Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

Browse Source 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
This commit is contained in:
Laurent Destailleur
2015-02-18 22:54:02 +01:00
parent cc1d506614 e485dd413d
commit 4963555669
108 changed files with 413 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/accountancy/admin/fiscalyear.php
View File

@@ -94,7 +94,6 @@ if ($result)
while ($i < $num && $i < $max)
{
$obj = $db->fetch_object($result);
$fiscalyearstatic->ref=$obj->rowid;
$fiscalyearstatic->id=$obj->rowid;
print '<tr '.$bc[$var].'>';
print '<td><a href="fiscalyear_card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowFiscalYear"),"technic").' '.$obj->rowid.'</a></td>';

4
htdocs/accountancy/admin/fiscalyear_card.php
View File

@@ -226,7 +226,7 @@ else if ($id)
// Ref
print "<tr>";
print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
print $object->ref;
print $object->rowid;
print '</td></tr>';
// Label
@@ -278,7 +278,7 @@ else if ($id)
// Ref
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td width="50%">';
print $object->ref;
print $object->rowid;
print '</td><td width="25%">';
print $linkback;
print '</td></tr>';

4
htdocs/accountancy/class/accountancysystem.class.php
View File

@@ -66,8 +66,8 @@ class AccountancySystem
$id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_system");
if ($id > 0) {
$this->id = $id;
$result = $this->id;
$this->rowid = $id;
$result = $this->rowid;
} else {
$result = - 2;
$this->error = "AccountancySystem::Create Erreur $result";

21
htdocs/accountancy/class/accountingaccount.class.php
View File

@@ -123,7 +123,7 @@ class AccountingAccount
*/
function create($user, $notrigger = 0)
{
global $conf, $langs;
global $conf;
$error = 0;
$now=dol_now();
@@ -190,7 +190,7 @@ class AccountingAccount
if (! $error) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accountingaccount");
if (! $notrigger) {
// if (! $notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -200,7 +200,7 @@ class AccountingAccount
// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
// if ($result < 0) { $error++; $this->errors=$interface->errors; }
// // End call triggers
}
// }
}
// Commit or rollback
@@ -225,8 +225,6 @@ class AccountingAccount
*/
function update($user)
{
global $langs;
$this->db->begin();
$sql = "UPDATE " . MAIN_DB_PREFIX . "accountingaccount ";
@@ -294,7 +292,6 @@ class AccountingAccount
*/
function delete($user, $notrigger = 0)
{
global $conf, $langs;
$error = 0;
$result = $this->checkUsage();
@@ -303,8 +300,8 @@ class AccountingAccount
$this->db->begin();
if (! $error) {
if (! $notrigger) {
// if (! $error) {
// if (! $notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -314,8 +311,8 @@ class AccountingAccount
// $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
// if ($result < 0) { $error++; $this->errors=$interface->errors; }
// // End call triggers
}
}
// }
// }
if (! $error) {
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accountingaccount";
@@ -392,8 +389,6 @@ class AccountingAccount
*/
function account_desactivate($id)
{
global $langs;
$result = $this->checkUsage();
if ($result > 0) {
@@ -427,8 +422,6 @@ class AccountingAccount
*/
function account_activate($id)
{
global $langs;
$this->db->begin();
$sql = "UPDATE " . MAIN_DB_PREFIX . "accountingaccount ";

21
htdocs/accountancy/class/bookkeeping.class.php
View File

@@ -225,8 +225,6 @@ class BookKeeping
*/
function create($user='')
{
global $conf, $user, $langs;
$this->piece_num = 0;
// first check if line not yet in bookkeeping
@@ -355,7 +353,6 @@ class BookKeeping
*/
function create_std($user, $notrigger = 0)
{
global $conf, $langs;
$error = 0;
// Clean parameters
@@ -445,7 +442,7 @@ class BookKeeping
if (! $error) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_bookkeeping");
if (! $notrigger) {
// if (! $notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -455,7 +452,7 @@ class BookKeeping
// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
// if ($result < 0) { $error++; $this->errors=$interface->errors; }
// // End call triggers
}
// }
}
// Commit or rollback
@@ -481,7 +478,6 @@ class BookKeeping
*/
function update($user = 0, $notrigger = 0)
{
global $conf, $langs;
$error = 0;
// Clean parameters
@@ -550,8 +546,8 @@ class BookKeeping
$this->errors[] = "Error " . $this->db->lasterror();
}
if (! $error) {
if (! $notrigger) {
// if (! $error) {
// if (! $notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -561,8 +557,8 @@ class BookKeeping
// $result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
// if ($result < 0) { $error++; $this->errors=$interface->errors; }
// // End call triggers
}
}
// }
// }
// Commit or rollback
if ($error) {
@@ -587,7 +583,6 @@ class BookKeeping
*/
function delete($user, $notrigger = 0)
{
global $conf, $langs;
$error = 0;
$this->db->begin();
@@ -642,10 +637,10 @@ class BookKeeping
$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
$resql = $this->db->query($sql);
dol_syslog(get_class($this) . "::export_bookkeping sql=" . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
$this->linesexport = array ();

10
htdocs/accountancy/class/html.formventilation.class.php
View File

@@ -50,10 +50,6 @@ class FormVentilation extends Form
*/
function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey='')
{
global $langs;
$date_array = array ();
$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
$sql .= ' ORDER BY import_key DESC';
@@ -100,7 +96,7 @@ class FormVentilation extends Form
*/
function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array())
{
global $conf, $user, $langs;
global $conf;
$out = '';
@@ -161,7 +157,7 @@ class FormVentilation extends Form
*/
function select_pcgtype($selectid, $htmlname = 'pcg_type', $showempty = 0, $event = array())
{
global $conf, $user, $langs;
global $conf;
$out = '';
@@ -217,7 +213,7 @@ class FormVentilation extends Form
*/
function select_pcgsubtype($selectid, $htmlname = 'pcg_subtype', $showempty = 0, $event = array())
{
global $conf, $user, $langs;
global $conf;
$out = '';

2
htdocs/accountancy/journal/bankjournal.php
View File

@@ -553,7 +553,6 @@ else
// Bank
foreach ( $tabbq[$key] as $k => $mt ) {
if (1) {
print "<tr " . $bc[$var] . ">";
print "<td>" . $date . "</td>";
print "<td>" . $reflabel . "</td>";
@@ -564,7 +563,6 @@ else
print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
print "</tr>";
}
}
// Third party
foreach ( $tabtp[$key] as $k => $mt ) {

2
htdocs/accountancy/journal/sellsjournal.php
View File

@@ -230,7 +230,6 @@ if ($action == 'writebookkeeping') {
$bookkeeping->doc_type = 'customer_invoice';
$bookkeeping->fk_doc = $key;
$bookkeeping->fk_docdet = $val["fk_facturedet"];
$bookkeeping->fk_compte = $compte->id;
$bookkeeping->code_tiers = '';
$bookkeeping->numero_compte = $k;
$bookkeeping->label_compte = $langs->trans("VAT");
@@ -420,7 +419,6 @@ if ($action == 'export_csv') {
$invoicestatic->id = $key;
$invoicestatic->ref = $val["ref"];
$invoicestatic->type = $val["type"];
$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
$date = dol_print_date($db->jdate($val["date"]), 'day');

2
htdocs/adherents/admin/adherent.php
View File

@@ -219,7 +219,7 @@ if ($conf->facture->enabled)
print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
print '<td>';
print $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
print '</td><td align="center" width="80">';
print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
print '</td>';

4
htdocs/adherents/canvas/actions_adherentcard_common.class.php
View File

@@ -27,6 +27,10 @@
*/
abstract class ActionsAdherentCardCommon
{
/**
* Database handler
* @var DoliDB
*/
var $db;
var $dirmodule;
var $targetmodule;

6
htdocs/adherents/card.php
View File

@@ -1159,7 +1159,7 @@ else
print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
if ($object->user_id)
{
print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
}
else print $langs->trans("NoDolibarrAccess");
print '</td></tr>';
@@ -1516,13 +1516,13 @@ else
print '</td><td colspan="2" class="valeur">';
if ($action == 'editlogin')
{
print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
}
else
{
if ($object->user_id)
{
print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
}
else print $langs->trans("NoDolibarrAccess");
}

4
htdocs/adherents/card_subscriptions.php
View File

@@ -674,13 +674,13 @@ if ($rowid)
{
$include=array($object->user_id,$user->id);
}*/
print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
}
else
{
if ($object->user_id)
{
print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
}
else print $langs->trans("NoDolibarrAccess");
}

4
htdocs/adherents/class/adherent.class.php
View File

@@ -641,10 +641,6 @@ class Adherent extends CommonObject
*/
function update_end_date($user)
{
global $conf, $langs;
$error=0;
$this->db->begin();
// Search for last subscription id and end date

7
htdocs/adherents/class/adherent_type.class.php
View File

@@ -36,6 +36,13 @@ class AdherentType extends CommonObject
public $element = 'adherent_type';
var $id;
/**
* @var int
* @deprecated Use rowid
*/
public $ref;
var $libelle;
var $statut;
var $cotisation; // Soumis a la cotisation

2
htdocs/adherents/list.php
View File

@@ -152,7 +152,7 @@ $nbtotalofrecords = 0;
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$resql = $db->query($sql);
if ($resql) $nbtotalofrecords = $db->num_rows($result);
if ($resql) $nbtotalofrecords = $db->num_rows($resql);
else dol_print_error($db);
}
// Add order and limit

4
htdocs/adherents/type.php
View File

@@ -92,7 +92,7 @@ if ($action == 'add' && $user->rights->adherent->configurer)
if ($adht->libelle)
{
$id=$adht->create($user->id);
$id=$adht->create($user);
if ($id > 0)
{
header("Location: ".$_SERVER["PHP_SELF"]);
@@ -127,7 +127,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels,$adht);
$adht->update($user->id);
$adht->update($user);
header("Location: ".$_SERVER["PHP_SELF"]."?rowid=".$_POST["rowid"]);
exit;

2
htdocs/admin/agenda_other.php
View File

@@ -133,7 +133,7 @@ print '<tr '.$bc[$var].'>'."\n";
print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td align="right" class="nowrap">'."\n";
print $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), 1);
$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), 1);
print '</td></tr>'."\n";
// AGENDA_DEFAULT_FILTER_STATUS

2
htdocs/admin/barcode.php
View File

@@ -328,7 +328,7 @@ if (! empty($conf->product->enabled))
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>';
print '<td width="60" align="right">';
print $formbarcode->select_barcode_type($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE,"PRODUIT_DEFAULT_BARCODE_TYPE",1);
$formbarcode->select_barcode_type($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE,"PRODUIT_DEFAULT_BARCODE_TYPE",1);
print '</td><td align="right">';
print '<input type="submit" class="button" name="submit_PRODUIT_DEFAULT_BARCODE_TYPE" value="'.$langs->trans("Modify").'">';
print "</td>";

6
htdocs/admin/ihm.php
View File

@@ -117,7 +117,8 @@ if ($action == 'edit') // Edit
clearstatcache();
$var=true;
print_fiche_titre($langs->trans("Language"),'','').'<br>';
print_fiche_titre($langs->trans("Language"),'','');
print '<br>';
print '<table summary="edit" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
print '<td width="20">&nbsp;</td>';
@@ -299,7 +300,8 @@ else // Show
$var=true;
// Language
print_fiche_titre($langs->trans("Language"),'','').'<br>';
print_fiche_titre($langs->trans("Language"),'','');
print '<br>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';

8
htdocs/admin/menus.php
View File

@@ -183,10 +183,10 @@ if ($action == 'edit')
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>';
print '<td>';
print $formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled="disabled"');
$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled="disabled"');
print '</td>';
print '<td>';
print $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled="disabled"');
$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled="disabled"');
print '</td>';
print '</tr>';
@@ -194,10 +194,10 @@ if ($action == 'edit')
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
print '<td>';
print $formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled="disabled"');
$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled="disabled"');
print '</td>';
print '<td>';
print $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled="disabled"');
$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled="disabled"');
print '</td>';
print '</tr>';

2
htdocs/admin/menus/edit.php
View File

@@ -299,7 +299,7 @@ if ($action == 'create')
// Handler
print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td>';
print '<td>';
print $formadmin->select_menu_families($menu_handler,'menu_handler',$dirmenu);
$formadmin->select_menu_families($menu_handler,'menu_handler',$dirmenu);
print '</td>';
print '<td>'.$langs->trans('DetailMenuHandler').'</td></tr>';

2
htdocs/admin/prelevement.php
View File

@@ -149,7 +149,7 @@ print '</tr>';
// Bank account (from Banks module)
print '<tr class="impair"><td>'.$langs->trans("BankToReceiveWithdraw").'</td>';
print '<td align="left">';
print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEMENT_ID_BANKACCOUNT',0,"courant=1",1);
$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEMENT_ID_BANKACCOUNT',0,"courant=1",1);
print '</td></tr>';
// ICS

2
htdocs/admin/tools/dolibarr_export.php
View File

@@ -97,7 +97,7 @@ jQuery(document).ready(function() {
if (jQuery("#select_sql_compat").val() == 'POSTGRESQL')
{
jQuery("#checkbox_dump_disable-add-locks").attr('checked',true);
};
}
});
<?php

2
htdocs/admin/tools/eaccelerator.php
View File

@@ -91,7 +91,7 @@ function compare($x, $y)
*/
function revcompare($x, $y)
{
global $sortby, $langs;
global $sortby;
if ( $x[$sortby] == $y[$sortby] )
return 0;

1
htdocs/admin/tools/export.php
View File

@@ -469,7 +469,6 @@ function backup_tables($outputfile, $tables='*')
$sql='SELECT * FROM '.$table;
$result = $db->query($sql);
$num_fields = $db->num_rows($result);
while($row = $db->fetch_row($result))
{
// For each row of data we print a line of INSERT

2
htdocs/admin/tools/listevents.php
View File

@@ -102,7 +102,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
{
$error++;
dol_syslog($securityevent->error, LOG_ERR);
$db->rolback();
$db->rollback();
}
}

4
htdocs/asterisk/wrapper.php
View File

@@ -41,7 +41,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
/**
* Empty header
*
* @return none
* @return void
*/
function llxHeader()
{
@@ -53,7 +53,7 @@ function llxHeader()
/**
* Empty footer
*
* @return none
* @return void
*/
function llxFooter()
{

7
htdocs/barcode/codeinit.php
View File

@@ -211,7 +211,8 @@ if ($conf->societe->enabled)
{
$nbno=$nbtotal=0;
print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','').'<br>'."\n";
print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','');
print '<br>'."\n";
$sql="SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''";
$resql=$db->query($sql);
if ($resql)
@@ -251,7 +252,9 @@ if ($conf->product->enabled || $conf->product->service)
$nbno=$nbtotal=0;
print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','').'<br>'."\n";
print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','');
print '<br>'."\n";
$sql ="SELECT count(rowid) as nb, fk_product_type, datec";
$sql.=" FROM ".MAIN_DB_PREFIX."product";
$sql.=" WHERE barcode IS NULL OR barcode = ''";

2
htdocs/barcode/printsheet.php
View File

@@ -360,7 +360,7 @@ print '<br>';
print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode")=='fillfromproduct')?'checked="checked" ':'').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
print '<br>';
print '<div class="showforproductselector">';
print $form->select_produits(GETPOST('productid'), 'productid', '');
$form->select_produits(GETPOST('productid'), 'productid', '');
print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
print '</div>';

2
htdocs/bookmarks/bookmarks.lib.php
View File

@@ -38,8 +38,6 @@ function printBookmarksList($aDb, $aLangs)
require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
if (! isset($conf->global->BOOKMARKS_SHOW_IN_MENU)) $conf->global->BOOKMARKS_SHOW_IN_MENU=5;
$bookm = new Bookmark($db);
$langs->load("bookmarks");
$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');

9
htdocs/bookmarks/list.php
View File

@@ -94,9 +94,12 @@ if ($resql)
print "<tr class=\"liste_titre\">";
//print "<td>&nbsp;</td>";
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bid","","",'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Title"),'','')."</td>";
print_liste_field_titre($langs->trans("Link"),'','')."</td>";
print_liste_field_titre($langs->trans("Target"),'','','','','align="center"')."</td>";
print_liste_field_titre($langs->trans("Title"),'','');
print "</td>";
print_liste_field_titre($langs->trans("Link"),'','');
print "</td>";
print_liste_field_titre($langs->trans("Target"),'','','','','align="center"');
print "</td>";
print_liste_field_titre($langs->trans("Owner"),$_SERVER["PHP_SELF"],"u.lastname","","",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"b.dateb","","",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Position"),$_SERVER["PHP_SELF"],"b.position","","",'align="right"',$sortfield,$sortorder);

2
htdocs/cashdesk/tpl/validation2.tpl.php
View File

@@ -31,7 +31,7 @@ $langs->load("bills");
function popupTicket()
{
largeur = 600;
hauteur = 500
hauteur = 500;
opt = 'width='+largeur+', height='+hauteur+', left='+(screen.width - largeur)/2+', top='+(screen.height-hauteur)/2+'';
window.open('validation_ticket.php?facid=<?php echo $_GET['facid']; ?>', '<?php echo $langs->trans('PrintTicket') ?>', opt);
}

4
htdocs/categories/categorie.php
View File

@@ -278,7 +278,7 @@ if ($socid)
// Address
print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">';
print dol_print_address($soc->address,'gmap','thirdparty',$soc->id);
dol_print_address($soc->address,'gmap','thirdparty',$soc->id);
print '</td></tr>';
// Zip / Town
@@ -609,7 +609,7 @@ else if ($id || $ref)
* @param Object $object Object we want to see categories it can be classified into
* @param int $typeid Type of category (0, 1, 2, 3)
* @param int $socid Id thirdparty
* @param string $showclassifyform 1=Add form to 'Classify', 0=Do not show form to 'Classify'
* @param int $showclassifyform 1=Add form to 'Classify', 0=Do not show form to 'Classify'
* @return int 0
*/
function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)

21
htdocs/categories/class/categorie.class.php
View File

@@ -297,7 +297,6 @@ class Categorie extends CommonObject
// FIXME le hook fait double emploi avec le trigger !!
$hookmanager->initHooks(array('HookCategorydao'));
$parameters=array();
$action='update';
$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
{
@@ -334,7 +333,7 @@ class Categorie extends CommonObject
* Delete a category from database
*
* @param User $user Object user that ask to delete
* @return void
* @return int <0 KO >0 OK
*/
function delete($user)
{
@@ -689,7 +688,9 @@ class Categorie extends CommonObject
*/
function containsObject($type, $object_id)
{
$field = ''; $classname = ''; $category_table = ''; $object_table = '';
$field = '';
$category_table = '';
if ($type == 'product') {
$field = 'product';
}
@@ -726,7 +727,7 @@ class Categorie extends CommonObject
/**
* Return childs of a category
*
* @return void
* @return array|int <0 KO, array ok
*/
function get_filles()
{
@@ -1045,7 +1046,7 @@ class Categorie extends CommonObject
* Retourne les categories de premier niveau (qui ne sont pas filles)
*
* @param int $type Type of category
* @return void
* @return array
*/
function get_main_categories($type=null)
{
@@ -1058,7 +1059,7 @@ class Categorie extends CommonObject
*
* @param string $sep Separator
* @param string $url Url
* @return void
* @return array
*/
function print_all_ways($sep = " &gt;&gt; ", $url='')
{
@@ -1088,7 +1089,7 @@ class Categorie extends CommonObject
/**
* Retourne un tableau contenant la liste des categories meres
*
* @return void
* @return int|array <0 KO, array OK
*/
function get_meres()
{
@@ -1123,7 +1124,7 @@ class Categorie extends CommonObject
* Retourne dans un tableau tous les chemins possibles pour arriver a la categorie
* en partant des categories principales, representes par des tableaux de categories
*
* @return void
* @return array
*/
function get_all_ways()
{
@@ -1315,7 +1316,7 @@ class Categorie extends CommonObject
$originImage = $dir . $file['name'];
// Cree fichier en taille origine
$result=dol_move_uploaded_file($file['tmp_name'], $originImage, 1, 0, 0);
dol_move_uploaded_file($file['tmp_name'], $originImage, 1, 0, 0);
if (file_exists($originImage))
{
@@ -1560,8 +1561,6 @@ class Categorie extends CommonObject
*/
function initAsSpecimen()
{
global $user,$langs,$conf;
dol_syslog(get_class($this)."::initAsSpecimen");
// Initialise parametres

4
htdocs/categories/photos.php
View File

@@ -66,7 +66,9 @@ if ($id > 0)
if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
if ($object->id) $result = $object->add_photo($upload_dir, $_FILES['userfile']);
if ($object->id) {
$object->add_photo($upload_dir, $_FILES['userfile']);
}
}
if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && $user->rights->categorie->creer)

96
htdocs/comm/action/class/actioncomm.class.php
View File

@@ -37,27 +37,67 @@ class ActionComm extends CommonObject
public $table_rowid = 'id';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* Id of the event
* @var int
*/
var $id;
/**
* Id of the event. Use $id as possible
* @var int
*/
public $ref;
var $type_id; // Id into parent table llx_c_actioncomm (used only if option to use type is set)
var $type_code; // Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
var $type; // Label into parent table llx_c_actioncomm (used only if option to use type is set)
var $type_color; // Color into parent table llx_c_actioncomm (used only if option to use type is set)
var $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
var $label;
/**
* @var string
* @deprecated Use $label
*/
public $libelle;
var $datec; // Date creation record (datec)
var $datem; // Date modification record (tms)
var $author; // Object user that create action //deprecated
var $usermod; // Object user that modified action // deprecated
/**
* Object user that create action
* @var User
* @deprecated
*/
var $author;
/**
* Object user that modified action
* @var User
* @deprecated
*/
var $usermod;
var $authorid; // Id user that create action
var $usermodid; // Id user that modified action
var $datep; // Date action start (datep)
var $datef; // Date action end (datep2)
var $durationp = -1; // -1=Unkown duration // deprecated
/**
* @var int -1=Unkown duration
* @deprecated
*/
var $durationp = -1;
var $fulldayevent = 0; // 1=Event on full day
var $punctual = 1; // Milestone // deprecated. Milestone is already event with end date = start date
/**
* Milestone
* @var int
* @deprecated Milestone is already event with end date = start date
*/
var $punctual = 1;
var $percentage; // Percentage
var $location; // Location
@@ -68,14 +108,41 @@ class ActionComm extends CommonObject
var $userassigned = array(); // Array of user ids
var $userownerid; // Id of user owner
var $userdoneid; // Id of user done
var $usertodo; // Object user of owner // deprecated
var $userdone; // Object user that did action // deprecated
/**
* Object user of owner
* @var User
* @deprecated
*/
var $usertodo;
/**
* Object user that did action
* @var User
* @deprecated
*/
var $userdone;
var $socid;
var $contactid;
var $societe; // Company linked to action (optional)
var $contact; // Contact linked to action (optional)
var $fk_project; // Id of project (optional)
/**
* Company linked to action (optional)
* @var Societe|null
*/
var $societe;
/**
* Contact linked to action (optional)
* @var Contact|null
*/
var $contact;
/**
* Id of project (optional)
* @var int
*/
var $fk_project;
// Properties for links to other objects
var $fk_element; // Id of record
@@ -95,8 +162,6 @@ class ActionComm extends CommonObject
*/
function __construct($db)
{
global $langs;
$this->db = $db;
$this->societe = new stdClass(); // deprecated
@@ -239,7 +304,6 @@ class ActionComm extends CommonObject
{
if (! is_array($val)) // For backward compatibility when val=id
{
$tmpid=$val;
$val=array('id'=>$val);
}
@@ -421,9 +485,7 @@ class ActionComm extends CommonObject
*/
function fetch_userassigned()
{
global $langs;
$sql.="SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency";
$sql ="SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency";
$sql.=" FROM ".MAIN_DB_PREFIX."actioncomm_resources";
$sql.=" WHERE element_type = 'user' AND fk_actioncomm = ".$this->id;
$resql2=$this->db->query($sql);
@@ -885,7 +947,7 @@ class ActionComm extends CommonObject
* @param int $overwritepicto 1=Overwrite picto
* @return string Chaine avec URL
*/
function getNomUrl($withpicto=0,$maxlength=0,$classname='',$option='',$overwritepicto='')
function getNomUrl($withpicto=0,$maxlength=0,$classname='',$option='',$overwritepicto=0)
{
global $conf,$langs;
@@ -1145,7 +1207,7 @@ class ActionComm extends CommonObject
*/
function initAsSpecimen()
{
global $user,$langs,$conf,$user;
global $user;
$now=dol_now();

4
htdocs/comm/action/class/cactioncomm.class.php
View File

@@ -99,10 +99,10 @@ class CActionComm
/**
* Return list of event types: array(id=>label) or array(code=>label)
*
* @param int $active 1 or 0 to filter on event state active or not ('' by default = no filter)
* @param string|int $active 1 or 0 to filter on event state active or not ('' by default = no filter)
* @param string $idorcode 'id' or 'code'
* @param string $excludetype Type to exclude
* @param string $onlyautoornot Group list by auto events or not
* @param int $onlyautoornot Group list by auto events or not
* @return mixed Array of all event types if OK, <0 if KO
*/
function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0)

2
htdocs/comm/action/class/ical.class.php
View File

@@ -261,7 +261,7 @@ class ICal
*/
function ical_rrule($value)
{
$result=aray();
$result=array();
$rrule = explode(';',$value);
foreach ($rrule as $line)
{

2
htdocs/comm/action/index.php
View File

@@ -1144,7 +1144,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
// Define $color (Hex string like '0088FF') and $cssclass of event
$color=-1; $cssclass=''; $colorindex=-1;
$color=-1; $colorindex=-1;
if (in_array($user->id, $keysofuserassigned))
{
$nummytasks++; $cssclass='family_mytasks';

2
htdocs/comm/action/listactions.php
View File

@@ -313,7 +313,7 @@ if ($resql)
$actionstatic->id=$obj->id;
$actionstatic->type_code=$obj->type_code;
$actionstatic->type_label=$obj->type_label;
$actionstatic->libelle=$obj->label;
$actionstatic->label=$obj->label;
print $actionstatic->getNomUrl(1,28);
print '</td>';

2
htdocs/comm/action/peruser.php
View File

@@ -804,7 +804,7 @@ $db->close();
* @param int $minheight Minimum height for each event. 60px by default.
* @param boolean $showheader Show header
* @param array $colorsbytype Array with colors by type
* @param string $var true or false for alternat style on tr/td
* @param bool $var true or false for alternat style on tr/td
* @return void
*/
function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false)

2
htdocs/comm/card.php
View File

@@ -909,7 +909,7 @@ if ($id > 0)
// Addresses list
if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
{
$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
}
if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))

2
htdocs/comm/index.php
View File

@@ -434,7 +434,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
while ($i < $num)
{
$obj = $db->fetch_object($resql);
print "<tr ".$bc[$var]."><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."</a></td>";
print "<tr ".$bc[$var]."><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), 'contract')." ".$obj->ref."</a></td>";
print '<td>';
$companystatic->id=$objp->rowid;
$companystatic->name=$objp->name;

6
htdocs/comm/mailing/cibles.php
View File

@@ -118,8 +118,7 @@ if ($action == 'add')
if (GETPOST('clearlist'))
{
// Chargement de la classe
$classname = "MailingTargets";
$obj = new $classname($db);
$obj = new MailingTargets($db);
$obj->clear_target($id);
header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
@@ -135,8 +134,7 @@ if ($action == 'delete')
{
if (!empty($id))
{
$classname = "MailingTargets";
$obj = new $classname($db);
$obj = new MailingTargets($db);
$obj->update_nb($id);
header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);

36
htdocs/comm/propal/class/propal.class.php
View File

@@ -296,15 +296,15 @@ class Propal extends CommonObject
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
*
* @param string $desc Description de la ligne
* @param double $pu_ht Prix unitaire
* @param double $qty Quantite
* @param double $txtva Taux de tva
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param float $pu_ht Prix unitaire
* @param float $qty Quantite
* @param float $txtva Taux de tva
* @param float $txlocaltax1 Local tax 1 rate
* @param float $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id du produit/service predefini
* @param double $remise_percent Pourcentage de remise de la ligne
* @param float $remise_percent Pourcentage de remise de la ligne
* @param string $price_base_type HT or TTC
* @param double $pu_ttc Prix unitaire TTC
* @param float $pu_ttc Prix unitaire TTC
* @param int $info_bits Bits de type de lignes
* @param int $type Type of line (product, service)
* @param int $rang Position of line
@@ -320,7 +320,7 @@ class Propal extends CommonObject
*
* @see add_product
*/
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_option=0)
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_option=0)
{
global $mysoc;
@@ -477,14 +477,14 @@ class Propal extends CommonObject
* Update a proposal line
*
* @param int $rowid Id de la ligne
* @param double $pu Prix unitaire (HT ou TTC selon price_base_type)
* @param double $qty Quantity
* @param double $remise_percent Remise effectuee sur le produit
* @param double $txtva Taux de TVA
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param float $pu Prix unitaire (HT ou TTC selon price_base_type)
* @param float $qty Quantity
* @param float $remise_percent Remise effectuee sur le produit
* @param float $txtva Taux de TVA
* @param float $txlocaltax1 Local tax 1 rate
* @param float $txlocaltax2 Local tax 2 rate
* @param string $desc Description
* @param double $price_base_type HT ou TTC
* @param string $price_base_type HT ou TTC
* @param int $info_bits Miscellaneous informations
* @param int $special_code Special code (also used by externals modules!)
* @param int $fk_parent_line Id of parent line (0 in most cases, used by modules adding sublevels into lines).
@@ -498,9 +498,9 @@ class Propal extends CommonObject
* @param array $array_option extrafields array
* @return int 0 if OK, <0 if KO
*/
function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_option=0)
function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_option=0)
{
global $conf,$user,$langs, $mysoc;
global $mysoc;
dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1866,8 +1866,6 @@ class Propal extends CommonObject
*/
function set_draft($user)
{
global $conf,$langs;
$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 0";
$sql.= " WHERE rowid = ".$this->id;

2
htdocs/comm/propal/class/propalestats.class.php
View File

@@ -193,8 +193,6 @@ class PropaleStats extends Stats
*/
function getAllByProduct($year)
{
global $user;
$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
$sql.= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
//if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

4
htdocs/comm/prospect/class/prospect.class.php
View File

@@ -41,8 +41,6 @@ class Prospect extends Societe
*/
function __construct($db)
{
global $config;
$this->db = $db;
return 0;
@@ -56,7 +54,7 @@ class Prospect extends Societe
*/
function load_state_board()
{
global $conf, $user;
global $user;
$this->nb=array("customers" => 0,"prospects" => 0);
$clause = "WHERE";

2
htdocs/comm/remx.php
View File

@@ -534,7 +534,7 @@ if ($socid > 0)
}
else
{
print dol_print_error($db);
dol_print_error($db);
}
}

56
htdocs/commande/class/commande.class.php
View File

@@ -162,7 +162,6 @@ class Commande extends CommonOrder
}
$obj = new $classname();
$numref = "";
$numref = $obj->getNextValue($soc,$this);
if ($numref != "")
@@ -1079,19 +1078,19 @@ class Commande extends CommonOrder
* Add an order line into database (linked to product/service or not)
*
* @param string $desc Description of line
* @param double $pu_ht Unit price (without tax)
* @param double $qty Quantite
* @param double $txtva Taux de tva force, sinon -1
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param float $pu_ht Unit price (without tax)
* @param float $qty Quantite
* @param float $txtva Taux de tva force, sinon -1
* @param float $txlocaltax1 Local tax 1 rate
* @param float $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id du produit/service predefini
* @param double $remise_percent Pourcentage de remise de la ligne
* @param float $remise_percent Pourcentage de remise de la ligne
* @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id remise
* @param string $price_base_type HT or TTC
* @param double $pu_ttc Prix unitaire TTC
* @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param float $pu_ttc Prix unitaire TTC
* @param int $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param int $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param int $type Type of line (0=product, 1=service)
* @param int $rang Position of line
* @param int $special_code Special code (also used by externals modules!)
@@ -1285,16 +1284,16 @@ class Commande extends CommonOrder
* $this->client must be loaded
*
* @param int $idproduct Product Id
* @param double $qty Quantity
* @param double $remise_percent Product discount relative
* @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param float $qty Quantity
* @param float $remise_percent Product discount relative
* @param int $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param int $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @return void
*
* TODO Remplacer les appels a cette fonction par generation objet Ligne
* insere dans tableau $this->products
*/
function add_product($idproduct, $qty, $remise_percent=0, $date_start='', $date_end='')
function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $date_end='')
{
global $conf, $mysoc;
@@ -1692,7 +1691,6 @@ class Commande extends CommonOrder
*/
function loadExpeditions($filtre_statut=-1)
{
$num=0;
$this->expeditions = array();
$sql = 'SELECT cd.rowid, cd.fk_product,';
@@ -1961,7 +1959,7 @@ class Commande extends CommonOrder
* Set the order date
*
* @param User $user Object user making change
* @param timestamp $date Date
* @param int $date Date
* @return int <0 if KO, >0 if OK
*/
function set_date($user, $date)
@@ -1995,7 +1993,7 @@ class Commande extends CommonOrder
* Set the planned delivery date
*
* @param User $user Objet utilisateur qui modifie
* @param timestamp $date_livraison Date de livraison
* @param int $date_livraison Date de livraison
* @return int <0 si ko, >0 si ok
*/
function set_date_livraison($user, $date_livraison)
@@ -2324,16 +2322,16 @@ class Commande extends CommonOrder
*
* @param int $rowid Id of line to update
* @param string $desc Description de la ligne
* @param double $pu Prix unitaire
* @param double $qty Quantity
* @param double $remise_percent Pourcentage de remise de la ligne
* @param double $txtva Taux TVA
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param float $pu Prix unitaire
* @param float $qty Quantity
* @param float $remise_percent Pourcentage de remise de la ligne
* @param float $txtva Taux TVA
* @param float $txlocaltax1 Local tax 1 rate
* @param float $txlocaltax2 Local tax 2 rate
* @param string $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations on line
* @param timestamp $date_start Start date of the line
* @param timestamp $date_end End date of the line
* @param int $date_start Start date of the line
* @param int $date_end End date of the line
* @param int $type Type of line (0=product, 1=service)
* @param int $fk_parent_line Id of parent line (0 in most cases, used by modules adding sublevels into lines).
* @param int $skip_update_total Keep fields total_xxx to 0 (used for special lines by some modules)
@@ -2344,7 +2342,7 @@ class Commande extends CommonOrder
* @param array $array_option extrafields array
* @return int < 0 if KO, > 0 if OK
*/
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0)
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0)
{
global $conf, $mysoc;
@@ -2578,6 +2576,8 @@ class Commande extends CommonOrder
*/
function update_extrafields($user)
{
global $hookmanager, $conf;
$action='create';
// Actions on extra fields (by external module or standard code)
@@ -3167,7 +3167,7 @@ class Commande extends CommonOrder
*/
public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
{
global $conf,$user,$langs,$hookmanager;
global $conf,$langs;
$langs->load("orders");

2
htdocs/commande/list.php
View File

@@ -500,7 +500,7 @@ if ($resql)
}
else
{
print dol_print_error($db);
dol_print_error($db);
}
llxFooter();

2
htdocs/commande/orderstoinvoice.php
View File

@@ -696,7 +696,7 @@ if (($action != 'create' && $action != 'add') || !$error)
}
else
{
print dol_print_error($db);
dol_print_error($db);
}
}

2
htdocs/compta/bank/account.php
View File

@@ -432,7 +432,7 @@ if ($id > 0 || ! empty($ref))
print '<td>';
//$filtertype=array('TIP'=>'TIP','PRE'=>'PRE',...)
$filtertype='';
print $form->select_types_paiements($paiementtype,'paiementtype',$filtertype,2,1,1,8);
$form->select_types_paiements($paiementtype,'paiementtype',$filtertype,2,1,1,8);
print '</td>';
print '<td><input type="text" class="flat" name="req_nb" value="'.$req_nb.'" size="2"></td>';
print '<td><input type="text" class="flat" name="req_desc" value="'.$req_desc.'" size="24"></td>';

4
htdocs/compta/bank/card.php
View File

@@ -250,7 +250,7 @@ if ($action == 'create')
// Type
print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
print '<td colspan="3">';
print $formbank->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
$formbank->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
print '</td></tr>';
// Currency
@@ -547,7 +547,7 @@ else
// Type
print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
print '<td colspan="3">';
print $formbank->select_type_comptes_financiers((isset($_POST["type"])?$_POST["type"]:$account->type),"type");
$formbank->select_type_comptes_financiers((isset($_POST["type"])?$_POST["type"]:$account->type),"type");
print '</td></tr>';
// Currency

11
htdocs/compta/bank/class/account.class.php
View File

@@ -36,7 +36,12 @@ class Account extends CommonObject
public $element='bank_account';
public $table_element='bank_account';
var $rowid; // deprecated
/**
* //TODO: Discuss this. $rowid is preferred over $id
* @var
* @deprecated
*/
var $rowid;
var $id;
var $ref;
var $label;
@@ -220,7 +225,7 @@ class Account extends CommonObject
/**
* Add an entry into table ".MAIN_DB_PREFIX."bank
*
* @param timestamp $date Date operation
* @param int $date Date operation
* @param string $oper 1,2,3,4... (deprecated) or TYP,VIR,PRE,LIQ,VAD,CB,CHQ...
* @param string $label Descripton
* @param float $amount Amount
@@ -1288,7 +1293,7 @@ class AccountLine extends CommonObject
$sql.= ")";
dol_syslog(get_class($this)."::update_conciliation", LOG_DEBUG);
$resql = $this->db->query($sql);
$this->db->query($sql);
// No error check. Can fail if category already affected
}

2
htdocs/compta/bank/ligne.php
View File

@@ -384,7 +384,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
print '<td colspan="3">';
print $form->select_types_paiements($objp->fk_type,"value",'',2);
$form->select_types_paiements($objp->fk_type,"value",'',2);
print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
if ($objp->receiptid)
{

4
htdocs/compta/bank/virement.php
View File

@@ -167,11 +167,11 @@ print '</tr>';
$var=false;
print '<tr '.$bc[$var].'><td>';
print $form->select_comptes($account_from,'account_from',0,'',1);
$form->select_comptes($account_from,'account_from',0,'',1);
print "</td>";
print "<td>\n";
print $form->select_comptes($account_to,'account_to',0,'',1);
$form->select_comptes($account_to,'account_to',0,'',1);
print "</td>\n";
print "<td>";

4
htdocs/compta/deplacement/card.php
View File

@@ -252,7 +252,7 @@ if ($action == 'create')
print "<tr>";
print '<td width="25%" class="fieldrequired">'.$langs->trans("Type").'</td><td>';
print $form->select_type_fees(GETPOST('type','int'),'type',1);
$form->select_type_fees(GETPOST('type','int'),'type',1);
print '</td></tr>';
print "<tr>";
@@ -344,7 +344,7 @@ else if ($id)
// Type
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
print $form->select_type_fees(GETPOST('type','int')?GETPOST('type','int'):$object->type,'type',0);
$form->select_type_fees(GETPOST('type','int')?GETPOST('type','int'):$object->type,'type',0);
print '</td></tr>';
// Who

4
htdocs/compta/deplacement/class/deplacement.class.php
View File

@@ -376,11 +376,11 @@ class Deplacement extends CommonObject
* List of types
*
* @param int $active Active or not
* @return void
* @return array
*/
function listOfTypes($active=1)
{
global $conf,$langs;
global $langs;
$ret=array();

2
htdocs/compta/dons/card.php
View File

@@ -500,7 +500,7 @@ if (! empty($id) && $action != 'edit')
// Payment mode
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
print $form->form_modes_reglement(null, $don->modepaiementid,'none');
$form->form_modes_reglement(null, $don->modepaiementid,'none');
print "</td></tr>\n";
print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>';

2
htdocs/compta/dons/class/don.class.php
View File

@@ -450,7 +450,7 @@ class Don extends CommonObject
function delete($rowid)
{
$this->db-begin();
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;";

2
htdocs/compta/facture.php
View File

@@ -2736,7 +2736,7 @@ if ($action == 'create')
} else {
if ($absolute_creditnote > 0) // If not, link will be added later
{
if ($object->statut == 0 && $object->type != TYPE_CREDIT_NOTE && $object->type != TYPE_DEPOSIT)
if ($object->statut == 0 && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT)
print ' (' . $addabsolutediscount . ')<br>';
else
print '. ';

1
htdocs/compta/facture/class/facture-rec.class.php
View File

@@ -592,7 +592,6 @@ class FactureRec extends Facture
parent::initAsSpecimen($option);
$this->usenewprice = 1;
}
}

25
htdocs/compta/facture/class/facture.class.php
View File

@@ -59,6 +59,11 @@ class Facture extends CommonInvoice
//! Id client
var $socid;
//! Objet societe client (to load with fetch_client method)
/**
* Customer
* @var Societe
*/
var $client;
var $author;
var $fk_user_author;
@@ -82,7 +87,10 @@ class Facture extends CommonInvoice
var $total_tva=0;
var $total_ttc=0;
var $revenuestamp;
var $note; // deprecated
/**
* @deprecated
*/
var $note;
var $note_private;
var $note_public;
//! 0=draft,
@@ -111,7 +119,10 @@ class Facture extends CommonInvoice
var $fk_account; // Id of bank account
var $fk_bank; // Field to store bank id to use when payment mode is withdraw
var $modelpdf;
var $products=array(); // deprecated
/**
* @deprecated
*/
var $products=array();
var $lines=array();
var $line;
var $extraparams=array();
@@ -1930,8 +1941,8 @@ class Facture extends CommonInvoice
* @param double $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id of predefined product/service
* @param double $remise_percent Percent of discount on line
* @param timestamp $date_start Date start of service
* @param timestamp $date_end Date end of service
* @param int $date_start Date start of service
* @param int $date_end Date end of service
* @param int $ventil Code of dispatching into accountancy
* @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id discount used
@@ -2106,8 +2117,8 @@ class Facture extends CommonInvoice
* @param double $pu Prix unitaire (HT ou TTC selon price_base_type) (> 0 even for credit note lines)
* @param double $qty Quantity
* @param double $remise_percent Pourcentage de remise de la ligne
* @param date $date_start Date de debut de validite du service
* @param date $date_end Date de fin de validite du service
* @param int $date_start Date de debut de validite du service
* @param int $date_end Date de fin de validite du service
* @param double $txtva VAT Rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
@@ -2946,7 +2957,7 @@ class Facture extends CommonInvoice
/**
* Supprime une demande de prelevement
*
* @param Use $user utilisateur creant la demande
* @param User $user utilisateur creant la demande
* @param int $did id de la demande a supprimer
* @return int <0 if OK, >0 if KO
*/

5
htdocs/compta/facture/impayees.php
View File

@@ -324,7 +324,7 @@ if ($action == 'remove_file')
$langs->load("other");
$upload_dir = $diroutputpdf;
$file = $upload_dir . '/' . GETPOST('file');
$ret=dol_delete_file($file,0,0,0,'');
$ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
$action='';
@@ -482,7 +482,8 @@ if ($resql)
$formmail = new FormMail($db);
print '<br>';
print_fiche_titre($langs->trans("SendRemind"),'','').'<br>';
print_fiche_titre($langs->trans("SendRemind"),'','');
print '<br>';
$topicmail="MailTopicSendRemindUnpaidInvoices";
$modelmail="facture_relance";

5
htdocs/compta/localtax/class/localtax.class.php
View File

@@ -249,10 +249,6 @@ class Localtax extends CommonObject
*/
function delete($user)
{
global $conf, $langs;
$error=0;
// Call trigger
$result=$this->call_trigger('LOCALTAX_DELETE',$user);
if ($result < 0) return -1;
@@ -270,7 +266,6 @@ class Localtax extends CommonObject
return -1;
}
return 1;
}

2
htdocs/compta/localtax/clients.php
View File

@@ -104,7 +104,7 @@ $fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': ';
$fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">';
$calc=MAIN_INFO_LOCALTAX_CALC.$local;
$calc=$conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
// Affiche en-tete du rapport
if ($conf->global->$calc==0 || $conf->global->$calc==1) // Calculate on invoice for goods and services
{

2
htdocs/compta/localtax/quadri_detail.php
View File

@@ -124,7 +124,7 @@ $fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
//$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': ';
//$fsearch.=' <input type="text" name="min" value="'.$min.'">';
$calc=MAIN_INFO_LOCALTAX_CALC.$local;
$calc=$conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
// Affiche en-tete du rapport
if ($conf->global->$calc==0 || $conf->global->$calc==1) // Calculate on invoice for goods and services
{

2
htdocs/compta/paiement.php
View File

@@ -315,7 +315,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$(\'.fieldrequireddyn\').addClass(\'fieldrequired\');
if ($(\'#fieldchqemetteur\').val() == \'\')
{
var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_htmltag(MAIN_INFO_SOCIETE_NOM).'\' : jQuery(\'#thirdpartylabel\').val();
var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'\' : jQuery(\'#thirdpartylabel\').val();
$(\'#fieldchqemetteur\').val(emetteur);
}
}

2
htdocs/compta/paiement/cheque/card.php
View File

@@ -355,7 +355,7 @@ if ($action == 'new')
print $form->select_date($filterdate,'fd',0,0,1,'',1,1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
print $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
$form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
print '</td></tr>';
print '</table>';
print '<center>';

16
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@@ -41,6 +41,8 @@ class RemiseCheque extends CommonObject
//! Numero d'erreur Plage 1024-1279
var $errno;
public $statut;
/**
* Constructor
*
@@ -274,7 +276,7 @@ class RemiseCheque extends CommonObject
* Supprime la remise en base
*
* @param User $user Utilisateur qui effectue l'operation
* @return void
* @return int
*/
function delete($user='')
{
@@ -292,14 +294,12 @@ class RemiseCheque extends CommonObject
{
$num = $this->db->affected_rows($resql);
if ($num <> 1)
{
if ($num <> 1) {
$this->errno = -2;
dol_syslog("Remisecheque::Delete Erreur Lecture ID ($this->errno)");
}
if ( $this->errno === 0)
{
if ( $this->errno === 0) {
$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
$sql.= " SET fk_bordereau = 0";
$sql.= " WHERE fk_bordereau = '".$this->id."'";
@@ -476,7 +476,7 @@ class RemiseCheque extends CommonObject
* Build document
*
* @param string $model Model name
* @param Tranlsate $outputlangs Object langs
* @param Translate $outputlangs Object langs
* @return int <0 if KO, >0 if OK
*/
function generatePdf($model, $outputlangs)
@@ -693,7 +693,7 @@ class RemiseCheque extends CommonObject
* Set the creation date
*
* @param User $user Object user
* @param timestamp $date Date creation
* @param int $date Date creation
* @return int <0 if KO, >0 if OK
*/
function set_date($user, $date)
@@ -727,7 +727,7 @@ class RemiseCheque extends CommonObject
* Set the number of bordereau
*
* @param User $user Object user
* @param timestamp $number number of bordereau
* @param int $number number of bordereau
* @return int <0 if KO, >0 if OK
*/
function set_number($user, $number)

2
htdocs/compta/paiement/class/paiement.class.php
View File

@@ -573,7 +573,7 @@ class Paiement extends CommonObject
/**
* Updates the payment date
*
* @param timestamp $date New date
* @param int $date New date
* @return int <0 if KO, 0 if OK
*/
function update_date($date)

14
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@@ -403,7 +403,7 @@ class BonPrelevement extends CommonObject
* Set withdrawal to credited status
*
* @param User $user id of user
* @param timestamp $date date of action
* @param int $date date of action
* @return int >0 if OK, <0 if KO
*/
function set_infocredit($user, $date)
@@ -525,7 +525,7 @@ class BonPrelevement extends CommonObject
* Set withdrawal to transmited status
*
* @param User $user id of user
* @param timestamp $date date of action
* @param int $date date of action
* @param string $method method of transmision to bank
* @return int >0 if OK, <0 if KO
*/
@@ -667,9 +667,9 @@ class BonPrelevement extends CommonObject
{
$obj = $this->db->fetch_object($resql);
return $obj->nb;
$this->db->free($resql);
return $obj->nb;
}
else
{
@@ -1167,7 +1167,7 @@ class BonPrelevement extends CommonObject
/**
* Delete a notification
*
* @param User $user notification user
* @param int $user notification user
* @param string $action notification action
* @return int >0 if OK, <0 if KO
*/
@@ -1192,7 +1192,7 @@ class BonPrelevement extends CommonObject
* Add a notification
*
* @param DoliDB $db database handler
* @param User $user notification user
* @param int $user notification user
* @param string $action notification action
* @return int 0 if OK, <0 if KO
*/
@@ -1631,7 +1631,7 @@ class BonPrelevement extends CommonObject
* Note: The tag PmtInf is opened here but closed into caller
*
* @param string $configuration conf
* @param date $ladate Date
* @param int $ladate Date
* @param int $nombre 0 or 1
* @param float $total Total
* @param string $CrLf End of line character

2
htdocs/compta/prelevement/class/ligneprelevement.class.php
View File

@@ -61,7 +61,7 @@ class LignePrelevement
* Recupere l'objet prelevement
*
* @param int $rowid id de la facture a recuperer
* @return void
* @return void|int
*/
function fetch($rowid)
{

6
htdocs/compta/prelevement/class/rejetprelevement.class.php
View File

@@ -71,7 +71,7 @@ class RejetPrelevement
* @param User $user User object
* @param int $id Id
* @param string $motif Motif
* @param timestamp $date_rejet Date rejet
* @param int $date_rejet Date rejet
* @param int $bonid Bon id
* @param int $facturation Facturation
* @return void
@@ -272,7 +272,7 @@ class RejetPrelevement
/**
* Retrieve the list of invoices
*
* @return void
* @return array
*/
private function getListInvoices()
{
@@ -318,7 +318,7 @@ class RejetPrelevement
* Retrieve withdrawal object
*
* @param int $rowid id of invoice to retrieve
* @return void
* @return int
*/
function fetch($rowid)
{

10
htdocs/compta/sociales/class/chargesociales.class.php
View File

@@ -69,7 +69,7 @@ class ChargeSociales extends CommonObject
*
* @param int $id Id
* @param string $ref Ref
* @return void
* @return int <0 KO >0 OK
*/
function fetch($id, $ref='')
{
@@ -99,13 +99,14 @@ class ChargeSociales extends CommonObject
$this->paye = $obj->paye;
$this->periode = $this->db->jdate($obj->periode);
$this->db->free($resql);
return 1;
}
else
{
return 0;
}
$this->db->free($resql);
}
else
{
@@ -308,6 +309,7 @@ class ChargeSociales extends CommonObject
if ($this->db->num_rows($result))
{
$obj = $this->db->fetch_object($result);
$this->db->free($result);
return $obj->amount;
}
else
@@ -315,8 +317,6 @@ class ChargeSociales extends CommonObject
return 0;
}
$this->db->free($result);
}
else
{
@@ -520,8 +520,6 @@ class ChargeSociales extends CommonObject
*/
function initAsSpecimen()
{
global $user,$langs,$conf;
// Initialize parameters
$this->id=0;
$this->ref = 'SPECIMEN';

4
htdocs/compta/tva/quadri.php
View File

@@ -54,7 +54,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
* @param DoliDB $db Database handler
* @param int $y Year
* @param int $q Year quarter (1-4)
* @return void
* @return array
*/
function tva_coll($db,$y,$q)
{
@@ -122,7 +122,7 @@ function tva_coll($db,$y,$q)
* @param DoliDB $db Database handler object
* @param int $y Year
* @param int $q Year quarter (1-4)
* @return void
* @return array
*/
function tva_paye($db, $y,$q)
{

2
htdocs/contact/class/contact.class.php
View File

@@ -1001,8 +1001,6 @@ class Contact extends CommonObject
*/
function initAsSpecimen()
{
global $user,$langs;
// Get first id of existing company and save it into $socid
$socid = 0;
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe ORDER BY rowid LIMIT 1";

2
htdocs/contrat/card.php
View File

@@ -659,7 +659,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contr
// Close all lines
else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
{
$result = $object->cloture($user);
$object->cloture($user);
}
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)

11
htdocs/contrat/class/contrat.class.php
View File

@@ -236,7 +236,6 @@ class Contrat extends CommonObject
}
$obj = new $classname();
$numref = "";
$numref = $obj->getNextValue($soc,$this);
if ( $numref != "")
@@ -1589,11 +1588,11 @@ class Contrat extends CommonObject
// Load $this->lines array
// $this->fetch_lines();
$newstatut=1;
foreach($this->lines as $key => $contractline)
{
// if ($contractline) // Loop on each service
}
// $newstatut=1;
// foreach($this->lines as $key => $contractline)
// {
// // if ($contractline) // Loop on each service
// }
return 1;
}

4
htdocs/core/class/commonobject.class.php
View File

@@ -821,7 +821,7 @@ abstract class CommonObject
* Update a specific field into database
*
* @param string $field Field to update
* @param mixte $value New value
* @param mixed $value New value
* @param string $table To force other table element or element line (should not be used)
* @param int $id To force other object id (should not be used)
* @param string $format Data format ('text', 'date'). 'text' is used if not defined
@@ -2412,7 +2412,7 @@ abstract class CommonObject
* TODO Move this into html.class.php
* But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
*
* @return void
* @return int
*/
function showLinkedObjectBlock()
{

2
htdocs/core/class/doleditor.class.php
View File

@@ -142,7 +142,7 @@ class DolEditor
*
* @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\'); });"
* @return void
* @return void|string
*/
function Create($noprint=0,$morejs='')
{

2
htdocs/core/class/extrafields.class.php
View File

@@ -590,7 +590,7 @@ class ExtraFields
* @param string $value Value to show (for date type it must be in timestamp format)
* @param string $moreparam To add more parametes on html input tag
* @param string $keyprefix Prefix string to add into name and id of field (can be used to avoid duplicate names)
* @return void
* @return string
*/
function showInputField($key,$value,$moreparam='',$keyprefix='')
{

8
htdocs/core/class/html.form.class.php
View File

@@ -2794,7 +2794,7 @@ class Form
* @param string $htmlname HTML field name
* @param int $maxlength Maximum length for labels
* @param int $excludeafterid Exclude all categories after this leaf in category tree.
* @return void
* @return string
* @see select_categories
*/
function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0)
@@ -3568,7 +3568,7 @@ class Form
*
* @param string $selected preselected currency code
* @param string $htmlname name of HTML select list
* @return void
* @return string
*/
function selectCurrency($selected='',$htmlname='currency_id')
{
@@ -3667,7 +3667,7 @@ class Form
* Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
* Sinon la TVA proposee par defaut=0. Fin de regle.
* @param bool $options_only Return options only (for ajax treatment)
* @return void
* @return string
*/
function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false)
{
@@ -4452,7 +4452,7 @@ class Form
* Return HTML code to output a photo
*
* @param string $modulepart Key to define module concerned ('societe', 'userphoto', 'memberphoto')
* @param Object $object Object containing data to retrieve file name
* @param object $object Object containing data to retrieve file name
* @param int $width Width of photo
* @return string HTML code to output photo
*/

2
htdocs/core/class/html.formcompany.class.php
View File

@@ -709,7 +709,7 @@ class FormCompany
* @param string $fields Fields
* @param int $fieldsize Field size
* @param int $disableautocomplete 1 To disable autocomplete features
* @return void
* @return string
*/
function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0)
{

8
htdocs/core/class/html.formother.class.php
View File

@@ -590,7 +590,7 @@ class FormOther
* @param int $showcolorbox 1=Show color code and color box, 0=Show only color code
* @param array $arrayofcolors Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
* @param string $morecss Add css style into input field
* @return void
* @return string
*/
function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
{
@@ -720,7 +720,7 @@ class FormOther
* @param string $selected Preselected value
* @param string $htmlname Nom de la zone select
* @param int $useempty Affiche valeur vide dans liste
* @return void
* @return string
*/
function select_dayofweek($selected='',$htmlname='weekid',$useempty=0)
{
@@ -761,7 +761,7 @@ class FormOther
* @param string $selected Preselected value
* @param string $htmlname Nom de la zone select
* @param int $useempty Affiche valeur vide dans liste
* @return void
* @return string
*/
function select_month($selected='',$htmlname='monthid',$useempty=0)
{
@@ -803,7 +803,7 @@ class FormOther
* @param int $offset Offset
* @param int $invert Invert
* @param string $option Option
* @return void
* @return string
*/
function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='')
{

2
htdocs/core/class/ldap.class.php
View File

@@ -801,7 +801,7 @@ class Ldap
*
* @param string $dn DN entry key
* @param string $filter Filter
* @return int <0 if KO, >0 if OK
* @return int|false|array <0 or false if KO, array if OK
*/
function getAttribute($dn,$filter)
{

2
htdocs/core/class/vcard.class.php
View File

@@ -306,7 +306,7 @@ class vCard
/**
* permet d'obtenir une vcard
*
* @return void
* @return string
*/
function getVCard()
{

8
htdocs/core/lib/accounting.lib.php
View File

@@ -26,10 +26,10 @@
/**
* Prepare array with list of admin tabs
*
* @param Object $object Object instance we show card
* @param AccountingAccount $object Object instance we show card
* @return array Array of tabs to show
*/
function admin_accounting_prepare_head($object=null)
function admin_accounting_prepare_head(AccountingAccount $object=null)
{
global $langs, $conf;
@@ -65,10 +65,10 @@ function admin_accounting_prepare_head($object=null)
/**
* Prepare array with list of tabs
*
* @param Object $object Accounting account
* @param AccountingAccount $object Accounting account
* @return array Array of tabs to show
*/
function accounting_prepare_head($object)
function accounting_prepare_head(AccountingAccount $object)
{
global $langs, $conf;

2
htdocs/core/lib/ajax.lib.php
View File

@@ -403,7 +403,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0)
* @param int $entity Entity to set
* @param int $revertonoff Revert on/off
* @param bool $strict Use only "disabled" with delConstant and "enabled" with setConstant
* @return void
* @return string
*/
function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, $strict=0)
{

4
htdocs/core/lib/bank.lib.php
View File

@@ -27,10 +27,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param Account $object Object related to tabs
* @return array Array of tabs to show
*/
function bank_prepare_head($object)
function bank_prepare_head(Account $object)
{
global $langs, $conf, $user;
$h = 0;

12
htdocs/core/lib/company.lib.php
View File

@@ -32,10 +32,10 @@
/**
* Return array of tabs to used on pages for third parties cards.
*
* @param Object $object Object company shown
* @param Societe $object Object company shown
* @return array Array of tabs
*/
function societe_prepare_head($object)
function societe_prepare_head(Societe $object)
{
global $db, $langs, $conf, $user;
$h = 0;
@@ -545,7 +545,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
* @param Conf $conf Object conf
* @param Translate $langs Object langs
* @param DoliDB $db Database handler
* @param Object $object Third party object
* @param Societe $object Third party object
* @param string $backtopage Url to go once contact is created
* @return void
*/
@@ -809,7 +809,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
* @param Conf $conf Object conf
* @param Translate $langs Object langs
* @param DoliDB $db Database handler
* @param Object $object Third party object
* @param Societe $object Third party object
* @param string $backtopage Url to go once address is created
* @return void
*/
@@ -904,7 +904,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
* @param Conf $conf Object conf
* @param Translate $langs Object langs
* @param DoliDB $db Object db
* @param Object $object Object third party or member
* @param Adherent|Societe $object Object third party or member
* @param Contact $objcon Object contact
* @param int $noprint Return string but does not output it
* @return mixed Return html part or void if noprint is 1
@@ -1067,7 +1067,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
* @param Conf $conf Object conf
* @param Translate $langs Object langs
* @param DoliDB $db Object db
* @param Object $object Object third party or member
* @param Adherent|Societe $object Object third party or member
* @param Contact $objcon Object contact
* @param int $noprint Return string but does not output it
* @return mixed Return html part or void if noprint is 1

4
htdocs/core/lib/contact.lib.php
View File

@@ -25,10 +25,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param Contact $object Object related to tabs
* @return array Array of tabs to show
*/
function contact_prepare_head($object)
function contact_prepare_head(Contact $object)
{
global $langs, $conf, $user;

4
htdocs/core/lib/contract.lib.php
View File

@@ -25,10 +25,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param Contrat $object Object related to tabs
* @return array Array of tabs to show
*/
function contract_prepare_head($object)
function contract_prepare_head(Contrat $object)
{
global $langs, $conf;
$h = 0;

4
htdocs/core/lib/cron.lib.php
View File

@@ -50,10 +50,10 @@ function cronadmin_prepare_head()
/**
* Return array of tabs to used on a cron job
*
* @param Object $object Object cron
* @param Cronjob $object Object cron
* @return array Array of tabs
*/
function cron_prepare_head($object)
function cron_prepare_head(Cronjob $object)
{
global $langs, $conf, $user;
$h = 0;

4
htdocs/core/lib/emailing.lib.php
View File

@@ -24,10 +24,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param Mailing $object Object related to tabs
* @return array Array of tabs to show
*/
function emailing_prepare_head($object)
function emailing_prepare_head(Mailing $object)
{
global $user, $langs, $conf;

4
htdocs/core/lib/fiscalyear.lib.php
View File

@@ -24,10 +24,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param Fiscalyear $object Object related to tabs
* @return array Array of tabs to show
*/
function fiscalyear_prepare_head($object)
function fiscalyear_prepare_head(Fiscalyear $object)
{
global $langs, $conf;

14
htdocs/core/lib/functions.lib.php
View File

@@ -657,7 +657,7 @@ function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto
* @param int $notab 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required.
* @param string $picto Add a picto on tab title
* @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
* @return void
* @return string
*/
function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0)
{
@@ -739,7 +739,7 @@ function dol_fiche_end($notab=0)
* Return tab footer of a card
*
* @param int $notab 0=Add tab footer, 1=no tab footer
* @return void
* @return string
*/
function dol_get_fiche_end($notab=0)
{
@@ -2542,7 +2542,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
* @param string $moreattrib Add more attributes on th ("" by defaut)
* @param string $sortfield Current field used to sort
* @param string $sortorder Current sort order
* @return void
* @return string
*/
function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="")
{
@@ -2647,7 +2647,7 @@ function print_fiche_titre($title, $mesg='', $picto='title.png', $pictoisfullpat
* @param string $picto Icon to use before title (should be a 32x32 transparent png file)
* @param int $pictoisfullpath 1=Icon name is a full absolute url of image
* @param int $id To force an id on html objects
* @return void
* @return string
*/
function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath=0, $id='')
{
@@ -3190,8 +3190,8 @@ function get_localtax_by_third($local)
*
* @param float $vatrate VAT Rate
* @param int $local Number of localtax (1 or 2, or 0 to return 1 & 2)
* @param int $buyer Company object
* @param int $seller Company object
* @param Societe $buyer Company object
* @param Societe $seller Company object
* @return array array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
*/
function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller)
@@ -4639,7 +4639,7 @@ function picto_from_langcode($codelang)
*
* @param Conf $conf Object conf
* @param Translate $langs Object langs
* @param Object|null $object Object object
* @param object|null $object Object object
* @param array $head Object head
* @param int $h New position to fill
* @param string $type Value for object where objectvalue can be

6
htdocs/core/lib/member.lib.php
View File

@@ -24,10 +24,10 @@
/**
* Return array head with list of tabs to view object informations
*
* @param Object $object Member
* @param Adherent $object Member
* @return array head
*/
function member_prepare_head($object)
function member_prepare_head(Adherent $object)
{
global $langs, $conf, $user;
@@ -155,7 +155,7 @@ function member_admin_prepare_head()
/**
* Return array head with list of tabs to view object stats informations
*
* @param Object $object Member or null
* @param Adherent $object Member or null
* @return array head
*/
function member_stats_prepare_head($object)

2
htdocs/core/lib/memory.lib.php
View File

@@ -169,7 +169,7 @@ function dol_getshmopaddress($memoryid)
/**
* Return list of contents of all memory area shared
*
* @return int 0=Nothing is done, <0 if KO, >0 if OK
* @return array
*/
function dol_listshmop()
{

4
htdocs/core/lib/order.lib.php
View File

@@ -28,10 +28,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param Commande $object Object related to tabs
* @return array Array of tabs to show
*/
function commande_prepare_head($object)
function commande_prepare_head(Commande $object)
{
global $langs, $conf, $user;
if (! empty($conf->expedition->enabled)) $langs->load("sendings");

Some files were not shown because too many files have changed in this diff Show More