Doxygen
This commit is contained in:
parent
0e2946cec7
commit
044879c838
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* \ingroup barcode
|
||||||
* \brief Page to setup barcode module
|
* \brief Page d'administration/configuration du module Code barre
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
|
|||||||
@ -88,9 +88,9 @@ if ($action == 'COMPANY_USE_SEARCH_TO_SELECT')
|
|||||||
if ($action == 'setModuleOptions')
|
if ($action == 'setModuleOptions')
|
||||||
{
|
{
|
||||||
$post_size=count($_POST);
|
$post_size=count($_POST);
|
||||||
|
|
||||||
$db->begin();
|
$db->begin();
|
||||||
|
|
||||||
for($i=0;$i < $post_size;$i++)
|
for($i=0;$i < $post_size;$i++)
|
||||||
{
|
{
|
||||||
if (array_key_exists('param'.$i,$_POST))
|
if (array_key_exists('param'.$i,$_POST))
|
||||||
@ -118,7 +118,7 @@ if ($action == 'set')
|
|||||||
{
|
{
|
||||||
$label = GETPOST("label");
|
$label = GETPOST("label");
|
||||||
$scandir = GETPOST("scandir");
|
$scandir = GETPOST("scandir");
|
||||||
|
|
||||||
$type='company';
|
$type='company';
|
||||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
|
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
|
||||||
$sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
|
$sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
|
||||||
@ -150,7 +150,7 @@ if ($action == 'setdoc')
|
|||||||
{
|
{
|
||||||
$label = GETPOST("label");
|
$label = GETPOST("label");
|
||||||
$scandir = GETPOST("scandir");
|
$scandir = GETPOST("scandir");
|
||||||
|
|
||||||
$db->begin();
|
$db->begin();
|
||||||
|
|
||||||
if (dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
|
if (dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
|
||||||
@ -189,7 +189,7 @@ if ($action == 'setdoc')
|
|||||||
if ($action == 'setprofid')
|
if ($action == 'setprofid')
|
||||||
{
|
{
|
||||||
$status = GETPOST("status");
|
$status = GETPOST("status");
|
||||||
|
|
||||||
$idprof="SOCIETE_IDPROF".$value."_UNIQUE";
|
$idprof="SOCIETE_IDPROF".$value."_UNIQUE";
|
||||||
if (dolibarr_set_const($db, $idprof,$status,'chaine',0,'',$conf->entity) > 0)
|
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;
|
$var = true;
|
||||||
$i=0;
|
$i=0;
|
||||||
|
|
||||||
$nbofloop=count($profid);
|
while ($i < sizeof($profid))
|
||||||
while ($i < $nbofloop)
|
|
||||||
{
|
{
|
||||||
$var = !$var;
|
$var = !$var;
|
||||||
|
|
||||||
|
|||||||
@ -2094,7 +2094,7 @@ class Propal extends CommonObject
|
|||||||
$this->nbtodolate++;
|
$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++;
|
// if ($mode == 'signed' && ! sizeof($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@ -47,7 +47,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
|
|||||||
{
|
{
|
||||||
$free = GETPOST("BANK_CHEQUERECEIPT_FREE_TEXT");
|
$free = GETPOST("BANK_CHEQUERECEIPT_FREE_TEXT");
|
||||||
$res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT",$free,'chaine',0,'',$conf->entity);
|
$res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT",$free,'chaine',0,'',$conf->entity);
|
||||||
|
|
||||||
if (! $res > 0) $error++;
|
if (! $res > 0) $error++;
|
||||||
|
|
||||||
if (! $error)
|
if (! $error)
|
||||||
@ -78,7 +78,7 @@ if ($action == 'setbankorder')
|
|||||||
* view
|
* view
|
||||||
*/
|
*/
|
||||||
|
|
||||||
llxHeader("",$langs->trans("BankSetupModule"));
|
llxHeader("","");
|
||||||
|
|
||||||
$html=new Form($db);
|
$html=new Form($db);
|
||||||
|
|
||||||
@ -144,8 +144,7 @@ $bankorder[1][2]='BankCode DeskCode BankAccountNumberKey AccountNumber';
|
|||||||
$var = true;
|
$var = true;
|
||||||
$i=0;
|
$i=0;
|
||||||
|
|
||||||
$nbofbank=count($bankorder);
|
while ($i < sizeof($bankorder))
|
||||||
while ($i < $nbofbank)
|
|
||||||
{
|
{
|
||||||
$var = !$var;
|
$var = !$var;
|
||||||
|
|
||||||
@ -175,11 +174,11 @@ while ($i < $nbofbank)
|
|||||||
print '</a></td>';
|
print '</a></td>';
|
||||||
}
|
}
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '</tr>'."\n";
|
print "</tr>\n";
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
print '</table>'."\n";
|
print "</table>\n";
|
||||||
|
|
||||||
dol_htmloutput_mesg($mesg);
|
dol_htmloutput_mesg($mesg);
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/compta/prelevement/class/ligne-prelevement.class.php
|
* \file htdocs/compta/prelevement/ligne-prelevement.class.php
|
||||||
* \ingroup prelevement
|
* \ingroup prelevement
|
||||||
* \brief Fichier de la classe des lignes de prelevements
|
* \brief Fichier de la classe des lignes de prelevements
|
||||||
*/
|
*/
|
||||||
@ -46,12 +46,12 @@ class LignePrelevement
|
|||||||
function LignePrelevement($DB, $user)
|
function LignePrelevement($DB, $user)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
|
|
||||||
$this->db = $DB ;
|
$this->db = $DB ;
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
|
|
||||||
// List of language codes for status
|
// List of language codes for status
|
||||||
|
|
||||||
$langs->load("withdrawals");
|
$langs->load("withdrawals");
|
||||||
$this->statuts[0]=$langs->trans("StatusWaiting");
|
$this->statuts[0]=$langs->trans("StatusWaiting");
|
||||||
$this->statuts[2]=$langs->trans("StatusCredited");
|
$this->statuts[2]=$langs->trans("StatusCredited");
|
||||||
@ -107,7 +107,7 @@ class LignePrelevement
|
|||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return status label of object
|
* Return status label of object
|
||||||
* @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
|
* @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
|
||||||
@ -132,7 +132,7 @@ class LignePrelevement
|
|||||||
{
|
{
|
||||||
return $langs->trans($this->statuts[$statut]);
|
return $langs->trans($this->statuts[$statut]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($mode == 1)
|
if ($mode == 1)
|
||||||
{
|
{
|
||||||
if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
|
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==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
|
||||||
if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
|
if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($mode == 3)
|
if ($mode == 3)
|
||||||
{
|
{
|
||||||
if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
|
if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
|
||||||
|
|||||||
@ -401,7 +401,7 @@ print "</table>";
|
|||||||
print '<br><table width="100%" class="noborder">';
|
print '<br><table width="100%" class="noborder">';
|
||||||
|
|
||||||
// Factures non reglees
|
// 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 = "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";
|
$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";
|
||||||
|
|||||||
@ -511,7 +511,7 @@ class Tva extends CommonObject
|
|||||||
$result = $this->db->query($sql);
|
$result = $this->db->query($sql);
|
||||||
if ($result)
|
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)
|
if ($this->id > 0)
|
||||||
{
|
{
|
||||||
$ok=1;
|
$ok=1;
|
||||||
|
|||||||
@ -114,11 +114,10 @@ function tva_coll($db,$y,$q)
|
|||||||
/**
|
/**
|
||||||
* Gets VAT to pay for the given month of the given year
|
* 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
|
* The function gets the VAT in split results, as the VAT declaration asks
|
||||||
* to report the amounts for different VAT rates as different lines
|
* to report the amounts for different VAT rates as different lines.
|
||||||
*
|
* @param object Database handler object
|
||||||
* @param DoliDB $db Database handler object
|
* @param y Year
|
||||||
* @param int $y Year
|
* @param q Year quarter (1-4)
|
||||||
* @param int $q Year quarter (1-4)
|
|
||||||
*/
|
*/
|
||||||
function tva_paye($db, $y,$q)
|
function tva_paye($db, $y,$q)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -630,6 +630,58 @@ class FormMail
|
|||||||
|
|
||||||
return $out;
|
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 "<table class=\"border\" width=\"100%\">";
|
||||||
|
|
||||||
|
// Topic
|
||||||
|
if ($withtopic)
|
||||||
|
{
|
||||||
|
print "<tr>";
|
||||||
|
print "<td width=\"180\">".$langs->trans("MailTopic")."</td>";
|
||||||
|
print "<td>";
|
||||||
|
print "<input type=\"text\" size=\"60\" name=\"subject\" value=\"\">";
|
||||||
|
print "</td></tr>";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Message
|
||||||
|
if ($withbody)
|
||||||
|
{
|
||||||
|
print "<tr>";
|
||||||
|
print "<td width=\"180\" valign=\"top\">".$langs->trans("MailText")."</td>";
|
||||||
|
print "<td>";
|
||||||
|
print "<textarea rows=\"8\" cols=\"72\" name=\"message\">";
|
||||||
|
print $defaultbody;
|
||||||
|
print "</textarea>";
|
||||||
|
print "</td></tr>";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Si fichier joint
|
||||||
|
if ($withfile)
|
||||||
|
{
|
||||||
|
print "<tr>";
|
||||||
|
print "<td width=\"180\">".$langs->trans("MailFile")."</td>";
|
||||||
|
print "<td>";
|
||||||
|
print "<input type=\"file\" name=\"addedfile\" value=\"".$langs->trans("Upload")."\"/>";
|
||||||
|
print "</td></tr>";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "</table>";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -42,11 +42,13 @@ class Notify
|
|||||||
var $fk_project;
|
var $fk_project;
|
||||||
|
|
||||||
// Les codes actions sont definis dans la table llx_notify_def
|
// 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
|
* \brief Constructeur
|
||||||
*
|
* \param DB Handler acces base
|
||||||
* @param DoliDB $DB Database handler
|
|
||||||
*/
|
*/
|
||||||
function Notify($DB)
|
function Notify($DB)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2103,7 +2103,7 @@ class SMTPs
|
|||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
|
function setAttachment ( $strContent, $strFileName = 'unknown', $strMimeType = 'unknown' )
|
||||||
{
|
{
|
||||||
if ( $strContent )
|
if ( $strContent )
|
||||||
{
|
{
|
||||||
@ -2120,23 +2120,21 @@ class SMTPs
|
|||||||
|
|
||||||
|
|
||||||
// DOL_CHANGE LDR
|
// DOL_CHANGE LDR
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method public void setImageInline( string )
|
* Method public void setImageInline( string )
|
||||||
*
|
*
|
||||||
* Image attachments are added to the content array as sub-arrays,
|
* Image attachments are added to the content array as sub-arrays,
|
||||||
* allowing for multiple images for each outbound email
|
* allowing for multiple images for each outbound email
|
||||||
*
|
*
|
||||||
* @param string $strContent Image data to attach to message
|
* @param string $strContent Image data to attach to message
|
||||||
* @param string $strImageName Image Name to give to attachment
|
* @param string $strImageName Image Name to give to attachment
|
||||||
* @param string $strMimeType Image Mime Type of attachment
|
* @param string $strMimeType Image Mime Type of attachment
|
||||||
* @param string $strImageCid CID
|
* @return void
|
||||||
* @return void
|
*
|
||||||
*
|
*/
|
||||||
*/
|
function setImageInline ( $strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown' )
|
||||||
function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
|
|
||||||
{
|
{
|
||||||
if ($strContent)
|
if ( $strContent )
|
||||||
{
|
{
|
||||||
$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
|
$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
|
||||||
$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
|
$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
|
||||||
@ -2172,7 +2170,7 @@ class SMTPs
|
|||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function setSensitivity($_value = 0)
|
function setSensitivity ( $_value = 0 )
|
||||||
{
|
{
|
||||||
if ( ( is_numeric ($_value) ) &&
|
if ( ( is_numeric ($_value) ) &&
|
||||||
( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
|
( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
|
||||||
@ -2518,10 +2516,7 @@ class SMTPs
|
|||||||
// ** CSV Version Control Info
|
// ** CSV Version Control Info
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* $Log: smtps.class.php,v $
|
* $Log: smtps.php,v $
|
||||||
* Revision 1.1 2011/09/03 00:14:27 eldy
|
|
||||||
* Doxygen
|
|
||||||
*
|
|
||||||
* Revision 1.4 2011/08/28 14:24:23 eldy
|
* Revision 1.4 2011/08/28 14:24:23 eldy
|
||||||
* Doxygen
|
* Doxygen
|
||||||
*
|
*
|
||||||
@ -234,7 +234,7 @@ class CMailFile
|
|||||||
// Use SMTPS library
|
// 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 = new SMTPs();
|
||||||
$smtps->setCharSet($conf->file->character_set_client);
|
$smtps->setCharSet($conf->file->character_set_client);
|
||||||
|
|
||||||
|
|||||||
@ -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 vat paid on due invoices (non draft)
|
||||||
if ($conf->global->MAIN_MODULE_ACCOUNTING)
|
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.
|
// n'est pas stocke dans la table des payments.
|
||||||
// Seul le module compta expert peut resoudre ce probleme.
|
// Seul le module compta expert peut resoudre ce probleme.
|
||||||
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
|
// (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 ($conf->global->MAIN_MODULE_ACCOUNTING)
|
||||||
{
|
{
|
||||||
// If vat paid on payments
|
// 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.
|
// n'est pas stocke dans la table des payments.
|
||||||
// Seul le module compta expert peut resoudre ce probleme.
|
// Seul le module compta expert peut resoudre ce probleme.
|
||||||
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
|
// (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)
|
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.
|
// n'est pas stocke dans la table des payments.
|
||||||
// Seul le module compta expert peut resoudre ce probleme.
|
// Seul le module compta expert peut resoudre ce probleme.
|
||||||
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
|
// (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)
|
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.
|
// n'est pas stocke dans la table des payments.
|
||||||
// Seul le module compta expert peut resoudre ce probleme.
|
// Seul le module compta expert peut resoudre ce probleme.
|
||||||
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
|
// (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)
|
if ($conf->global->MAIN_MODULE_ACCOUNTING)
|
||||||
{
|
{
|
||||||
// Count on invoice date
|
// 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.
|
// n'est pas stocke dans la table des payments.
|
||||||
// Seul le module compta expert peut resoudre ce probleme.
|
// Seul le module compta expert peut resoudre ce probleme.
|
||||||
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
|
// (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)
|
if ($conf->global->MAIN_MODULE_ACCOUNTING)
|
||||||
{
|
{
|
||||||
// Count on payments date
|
// 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.
|
// n'est pas stocke dans la table des payments.
|
||||||
// Seul le module compta expert peut resoudre ce probleme.
|
// Seul le module compta expert peut resoudre ce probleme.
|
||||||
// (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le
|
// (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le
|
||||||
|
|||||||
@ -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
|
* \ingroup service
|
||||||
* \brief Fichier de la classe des services par defaut
|
* \brief Fichier de la classe des services par defaut
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -2485,7 +2485,7 @@ class Product extends CommonObject
|
|||||||
if (file_exists($dir_osencoded))
|
if (file_exists($dir_osencoded))
|
||||||
{
|
{
|
||||||
// Cree fichier en taille vignette
|
// Cree fichier en taille vignette
|
||||||
// TODO A faire
|
// \todo A faire
|
||||||
|
|
||||||
// Cree fichier en taille origine
|
// Cree fichier en taille origine
|
||||||
$content = @file_get_contents($file);
|
$content = @file_get_contents($file);
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/societe/class/companybankaccount.class.php
|
* \files htdocs/societe/class/companybankaccount.class.php
|
||||||
* \ingroup societe
|
* \ingroup societe
|
||||||
* \brief File of class to manage bank accounts description of third parties
|
* \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
|
class CompanyBankAccount extends Account
|
||||||
{
|
{
|
||||||
var $rowid;
|
var $rowid;
|
||||||
var $socid;
|
var $socid;
|
||||||
|
|
||||||
var $bank;
|
var $bank;
|
||||||
var $courant;
|
var $courant;
|
||||||
var $clos;
|
var $clos;
|
||||||
var $code_banque;
|
var $code_banque;
|
||||||
var $code_guichet;
|
var $code_guichet;
|
||||||
var $number;
|
var $number;
|
||||||
var $cle_rib;
|
var $cle_rib;
|
||||||
var $bic;
|
var $bic;
|
||||||
var $iban;
|
var $iban;
|
||||||
var $iban_prefix; // deprecated
|
var $iban_prefix; // deprecated
|
||||||
var $proprio;
|
var $proprio;
|
||||||
var $adresse_proprio;
|
var $adresse_proprio;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*/
|
*/
|
||||||
function CompanyBankAccount($DB)
|
function CompanyBankAccount($DB)
|
||||||
{
|
{
|
||||||
$this->db = $DB;
|
$this->db = $DB;
|
||||||
|
|
||||||
$this->socid = 0;
|
$this->socid = 0;
|
||||||
$this->clos = 0;
|
$this->clos = 0;
|
||||||
$this->solde = 0;
|
$this->solde = 0;
|
||||||
$this->error_number = 0;
|
$this->error_number = 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create bank information record
|
* Create bank information record
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function create()
|
function create()
|
||||||
{
|
{
|
||||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")";
|
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")";
|
||||||
$resql=$this->db->query($sql);
|
$resql=$this->db->query($sql);
|
||||||
if ($resql)
|
if ($resql)
|
||||||
{
|
{
|
||||||
if ($this->db->affected_rows($resql))
|
if ($this->db->affected_rows($resql))
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print $this->db->error();
|
print $this->db->error();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function update($user='')
|
function update($user='')
|
||||||
{
|
{
|
||||||
|
|
||||||
$sql = "SELECT fk_soc FROM ".MAIN_DB_PREFIX."societe_rib";
|
$sql = "SELECT fk_soc FROM ".MAIN_DB_PREFIX."societe_rib";
|
||||||
$sql .= " WHERE fk_soc = ".$this->socid;
|
$sql .= " WHERE fk_soc = ".$this->socid;
|
||||||
|
|
||||||
$result = $this->db->query($sql);
|
$result = $this->db->query($sql);
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
if ($this->db->num_rows($result) == 0)
|
if ($this->db->num_rows($result) == 0)
|
||||||
{
|
{
|
||||||
$this->create();
|
$this->create();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dol_print_error($this->db);
|
dol_print_error($this->db);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET ";
|
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET ";
|
||||||
$sql .= " bank = '" .$this->db->escape($this->bank)."'";
|
$sql .= " bank = '" .$this->db->escape($this->bank)."'";
|
||||||
$sql .= ",code_banque='".$this->code_banque."'";
|
$sql .= ",code_banque='".$this->code_banque."'";
|
||||||
$sql .= ",code_guichet='".$this->code_guichet."'";
|
$sql .= ",code_guichet='".$this->code_guichet."'";
|
||||||
$sql .= ",number='".$this->number."'";
|
$sql .= ",number='".$this->number."'";
|
||||||
$sql .= ",cle_rib='".$this->cle_rib."'";
|
$sql .= ",cle_rib='".$this->cle_rib."'";
|
||||||
$sql .= ",bic='".$this->bic."'";
|
$sql .= ",bic='".$this->bic."'";
|
||||||
$sql .= ",iban_prefix = '".$this->iban_prefix."'";
|
$sql .= ",iban_prefix = '".$this->iban_prefix."'";
|
||||||
$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
|
$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
|
||||||
$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
|
$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
|
||||||
$sql .= ",adresse_proprio = '".$this->db->escape($this->adresse_proprio)."'";
|
$sql .= ",adresse_proprio = '".$this->db->escape($this->adresse_proprio)."'";
|
||||||
$sql .= " WHERE fk_soc = ".$this->socid;
|
$sql .= " WHERE fk_soc = ".$this->socid;
|
||||||
|
|
||||||
$result = $this->db->query($sql);
|
$result = $this->db->query($sql);
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dol_print_error($this->db);
|
dol_print_error($this->db);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load record from database
|
* Load record from database
|
||||||
* @param id Id of record
|
* @param id Id of record
|
||||||
* @param socid Id of company
|
* @param socid Id of company
|
||||||
*/
|
*/
|
||||||
function fetch($id,$socid=0)
|
function fetch($id,$socid=0)
|
||||||
{
|
{
|
||||||
if (empty($id) && empty($socid)) return -1;
|
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 = "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";
|
$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
|
||||||
if ($id) $sql.= " WHERE rowid = ".$id;
|
if ($id) $sql.= " WHERE rowid = ".$id;
|
||||||
if ($socid) $sql.= " WHERE fk_soc = ".$socid;
|
if ($socid) $sql.= " WHERE fk_soc = ".$socid;
|
||||||
|
|
||||||
$resql = $this->db->query($sql);
|
$resql = $this->db->query($sql);
|
||||||
if ($resql)
|
if ($resql)
|
||||||
{
|
{
|
||||||
if ($this->db->num_rows($resql))
|
if ($this->db->num_rows($resql))
|
||||||
{
|
{
|
||||||
$obj = $this->db->fetch_object($resql);
|
$obj = $this->db->fetch_object($resql);
|
||||||
|
|
||||||
$this->id = $obj->rowid;
|
$this->id = $obj->rowid;
|
||||||
$this->socid = $obj->fk_soc;
|
$this->socid = $obj->fk_soc;
|
||||||
$this->bank = $obj->bank;
|
$this->bank = $obj->bank;
|
||||||
$this->courant = $obj->courant;
|
$this->courant = $obj->courant;
|
||||||
$this->clos = $obj->clos;
|
$this->clos = $obj->clos;
|
||||||
$this->code_banque = $obj->code_banque;
|
$this->code_banque = $obj->code_banque;
|
||||||
$this->code_guichet = $obj->code_guichet;
|
$this->code_guichet = $obj->code_guichet;
|
||||||
$this->number = $obj->number;
|
$this->number = $obj->number;
|
||||||
$this->cle_rib = $obj->cle_rib;
|
$this->cle_rib = $obj->cle_rib;
|
||||||
$this->bic = $obj->bic;
|
$this->bic = $obj->bic;
|
||||||
$this->iban = $obj->iban;
|
$this->iban = $obj->iban;
|
||||||
$this->iban_prefix = $obj->iban; // deprecated
|
$this->iban_prefix = $obj->iban; // deprecated
|
||||||
$this->domiciliation = $obj->domiciliation;
|
$this->domiciliation = $obj->domiciliation;
|
||||||
$this->proprio = $obj->proprio;
|
$this->proprio = $obj->proprio;
|
||||||
$this->adresse_proprio = $obj->adresse_proprio;
|
$this->adresse_proprio = $obj->adresse_proprio;
|
||||||
}
|
}
|
||||||
$this->db->free($resql);
|
$this->db->free($resql);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dol_print_error($this->db);
|
dol_print_error($this->db);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -127,8 +127,8 @@ input.ui-input-text, textarea.ui-input-text {
|
|||||||
/* ============================================================================== */
|
/* ============================================================================== */
|
||||||
|
|
||||||
div.fiche {
|
div.fiche {
|
||||||
margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone)?'10':'2'); ?>px;
|
margin-<?php print $left; ?>: <?php print empty($conf->browser->phone)?'10':'2'; ?>px;
|
||||||
margin-<?php print $right; ?>: <?php print (empty($conf->browser->phone)?'6':''); ?>px;
|
margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'6':''; ?>px;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.fichecenter {
|
div.fichecenter {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user