Qual: Spelling htdocs/[d-k]* (#27427)
Highlights: - htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php Potential functional change (fix) because toekn was changed to token: `<input type=hidden name=toekn` - htdocs/install/upgrade2.php $filles changed to $children - htdocs/intracommreport/class/intracommreport.class.php Local $enveloppe changed to $envelope. Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
MDW
GitHub
parent
89004f7e03
commit
bd002480ce
114 changed files with 382 additions and 382 deletions
|
|
@ -102,7 +102,7 @@ class ActionsDatapolicy extends CommonHookActions
|
|||
|
||||
// FIXME Removed hard coded id, use codes
|
||||
if ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'anonymiser' && (in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8)) {
|
||||
// on verifie si l'objet est utilisé
|
||||
// Verify if the object is used
|
||||
if ($object->isObjectUsed(GETPOST('socid'))) {
|
||||
$object->name = $langs->trans('ANONYME');
|
||||
$object->name_alias = '';
|
||||
|
|
@ -252,7 +252,7 @@ class ActionsDatapolicy extends CommonHookActions
|
|||
}
|
||||
|
||||
if (GETPOST('socid')) {
|
||||
/* Removed due to awful harcoded values
|
||||
/* Removed due to awful hardcoded values
|
||||
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
||||
$societe = new Societe($this->db);
|
||||
$societe->fetch(GETPOST('socid'));
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
|
|||
// Check date validity
|
||||
if ($user->isNotIntoValidityDateRange()) {
|
||||
// User validity dates are no more valid
|
||||
dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
|
||||
dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], current date is ".dol_now());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ class TraceableDB extends DoliDB
|
|||
* Format a SQL IF
|
||||
*
|
||||
* @param string $test Test string (example: 'cd.statut=0', 'field IS NULL')
|
||||
* @param string $resok resultat si test egal
|
||||
* @param string $resko resultat si test non egal
|
||||
* @param string $resok resultat si test equal
|
||||
* @param string $resko resultat si test non equal
|
||||
* @return string SQL string
|
||||
*/
|
||||
public function ifsql($test, $resok, $resko)
|
||||
|
|
@ -102,7 +102,7 @@ class TraceableDB extends DoliDB
|
|||
* Function to use to build INSERT, UPDATE or WHERE predica
|
||||
*
|
||||
* @param int $param Date TMS to convert
|
||||
* @param mixed $gm 'gmt'=Input informations are GMT values, 'tzserver'=Local to server TZ
|
||||
* @param mixed $gm 'gmt'=Input information are GMT values, 'tzserver'=Local to server TZ
|
||||
* @return string Date in a string YYYY-MM-DD HH:MM:SS
|
||||
*/
|
||||
public function idate($param, $gm = 'tzserver')
|
||||
|
|
@ -124,7 +124,7 @@ class TraceableDB extends DoliDB
|
|||
* Start transaction
|
||||
*
|
||||
* @param string $textinlog Add a small text into log. '' by default.
|
||||
* @return int 1 if transaction successfuly opened or already opened, 0 if error
|
||||
* @return int 1 if transaction successfully opened or already opened, 0 if error
|
||||
*/
|
||||
public function begin($textinlog = '')
|
||||
{
|
||||
|
|
@ -197,7 +197,7 @@ class TraceableDB extends DoliDB
|
|||
* List tables into a database
|
||||
*
|
||||
* @param string $database Name of database
|
||||
* @param string $table Nmae of table filter ('xxx%')
|
||||
* @param string $table Name of table filter ('xxx%')
|
||||
* @return array List of tables in an array
|
||||
*/
|
||||
public function DDLListTables($database, $table = '')
|
||||
|
|
@ -209,7 +209,7 @@ class TraceableDB extends DoliDB
|
|||
* List tables into a database with table info
|
||||
*
|
||||
* @param string $database Name of database
|
||||
* @param string $table Nmae of table filter ('xxx%')
|
||||
* @param string $table Name of table filter ('xxx%')
|
||||
* @return array List of tables in an array
|
||||
*/
|
||||
public function DDLListTablesFull($database, $table = '')
|
||||
|
|
@ -323,7 +323,7 @@ class TraceableDB extends DoliDB
|
|||
* Cancel a transaction and go back to initial data values
|
||||
*
|
||||
* @param string $log Add more log to default log line
|
||||
* @return resource|int 1 if cancelation is ok or transaction not open, 0 if error
|
||||
* @return resource|int 1 if cancellation is ok or transaction not open, 0 if error
|
||||
*/
|
||||
public function rollback($log = '')
|
||||
{
|
||||
|
|
@ -387,7 +387,7 @@ class TraceableDB extends DoliDB
|
|||
}
|
||||
|
||||
/**
|
||||
* Connexion to server
|
||||
* Connection to server
|
||||
*
|
||||
* @param string $host database server host
|
||||
* @param string $login login
|
||||
|
|
@ -483,7 +483,7 @@ class TraceableDB extends DoliDB
|
|||
/**
|
||||
* Return generic error code of last operation.
|
||||
*
|
||||
* @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
|
||||
* @return string Error code (Examples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
|
||||
*/
|
||||
public function errno()
|
||||
{
|
||||
|
|
@ -533,7 +533,7 @@ class TraceableDB extends DoliDB
|
|||
*
|
||||
* @param string $table Name of table
|
||||
* @param string $field_name Name of field to add
|
||||
* @param string $field_desc Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
|
||||
* @param string $field_desc Tableau associatif de description du champ a inserer[nom du parameter][valeur du parameter]
|
||||
* @param string $field_position Optionnel ex.: "after champtruc"
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -614,7 +614,7 @@ class TraceableDB extends DoliDB
|
|||
*
|
||||
* @param string $dolibarr_main_db_host Ip serveur
|
||||
* @param string $dolibarr_main_db_user Nom user a creer
|
||||
* @param string $dolibarr_main_db_pass Mot de passe user a creer
|
||||
* @param string $dolibarr_main_db_pass Password user a creer
|
||||
* @param string $dolibarr_main_db_name Database name where user must be granted
|
||||
* @return int Return integer <0 if KO, >=0 if OK
|
||||
*/
|
||||
|
|
@ -630,7 +630,7 @@ class TraceableDB extends DoliDB
|
|||
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
|
||||
*
|
||||
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
||||
* @param bool $gm 1=Input informations are GMT values, otherwise local to server TZ
|
||||
* @param bool $gm 1=Input information are GMT values, otherwise local to server TZ
|
||||
* @return int|string Date TMS or ''
|
||||
*/
|
||||
public function jdate($string, $gm = false)
|
||||
|
|
@ -667,7 +667,7 @@ class TraceableDB extends DoliDB
|
|||
* List information of columns into a table.
|
||||
*
|
||||
* @param string $table Name of table
|
||||
* @return array Array with inforation on table
|
||||
* @return array Array with information on table
|
||||
*/
|
||||
public function DDLInfoTable($table)
|
||||
{
|
||||
|
|
@ -686,9 +686,9 @@ class TraceableDB extends DoliDB
|
|||
}
|
||||
|
||||
/**
|
||||
* Close database connexion
|
||||
* Close database connection
|
||||
*
|
||||
* @return boolean True if disconnect successfull, false otherwise
|
||||
* @return boolean True if disconnect successful, false otherwise
|
||||
* @see connect()
|
||||
*/
|
||||
public function close()
|
||||
|
|
@ -707,9 +707,9 @@ class TraceableDB extends DoliDB
|
|||
}
|
||||
|
||||
/**
|
||||
* Return connexion ID
|
||||
* Return connection ID
|
||||
*
|
||||
* @return string Id connexion
|
||||
* @return string Id connection
|
||||
*/
|
||||
public function DDLGetConnectId()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -696,11 +696,11 @@ if ($action == 'create') {
|
|||
print '</div></div>';
|
||||
} else {
|
||||
/* Expedition non trouvee */
|
||||
print "Expedition inexistante ou acces refuse";
|
||||
print "Expedition inexistante ou access refuse";
|
||||
}
|
||||
} else {
|
||||
/* Expedition non trouvee */
|
||||
print "Expedition inexistante ou acces refuse";
|
||||
print "Expedition inexistante ou access refuse";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ class Delivery extends CommonObject
|
|||
public $socid;
|
||||
|
||||
/**
|
||||
* @var string ref custome
|
||||
* @var string ref customer
|
||||
*/
|
||||
public $ref_customer;
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ class Delivery extends CommonObject
|
|||
/**
|
||||
* Create delivery receipt in database
|
||||
*
|
||||
* @param User $user Objet du user qui cree
|
||||
* @param User $user Object du user qui cree
|
||||
* @return int Return integer <0 si erreur, id delivery cree si ok
|
||||
*/
|
||||
public function create($user)
|
||||
|
|
@ -991,7 +991,7 @@ class Delivery extends CommonObject
|
|||
}
|
||||
}
|
||||
|
||||
// Initialise parametres
|
||||
// Initialise parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->specimen = 1;
|
||||
|
|
@ -1040,7 +1040,7 @@ class Delivery extends CommonObject
|
|||
while ($i < $num_lines) {
|
||||
$objSourceLine = $this->db->fetch_object($resultSourceLine);
|
||||
|
||||
// Get lines of sources alread delivered
|
||||
// Get lines of sources already delivered
|
||||
$sql = "SELECT ld.fk_origin_line, sum(ld.qty) as qty";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."deliverydet as ld, ".MAIN_DB_PREFIX."delivery as l,";
|
||||
$sql .= " ".MAIN_DB_PREFIX.$this->linked_objects[0]['type']." as c";
|
||||
|
|
@ -1082,7 +1082,7 @@ class Delivery extends CommonObject
|
|||
/**
|
||||
* Set the planned delivery date
|
||||
*
|
||||
* @param User $user Objet utilisateur qui modifie
|
||||
* @param User $user Object utilisateur qui modifie
|
||||
* @param integer $delivery_date Delivery date
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ if ($action == 'create') {
|
|||
print '<td>';
|
||||
$filter = '((s.client:IN:1,2,3) AND (status:=:1))';
|
||||
print $form->select_company($soc->id, 'socid', $filter, 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
|
||||
// Option to reload page to retrieve customer informations. Note, this clear other input
|
||||
// Option to reload page to retrieve customer information. Note, this clear other input
|
||||
if (getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
|
||||
print '<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ class Donations extends DolibarrApi
|
|||
/**
|
||||
* Get properties of an donation object
|
||||
*
|
||||
* Return an array with donation informations
|
||||
* Return an array with donation information
|
||||
*
|
||||
* @param int $id ID of order
|
||||
* @return Object Object with cleaned properties
|
||||
|
|
@ -94,7 +94,7 @@ class Donations extends DolibarrApi
|
|||
* @param int $page Page number
|
||||
* @param string $thirdparty_ids Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
|
||||
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
|
||||
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
|
||||
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
|
||||
* @return array Array of order objects
|
||||
*
|
||||
* @throws RestException
|
||||
|
|
@ -186,7 +186,7 @@ class Donations extends DolibarrApi
|
|||
|
||||
foreach ($request_data as $field => $value) {
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->don->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -235,7 +235,7 @@ class Donations extends DolibarrApi
|
|||
continue;
|
||||
}
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->don->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ class Don extends CommonObject
|
|||
}
|
||||
}
|
||||
|
||||
// Initialise parametres
|
||||
// Initialise parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->specimen = 1;
|
||||
|
|
@ -482,7 +482,7 @@ class Don extends CommonObject
|
|||
/**
|
||||
* Update a donation record
|
||||
*
|
||||
* @param User $user Objet utilisateur qui met a jour le don
|
||||
* @param User $user Object utilisateur qui met a jour le don
|
||||
* @param int $notrigger Disable triggers
|
||||
* @return int >0 if OK, <0 if KO
|
||||
*/
|
||||
|
|
@ -879,7 +879,7 @@ class Don extends CommonObject
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Charge indicateurs this->nb pour le tableau de bord
|
||||
* Load the indicators this->nb for the state board
|
||||
*
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -1007,7 +1007,7 @@ class Don extends CommonObject
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
@ -1061,7 +1061,7 @@ class Don extends CommonObject
|
|||
foreach (array('html', 'doc', 'pdf') as $prefix) {
|
||||
$file = $prefix."_".preg_replace('/^html_/', '', $modele).".modules.php";
|
||||
|
||||
// On verifie l'emplacement du modele
|
||||
// Verify the path for the module
|
||||
$file = dol_buildpath($reldir."core/modules/dons/".$file, 0);
|
||||
if (file_exists($file)) {
|
||||
$filefound = 1;
|
||||
|
|
|
|||
|
|
@ -711,7 +711,7 @@ class EcmDirectory extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its childs.
|
||||
* Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its children.
|
||||
* Separator between directories is always '/', whatever is OS.
|
||||
*
|
||||
* @param int $id_categ id_categ entry to update
|
||||
|
|
|
|||
|
|
@ -863,7 +863,7 @@ class EcmFiles extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes' &
|
|||
}
|
||||
|
||||
// Refresh directory view
|
||||
// This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
|
||||
// This refresh list of dirs, not list of files (for performance reason). List of files is refresh only if dir was not synchronized.
|
||||
// To refresh content of dir with cache, just open the dir in edit mode.
|
||||
if ($action == 'refreshmanual' && $permissiontoread) {
|
||||
$ecmdirtmp = new EcmDirectory($db);
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes') {
|
|||
}
|
||||
|
||||
// Refresh directory view
|
||||
// This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
|
||||
// This refresh list of dirs, not list of files (for performance reason). List of files is refresh only if dir was not synchronized.
|
||||
// To refresh content of dir with cache, just open the dir in edit mode.
|
||||
if ($action == 'refreshmanual') {
|
||||
$ecmdirtmp = new EcmDirectory($db);
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
|
|||
}
|
||||
|
||||
// Refresh directory view
|
||||
// This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
|
||||
// This refresh list of dirs, not list of files (for performance reason). List of files is refresh only if dir was not synchronized.
|
||||
// To refresh content of dir with cache, just open the dir in edit mode.
|
||||
if ($action == 'refreshmanual') {
|
||||
$ecmdirtmp = new EcmDirectory($db);
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ class EmailCollector extends CommonObject
|
|||
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
|
||||
* 'default' is a default value for creation (can still be replaced by the global setup of default values)
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'position' is the sort order of field.
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
|
|
@ -556,7 +556,7 @@ class EmailCollector extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -670,7 +670,7 @@ class EmailCollector extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Charge les informations d'ordre info dans l'objet commande
|
||||
* Charge les information d'ordre info dans l'objet commande
|
||||
*
|
||||
* @param int $id Id of order
|
||||
* @return void
|
||||
|
|
@ -850,7 +850,7 @@ class EmailCollector extends CommonObject
|
|||
|
||||
/**
|
||||
* Action executed by scheduler
|
||||
* CAN BE A CRON TASK. In such a case, paramerts come from the schedule job setup field 'Parameters'
|
||||
* CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
|
||||
*
|
||||
* @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
|
||||
*/
|
||||
|
|
@ -1724,7 +1724,7 @@ class EmailCollector extends CommonObject
|
|||
}
|
||||
if (getDolGlobalString('EMAILCOLLECTOR_USE_IN_REPLY_TO_TO_DETECT_ANSWERS')) {
|
||||
// Note: "In-Reply-To" to detect if mail is an answer of another mail is not reliable because we can have:
|
||||
// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer but may be NOT (for example a transfer of an email rewriten)
|
||||
// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer but may be NOT (for example a transfer of an email rewritten)
|
||||
if (!empty($headers['In-Reply-To'])) {
|
||||
$isanswer = 1;
|
||||
}
|
||||
|
|
@ -1741,7 +1741,7 @@ class EmailCollector extends CommonObject
|
|||
if ($searchfilterisnotanswer > 0) {
|
||||
if (!empty($headers['In-Reply-To'])) {
|
||||
// Note: we can have
|
||||
// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
|
||||
// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewritten)
|
||||
$isanswer = 0;
|
||||
if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
|
||||
$isanswer = 1;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class EmailCollectorAction extends CommonObject
|
|||
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
|
||||
* 'default' is a default value for creation (can still be replaced by the global setup of default values)
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'position' is the sort order of field.
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
|
|
@ -265,7 +265,7 @@ class EmailCollectorAction extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -417,7 +417,7 @@ class EmailCollectorAction extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Charge les informations d'ordre info dans l'objet commande
|
||||
* Charge les information d'ordre info dans l'objet commande
|
||||
*
|
||||
* @param int $id Id of order
|
||||
* @return void
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ class EmailCollectorFilter extends CommonObject
|
|||
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
|
||||
* 'default' is a default value for creation (can still be replaced by the global setup of default values)
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'position' is the sort order of field.
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
|
|
@ -279,7 +279,7 @@ class EmailCollectorFilter extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -431,7 +431,7 @@ class EmailCollectorFilter extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Charge les informations d'ordre info dans l'objet commande
|
||||
* Charge les information d'ordre info dans l'objet commande
|
||||
*
|
||||
* @param int $id Id of order
|
||||
* @return void
|
||||
|
|
|
|||
|
|
@ -153,8 +153,8 @@ function getAttachments($jk, $mbox)
|
|||
*/
|
||||
function getFileData($jk, $fpos, $type, $mbox)
|
||||
{
|
||||
$mege = imap_fetchbody($mbox, $jk, $fpos, FT_UID);
|
||||
$data = getDecodeValue($mege, $type);
|
||||
$merge = imap_fetchbody($mbox, $jk, $fpos, FT_UID);
|
||||
$data = getDecodeValue($merge, $type);
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ class ConferenceOrBooth extends ActionComm
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
|
||||
|
|
@ -394,7 +394,7 @@ class ConferenceOrBooth extends ActionComm
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_CONFIRMED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -512,7 +512,7 @@ class ConferenceOrBooth extends ActionComm
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param int $maxlength Not use here just for declaration method compatibility with parent classes
|
||||
|
|
@ -760,7 +760,7 @@ class ConferenceOrBooth extends ActionComm
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class ConferenceOrBoothAttendee extends CommonObject
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
|
||||
|
|
@ -541,7 +541,7 @@ class ConferenceOrBoothAttendee extends CommonObject
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -726,7 +726,7 @@ class ConferenceOrBoothAttendee extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -1014,7 +1014,7 @@ class ConferenceOrBoothAttendee extends CommonObject
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
|
|||
|
||||
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST("search_all", 'alpha');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ if (!$sortorder) {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
@ -811,7 +811,7 @@ $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('sele
|
|||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
|
|||
|
||||
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ global $dolibarr_main_url_root;
|
|||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("eventorganization", "other", "projects", "bills"));
|
||||
|
||||
// Get Paramters
|
||||
// Get Parameters
|
||||
$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
|
||||
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
|
||||
$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
|
||||
|
|
@ -100,7 +100,7 @@ if (!$sortorder) {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
@ -806,7 +806,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|||
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
|
||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -276,7 +276,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
|
|||
$resaction .= $langs->trans("NbSent") . ': ' . ($nbsent ? $nbsent : 0) . "\n<br>";
|
||||
|
||||
if ($nbsent) {
|
||||
$action = ''; // Do not show form post if there was at least one successfull sent
|
||||
$action = ''; // Do not show form post if there was at least one successful sent
|
||||
//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
|
||||
setEventMessages($langs->trans("EMailSentForNElements", $nbsent . '/' . count($toselect)), null, 'mesgs');
|
||||
setEventMessages($resaction, null, 'mesgs');
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ function conferenceorboothAttendeePrepareHead($object)
|
|||
$head[$h][2] = 'card';
|
||||
$h++;
|
||||
|
||||
//TODO : Note and docuement
|
||||
//TODO : Note and document
|
||||
|
||||
complete_head_from_modules($conf, $langs, $object, $head, $h, 'conferenceorboothattendee@eventorganization');
|
||||
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ if (empty($reshook)) {
|
|||
$object->socid = $objectsrc->socid;
|
||||
$object->ref_customer = GETPOST('ref_customer', 'alpha');
|
||||
$object->model_pdf = GETPOST('model');
|
||||
$object->date_delivery = $date_delivery; // Date delivery planed
|
||||
$object->date_delivery = $date_delivery; // Date delivery planned
|
||||
$object->fk_delivery_address = $objectsrc->fk_delivery_address;
|
||||
$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
|
||||
$object->tracking_number = GETPOST('tracking_number', 'alpha');
|
||||
|
|
@ -318,7 +318,7 @@ if (empty($reshook)) {
|
|||
// No detail were provided for lots, so if a qty was provided, we can throw an error.
|
||||
if (GETPOST($qty)) {
|
||||
// We try to set an amount
|
||||
// Case we dont use the list of available qty for each warehouse/lot
|
||||
// Case we don't use the list of available qty for each warehouse/lot
|
||||
// GUI does not allow this yet
|
||||
setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse").' ('.$langs->trans("Line").' '.GETPOST($idl, 'int').')', null, 'errors');
|
||||
$error++;
|
||||
|
|
@ -1561,7 +1561,7 @@ if ($action == 'create') {
|
|||
print "</tr>\n";
|
||||
}
|
||||
}
|
||||
// Show subproducts of product (not recommanded)
|
||||
// Show subproducts of product (not recommended)
|
||||
if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $line->fk_product > 0) {
|
||||
$product->get_sousproduits_arbo();
|
||||
$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
|
||||
|
|
@ -1844,7 +1844,7 @@ if ($action == 'create') {
|
|||
|
||||
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateSending'), $text, 'confirm_valid', '', 0, 1, 250);
|
||||
}
|
||||
// Confirm cancelation
|
||||
// Confirm cancellation
|
||||
if ($action == 'cancel') {
|
||||
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
|
||||
}
|
||||
|
|
@ -2411,7 +2411,7 @@ if ($action == 'create') {
|
|||
print '<tr>';
|
||||
// Qty to ship or shipped
|
||||
print '<td><input class="qtyl right" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
|
||||
// Batch number managment
|
||||
// Batch number management
|
||||
if ($lines[$i]->entrepot_id == 0) {
|
||||
// only show lot numbers from src warehouse when shipping from multiple warehouses
|
||||
$line->fetch($detail_batch->fk_expeditiondet);
|
||||
|
|
@ -2424,7 +2424,7 @@ if ($action == 'create') {
|
|||
print '<tr>';
|
||||
// Qty to ship or shipped
|
||||
print '<td><input class="qtyl" name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0"></td>';
|
||||
// Batch number managment
|
||||
// Batch number management
|
||||
print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
|
||||
print '</tr>';
|
||||
} elseif (isModEnabled('stock')) {
|
||||
|
|
@ -2436,7 +2436,7 @@ if ($action == 'create') {
|
|||
print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
|
||||
// Warehouse source
|
||||
print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
|
||||
// Batch number managment
|
||||
// Batch number management
|
||||
print '<td> - '.$langs->trans("NA").'</td>';
|
||||
print '</tr>';
|
||||
} elseif (count($lines[$i]->details_entrepot) > 1) {
|
||||
|
|
@ -2447,7 +2447,7 @@ if ($action == 'create') {
|
|||
print '<td><input class="qtyl right" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
|
||||
// Warehouse source
|
||||
print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
|
||||
// Batch number managment
|
||||
// Batch number management
|
||||
print '<td> - '.$langs->trans("NA").'</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
|
@ -2470,7 +2470,7 @@ if ($action == 'create') {
|
|||
print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
|
||||
// Warehouse source
|
||||
print '<td></td>';
|
||||
// Batch number managment
|
||||
// Batch number management
|
||||
print '<td></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
|
@ -2481,7 +2481,7 @@ if ($action == 'create') {
|
|||
print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
|
||||
// Warehouse source
|
||||
print '<td></td>';
|
||||
// Batch number managment
|
||||
// Batch number management
|
||||
print '<td></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
|
@ -2514,7 +2514,7 @@ if ($action == 'create') {
|
|||
print '</td>';
|
||||
}
|
||||
|
||||
// Batch number managment
|
||||
// Batch number management
|
||||
if (isModEnabled('productbatch')) {
|
||||
if (isset($lines[$i]->detail_batch)) {
|
||||
print '<!-- Detail of lot -->';
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class Shipments extends DolibarrApi
|
|||
/**
|
||||
* Get properties of a shipment object
|
||||
*
|
||||
* Return an array with shipment informations
|
||||
* Return an array with shipment information
|
||||
*
|
||||
* @param int $id ID of shipment
|
||||
* @return Object Object with cleaned properties
|
||||
|
|
@ -94,7 +94,7 @@ class Shipments extends DolibarrApi
|
|||
* @param int $page Page number
|
||||
* @param string $thirdparty_ids Thirdparty ids to filter shipments of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
|
||||
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
|
||||
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
|
||||
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
|
||||
* @return array Array of shipment objects
|
||||
*
|
||||
* @throws RestException
|
||||
|
|
@ -190,7 +190,7 @@ class Shipments extends DolibarrApi
|
|||
|
||||
foreach ($request_data as $field => $value) {
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->shipment->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -406,7 +406,7 @@ class Shipments extends DolibarrApi
|
|||
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
|
||||
}
|
||||
|
||||
// TODO Check the lineid $lineid is a line of ojbect
|
||||
// TODO Check the lineid $lineid is a line of object
|
||||
|
||||
$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
|
||||
if ($updateRes > 0) {
|
||||
|
|
@ -443,7 +443,7 @@ class Shipments extends DolibarrApi
|
|||
continue;
|
||||
}
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->shipment->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
/**
|
||||
* \file htdocs/expedition/class/expedition.class.php
|
||||
* \ingroup expedition
|
||||
* \brief Fichier de la classe de gestion des expeditions
|
||||
* \brief File of class managing the shipments
|
||||
*/
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
|
||||
|
|
@ -169,7 +169,7 @@ class Expedition extends CommonObject
|
|||
public $weight;
|
||||
|
||||
/**
|
||||
* @var integer|string Date delivery planed
|
||||
* @var integer|string Date delivery planned
|
||||
*/
|
||||
public $date_delivery;
|
||||
|
||||
|
|
@ -332,7 +332,7 @@ class Expedition extends CommonObject
|
|||
/**
|
||||
* Create expedition en base
|
||||
*
|
||||
* @param User $user Objet du user qui cree
|
||||
* @param User $user Object du user qui cree
|
||||
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
|
||||
* @return int Return integer <0 si erreur, id expedition creee si ok
|
||||
*/
|
||||
|
|
@ -521,7 +521,7 @@ class Expedition extends CommonObject
|
|||
/**
|
||||
* Create the detail of the expedition line. Create 1 record into expeditiondet for each warehouse and n record for each lot in this warehouse into expeditiondet_batch.
|
||||
*
|
||||
* @param object $line_ext Objet with full information of line. $line_ext->detail_batch must be an array of ExpeditionLineBatch
|
||||
* @param object $line_ext Object with full information of line. $line_ext->detail_batch must be an array of ExpeditionLineBatch
|
||||
* @param array $array_options extrafields array
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -630,7 +630,7 @@ class Expedition extends CommonObject
|
|||
$this->date = $this->db->jdate($obj->date_expedition); // TODO deprecated
|
||||
$this->date_expedition = $this->db->jdate($obj->date_expedition); // TODO deprecated
|
||||
$this->date_shipping = $this->db->jdate($obj->date_expedition); // Date real
|
||||
$this->date_delivery = $this->db->jdate($obj->date_delivery); // Date planed
|
||||
$this->date_delivery = $this->db->jdate($obj->date_delivery); // Date planned
|
||||
$this->fk_delivery_address = $obj->fk_address;
|
||||
$this->model_pdf = $obj->model_pdf;
|
||||
$this->shipping_method_id = $obj->fk_shipping_method;
|
||||
|
|
@ -674,7 +674,7 @@ class Expedition extends CommonObject
|
|||
// Retrieve extrafields
|
||||
$this->fetch_optionals();
|
||||
|
||||
// Fix Get multicurrency param for transmited
|
||||
// Fix Get multicurrency param for transmitted
|
||||
if (isModEnabled('multicurrency')) {
|
||||
if (!empty($this->multicurrency_code)) {
|
||||
$this->multicurrency_code = $this->thirdparty->multicurrency_code;
|
||||
|
|
@ -770,7 +770,7 @@ class Expedition extends CommonObject
|
|||
$error++;
|
||||
}
|
||||
|
||||
// If stock increment is done on sending (recommanded choice)
|
||||
// If stock increment is done on sending (recommended choice)
|
||||
if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
|
||||
$result = $this->manageStockMvtOnEvt($user, "ShipmentValidatedInDolibarr");
|
||||
if ($result < 0) {
|
||||
|
|
@ -1275,7 +1275,7 @@ class Expedition extends CommonObject
|
|||
}
|
||||
}
|
||||
if ($error) {
|
||||
break; // break for loop incase of error
|
||||
break; // break for loop in case of error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1464,7 +1464,7 @@ class Expedition extends CommonObject
|
|||
}
|
||||
}
|
||||
if ($error) {
|
||||
break; // break for loop incase of error
|
||||
break; // break for loop in case of error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2011,7 +2011,7 @@ class Expedition extends CommonObject
|
|||
$order = new Commande($this->db);
|
||||
$order->initAsSpecimen();
|
||||
|
||||
// Initialise parametres
|
||||
// Initialise parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->specimen = 1;
|
||||
|
|
@ -2070,7 +2070,7 @@ class Expedition extends CommonObject
|
|||
/**
|
||||
* Set the planned delivery date
|
||||
*
|
||||
* @param User $user Objet user that modify
|
||||
* @param User $user Object user that modify
|
||||
* @param integer $delivery_date Date of delivery
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -2361,7 +2361,7 @@ class Expedition extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Classify the shipping as invoiced (used for exemple by trigger when WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE is on)
|
||||
* Classify the shipping as invoiced (used for example by trigger when WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE is on)
|
||||
*
|
||||
* @return int Return integer <0 if ko, >0 if ok
|
||||
*/
|
||||
|
|
@ -2589,7 +2589,7 @@ class Expedition extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Classe to manage lines of shipment
|
||||
* Class to manage lines of shipment
|
||||
*/
|
||||
class ExpeditionLigne extends CommonObjectLine
|
||||
{
|
||||
|
|
@ -3040,7 +3040,7 @@ class ExpeditionLigne extends CommonObjectLine
|
|||
$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
|
||||
$error++;
|
||||
} else {
|
||||
// caculate new total line qty
|
||||
// calculate new total line qty
|
||||
foreach ($lotArray as $lot) {
|
||||
if ($expedition_batch_id != $lot->id) {
|
||||
$remainingQty += $lot->qty;
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class ExpeditionLineBatch extends CommonObject
|
|||
public $qty;
|
||||
public $dluo_qty; // deprecated, use qty
|
||||
public $entrepot_id;
|
||||
public $fk_origin_stock; // rowid in llx_product_batch table (not usefull)
|
||||
public $fk_origin_stock; // rowid in llx_product_batch table (not useful)
|
||||
public $fk_warehouse; // warehouse ID
|
||||
public $fk_expeditiondet;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
/**
|
||||
* \file htdocs/expedition/class/expeditionstats.class.php
|
||||
* \ingroup expedition
|
||||
* \brief File of class fo tmanage shipment statistics
|
||||
* \brief File of class to manage shipment statistics
|
||||
*/
|
||||
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ if ($search_all || $search_user > 0) {
|
|||
}
|
||||
$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, e.fk_statut, e.billed, e.tracking_number, e.fk_shipping_method,";
|
||||
if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
|
||||
// Link for delivery fields ref and date. Does not duplicate the line because we should always have ony 1 link or 0 per shipment
|
||||
// Link for delivery fields ref and date. Does not duplicate the line because we should always have only 1 link or 0 per shipment
|
||||
$sql .= " l.date_delivery as date_reception,";
|
||||
}
|
||||
$sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
|
||||
|
|
@ -299,7 +299,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
|
|||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
|
||||
if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
|
||||
// Link for delivery fields ref and date. Does not duplicate the line because we should always have ony 1 link or 0 per shipment
|
||||
// Link for delivery fields ref and date. Does not duplicate the line because we should always have only 1 link or 0 per shipment
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
|
||||
}
|
||||
|
|
@ -1080,7 +1080,7 @@ while ($i < $imaxinloop) {
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Date delivery planed
|
||||
// Date delivery planned
|
||||
if (!empty($arrayfields['e.date_delivery']['checked'])) {
|
||||
print '<td class="center nowraponall">';
|
||||
print dol_print_date($db->jdate($obj->delivery_date), "dayhour");
|
||||
|
|
|
|||
|
|
@ -322,8 +322,8 @@ if ($id > 0 || !empty($ref)) {
|
|||
|
||||
// Discounts for third party
|
||||
if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
|
||||
$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
|
||||
$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
|
||||
$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
|
||||
$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
|
||||
} else {
|
||||
$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
|
||||
$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
|
||||
|
|
|
|||
|
|
@ -2077,7 +2077,7 @@ if ($action == 'create') {
|
|||
print '<td>';
|
||||
print '</td>';
|
||||
|
||||
// Information if theres a rule restriction
|
||||
// Information if there's a rule restriction
|
||||
print '<td>';
|
||||
print '</td>';
|
||||
|
||||
|
|
@ -2179,7 +2179,7 @@ if ($action == 'create') {
|
|||
$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
|
||||
$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
|
||||
if (image_format_supported($fileinfo['basename']) > 0) {
|
||||
$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
|
||||
$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case however) than original
|
||||
if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
|
||||
$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
|
||||
}
|
||||
|
|
@ -2203,7 +2203,7 @@ if ($action == 'create') {
|
|||
|
||||
$pdfexists = file_exists($filepdf);
|
||||
if ($pdfexists) {
|
||||
// Conversion du PDF en image png si fichier png non existant
|
||||
// Conversion du PDF en image png si fichier png non existent
|
||||
if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
|
||||
if (!getDolGlobalString('MAIN_DISABLE_PDF_THUMBS')) { // If you experience trouble with pdf thumb generation and imagick, you can disable here.
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
||||
|
|
@ -2389,7 +2389,7 @@ if ($action == 'create') {
|
|||
print '<td class="center">';
|
||||
//print $line->fk_ecm_files;
|
||||
print '</td>';
|
||||
// Information if theres a rule restriction
|
||||
// Information if there's a rule restriction
|
||||
print '<td class="center">';
|
||||
print '</td>';
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class ExpenseReports extends DolibarrApi
|
|||
/**
|
||||
* Get properties of a Expense Report object
|
||||
*
|
||||
* Return an array with Expense Report informations
|
||||
* Return an array with Expense Report information
|
||||
*
|
||||
* @param int $id ID of Expense Report
|
||||
* @return Object Object with cleaned properties
|
||||
|
|
@ -92,7 +92,7 @@ class ExpenseReports extends DolibarrApi
|
|||
* @param int $page Page number
|
||||
* @param string $user_ids User ids filter field. Example: '1' or '1,2,3' {@pattern /^[0-9,]*$/i}
|
||||
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
|
||||
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
|
||||
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
|
||||
* @return array Array of Expense Report objects
|
||||
*/
|
||||
public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '', $properties = '')
|
||||
|
|
@ -172,7 +172,7 @@ class ExpenseReports extends DolibarrApi
|
|||
|
||||
foreach ($request_data as $field => $value) {
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->expensereport->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -384,7 +384,7 @@ class ExpenseReports extends DolibarrApi
|
|||
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
|
||||
}
|
||||
|
||||
// TODO Check the lineid $lineid is a line of ojbect
|
||||
// TODO Check the lineid $lineid is a line of object
|
||||
|
||||
$updateRes = $this->expensereport->deleteline($lineid);
|
||||
if ($updateRes == 1) {
|
||||
|
|
@ -425,7 +425,7 @@ class ExpenseReports extends DolibarrApi
|
|||
continue;
|
||||
}
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->expensereport->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ class ExpenseReport extends CommonObject
|
|||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param DoliDB $db Handler acces base de donnees
|
||||
* @param DoliDB $db Handler access base de donnees
|
||||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
|
|
@ -884,7 +884,7 @@ class ExpenseReport extends CommonObject
|
|||
|
||||
$now = dol_now();
|
||||
|
||||
// Initialise parametres
|
||||
// Initialise parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->specimen = 1;
|
||||
|
|
@ -1269,7 +1269,7 @@ class ExpenseReport extends CommonObject
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::valid action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2033,7 +2033,7 @@ class ExpenseReport extends CommonObject
|
|||
$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationWarning', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency));
|
||||
}
|
||||
|
||||
// No break, we sould test if another rule is violated
|
||||
// No break, we should test if another rule is violated
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2240,7 +2240,7 @@ class ExpenseReport extends CommonObject
|
|||
$this->db->free($resql);
|
||||
}
|
||||
|
||||
// Select des informations du projet
|
||||
// Select des information du projet
|
||||
$sql = "SELECT p.ref as ref_projet, p.title as title_projet";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
|
||||
$sql .= " WHERE p.rowid = ".((int) $projet_id);
|
||||
|
|
@ -2417,10 +2417,10 @@ class ExpenseReport extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Create a document onto disk accordign to template module.
|
||||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force le mnodele a utiliser ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
@ -2481,7 +2481,7 @@ class ExpenseReport extends CommonObject
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Charge indicateurs this->nb pour le tableau de bord
|
||||
* Load the indicators this->nb for the state board
|
||||
*
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -2520,7 +2520,7 @@ class ExpenseReport extends CommonObject
|
|||
/**
|
||||
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
||||
*
|
||||
* @param User $user Objet user
|
||||
* @param User $user Object user
|
||||
* @param string $option 'topay' or 'toapprove'
|
||||
* @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
|
||||
*/
|
||||
|
|
@ -2671,9 +2671,9 @@ class ExpenseReport extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* \brief Compute the cost of the kilometers expense based on the number of kilometers and the vehicule category
|
||||
* \brief Compute the cost of the kilometers expense based on the number of kilometers and the vehicle category
|
||||
*
|
||||
* @param int $fk_cat Category of the vehicule used
|
||||
* @param int $fk_cat Category of the vehicle used
|
||||
* @param float $qty Number of kilometers
|
||||
* @param float $tva VAT rate
|
||||
* @return int Return integer <0 if KO, total ttc if OK
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ class ExpenseReportIk extends CommonObject
|
|||
$ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
|
||||
// prevent out of range -1 indice
|
||||
$indice = $default_range - 1;
|
||||
// substract 1 because array start from 0
|
||||
// subtract 1 because array start from 0
|
||||
if (empty($ranges) || $indice < 0 || !isset($ranges[$indice])) {
|
||||
return false;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
/**
|
||||
* \file htdocs/expensereport/class/expensereportstats.class.php
|
||||
* \ingroup expensereport
|
||||
* \brief Fichier de la classe de gestion des stats des expensereport et notes de frais
|
||||
* \brief File of lass to manage the statistics of the expensereports et expense notes
|
||||
*/
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
|
||||
|
||||
/**
|
||||
* Classe permettant la gestion des stats des expensereports et notes de frais
|
||||
* Class to manage the statistics of the expensereports and expense notes
|
||||
*/
|
||||
class ExpenseReportStats extends Stats
|
||||
{
|
||||
|
|
|
|||
|
|
@ -559,7 +559,7 @@ class PaymentExpenseReport extends CommonObject
|
|||
);
|
||||
|
||||
// Update fk_bank in llx_paiement.
|
||||
// So we wil know the payment that have generated the bank transaction
|
||||
// So we will know the payment that has generated the bank transaction
|
||||
if ($bank_line_id > 0) {
|
||||
$result = $this->update_fk_bank($bank_line_id);
|
||||
if ($result <= 0) {
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ foreach ($listoftype as $code => $label) {
|
|||
// Sort array with most important first
|
||||
$dataseries = dol_sort_array($dataseries, 1, 'desc');
|
||||
|
||||
// Merge all entrie after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic).
|
||||
// Merge all entries after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic).
|
||||
$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain
|
||||
$i = 0;
|
||||
if (count($dataseries) > ($KEEPNFIRST + 1)) {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
|
|||
$pdfexists = file_exists($filepdf);
|
||||
|
||||
if ($pdfexists) {
|
||||
// Conversion du PDF en image png si fichier png non existant
|
||||
// Conversion du PDF en image png si fichier png non existent
|
||||
if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
|
||||
if (!getDolGlobalString('MAIN_DISABLE_PDF_THUMBS')) { // If you experience trouble with pdf thumb generation and imagick, you can disable here.
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
||||
|
|
|
|||
|
|
@ -204,11 +204,11 @@ class Export
|
|||
$this->array_export_label[$i] = $module->getExportDatasetLabel($r);
|
||||
// Table of fields to export / Tableau des champ a exporter (cle=champ, valeur=libelle)
|
||||
$this->array_export_fields[$i] = $module->export_fields_array[$r];
|
||||
// Table of fields to be filtered / Tableau des champs a filtrer (cle=champ, valeur1=type de donnees) on verifie que le module a des filtres
|
||||
// Table of fields to be filtered (key=field, value1=data type) Verifies that the module has filters
|
||||
$this->array_export_TypeFields[$i] = (isset($module->export_TypeFields_array[$r]) ? $module->export_TypeFields_array[$r] : '');
|
||||
// Table of entities for export / Tableau des entites a exporter (cle=champ, valeur=entite)
|
||||
// Table of entities to export (key=field, value=entity)
|
||||
$this->array_export_entities[$i] = $module->export_entities_array[$r];
|
||||
// Table of entities requiring DISTINCT abandonment / Tableau des entites qui requiert abandon du DISTINCT (cle=entite, valeur=champ id child records)
|
||||
// Table of entities requiring to abandon DISTINCT (key=entity, valeur=field id child records)
|
||||
$this->array_export_dependencies[$i] = (!empty($module->export_dependencies_array[$r]) ? $module->export_dependencies_array[$r] : '');
|
||||
// Table of special field operations / Tableau des operations speciales sur champ
|
||||
$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
|
||||
|
|
@ -313,7 +313,7 @@ class Export
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Build the conditionnal string from filter the query
|
||||
* Build the conditional string from filter the query
|
||||
*
|
||||
* @param string $TypeField Type of Field to filter
|
||||
* @param string $NameField Name of the field to filter
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ if ($step == 1 || !$datatoexport) {
|
|||
print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
|
||||
|
||||
// Affiche les modules d'exports
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Module").'</td>';
|
||||
|
|
@ -527,7 +527,7 @@ if ($step == 2 && $datatoexport) {
|
|||
print '</form>';
|
||||
|
||||
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Object").'</td>';
|
||||
|
|
@ -708,7 +708,7 @@ if ($step == 3 && $datatoexport) {
|
|||
print '<form action="'.$_SERVER["PHP_SELF"].'?step=4&action=submitFormField&datatoexport='.$datatoexport.'" name="FilterField" method="post">';
|
||||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
|
|
@ -907,7 +907,7 @@ if ($step == 4 && $datatoexport) {
|
|||
|
||||
print '<div class="marginbottomonly"><span class="opacitymedium">'.$langs->trans("ChooseFieldsOrdersAndTitle").'</span></div>';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Entities").'</td>';
|
||||
|
|
@ -1009,7 +1009,7 @@ if ($step == 4 && $datatoexport) {
|
|||
print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
|
||||
print '<input type="hidden" name="hexa" value="'.$hexa.'">';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("ExportModelName").'</td>';
|
||||
|
|
@ -1095,7 +1095,7 @@ if ($step == 5 && $datatoexport) {
|
|||
$head[$h][1] = $langs->trans("Step")." 2";
|
||||
$h++;
|
||||
|
||||
// si le filtrage est parametre pour l'export ou pas
|
||||
// si le filtrage est parameter pour l'export ou pas
|
||||
if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
|
||||
$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
|
||||
$head[$h][1] = $langs->trans("Step")." 3";
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ print '<br>';
|
|||
|
||||
// List of available export formats
|
||||
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ $action = GETPOST('action', 'aZ09');
|
|||
* Actions
|
||||
*/
|
||||
|
||||
// Sauvegardes parametres
|
||||
// Sauvegardes parameters
|
||||
if ($action == 'update') {
|
||||
$i = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -189,10 +189,10 @@ if ($action == 'add') {
|
|||
} elseif ($action == 'createfrommodel') {
|
||||
$newinter = new Fichinter($db);
|
||||
|
||||
// on récupère les enregistrements
|
||||
// Fetch the stored data
|
||||
$object->fetch($id);
|
||||
$res = $object->fetch_lines();
|
||||
// on transfert les données de l'un vers l'autre
|
||||
// Transfer the data from one to the other
|
||||
if ($object->socid > 0) {
|
||||
$newinter->socid = $object->socid;
|
||||
$newinter->fk_project = $object->fk_project;
|
||||
|
|
@ -606,7 +606,7 @@ if ($action == 'create') {
|
|||
|
||||
print '<table class="border centpercent">';
|
||||
|
||||
// if "frequency" is empty or = 0, the reccurence is disabled
|
||||
// if "frequency" is empty or = 0, the recurrence is disabled
|
||||
print '<tr><td class="titlefield">';
|
||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||
print $langs->trans('Frequency');
|
||||
|
|
|
|||
|
|
@ -1121,7 +1121,7 @@ if ($action == 'create') {
|
|||
|
||||
// Confirm validation
|
||||
if ($action == 'validate') {
|
||||
// on verifie si l'objet est en numerotation provisoire
|
||||
// Verify if the object's number os temporary
|
||||
$ref = substr($object->ref, 1, 4);
|
||||
if ($ref == 'PROV') {
|
||||
$numref = $object->getNextNumRef($soc);
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class Interventions extends DolibarrApi
|
|||
* @param int $page Page number
|
||||
* @param string $thirdparty_ids Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
|
||||
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
|
||||
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
|
||||
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
|
||||
* @return array Array of order objects
|
||||
*
|
||||
* @throws RestException
|
||||
|
|
@ -199,7 +199,7 @@ class Interventions extends DolibarrApi
|
|||
$result = $this->_validate($request_data);
|
||||
foreach ($request_data as $field => $value) {
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->fichinter->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -268,7 +268,7 @@ class Interventions extends DolibarrApi
|
|||
|
||||
foreach ($request_data as $field => $value) {
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->fichinter->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
/**
|
||||
* \file htdocs/fichinter/class/fichinter.class.php
|
||||
* \ingroup fichinter
|
||||
* \brief Fichier de la classe des gestion des fiches interventions
|
||||
* \brief File for class to manage interventions
|
||||
*/
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
|
||||
|
|
@ -248,7 +248,7 @@ class Fichinter extends CommonObject
|
|||
/**
|
||||
* Create an intervention into data base
|
||||
*
|
||||
* @param User $user Objet user that make creation
|
||||
* @param User $user Object user that make creation
|
||||
* @param int $notrigger Disable all triggers
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -383,7 +383,7 @@ class Fichinter extends CommonObject
|
|||
/**
|
||||
* Update an intervention
|
||||
*
|
||||
* @param User $user Objet user that make creation
|
||||
* @param User $user Object user that make creation
|
||||
* @param int $notrigger Disable all triggers
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -690,7 +690,7 @@ class Fichinter extends CommonObject
|
|||
/**
|
||||
* Close intervention
|
||||
*
|
||||
* @param User $user Objet user that close
|
||||
* @param User $user Object user that close
|
||||
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
|
|
@ -1410,7 +1410,7 @@ class Fichinter extends CommonObject
|
|||
|
||||
$now = dol_now();
|
||||
|
||||
// Initialise parametres
|
||||
// Initialise parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->ref_client = 'SPECIMEN CLIENT';
|
||||
|
|
@ -1705,7 +1705,7 @@ class FichinterLigne extends CommonObjectLine
|
|||
/**
|
||||
* Insert the line into database
|
||||
*
|
||||
* @param User $user Objet user that make creation
|
||||
* @param User $user Object user that make creation
|
||||
* @param int $notrigger Disable all triggers
|
||||
* @return int Return integer <0 if ko, >0 if ok
|
||||
*/
|
||||
|
|
@ -1794,7 +1794,7 @@ class FichinterLigne extends CommonObjectLine
|
|||
/**
|
||||
* Update intervention into database
|
||||
*
|
||||
* @param User $user Objet user that make creation
|
||||
* @param User $user Object user that make creation
|
||||
* @param int $notrigger Disable all triggers
|
||||
* @return int Return integer <0 if ko, >0 if ok
|
||||
*/
|
||||
|
|
@ -1905,7 +1905,7 @@ class FichinterLigne extends CommonObjectLine
|
|||
/**
|
||||
* Delete a intervention line
|
||||
*
|
||||
* @param User $user Objet user that make creation
|
||||
* @param User $user Object user that make creation
|
||||
* @param int $notrigger Disable all triggers
|
||||
* @return int >0 if ok, <0 if ko
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
/**
|
||||
* \file htdocs/fichinter/class/fichinterrec.class.php
|
||||
* \ingroup fichinter
|
||||
* \brief Fichier de la classe des factures recurentes
|
||||
* \brief File for class to manage recurring invoices/templates (models)
|
||||
*/
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
|
||||
|
|
@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
|
|||
|
||||
|
||||
/**
|
||||
* Classe de gestion des factures recurrentes/Modeles
|
||||
* Class to manage recurring invoices/templates (models)
|
||||
*/
|
||||
class FichinterRec extends Fichinter
|
||||
{
|
||||
|
|
@ -768,7 +768,7 @@ class FichinterRec extends Fichinter
|
|||
public function setNextDate($date, $increment_nb_gen_done = 0)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
|
||||
dol_syslog(get_class($this)."::setNextDate was called on object with property table_element not defined", LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
|
||||
|
|
@ -800,7 +800,7 @@ class FichinterRec extends Fichinter
|
|||
public function setMaxPeriod($nb)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
|
||||
dol_syslog(get_class($this)."::setMaxPeriod was called on object with property table_element not defined", LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
|
|||
|
||||
/*
|
||||
* Define PATH to external libraries
|
||||
* To use other version than embeded libraries, define here constant to path. Use '' to use include class path autodetect.
|
||||
* To use other version than embedded libraries, define here constant to path. Use '' to use include class path autodetect.
|
||||
*/
|
||||
// Path to root libraries
|
||||
if (!defined('TCPDF_PATH')) {
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ class SupplierInvoices extends DolibarrApi
|
|||
* @param string $thirdparty_ids Thirdparty ids to filter invoices of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
|
||||
* @param string $status Filter by invoice status : draft | unpaid | paid | cancelled
|
||||
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
|
||||
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
|
||||
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
|
||||
* @return array Array of invoice objects
|
||||
*
|
||||
* @throws RestException
|
||||
|
|
@ -209,7 +209,7 @@ class SupplierInvoices extends DolibarrApi
|
|||
|
||||
foreach ($request_data as $field => $value) {
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->invoice->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -257,7 +257,7 @@ class SupplierInvoices extends DolibarrApi
|
|||
continue;
|
||||
}
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->invoice->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -698,7 +698,7 @@ class SupplierInvoices extends DolibarrApi
|
|||
throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
|
||||
}
|
||||
|
||||
// TODO Check the lineid $lineid is a line of ojbect
|
||||
// TODO Check the lineid $lineid is a line of object
|
||||
|
||||
$updateRes = $this->invoice->deleteline($lineid);
|
||||
if ($updateRes > 0) {
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ class SupplierOrders extends DolibarrApi
|
|||
* @param string $status Filter by order status : draft | validated | approved | running | received_start | received_end | cancelled | refused
|
||||
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
|
||||
* @param string $sqlfilterlines Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
|
||||
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
|
||||
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
|
||||
* @return array Array of order objects
|
||||
*
|
||||
* @throws RestException
|
||||
|
|
@ -229,7 +229,7 @@ class SupplierOrders extends DolibarrApi
|
|||
|
||||
foreach ($request_data as $field => $value) {
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->order->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -281,7 +281,7 @@ class SupplierOrders extends DolibarrApi
|
|||
continue;
|
||||
}
|
||||
if ($field === 'caller') {
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
|
||||
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
|
||||
$this->order->context['caller'] = $request_data['caller'];
|
||||
continue;
|
||||
}
|
||||
|
|
@ -299,7 +299,7 @@ class SupplierOrders extends DolibarrApi
|
|||
/**
|
||||
* Get contacts of given supplier order
|
||||
*
|
||||
* Return an array with contact informations
|
||||
* Return an array with contact information
|
||||
*
|
||||
* @param int $id ID of supplier order
|
||||
* @param string $source Source of the contact (internal, external, all).
|
||||
|
|
|
|||
|
|
@ -115,8 +115,8 @@ class CommandeFournisseur extends CommonOrder
|
|||
/**
|
||||
* @var int
|
||||
*/
|
||||
public $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
|
||||
// -> 7=Canceled/Never received -> (reopen) 3=Process runing
|
||||
public $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process running -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
|
||||
// -> 7=Canceled/Never received -> (reopen) 3=Process running
|
||||
// -> 6=Canceled -> (reopen) 2=Approved
|
||||
// -> 9=Refused -> (reopen) 1=Validated
|
||||
// Note: billed or not is on another field "billed"
|
||||
|
|
@ -239,7 +239,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -1534,7 +1534,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
$line->special_code
|
||||
);
|
||||
if ($result < 0) {
|
||||
dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functionnal error
|
||||
dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functional error
|
||||
$this->db->rollback();
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -2081,7 +2081,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
}
|
||||
}
|
||||
|
||||
// Mise a jour informations denormalisees au niveau de la commande meme
|
||||
// Mise a jour information denormalisees au niveau de la commande meme
|
||||
$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
|
||||
if ($result > 0) {
|
||||
$this->db->commit();
|
||||
|
|
@ -2563,7 +2563,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
/**
|
||||
* Set the planned delivery date
|
||||
*
|
||||
* @param User $user Objet user making change
|
||||
* @param User $user Object user making change
|
||||
* @param integer $delivery_date Planned delivery date
|
||||
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
|
|
@ -2620,7 +2620,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
/**
|
||||
* Set the id projet
|
||||
*
|
||||
* @param User $user Objet utilisateur qui modifie
|
||||
* @param User $user Object utilisateur qui modifie
|
||||
* @param int $id_projet Delivery date
|
||||
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
|
||||
* @return int Return integer <0 si ko, >0 si ok
|
||||
|
|
@ -2783,7 +2783,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
* @param double $txlocaltax1 Localtax1 tax
|
||||
* @param double $txlocaltax2 Localtax2 tax
|
||||
* @param double $price_base_type Type of price base
|
||||
* @param int $info_bits Miscellaneous informations
|
||||
* @param int $info_bits Miscellaneous information
|
||||
* @param int $type Type of line (0=product, 1=service)
|
||||
* @param int $notrigger Disable triggers
|
||||
* @param integer $date_start Date start of service
|
||||
|
|
@ -3006,7 +3006,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
$prodid = $obj->rowid;
|
||||
}
|
||||
|
||||
// Initialise parametres
|
||||
// Initialise parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->specimen = 1;
|
||||
|
|
@ -3060,7 +3060,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
}
|
||||
|
||||
/**
|
||||
* Charge les informations d'ordre info dans l'objet facture
|
||||
* Charge les information d'ordre info dans l'objet facture
|
||||
*
|
||||
* @param int $id Id de la facture a charger
|
||||
* @return void
|
||||
|
|
@ -3099,7 +3099,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Charge indicateurs this->nb de tableau de bord
|
||||
* Load the indicators this->nb for the state board
|
||||
*
|
||||
* @return int Return integer <0 si ko, >0 si ok
|
||||
*/
|
||||
|
|
@ -3139,7 +3139,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
/**
|
||||
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
||||
*
|
||||
* @param User $user Objet user
|
||||
* @param User $user Object user
|
||||
* @param int $mode "opened", "awaiting" for orders awaiting reception
|
||||
* @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
|
||||
*/
|
||||
|
|
@ -3467,7 +3467,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
//var_dump($keysindeliverednotinwished);
|
||||
//exit;
|
||||
|
||||
if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) { //No diff => mean everythings is received
|
||||
if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) { //No diff => mean everything is received
|
||||
if ($closeopenorder) {
|
||||
//$ret=$this->setStatus($user,5);
|
||||
$ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
* \file htdocs/fourn/class/fournisseur.commande.dispatch.class.php
|
||||
* \ingroup fournisseur stock
|
||||
* \brief This file is an example for a CRUD class file (Create/Read/Update/Delete)
|
||||
* Initialy built by build_class_from_table on 2015-02-24 10:38
|
||||
* Initially built by build_class_from_table on 2015-02-24 10:38
|
||||
*/
|
||||
|
||||
// Put here all includes required by your class file
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
/**
|
||||
* \file htdocs/fourn/facture/class/fournisseur.facture-rec.class.php
|
||||
* \ingroup facture
|
||||
* \brief Fichier de la classe des factures fournisseursrecurentes
|
||||
* \brief File for class to manage invoice templates
|
||||
*/
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
|
||||
|
|
@ -171,7 +171,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' is the CSS style to use on field. For example: 'maxwidth200'
|
||||
|
|
@ -1255,7 +1255,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
* Create all recurrents supplier invoices (for all entities if multicompany is used).
|
||||
* A result may also be provided into this->output.
|
||||
*
|
||||
* WARNING: This method change temporarly context $conf->entity to be in correct context for each recurring invoice found.
|
||||
* WARNING: This method changes temporarily the context $conf->entity to be in correct context for each recurring invoice found.
|
||||
*
|
||||
* @param int $restrictioninvoiceid 0=All qualified template invoices found. > 0 = restrict action on invoice ID
|
||||
* @param int $forcevalidation 1=Force validation of invoice whatever is template auto_validate flag.
|
||||
|
|
@ -1794,12 +1794,12 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
public function setFrequencyAndUnit($frequency, $unit)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
|
||||
dol_syslog(get_class($this). '::setFrequencyAndUnit was called on object with property table_element not defined', LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!empty($frequency) && empty($unit)) {
|
||||
dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
|
||||
dol_syslog(get_class($this). '::setFrequencyAndUnit was called on object with params frequency defined but unit not defined', LOG_ERR);
|
||||
return -2;
|
||||
}
|
||||
|
||||
|
|
@ -1834,7 +1834,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
public function setNextDate($date, $increment_nb_gen_done = 0)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this).'::setNextDate was called on objet with property table_element not defined', LOG_ERR);
|
||||
dol_syslog(get_class($this).'::setNextDate was called on object with property table_element not defined', LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
|
||||
|
|
@ -1867,7 +1867,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
public function setMaxPeriod($nb)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this).'::setMaxPeriod was called on objet with property table_element not defined', LOG_ERR);
|
||||
dol_syslog(get_class($this).'::setMaxPeriod was called on object with property table_element not defined', LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1899,7 +1899,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
public function setAutoValidate($validate)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this).'::setAutoValidate was called on objet with property table_element not defined', LOG_ERR);
|
||||
dol_syslog(get_class($this).'::setAutoValidate was called on object with property table_element not defined', LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1927,7 +1927,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
public function setGeneratePdf($validate)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this).'::setGeneratePdf was called on objet with property table_element not defined', LOG_ERR);
|
||||
dol_syslog(get_class($this).'::setGeneratePdf was called on object with property table_element not defined', LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1955,7 +1955,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
public function setModelPdf($model)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this).'::setModelPdf was called on objet with property table_element not defined', LOG_ERR);
|
||||
dol_syslog(get_class($this).'::setModelPdf was called on object with property table_element not defined', LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -199,8 +199,8 @@ class FactureFournisseur extends CommonInvoice
|
|||
*/
|
||||
public $tva;
|
||||
|
||||
// Warning: Do not set default value into property defintion. it must stay null.
|
||||
// For example to avoid to have substition done when object is generic and not yet defined.
|
||||
// Warning: Do not set default value into property definition. it must stay null.
|
||||
// For example to avoid to have substitution done when object is generic and not yet defined.
|
||||
public $localtax1;
|
||||
public $localtax2;
|
||||
public $total_ht;
|
||||
|
|
@ -344,7 +344,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
* If paid partially, $this->close_code can be:
|
||||
* - CLOSECODE_DISCOUNTVAT
|
||||
* - CLOSECODE_BADCREDIT
|
||||
* If paid completelly, this->close_code will be null
|
||||
* If paid completely, this->close_code will be null
|
||||
*/
|
||||
const STATUS_CLOSED = 2;
|
||||
|
||||
|
|
@ -1552,8 +1552,8 @@ class FactureFournisseur extends CommonInvoice
|
|||
* @deprecated
|
||||
* @see setPaid()
|
||||
* @param User $user Object user
|
||||
* @param string $close_code Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
|
||||
* @param string $close_note Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
|
||||
* @param string $close_code Code indicates whether the class has paid in full while payment is incomplete. Not implemented yet.
|
||||
* @param string $close_note Comment informs if the class has been paid while payment is incomplete. Not implemented yet.
|
||||
* @return int Return integer <0 si ko, >0 si ok
|
||||
*/
|
||||
public function set_paid($user, $close_code = '', $close_note = '')
|
||||
|
|
@ -1567,8 +1567,8 @@ class FactureFournisseur extends CommonInvoice
|
|||
* Tag invoice as a paid invoice
|
||||
*
|
||||
* @param User $user Object user
|
||||
* @param string $close_code Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
|
||||
* @param string $close_note Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
|
||||
* @param string $close_code Code indicates whether the class has paid in full while payment is incomplete. Not implemented yet.
|
||||
* @param string $close_note Comment informs if the class has been paid while payment is incomplete. Not implemented yet.
|
||||
* @return int Return integer <0 si ko, >0 si ok
|
||||
*/
|
||||
public function setPaid($user, $close_code = '', $close_note = '')
|
||||
|
|
@ -2286,7 +2286,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
}
|
||||
}
|
||||
|
||||
// Mise a jour informations denormalisees au niveau de la facture meme
|
||||
// Mise a jour information denormalisees au niveau de la facture meme
|
||||
$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
|
||||
if ($result > 0) {
|
||||
$this->db->commit();
|
||||
|
|
@ -2319,7 +2319,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
* @param double $qty Quantity
|
||||
* @param int $idproduct Id produit
|
||||
* @param double $price_base_type HT or TTC
|
||||
* @param int $info_bits Miscellaneous informations of line
|
||||
* @param int $info_bits Miscellaneous information of line
|
||||
* @param int $type Type of line (0=product, 1=service)
|
||||
* @param double $remise_percent Percentage discount of the line
|
||||
* @param int $notrigger Disable triggers
|
||||
|
|
@ -2595,7 +2595,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
$sql .= " AND f.entity = ".$conf->entity;
|
||||
$sql .= " AND f.paye = 0"; // Pas classee payee completement
|
||||
$sql .= " AND pf.fk_paiementfourn IS NULL"; // Aucun paiement deja fait
|
||||
$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
|
||||
$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de replacement
|
||||
if ($socid > 0) {
|
||||
$sql .= " AND f.fk_soc = ".((int) $socid);
|
||||
}
|
||||
|
|
@ -3022,7 +3022,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
}
|
||||
}
|
||||
|
||||
// Initialise parametres
|
||||
// Initialise parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->ref_supplier = 'SUPPLIER_REF_SPECIMEN';
|
||||
|
|
@ -3376,7 +3376,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
public function setVATReverseCharge($vatreversecharge)
|
||||
{
|
||||
if (!$this->table_element) {
|
||||
dol_syslog(get_class($this)."::setVATReverseCharge was called on objet with property table_element not defined", LOG_ERR);
|
||||
dol_syslog(get_class($this)."::setVATReverseCharge was called on object with property table_element not defined", LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ class ProductFournisseur extends Product
|
|||
$localtax1 = $localtaxes_array['1'];
|
||||
$localtaxtype2 = $localtaxes_array['2'];
|
||||
$localtax2 = $localtaxes_array['3'];
|
||||
} else { // old method. deprecated because ot can't retrieve type
|
||||
} else { // old method. deprecated because it can't retrieve type
|
||||
$localtaxtype1 = '0';
|
||||
$localtax1 = get_localtax($newvat, 1);
|
||||
$localtaxtype2 = '0';
|
||||
|
|
@ -1172,7 +1172,7 @@ class ProductFournisseur extends Product
|
|||
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto).
|
||||
* Return a link to the object card (with optionally the picto).
|
||||
* Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ class PaiementFourn extends Paiement
|
|||
* Create payment in database
|
||||
*
|
||||
* @param User $user Object of creating user
|
||||
* @param int $closepaidinvoices 1=Also close payed invoices to paid, 0=Do nothing more
|
||||
* @param int $closepaidinvoices 1=Also close paid invoices to paid, 0=Do nothing more
|
||||
* @param Societe $thirdparty Thirdparty
|
||||
* @return int id of created payment, < 0 if error
|
||||
*/
|
||||
|
|
@ -515,7 +515,7 @@ class PaiementFourn extends Paiement
|
|||
/**
|
||||
* Information on object
|
||||
*
|
||||
* @param int $id Id du paiement dont il faut afficher les infos
|
||||
* @param int $id Id du paiement don't il faut afficher les infos
|
||||
* @return void
|
||||
*/
|
||||
public function info($id)
|
||||
|
|
|
|||
|
|
@ -350,8 +350,8 @@ if (empty($reshook)) {
|
|||
$newstatus = 3;
|
||||
} elseif ($object->statut == 5) {
|
||||
//$newstatus=2; // Ordered
|
||||
// TODO Can we set it to submited ?
|
||||
//$newstatus=3; // Submited
|
||||
// TODO Can we set it to submitted ?
|
||||
//$newstatus=3; // Submitted
|
||||
// TODO If there is at least one reception, we can set to Received->Received partially
|
||||
$newstatus = 4; // Received partially
|
||||
} elseif ($object->statut == 6) {
|
||||
|
|
@ -551,7 +551,7 @@ if (empty($reshook)) {
|
|||
$desc = $productsupplier->desc_supplier;
|
||||
}
|
||||
|
||||
//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
|
||||
//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
|
||||
if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
|
||||
$product_desc='';
|
||||
}
|
||||
|
|
@ -1714,7 +1714,7 @@ if ($action == 'create') {
|
|||
} else {
|
||||
$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
|
||||
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
|
||||
// reload page to retrieve customer informations
|
||||
// reload page to retrieve customer information
|
||||
if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
|
||||
print '<script>
|
||||
$(document).ready(function() {
|
||||
|
|
@ -2139,8 +2139,8 @@ if ($action == 'create') {
|
|||
|
||||
// Relative and absolute discounts
|
||||
if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
|
||||
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
|
||||
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
|
||||
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
|
||||
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
|
||||
} else {
|
||||
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
|
||||
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
|
||||
|
|
@ -2273,7 +2273,7 @@ if ($action == 'create') {
|
|||
print '<td>'.$object->getMaxDeliveryTimeDay($langs).'</td>';
|
||||
print '</tr>';
|
||||
|
||||
// Delivery date planed
|
||||
// Delivery date planned
|
||||
print '<tr><td>';
|
||||
print '<table class="nobordernopadding centpercent"><tr><td>';
|
||||
print $langs->trans('DateDeliveryPlanned');
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ if ($resql) {
|
|||
$total = 0;
|
||||
$dataseries = array();
|
||||
$vals = array();
|
||||
// 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
|
||||
// -> 7=Canceled/Never received -> (reopen) 3=Process runing
|
||||
// 0=Draft -> 1=Validated -> 2=Approved -> 3=Process running -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
|
||||
// -> 7=Canceled/Never received -> (reopen) 3=Process running
|
||||
// -> 6=Canceled -> (reopen) 2=Approved
|
||||
while ($i < $num) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ if (isModEnabled('project')) {
|
|||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
|
||||
|
||||
// Get Paramters
|
||||
// Get Parameters
|
||||
$id = GETPOST('id', 'int');
|
||||
$ref = GETPOST('ref', 'alpha');
|
||||
$action = GETPOST('action', 'aZ09');
|
||||
|
|
|
|||
|
|
@ -441,7 +441,7 @@ if (empty($reshook)) {
|
|||
$sql .= ")";
|
||||
|
||||
if (!$db->query($sql)) {
|
||||
$erorr++;
|
||||
$error++;
|
||||
}
|
||||
|
||||
if (!$error) {
|
||||
|
|
@ -519,7 +519,7 @@ if (empty($reshook)) {
|
|||
$lines[$i]->info_bits,
|
||||
'HT',
|
||||
$product_type,
|
||||
// we dont use the rank from orderline because we may have lines from several orders
|
||||
// we don't use the rank from orderline because we may have lines from several orders
|
||||
-1,
|
||||
false,
|
||||
$lines[$i]->array_options,
|
||||
|
|
|
|||
|
|
@ -567,7 +567,7 @@ if (empty($reshook)) {
|
|||
$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
|
||||
} elseif ($tmpvat != $tmpprodvat) {
|
||||
// On reevalue prix selon taux tva car taux tva transaction peut etre different
|
||||
// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
|
||||
// de ceux du produit par default (par example si pays different entre vendeur et acheteur).
|
||||
if ($price_base_type != 'HT') {
|
||||
$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
|
||||
} else {
|
||||
|
|
@ -1414,7 +1414,7 @@ if ($action == 'create') {
|
|||
|
||||
print '<tr><td colspan="2">' . img_picto('', 'recurring', 'class="pictofixedwidth"') . $title . '</td></tr>';
|
||||
|
||||
// if "frequency" is empty or = 0, the reccurence is disabled
|
||||
// if "frequency" is empty or = 0, the recurrence is disabled
|
||||
print '<tr><td style="width: 50%">';
|
||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||
print $langs->trans('Frequency');
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ if (empty($reshook)) {
|
|||
setEventMessages($object->error, $object->errors, 'errors');
|
||||
}
|
||||
} elseif ($action == 'confirm_paid_partially' && $confirm == 'yes') {
|
||||
// Classif "paid partialy"
|
||||
// Classif "paid partially"
|
||||
$object->fetch($id);
|
||||
$close_code = GETPOST("close_code", 'restricthtml');
|
||||
$close_note = GETPOST("close_note", 'restricthtml');
|
||||
|
|
@ -724,7 +724,7 @@ if (empty($reshook)) {
|
|||
|
||||
if (empty($error)) {
|
||||
if ($object->type != FactureFournisseur::TYPE_DEPOSIT) {
|
||||
// Classe facture
|
||||
// Set invoice as paid
|
||||
$result = $object->setPaid($user);
|
||||
if ($result >= 0) {
|
||||
$db->commit();
|
||||
|
|
@ -829,7 +829,7 @@ if (empty($reshook)) {
|
|||
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
|
||||
$object->transport_mode_id = GETPOST('transport_mode_id', 'int');
|
||||
|
||||
// Proprietes particulieres a facture de remplacement
|
||||
// Proprietes particulieres a facture de replacement
|
||||
$object->fk_facture_source = GETPOST('fac_replacement', 'int');
|
||||
$object->type = FactureFournisseur::TYPE_REPLACEMENT;
|
||||
|
||||
|
|
@ -1671,7 +1671,7 @@ if (empty($reshook)) {
|
|||
$desc = $productsupplier->desc_supplier;
|
||||
}
|
||||
|
||||
//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
|
||||
//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
|
||||
if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
|
||||
$product_desc = '';
|
||||
}
|
||||
|
|
@ -1875,7 +1875,7 @@ if (empty($reshook)) {
|
|||
$ventilExportCompta = $object->getVentilExportCompta();
|
||||
|
||||
if (!$ventilExportCompta) {
|
||||
// On verifie si aucun paiement n'a ete effectue
|
||||
// We verify that no payment was done
|
||||
if ($resteapayer == price2num($object->total_ttc, 'MT', 1) && $object->statut == FactureFournisseur::STATUS_VALIDATED) {
|
||||
$idwarehouse = GETPOST('idwarehouse');
|
||||
|
||||
|
|
@ -2293,7 +2293,7 @@ if ($action == 'create') {
|
|||
} else {
|
||||
$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
|
||||
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(empty($societe->id) ? 0 : $societe->id, 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 widthcentpercentminusxx maxwidth500');
|
||||
// reload page to retrieve supplier informations
|
||||
// reload page to retrieve supplier information
|
||||
if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
|
||||
print '<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
|
@ -2359,7 +2359,7 @@ if ($action == 'create') {
|
|||
$i++;
|
||||
}
|
||||
print '</select>';
|
||||
// Option to reload page to retrieve customer informations. Note, this clear other input
|
||||
// Option to reload page to retrieve customer information. Note, this clear other input
|
||||
if (!getDolGlobalString('RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED')) {
|
||||
print '<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
|
@ -2918,8 +2918,8 @@ if ($action == 'create') {
|
|||
$resteapayeraffiche = $resteapayer;
|
||||
|
||||
if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) { // Never use this
|
||||
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
|
||||
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
|
||||
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
|
||||
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
|
||||
} else {
|
||||
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
|
||||
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
|
||||
|
|
@ -4005,7 +4005,7 @@ if ($action == 'create') {
|
|||
if (empty($reshook)) {
|
||||
// Modify a validated invoice with no payments
|
||||
if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate) {
|
||||
// We check if lines of invoice are not already transfered into accountancy
|
||||
// We check if lines of invoice are not already transferred into accountancy
|
||||
$ventilExportCompta = $object->getVentilExportCompta(); // Should be 0 since the sum of payments are zero. But we keep the protection.
|
||||
|
||||
if ($ventilExportCompta == 0) {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
/**
|
||||
* \file htdocs/fourn/facture/info.php
|
||||
* \ingroup facture, fournisseur
|
||||
* \brief Page des informations d'une facture fournisseur
|
||||
* \brief Page des information d'une facture fournisseur
|
||||
*/
|
||||
|
||||
// Load Dolibarr environment
|
||||
|
|
|
|||
|
|
@ -572,7 +572,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
|
||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
// Fields title search
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ $sql .= " country.code as country_code,";
|
|||
$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
|
||||
$sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
|
||||
// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
|
||||
// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
|
||||
// TODO Better solution to be able to sort on already paid or remain to pay is to store amount_payed in a denormalized field.
|
||||
if (!$search_all) {
|
||||
$sql .= ', SUM(pf.amount) as dynamount_payed';
|
||||
}
|
||||
|
|
@ -1560,7 +1560,7 @@ while ($i < $imaxinloop) {
|
|||
|
||||
$object = $facturestatic;
|
||||
|
||||
//If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
|
||||
//If invoice has been converted and the conversion has been used, we don't have remain to pay on invoice
|
||||
if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
|
||||
if ($facturestatic->isCreditNoteUsed()) {
|
||||
$remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ if (empty($reshook)) {
|
|||
$facid = $key;
|
||||
if (is_numeric($amount) && $amount != 0) {
|
||||
if ($invoiceid != 0) {
|
||||
$invoiceid = -1; // There is more than one invoice payed by this payment
|
||||
$invoiceid = -1; // There is more than one invoice paid by this payment
|
||||
} else {
|
||||
$invoiceid = $facid;
|
||||
}
|
||||
|
|
@ -759,10 +759,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
|
|||
print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
|
||||
}
|
||||
print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
|
||||
print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
|
||||
print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is required to be used by javascript callForResult();
|
||||
} else {
|
||||
print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
|
||||
print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
|
||||
print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is required to be used by javascript callForResult();
|
||||
}
|
||||
print "</td>";
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
|
|||
$sign = -1;
|
||||
}
|
||||
if ($objectlink->statut != 3) {
|
||||
// If not abandonned
|
||||
// If not abandoned
|
||||
$total = $total + $sign * $objectlink->total_ht;
|
||||
echo price($objectlink->total_ht);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ if (!function_exists('ftp_connect')) {
|
|||
print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive ? "(Passive)" : "(Active)").'<br>';
|
||||
print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
|
||||
print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SSL')).'</b><br>';
|
||||
print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SFTP')).'</b><br>';
|
||||
print $langs->trans("SFTP (FTP as a subsystem of SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SFTP')).'</b><br>';
|
||||
print $langs->trans("Directory").': ';
|
||||
$sectionarray = preg_split('|[\/]|', $section);
|
||||
// For /
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ if (empty($reshook)) {
|
|||
|
||||
// If under validation
|
||||
if ($object->statut == Holiday::STATUS_DRAFT) {
|
||||
// If this is the requestor or has read/write rights
|
||||
// If this is the requester or has read/write rights
|
||||
if ($cancreate) {
|
||||
$approverid = GETPOST('valideur', 'int');
|
||||
// TODO Check this approver user id has the permission for approval
|
||||
|
|
@ -616,7 +616,7 @@ if (empty($reshook)) {
|
|||
|
||||
// If no SQL error, we redirect to the request form
|
||||
if (!$error) {
|
||||
// Calculcate number of days consumed
|
||||
// Calculate number of days consumed
|
||||
$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
|
||||
$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
|
||||
$newSolde = ($soldeActuel - $nbopenedday);
|
||||
|
|
@ -840,7 +840,7 @@ if (empty($reshook)) {
|
|||
$error++;
|
||||
}
|
||||
|
||||
// Calculcate number of days consumed
|
||||
// Calculate number of days consumed
|
||||
$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
|
||||
|
||||
$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
|
||||
|
|
|
|||
|
|
@ -114,12 +114,12 @@ class Holiday extends CommonObject
|
|||
public $fk_user_refuse;
|
||||
|
||||
/**
|
||||
* @var int Date for cancelation
|
||||
* @var int Date for cancellation
|
||||
*/
|
||||
public $date_cancel = '';
|
||||
|
||||
/**
|
||||
* @var int ID for cancelation
|
||||
* @var int ID for cancellation
|
||||
*/
|
||||
public $fk_user_cancel;
|
||||
|
||||
|
|
@ -1276,7 +1276,7 @@ class Holiday extends CommonObject
|
|||
while ($i < $num_rows) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
|
||||
// Note: $obj->halfday is 0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
|
||||
// Note: $obj->halfday is 0:Full days, 2:Start afternoon end morning, -1:Start afternoon, 1:End morning
|
||||
$arrayofrecord[$obj->rowid] = array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday);
|
||||
$i++;
|
||||
}
|
||||
|
|
@ -2062,9 +2062,9 @@ class Holiday extends CommonObject
|
|||
$sql .= " WHERE u.statut > 0";
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
$objet = $this->db->fetch_object($result);
|
||||
$object = $this->db->fetch_object($result);
|
||||
|
||||
return $objet->compteur;
|
||||
return $object->compteur;
|
||||
}
|
||||
/**
|
||||
* Compte le nombre d'utilisateur actifs dans Dolibarr sans CP
|
||||
|
|
@ -2078,9 +2078,9 @@ class Holiday extends CommonObject
|
|||
$sql .= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
$objet = $this->db->fetch_object($result);
|
||||
$object = $this->db->fetch_object($result);
|
||||
|
||||
return $objet->compteur;
|
||||
return $object->compteur;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2403,7 +2403,7 @@ class Holiday extends CommonObject
|
|||
/**
|
||||
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
||||
*
|
||||
* @param User $user Objet user
|
||||
* @param User $user Object user
|
||||
* @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
|
||||
*/
|
||||
public function load_board($user)
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ print "</div><br>\n";
|
|||
|
||||
$filters = '';
|
||||
|
||||
// Filter on array of ids of all childs
|
||||
// Filter on array of ids of all children
|
||||
$userchilds = array();
|
||||
if (!$user->hasRight('holiday', 'readall')) {
|
||||
$userchilds = $user->getAllChildIds(1);
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ if (!$user->hasRight('holiday', 'readall')) {
|
|||
$include = 'hierarchyme'; // Can see only its hierarchyl
|
||||
}
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
// Fields title search
|
||||
|
|
@ -691,7 +691,7 @@ if (!empty($arrayfields['cp.date_valid']['checked'])) {
|
|||
print '</td>';
|
||||
}
|
||||
|
||||
// Date appoval
|
||||
// Date approval
|
||||
if (!empty($arrayfields['cp.date_approval']['checked'])) {
|
||||
print '<td class="liste_titre center nowraponall">';
|
||||
print '</td>';
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ if ($result) {
|
|||
$num = $db->num_rows($result);
|
||||
$i = 0;
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@ class Establishment extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class Evaluation extends CommonObject
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -524,7 +524,7 @@ class Evaluation extends CommonObject
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -716,7 +716,7 @@ class Evaluation extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -999,7 +999,7 @@ class Evaluation extends CommonObject
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ class EvaluationLine extends CommonObjectLine
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -495,7 +495,7 @@ class EvaluationLine extends CommonObjectLine
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -684,7 +684,7 @@ class EvaluationLine extends CommonObjectLine
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -967,7 +967,7 @@ class EvaluationLine extends CommonObjectLine
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ class Job extends CommonObject
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -493,7 +493,7 @@ class Job extends CommonObject
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -719,7 +719,7 @@ class Job extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -1006,7 +1006,7 @@ class Job extends CommonObject
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ class Position extends CommonObject
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -503,7 +503,7 @@ class Position extends CommonObject
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this) . "::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this) . "::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -692,7 +692,7 @@ class Position extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -905,7 +905,7 @@ class Position extends CommonObject
|
|||
* @param array $val Array of properties of field to show
|
||||
* @param string $key Key of attribute
|
||||
* @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
|
||||
* @param string $moreparam To add more parametes on html input tag
|
||||
* @param string $moreparam To add more parameters on html input tag
|
||||
* @param string $keysuffix Prefix string to add into name and id of field (can be used to avoid duplicate names)
|
||||
* @param string $keyprefix Suffix string to add into name and id of field (can be used to avoid duplicate names)
|
||||
* @param mixed $morecss Value for css to define size. May also be a numeric.
|
||||
|
|
@ -1064,7 +1064,7 @@ class Position extends CommonObject
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ class Skill extends CommonObject
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -243,7 +243,7 @@ class Skill extends CommonObject
|
|||
/**
|
||||
* createSkills
|
||||
*
|
||||
* @param int $i Rank from which we want to create skilldets (level $i to HRM_MAXRANK wil be created)
|
||||
* @param int $i Rank from which we want to create skilldets (level $i to HRM_MAXRANK will be created)
|
||||
* @return int Return integer <0 if KO, Id of created object if OK
|
||||
*/
|
||||
public function createSkills($i = 1)
|
||||
|
|
@ -561,7 +561,7 @@ class Skill extends CommonObject
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -750,7 +750,7 @@ class Skill extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -760,7 +760,7 @@ class Skill extends CommonObject
|
|||
* @return string String with URL
|
||||
*/
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -1048,7 +1048,7 @@ class Skill extends CommonObject
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ class Skilldet extends CommonObjectLine
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -484,7 +484,7 @@ class Skilldet extends CommonObjectLine
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -673,7 +673,7 @@ class Skilldet extends CommonObjectLine
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -935,7 +935,7 @@ class Skilldet extends CommonObjectLine
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class SkillRank extends CommonObject
|
|||
* 'noteditable' says if field is not editable (1 or 0)
|
||||
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
|
||||
* 'index' if we want an index in database.
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
|
||||
|
|
@ -533,7 +533,7 @@ class SkillRank extends CommonObject
|
|||
|
||||
// Protection
|
||||
if ($this->status == self::STATUS_VALIDATED) {
|
||||
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
|
||||
dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -722,7 +722,7 @@ class SkillRank extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
* Return a link to the object card (with optionally the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -1009,7 +1009,7 @@ class SkillRank extends CommonObject
|
|||
* Create a document onto disk according to template module.
|
||||
*
|
||||
* @param string $modele Force template to use ('' to not force)
|
||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||
* @param Translate $outputlangs object lang a utiliser pour traduction
|
||||
* @param int $hidedetails Hide details of lines
|
||||
* @param int $hidedesc Hide description
|
||||
* @param int $hideref Hide ref
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ function diff(&$TMergedSkills)
|
|||
}
|
||||
|
||||
/**
|
||||
* Return a html list with rank informations
|
||||
* Return a html list with rank information
|
||||
* @param array $TMergedSkills skill list for display
|
||||
* @param string $field which column of comparison we are working with
|
||||
* @return string
|
||||
|
|
@ -379,7 +379,7 @@ function skillList(&$TMergedSkills)
|
|||
}
|
||||
|
||||
/**
|
||||
* create an array of lines [ skillLabel,dscription, maxrank on group1 , minrank needed for this skill ]
|
||||
* create an array of lines [ skillLabel,description, maxrank on group1 , minrank needed for this skill ]
|
||||
*
|
||||
* @param array $TSkill1 skill list of first column
|
||||
* @param array $TSkill2 skill list of second column
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
|
|||
|
||||
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST("search_all", 'alpha');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ if (!$sortorder) {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
@ -498,7 +498,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|||
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
|
||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
// Fields title search
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
|
|||
|
||||
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST("search_all", 'alpha');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ if (!$sortorder) {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
@ -473,7 +473,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
|
||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ if (!$sortorder) {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($objectposition->fields as $key => $val) {
|
||||
|
|
@ -542,7 +542,7 @@ if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'
|
|||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
|
||||
|
||||
// Fields title search
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ if ($object->id > 0) {
|
|||
$filters['search_agenda_label'] = $search_agenda_label;
|
||||
$filters['search_rowid'] = $search_rowid;
|
||||
|
||||
$object->fields['label']=array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
|
||||
$object->fields['label']=array(); // Useful to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
|
||||
|
||||
// TODO Replace this with same code than into list.php
|
||||
show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
|
|||
|
||||
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST("search_all", 'alpha');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ if (!$sortorder) {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
@ -484,7 +484,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
|
||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
|
|||
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
||||
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST("search_all", 'alpha');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
@ -540,7 +540,7 @@ if ($action != "create" && $action != "edit") {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($objectline->fields as $key => $val) {
|
||||
|
|
@ -671,7 +671,7 @@ if ($action != "create" && $action != "edit") {
|
|||
// $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
||||
// $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ if (!$sortorder) {
|
|||
$sortorder = "ASC";
|
||||
}
|
||||
|
||||
// Initialize array of search criterias
|
||||
// Initialize array of search criteria
|
||||
$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
|
||||
$search = array();
|
||||
foreach ($object->fields as $key => $val) {
|
||||
|
|
@ -486,7 +486,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|||
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
|
||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -186,9 +186,9 @@ class Import
|
|||
$this->array_import_fields[$i] = $module->import_fields_array[$r];
|
||||
// Array of hidden fields to import (key=field, value=label)
|
||||
$this->array_import_fieldshidden[$i] = (isset($module->import_fieldshidden_array[$r]) ? $module->import_fieldshidden_array[$r] : '');
|
||||
// Tableau des entites a exporter (cle=champ, valeur=entite)
|
||||
// Array of entiteis to export (key=field, value=entity)
|
||||
$this->array_import_entities[$i] = $module->import_entities_array[$r];
|
||||
// Tableau des alias a exporter (cle=champ, valeur=alias)
|
||||
// Array of aliases to export (key=field, value=alias)
|
||||
$this->array_import_regex[$i] = (isset($module->import_regex_array[$r]) ? $module->import_regex_array[$r] : '');
|
||||
// Array of columns allowed as UPDATE options
|
||||
$this->array_import_updatekeys[$i] = (isset($module->import_updatekeys_array[$r]) ? $module->import_updatekeys_array[$r] : '');
|
||||
|
|
@ -235,7 +235,7 @@ class Import
|
|||
|
||||
dol_syslog(get_class($this)."::build_example_file ".$model);
|
||||
|
||||
// Creation de la classe d'import du model Import_XXX
|
||||
// Create the import class for the model Import_XXX
|
||||
$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
|
||||
$file = "import_".$model.".modules.php";
|
||||
$classname = "Import".$model;
|
||||
|
|
|
|||
|
|
@ -379,7 +379,7 @@ if ($step == 1 || !$datatoimport) {
|
|||
print '<div class="opacitymedium">'.$langs->trans("SelectImportDataSet").'</div><br>';
|
||||
|
||||
// Affiche les modules d'imports
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Module").'</td>';
|
||||
|
|
@ -486,12 +486,12 @@ if ($step == 2 && $datatoimport) {
|
|||
|
||||
print '<br>';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent" cellpadding="4">';
|
||||
|
||||
$filetoimport = '';
|
||||
|
||||
// Add format informations and link to download example
|
||||
// Add format information and link to download example
|
||||
print '<tr class="liste_titre"><td colspan="5">';
|
||||
print $langs->trans("FileMustHaveOneOfFollowingFormat");
|
||||
print '</td></tr>';
|
||||
|
|
@ -701,7 +701,7 @@ if ($step == 3 && $datatoimport) {
|
|||
// Search available imports
|
||||
$filearray = dol_dir_list($conf->import->dir_temp, 'files', 0, '', '', 'name', SORT_DESC);
|
||||
if (count($filearray) > 0) {
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent" width="100%" cellpadding="4">';
|
||||
|
||||
$dir = $conf->import->dir_temp;
|
||||
|
|
@ -803,7 +803,7 @@ if ($step == 4 && $datatoimport) {
|
|||
// The value to use
|
||||
$separator_used = str_replace('\t', "\t", $separator);
|
||||
|
||||
// Create classe to use for import
|
||||
// Create class to use for import
|
||||
$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
|
||||
$file = "import_".$model.".modules.php";
|
||||
$classname = "Import".ucfirst($model);
|
||||
|
|
@ -1061,7 +1061,7 @@ if ($step == 4 && $datatoimport) {
|
|||
print '</form>';
|
||||
|
||||
// Title of array with fields
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("FieldsInSourceFile").'</td>';
|
||||
|
|
@ -1189,7 +1189,7 @@ if ($step == 4 && $datatoimport) {
|
|||
|
||||
$filecolumn = ($i + 1);
|
||||
// Source field info
|
||||
if (empty($objimport->array_import_convertvalue[0][$tmpcode])) { // If source file does not need convertion
|
||||
if (empty($objimport->array_import_convertvalue[0][$tmpcode])) { // If source file does not need conversion
|
||||
$filecolumntoshow = num2Alpha($i);
|
||||
} else {
|
||||
if ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromref') {
|
||||
|
|
@ -1202,7 +1202,7 @@ if ($step == 4 && $datatoimport) {
|
|||
// Source required
|
||||
$example = !empty($objimport->array_import_examplevalues[0][$tmpcode]) ? $objimport->array_import_examplevalues[0][$tmpcode] : "";
|
||||
// Example
|
||||
if (empty($objimport->array_import_convertvalue[0][$tmpcode])) { // If source file does not need convertion
|
||||
if (empty($objimport->array_import_convertvalue[0][$tmpcode])) { // If source file does not need conversion
|
||||
if ($example) {
|
||||
$htmltext .= $langs->trans("SourceExample").': <b>'.str_replace('"', '', $example).'</b><br>';
|
||||
}
|
||||
|
|
@ -1480,7 +1480,7 @@ if ($step == 4 && $datatoimport) {
|
|||
print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
|
||||
print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table summary="selectofimportprofil" class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("ImportModelName").'</td>';
|
||||
|
|
@ -1489,7 +1489,7 @@ if ($step == 4 && $datatoimport) {
|
|||
print '</tr>';
|
||||
|
||||
$nameofimportprofile = str_replace(' ', '-', $langs->trans("ImportProfile").' '.$titleofmodule.' '.dol_print_date(dol_now('gmt'), 'dayxcard'));
|
||||
if (GETPOST('import_name')) { // If we have submited a form, we take value used fot the update try
|
||||
if (GETPOST('import_name')) { // If we have submitted a form, we take value used for the update try
|
||||
$nameofimportprofile = $import_name;
|
||||
}
|
||||
|
||||
|
|
@ -1563,7 +1563,7 @@ if ($step == 5 && $datatoimport) {
|
|||
$model = $format;
|
||||
$list = $objmodelimport->listOfAvailableImportFormat($db);
|
||||
|
||||
// Create classe to use for import
|
||||
// Create class to use for import
|
||||
$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
|
||||
$file = "import_".$model.".modules.php";
|
||||
$classname = "Import".ucfirst($model);
|
||||
|
|
@ -2053,7 +2053,7 @@ if ($step == 6 && $datatoimport) {
|
|||
$importid = GETPOST("importid", 'alphanohtml');
|
||||
|
||||
|
||||
// Create classe to use for import
|
||||
// Create class to use for import
|
||||
$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
|
||||
$file = "import_".$model.".modules.php";
|
||||
$classname = "Import".ucfirst($model);
|
||||
|
|
@ -2448,7 +2448,7 @@ function show_elem($fieldssource, $pos, $key)
|
|||
// Print field of source file
|
||||
print '<tr style="height:'.$height.'" class="trimport oddevenimport">';
|
||||
print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
|
||||
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
|
||||
// The image must have the class 'boxhandle' because it's value used in DOM draggable objects to define the area used to catch the full object
|
||||
//print img_picto($langs->trans("MoveField", $pos), 'grip_title', 'class="boxhandle" style="cursor:move;"');
|
||||
print img_picto($langs->trans("Column").' '.num2Alpha($pos - 1), 'file', 'class="pictofixedwith"');
|
||||
print '</td>';
|
||||
|
|
@ -2517,7 +2517,7 @@ function getnewkey(&$fieldssource, &$listofkey)
|
|||
* Return array with element inserted in it at position $position
|
||||
*
|
||||
* @param array $array Array of field source
|
||||
* @param mixed $position key of postion to insert to
|
||||
* @param mixed $position key of position to insert to
|
||||
* @param array $insertArray Array to insert
|
||||
* @return array
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ CKEDITOR.inline( 'sectionimage' , { toolbar: ['Bold','Italic'] } );
|
|||
</section>
|
||||
|
||||
|
||||
<!-- Looking for our sevices -->
|
||||
<!-- Looking for our services -->
|
||||
<section id="sectionfirstclass" contenteditable="true" class="section-with-counters bg-accent text-center">
|
||||
<div class="container bg-cape-cod context-dark section-60 section-lg-90">
|
||||
<h2 class="text-rolling-stone font-weight-bold text-uppercase">Looking for</h2>
|
||||
|
|
@ -215,7 +215,7 @@ CKEDITOR.inline( 'sectionimage' , { toolbar: ['Bold','Italic'] } );
|
|||
</ul>
|
||||
</div>
|
||||
<div class="plan-btn plan-picker">
|
||||
<a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subcribe</a>
|
||||
<a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subscribe</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -487,7 +487,7 @@ CKEDITOR.inline( 'sectionimage' , { toolbar: ['Bold','Italic'] } );
|
|||
<div class="divider-fullwidth"></div>
|
||||
<div>
|
||||
<span class="fa fa-quote-left"><!-- Keep this comment --></span>
|
||||
<q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 monthes.</q>
|
||||
<q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 months.</q>
|
||||
<span class="fa fa-quote-right"><!-- Keep this comment --></span>
|
||||
</div>
|
||||
</blockquote>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ ob_start();
|
|||
</ul>
|
||||
</div>
|
||||
<div class="plan-btn plan-picker">
|
||||
<a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subcribe</a>
|
||||
<a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subscribe</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ ob_start();
|
|||
<p>
|
||||
Lorem ipsum dolor, sit amet consectetur adipisicing
|
||||
elit. Ab fuga nobis omnis alias, aliquid iste cumque
|
||||
tempora nam reprehenderit quia itaque debitis,
|
||||
tempora nim reprehenderit quia itaque debitis,
|
||||
nostrum labore rerum reiciendis laboriosam unde,
|
||||
tempore corporis.
|
||||
</p>
|
||||
|
|
@ -162,7 +162,7 @@ ob_start();
|
|||
<p>
|
||||
Lorem ipsum dolor, sit amet consectetur adipisicing
|
||||
elit. Ab fuga nobis omnis alias, aliquid iste cumque
|
||||
tempora nam reprehenderit quia itaque debitis,
|
||||
tempora nim reprehenderit quia itaque debitis,
|
||||
nostrum labore rerum reiciendis laboriosam unde,
|
||||
tempore corporis.
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ ob_start();
|
|||
<strong>1,024</strong> Nullam
|
||||
</li>
|
||||
</ul>
|
||||
<p class="content">Nam elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nam a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varius lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>
|
||||
<p class="content">Nim elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nim a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varias lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>
|
||||
<footer class="major">
|
||||
<ul class="actions special">
|
||||
<li><a href="generic.php" class="buttonwebsite">Learn More</a></li>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue