From 044879c8385a64086c79dfb62532f724bf3b2667 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Sep 2011 23:57:26 +0000 Subject: [PATCH] Doxygen --- htdocs/admin/barcode.php | 6 +- htdocs/admin/societe.php | 13 +- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/compta/bank/admin/bank.php | 11 +- .../class/ligne-prelevement.class.php | 12 +- htdocs/compta/stats/index.php | 2 +- htdocs/compta/tva/class/tva.class.php | 2 +- htdocs/compta/tva/quadri.php | 9 +- htdocs/core/class/html.formmail.class.php | 52 ++++ htdocs/core/class/notify.class.php | 10 +- .../core/class/{smtps.class.php => smtps.php} | 37 ++- htdocs/lib/CMailFile.class.php | 2 +- htdocs/lib/tax.lib.php | 12 +- .../service/actions_card_service.class.php | 2 +- htdocs/product/class/product.class.php | 2 +- .../class/companybankaccount.class.php | 268 +++++++++--------- .../smartphone/theme/default/default.css.php | 4 +- 17 files changed, 246 insertions(+), 200 deletions(-) rename htdocs/core/class/{smtps.class.php => smtps.php} (98%) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index dd47597da4e..5e95f3366ca 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -18,9 +18,9 @@ */ /** - * \file htdocs/admin/barcode.php + * \file htdocs/includes/modules/barcode/admin/barcode.php * \ingroup barcode - * \brief Page to setup barcode module + * \brief Page d'administration/configuration du module Code barre */ require("../main.inc.php"); diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index f761ff03b72..d8db16d4810 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -88,9 +88,9 @@ if ($action == 'COMPANY_USE_SEARCH_TO_SELECT') if ($action == 'setModuleOptions') { $post_size=count($_POST); - + $db->begin(); - + for($i=0;$i < $post_size;$i++) { if (array_key_exists('param'.$i,$_POST)) @@ -118,7 +118,7 @@ if ($action == 'set') { $label = GETPOST("label"); $scandir = GETPOST("scandir"); - + $type='company'; $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)"; $sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", "; @@ -150,7 +150,7 @@ if ($action == 'setdoc') { $label = GETPOST("label"); $scandir = GETPOST("scandir"); - + $db->begin(); if (dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) @@ -189,7 +189,7 @@ if ($action == 'setdoc') if ($action == 'setprofid') { $status = GETPOST("status"); - + $idprof="SOCIETE_IDPROF".$value."_UNIQUE"; if (dolibarr_set_const($db, $idprof,$status,'chaine',0,'',$conf->entity) > 0) { @@ -518,8 +518,7 @@ $profid[3][1]=$langs->transcountry('ProfId4' ,$mysoc->pays_code); $var = true; $i=0; -$nbofloop=count($profid); -while ($i < $nbofloop) +while ($i < sizeof($profid)) { $var = !$var; diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 29d37ca6c06..0d89e763953 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2094,7 +2094,7 @@ class Propal extends CommonObject $this->nbtodolate++; } } - // TODO Definir regle des propales a facturer en retard + // \todo Definir regle des propales a facturer en retard // if ($mode == 'signed' && ! sizeof($this->FactureListeArray($obj->rowid))) $this->nbtodolate++; } return 1; diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/compta/bank/admin/bank.php index 4d1608b7bd2..4c33f0e3bd5 100644 --- a/htdocs/compta/bank/admin/bank.php +++ b/htdocs/compta/bank/admin/bank.php @@ -47,7 +47,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT') { $free = GETPOST("BANK_CHEQUERECEIPT_FREE_TEXT"); $res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT",$free,'chaine',0,'',$conf->entity); - + if (! $res > 0) $error++; if (! $error) @@ -78,7 +78,7 @@ if ($action == 'setbankorder') * view */ -llxHeader("",$langs->trans("BankSetupModule")); +llxHeader("",""); $html=new Form($db); @@ -144,8 +144,7 @@ $bankorder[1][2]='BankCode DeskCode BankAccountNumberKey AccountNumber'; $var = true; $i=0; -$nbofbank=count($bankorder); -while ($i < $nbofbank) +while ($i < sizeof($bankorder)) { $var = !$var; @@ -175,11 +174,11 @@ while ($i < $nbofbank) print ''; } print ' '; - print ''."\n"; + print "\n"; $i++; } -print ''."\n"; +print "\n"; dol_htmloutput_mesg($mesg); diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php index e286e5a2fa2..a9ec795657b 100644 --- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php +++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/prelevement/class/ligne-prelevement.class.php + * \file htdocs/compta/prelevement/ligne-prelevement.class.php * \ingroup prelevement * \brief Fichier de la classe des lignes de prelevements */ @@ -46,12 +46,12 @@ class LignePrelevement function LignePrelevement($DB, $user) { global $conf,$langs; - + $this->db = $DB ; $this->user = $user; // List of language codes for status - + $langs->load("withdrawals"); $this->statuts[0]=$langs->trans("StatusWaiting"); $this->statuts[2]=$langs->trans("StatusCredited"); @@ -107,7 +107,7 @@ class LignePrelevement return $result; } - + /** * Return status label of object * @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto @@ -132,7 +132,7 @@ class LignePrelevement { return $langs->trans($this->statuts[$statut]); } - + if ($mode == 1) { if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]); @@ -145,7 +145,7 @@ class LignePrelevement if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4'); if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8'); } - + if ($mode == 3) { if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0'); diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 338a47a5d85..c98a7b4e1eb 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -401,7 +401,7 @@ print ""; print '
'; // Factures non reglees - // Y a bug ici. Il faut prendre le reste a payer et non le total des factures non reglees ! + // \todo Y a bug ici. Il faut prendre le reste a payer et non le total des factures non reglees ! $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid, f.total_ttc, sum(pf.amount) as am"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture"; diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index 8417972d104..02312e6d45b 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -511,7 +511,7 @@ class Tva extends CommonObject $result = $this->db->query($sql); if ($result) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO devrait s'appeler paiementtva + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // \todo devrait s'appeler paiementtva if ($this->id > 0) { $ok=1; diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index d02ebf630d6..c94dc2cd8cc 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -114,11 +114,10 @@ function tva_coll($db,$y,$q) /** * Gets VAT to pay for the given month of the given year * The function gets the VAT in split results, as the VAT declaration asks - * to report the amounts for different VAT rates as different lines - * - * @param DoliDB $db Database handler object - * @param int $y Year - * @param int $q Year quarter (1-4) + * to report the amounts for different VAT rates as different lines. + * @param object Database handler object + * @param y Year + * @param q Year quarter (1-4) */ function tva_paye($db, $y,$q) { diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 1856b452608..05dd38b43c1 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -630,6 +630,58 @@ class FormMail return $out; } + + + /** + * \brief Affiche la partie de formulaire pour saisie d'un mail + * \param withtopic 1 pour proposer a la saisie le sujet + * \param withbody 1 pour proposer a la saisie le corps du message + * \param withfile 1 pour proposer a la saisie l'ajout d'un fichier joint + * \todo Fonction a virer quand fichier /comm/mailing.php vire (= quand ecran dans /comm/mailing prets) + */ + function mail_topicmessagefile($withtopic=1,$withbody=1,$withfile=1,$defaultbody) + { + global $langs; + + $langs->load("other"); + + print "
"; + + // Topic + if ($withtopic) + { + print ""; + print ""; + print ""; + } + + // Message + if ($withbody) + { + print ""; + print ""; + print ""; + } + + // Si fichier joint + if ($withfile) + { + print ""; + print ""; + print ""; + } + + print "
".$langs->trans("MailTopic").""; + print ""; + print "
".$langs->trans("MailText").""; + print ""; + print "
".$langs->trans("MailFile").""; + print "trans("Upload")."\"/>"; + print "
"; + } + } ?> diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 155ca106014..6bc26636542 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2008 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 @@ -42,11 +42,13 @@ class Notify var $fk_project; // Les codes actions sont definis dans la table llx_notify_def + // \todo utiliser des codes texte plutot que numerique + // 1 = Validation fiche inter + // 2 = Validation facture /** - * Constructor - * - * @param DoliDB $DB Database handler + * \brief Constructeur + * \param DB Handler acces base */ function Notify($DB) { diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.php similarity index 98% rename from htdocs/core/class/smtps.class.php rename to htdocs/core/class/smtps.php index f4a8c4008a8..d4d37affff1 100755 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.php @@ -2103,7 +2103,7 @@ class SMTPs * @return void * */ - function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown') + function setAttachment ( $strContent, $strFileName = 'unknown', $strMimeType = 'unknown' ) { if ( $strContent ) { @@ -2120,23 +2120,21 @@ class SMTPs // DOL_CHANGE LDR - /** - * Method public void setImageInline( string ) - * - * Image attachments are added to the content array as sub-arrays, - * allowing for multiple images for each outbound email - * - * @param string $strContent Image data to attach to message - * @param string $strImageName Image Name to give to attachment - * @param string $strMimeType Image Mime Type of attachment - * @param string $strImageCid CID - * @return void - * - */ - function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown') + * Method public void setImageInline( string ) + * + * Image attachments are added to the content array as sub-arrays, + * allowing for multiple images for each outbound email + * + * @param string $strContent Image data to attach to message + * @param string $strImageName Image Name to give to attachment + * @param string $strMimeType Image Mime Type of attachment + * @return void + * + */ + function setImageInline ( $strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown' ) { - if ($strContent) + if ( $strContent ) { $this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType; $this->_msgContent['image'][$strImageName]['imageName'] = $strImageName; @@ -2172,7 +2170,7 @@ class SMTPs * @return void * */ - function setSensitivity($_value = 0) + function setSensitivity ( $_value = 0 ) { if ( ( is_numeric ($_value) ) && ( ( $_value >= 0 ) && ( $_value <= 3 ) ) ) @@ -2518,10 +2516,7 @@ class SMTPs // ** CSV Version Control Info /** - * $Log: smtps.class.php,v $ - * Revision 1.1 2011/09/03 00:14:27 eldy - * Doxygen - * + * $Log: smtps.php,v $ * Revision 1.4 2011/08/28 14:24:23 eldy * Doxygen * diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 307c2f7391c..2a719fc4085 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -234,7 +234,7 @@ class CMailFile // Use SMTPS library // ------------------------------------------ - require_once(DOL_DOCUMENT_ROOT."/core/class/smtps.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/smtps.php"); $smtps = new SMTPs(); $smtps->setCharSet($conf->file->character_set_client); diff --git a/htdocs/lib/tax.lib.php b/htdocs/lib/tax.lib.php index 29bf272ebd6..1cd19bc8765 100644 --- a/htdocs/lib/tax.lib.php +++ b/htdocs/lib/tax.lib.php @@ -64,7 +64,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction // If vat paid on due invoices (non draft) if ($conf->global->MAIN_MODULE_ACCOUNTING) { - // TODO a ce jour on se sait pas la compter car le montant tva d'un payment + // \todo a ce jour on se sait pas la compter car le montant tva d'un payment // n'est pas stocke dans la table des payments. // Seul le module compta expert peut resoudre ce probleme. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le @@ -102,7 +102,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction if ($conf->global->MAIN_MODULE_ACCOUNTING) { // If vat paid on payments - // TODO a ce jour on se sait pas la compter car le montant tva d'un payment + // \todo a ce jour on se sait pas la compter car le montant tva d'un payment // n'est pas stocke dans la table des payments. // Seul le module compta expert peut resoudre ce probleme. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le @@ -215,7 +215,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction, { if ($conf->global->MAIN_MODULE_ACCOUNTING) { - // TODO a ce jour on se sait pas la compter car le montant tva d'un payment + // \todo a ce jour on se sait pas la compter car le montant tva d'un payment // n'est pas stocke dans la table des payments. // Seul le module compta expert peut resoudre ce probleme. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le @@ -261,7 +261,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction, { if ($conf->global->MAIN_MODULE_ACCOUNTING) { - // TODO a ce jour on se sait pas la compter car le montant tva d'un payment + // \todo a ce jour on se sait pas la compter car le montant tva d'un payment // n'est pas stocke dans la table des payments. // Seul le module compta expert peut resoudre ce probleme. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le @@ -376,7 +376,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction, if ($conf->global->MAIN_MODULE_ACCOUNTING) { // Count on invoice date - // TODO a ce jour on se sait pas la compter car le montant tva d'un payment + // \todo a ce jour on se sait pas la compter car le montant tva d'un payment // n'est pas stocke dans la table des payments. // Seul le module compta expert peut resoudre ce probleme. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le @@ -423,7 +423,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction, if ($conf->global->MAIN_MODULE_ACCOUNTING) { // Count on payments date - // TODO a ce jour on se sait pas la compter car le montant tva d'un payment + // \todo a ce jour on se sait pas la compter car le montant tva d'un payment // n'est pas stocke dans la table des payments. // Seul le module compta expert peut resoudre ce probleme. // (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index 225eeca5f29..ad9f1cb5666 100755 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/product/canvas/service/actions_card_service.class.php + * \file htdocs/product/canvas/service/product.service.class.php * \ingroup service * \brief Fichier de la classe des services par defaut */ diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1babd5f2e19..b803dce5844 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2485,7 +2485,7 @@ class Product extends CommonObject if (file_exists($dir_osencoded)) { // Cree fichier en taille vignette - // TODO A faire + // \todo A faire // Cree fichier en taille origine $content = @file_get_contents($file); diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index fcb39a66b56..dd149caf89a 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/societe/class/companybankaccount.class.php + * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties */ @@ -26,159 +26,159 @@ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); /** - * \brief Class to manage bank accounts description of third parties + * \brief Class to manage bank accounts description of third parties */ class CompanyBankAccount extends Account { - var $rowid; - var $socid; + var $rowid; + var $socid; - var $bank; - var $courant; - var $clos; - var $code_banque; - var $code_guichet; - var $number; - var $cle_rib; - var $bic; - var $iban; - var $iban_prefix; // deprecated - var $proprio; - var $adresse_proprio; + var $bank; + var $courant; + var $clos; + var $code_banque; + var $code_guichet; + var $number; + var $cle_rib; + var $bic; + var $iban; + var $iban_prefix; // deprecated + var $proprio; + var $adresse_proprio; - /** - * Constructor - */ - function CompanyBankAccount($DB) - { - $this->db = $DB; + /** + * Constructor + */ + function CompanyBankAccount($DB) + { + $this->db = $DB; - $this->socid = 0; - $this->clos = 0; - $this->solde = 0; - $this->error_number = 0; - return 1; - } + $this->socid = 0; + $this->clos = 0; + $this->solde = 0; + $this->error_number = 0; + return 1; + } - /** - * Create bank information record - * - */ - function create() - { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")"; + /** + * Create bank information record + * + */ + function create() + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")"; $resql=$this->db->query($sql); - if ($resql) - { - if ($this->db->affected_rows($resql)) - { - return 1; - } - } - else - { - print $this->db->error(); - return 0; - } - } + if ($resql) + { + if ($this->db->affected_rows($resql)) + { + return 1; + } + } + else + { + print $this->db->error(); + return 0; + } + } - /** - * - * - */ - function update($user='') - { + /** + * + * + */ + function update($user='') + { - $sql = "SELECT fk_soc FROM ".MAIN_DB_PREFIX."societe_rib"; - $sql .= " WHERE fk_soc = ".$this->socid; + $sql = "SELECT fk_soc FROM ".MAIN_DB_PREFIX."societe_rib"; + $sql .= " WHERE fk_soc = ".$this->socid; - $result = $this->db->query($sql); - if ($result) - { - if ($this->db->num_rows($result) == 0) - { - $this->create(); - } - } - else - { - dol_print_error($this->db); - return 0; - } + $result = $this->db->query($sql); + if ($result) + { + if ($this->db->num_rows($result) == 0) + { + $this->create(); + } + } + else + { + dol_print_error($this->db); + return 0; + } - $sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET "; - $sql .= " bank = '" .$this->db->escape($this->bank)."'"; - $sql .= ",code_banque='".$this->code_banque."'"; - $sql .= ",code_guichet='".$this->code_guichet."'"; - $sql .= ",number='".$this->number."'"; - $sql .= ",cle_rib='".$this->cle_rib."'"; - $sql .= ",bic='".$this->bic."'"; - $sql .= ",iban_prefix = '".$this->iban_prefix."'"; - $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'"; - $sql .= ",proprio = '".$this->db->escape($this->proprio)."'"; - $sql .= ",adresse_proprio = '".$this->db->escape($this->adresse_proprio)."'"; - $sql .= " WHERE fk_soc = ".$this->socid; + $sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET "; + $sql .= " bank = '" .$this->db->escape($this->bank)."'"; + $sql .= ",code_banque='".$this->code_banque."'"; + $sql .= ",code_guichet='".$this->code_guichet."'"; + $sql .= ",number='".$this->number."'"; + $sql .= ",cle_rib='".$this->cle_rib."'"; + $sql .= ",bic='".$this->bic."'"; + $sql .= ",iban_prefix = '".$this->iban_prefix."'"; + $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'"; + $sql .= ",proprio = '".$this->db->escape($this->proprio)."'"; + $sql .= ",adresse_proprio = '".$this->db->escape($this->adresse_proprio)."'"; + $sql .= " WHERE fk_soc = ".$this->socid; - $result = $this->db->query($sql); - if ($result) - { - return 1; - } - else - { - dol_print_error($this->db); - return 0; - } - } + $result = $this->db->query($sql); + if ($result) + { + return 1; + } + else + { + dol_print_error($this->db); + return 0; + } + } - /** - * Load record from database - * @param id Id of record - * @param socid Id of company - */ - function fetch($id,$socid=0) - { - if (empty($id) && empty($socid)) return -1; + /** + * Load record from database + * @param id Id of record + * @param socid Id of company + */ + function fetch($id,$socid=0) + { + if (empty($id) && empty($socid)) return -1; - $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, adresse_proprio"; - $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib"; - if ($id) $sql.= " WHERE rowid = ".$id; - if ($socid) $sql.= " WHERE fk_soc = ".$socid; + $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, adresse_proprio"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib"; + if ($id) $sql.= " WHERE rowid = ".$id; + if ($socid) $sql.= " WHERE fk_soc = ".$socid; - $resql = $this->db->query($sql); - if ($resql) - { - if ($this->db->num_rows($resql)) - { - $obj = $this->db->fetch_object($resql); + $resql = $this->db->query($sql); + if ($resql) + { + if ($this->db->num_rows($resql)) + { + $obj = $this->db->fetch_object($resql); - $this->id = $obj->rowid; + $this->id = $obj->rowid; $this->socid = $obj->fk_soc; - $this->bank = $obj->bank; - $this->courant = $obj->courant; - $this->clos = $obj->clos; - $this->code_banque = $obj->code_banque; - $this->code_guichet = $obj->code_guichet; - $this->number = $obj->number; - $this->cle_rib = $obj->cle_rib; - $this->bic = $obj->bic; - $this->iban = $obj->iban; - $this->iban_prefix = $obj->iban; // deprecated - $this->domiciliation = $obj->domiciliation; - $this->proprio = $obj->proprio; - $this->adresse_proprio = $obj->adresse_proprio; - } - $this->db->free($resql); + $this->bank = $obj->bank; + $this->courant = $obj->courant; + $this->clos = $obj->clos; + $this->code_banque = $obj->code_banque; + $this->code_guichet = $obj->code_guichet; + $this->number = $obj->number; + $this->cle_rib = $obj->cle_rib; + $this->bic = $obj->bic; + $this->iban = $obj->iban; + $this->iban_prefix = $obj->iban; // deprecated + $this->domiciliation = $obj->domiciliation; + $this->proprio = $obj->proprio; + $this->adresse_proprio = $obj->adresse_proprio; + } + $this->db->free($resql); - return 1; - } - else - { - dol_print_error($this->db); - return -1; - } - } + return 1; + } + else + { + dol_print_error($this->db); + return -1; + } + } } diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index fc8f9494057..4145de0a326 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -127,8 +127,8 @@ input.ui-input-text, textarea.ui-input-text { /* ============================================================================== */ div.fiche { - margin-: browser->phone)?'10':'2'); ?>px; - margin-: browser->phone)?'6':''); ?>px; + margin-: browser->phone)?'10':'2'; ?>px; + margin-: browser->phone)?'6':''; ?>px; } div.fichecenter {