"; } if ($web) $s.="
';
print '' . $langs->trans('Modify') . '';
-
+
// print '' . $langs->trans('Delete') . '';
-
+
print '
';
}
}
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index ead997a5d8c7c..b6aceb52ad41c 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -266,7 +266,7 @@
}
-// Param a user $user->rights->accountancy->chartofaccount can access
+// Param a user $user->rights->accounting->chartofaccount can access
foreach ($list as $key)
{
print '';
print '
';
+
print '';
- print '';
+ print '';
// account movement
- print '
';
print '';
print '';
+ print '';
+
print '';
+
print '
'; + $result = $book->fetchAllPerMvt($piece_num, $mode); if ($result < 0) { setEventMessages($book->error, $book->errors, 'errors'); @@ -490,11 +568,11 @@ print '';
print_liste_field_titre($langs->trans("AccountAccountingShort"));
- print_liste_field_titre($langs->trans("Subledger_account"));
+ print_liste_field_titre($langs->trans("SubledgerAccount"));
print_liste_field_titre($langs->trans("Labelcompte"));
- print_liste_field_titre($langs->trans("Labeloperation"));
- print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="center"');
- print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="center"');
+ print_liste_field_titre($langs->trans("Label"));
+ print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="right"');
+ print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="right"');
print_liste_field_titre($langs->trans("Action"), "", "", "", "", 'width="60" align="center"');
print " \n";
@@ -506,15 +584,24 @@
if ($action == 'update' && $line->id == $id) {
print '';
- print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
+ print $formaccounting->select_account($line->numero_compte, 'account_number', 1, array (), 1, 1, '');
print ' ';
print '';
- print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
+ // TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+ // use setup of keypress to select thirdparty and this hang browser on large database.
+ if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+ {
+ print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
+ }
+ else
+ {
+ print '';
+ }
print ' ';
print '';
print '' . "\n";
print '';
@@ -528,10 +615,14 @@
print ' ' . price($line->credit) . ' ';
print '';
- print 'id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">';
+ print 'id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">';
print img_edit();
- print ' ';
- print 'id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">';
+ print ' ';
+
+ $actiontodelete='detele';
+ if ($mode == '_tmp') $actiontodelete='confirm_delete';
+
+ print '';
print img_delete();
print '';
@@ -548,22 +639,46 @@
if ($action == "" || $action == 'add') {
print ' ';
print '';
- print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
+ print $formaccounting->select_account($account_number, 'account_number', 1, array (), 1, 1, '');
print ' ';
print '';
- print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
+ // TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+ // use setup of keypress to select thirdparty and this hang browser on large database.
+ if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+ {
+ print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
+ }
+ else
+ {
+ print '';
+ }
print ' ';
print ' ';
}
print '
';
- if ($mode=='_tmp' && $total_debit == $total_credit && $action=='') {
- print '
| ' . $langs->trans("NumMvts") . ' | '; print '' . $book->piece_num . ' | '; print '||||
| '; + print ' | |||||
';
print '
| '; if ($action == 'editdate') { @@ -361,18 +428,18 @@ $form->select_date($book->doc_date ? $book->doc_date : - 1, 'doc_date', '', '', '', "setdate"); print ''; print ''; - } else { - print $book->doc_date ? dol_print_date($book->doc_date, 'daytext') : ' '; + } else { + print $book->doc_date ? dol_print_date($book->doc_date, 'daytext') : ' '; } print ' | '; print '||||
| '; + print ' | |||||
';
print '
| '; if ($action == 'editjournal') { @@ -389,12 +456,12 @@ print ' | '; print '||||
| '; + print ' | |||||
';
print '
| '; if ($action == 'editdocref') { @@ -410,21 +477,25 @@ } print ' | '; print '||||
| ' . $langs->trans("Doctype") . ' | '; - print '' . $book->doc_type . ' | '; - print '||||
';
+
print '';
print '';
+ // Doc type
+ print '
\n";
- print '
';
+
print '| ' . $langs->trans("Doctype") . ' | '; + print '' . $book->doc_type . ' | '; + print '
| ' . $langs->trans("Status") . ' | '; print ''; if (empty($book->validated)) { @@ -438,10 +509,12 @@ } print ' | '; print '
| ' . $langs->trans("Control") . ' | '; /* + print '|
| ' . $langs->trans("Control") . ' | '; if ($book->doc_type == 'customer_invoice') { $sqlmid = 'SELECT rowid as ref'; @@ -457,14 +530,19 @@ } else dol_print_error($db); } - */ print '' . $ref .' | '; + print '
'; + $result = $book->fetchAllPerMvt($piece_num, $mode); if ($result < 0) { setEventMessages($book->error, $book->errors, 'errors'); @@ -490,11 +568,11 @@ print '
';
- print ''.$langs->trans("ValidTransaction").'';
+
+
+ if ($mode=='_tmp' && $action=='')
+ {
+ print '
'; + print '
- * Copyright (C) 2013-2017 Alexandre Spangaro
- * Copyright (C) 2016 Laurent Destailleur
+/* Copyright (C) 2013-2016 Olivier Geffroy
+ * Copyright (C) 2013-2016 Florian Henry
+ * Copyright (C) 2013-2017 Alexandre Spangaro
+ * Copyright (C) 2016-2017 Laurent Destailleur
*
* 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
@@ -16,7 +16,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see ';
print ' ';
print '';
print ' ';
print '';
print ' ';
print '';
@@ -437,7 +454,10 @@
$total_debit = 0;
$total_credit = 0;
-foreach ($object->lines as $line ) {
+$i=0;
+while ($i < min($num, $limit))
+{
+ $line = $object->lines[$i];
$total_debit += $line->debit;
$total_credit += $line->credit;
@@ -463,6 +483,8 @@
print '' . img_delete() . '';
print ' ';
print "
'; + print '
';
+ if ($total_debit == $total_credit)
+ {
+ print ''.$langs->trans("ValidTransaction").'';
+ }
+ else
+ {
+ print '';
+ }
+
+ print ' ';
+ print ''.$langs->trans("Cancel").'';
+
print "
";
}
print '';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 6f994eb11101f..93968644a8ffb 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,8 +1,8 @@
- * Copyright (C) 2013-2016 Florian Henry ';
-print $langs->trans('From') . ': ';
+print $langs->trans('From') . ' ';
print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
print '
';
print '';
-print $langs->trans('to') . ': ';
+print $langs->trans('to') . ' ';
print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
print '
';
print '';
-print $langs->trans('From');
+print $langs->trans('From').' ';
print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
print '
';
print '';
-print $langs->trans('to');
+print $langs->trans('to').' ';
print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
print '
';
print '';
-print $langs->trans('From');
-print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+print $langs->trans('From').' ';
+// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+// use setup of keypress to select thirdparty and this hang browser on large database.
+if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+{
+ print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+}
+else
+{
+ print '';
+}
print '
';
print '';
-print $langs->trans('to');
-print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+print $langs->trans('to').' ';
+// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+// use setup of keypress to select thirdparty and this hang browser on large database.
+if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+{
+ print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+}
+else
+{
+ print '';
+}
print '
';
print '| '.$langs->trans("ThirdPartyName").' | '; + $object->next_prev_filter="te.fournisseur = 1"; + print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); + print ' | ||
| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ||
| '.$langs->trans("CustomerCode"). ' | '; + print $object->code_client; + if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; + print ' | '; + print '||
| '; + print $form->editfieldkey("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer); + print ' | '; + print $form->editfieldval("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer); + print ' | '; + print '||
| '.$langs->trans("Address").' | '; + dol_print_address($object->address,'gmap','thirdparty',$object->id); + print ' | ||
| '.$langs->trans("Zip").' / '.$langs->trans("Town").' | '.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.' | '; + print '||
| '.$langs->trans("Country").' | '; + //$img=picto_from_langcode($object->country_code); + $img=''; + if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0); + else print ($img?$img.' ':'').$object->country; + print ' | ||
| '.$langs->trans("ThirdPartyName").' | '; + $object->next_prev_filter="te.fournisseur = 1"; + print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); + print ' | ||
| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ||
| '.$langs->trans("SupplierCode"). ' | '; + print $object->code_fournisseur; + if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; + print ' | '; + print '||
| '; + print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer); + print ' | '; + print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer); + print ' | '; + print '||
| '.$langs->trans("Address").' | '; + dol_print_address($object->address,'gmap','thirdparty',$object->id); + print ' | ||
| '.$langs->trans("Zip").' / '.$langs->trans("Town").' | '.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.' | '; + print '||
| '.$langs->trans("Country").' | '; + //$img=picto_from_langcode($object->country_code); + $img=''; + if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0); + else print ($img?$img.' ':'').$object->country; + print ' | ||
\n"; print '
| '; print ' | '; print ' | '; - print ' | '; - print ' | '; - print ' | '; + print ' | '; + print ' | '; + print ' | '; print ' | '; print ' | '; $searchpicto=$form->showFilterButtons(); @@ -287,9 +287,9 @@ //print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("VATIntra"), $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder); $clickpicto=$form->showCheckAddButtons(); print_liste_field_titre($clickpicto, '', '', '', '', 'align="center"'); @@ -332,14 +332,14 @@ print ' | '; print '' . price($objp->total_ht) . ' | '; - print '' . price($objp->tva_tx) . ' | '; - print ''; + print ' | ' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' | '; + print ''; print $codecompta . ' '; print img_edit(); print ''; print ' | '; - print '' . $objp->country .' | '; + print '' . $objp->country .' | '; print '' . $objp->tva_intra . ' | '; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 75c1a59aa3032..4272dfaf11551 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -99,7 +99,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; } // Purge search criteria -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers { $search_lineid = ''; $search_ref = ''; @@ -179,7 +179,7 @@ // Customer Invoice lines $sql = "SELECT f.facnumber, f.rowid as facid, f.datef, f.type as ftype,"; -$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line,"; +$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,"; $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,"; $sql .= " aa.rowid as aarowid"; $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f"; @@ -189,7 +189,8 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version"; $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0"; $sql .= " AND product_type <= 2"; -$sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')"; +$sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='' OR p.accountancy_code_sell NOT IN + (SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accounting_account as aa , " . MAIN_DB_PREFIX . "accounting_system as asy WHERE fk_pcg_version = asy.pcg_version AND asy.rowid ='" . $conf->global->CHARTOFACCOUNTS . "'))"; // Add search filter like if ($search_lineid) { $sql .= natural_search("l.rowid", $search_lineid, 1); @@ -387,7 +388,7 @@ if ($objp->vat_tx_l != $objp->vat_tx_p) $code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red'; print ''; - print price($objp->tva_tx_line); + print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')); print ' | '; // Current account diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php index 1c94b0b649a68..fee9e0b0057ee 100644 --- a/htdocs/accountancy/expensereport/card.php +++ b/htdocs/accountancy/expensereport/card.php @@ -23,7 +23,7 @@ */ /** * \file htdocs/accountancy/supplier/card.php - * \ingroup Accountancy + * \ingroup Advanced accountancy * \brief Card expense report ventilation */ require '../../main.inc.php'; @@ -56,7 +56,7 @@ $sql = " UPDATE " . MAIN_DB_PREFIX . "expensereport_det"; $sql .= " SET fk_code_ventilation = " . $codeventil; $sql .= " WHERE rowid = " . $id; - + $resql = $db->query($sql); if (! $resql) { setEventMessages($db->lasterror(), null, 'errors'); diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index 2237f578069ab..f115cbde2e4ce 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -82,7 +82,7 @@ */ // Purge search criteria -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers { $search_expensereport = ''; $search_label = ''; @@ -146,7 +146,7 @@ * Expense reports lines */ $sql = "SELECT er.ref, er.rowid as erid,"; -$sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht, erd.fk_code_ventilation, erd.tva_tx, erd.date,"; +$sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht, erd.fk_code_ventilation, erd.tva_tx, erd.vat_src_code, erd.date,"; $sql .= " aa.label, aa.account_number,"; $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label"; $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport as er"; @@ -241,8 +241,8 @@ print ''; print ' | '; print ' | '; - print ' | '; - print ' | '; + print ' | '; + print ' | '; print ' | '; print ' | '; $searchpicto=$form->showFilterButtons(); @@ -258,7 +258,7 @@ print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder); print_liste_field_titre(''); $checkpicto=$form->showCheckAddButtons(); print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"'); @@ -293,7 +293,7 @@ print ' | ' . price($objp->total_ht) . ' | '; - print '' . price($objp->tva_tx) . ' | '; + print '' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' | '; print '' . $codeCompta . ' | '; diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 8e7b9c60c92b8..1c08deb51d25e 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -95,7 +95,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; } // Purge search criteria -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers { $search_expensereport = ''; $search_label = ''; @@ -174,7 +174,7 @@ // Expense report lines $sql = "SELECT er.ref, er.rowid as erid, er.date_debut,"; -$sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.date,"; +$sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,"; $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,"; $sql .= " aa.rowid as aarowid"; $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport as er"; @@ -284,8 +284,8 @@ print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"'); - print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"'); + print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"', $sortfield, $sortorder); $checkpicto=''; if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1); print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"'); @@ -333,7 +333,7 @@ // Vat rate print ''; - print price($objp->tva_tx_line); + print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')); print ' | '; // Current account diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index ed8d1d7501a9b..d5746eb63e5c9 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -1,4 +1,6 @@ * Copyright (C) 2007-2010 Jean Heimburger
'; + dol_fiche_end(); // Autogeneration $title = $langs->trans("Recurrence"); - print load_fiche_titre($title, '', 'calendar'); + print load_fiche_titre(' '.$title, '', ''); + + dol_fiche_head(null, '', '', 0); print '
'; + dol_fiche_end(); + $title = $langs->trans("ProductsAndServices"); if (empty($conf->service->enabled)) @@ -1078,8 +1100,6 @@ } print "\n"; - dol_fiche_end(); - print '
';
print ' ';
print '';
@@ -1260,7 +1280,7 @@
'__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')'
);
$substitutionarray['__(TransKey)__']=$langs->trans("TransKey");
-
+
$htmltext = ''.$langs->trans("FollowingConstantsWillBeSubstituted").':
'; foreach($substitutionarray as $key => $val) { @@ -1323,7 +1343,7 @@ print '';
print '';
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index cdc5eb2e54549..394e2f2384194 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -99,7 +99,7 @@
$atleastonepaymentnotnull = 0;
// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
- $tmpinvoice=new Facture($db);
+ $tmpinvoice=new Facture($db);
foreach ($_POST as $key => $value)
{
if (substr($key,0,7) == 'amount_')
@@ -188,7 +188,7 @@
setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('Date')), null, 'errors');
$error++;
}
-
+
// Check if payments in both currency
if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
{
@@ -228,7 +228,7 @@
$newvalue = price2num($value,'MT');
$amounts[$key] = -$newvalue;
}
-
+
foreach ($multicurrency_amounts as $key => $value) // How payment is dispatch
{
$newvalue = price2num($value,'MT');
@@ -319,7 +319,7 @@
if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
{
$facture = new Facture($db);
- $result=$facture->fetch($facid);
+ $result = $facture->fetch($facid);
if ($result >= 0)
{
@@ -389,7 +389,7 @@ function _elemToJson(selector)
{
subJson[n["name"]] = n["value"];
});
-
+
return subJson;
}
function callForResult(imgId)
@@ -516,31 +516,31 @@ function callForResult(imgId)
print '
';
dol_fiche_end();
-
+
/*
* List of unpaid invoices
*/
-
+
$sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type, ';
$sql.= ' f.datef as df, f.fk_soc as socid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
-
+
if(!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS)) {
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON (f.fk_soc = s.rowid)';
}
-
+
$sql.= ' WHERE f.entity = '.$conf->entity;
$sql.= ' AND (f.fk_soc = '.$facture->socid;
-
+
if(!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
$sql.= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
}
-
+
$sql.= ') AND f.paye = 0';
$sql.= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
if ($facture->type != 2)
@@ -577,7 +577,7 @@ function callForResult(imgId)
//print '';
print '
'; print '';
-
+
print ''.$langs->trans("TF_".strtoupper(empty($objp->type_fees_libelle)?'OTHER':$objp->type_fees_libelle)).' ';
print ''.($langs->trans(($objp->type_fees_code)) == $objp->type_fees_code ? $objp->type_fees_libelle : $langs->trans(($objp->type_fees_code))).' ';
print ''.$objp->comments.' ';
- print ''.vatrate($objp->vatrate,true).' ';
+ print ''.vatrate($objp->vatrate.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''),true).' ';
print ''.price($objp->value_unit).' ';
print ''.$objp->qty.' ';
@@ -2057,22 +2081,25 @@
// Add comments
print '';
- print '';
+ print '';
print ' ';
// VAT
print '';
- print $form->load_tva('vatrate', (isset($_POST["vatrate"])?$_POST["vatrate"]:$objp->vatrate), $mysoc, '');
+ $seller=$mysoc;
+ $buyer=new Societe($db);
+ $selectedvat=(GETPOST("vatrate",'alpha')?GETPOST("vatrate",'alpha'):$objp->vatrate.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
+ print $form->load_tva('vatrate', $selectedvat, $seller, $buyer, 0, 0, '', false, 1);
print ' ';
// Unit price
print '';
- print '';
+ print '';
print ' ';
// Quantity
print '';
- print '';
+ print ''; // We must be able to enter decimal qty
print ' ';
if ($action != 'editline')
@@ -2093,13 +2120,6 @@
$db->free($resql);
}
- else
- {
- /* print '';
- print '
';*/
- }
- //print '';
// Add a line
if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline' && $user->rights->expensereport->creer)
@@ -2116,7 +2136,6 @@
print '';
print '';
$defaultvat=-1;
if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
- print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false);
+ print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false, 1);
print ' ';
// Unit price
print '';
- print '';
+ print '';
print ' ';
// Quantity
print '';
- print '';
+ print ''; // We must be able to enter decimal qty
print ' ';
if ($action != 'editline')
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index ffef31cad8bbc..f999a93c57fe8 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -37,9 +37,9 @@ class ExpenseReport extends CommonObject
var $picto = 'trip';
var $lignes=array();
-
+
public $date_debut;
-
+
public $date_fin;
var $fk_user_validator;
@@ -65,7 +65,7 @@ class ExpenseReport extends CommonObject
// Update
var $date_modif;
var $fk_user_modif;
-
+
// Refus
var $date_refuse;
var $detail_refuse;
@@ -128,17 +128,17 @@ function create($user, $notrigger=0)
$now = dol_now();
$error = 0;
-
+
// Check parameters
- if (empty($this->date_debut) || empty($this->date_fin))
+ if (empty($this->date_debut) || empty($this->date_fin))
{
$this->error='ErrorFieldRequired';
return -1;
}
-
+
$fuserid = $this->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
if (empty($fuserid)) $fuserid = $user->id;
-
+
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
@@ -208,7 +208,7 @@ function create($user, $notrigger=0)
$result=$this->update_price();
if ($result > 0)
{
-
+
if (!$notrigger)
{
// Call trigger
@@ -262,19 +262,18 @@ function create($user, $notrigger=0)
function createFromClone($fk_user_author)
{
global $user,$hookmanager;
-
+
$error=0;
-
+
if (empty($fk_user_author)) $fk_user_author = $user->id;
-
+
$this->context['createfromclone'] = 'createfromclone';
-
$this->db->begin();
-
+
// get extrafields so they will be clone
//foreach($this->lines as $line)
//$line->fetch_optionals($line->rowid);
-
+
// Load source object
$objFrom = clone $this;
@@ -307,6 +306,7 @@ function createFromClone($fk_user_author)
// Call trigger
$result=$this->call_trigger('EXPENSEREPORT_CLONE',$user);
+
if ($result < 0) $error++;
// End call triggers
}
@@ -325,8 +325,8 @@ function createFromClone($fk_user_author)
return -1;
}
}
-
-
+
+
/**
* update
*
@@ -341,7 +341,7 @@ function update($user, $notrigger = 0, $userofexpensereport=null)
$error = 0;
$this->db->begin();
-
+
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
$sql.= " total_ht = ".$this->total_ht;
$sql.= " , total_ttc = ".$this->total_ttc;
@@ -420,7 +420,7 @@ function fetch($id, $ref='')
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
if ($ref) $sql.= " WHERE d.ref = '".$this->db->escape($ref)."'";
else $sql.= " WHERE d.rowid = ".$id;
- $sql.= $restrict;
+ //$sql.= $restrict;
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql) ;
@@ -455,7 +455,7 @@ function fetch($id, $ref='')
$this->fk_user_refuse = $obj->fk_user_refuse;
$this->fk_user_cancel = $obj->fk_user_cancel;
$this->fk_user_approve = $obj->fk_user_approve;
-
+
$user_author = new User($this->db);
if ($this->fk_user_author > 0) $user_author->fetch($this->fk_user_author);
@@ -512,7 +512,7 @@ function set_paid($id, $fuser, $notrigger = 0)
{
$error = 0;
$this->db->begin();
-
+
$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport";
$sql.= " SET fk_statut = 6, paid=1";
$sql.= " WHERE rowid = ".$id." AND fk_statut = 5";
@@ -533,7 +533,7 @@ function set_paid($id, $fuser, $notrigger = 0)
}
// End call triggers
}
-
+
if (empty($error))
{
$this->db->commit();
@@ -620,7 +620,7 @@ function info($id)
$sql.= " f.tms as date_modification,";
$sql.= " f.date_valid as datev,";
$sql.= " f.date_approve as datea,";
- $sql.= " f.fk_user_author as fk_user_creation,";
+ //$sql.= " f.fk_user_author as fk_user_creation,"; // This is not user of creation but user the expense is for.
$sql.= " f.fk_user_modif as fk_user_modification,";
$sql.= " f.fk_user_valid,";
$sql.= " f.fk_user_approve";
@@ -670,7 +670,7 @@ function info($id)
$auser->fetch($obj->fk_user_approve);
$this->user_approve = $auser;
}
-
+
}
$this->db->free($resql);
}
@@ -704,8 +704,8 @@ function initAsSpecimen()
$this->date_fin = $now;
$this->date_approve = $now;
- $type_fees_id = 2; // TF_TRIP
-
+ $type_fees_id = 2; // TF_TRIP
+
$this->status = 5;
$this->fk_statut = 5;
@@ -1078,14 +1078,14 @@ function setValidate($fuser, $notrigger=0)
{
$now = dol_now();
$this->db->begin();
-
+
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 2, fk_user_valid = ".$fuser->id.", date_valid='".$this->db->idate($now)."'";
if ($update_number_int) {
$sql.= ", ref_number_int = ".$ref_number_int;
}
$sql.= ' WHERE rowid = '.$this->id;
-
+
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1099,7 +1099,7 @@ function setValidate($fuser, $notrigger=0)
}
// End call triggers
}
-
+
if (empty($error))
{
$this->db->commit();
@@ -1123,7 +1123,7 @@ function setValidate($fuser, $notrigger=0)
{
dol_syslog(get_class($this)."::setValidate expensereport already with validated status", LOG_WARNING);
}
-
+
return 0;
}
@@ -1183,13 +1183,13 @@ function setApproved($fuser, $notrigger=0)
{
$now=dol_now();
$error = 0;
-
+
// date approval
$this->date_approve = $this->db->idate($now);
if ($this->fk_statut != 5)
{
$this->db->begin();
-
+
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
$sql.= " date_approve='".$this->db->idate($this->date_approve)."'";
@@ -1206,7 +1206,7 @@ function setApproved($fuser, $notrigger=0)
}
// End call triggers
}
-
+
if (empty($error))
{
$this->db->commit();
@@ -1230,7 +1230,7 @@ function setApproved($fuser, $notrigger=0)
{
dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
}
-
+
return 0;
}
@@ -1245,7 +1245,7 @@ function setDeny($fuser,$details,$notrigger=0)
{
$now = dol_now();
$error = 0;
-
+
// date de refus
if ($this->fk_statut != 99)
{
@@ -1261,7 +1261,7 @@ function setDeny($fuser,$details,$notrigger=0)
$this->fk_user_refuse = $fuser->id;
$this->detail_refuse = $details;
$this->date_refuse = $now;
-
+
if (!$notrigger)
{
// Call trigger
@@ -1272,7 +1272,7 @@ function setDeny($fuser,$details,$notrigger=0)
}
// End call triggers
}
-
+
if (empty($error))
{
$this->db->commit();
@@ -1308,11 +1308,11 @@ function setDeny($fuser,$details,$notrigger=0)
function set_unpaid($fuser, $notrigger = 0)
{
$error = 0;
-
+
if ($this->fk_c_deplacement_statuts != 5)
{
$this->db->begin();
-
+
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET fk_statut = 5";
$sql.= ' WHERE rowid = '.$this->id;
@@ -1331,7 +1331,7 @@ function set_unpaid($fuser, $notrigger = 0)
}
// End call triggers
}
-
+
if (empty($error))
{
$this->db->commit();
@@ -1372,7 +1372,7 @@ function set_cancel($fuser,$detail, $notrigger=0)
if ($this->fk_statut != 4)
{
$this->db->begin();
-
+
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET fk_statut = 4, fk_user_cancel = ".$fuser->id;
$sql.= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
@@ -1393,7 +1393,7 @@ function set_cancel($fuser,$detail, $notrigger=0)
}
// End call triggers
}
-
+
if (empty($error))
{
$this->db->commit();
@@ -1433,7 +1433,7 @@ function getNextNumRef()
$sql = 'SELECT MAX(de.ref_number_int) as max';
$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' de';
-
+
$result = $this->db->query($sql);
if($this->db->num_rows($result) > 0):
@@ -1577,7 +1577,7 @@ function update_totaux_del($ligne_total_ht,$ligne_total_tva)
* @param int $rowid Line to edit
* @param int $type_fees_id Type payment
* @param int $projet_id Project id
- * @param double $vatrate Vat rate
+ * @param double $vatrate Vat rate. Can be '8.5* (8.5NPROM...)'
* @param string $comments Description
* @param real $qty Qty
* @param double $value_unit Value init
@@ -1587,14 +1587,34 @@ function update_totaux_del($ligne_total_ht,$ligne_total_tva)
*/
function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $expensereport_id)
{
- global $user;
+ global $user, $mysoc;
if ($this->fk_statut==0 || $this->fk_statut==99)
{
$this->db->begin();
+ $type = 0; // TODO What if type is service ?
+
+ // We don't know seller and buyer for expense reports
+ $seller = $mysoc;
+ $buyer = new Societe($this->db);
+
+ $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$buyer,$seller);
+
+ // Clean vat code
+ $vat_src_code='';
+
+ if (preg_match('/\((.*)\)/', $vatrate, $reg))
+ {
+ $vat_src_code = $reg[1];
+ $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
+ }
+ $vatrate = preg_replace('/\*/','',$vatrate);
+
+ $tmp = calcul_price_total($qty, $value_unit, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller, $localtaxes_type);
+
// calcul de tous les totaux de la ligne
- $total_ttc = price2num($qty*$value_unit, 'MT');
+ //$total_ttc = price2num($qty*$value_unit, 'MT');
$tx_tva = $vatrate / 100;
$tx_tva = $tx_tva + 1;
@@ -1604,6 +1624,9 @@ function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty
// fin calculs
$ligne = new ExpenseReportLine($this->db);
+
+ $ligne->rowid = $rowid;
+
$ligne->comments = $comments;
$ligne->qty = $qty;
$ligne->value_unit = $value_unit;
@@ -1613,11 +1636,21 @@ function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty
$ligne->fk_c_type_fees = $type_fees_id;
$ligne->fk_projet = $projet_id;
- $ligne->total_ht = $total_ht;
- $ligne->total_tva = $total_tva;
- $ligne->total_ttc = $total_ttc;
- $ligne->vatrate = price2num($vatrate);
- $ligne->rowid = $rowid;
+ //$ligne->total_ht = $total_ht;
+ //$ligne->total_tva = $total_tva;
+ //$ligne->total_ttc = $total_ttc;
+ //$ligne->vatrate = price2num($vatrate);
+
+ $ligne->vat_src_code = $vat_src_code;
+ $ligne->vatrate = price2num($vatrate);
+ $ligne->total_ttc = $tmp[2];
+ $ligne->total_ht = $tmp[0];
+ $ligne->total_tva = $tmp[1];
+ $ligne->localtax1_tx = $localtaxes_type[1];
+ $ligne->localtax2_tx = $localtaxes_type[3];
+ $ligne->localtax1_type = $localtaxes_type[0];
+ $ligne->localtax2_type = $localtaxes_type[2];
+
// Select des infos sur le type fees
$sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
@@ -1758,7 +1791,7 @@ function fetch_users_approver_expensereport()
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
$sql.= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
//print $sql;
-
+
dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
$result = $this->db->query($sql);
if($result)
@@ -1895,7 +1928,7 @@ function load_board($user, $option='topay')
$now=dol_now();
$userchildids = $user->getAllChildIds(1);
-
+
$sql = "SELECT ex.rowid, ex.date_valid";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
if ($option == 'toapprove') $sql.= " WHERE ex.fk_statut = 2";
@@ -1927,7 +1960,7 @@ function load_board($user, $option='topay')
while ($obj=$this->db->fetch_object($resql))
{
$response->nbtodo++;
-
+
if ($option == 'toapprove')
{
if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
@@ -1951,7 +1984,7 @@ function load_board($user, $option='topay')
return -1;
}
}
-
+
/**
* Return if an expense report is late or not
*
@@ -1961,11 +1994,11 @@ function load_board($user, $option='topay')
public function hasDelay($option)
{
global $conf;
-
+
//Only valid members
if ($option == 'toapprove' && $this->status != 2) return false;
if ($option == 'topay' && $this->status != 5) return false;
-
+
$now = dol_now();
if ($option == 'toapprove')
{
@@ -1973,7 +2006,7 @@ public function hasDelay($option)
}
else
return ($this->datevalid?$this->datevalid:$this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
- }
+ }
}
@@ -2025,7 +2058,7 @@ function __construct($db)
function fetch($rowid)
{
$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_projet, fde.date,';
- $sql.= ' fde.tva_tx as vatrate, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
+ $sql.= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
$sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
$sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
@@ -2054,6 +2087,7 @@ function fetch($rowid)
$this->projet_ref = $objp->projet_ref;
$this->projet_title = $objp->projet_title;
$this->vatrate = $objp->vatrate;
+ $this->vat_src_code = $objp->vat_src_code;
$this->total_ht = $objp->total_ht;
$this->total_tva = $objp->total_tva;
$this->total_ttc = $objp->total_ttc;
@@ -2088,11 +2122,12 @@ function insert($notrigger=0)
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'expensereport_det';
$sql.= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
- $sql.= ' tva_tx, comments, qty, value_unit, total_ht, total_tva, total_ttc, date)';
+ $sql.= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date)';
$sql.= " VALUES (".$this->fk_expensereport.",";
$sql.= " ".$this->fk_c_type_fees.",";
$sql.= " ".($this->fk_projet>0?$this->fk_projet:'null').",";
$sql.= " ".$this->vatrate.",";
+ $sql.= " '".$this->db->escape($this->vat_src_code)."',";
$sql.= " '".$this->db->escape($this->comments)."',";
$sql.= " ".$this->qty.",";
$sql.= " ".$this->value_unit.",";
@@ -2163,6 +2198,7 @@ function update($fuser)
$sql.= ",total_tva=".$this->total_tva."";
$sql.= ",total_ttc=".$this->total_ttc."";
$sql.= ",tva_tx=".$this->vatrate;
+ $sql.= ",vat_src_code='".$this->db->escape($this->vat_src_code)."'";
if ($this->fk_c_type_fees) $sql.= ",fk_c_type_fees=".$this->fk_c_type_fees;
else $sql.= ",fk_c_type_fees=null";
if ($this->fk_projet) $sql.= ",fk_projet=".$this->fk_projet;
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index edd80a0bff563..4d2bc6b9b485c 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -506,7 +506,7 @@ function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_
$total=$this->total;
if ($mode == 'payment_expensereport') $amount=$total;
-
+
// Insert payment into llx_bank
$bank_line_id = $acc->addline(
$this->datepaid,
@@ -543,25 +543,25 @@ function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_
dol_print_error($this->db);
}
}
-
+
// Add link 'user' in bank_url between user and bank transaction
if (! $error)
{
- foreach ($this->amounts as $key => $value) // We should have always same third party but we loop in case of.
+ foreach ($this->amounts as $key => $value) // We should have always same user but we loop in case of.
{
if ($mode == 'payment_expensereport')
{
- $er = new ExpenseReport($this->db);
- $er->fetch($key);
- $er->fetch_user($er->fk_user_author);
+ $fuser = new User($this->db);
+ $fuser->fetch($key);
+
$result=$acc->add_url_line(
$bank_line_id,
- $er->user->id,
+ $fuser->id,
DOL_URL_ROOT.'/user/card.php?id=',
- $er->user->getFullName($langs),
+ $fuser->getFullName($langs),
'user'
);
- if ($result <= 0)
+ if ($result <= 0)
{
$this->error=$this->db->lasterror();
dol_syslog(get_class($this).'::addPaymentToBank '.$this->error);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 34f1cfebf3866..e0a9df80b3f38 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -140,7 +140,7 @@
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test must be present to be compatible with all browsers
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // Both test must be present to be compatible with all browsers
{
$search_ref="";
$search_user="";
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 29e6b2174e3e5..ad74c7fda053d 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -80,7 +80,7 @@
setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToDebit")), null, 'errors');
$error++;
}
-
+
if (! $error)
{
$paymentid = 0;
@@ -190,19 +190,19 @@
print '';
print '';
print '';
-
+
dol_fiche_head(null, '0', '', -1);
$linkback = '';
// $linkback = '' . $langs->trans("BackToList") . '';
-
+
dol_banner_tab($expensereport, 'ref', $linkback, 1, 'ref', 'ref', '');
-
+
print ' \n";
-
+
$total+=$objp->total;
$total_ttc+=$objp->total_ttc;
$totalrecu+=$objp->am;
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 78fd59ecb2230..75f151d085057 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -141,7 +141,7 @@
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Purge search criteria
- if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
{
$search_ref="";
$search_company="";
@@ -253,6 +253,13 @@
$arrayofselected=is_array($toselect)?$toselect:array();
+ if ($socid > 0)
+ {
+ $soc = new Societe($db);
+ $soc->fetch($socid);
+ if (empty($search_company)) $search_company = $soc->name;
+ }
+
$param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 6d14f47af10f8..84f0b2c805662 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
*/
if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','6.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION','7.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
if (! defined('EURO')) define('EURO',chr(128));
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index e5e42042015d3..36910458aa3fb 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -375,12 +375,6 @@
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
{
$langs->load("products");
- print '';
- print '';
+ print '
'; foreach($substitutionarray as $key => $val) { @@ -1323,7 +1343,7 @@ print '
| '.$title.' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
';
print '
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans('Comments').' | '; print ''; print ' |
'; print '
| '.$arraytitle.' | '; print ''.$langs->trans('Date').' | '; @@ -602,7 +602,7 @@ function callForResult(imgId) while ($i < $num) { $objp = $db->fetch_object($resql); - + $soc = new Societe($db); $soc->fetch($objp->socid); @@ -614,9 +614,9 @@ function callForResult(imgId) $deposits=$invoice->getSumDepositsUsed(); $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT'); $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT'); - + // Multicurrency Price - if (!empty($conf->multicurrency->enabled)) + if (!empty($conf->multicurrency->enabled)) { $multicurrency_payment = $invoice->getSommePaiement(1); $multicurrency_creditnotes=$invoice->getSumCreditNotesUsed(1); @@ -624,7 +624,7 @@ function callForResult(imgId) $multicurrency_alreadypayed=price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits,'MT'); $multicurrency_remaintopay=price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits,'MT'); } - + print '||||||||||||||||||||||||||
| '; @@ -634,36 +634,36 @@ function callForResult(imgId) // Date print ' | '.dol_print_date($db->jdate($objp->df),'day')." | \n"; - + // Currency if (!empty($conf->multicurrency->enabled)) print ''.$objp->multicurrency_code." | \n"; - + // Multicurrency Price - if (!empty($conf->multicurrency->enabled)) + if (!empty($conf->multicurrency->enabled)) { print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc); print ' | '; - + // Multicurrency Price print ''; - if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) + if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) { print price($sign * $multicurrency_payment); if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes); if ($multicurrency_deposits) print '+'.price($multicurrency_deposits); } print ' | '; - + // Multicurrency Price print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay); print ' | '; } - + // Price print ''.price($sign * $objp->total_ttc).' | '; - + // Received or paid back print ''.price($sign * $paiement); if ($creditnotes) print '+'.price($creditnotes); @@ -685,7 +685,7 @@ function callForResult(imgId) { if (!empty($conf->use_javascript_ajax)) print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'"); - print ''; + print ''; print ''; } else @@ -696,14 +696,14 @@ function callForResult(imgId) print " | "; // Multicurrency Price - if (! empty($conf->multicurrency->enabled)) + if (! empty($conf->multicurrency->enabled)) { print ''; - + // Add remind multicurrency amount $namef = 'multicurrency_amount_'.$objp->facid; $nameRemain = 'multicurrency_remain_'.$objp->facid; - + if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) { if ($action != 'add_paiement') @@ -723,7 +723,7 @@ function callForResult(imgId) } // Warning - print ' | '; + print ' | ';
//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]." "; if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id])) || $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id]))) @@ -744,7 +744,7 @@ function callForResult(imgId) $totalrecudeposits+=$deposits; $i++; } - + if ($i > 1) { // Print total @@ -760,7 +760,7 @@ function callForResult(imgId) if ($totalrecudeposits) print '+'.price($totalrecudeposits); print ' | ';
print ''.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits,'MT')).' | '; - print ''; + print ' | '; // Autofilled if (!empty($conf->multicurrency->enabled)) print ' | '; print ' | '; print " | ||||||||||||
| '.$objp->facnumber." | \n"; print ''.dol_print_date($db->jdate($objp->dp))." | \n"; diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index aeed72d93d100..3e2b43b7f3456 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -68,7 +68,7 @@ */ // If click on purge search criteria ? -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers { $search_ref=''; $search_amount=''; diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php index d6031ae168513..b089cac6aab6d 100644 --- a/htdocs/compta/paiement/class/cpaiement.class.php +++ b/htdocs/compta/paiement/class/cpaiement.class.php @@ -42,7 +42,7 @@ class Cpaiement /** */ - + public $code; public $libelle; public $type; @@ -52,7 +52,7 @@ class Cpaiement /** */ - + /** * Constructor @@ -79,7 +79,7 @@ public function create(User $user, $notrigger = false) $error = 0; // Clean parameters - + if (isset($this->code)) { $this->code = trim($this->code); } @@ -99,14 +99,14 @@ public function create(User $user, $notrigger = false) $this->module = trim($this->module); } - + // Check parameters // Put here code to add control on parameters values // Insert request $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '('; - + $sql.= 'id,'; $sql.= 'code,'; $sql.= 'libelle,'; @@ -115,9 +115,9 @@ public function create(User $user, $notrigger = false) $sql.= 'accountancy_code,'; $sql.= 'module'; - + $sql .= ') VALUES ('; - + $sql .= ' '.(! isset($this->id)?'NULL':$this->id).','; $sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").','; $sql .= ' '.(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").','; @@ -126,7 +126,7 @@ public function create(User $user, $notrigger = false) $sql .= ' '.(! isset($this->accountancy_code)?'NULL':"'".$this->db->escape($this->accountancy_code)."'").','; $sql .= ' '.(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'"); - + $sql .= ')'; $this->db->begin(); @@ -198,7 +198,7 @@ public function fetch($id, $ref = null) $obj = $this->db->fetch_object($resql); $this->id = $obj->id; - + $this->code = $obj->code; $this->libelle = $obj->libelle; $this->type = $obj->type; @@ -206,7 +206,7 @@ public function fetch($id, $ref = null) $this->accountancy_code = $obj->accountancy_code; $this->module = $obj->module; - + } $this->db->free($resql); @@ -238,7 +238,7 @@ public function update(User $user, $notrigger = false) dol_syslog(__METHOD__, LOG_DEBUG); // Clean parameters - + if (isset($this->code)) { $this->code = trim($this->code); } @@ -258,7 +258,7 @@ public function update(User $user, $notrigger = false) $this->module = trim($this->module); } - + // Check parameters // Put here code to add a control on parameters values @@ -356,8 +356,8 @@ public function delete(User $user, $notrigger = false) return 1; } } - - + + /** * Initialise object with example values * Id must be 0 if object instance is a specimen @@ -367,7 +367,7 @@ public function delete(User $user, $notrigger = false) public function initAsSpecimen() { $this->id = 0; - + $this->code = ''; $this->libelle = ''; $this->type = ''; @@ -375,7 +375,7 @@ public function initAsSpecimen() $this->accountancy_code = ''; $this->module = ''; - + } } diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index f4e61380a9c0a..8e67825c085db 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -337,6 +337,24 @@ function create($user,$closepaidinvoices=0) $error++; } } + } + + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $invoice->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $ret = $invoice->fetch($id); // Reload to get new records + + $result = $invoice->generateDocument($invoice->modelpdf, $outputlangs); + if ($result < 0) { + setEventMessages($invoice->error, $invoice->errors, 'errors'); + $error++; + } + } } } diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index ec2bbc78fc66a..4a7a2e3c81ae9 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -77,7 +77,7 @@ * Actions */ -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers { $search_ref=""; $search_account=""; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 9a5585c2513ae..6fcbb62b5d9cd 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -57,7 +57,7 @@ * Actions */ -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers { $search_ref=""; } diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 208be88aeae4b..6251a6f652193 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -65,7 +65,7 @@ * Actions */ -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers { $search_line=""; $search_bon=""; diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 45bde4bcd324b..2b8b6a6fe5b0e 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -44,7 +44,7 @@ // Security check $socid = GETPOST("socid","int"); if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'salaries', '', '', ''); +$result = restrictedArea($user, 'salaries', '', '', 'payment'); $object = new PaymentSalary($db); diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index baf991829939d..b25df5a71ac35 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -79,7 +79,7 @@ * Actions */ -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers { $search_ref=""; $search_label=""; diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index 630197cfc788d..0ab82a7cae315 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -67,7 +67,7 @@ if ($object->paye) { $result = $object->set_unpaid($user); - if ($result > 0) + if ($result > 0) { header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id); exit(); @@ -350,7 +350,7 @@ print '||||||||||||||||||||||||||
| '.$langs->trans("Project").' | '; $numproject=$formproject->select_projects(-1, $projectid,'fk_project',0,0,1,1); - + print ' | ||||||||||||||||||||||||||
| '.$langs->trans("Type")." | ".$object->type_libelle." | "; print "
| '.$langs->trans("Type").' | '; print ''.$langs->trans("Amount").' | '; print ''; - + $var=true; if ($num > 0) { while ($i < $num) { $objp = $db->fetch_object($resql); - + print "|||||
| "; print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.' | '; print ''.dol_print_date($db->jdate($objp->dp),'day')." | \n"; @@ -619,18 +619,18 @@ } else { - + print '|||||
| '.$langs->trans("None").' | ||||||
| ".$langs->trans("AlreadyPaid")." : | ".price($totalpaye)." | |||||
| ".$langs->trans("AmountExpected")." : | ".price($object->amount)." | |||||
| ".$langs->trans("RemainderToPay")." : | "; print ''.price($resteapayer)." | |||||
| '.$obj->dm." | \n"; $total = $total + $obj->mm; @@ -117,7 +117,7 @@ function pt ($db, $sql, $date) $textnextyear=" ".img_next($langs->trans("Next"), 'class="valignbottom"').""; print $conf->dol_optimize_smallscreen; -print load_fiche_titre($langs->trans("VAT"), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'title_accountancy.png'); +print load_fiche_titre($langs->transcountry("VAT", $mysoc->country_code), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'title_accountancy.png'); print $langs->trans("VATReportBuildWithOptionDefinedInModule").'||||||
| '.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").' | '; @@ -220,22 +220,67 @@ function pt ($db, $sql, $date) print '
| ' . $langs->trans("VATDue") . ' | '; // need to add translation + print '' . price(price2num($total, 'MT')) . ' | '; + print "
| ' . $langs->trans("VATPaid") . ' | '; + print '' . price(price2num($obj->mm, 'MT')) . " | \n"; + print "
| ' . $langs->trans("VATRestopay") . ' | '; // need to add translation + print '' . price(price2num($restopay, 'MT')) . ' | '; + print "
' . $langs->trans("Phone") . ': '.join(', ',$phonelist); $label.= '
' . $langs->trans("Address") . ': '.dol_format_address($this, 1, ' ', $langs); - + $link = 'global->MAIN_OPTIMIZEFORTEXTBROWSER)) + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { $label=$langs->trans("ShowContact"); - $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"'; + $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"'; } $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose.= ' class="classfortooltip">'; @@ -1029,15 +1031,15 @@ function getNomUrl($withpicto=0,$option='',$maxlen=0,$moreparam='') if ($reshook > 0) $linkclose = $hookmanager->resPrint; $link.=$linkclose; - + $linkend=''; - + if ($option == 'xxx') { $link = ''; $linkend=''; } - + if ($withpicto) $result.=($link.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' '); $result.=$link.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend; return $result; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 608f5614cd8d5..0c3ee14666a29 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -228,7 +228,7 @@ function getNextNumRef($soc) */ function active_line($user, $line_id, $date, $date_end='', $comment='') { - $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment); + return $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment); } @@ -243,7 +243,7 @@ function active_line($user, $line_id, $date, $date_end='', $comment='') */ function close_line($user, $line_id, $date_end, $comment='') { - $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment); + return $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment); } @@ -1278,6 +1278,15 @@ function update($user=null, $notrigger=0) //// End call triggers } } + + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } // Commit or rollback if ($error) @@ -1633,8 +1642,8 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $dat if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used { $contractline = new ContratLigne($this->db); - $contractline->array_options=$array_option; - $contractline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$contractline->table_element); + $contractline->array_options=$array_options; + $contractline->id= $rowid; $result=$contractline->insertExtraFields(); if ($result < 0) { diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index a526a9bd78c2d..d53bc0a3ee18c 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -146,7 +146,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; // Purge search criteria -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers +if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers { $day=''; $month=''; @@ -306,6 +306,13 @@ $arrayofselected=is_array($toselect)?$toselect:array(); + if ($socid > 0) + { + $soc = new Societe($db); + $soc->fetch($socid); + if (empty($search_name)) $search_name = $soc->name; + } + $param=''; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index aea03a73df5e9..6534ef1e3621e 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -152,7 +152,7 @@ // Selection of new fields include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; - if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers + if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers { $search_name=""; $search_contract=""; @@ -332,7 +332,7 @@ $moreforfilter.='
';
$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
- $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+ $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
$moreforfilter.='
';
}
@@ -523,7 +523,6 @@
$contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
-
print ''.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget",$modName,"").'
';
+ }
+ else
+ {
+ try {
+ include_once $newdir.'/'.$file;
+ }
+ catch(Exception $e)
+ {
+ print $e->getMessage();
+ }
+ }
+
+ $files[$i] = $file;
+ $fullpath[$i] = $dir.'/'.$file;
+ $relpath[$i] = preg_replace('/^\//','',$reldir).'/'.$file;
+ $iscoreorexternal[$i] = ($reldir == '/core/boxes/'?'internal':'external');
+ $modules[$i] = $modName;
+ $orders[$i] = $part1; // Set sort criteria value
+
+ $i++;
+ }
+ }
+ closedir($handle);
+ }
+ }
+
+ asort($orders);
+
+ $widget = array();
+ $j = 0;
+
+ // Loop on each widget
+ foreach ($orders as $key => $value)
+ {
+ $modName = $modules[$key];
+ if (empty($modName)) continue;
+
+ if (! class_exists($modName))
+ {
+ print 'Error: A widget file was found but its class "'.$modName.'" was not found.'."\n"; + continue; + } + + $objMod = new $modName($db); + if (is_object($objMod)) + { + // Define disabledbyname and disabledbymodule + $disabledbyname=0; + $module=''; + + // Check if widget file is disabled by name + if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1; + + // We set info of modules + $widget[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic'); + $widget[$j]['file'] = $files[$key]; + $widget[$j]['fullpath'] = $fullpath[$key]; + $widget[$j]['relpath'] = $relpath[$key]; + $widget[$j]['iscoreorexternal'] = $iscoreorexternal[$key]; + //$widget[$j]['version'] = $objMod->getVersion(); + $widget[$j]['status'] = img_picto($langs->trans("Active"),'tick'); + if ($disabledbyname > 0 || $disabledbymodule > 1) $widget[$j]['status'] = ''; + + $text =''.$langs->trans("Description").':
'; + $text.=$objMod->boxlabel.'
'; + $text.='
'.$langs->trans("Status").':
'; + if ($disabledbymodule == 2) $text.=$langs->trans("HooksDisabledAsModuleDisabled",$module).'
'; + + $widget[$j]['info'] = $text; + } + $j++; + } + return $widget; + } + + } diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 00394b0e03f80..1961cbb7af636 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -318,34 +318,6 @@ function get_substitutionarray_other($outputlangs) return $array_other; } - - - - /** - * Define array with couple subtitution key => subtitution value - * - * @param Object $object Dolibarr Object - * @param Translate $outputlangs Language object for output - * @param boolean $recursive Want to fetch child array or child object - * @return array Array of substitution key->code - */ - function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) { - $array_other = array(); - if(!empty($object)) { - foreach($object as $key => $value) { - if(!empty($value)) { - if(!is_array($value) && !is_object($value)) { - $array_other['object_'.$key] = $value; - } - if(is_array($value) && $recursive){ - $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false); - } - } - } - } - return $array_other; - } - /** @@ -410,10 +382,19 @@ function get_substitutionarray_object($object,$outputlangs,$array_key='object') $array_key.'_total_ttc'=>price2num($object->total_ttc), $array_key.'_total_discount_ht' => price2num($object->getTotalDiscount()), + $array_key.'_multicurrency_code' => price2num($object->multicurrency_code), + $array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx), + $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht), + $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva), + $array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc), + $array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs), + $array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs), + $array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs), + $array_key.'_note_private'=>$object->note, $array_key.'_note_public'=>$object->note_public, $array_key.'_note'=>$object->note_public, // For backward compatibility - + // Payments $array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs), $array_key.'_already_payed'=>price2num($sumpayed), @@ -421,10 +402,10 @@ function get_substitutionarray_object($object,$outputlangs,$array_key='object') $array_key.'_already_deposit'=>price2num($sumdeposit), $array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs), $array_key.'_already_creditnote'=>price2num($sumcreditnote), - + $array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs), - $array_key.'already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'), - + $array_key.'_already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'), + // Remain to pay with all know infrmation (except open direct debit requests) $array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs), $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT') @@ -493,6 +474,16 @@ function get_substitutionarray_lines($line,$outputlangs) 'line_date_end'=>dol_print_date($line->date_end, 'day', 'tzuser'), 'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzuser', $outputlangs), 'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc', 'tzuser'), + + 'line_multicurrency_code' => price2num($line->multicurrency_code), + 'line_multicurrency_subprice' => price2num($line->multicurrency_subprice), + 'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht), + 'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva), + 'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc), + 'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs), + 'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs), + 'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs), + 'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs), ); // Retrieve extrafields @@ -601,6 +592,33 @@ function get_substitutionarray_shipment_lines($line,$outputlangs) ); } + + /** + * Define array with couple subtitution key => subtitution value + * + * @param Object $object Dolibarr Object + * @param Translate $outputlangs Language object for output + * @param boolean $recursive Want to fetch child array or child object + * @return array Array of substitution key->code + */ + function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) { + $array_other = array(); + if(!empty($object)) { + foreach($object as $key => $value) { + if(!empty($value)) { + if(!is_array($value) && !is_object($value)) { + $array_other['object_'.$key] = $value; + } + if(is_array($value) && $recursive){ + $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false); + } + } + } + } + return $array_other; + } + + /** * Fill array with couple extrafield key => extrafield value * diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1339512b3af7f..f0146b2cb03c5 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -600,47 +600,63 @@ function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger $datecreate = dol_now(); - $this->db->begin(); + // Socpeople must have already been added by some a trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error + $TListeContacts=$this->liste_contact(-1, $source); + $already_added=false; + if(!empty($TListeContacts)) { + foreach($TListeContacts as $array_contact) { + if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) { + $already_added=true; + break; + } + } + } - // Insertion dans la base - $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact"; - $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) "; - $sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ; - $sql.= "'".$this->db->idate($datecreate)."'"; - $sql.= ", 4, ". $id_type_contact; - $sql.= ")"; + if(!$already_added) { - $resql=$this->db->query($sql); - if ($resql) - { - if (! $notrigger) - { - $result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user); - if ($result < 0) + $this->db->begin(); + + // Insertion dans la base + $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact"; + $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) "; + $sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ; + $sql.= "'".$this->db->idate($datecreate)."'"; + $sql.= ", 4, ". $id_type_contact; + $sql.= ")"; + + $resql=$this->db->query($sql); + if ($resql) + { + if (! $notrigger) + { + $result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user); + if ($result < 0) + { + $this->db->rollback(); + return -1; + } + } + + $this->db->commit(); + return 1; + } + else + { + if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') + { + $this->error=$this->db->errno(); + $this->db->rollback(); + echo 'err rollback'; + return -2; + } + else { + $this->error=$this->db->error(); $this->db->rollback(); return -1; } - } - - $this->db->commit(); - return 1; - } - else - { - if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') - { - $this->error=$this->db->errno(); - $this->db->rollback(); - return -2; - } - else - { - $this->error=$this->db->error(); - $this->db->rollback(); - return -1; - } - } + } + } else return 0; } /** @@ -4153,6 +4169,9 @@ function fetch_optionals($rowid=null,$optionsArray=null) $optionsArray = $extrafields->attributes[$this->table_element]['label']; } + $table_element = $this->table_element; + if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility + // Request to get complementary values if (count($optionsArray) > 0) { @@ -4164,7 +4183,7 @@ function fetch_optionals($rowid=null,$optionsArray=null) $sql.= ", ".$name; } } - $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields"; + $sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields"; $sql.= " WHERE fk_object = ".$rowid; dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG); @@ -4210,7 +4229,10 @@ function deleteExtraFields() { $this->db->begin(); - $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; + $table_element = $this->table_element; + if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility + + $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id; dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG); $resql=$this->db->query($sql_del); if (! $resql) @@ -4316,11 +4338,14 @@ function insertExtraFields() } $this->db->begin(); - $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; + $table_element = $this->table_element; + if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility + + $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id; dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG); $this->db->query($sql_del); - $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object"; foreach($new_array_options as $key => $value) { $attributeKey = substr($key,8); // Remove 'options_' prefix @@ -4630,18 +4655,17 @@ public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, /** * Get buy price to use for margin calculation. This function is called when buy price is unknown. - * set buy price = sell price if ForceBuyingPriceIfNull configured, + * Set buy price = sell price if ForceBuyingPriceIfNull configured, * else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice * else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice * else set min buy price as buy price * - * @param float $unitPrice product unit price - * @param float $discountPercent line discount percent - * @param int $fk_product product id - * - * @return float <0 if ko, buyprice if ok + * @param float $unitPrice Product unit price + * @param float $discountPercent Line discount percent + * @param int $fk_product Product id + * @return float <0 if KO, buyprice if OK */ - public function defineBuyPrice($unitPrice = 0, $discountPercent = 0, $fk_product = 0) + public function defineBuyPrice($unitPrice = 0.0, $discountPercent = 0.0, $fk_product = 0) { global $conf; @@ -4710,17 +4734,7 @@ public function defineBuyPrice($unitPrice = 0, $discountPercent = 0, $fk_product return $buyPrice; } - /** - * Function test if type is date - * - * @param array $info content informations of field - * @return bool - */ - protected function isDate($info) - { - if(isset($info['type']) && $info['type']=='date') return true; - else return false; - } + /** * Function test if type is array @@ -4754,13 +4768,26 @@ protected function isNull($info) else return false; } + + /** + * Function test if type is date + * + * @param array $info content informations of field + * @return bool + */ + public function isDate($info) + { + if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true; + else return false; + } + /** * Function test if type is integer * * @param array $info content informations of field * @return bool */ - protected function isInt($info) + public function isInt($info) { if(is_array($info)) { @@ -4776,11 +4803,11 @@ protected function isInt($info) * @param array $info content informations of field * @return bool */ - protected function isFloat($info) + public function isFloat($info) { if(is_array($info)) { - if(isset($info['type']) && $info['type']=='float') return true; + if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true; else return false; } else return false; @@ -4792,7 +4819,7 @@ protected function isFloat($info) * @param array $info content informations of field * @return bool */ - protected function isText($info) + public function isText($info) { if(is_array($info)) { @@ -4819,169 +4846,272 @@ protected function isIndex($info) } /** - * Function to prepare the values to insert + * Function to prepare the values to insert. + * Note $this->${field} are set by the page that make the createCommon or the updateCommon. * * @return array */ private function set_save_query() { - $query=array(); - foreach ($this->fields as $field=>$info) + global $conf; + + $queryarray=array(); + foreach ($this->fields as $field=>$info) // Loop on definition of fields { + // Depending on field type ('datetime', ...) if($this->isDate($info)) { if(empty($this->{$field})) { - $query[$field] = NULL; + $queryarray[$field] = NULL; } else { - $query[$field] = $this->db->idate($this->{$field}); + $queryarray[$field] = $this->db->idate($this->{$field}); } } else if($this->isArray($info)) { - $query[$field] = serialize($this->{$field}); + $queryarray[$field] = serialize($this->{$field}); } else if($this->isInt($info)) { - $query[$field] = (int) price2num($this->{$field}); + if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity; + else + { + $queryarray[$field] = (int) price2num($this->{$field}); + if (empty($queryarray[$field])) $queryarray[$field]=0; // May be rest to null later if property 'nullifempty' is on for this field. + } } else if($this->isFloat($info)) { - $query[$field] = (double) price2num($this->{$field}); - } - elseif($this->isNull($info)) - { - $query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field}); + $queryarray[$field] = (double) price2num($this->{$field}); + if (empty($queryarray[$field])) $queryarray[$field]=0; } else { - $query[$field] = $this->{$field}; + $queryarray[$field] = $this->{$field}; } + + if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]); + if (! empty($info['nullifempty']) && empty($queryarray[$field])) $queryarray[$field] = null; } - return $query; + return $queryarray; } + /** + * Function to load data into current object this + * + * @param stdClass $obj Contain data of object from database + */ + private function setVarsFromFetchObj(&$obj) + { + foreach ($this->fields as $field => $info) + { + if($this->isDate($info)) + { + if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0; + else $this->{$field} = strtotime($obj->{$field}); + } + elseif($this->isArray($info)) + { + $this->{$field} = @unserialize($obj->{$field}); + // Hack for data not in UTF8 + if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field})); + } + elseif($this->isInt($info)) + { + if ($field == 'rowid') $this->id = (int) $obj->{$field}; + else $this->{$field} = (int) $obj->{$field}; + } + elseif($this->isFloat($info)) + { + $this->{$field} = (double) $obj->{$field}; + } + elseif($this->isNull($info)) + { + $val = $obj->{$field}; + // zero is not null + $this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val); + } + else + { + $this->{$field} = $obj->{$field}; + } + + } + } + + /** + * Function to concat keys of fields + * + * @return string + */ + private function get_field_list() + { + $keys = array_keys($this->fields); + return implode(',', $keys); + } + + /** + * Add quote to field value if necessary + * + * @param string|int $value Value to protect + * @param array $fieldsentry Properties of field + * @return string + */ + protected function quote($value, $fieldsentry) { + if (is_null($value)) return 'NULL'; + else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value"); + else return "'".$this->db->escape($value)."'"; + } + + /** * Create object into database * * @param User $user User that creates * @param bool $notrigger false=launch triggers after, true=disable triggers - * - * @return int <0 if KO, Id of created object if OK + * @return int <0 if KO, Id of created object if OK */ public function createCommon(User $user, $notrigger = false) { + $error = 0; - $fields = array_merge(array('datec'=>$this->db->idate(dol_now())), $this->set_save_query()); + $now=dol_now(); - foreach ($fields as $k => $v) { + $fieldvalues = $this->set_save_query(); + if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now); + if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id; + unset($fieldvalues['rowid']); // We suppose the field rowid is reserved field for autoincrement field. + $keys=array(); + $values = array(); + foreach ($fieldvalues as $k => $v) { $keys[] = $k; - $values[] = $this->quote($v); - + $values[] = $this->quote($v, $this->fields[$k]); } - $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.' - ( '.implode( ",", $keys ).' ) - VALUES ( '.implode( ",", $values ).' ) '; - $res = $this->db->query( $sql ); - if($res===false) { - return false; + $this->db->begin(); + + if (! $error) + { + $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element; + $sql.= ' ('.implode( ", ", $keys ).')'; + $sql.= ' VALUES ('.implode( ", ", $values ).')'; + + $res = $this->db->query( $sql ); + if ($res===false) { + $error++; + $this->errors[] = $this->db->lasterror(); + } } - // TODO Add triggers + if (! $error && ! $notrigger) { + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element); - return true; + if (!$notrigger) { + // Call triggers + $result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } + } + // Commit or rollback + if ($error) { + $this->db->rollback(); + return -1; + } else { + $this->db->commit(); + return $this->id; + } } /** - * Function to load data into current object this + * Load an object from its id and create a new one in database * - * @param stdClass $obj Contain data of object from database + * @param User $user User that creates + * @param int $fromid Id of object to clone + * @return int New id of clone */ - private function set_vars_by_db(&$obj) + public function createFromCloneCommon(User $user, $fromid) { - foreach ($this->fields as $field => $info) - { - if($this->isDate($info)) - { - if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0; - else $this->{$field} = strtotime($obj->{$field}); - } - elseif($this->isArray($info)) - { - $this->{$field} = @unserialize($obj->{$field}); - // Hack for data not in UTF8 - if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field})); - } - elseif($this->isInt($info)) - { - $this->{$field} = (int) $obj->{$field}; - } - elseif($this->isFloat($info)) - { - $this->{$field} = (double) $obj->{$field}; - } - elseif($this->isNull($info)) - { - $val = $obj->{$field}; - // zero is not null - $this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val); - } - else - { - $this->{$field} = $obj->{$field}; - } + global $user, $langs; - } - } + $error = 0; - /** - * Function to concat keys of fields - * - * @return string - */ - private function get_field_list() - { - $keys = array_keys($this->fields); - return implode(',', $keys); + dol_syslog(__METHOD__, LOG_DEBUG); + + $object = new self($this->db); + + $this->db->begin(); + + // Load source object + $object->fetchCommon($fromid); + // Reset some properties + unset($object->id); + unset($object->fk_user_creat); + unset($object->import_key); + + // Clear fields + $object->ref = "copy_of_".$object->ref; + $object->title = $langs->trans("CopyOf")." ".$object->title; + // ... + + // Create clone + $result = $object->createCommon($user); + + // Other options + if ($result < 0) { + $error++; + $this->error = $object->error; + $this->errors = $object->errors; + dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR); + } + + // End + if (!$error) { + $this->db->commit(); + return $object->id; + } else { + $this->db->rollback(); + return -1; + } } /** * Load object in memory from the database * - * @param int $id Id object - * @param string $ref Ref - * - * @return int <0 if KO, 0 if not found, >0 if OK + * @param int $id Id object + * @param string $ref Ref + * @return int <0 if KO, 0 if not found, >0 if OK */ public function fetchCommon($id, $ref = null) { - if (empty($id) && empty($ref)) return false; - $sql = 'SELECT '.$this->get_field_list().', datec, tms'; + $sql = 'SELECT '.$this->get_field_list(); $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element; if(!empty($id)) $sql.= ' WHERE rowid = '.$id; - else $sql.= ' WHERE ref = \''.$this->quote($ref).'\''; + else $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']); $res = $this->db->query($sql); if ($res) { if ($obj = $this->db->fetch_object($res)) { - $this->id = $id; - $this->set_vars_by_db($obj); - - $this->datec = $this->db->idate($obj->datec); - $this->tms = $this->db->idate($obj->tms); - - return $this->id; + if ($obj) + { + $this->setVarsFromFetchObj($obj); + return $this->id; + } + else + { + return 0; + } } else { @@ -5003,78 +5133,114 @@ public function fetchCommon($id, $ref = null) * * @param User $user User that modifies * @param bool $notrigger false=launch triggers after, true=disable triggers - * - * @return int <0 if KO, >0 if OK + * @return int <0 if KO, >0 if OK */ public function updateCommon(User $user, $notrigger = false) { - $fields = $this->set_save_query(); + $error = 0; - foreach ($fields as $k => $v) { + $fieldvalues = $this->set_save_query(); + unset($fieldvalues['rowid']); // We don't update this field, it is the key to define which record to update. + foreach ($fieldvalues as $k => $v) { if (is_array($key)){ $i=array_search($k, $key); if ( $i !== false) { - $where[] = $key[$i].'=' . $this->quote( $v ) ; + $where[] = $key[$i].'=' . $this->quote($v, $this->fields[$k]); continue; } } else { if ( $k == $key) { - $where[] = $k.'=' .$this->quote( $v ) ; + $where[] = $k.'=' .$this->quote($v, $this->fields[$k]); continue; } } - - $tmp[] = $k.'='.$this->quote($v); + $tmp[] = $k.'='.$this->quote($v, $this->fields[$k]); } $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ; - $res = $this->db->query( $sql ); - if($res===false) { - //error - return false; + $this->db->begin(); + if (! $error) + { + $res = $this->db->query($sql); + if ($res===false) + { + $error++; + $this->errors[] = $this->db->lasterror(); + } } - // TODO Add triggers + if (! $error && ! $notrigger) { + // Call triggers + $result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user); + if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail + // End call triggers + } - return true; + // Commit or rollback + if ($error) { + $this->db->rollback(); + return -1; + } else { + $this->db->commit(); + return $this->id; + } } /** * Delete object in database * - * @param User $user User that deletes - * @param bool $notrigger false=launch triggers after, true=disable triggers - * - * @return int <0 if KO, >0 if OK + * @param User $user User that deletes + * @param bool $notrigger false=launch triggers after, true=disable triggers + * @return int <0 if KO, >0 if OK */ public function deleteCommon(User $user, $notrigger = false) { - $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id; + $error=0; - $res = $this->db->query( $sql ); - if($res===false) { - return false; - } + $this->db->begin(); - // TODO Add triggers + if (! $error) { + if (! $notrigger) { + // Call triggers + $result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user); + if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail + // End call triggers + } + } - return true; + if (! $error) + { + $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id; + + $res = $this->db->query($sql); + if($res===false) { + $error++; + $this->errors[] = $this->db->lasterror(); + } + } + + // Commit or rollback + if ($error) { + $this->db->rollback(); + return -1; + } else { + $this->db->commit(); + return 1; + } } /** - * Add quote to field value if necessary + * Initialise object with example values + * Id must be 0 if object instance is a specimen * - * @param string|int $value value to protect - * @return string|int + * @return void */ - protected function quote($value) { - - if(is_null($value)) return 'NULL'; - else if(is_numeric($value)) return $value; - else return "'".$this->db->escape( $value )."'"; + public function initAsSpecimenCommon() + { + $this->id = 0; + // TODO... } } - diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index a7e404383ea04..eaf72ffff7116 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -52,13 +52,13 @@ class DolEditor * @param string $content Content of WYSIWIG field * @param int $width Width in pixel of edit area (auto by default) * @param int $height Height in pixel of edit area (200px by default) - * @param string $toolbarname Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly') + * @param string $toolbarname Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly', 'ace'). * @param string $toolbarlocation Where bar is stored : * 'In' each window has its own toolbar * 'Out:name' share toolbar into the div called 'name' * @param boolean $toolbarstartexpanded Bar is visible or not at start * @param int $uselocalbrowser Enabled to add links to local object with local browser. If false, only external images can be added in content. - * @param int $okforextendededitor True=Allow usage of extended editor tool (like fckeditor) + * @param boolean|string $okforextendededitor True=Allow usage of extended editor tool if qualified (like fckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace. * @param int $rows Size of rows for textarea tool * @param string $cols Size of cols for textarea tool (textarea number of cols '70' or percent 'x%') * @param int $readonly 0=Read/Edit, 1=Read only @@ -80,8 +80,9 @@ function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basi $this->readonly=$readonly; // Check if extended editor is ok. If not we force textarea - if (empty($conf->fckeditor->enabled) || ! $okforextendededitor) $this->tool = 'textarea'; - if ($conf->dol_use_jmobile) $this->tool = 'textarea'; // TODO ckeditor ko with jmobile + if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea'; + if ($okforextendededitor === 'ace') $this->tool='ace'; + //if ($conf->dol_use_jmobile) $this->tool = 'textarea'; // ckeditor and ace seems ok with mobile // Define content and some properties if ($this->tool == 'ckeditor') @@ -100,7 +101,7 @@ function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basi $this->editor->Height = $height; if (! empty($width)) $this->editor->Width = $width; $this->editor->ToolbarSet = $shorttoolbarname; // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js - $this->editor->Config['AutoDetectLanguage'] = 'true'; + $this->editor->Config['AutoDetectLanguage'] = 'true'; // Language of user (browser) $this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In'; $this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded; @@ -122,7 +123,7 @@ function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basi } // Define some properties - if (in_array($this->tool,array('textarea','ckeditor'))) + if (in_array($this->tool,array('textarea','ckeditor','ace'))) { $this->content = $content; $this->htmlname = $htmlname; @@ -141,11 +142,13 @@ function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basi * Output depends on this->tool (fckeditor, ckeditor, textarea, ...) * * @param int $noprint 1=Return HTML string instead of printing it to output - * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });" - * @param boolean $disallowAnyContent Disallow to use any content. true=restrict to a predefined list of allowed elements. + * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only. + * @param boolean $disallowAnyContent Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only. + * @param string $titlecontent Show title content before editor area. Used by ACE editor only. + * @param string $option For ACE editor, set the source language ('html', 'php', 'javascript', ...) * @return void|string */ - function Create($noprint=0,$morejs='',$disallowAnyContent=true) + function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='') { global $conf,$langs; @@ -160,7 +163,7 @@ function Create($noprint=0,$morejs='',$disallowAnyContent=true) if ($this->tool == 'fckeditor') // not used anymore { - $found=1; + $found=1; $this->editor->Create(); } if (in_array($this->tool,array('textarea','ckeditor'))) @@ -196,7 +199,7 @@ function Create($noprint=0,$morejs='',$disallowAnyContent=true) htmlEncodeOutput :'.$htmlencode_force.', allowedContent :'.($disallowAnyContent?'false':'true').', extraAllowedContent : \'\', - fullPage : '.($fullpage?'true':'false').', + fullPage : '.($fullpage?'true':'false').', toolbar: \''.$this->toolbarname.'\', toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').', width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').', @@ -242,11 +245,84 @@ function Create($noprint=0,$morejs='',$disallowAnyContent=true) filebrowserImageWindowHeight : \'500\''; } $out.= ' })'.$morejs; - $out.= '}); - '; + $out.= '});'."\n"; + $out.= ''."\n"; } } + // Output editor ACE + // Warning: ace.js and ext-statusbar.js must be loaded by the parent page. + if (preg_match('/^ace/', $this->tool)) + { + $found=1; + $format=$option; + + $out.= "\n".''."\n"; + + if ($titlecontent) + { + $out.= ''; + $out.= ''."\n"; + } + + $out.= '
$/'), array('<?php','?>'), $this->content); */
+ $out.= htmlentities($this->content);
+ $out.= '';
+ $out.= '';
+
+ $out.= ''."\n";
+ }
+
if (empty($found))
{
$out.= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4b5f151ec7250..966f3f859c0e4 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -197,6 +197,7 @@ private function create($attrname, $type='varchar', $length=255, $elementtype='m
if ($elementtype == 'contact') $elementtype='socpeople';
$table=$elementtype.'_extrafields';
+ if ($elementtype == 'categorie') $table='categories_extrafields';
if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
{
@@ -280,7 +281,7 @@ private function create($attrname, $type='varchar', $length=255, $elementtype='m
*/
private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0, $ishidden=0, $default='', $computed='')
{
- global $conf;
+ global $conf,$user;
if ($elementtype == 'thirdparty') $elementtype='societe';
if ($elementtype == 'contact') $elementtype='socpeople';
@@ -304,7 +305,27 @@ private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $
$params='';
}
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list, ishidden, fielddefault, fieldcomputed)";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+ $sql.= " name,";
+ $sql.= " label,";
+ $sql.= " type,";
+ $sql.= " pos,";
+ $sql.= " size,";
+ $sql.= " entity,";
+ $sql.= " elementtype,";
+ $sql.= " fieldunique,";
+ $sql.= " fieldrequired,";
+ $sql.= " param,";
+ $sql.= " alwayseditable,";
+ $sql.= " perms,";
+ $sql.= " list,";
+ $sql.= " ishidden,";
+ $sql.= " fielddefault,";
+ $sql.= " fieldcomputed,";
+ $sql.= " fk_user_author,";
+ $sql.= " fk_user_modif,";
+ $sql.= " datec";
+ $sql.= " )";
$sql.= " VALUES('".$attrname."',";
$sql.= " '".$this->db->escape($label)."',";
$sql.= " '".$type."',";
@@ -320,9 +341,12 @@ private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $
$sql.= " ".$list.",";
$sql.= " ".$ishidden.",";
$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
- $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null");
+ $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
+ $sql .= " " . $user->id . ",";
+ $sql .= " " . $user->id . ",";
+ $sql .= "'" . $this->db->idate(dol_now()) . "'";
$sql.=')';
-
+
dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
if ($this->db->query($sql))
{
@@ -350,6 +374,7 @@ function delete($attrname, $elementtype='member')
if ($elementtype == 'contact') $elementtype='socpeople';
$table=$elementtype.'_extrafields';
+ if ($elementtype == 'categorie') $table='categories_extrafields';
$error=0;
@@ -460,6 +485,7 @@ function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=
if ($elementtype == 'contact') $elementtype='socpeople';
$table=$elementtype.'_extrafields';
+ if ($elementtype == 'categorie') $table='categories_extrafields';
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
{
@@ -559,7 +585,7 @@ function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=
*/
private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0,$default='',$computed='')
{
- global $conf;
+ global $conf, $user;
dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden.", ".$default.", ".$computed);
// Clean parameters
@@ -600,7 +626,10 @@ private function update_label($attrname,$label,$type,$size,$elementtype,$unique=
$sql.= " list,";
$sql.= " ishidden,";
$sql.= " fielddefault,";
- $sql.= " fieldcomputed";
+ $sql.= " fieldcomputed,";
+ $sql.= " fk_user_author,";
+ $sql.= " fk_user_modif,";
+ $sql.= " datec";
$sql.= ") VALUES (";
$sql.= "'".$attrname."',";
$sql.= " ".$conf->entity.",";
@@ -617,7 +646,10 @@ private function update_label($attrname,$label,$type,$size,$elementtype,$unique=
$sql.= " ".$list.", ";
$sql.= " ".$ishidden.", ";
$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
- $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null");
+ $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
+ $sql .= " " . $user->id . ",";
+ $sql .= " " . $user->id . ",";
+ $sql .= "'" . $this->db->idate(dol_now()) . "'";
$sql.= ")";
$resql2=$this->db->query($sql);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e291277d8e4e9..27115d12eb78b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004 Benoit Mortier '.$morehtmlright.'
';
- if ($previous_ref || $next_ref || $morehtml)
- {
- $ret.='- ';
- }
+ if ($previous_ref || $next_ref || $morehtml)
+ {
+ $ret.='
- '.$morehtml.' '; @@ -5914,7 +5943,7 @@ function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$f { $ret.=dol_htmlentities($object->name); } - else if (in_array($object->element, array('contact', 'user', 'member'))) + else if (in_array($object->element, array('contact', 'user', 'usergroup', 'member'))) { $ret.=dol_htmlentities($object->getFullName($langs)); } @@ -6098,7 +6127,9 @@ static function showphoto($modulepart, $object, $width=100, $height=0, $caneditf */ global $dolibarr_main_url_root; $ret.=''; - $ret.='
- ';
+ }
if ($morehtml)
{
$ret.='
),3).'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,3)).' "'.$email.' Gravatar avatar")
'; // gravatar need md5 hash
+ //$defaultimg=urlencode(dol_buildpath($nophoto,3));
+ $defaultimg='mm';
+ $ret.='),3).'?s='.$width.'&d='.$defaultimg.' "'.$email.' Gravatar avatar")
'; // gravatar need md5 hash
}
else
{
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a5ccb33f08447..040ae1ba96e39 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -314,7 +314,7 @@ function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed
if (preg_match('/massfilesarea_/', $modulepart))
{
- $out.=''."\n";
+
+ // Define $box_max_lines
+ $box_max_lines=5;
+ if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+
+ $ii=0;
+ foreach ($boxactivated as $key => $box)
+ {
+ if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+ if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1)); // When box_order was not yet set to Axx or Bxx and is still 0
+ if (preg_match('/^A/i',$box->box_order)) // column A
+ {
+ $ii++;
+ //print 'box_id '.$boxactivated[$ii]->box_id.' ';
+ //print 'box_order '.$boxactivated[$ii]->box_order.'
'; + // Show box + $box->loadBox($box_max_lines); + $boxlista.= $box->outputBox(); + } + } + + if (empty($conf->browser->phone)) + { + $emptybox->box_id='A'; + $emptybox->info_box_head=array(); + $emptybox->info_box_contents=array(); + $boxlista.= $emptybox->outputBox(array(),array()); + } + $boxlista.= "
\n";
+ $boxlista.= "\n";
+
+ $boxlistb.= "\n\n";
+ $boxlistb.= ''; + // Show box + $box->loadBox($box_max_lines); + $boxlista.= $box->outputBox(); + } + } + + if (empty($conf->browser->phone)) + { + $emptybox->box_id='A'; + $emptybox->info_box_head=array(); + $emptybox->info_box_contents=array(); + $boxlista.= $emptybox->outputBox(array(),array()); + } + $boxlista.= "
'."\n";
+
+ $ii=0;
+ foreach ($boxactivated as $key => $box)
+ {
+ if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+ if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1)); // When box_order was not yet set to Axx or Bxx and is still 0
+ if (preg_match('/^B/i',$box->box_order)) // colonne B
+ {
+ $ii++;
+ //print 'box_id '.$boxactivated[$ii]->box_id.' ';
+ //print 'box_order '.$boxactivated[$ii]->box_order.'
'; + // Show box + $box->loadBox($box_max_lines); + $boxlistb.= $box->outputBox(); + } + } + + if (empty($conf->browser->phone)) + { + $emptybox->box_id='B'; + $emptybox->info_box_head=array(); + $emptybox->info_box_contents=array(); + $boxlistb.= $emptybox->outputBox(array(),array()); + } + $boxlistb.= "
\n";
+ $boxlistb.= "\n";
+
+ }
+
+ return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
+ }
+
+
+ /**
+ * Return a HTML select list of bank accounts
+ *
+ * @param string $htmlname Name of select zone
+ * @param string $dictionarytable Dictionary table
+ * @param string $keyfield Field for key
+ * @param string $labelfield Label field
+ * @param string $selected Selected value
+ * @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+ * @param string $moreattrib More attributes on HTML select tag
+ * @return void
+ */
+ function select_dictionary($htmlname,$dictionarytable,$keyfield='code',$labelfield='label',$selected='',$useempty=0,$moreattrib='')
+ {
+ global $langs, $conf;
+
+ $langs->load("admin");
+
+ $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
+ $sql.= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
+ $sql.= " ORDER BY ".$labelfield;
+
+ dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $num = $this->db->num_rows($result);
+ $i = 0;
+ if ($num)
+ {
+ print '";
+ }
+ else
+ {
+ print $langs->trans("DictionaryEmpty");
+ }
+ }
+ else {
+ dol_print_error($this->db);
+ }
+ }
+
+}
+
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 625b30e3ac22a..ef64ac8d8e5bd 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -231,7 +231,7 @@ function run_triggers($action,$object,$user,$langs,$conf)
*/
function getTriggersList($forcedirtriggers=null)
{
- global $conf, $langs;
+ global $conf, $langs, $db;
$files = array();
$fullpath = array();
@@ -262,6 +262,8 @@ function getTriggersList($forcedirtriggers=null)
{
if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/',$file,$reg))
{
+ if (preg_match('/\.back$/',$file)) continue;
+
$part1=$reg[1];
$part2=$reg[2];
$part3=$reg[3];
@@ -309,7 +311,7 @@ function getTriggersList($forcedirtriggers=null)
continue;
}
- $objMod = new $modName($this->db);
+ $objMod = new $modName($db);
// Define disabledbyname and disabledbymodule
$disabledbyname=0;
@@ -335,7 +337,7 @@ function getTriggersList($forcedirtriggers=null)
$triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
$triggers[$j]['version'] = $objMod->getVersion();
$triggers[$j]['status'] = img_picto($langs->trans("Active"),'tick');
- if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = " ";
+ if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
$text =''.$langs->trans("Description").':'; + // Show box + $box->loadBox($box_max_lines); + $boxlistb.= $box->outputBox(); + } + } + + if (empty($conf->browser->phone)) + { + $emptybox->box_id='B'; + $emptybox->info_box_head=array(); + $emptybox->info_box_contents=array(); + $boxlistb.= $emptybox->outputBox(array(),array()); + } + $boxlistb.= "
'; $text.=$objMod->getDesc().'
'; diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 137a55172317d..431c5d19eebb6 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -402,7 +402,8 @@ function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$t } /** - * Load entries found from database in this->newmenu array. + * Load entries found from database (and stored into $tabMenu) in $this->newmenu array. + * Warning: Entries in $tabMenu must have child after parent * * @param Menu $newmenu Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy) * @param string $mymainmenu Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"]) @@ -435,10 +436,10 @@ function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_h // We initialize newmenu with first already found menu entries $this->newmenu = $newmenu; - // Now edit this->newmenu->list to add entries found into tabMenu that are childs of mainmenu claimed, using the fk_menu link (old method) + // Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method) $this->recur($tabMenu, $menutopid, 1); - // Now update this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu) + // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu) foreach($tabMenu as $key => $val) { //var_dump($tabMenu); @@ -479,6 +480,10 @@ function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_h } //print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'
'; if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']); + else { + dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING); + //print "Parent menu not found !!
"; + } } } } @@ -494,7 +499,7 @@ function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_h * @param string $myleftmenu Value for left that defined leftmenu * @param int $type_user Looks for menu entry for 0=Internal users, 1=External users * @param string $menu_handler Name of menu_handler used ('auguria', 'eldy'...) - * @param array $tabMenu Array to store new entries found (in most cases, it's empty, but may be alreay filled) + * @param array $tabMenu Array to store new entries found (in most cases, it's empty, but may be alreay filled) * @return int >0 if OK, <0 if KO */ function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu) @@ -610,6 +615,11 @@ function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu $a++; } $this->db->free($resql); + + // Currently $tabMenu is sorted on position. + // If a child have a position lower that its parent, we can make a loop to fix this here, but we prefer to show a warning + // into the leftMenuCharger later to avoid useless operations. + return 1; } else @@ -622,7 +632,7 @@ function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu /** * Complete this->newmenu with menu entry found in $tab * - * @param array $tab Tab array + * @param array $tab Tab array with all menu entries * @param int $pere Id of parent * @param int $level Level * @return void diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index 9fb119fa9e60f..c92558bf1d303 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -221,7 +221,7 @@ class SMTPs var $_debug = false; - // DOL_CHANGE LDR + // @CHANGE LDR var $log = ''; var $_errorsTo = ''; var $_deliveryReceipt = 0; @@ -271,7 +271,7 @@ function setMoreInHeader($_val = '') { $this->_moreinheader = $_val; } - + /** * get trackid * @@ -291,7 +291,7 @@ function getMoreInHeader() { return $this->_moreinheader; } - + /** * Set errors to * @@ -361,7 +361,7 @@ function _server_connect() $host=preg_replace('@tcp://@i','',$host); // Remove prefix $host=preg_replace('@ssl://@i','',$host); // Remove prefix - // DOL_CHANGE LDR + // @CHANGE LDR include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; if ( (! is_ip($host)) && ((gethostbyname($host)) == $host)) @@ -393,7 +393,7 @@ function _server_connect() // This connection attempt failed. else { - // DOL_CHANGE LDR + // @CHANGE LDR if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort(); $this->_setErr($this->errno, $this->errstr); $_retVal = false; @@ -411,7 +411,7 @@ function _server_connect() function _server_authenticate() { global $conf; - + // Send the RFC2554 specified EHLO. // This improvment as provided by 'SirSir' to // accomodate both SMTP AND ESMTP capable servers @@ -462,7 +462,7 @@ function _server_authenticate() { $this->_setErr(126, '"' . $host . '" does not support authenticated connections.'); return $_retVal; - } + } } // Send Authentication to Server // Check for errors along the way @@ -903,7 +903,7 @@ function setReplyTo($_strReplyTo) if ( $_strReplyTo ) $this->_msgReplyTo = $this->_strip_email($_strReplyTo); } - + /** * Retrieves the Address from which mail will be the reply-to * @@ -913,15 +913,15 @@ function setReplyTo($_strReplyTo) function getReplyTo($_part = true) { $_retValue = ''; - + if ( $_part === true ) $_retValue = $this->_msgReplyTo; else $_retValue = $this->_msgReplyTo[$_part]; - + return $_retValue; } - + /** * Inserts given addresses into structured format. * This method takes a list of given addresses, via an array @@ -1093,7 +1093,7 @@ function get_email_list($_which = null) { foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName ) { - if ( $_realName ) // DOL_CHANGE LDR + if ( $_realName ) // @CHANGE LDR { $_realName = '"' . $_realName . '"'; $_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>'; @@ -1217,6 +1217,8 @@ function getSubject() */ function getHeader() { + global $conf; + $_header = 'From: ' . $this->getFrom('org') . "\r\n" . 'To: ' . $this->getTO() . "\r\n"; @@ -1233,13 +1235,13 @@ function getHeader() if ( $this->getBCC() ) $_header .= 'Bcc: ' . $this->getBCC() . "\r\n"; */ - + $host=$this->getHost(); $host=preg_replace('@tcp://@i','',$host); // Remove prefix $host=preg_replace('@ssl://@i','',$host); // Remove prefix $host=dol_getprefix('email'); - + //NOTE: Message-ID should probably contain the username of the user who sent the msg $_header .= 'Subject: ' . $this->getSubject() . "\r\n"; $_header .= 'Date: ' . date("r") . "\r\n"; @@ -1258,7 +1260,7 @@ function getHeader() } if ( $this->getMoreInHeader() ) $_header .= $this->getMoreInHeader(); // Value must include the "\r\n"; - + //$_header .= // 'Read-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n" // 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n"; @@ -1270,7 +1272,7 @@ function getHeader() $_header .= $this->getPriority(); - // DOL_CHANGE LDR + // @CHANGE LDR if ( $this->getDeliveryReceipt() ) $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n"; if ( $this->getErrorsTo() ) @@ -1279,9 +1281,10 @@ function getHeader() $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n"; $_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n"; + $_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n"; $_header .= 'Mime-Version: 1.0' . "\r\n"; - + return $_header; } @@ -1310,17 +1313,17 @@ function setBodyContent($strContent, $strType = 'plain') $strContentAltText = html_entity_decode(strip_tags($strContent)); $strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n")); } - + // Make RFC2045 Compliant //$strContent = rtrim(chunk_split($strContent)); // Function chunck_split seems ko if not used on a base64 content $strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content. - + $this->_msgContent[$strType] = array(); $this->_msgContent[$strType]['mimeType'] = $strMimeType; $this->_msgContent[$strType]['data'] = $strContent; $this->_msgContent[$strType]['dataText'] = $strContentAltText; - + if ( $this->getMD5flag() ) $this->_msgContent[$strType]['md5'] = dol_hash($strContent, 3); //} @@ -1334,7 +1337,7 @@ function setBodyContent($strContent, $strType = 'plain') function getBodyContent() { global $conf; - + // Generate a new Boundary string $this->_setBoundary(); @@ -1382,7 +1385,7 @@ function getBodyContent() $content .= "\r\n"; $content .= "--" . $this->_getBoundary('mixed') . "\r\n"; - + if (key_exists('image', $this->_msgContent)) // If inline image found { $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n"; @@ -1390,7 +1393,7 @@ function getBodyContent() $content .= "--" . $this->_getBoundary('alternative') . "\r\n"; } - + // $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment' @@ -1414,7 +1417,7 @@ function getBodyContent() $content .= "\r\n" . $_data['data'] . "\r\n\r\n"; } } - // DOL_CHANGE LDR + // @CHANGE LDR else if ( $type == 'image' ) { // loop through all images @@ -1450,18 +1453,18 @@ function getBodyContent() $content.= "\r\n"; $content.= "--" . $this->_getBoundary('related') . "\r\n"; } - + if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) // Add plain text message part before html part { $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n"; $content .= "\r\n"; $content .= "--" . $this->_getBoundary('alternative') . "\r\n"; - + $content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n"; $content.= "\r\n". $_content['dataText'] . "\r\n"; $content.= "--" . $this->_getBoundary('alternative') . "\r\n"; - } - + } + $content .= 'Content-Type: ' . $_content['mimeType'] . '; ' // . 'charset="' . $this->getCharSet() . '"'; . 'charset=' . $this->getCharSet() . ''; @@ -1483,7 +1486,7 @@ function getBodyContent() { $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n"; } - + $content .= "\r\n"; } } @@ -1521,7 +1524,7 @@ function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'un } - // DOL_CHANGE LDR + // @CHANGE LDR /** * Image attachments are added to the content array as sub-arrays, @@ -1546,7 +1549,7 @@ function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = ' $this->_msgContent['image'][$strImageName]['md5'] = dol_hash($strContent, 3); } } - // END DOL_CHANGE LDR + // END @CHANGE LDR /** @@ -1740,7 +1743,7 @@ function server_parse($socket, $response) */ function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" ) { - if ($this->_debug) $this->log.=$_strSend; // DOL_CHANGE LDR for log + if ($this->_debug) $this->log.=$_strSend; // @CHANGE LDR for log fputs($this->socket, $_strSend . $CRLF); if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF; diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php index 3a35bfb2cc282..dee63987d453d 100644 --- a/htdocs/core/class/utils.class.php +++ b/htdocs/core/class/utils.class.php @@ -28,10 +28,10 @@ class Utils { var $db; - + var $output; // Used by Cron method to return message var $result; // Used by Cron method to return data - + /** * Constructor * @@ -47,21 +47,21 @@ function __construct($db) * Purge files into directory of data files. * CAN BE A CRON TASK * - * @param string $choice Choice of purge mode ('tempfiles', 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfiles') - * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) + * @param string $choice Choice of purge mode ('tempfiles', 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile') + * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) */ function purgeFiles($choice='tempfilesold') { global $conf, $langs, $dolibarr_main_data_root; - + $langs->load("admin"); - + dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG); require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - + $filesarray=array(); if (empty($choice)) $choice='tempfilesold'; - + if ($choice=='tempfiles' || $choice=='tempfilesold') { // Delete temporary files @@ -78,49 +78,71 @@ function purgeFiles($choice='tempfilesold') } } } - + if ($choice=='allfiles') { - // Delete all files + // Delete all files (except install.lock) if ($dolibarr_main_data_root) { $filesarray=dol_dir_list($dolibarr_main_data_root,"all",0,'','install\.lock$'); } } - + if ($choice=='logfile') { - // Define filelog to discard it from purge + // Define files log + if ($dolibarr_main_data_root) + { + $filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*$', 'install\.lock$'); + } + $filelog=''; if (! empty($conf->syslog->enabled)) { $filelog=$conf->global->SYSLOG_FILE; $filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog); - } - $filesarray[]=array('fullname'=>$filelog,'type'=>'file'); + $alreadyincluded=false; + foreach ($filesarray as $tmpcursor) + { + if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; } + } + if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file'); + } } - + $count=0; + $countdeleted=0; + $counterror=0; if (count($filesarray)) { foreach($filesarray as $key => $value) { - //print "x ".$filesarray[$key]['fullname']."
\n"; + //print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."
\n"; if ($filesarray[$key]['type'] == 'dir') { - $count+=dol_delete_dir_recursive($filesarray[$key]['fullname']); + $startcount=0; + $tmpcountdeleted=0; + $result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted); + $count+=$result; + $countdeleted+=$tmpcountdeleted; } elseif ($filesarray[$key]['type'] == 'file') { // If (file that is not logfile) or (if logfile with option logfile) if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile') { - $count+=(dol_delete_file($filesarray[$key]['fullname'])?1:0); + $result=dol_delete_file($filesarray[$key]['fullname'], 1, 1); + if ($result) + { + $count++; + $countdeleted++; + } + else $counterror++; } } } - + // Update cachenbofdoc if (! empty($conf->ecm->enabled) && $choice=='allfiles') { @@ -129,14 +151,18 @@ function purgeFiles($choice='tempfilesold') $result = $ecmdirstatic->refreshcachenboffile(1); } } - - if ($count > 0) $this->output=$langs->trans("PurgeNDirectoriesDeleted", $count); - else $this->output=$langs->trans("PurgeNothingToDelete"); + + if ($count > 0) + { + $this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted); + if ($count > $countdeleted) $this->output.='
'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted)); + } + else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':''); //return $count; return 0; // This function can be called by cron so must return 0 if OK } - + /** * Make a backup of database @@ -147,16 +173,16 @@ function purgeFiles($choice='tempfilesold') * @param int $usedefault 1=Use default backup profile (Set this to 1 when used as cron) * @param string $file 'auto' or filename to build * @param int $keeplastnfiles Keep only last n files (not used yet) - * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) + * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) */ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0) { global $db, $conf, $langs, $dolibarr_main_data_root; global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass; - + $langs->load("admin"); - + dol_syslog("Utils::dumpDatabase type=".$type." compression=".$compression." file=".$file, LOG_DEBUG); require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -190,14 +216,14 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a $outputdir = $conf->admin->dir_output.'/backup'; $result=dol_mkdir($outputdir); - + // MYSQL if ($type == 'mysql' || $type == 'mysqli') { $cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP; - - + + $outputfile = $outputdir.'/'.$file; // for compression format, we add extension $compression=$compression ? $compression : 'none'; @@ -205,11 +231,11 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a if ($compression == 'bz') $outputfile.='.bz2'; $outputerror = $outputfile.'.err'; dol_mkdir($conf->admin->dir_output.'/backup'); - + // Parameteres execution $command=$cmddump; if (preg_match("/\s/",$command)) $command=escapeshellarg($command); // Use quotes on command - + //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass); $param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host; $param.=" -u ".$dolibarr_main_db_user; @@ -250,16 +276,16 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a $paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"'; $paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"'; } - + $errormsg=''; - + // Debut appel methode execution $fullcommandcrypted=$command." ".$paramcrypted." 2>&1"; $fullcommandclear=$command." ".$paramclear." 2>&1"; if ($compression == 'none') $handle = fopen($outputfile, 'w'); if ($compression == 'gz') $handle = gzopen($outputfile, 'w'); if ($compression == 'bz') $handle = bzopen($outputfile, 'w'); - + if ($handle) { $ok=0; @@ -277,11 +303,11 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1; } pclose($handlein); - + if ($compression == 'none') fclose($handle); if ($compression == 'gz') gzclose($handle); if ($compression == 'bz') bzclose($handle); - + if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK)); } @@ -291,7 +317,7 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a dol_syslog("Failed to open file ".$outputfile,LOG_ERR); $errormsg=$langs->trans("ErrorFailedToWriteInDir"); } - + // Get errorstring if ($compression == 'none') $handle = fopen($outputfile, 'r'); if ($compression == 'gz') $handle = gzopen($outputfile, 'r'); @@ -320,13 +346,13 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a } } // Fin execution commande - + $this->output = $errormsg; $this->error = $errormsg; $this->result = array("commandbackuplastdone" => $command." ".$paramcrypted, "commandbackuptorun" => ""); //if (empty($this->output)) $this->output=$this->result['commandbackuplastdone']; } - + // MYSQL NO BIN if ($type == 'mysqlnobin') { @@ -338,7 +364,7 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a if ($compression == 'bz') $outputfile.='.bz2'; $outputerror = $outputfile.'.err'; dol_mkdir($conf->admin->dir_output.'/backup'); - + if ($compression == 'gz' or $compression == 'bz') { backup_tables($outputfiletemp); @@ -349,16 +375,16 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a { backup_tables($outputfile); } - + $this->output = ""; $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => ""); } - + // POSTGRESQL if ($type == 'postgresql') { $cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP; - + $outputfile = $outputdir.'/'.$file; // for compression format, we add extension $compression=$compression ? $compression : 'none'; @@ -366,11 +392,11 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a if ($compression == 'bz') $outputfile.='.bz2'; $outputerror = $outputfile.'.err'; dol_mkdir($conf->admin->dir_output.'/backup'); - + // Parameteres execution $command=$cmddump; if (preg_match("/\s/",$command)) $command=escapeshellarg($command); // Use quotes on command - + //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass); //$param="-F c"; $param="-F p"; @@ -419,8 +445,8 @@ function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='a dol_delete_file($val['fullname']); } } - - + + return 0; } } diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 526d43de0ab66..4358e8695feaa 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -735,13 +735,13 @@ function DDLAddField($table,$field_name,$field_desc,$field_position="") { // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment'); - $sql= "ALTER TABLE ".$table." ADD `".$field_name."` "; + $sql= "ALTER TABLE ".$table." ADD ".$field_name." "; $sql.= $field_desc['type']; if(preg_match("/^[^\s]/i",$field_desc['value'])) - if (! in_array($field_desc['type'],array('date','datetime'))) - { - $sql.= "(".$field_desc['value'].")"; - } + if (! in_array($field_desc['type'],array('date','datetime'))) + { + $sql.= "(".$field_desc['value'].")"; + } if(preg_match("/^[^\s]/i",$field_desc['attribute'])) $sql.= " ".$field_desc['attribute']; if(preg_match("/^[^\s]/i",$field_desc['null'])) diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 4aa56b367f3d5..d02ff4a1341ec 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -1048,8 +1048,11 @@ function DDLAddField($table,$field_name,$field_desc,$field_position="") // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment'); $sql= "ALTER TABLE ".$table." ADD ".$field_name." "; $sql .= $field_desc['type']; - if ($field_desc['type'] != 'int' && preg_match("/^[^\s]/i",$field_desc['value'])) - $sql .= "(".$field_desc['value'].")"; + if(preg_match("/^[^\s]/i",$field_desc['value'])) + if (! in_array($field_desc['type'],array('int','date','datetime'))) + { + $sql.= "(".$field_desc['value'].")"; + } if (preg_match("/^[^\s]/i",$field_desc['attribute'])) $sql .= " ".$field_desc['attribute']; if (preg_match("/^[^\s]/i",$field_desc['null'])) diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php index 5c8e76a952220..5523708a3a05f 100644 --- a/htdocs/core/filemanagerdol/connectors/php/commands.php +++ b/htdocs/core/filemanagerdol/connectors/php/commands.php @@ -183,7 +183,7 @@ function CreateFolder( $resourceType, $currentFolder ) echo '
\n"; + if ($result) $countdeleted++; } } } @@ -1148,14 +1170,13 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0,$onlysub=0) if (empty($onlysub)) { - dol_delete_dir($dir,$nophperrors); - $count++; - //echo "removing $dir
\n"; + $result=dol_delete_dir($dir, $nophperrors); + $count++; + if ($result) $countdeleted++; } } } - //echo "return=".$count; return $count; } @@ -1689,7 +1710,7 @@ function dol_uncompress($inputfile,$outputdir) * Compress a directory and subdirectories into a package file. * * @param string $inputdir Source dir name - * @param string $outputfile Target file name + * @param string $outputfile Target file name (output directory must exists and be writable) * @param string $mode 'zip' * @return int <0 if KO, >0 if OK */ @@ -1698,6 +1719,15 @@ function dol_compress_dir($inputdir, $outputfile, $mode="zip") $foundhandler=0; dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode); + + if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile))) + { + global $langs, $errormsg; + $langs->load("errors"); + $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile); + return -3; + } + try { if ($mode == 'gz') { $foundhandler=0; } @@ -1721,7 +1751,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode="zip") // Initialize archive object $zip = new ZipArchive(); - $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE); + $result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE); // Create recursive directory iterator /** @var SplFileInfo[] $files */ @@ -1756,6 +1786,10 @@ function dol_compress_dir($inputdir, $outputfile, $mode="zip") dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR); return -2; } + else + { + return 0; + } } catch (Exception $e) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7babff42118b4..de07281696af4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1,16 +1,16 @@ +/* Copyright (C) 2000-2007 Rodolphe Quiedeville
\n"; @@ -3317,7 +3327,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>'; else $out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>'; - if (empty($thead) && $field) // If this is a sort field + if (empty($thead) && $field && empty($disablesortlink)) // If this is a sort field { $options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam); $options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options); @@ -3338,7 +3348,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m $out.=$langs->trans($name); - if (empty($thead) && $field) // If this is a sort field + if (empty($thead) && $field && empty($disablesortlink)) // If this is a sort field { $out.=''; } @@ -4160,7 +4170,7 @@ function getTaxesFromId($vatrate, $buyer=null, $seller=null, $firstparamisid=1) * @param Societe $buyer Company object * @param Societe $seller Company object * @param int $firstparamisid 1 if first param is id into table (use this if you can) - * @return array array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type1, rate localtax2, accountancycodecust, accountancycodesupp) + * @return array array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp) * @see getTaxesFromId */ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid=0) @@ -4764,22 +4774,57 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8') * Return first line of text. Cut will depends if content is HTML or not. * * @param string $text Input text + * @param int $nboflines Nb of lines to get (default is 1 = first line only) * @return string Output text * @see dol_nboflines_bis, dol_string_nohtmltag, dol_escape_htmltag */ -function dolGetFirstLineOfText($text) +function dolGetFirstLineOfText($text, $nboflines=1) { - if (dol_textishtml($text)) + if ($nboflines == 1) { - $firstline=preg_replace('/
", "\r" => " ", "\0" => " ", "\x0B" => " "); + } + + $text = strtr($text, $repTable); + if ($charset == 'UTF-8') { $pattern = '/(
\n":"\n"); + $i++; + } + unset($a); + return $firstline.(($i < $nba)?'...':''); } - return $firstline.((strlen($firstline) != strlen($text))?'...':''); } @@ -4941,7 +4986,7 @@ function dol_nboflines($s,$maxchar=0) /** - * Return nb of lines of a formated text with \n and
(we can't have both \n and br) + * Return nb of lines of a formated text with \n and
(WARNING: string must not have mixed \n and br separators) * * @param string $text Text * @param int $maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut) @@ -4977,6 +5022,8 @@ function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8') } } } + + unset($a); return $nblines; } diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php old mode 100755 new mode 100644 diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php new file mode 100644 index 0000000000000..1df10e6a9c700 --- /dev/null +++ b/htdocs/core/lib/modulebuilder.lib.php @@ -0,0 +1,211 @@ + + * + * 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
// become
- // 
+ // 
$newfreetext=preg_replace('/(
+ // become
+ // 
+ $nbrep=0;
+ if (! $symlinktomediaexists)
+ {
+ $content=preg_replace('/('; } @@ -541,42 +569,37 @@ function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$ma } // Define $listfields and $listvalues to build SQL request - if ($listfields) { $listfields.=', '; $listvalues.=', '; } - $listfields.=$fieldname; + $listfields[] = $fieldname; // Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert - if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) $listvalues.=($newval=='0'?$newval:"null"); - elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) $listvalues.="''"; - else $listvalues.="'".$this->db->escape($newval)."'"; + if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) $listvalues[] = ($newval=='0'?$newval:"null"); + elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) $listvalues[] = "''"; + else $listvalues[] = "'".$this->db->escape($newval)."'"; } $i++; } // We add hidden fields (but only if there is at least one field to add into table) - if ($listfields && is_array($objimport->array_import_fieldshidden[0])) + if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) { // Loop on each hidden fields to add them into listfields/listvalues foreach($objimport->array_import_fieldshidden[0] as $key => $val) { if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue; // Not a field of current table - if ($listfields) { $listfields.=', '; $listvalues.=', '; } if ($val == 'user->id') { - $listfields.=preg_replace('/^'.preg_quote($alias).'\./','',$key); - $listvalues.=$user->id; + $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key); + $listvalues[] = $user->id; } elseif (preg_match('/^lastrowid-/',$val)) { $tmp=explode('-',$val); $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0; - $listfields.=preg_replace('/^'.preg_quote($alias).'\./','',$key); - $listvalues.=$lastinsertid; + $keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key); + $listfields[] = $keyfield; + $listvalues[] = $lastinsertid; //print $key."-".$val."-".$listfields."-".$listvalues."
";exit; - } else - { - $listfields.=preg_replace('/^'.preg_quote($alias).'\./','',$key); - $listvalues.=$val; - } + } } } //print 'listfields='.$listfields.'
listvalues='.$listvalues.'
'; @@ -584,49 +607,114 @@ function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$ma // If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined if (! $errorforthistable) { - //print "$alias/$tablename/$listfields/$listvalues
"; - if ($listfields) + //print "$alias/$tablename/$listfields/$listvalues
"; + if (!empty($listfields)) { - //var_dump($objimport->array_import_convertvalue); exit; - - // Build SQL request - if (empty($tablewithentity_cache[$tablename])) - { - $sql ='INSERT INTO '.$tablename.'('.$listfields.', import_key'; - if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$objimport->array_import_tables_creator[0][$alias]; - $sql.=') VALUES('.$listvalues.", '".$importid."'"; - } - else - { - $sql ='INSERT INTO '.$tablename.'('.$listfields.', import_key, entity'; - if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$objimport->array_import_tables_creator[0][$alias]; - $sql.=') VALUES('.$listvalues.", '".$importid."', ".$conf->entity ; + $updatedone = false; + $insertdone = false; + if (!empty($updatekeys)) { + // We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields) + if (empty($lastinsertid)) { + $sqlSelect = 'SELECT rowid FROM '.$tablename; + + $data = array_combine($listfields, $listvalues); + $where = array(); + $filters = array(); + foreach ($updatekeys as $key) { + $col = $objimport->array_import_updatekeys[0][$key]; + $key=preg_replace('/^.*\./i','',$key); + $where[] = $key.' = '.$data[$key]; + $filters[] = $col.' = '.$data[$key]; + } + $sqlSelect.= ' WHERE '.implode(' AND ', $where); + + $resql=$this->db->query($sqlSelect); + if($resql) { + $res = $this->db->fetch_object($resql); + if($resql->num_rows == 1) { + $lastinsertid = $res->rowid; + $last_insert_id_array[$tablename] = $lastinsertid; + } else if($resql->num_rows > 1) { + $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', ')); + $this->errors[$error]['type']='SQL'; + $error++; + } else { + // No record found with filters, insert will be tried below + } + } + else + { + //print 'E'; + $this->errors[$error]['lib']=$this->db->lasterror(); + $this->errors[$error]['type']='SQL'; + $error++; + } + } + + if (!empty($lastinsertid)) { + // Build SQL UPDATE request + $sqlstart = 'UPDATE '.$tablename; + + $data = array_combine($listfields, $listvalues); + $set = array(); + foreach ($data as $key => $val) { + $set[] = $key.' = '.$val; + } + $sqlstart.= ' SET '.implode(', ', $set); + + if(empty($keyfield)) $keyfield = 'rowid'; + $sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid; + + $sql = $sqlstart.$sqlend; + + // Run update request + $resql=$this->db->query($sql); + if($resql) { + // No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed + $updatedone = true; + } + else + { + //print 'E'; + $this->errors[$error]['lib']=$this->db->lasterror(); + $this->errors[$error]['type']='SQL'; + $error++; + } + } } - if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$user->id; - $sql.=')'; - - //print($sql).'
'; - dol_syslog("import_csv.modules", LOG_DEBUG); - - //print '> '.join(',',$arrayrecord); - //print 'sql='.$sql; - //print '
'."\n"; - - // Run insert request - if ($sql) - { - $resql=$this->db->query($sql); - $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr). - if ($resql) - { - //print '.'; + + // Update not done, we do insert + if (!$error && !$updatedone) { + // Build SQL INSERT request + $sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key'; + $sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'"; + if (! empty($tablewithentity_cache[$tablename])) { + $sqlstart.= ', entity'; + $sqlend.= ', '.$conf->entity; + } + if (! empty($objimport->array_import_tables_creator[0][$alias])) { + $sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias]; + $sqlend.=', '.$user->id; } - else + $sql = $sqlstart.$sqlend.')'; + dol_syslog("import_xlsx.modules", LOG_DEBUG); + + // Run insert request + if ($sql) { - //print 'E'; - $this->errors[$error]['lib']=$this->db->lasterror(); - $this->errors[$error]['type']='SQL'; - $error++; + $resql=$this->db->query($sql); + if ($resql) + { + $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr). + $insertdone = true; + } + else + { + //print 'E'; + $this->errors[$error]['lib']=$this->db->lasterror(); + $this->errors[$error]['type']='SQL'; + $error++; + } } } } @@ -638,6 +726,9 @@ function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$ma if ($error) break; } + + if($updatedone) $this->nbupdate++; + if($insertdone) $this->nbinsert++; } return 1; diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index af0874b8c3020..cfdd15fcc00d6 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2013-2017 Alexandre Spangaro
'; } $texte.='
';
-
+
if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
{
// Model for creation
@@ -252,7 +252,7 @@ function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidede
if (! is_object($object))
{
$id = $object;
- $object = new Propale($this->db);
+ $object = new Propal($this->db);
$result=$object->fetch($id);
if ($result < 0)
{
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 972a75eecc870..250796dd9d580 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -120,7 +120,7 @@ function __construct($db)
}
$this->posxdiscount=162;
$this->postotalht=174;
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
if ($this->page_largeur < 210) // To work with US executive format
{
@@ -273,7 +273,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
$pdf->SetAutoPageBreak(1,0);
-
+
if (class_exists('TCPDF'))
{
$pdf->setPrintHeader(false);
@@ -292,10 +292,10 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
$pdf->SetDrawColor(128,128,128);
$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
- $pdf->SetSubject($outputlangs->transnoentities("CommercialProposal"));
+ $pdf->SetSubject($outputlangs->transnoentities("PdfCommercialProposalTitle"));
$pdf->SetCreator("Dolibarr ".DOL_VERSION);
$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
- $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialProposal")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+ $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
@@ -322,19 +322,19 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
$pdf->AddPage();
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
$pagenb++;
-
+
$heightforinfotot = 40; // Height reserved to output the info and total part
$heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE)?(pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature"))+10):0;
$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5); // Height reserved to output the free text on last page
$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
- //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
-
+ //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
+
$this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0,0,0);
-
+
$tab_top = 90;
$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
$tab_height = 130;
@@ -383,7 +383,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
$notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
if ($tmpuser->email) $notetoshow.=', Mail: '.$tmpuser->email;
if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
- }
+ }
if ($notetoshow)
{
$tab_top = 88 + $height_incoterms;
@@ -452,7 +452,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
$curX = $this->posxdesc-1;
$showpricebeforepagebreak=1;
-
+
$pdf->startTransaction();
pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
$pageposafter=$pdf->getPage();
@@ -554,14 +554,14 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
else $tvaligne=$object->lines[$i]->total_tva;
-
+
$localtax1ligne=$object->lines[$i]->total_localtax1;
$localtax2ligne=$object->lines[$i]->total_localtax2;
$localtax1_rate=$object->lines[$i]->localtax1_tx;
$localtax2_rate=$object->lines[$i]->localtax2_tx;
$localtax1_type=$object->lines[$i]->localtax1_type;
- $localtax2_type=$object->lines[$i]->localtax2_type;
-
+ $localtax2_type=$object->lines[$i]->localtax2_type;
+
if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
@@ -669,7 +669,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
{
$posy=$this->_signature_area($pdf, $object, $posy, $outputlangs);
}
-
+
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
@@ -1428,7 +1428,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B',$default_font_size + 3);
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
- $title=$outputlangs->transnoentities("CommercialProposal");
+ $title=$outputlangs->transnoentities("PdfCommercialProposalTitle");
$pdf->MultiCell(100, 4, $title, '', 'R');
$pdf->SetFont('','B',$default_font_size);
@@ -1481,7 +1481,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
}
}
-
+
$posy+=2;
// Show list of linked objects
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index fb06c028aeda6..97c7b077b223c 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -28,7 +28,7 @@
/**
* Class to manage customer payment numbering rules Ant
*/
-class mod_supplier_payment_brodator extends ModeleNumRefPayments
+class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $error = '';
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index e7146e2e1fd28..c94ef4296c0eb 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -27,7 +27,7 @@
/**
* Class to manage customer payment numbering rules Cicada
*/
-class mod_supplier_payment_bronan extends ModeleNumRefPayments
+class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='SPAY';
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index d8586777d3042..56c5bd94ae073 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -48,11 +48,11 @@ static function liste_modeles($db,$maxfilenamelength=0)
}
/**
- * \class ModeleNumRefPayments
+ * \class ModeleNumRefSupplierPayments
* \brief Payment numbering references mother class
*/
-abstract class ModeleNumRefPayments
+abstract class ModeleNumRefSupplierPayments
{
var $error='';
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index c5aabf27bf962..a7e8952c604bf 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -108,7 +108,7 @@ function __construct($db)
$this->posxqty=145;
$this->posxdiscount=162;
$this->postotalht=174;
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
if ($this->page_largeur < 210) // To work with US executive format
{
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index 2c5d71c79d5fe..80b928815cb86 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -21,43 +21,45 @@
if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
?>
+
-
-
-
-
-
-
-
-
-
- - \ No newline at end of file +'."\n"; +print '$(document).ready(function() {'."\n"; +print '$("#hide-'.$blocname.'").click(function(){'."\n"; +print ' setShowHide(0);'."\n"; +print ' $("#'.$blocname.'_bloc").hide("blind", {direction: "vertical"}, 300).removeClass("nohideobject");'."\n"; +print ' $(this).hide();'."\n"; +print ' $("#show-'.$blocname.'").show();'."\n"; +print '});'."\n"; + +print '$("#show-'.$blocname.'").click(function(){'."\n"; +print ' setShowHide(1);'."\n"; +print ' $("#'.$blocname.'").show("blind", {direction: "vertical"}, 300).addClass("nohideobject");'."\n"; +print ' $(this).hide();'."\n"; +print ' $("#hide-'.$blocname.'").show();'."\n"; +print '});'."\n"; + +print 'function setShowHide(status) {'."\n"; +print ' var id = '.$object->id.";\n"; +print " var element = '".$object->element."';\n"; +print " var htmlelement = '".$blocname."';\n"; +print ' var type = "showhide";'."\n"; +print ' $.get("'.dol_buildpath('/core/ajax/extraparams.php', 1); +print '?id="+id+"&element="+element+"&htmlelement="+htmlelement+"&type="+type+"&value="+status);'."\n"; +print '}'."\n"; + +print '});'."\n"; +print ''."\n"; + +print ''."\n"; +print ''."\n"; +print '
'; +?> + diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php index 2538e052ae43e..87071e9420331 100644 --- a/htdocs/core/tpl/notes.tpl.php +++ b/htdocs/core/tpl/notes.tpl.php @@ -1,7 +1,7 @@ - * Copyright (C) 2013 Florian Henry
- * Copyright (C) 2014 Laurent Destailleur
+/* Copyright (C) 2012 Regis Houssin
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2014-2017 Laurent Destailleur
*
* 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
@@ -17,9 +17,10 @@
* along with this program. If not, see
- * Copyright (C) 2014 Marcos García
+/* Copyright (C) 2010 Regis Houssin
+ * Copyright (C) 2011-2017 Laurent Destailleur
+ * Copyright (C) 2014 Marcos García
*
* 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
@@ -55,7 +55,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
// Proposals to order
if ($action == 'PROPAL_CLOSE_SIGNED')
{
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
{
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -74,7 +74,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
// Order to invoice
if ($action == 'ORDER_CLOSE')
{
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE))
{
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -90,77 +90,116 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
}
}
+
+
// Order classify billed proposal
if ($action == 'ORDER_CLASSIFY_BILLED')
{
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
if (! empty($conf->propal->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
{
$object->fetchObjectLinked('','propal',$object->id,$object->element);
if (! empty($object->linkedObjects))
{
+ $totalonlinkedelements=0;
foreach($object->linkedObjects['propal'] as $element)
{
- $ret=$element->classifyBilled($user);
+ if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+ }
+ dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+ if ($totalonlinkedelements == $object->total_ht)
+ {
+ foreach($object->linkedObjects['propal'] as $element)
+ {
+ $ret=$element->classifyBilled($user);
+ }
}
}
return $ret;
}
}
- // Invoice classify billed order
- if ($action == 'BILL_PAYED')
+ // classify billed order
+ if ($action == 'BILL_VALIDATE')
{
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
- if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER))
+ if (! empty($conf->propal->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
{
- $object->fetchObjectLinked('','commande',$object->id,$object->element);
+ $object->fetchObjectLinked('','propal',$object->id,$object->element);
if (! empty($object->linkedObjects))
{
- foreach($object->linkedObjects['commande'] as $element)
- {
- $ret=$element->classifyBilled($user);
- }
+ $totalonlinkedelements=0;
+ foreach($object->linkedObjects['propal'] as $element)
+ {
+ if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+ }
+ dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+ if ($totalonlinkedelements == $object->total_ht)
+ {
+ foreach($object->linkedObjects['propal'] as $element)
+ {
+ $ret=$element->classifyBilled($user);
+ }
+ }
}
return $ret;
}
- }
-
- // classify billed order
- if ($action == 'BILL_VALIDATE')
- {
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
{
$object->fetchObjectLinked('','commande',$object->id,$object->element);
if (! empty($object->linkedObjects))
{
- foreach($object->linkedObjects['commande'] as $element)
- {
- $ret=$element->classifyBilled($user);
- }
+ $totalonlinkedelements=0;
+ foreach($object->linkedObjects['commande'] as $element)
+ {
+ if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+ }
+ dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+ if ($totalonlinkedelements == $object->total_ht)
+ {
+ foreach($object->linkedObjects['commande'] as $element)
+ {
+ $ret=$element->classifyBilled($user);
+ }
+ }
}
return $ret;
}
+ }
- if (! empty($conf->propal->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
- {
- $object->fetchObjectLinked('','propal',$object->id,$object->element);
- if (! empty($object->linkedObjects))
- {
- foreach($object->linkedObjects['propal'] as $element)
- {
- $ret=$element->classifyBilled($user);
- }
- }
- return $ret;
- }
+ // Invoice classify billed order
+ if ($action == 'BILL_PAYED')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
+
+ if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER))
+ {
+ $object->fetchObjectLinked('','commande',$object->id,$object->element);
+ if (! empty($object->linkedObjects))
+ {
+ $totalonlinkedelements=0;
+ foreach($object->linkedObjects['commande'] as $element)
+ {
+ if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+ }
+ dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+ if ($totalonlinkedelements == $object->total_ht)
+ {
+ foreach($object->linkedObjects['commande'] as $element)
+ {
+ $ret=$element->classifyBilled($user);
+ }
+ }
+ }
+ return $ret;
+ }
}
- if ($action=='SHIPPING_VALIDATE') {
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ if ($action=='SHIPPING_VALIDATE')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
if (! empty($conf->commande->enabled) && ! empty($conf->expedition->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 1160fb2625d9b..751a5fa13610f 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -62,10 +62,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
*/
public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
{
- // Module not active, we do nothing
- if (empty($conf->agenda->enabled)) {
- return 0;
- }
+ if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
@@ -651,25 +648,25 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
$langs->load("agenda");
$langs->load("other");
$langs->load("projects");
-
+
if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
$object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
-
+
$object->sendtoid=0;
}
elseif($action == 'PROJECT_MODIFY') {
$langs->load("agenda");
$langs->load("other");
$langs->load("projects");
-
+
if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
$object->actionmsg=$langs->transnoentities("ProjectModifieddInDolibarr",$object->ref);
$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-
+
$object->sendtoid=0;
}
-
+
// Project tasks
elseif($action == 'TASK_CREATE') {
$langs->load("agenda");
@@ -708,18 +705,18 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
}
// TODO Merge all previous cases into this generic one
else {
- // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function)
+ // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function)
$langs->load("agenda");
$langs->load("other");
-
+
if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
$object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
-
+
$object->sendtoid=0;
}
-
+
$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
-
+
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
// Add entry in event table
@@ -783,7 +780,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
$actioncomm->elementtype = $object->element;
$ret=$actioncomm->create($user); // User creating action
-
+
if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
{
if (is_array($object->attachedfiles) && array_key_exists('paths',$object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
@@ -798,9 +795,9 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
}
}
}
-
+
unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode); // When several action are called on same object, we must be sure to not reuse value of first action.
-
+
if ($ret > 0)
{
$_SESSION['LAST_ACTION_CREATED'] = $ret;
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 6759d18ba5d06..39dae7c209e80 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -30,9 +30,9 @@
class InterfaceActionsBlockedLog extends DolibarrTriggers
{
public $family = 'system';
- public $description = "Triggers of this module add blocklog.";
+ public $description = "Triggers of this module add action for BlockedLog module.";
public $version = self::VERSION_DOLIBARR;
- public $picto = 'system';
+ public $picto = 'technic';
/**
* Function called on Dolibarrr payment or invoice event.
@@ -46,10 +46,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
*/
public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
{
- // Do not log events not enabled for this action
- if (empty($conf->blockedlog->enabled)) {
- return 0;
- }
+ if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
|| $action === 'BILL_SENTBYMAIL' || $action === 'DOC_DOWNLOAD' || $action === 'DOC_PREVIEW') {
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index 467cf678c07b1..a0fbe09405c4d 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -31,7 +31,7 @@
*/
class InterfaceMailmanSpipsynchro extends DolibarrTriggers
{
- public $family = 'ldap';
+ public $family = 'mailmanspip';
public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
public $version = self::VERSION_DOLIBARR;
public $picto = 'technic';
@@ -51,12 +51,6 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
{
if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
- if (! function_exists('ldap_connect'))
- {
- dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);
- return 0;
- }
-
if ($action == 'CATEGORY_LINK')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index d55a1a776a030..aaea372ef4a7b 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -65,7 +65,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
$notify = new Notify($this->db);
-
+
if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
deleted file mode 100644
index 5a36bf1069a13..0000000000000
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ /dev/null
@@ -1,275 +0,0 @@
-
- * Copyright (C) 2005-2014 Regis Houssin
- * Copyright (C) 2014 Marcos García
- * Copyright (C) 2015 Bahfir Abbes
- *
- * 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
'.$langs->trans('CronArgs').': '. $obj->params; $texttoshow.='
'.$langs->trans('Comment').': '. $langs->trans($obj->note); } - elseif ($obj->jobtype=='command') + elseif ($obj->jobtype=='command') { $text=$langs->trans('CronCommand'); $texttoshow=$langs->trans('CronCommand').': '.dol_trunc($obj->command); @@ -419,7 +419,7 @@ print '';
if (!empty($obj->maxrun)) {print $obj->maxrun;}
print ' ';
-
+
print '';
if (!empty($obj->nbrun)) {print $obj->nbrun;} else {print '0';}
print ' ';
@@ -468,7 +468,7 @@
print '';
print '
-
-
-
-
-- - \ No newline at end of file +'."\n"; +print '$(document).ready(function() {'."\n"; +print '$("#hide-'.$blocname.'").click(function(){'."\n"; +print ' setShowHide(0);'."\n"; +print ' $("#'.$blocname.'_bloc").hide("blind", {direction: "vertical"}, 300).removeClass("nohideobject");'."\n"; +print ' $(this).hide();'."\n"; +print ' $("#show-'.$blocname.'").show();'."\n"; +print '});'."\n"; + +print '$("#show-'.$blocname.'").click(function(){'."\n"; +print ' setShowHide(1);'."\n"; +print ' $("#'.$blocname.'").show("blind", {direction: "vertical"}, 300).addClass("nohideobject");'."\n"; +print ' $(this).hide();'."\n"; +print ' $("#hide-'.$blocname.'").show();'."\n"; +print '});'."\n"; + +print 'function setShowHide(status) {'."\n"; +print ' var id = '.$object->id.";\n"; +print " var element = '".$object->element."';\n"; +print " var htmlelement = '".$blocname."';\n"; +print ' var type = "showhide";'."\n"; +print ' $.get("'.dol_buildpath('/core/ajax/extraparams.php', 1); +print '?id="+id+"&element="+element+"&htmlelement="+htmlelement+"&type="+type+"&value="+status);'."\n"; +print '}'."\n"; + +print '});'."\n"; +print ''."\n"; + +print ''."\n"; +print ''."\n"; +print '
'.$title.'
'."\n";
+print ''."\n";
+
+include DOL_DOCUMENT_ROOT.'/core/tpl/'.$blocname.'.tpl.php';
+print '
'; +?> + diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php index 2538e052ae43e..87071e9420331 100644 --- a/htdocs/core/tpl/notes.tpl.php +++ b/htdocs/core/tpl/notes.tpl.php @@ -1,7 +1,7 @@ - * Copyright (C) 2013 Florian Henry
'.$langs->trans('CronArgs').': '. $obj->params; $texttoshow.='
'.$langs->trans('Comment').': '. $langs->trans($obj->note); } - elseif ($obj->jobtype=='command') + elseif ($obj->jobtype=='command') { $text=$langs->trans('CronCommand'); $texttoshow=$langs->trans('CronCommand').': '.dol_trunc($obj->command); @@ -419,7 +419,7 @@ print '
'.$langs->trans("AucuneLigne").' |
';
print '';
-
+
print ''."\n";
-
+
print '
';
-
+
print '
'; - + print ''; - + print ''."\n";
-
+
print '
';
print '
';
-
+
dol_fiche_end();
// List of expenses ereport not already paid completely
@@ -304,7 +304,7 @@
print "";
print "| '.$langs->trans("Period").' | '.get_date_range($expensereport->date_debut,$expensereport->date_fin,"",$langs,0).' |
| '.$langs->trans("Amount").' | '.price($expensereport->total_ttc,0,$outputlangs,1,-1,-1,$conf->currency).' |
| '.$langs->trans("RemainderToPay").' | '.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).' |
'; - + print ''; - + print '
| '.$langs->trans("Date").' | '; $datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); $datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaid):0; @@ -248,7 +248,7 @@ $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$expensereport->accountid, "accountid", 0, '',1); // Show open bank account list print ' | |
| '.$langs->trans('Numero'); print ' ('.$langs->trans("ChequeOrTransferNumber").')'; @@ -263,7 +263,7 @@ print ' | ||
| '.$langs->trans("ProductsAndServices").' | '; - print ''.$langs->trans("AllProductServicePrices").' '.$object->nbOfProductRefs().''; - print ' | ||||||||||||||||||||||||||
| '.$langs->trans("ProductsAndServices").' | '; + print ''.$langs->trans("AllProductServicePrices").' '.$object->nbOfProductRefs().''; + print ' | ||||||||||||||||||||||||||
';
- print '
'.$langs->trans("ToOrder").' | '.$langs->trans("OrderDate").' | ';
$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
- print $form->select_date($date_com,'',1,1,'',"commande",1,0,1);
+ print $form->select_date($date_com,'',1,1,'',"commande",1,1,1);
print ' | '.$langs->trans("OrderMode").' | ';
@@ -2756,7 +2756,7 @@
print ' |
'; if (!empty($totalpayment)) $text=$langs->trans('ConfirmSupplierPayment',price($totalpayment),$langs->trans("Currency".$conf->currency)); - if (!empty($multicurrency_totalpayment)) + if (!empty($multicurrency_totalpayment)) { $text.=' '.$langs->trans('ConfirmSupplierPayment',price($multicurrency_totalpayment),$langs->trans("paymentInInvoiceCurrency")); } @@ -589,7 +710,7 @@ print ''; } } - else dol_print_error($db); + else dol_print_error($db); } /* @@ -635,14 +756,14 @@ $sql.= " GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label"; if (!$user->rights->societe->client->voir) $sql .= ", sc.fk_soc, sc.fk_user"; $sql.= $db->order($sortfield,$sortorder); - + $nbtotalofrecords = ''; if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $result = $db->query($sql); $nbtotalofrecords = $db->num_rows($result); } - + $sql.= $db->plimit($limit+1, $offset); $resql = $db->query($sql); @@ -667,9 +788,9 @@ $tmpkey=preg_replace('/search_options_/','',$key); if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val); } - + $massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge"))); - + print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit); print ' | ||||||||||||||||||||||