lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "Sal" class into "Salaries"

Browse Source
This commit is contained in:
aspangaro 2014-03-10 21:17:03 +01:00
parent db0a45d78f
commit 61a5735300
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ $memberstatic=new Adherent($db);
$paymentstatic=new Paiement($db); $paymentstatic=new Paiement($db);
$paymentsupplierstatic=new PaiementFourn($db); $paymentsupplierstatic=new PaiementFourn($db);
$paymentvatstatic=new TVA($db); $paymentvatstatic=new TVA($db);
$paymentsalstatic=new Sal($db); $paymentsalstatic=new Salaries($db);
$bankstatic=new Account($db); $bankstatic=new Account($db);
$banklinestatic=new AccountLine($db); $banklinestatic=new AccountLine($db);

4
htdocs/compta/charges/index.php
View File

@ -61,7 +61,7 @@ if (! $sortorder) $sortorder="DESC";
$tva_static = new Tva($db); $tva_static = new Tva($db);
$socialcontrib=new ChargeSociales($db); $socialcontrib=new ChargeSociales($db);
$payment_sc_static=new PaymentSocialContribution($db); $payment_sc_static=new PaymentSocialContribution($db);
$sal_static = new Sal($db); $sal_static = new Salaries($db);
llxHeader('',$langs->trans("TaxAndDividendsArea")); llxHeader('',$langs->trans("TaxAndDividendsArea"));
@ -86,7 +86,7 @@ if (GETPOST("mode") != 'sconly')
// Salaries // Salaries
if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') 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.')':''), '', ''); print_fiche_titre($langs->trans("SalPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');

12
htdocs/compta/salaries/class/salaries.class.php
View File

@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
/** /**
* Put here description of your class * Put here description of your class
*/ */
class Sal extends CommonObject class Salaries extends CommonObject
{ {
//public $element='salaries'; //!< Id that identify managed objects //public $element='salaries'; //!< Id that identify managed objects
//public $table_element='salaries'; //!< Name of table without prefix where object is stored //public $table_element='salaries'; //!< Name of table without prefix where object is stored
@ -130,7 +130,7 @@ class Sal extends CommonObject
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $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; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
@ -205,7 +205,7 @@ class Sal extends CommonObject
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $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; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
} }
@ -313,7 +313,7 @@ class Sal extends CommonObject
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $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; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
@ -424,7 +424,7 @@ class Sal extends CommonObject
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $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; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
@ -478,7 +478,7 @@ class Sal extends CommonObject
$linkaddedforthirdparty=array(); $linkaddedforthirdparty=array();
foreach ($this->amounts as $key => $value) foreach ($this->amounts as $key => $value)
{ {
$sal = new Sal ($this->db); $sal = new Salaries ($this->db);
$sal->fetch($key); $sal->fetch($key);
$sal->fetch_user($this->fk_user); $sal->fetch_user($this->fk_user);

4
htdocs/compta/salaries/fiche.php
View File

@ -38,7 +38,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges'); $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 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('taxsalcard')); $hookmanager->initHooks(array('taxsalcard'));
@ -144,7 +144,7 @@ $form = new Form($db);
if ($id) if ($id)
{ {
$salpayment = new Sal($db); $salpayment = new Salaries($db);
$result = $salpayment->fetch($id); $result = $salpayment->fetch($id);
if ($result <= 0) if ($result <= 0)
{ {

2
htdocs/compta/salaries/index.php
View File

@ -39,7 +39,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
llxHeader(); llxHeader();
$salstatic = new Sal($db); $salstatic = new Salaries($db);
$userstatic = new User($db); $userstatic = new User($db);