diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 90a4e59fe40ce559ce782bf98f87886d61841153..1240e8f7655ccd2ccc9bcda3bf4eb312b0924c0a 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -142,7 +142,7 @@ $memberstatic=new Adherent($db); $paymentstatic=new Paiement($db); $paymentsupplierstatic=new PaiementFourn($db); $paymentvatstatic=new TVA($db); -$paymentsalstatic=new Sal($db); +$paymentsalstatic=new Salaries($db); $bankstatic=new Account($db); $banklinestatic=new AccountLine($db); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 1004f765fa813c62f52c875531ccb6b4684a86da..1a2fa0cf0f6e20c5b8f6094ebd41ae251054b0c1 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -61,7 +61,7 @@ if (! $sortorder) $sortorder="DESC"; $tva_static = new Tva($db); $socialcontrib=new ChargeSociales($db); $payment_sc_static=new PaymentSocialContribution($db); -$sal_static = new Sal($db); +$sal_static = new Salaries($db); llxHeader('',$langs->trans("TaxAndDividendsArea")); @@ -86,7 +86,7 @@ if (GETPOST("mode") != 'sconly') // Salaries if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') { - $sal = new Sal($db); + $sal = new Salaries($db); print_fiche_titre($langs->trans("SalPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); diff --git a/htdocs/compta/salaries/class/salaries.class.php b/htdocs/compta/salaries/class/salaries.class.php index ccb89a1e4e50a382d8ffe950495e47ff3f65edf2..51b2682918aaeb3beacfaa2916929b0d1cee2567 100644 --- a/htdocs/compta/salaries/class/salaries.class.php +++ b/htdocs/compta/salaries/class/salaries.class.php @@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** * Put here description of your class */ -class Sal extends CommonObject +class Salaries extends CommonObject { //public $element='salaries'; //!< Id that identify managed objects //public $table_element='salaries'; //!< Name of table without prefix where object is stored @@ -130,7 +130,7 @@ class Sal extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('SAL_CREATE',$this,$user,$langs,$conf); + $result=$interface->run_triggers('SALARIES_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers @@ -205,7 +205,7 @@ class Sal extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('SAL_MODIFY',$this,$user,$langs,$conf); + $result=$interface->run_triggers('SALARIES_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers } @@ -313,7 +313,7 @@ class Sal extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('SAL_DELETE',$this,$user,$langs,$conf); + $result=$interface->run_triggers('SALARIES_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers @@ -424,7 +424,7 @@ class Sal extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $result=$interface->run_triggers('SAL_ADDPAYMENT',$this,$user,$langs,$conf); + $result=$interface->run_triggers('SALARIES_ADDPAYMENT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers @@ -478,7 +478,7 @@ class Sal extends CommonObject $linkaddedforthirdparty=array(); foreach ($this->amounts as $key => $value) { - $sal = new Sal ($this->db); + $sal = new Salaries ($this->db); $sal->fetch($key); $sal->fetch_user($this->fk_user); diff --git a/htdocs/compta/salaries/fiche.php b/htdocs/compta/salaries/fiche.php index 2cdca50a71fd3526a7b6111a253588613ed13802..04563f9aae6a0e6c811a48b8bf86bc4717b24693 100644 --- a/htdocs/compta/salaries/fiche.php +++ b/htdocs/compta/salaries/fiche.php @@ -38,7 +38,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:''; if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'tax', '', '', 'charges'); -$sal = new Sal($db); +$sal = new Salaries($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('taxsalcard')); @@ -144,7 +144,7 @@ $form = new Form($db); if ($id) { - $salpayment = new Sal($db); + $salpayment = new Salaries($db); $result = $salpayment->fetch($id); if ($result <= 0) { diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index a2e166529def7b05da0493abbed00cd1a1350ed4..4d38643ec4894f971bd9f4d08dafbbfccd5c3aef 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -39,7 +39,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges'); llxHeader(); -$salstatic = new Sal($db); +$salstatic = new Salaries($db); $userstatic = new User($db);