--- /tmp/dsg/dolibarr/htdocs/compta/localtax/class/github_localtax.class.php
+++ /tmp/dsg/dolibarr/htdocs/compta/localtax/class/client_localtax.class.php
@@ -50,45 +50,45 @@
public $amount;
/**
- * @var string local tax
- */
- public $label;
-
- /**
- * @var int ID
- */
+ * @var string local tax
+ */
+ public $label;
+
+ /**
+ * @var int ID
+ */
public $fk_bank;
/**
- * @var int ID
- */
+ * @var int ID
+ */
public $fk_user_creat;
/**
- * @var int ID
- */
+ * @var int ID
+ */
public $fk_user_modif;
- /**
+ /**
* Constructor
*
* @param DoliDB $db Database handler
- */
- public function __construct($db)
- {
- $this->db = $db;
- }
-
-
- /**
- * Create in database
- *
- * @param User $user User that create
- * @return int <0 if KO, >0 if OK
- */
- public function create($user)
- {
- global $conf, $langs;
+ */
+ public function __construct($db)
+ {
+ $this->db = $db;
+ }
+
+
+ /**
+ * Create in database
+ *
+ * @param User $user User that create
+ * @return int <0 if KO, >0 if OK
+ */
+ public function create($user)
+ {
+ global $conf, $langs;
$error = 0;
@@ -97,7 +97,7 @@
$this->label = trim($this->label);
$this->note = trim($this->note);
- // Insert request
+ // Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax(";
$sql .= "localtaxtype,";
$sql .= "tms,";
@@ -109,8 +109,8 @@
$sql .= "fk_bank,";
$sql .= "fk_user_creat,";
$sql .= "fk_user_modif";
- $sql .= ") VALUES (";
- $sql .= " ".$this->ltt.",";
+ $sql .= ") VALUES (";
+ $sql .= " ".$this->ltt.",";
$sql .= " '".$this->db->idate($this->tms)."',";
$sql .= " '".$this->db->idate($this->datep)."',";
$sql .= " '".$this->db->idate($this->datev)."',";
@@ -123,41 +123,45 @@
$sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
-
- // Call trigger
- $result = $this->call_trigger('LOCALTAX_CREATE', $user);
- if ($result < 0) $error++;
- // End call triggers
-
- if (!$error)
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
+
+ // Call trigger
+ $result = $this->call_trigger('LOCALTAX_CREATE', $user);
+ if ($result < 0) $error++;
+ // End call triggers
+
+ if (!$error)
+ {
+ $this->db->commit();
+ return $this->id;
+ }
+ else
{
- $this->db->commit();
- return $this->id;
- } else {
$this->db->rollback();
return -1;
- }
- } else {
- $this->error = "Error ".$this->db->lasterror();
- $this->db->rollback();
- return -1;
- }
- }
-
- /**
- * Update database
- *
- * @param User $user User that modify
- * @param int $notrigger 0=no, 1=yes (no update trigger)
- * @return int <0 if KO, >0 if OK
- */
- public function update(User $user, $notrigger = 0)
- {
- global $conf, $langs;
+ }
+ }
+ else
+ {
+ $this->error = "Error ".$this->db->lasterror();
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
+ /**
+ * Update database
+ *
+ * @param User $user User that modify
+ * @param int $notrigger 0=no, 1=yes (no update trigger)
+ * @return int <0 if KO, >0 if OK
+ */
+ public function update(User $user, $notrigger = 0)
+ {
+ global $conf, $langs;
$error = 0;
@@ -182,43 +186,45 @@
$sql .= " fk_user_modif=".(int) $this->fk_user_modif;
$sql .= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::update", LOG_DEBUG);
- $resql = $this->db->query($sql);
- if (!$resql)
- {
- $this->error = "Error ".$this->db->lasterror();
- $error++;
- }
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if (!$resql)
+ {
+ $this->error = "Error ".$this->db->lasterror();
+ $error++;
+ }
if (!$error && !$notrigger)
{
- // Call trigger
- $result = $this->call_trigger('LOCALTAX_MODIFY', $user);
- if ($result < 0) $error++;
- // End call triggers
- }
-
- if (!$error)
- {
- $this->db->commit();
- return 1;
- } else {
- $this->db->rollback();
- return -1;
- }
- }
-
-
- /**
- * Load object in memory from database
- *
- * @param int $id Object id
- * @return int <0 if KO, >0 if OK
- */
- public function fetch($id)
- {
- global $langs;
- $sql = "SELECT";
+ // Call trigger
+ $result = $this->call_trigger('LOCALTAX_MODIFY', $user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+
+ if (!$error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
+
+ /**
+ * Load object in memory from database
+ *
+ * @param int $id Object id
+ * @return int <0 if KO, >0 if OK
+ */
+ public function fetch($id)
+ {
+ global $langs;
+ $sql = "SELECT";
$sql .= " t.rowid,";
$sql .= " t.localtaxtype,";
$sql .= " t.tms,";
@@ -233,21 +239,21 @@
$sql .= " b.fk_account,";
$sql .= " b.fk_type,";
$sql .= " b.rappro";
- $sql .= " FROM ".MAIN_DB_PREFIX."localtax as t";
+ $sql .= " FROM ".MAIN_DB_PREFIX."localtax as t";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
- $sql .= " WHERE t.rowid = ".$id;
-
- dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
- $resql = $this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
- $obj = $this->db->fetch_object($resql);
-
- $this->id = $obj->rowid;
- $this->ref = $obj->rowid;
- $this->ltt = $obj->localtaxtype;
+ $sql .= " WHERE t.rowid = ".$id;
+
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
+
+ $this->id = $obj->rowid;
+ $this->ref = $obj->rowid;
+ $this->ltt = $obj->localtaxtype;
$this->tms = $this->db->jdate($obj->tms);
$this->datep = $this->db->jdate($obj->datep);
$this->datev = $this->db->jdate($obj->datev);
@@ -260,15 +266,17 @@
$this->fk_account = $obj->fk_account;
$this->fk_type = $obj->fk_type;
$this->rappro = $obj->rappro;
- }
- $this->db->free($resql);
-
- return 1;
- } else {
- $this->error = "Error ".$this->db->lasterror();
- return -1;
- }
- }
+ }
+ $this->db->free($resql);
+
+ return 1;
+ }
+ else
+ {
+ $this->error = "Error ".$this->db->lasterror();
+ return -1;
+ }
+ }
/**
@@ -308,7 +316,7 @@
*/
public function initAsSpecimen()
{
- global $user;
+ global $user;
$this->id = 0;
@@ -325,257 +333,280 @@
}
- /**
- * Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de localtax, non ?
- *
- * @param int $year Year
- * @return int ???
- */
- public function solde($year = 0)
- {
- $reglee = $this->localtax_sum_reglee($year);
-
- $payee = $this->localtax_sum_payee($year);
- $collectee = $this->localtax_sum_collectee($year);
-
- $solde = $reglee - ($collectee - $payee);
-
- return $solde;
- }
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Total de la localtax des factures emises par la societe.
- *
- * @param int $year Year
- * @return int ???
- */
- public function localtax_sum_collectee($year = 0)
- {
- // phpcs:enable
- $sql = "SELECT sum(f.localtax) as amount";
- $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
- if ($year)
+ /**
+ * Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de localtax, non ?
+ *
+ * @param int $year Year
+ * @return int ???
+ */
+ public function solde($year = 0)
+ {
+ $reglee = $this->localtax_sum_reglee($year);
+
+ $payee = $this->localtax_sum_payee($year);
+ $collectee = $this->localtax_sum_collectee($year);
+
+ $solde = $reglee - ($collectee - $payee);
+
+ return $solde;
+ }
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Total de la localtax des factures emises par la societe.
+ *
+ * @param int $year Year
+ * @return int ???
+ */
+ public function localtax_sum_collectee($year = 0)
+ {
+ // phpcs:enable
+ $sql = "SELECT sum(f.localtax) as amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+ if ($year)
+ {
+ $sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+ }
+
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ if ($this->db->num_rows($result))
+ {
+ $obj = $this->db->fetch_object($result);
+ $ret = $obj->amount;
+ $this->db->free($result);
+ return $ret;
+ }
+ else
+ {
+ $this->db->free($result);
+ return 0;
+ }
+ }
+ else
{
- $sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
- }
-
- $result = $this->db->query($sql);
- if ($result)
- {
- if ($this->db->num_rows($result))
+ print $this->db->lasterror();
+ return -1;
+ }
+ }
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * localtax payed
+ *
+ * @param int $year Year
+ * @return int ???
+ */
+ public function localtax_sum_payee($year = 0)
+ {
+ // phpcs:enable
+
+ $sql = "SELECT sum(f.total_localtax) as total_localtax";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+ if ($year)
+ {
+ $sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+ }
+
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ if ($this->db->num_rows($result))
+ {
+ $obj = $this->db->fetch_object($result);
+ $ret = $obj->total_localtax;
+ $this->db->free($result);
+ return $ret;
+ }
+ else
{
- $obj = $this->db->fetch_object($result);
- $ret = $obj->amount;
- $this->db->free($result);
- return $ret;
- } else {
- $this->db->free($result);
+ $this->db->free($result);
+ return 0;
+ }
+ }
+ else
+ {
+ print $this->db->lasterror();
+ return -1;
+ }
+ }
+
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * localtax payed
+ * Total de la localtax payed
+ *
+ * @param int $year Year
+ * @return int ???
+ */
+ public function localtax_sum_reglee($year = 0)
+ {
+ // phpcs:enable
+
+ $sql = "SELECT sum(f.amount) as amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
+ if ($year)
+ {
+ $sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
+ }
+
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ if ($this->db->num_rows($result))
+ {
+ $obj = $this->db->fetch_object($result);
+ $ret = $obj->amount;
+ $this->db->free($result);
+ return $ret;
+ }
+ else
+ {
+ $this->db->free($result);
return 0;
- }
- } else {
- print $this->db->lasterror();
- return -1;
- }
- }
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Total of localtax paid in invoice
- *
- * @param int $year Year
- * @return int ???
- */
- public function localtax_sum_payee($year = 0)
- {
- // phpcs:enable
-
- $sql = "SELECT sum(f.total_localtax) as total_localtax";
- $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
- if ($year)
- {
- $sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
- }
-
- $result = $this->db->query($sql);
- if ($result)
- {
- if ($this->db->num_rows($result))
- {
- $obj = $this->db->fetch_object($result);
- $ret = $obj->total_localtax;
- $this->db->free($result);
- return $ret;
- } else {
- $this->db->free($result);
- return 0;
- }
- } else {
- print $this->db->lasterror();
- return -1;
- }
- }
-
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Total of localtax paid
- *
- * @param int $year Year
- * @return int ???
- */
- public function localtax_sum_reglee($year = 0)
- {
- // phpcs:enable
-
- $sql = "SELECT sum(f.amount) as amount";
- $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
- if ($year)
- {
- $sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
- }
-
- $result = $this->db->query($sql);
- if ($result)
- {
- if ($this->db->num_rows($result))
- {
- $obj = $this->db->fetch_object($result);
- $ret = $obj->amount;
- $this->db->free($result);
- return $ret;
- } else {
- $this->db->free($result);
- return 0;
- }
- } else {
- print $this->db->lasterror();
- return -1;
- }
- }
-
-
- /**
- * Add a payment of localtax
- *
+ }
+ }
+ else
+ {
+ print $this->db->lasterror();
+ return -1;
+ }
+ }
+
+
+ /**
+ * Add a payment of localtax
+ *
* @param User $user Object user that insert
* @return int <0 if KO, rowid in localtax table if OK
- */
- public function addPayment($user)
- {
- global $conf, $langs;
-
- $this->db->begin();
-
- // Check parameters
- $this->amount = price2num($this->amount);
+ */
+ public function addPayment($user)
+ {
+ global $conf, $langs;
+
+ $this->db->begin();
+
+ // Check parameters
+ $this->amount = price2num($this->amount);
if (!$this->label)
{
$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
return -3;
}
- if ($this->amount <= 0)
- {
- $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
- return -4;
- }
- if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
- {
- $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
- return -5;
- }
- if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
- {
- $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
- return -5;
- }
-
- // Insertion dans table des paiement localtax
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
- if ($this->note) $sql .= ", note";
- if ($this->label) $sql .= ", label";
- $sql .= ", fk_user_creat, fk_bank";
+ if ($this->amount <= 0)
+ {
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+ return -4;
+ }
+ if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+ {
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+ return -5;
+ }
+ if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
+ {
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+ return -5;
+ }
+
+ // Insertion dans table des paiement localtax
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
+ if ($this->note) $sql .= ", note";
+ if ($this->label) $sql .= ", label";
+ $sql .= ", fk_user_creat, fk_bank";
$sql .= ") ";
- $sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
- $sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
- if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
- if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
- $sql .= ", ".((int) $user->id).", NULL";
- $sql .= ")";
+ $sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
+ $sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
+ if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+ if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+ $sql .= ", ".((int) $user->id).", NULL";
+ $sql .= ")";
dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
- $result = $this->db->query($sql);
- if ($result)
- {
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
- if ($this->id > 0)
- {
- $ok = 1;
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
+ if ($this->id > 0)
+ {
+ $ok = 1;
if (!empty($conf->banque->enabled))
- {
- // Insertion dans llx_bank
- require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
- $acc = new Account($this->db);
+ {
+ // Insertion dans llx_bank
+ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+ $acc = new Account($this->db);
$result = $acc->fetch($this->accountid);
if ($result <= 0) dol_print_error($this->db);
- $bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
-
- // Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g�n�r� l'�criture bancaire
- if ($bank_line_id > 0)
+ $bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
+
+ // Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g�n�r� l'�criture bancaire
+ if ($bank_line_id > 0)
{
- $this->update_fk_bank($bank_line_id);
- } else {
- $this->error = $acc->error;
- $ok = 0;
- }
-
- // Mise a jour liens
- $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
- if ($result < 0)
+ $this->update_fk_bank($bank_line_id);
+ }
+ else
{
$this->error = $acc->error;
$ok = 0;
}
- }
+
+ // Mise a jour liens
+ $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
+ if ($result < 0)
+ {
+ $this->error = $acc->error;
+ $ok = 0;
+ }
+ }
if ($ok)
{
$this->db->commit();
return $this->id;
- } else {
+ }
+ else
+ {
$this->db->rollback();
return -3;
}
- } else {
- $this->error = $this->db->lasterror();
- $this->db->rollback();
- return -2;
- }
- } else {
- $this->error = $this->db->lasterror();
- $this->db->rollback();
- return -1;
- }
- }
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Update the link betwen localtax payment and the line into llx_bank
- *
- * @param int $id Id bank account
+ }
+ else
+ {
+ $this->error = $this->db->lasterror();
+ $this->db->rollback();
+ return -2;
+ }
+ }
+ else
+ {
+ $this->error = $this->db->lasterror();
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Update the link betwen localtax payment and the line into llx_bank
+ *
+ * @param int $id Id bank account
* @return int <0 if KO, >0 if OK
- */
+ */
public function update_fk_bank($id)
{
- // phpcs:enable
+ // phpcs:enable
$sql = 'UPDATE '.MAIN_DB_PREFIX.'localtax SET fk_bank = '.$id;
$sql .= ' WHERE rowid = '.$this->id;
$result = $this->db->query($sql);
if ($result) {
return 1;
- } else {
+ }
+ else
+ {
dol_print_error($this->db);
return -1;
}
@@ -596,12 +627,12 @@
$result = '';
$label = $langs->trans("ShowVatPayment").': '.$this->ref;
- $link = '';
+ $link = '';
$linkend = '';
$picto = 'payment';
- if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+ if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
if ($withpicto && $withpicto != 2) $result .= ' ';
if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
return $result;
@@ -618,7 +649,7 @@
return $this->LibStatut($this->statut, $mode);
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Renvoi le libelle d'un statut donne
*
@@ -626,11 +657,11 @@
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Libelle du statut
*/
- public function LibStatut($status, $mode = 0)
- {
- // phpcs:enable
- global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
-
- return '';
- }
+ public function LibStatut($status, $mode = 0)
+ {
+ // phpcs:enable
+ global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+
+ return '';
+ }
}