Merge branch 'develop' into dev_sign_soeciete_rib
This commit is contained in:
commit
c6dbb3d434
162 changed files with 841 additions and 1243 deletions
|
|
@ -21,6 +21,7 @@ Following changes may create regressions for some external modules, but were nec
|
|||
* The method get_substitutionarray_shipment_lines() has been removed. Use the generic get_substitutionarray_lines() instead.
|
||||
* Recheck setup of your module workflow to see if you need to enable the new setting to have shipment set to billed automatically
|
||||
when an invoice from a shipment is validated (and if your process is to make invoice on shipment and not on order).
|
||||
* It was possible to use a variable $soc or $right inside a php code condition of some extrafields properties, this is no more true (this vars are no more defined globaly).
|
||||
|
||||
|
||||
***** ChangeLog for 18.0.1 compared to 18.0.0 *****
|
||||
|
|
|
|||
|
|
@ -1433,7 +1433,7 @@ class Asset extends CommonObject
|
|||
// phpcs:enable
|
||||
if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
|
||||
global $langs;
|
||||
//$langs->load("asset@asset");
|
||||
//$langs->load("assets");
|
||||
$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('AssetInProgress');
|
||||
$this->labelStatus[self::STATUS_DISPOSED] = $langs->transnoentitiesnoconv('AssetDisposed');
|
||||
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('AssetInProgress');
|
||||
|
|
@ -1516,7 +1516,7 @@ class Asset extends CommonObject
|
|||
public function getNextNumRef()
|
||||
{
|
||||
global $langs, $conf;
|
||||
$langs->load("asset@asset");
|
||||
$langs->load("assets");
|
||||
|
||||
if (empty($conf->global->ASSET_ASSET_ADDON)) {
|
||||
$conf->global->ASSET_ASSET_ADDON = 'mod_asset_standard';
|
||||
|
|
@ -1581,7 +1581,7 @@ class Asset extends CommonObject
|
|||
// $result = 0;
|
||||
// $includedocgeneration = 1;
|
||||
//
|
||||
// $langs->load("asset@asset");
|
||||
// $langs->load("assets");
|
||||
//
|
||||
// if (!dol_strlen($modele)) {
|
||||
// $modele = 'standard_asset';
|
||||
|
|
|
|||
|
|
@ -698,7 +698,7 @@ class AssetModel extends CommonObject
|
|||
// phpcs:enable
|
||||
if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
|
||||
global $langs;
|
||||
//$langs->load("asset@asset");
|
||||
//$langs->load("assets");
|
||||
$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
|
||||
$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
|
||||
$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
|
||||
|
|
|
|||
|
|
@ -1321,7 +1321,7 @@ class ActionComm extends CommonObject
|
|||
* @param string $sortfield Sort on this field
|
||||
* @param string $sortorder ASC or DESC
|
||||
* @param string $limit Limit number of answers
|
||||
* @return array|string Error string if KO, array with actions if OK
|
||||
* @return ActionComm[]|string Error string if KO, array with actions if OK
|
||||
*/
|
||||
public function getActions($socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -547,7 +547,7 @@ if (empty($reshook)) {
|
|||
$object->title = (string) GETPOST("title");
|
||||
$object->sujet = (string) GETPOST("sujet");
|
||||
$object->body = (string) GETPOST("bodyemail", 'restricthtml');
|
||||
$object->bgcolor = (string) GETPOST("bgcolor");
|
||||
$object->bgcolor = preg_replace('/^#/', '', (string) GETPOST("bgcolor"));
|
||||
$object->bgimage = (string) GETPOST("bgimage");
|
||||
|
||||
if (!$object->title) {
|
||||
|
|
@ -641,7 +641,7 @@ if (empty($reshook)) {
|
|||
$mesgs = array();
|
||||
$object->sujet = (string) GETPOST("sujet");
|
||||
$object->body = (string) GETPOST("bodyemail", 'restricthtml');
|
||||
$object->bgcolor = (string) GETPOST("bgcolor");
|
||||
$object->bgcolor = preg_replace('/^#/', '', (string) GETPOST("bgcolor"));
|
||||
$object->bgimage = (string) GETPOST("bgimage");
|
||||
|
||||
if (!$object->sujet) {
|
||||
|
|
|
|||
|
|
@ -1889,7 +1889,7 @@ if ($action == 'create') {
|
|||
|
||||
$thirdparty = $soc;
|
||||
$discount_type = 0;
|
||||
$backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid'));
|
||||
$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode(GETPOST('origin')).'&originid='.urlencode(GETPOSTINT('originid'));
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
|
@ -2473,7 +2473,7 @@ if ($action == 'create') {
|
|||
|
||||
$thirdparty = $soc;
|
||||
$discount_type = 0;
|
||||
$backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
|
||||
$backtopage = $_SERVER["PHP_SELF"].'?id='.$object->id;
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
|
||||
|
||||
print '</td></tr>';
|
||||
|
|
|
|||
|
|
@ -116,9 +116,22 @@ class Propal extends CommonObject
|
|||
/**
|
||||
* Ref from thirdparty
|
||||
* @var string
|
||||
* @deprecated
|
||||
* @see $ref_customer
|
||||
*/
|
||||
public $ref_client;
|
||||
|
||||
/**
|
||||
* Ref from thirdparty
|
||||
* @var string
|
||||
*/
|
||||
public $ref_customer;
|
||||
|
||||
/**
|
||||
* @var Propal oldcopy with propal properties
|
||||
*/
|
||||
public $oldcopy;
|
||||
|
||||
/**
|
||||
* Status of the quote
|
||||
* @var int
|
||||
|
|
@ -240,7 +253,21 @@ class Propal extends CommonObject
|
|||
public $address_type;
|
||||
public $address;
|
||||
|
||||
/**
|
||||
* @var int availabilty ID
|
||||
*/
|
||||
public $availability_id;
|
||||
|
||||
/**
|
||||
* @var int availabilty ID
|
||||
* @deprecated
|
||||
* @see $availability_id
|
||||
*/
|
||||
public $fk_availability;
|
||||
|
||||
/**
|
||||
* @var string availabilty code
|
||||
*/
|
||||
public $availability_code;
|
||||
|
||||
public $duree_validite;
|
||||
|
|
@ -256,6 +283,10 @@ class Propal extends CommonObject
|
|||
* @var PropaleLigne[]
|
||||
*/
|
||||
public $lines = array();
|
||||
|
||||
/**
|
||||
* @var PropaleLigne
|
||||
*/
|
||||
public $line;
|
||||
|
||||
public $labelStatus = array();
|
||||
|
|
@ -970,8 +1001,9 @@ class Propal extends CommonObject
|
|||
|
||||
$this->update_price(1, 'auto');
|
||||
|
||||
$this->fk_propal = $this->id;
|
||||
$this->rowid = $rowid;
|
||||
// $this is Propal
|
||||
// $this->fk_propal = $this->id;
|
||||
// $this->rowid = $rowid;
|
||||
|
||||
$this->db->commit();
|
||||
return $result;
|
||||
|
|
@ -2702,7 +2734,7 @@ class Propal extends CommonObject
|
|||
// The connected company is classified as a client
|
||||
$soc=new Societe($this->db);
|
||||
$soc->id = $this->socid;
|
||||
$result = $soc->set_as_client();
|
||||
$result = $soc->setAsCustomer();
|
||||
|
||||
if ($result < 0) {
|
||||
$this->error=$this->db->lasterror();
|
||||
|
|
|
|||
|
|
@ -1852,7 +1852,7 @@ if ($action == 'create' && $usercancreate) {
|
|||
|
||||
$thirdparty = $soc;
|
||||
$discount_type = 0;
|
||||
$backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid'));
|
||||
$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode(GETPOST('origin')).'&originid='.urlencode(GETPOSTINT('originid'));
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
|
||||
|
||||
print '</td></tr>';
|
||||
|
|
@ -2470,7 +2470,7 @@ if ($action == 'create' && $usercancreate) {
|
|||
|
||||
$thirdparty = $soc;
|
||||
$discount_type = 0;
|
||||
$backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
|
||||
$backtopage = $_SERVER["PHP_SELF"].'?id='.$object->id;
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
|
||||
|
||||
print '</td></tr>';
|
||||
|
|
|
|||
|
|
@ -505,7 +505,7 @@ class Commande extends CommonOrder
|
|||
$soc->fetch($this->socid);
|
||||
|
||||
// Class of company linked to order
|
||||
$result = $soc->set_as_client();
|
||||
$result = $soc->setAsCustomer();
|
||||
|
||||
// Define new ref
|
||||
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
|
||||
|
|
|
|||
|
|
@ -2029,6 +2029,8 @@ if (empty($reshook)) {
|
|||
$price_ht_devise = '';
|
||||
$price_ttc = '';
|
||||
$price_ttc_devise = '';
|
||||
$price_min = '';
|
||||
$price_min_ttc = '';
|
||||
|
||||
if (GETPOST('price_ht') !== '') {
|
||||
$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
|
||||
|
|
@ -3167,7 +3169,6 @@ if ($action == 'create') {
|
|||
print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
|
||||
}
|
||||
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
|
||||
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
|
||||
print '<input name="ref" type="hidden" value="provisoire">';
|
||||
print '<input name="ref_client" type="hidden" value="'.$ref_client.'">';
|
||||
print '<input name="force_cond_reglement_id" type="hidden" value="0">';
|
||||
|
|
@ -3668,7 +3669,7 @@ if ($action == 'create') {
|
|||
|
||||
$thirdparty = $soc;
|
||||
$discount_type = 0;
|
||||
$backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin', 'alpha').'&originid='.GETPOST('originid', 'int'));
|
||||
$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode(GETPOST('origin')).'&originid='.urlencode(GETPOSTINT('originid'));
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
|
||||
|
||||
print '</td></tr>';
|
||||
|
|
@ -4502,7 +4503,7 @@ if ($action == 'create') {
|
|||
print '<td>';
|
||||
$thirdparty = $soc;
|
||||
$discount_type = 0;
|
||||
$backtopage = urlencode($_SERVER["PHP_SELF"].'?facid='.$object->id);
|
||||
$backtopage = $_SERVER["PHP_SELF"].'?facid='.$object->id;
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
|
||||
print '</td></tr>';
|
||||
|
||||
|
|
|
|||
|
|
@ -3372,7 +3372,7 @@ class Facture extends CommonInvoice
|
|||
|
||||
if (!$error) {
|
||||
// Define third party as a customer
|
||||
$result = $this->thirdparty->set_as_client();
|
||||
$result = $this->thirdparty->setAsCustomer();
|
||||
|
||||
// If active we decrement the main product and its components at invoice validation
|
||||
if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0) {
|
||||
|
|
|
|||
|
|
@ -895,9 +895,11 @@ class BonPrelevement extends CommonObject
|
|||
$factures_errors = array();
|
||||
|
||||
if (!$error) {
|
||||
dol_syslog(__METHOD__." Read invoices for did=".((int) $did), LOG_DEBUG);
|
||||
|
||||
$sql = "SELECT f.rowid, pd.rowid as pfdrowid, f.fk_soc";
|
||||
$sql .= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
|
||||
$sql .= ", pfd.amount";
|
||||
$sql .= ", pd.code_banque, pd.code_guichet, pd.number, pd.cle_rib";
|
||||
$sql .= ", pd.amount";
|
||||
$sql .= ", s.nom as name";
|
||||
$sql .= ", f.ref, sr.bic, sr.iban_prefix, sr.frstrecur";
|
||||
if ($type != 'bank-transfer') {
|
||||
|
|
@ -919,7 +921,6 @@ class BonPrelevement extends CommonObject
|
|||
if ($did > 0) {
|
||||
$sql .= " AND pd.rowid = ".((int) $did);
|
||||
}
|
||||
dol_syslog(__METHOD__." Read invoices,", LOG_DEBUG);
|
||||
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
|
|
@ -941,7 +942,9 @@ class BonPrelevement extends CommonObject
|
|||
dol_syslog(__METHOD__." Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
|
||||
} else {
|
||||
$error++;
|
||||
dol_syslog(__METHOD__." Read invoices error ".$this->db->error(), LOG_ERR);
|
||||
$this->error = $this->db->lasterror();
|
||||
dol_syslog(__METHOD__." Read invoices error ".$this->db->lasterror(), LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -965,7 +968,7 @@ class BonPrelevement extends CommonObject
|
|||
if ($resfetch >= 0) { // Field 0 of $fac is rowid of invoice
|
||||
*/
|
||||
|
||||
// Check if $fac[8] s.nom is null
|
||||
// Check if $fac[8] s.nom is null
|
||||
if ($fac[8] != null) {
|
||||
//$bac = new CompanyBankAccount($this->db);
|
||||
//$bac->fetch(0, $soc->id);
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ if (empty($reshook)) {
|
|||
if (!$error) {
|
||||
// getDolGlobalString('PRELEVEMENT_CODE_BANQUE') and getDolGlobalString('PRELEVEMENT_CODE_GUICHET') should be empty (we don't use them anymore)
|
||||
$result = $bprev->create(getDolGlobalString('PRELEVEMENT_CODE_BANQUE'), getDolGlobalString('PRELEVEMENT_CODE_GUICHET'), $mode, $format, $executiondate, 0, $type);
|
||||
|
||||
if ($result < 0) {
|
||||
setEventMessages($bprev->error, $bprev->errors, 'errors');
|
||||
} elseif ($result == 0) {
|
||||
|
|
|
|||
|
|
@ -499,7 +499,7 @@ class Contrat extends CommonObject
|
|||
|
||||
// A contract is validated so we can move thirdparty to status customer
|
||||
if (empty($conf->global->CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION)) {
|
||||
$result = $this->thirdparty->set_as_client();
|
||||
$result = $this->thirdparty->setAsCustomer();
|
||||
}
|
||||
|
||||
// Define new ref
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissionto
|
|||
}
|
||||
} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha') && !empty($permissiontoadd)) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
|
||||
$langs->load('link');
|
||||
|
||||
$link = new Link($db);
|
||||
$f = $link->fetch(GETPOST('linkid', 'int'));
|
||||
if ($f) {
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ class box_last_knowledgerecord extends ModeleBoxes
|
|||
public function __construct($db, $param = '')
|
||||
{
|
||||
global $langs;
|
||||
$langs->load("boxes", "languages");
|
||||
$langs->loadLangs(array("boxes", "languages"));
|
||||
$this->db = $db;
|
||||
|
||||
$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastKnowledgerecord");
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ class box_last_modified_knowledgerecord extends ModeleBoxes
|
|||
public function __construct($db, $param = '')
|
||||
{
|
||||
global $langs;
|
||||
$langs->load("boxes", "knowledgemanagement", "languages");
|
||||
$langs->loadLangs(array("boxes", "knowledgemanagement", "languages"));
|
||||
$this->db = $db;
|
||||
|
||||
$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedKnowledgerecord");
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class box_scheduled_jobs extends ModeleBoxes
|
|||
while ($i < $num) {
|
||||
$objp = $this->db->fetch_object($result);
|
||||
|
||||
if (dol_eval($objp->test, 1, 1, '')) {
|
||||
if (dol_eval($objp->test, 1, 1, '2')) {
|
||||
$nextrun = $this->db->jdate($objp->datenextrun);
|
||||
if (empty($nextrun)) {
|
||||
$nextrun = $this->db->jdate($objp->datestart);
|
||||
|
|
|
|||
|
|
@ -6168,7 +6168,7 @@ abstract class CommonObject
|
|||
if (empty($conf->disable_compute)) {
|
||||
global $objectoffield; // We set a global variable to $objectoffield so
|
||||
$objectoffield = $this; // we can use it inside computed formula
|
||||
$this->array_options['options_' . $key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '');
|
||||
$this->array_options['options_' . $key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '2');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6297,8 +6297,8 @@ abstract class CommonObject
|
|||
|
||||
if (!empty($attrfieldcomputed)) {
|
||||
if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
|
||||
$value = dol_eval($attrfieldcomputed, 1, 0, '');
|
||||
dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
|
||||
$value = dol_eval($attrfieldcomputed, 1, 0, '2');
|
||||
dol_syslog($langs->trans("Extrafieldcomputed")." on ".$attributeLabel."(".$value.")", LOG_DEBUG);
|
||||
$new_array_options[$key] = $value;
|
||||
} else {
|
||||
$new_array_options[$key] = null;
|
||||
|
|
@ -6678,7 +6678,7 @@ abstract class CommonObject
|
|||
|
||||
if (!empty($attrfieldcomputed)) {
|
||||
if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
|
||||
$value = dol_eval($attrfieldcomputed, 1, 0, '');
|
||||
$value = dol_eval($attrfieldcomputed, 1, 0, '2');
|
||||
dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
|
||||
$this->array_options["options_".$key] = $value;
|
||||
} else {
|
||||
|
|
@ -7600,7 +7600,7 @@ abstract class CommonObject
|
|||
if ($computed) {
|
||||
// Make the eval of compute string
|
||||
//var_dump($computed);
|
||||
$value = dol_eval($computed, 1, 0, '');
|
||||
$value = dol_eval($computed, 1, 0, '2');
|
||||
}
|
||||
|
||||
if (empty($morecss)) {
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ class FormActions
|
|||
print '</td>';
|
||||
|
||||
// Label
|
||||
print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($actioncomm->label).'">'.$actioncomm->getNomUrl(0, 36).'</td>';
|
||||
print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($actioncomm->label).'">'.$actioncomm->getNomUrl(0).'</td>';
|
||||
|
||||
// Date
|
||||
print '<td class="center nowraponall">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
|
||||
|
|
|
|||
|
|
@ -825,11 +825,11 @@ class FormOther
|
|||
/**
|
||||
* Output a HTML code to select a color. Field will return an hexa color like '334455'.
|
||||
*
|
||||
* @param string $set_color Pre-selected color
|
||||
* @param string $set_color Pre-selected color with format '#......'
|
||||
* @param string $prefix Name of HTML field
|
||||
* @param string $form_name Deprecated. Not used.
|
||||
* @param int $showcolorbox 1=Show color code and color box, 0=Show only color code
|
||||
* @param array $arrayofcolors Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
|
||||
* @param array $arrayofcolors Array of possible colors to choose in the selector. All colors are possible if empty. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
|
||||
* @param string $morecss Add css style into input field
|
||||
* @param string $setpropertyonselect Set this property after selecting a color
|
||||
* @param string $default Default color
|
||||
|
|
@ -917,7 +917,8 @@ class FormOther
|
|||
</script>';
|
||||
$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
|
||||
} else {
|
||||
$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat input-nobottom colorselector valignmiddle '.($morecss ? ' '.$morecss : '').'" type="color" value="#'.dol_escape_htmltag($set_color !== '' ? $set_color : $default).'" />';
|
||||
$color = ($set_color !== '' ? $set_color : ($default !== '' ? $default : 'FFFFFF'));
|
||||
$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat input-nobottom colorselector valignmiddle '.($morecss ? ' '.$morecss : '').'" type="color" data-default="'.$default.'" value="'.dol_escape_htmltag(preg_match('/^#/', $color) ? $color : '#'.$color).'" />';
|
||||
$out .= '<script nonce="'.getNonce().'" type="text/javascript">
|
||||
jQuery(document).ready(function(){
|
||||
var originalhex = null;
|
||||
|
|
|
|||
|
|
@ -653,6 +653,7 @@ class SMTPs
|
|||
{
|
||||
global $conf;
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
|
||||
/**
|
||||
* Default return value
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ function assetPrepareHead(Asset $object)
|
|||
{
|
||||
global $db, $langs, $conf;
|
||||
|
||||
$langs->load("assets", "admin");
|
||||
$langs->loadLangs(array("assets", "admin"));
|
||||
|
||||
$h = 0;
|
||||
$head = array();
|
||||
|
|
@ -184,7 +184,7 @@ function assetModelPrepareHead($object)
|
|||
{
|
||||
global $langs, $conf;
|
||||
|
||||
$langs->load("assets", "admin");
|
||||
$langs->loadLangs(array("assets", "admin"));
|
||||
|
||||
$h = 0;
|
||||
$head = array();
|
||||
|
|
|
|||
|
|
@ -869,7 +869,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
|
|||
|
||||
// Ref
|
||||
print '<td class="nowraponall">';
|
||||
print $projecttmp->getNomUrl(1);
|
||||
print $projecttmp->getNomUrl(1, '', 0, '', '-', 0, 1, '', 'project:'.$_SERVER["PHP_SELF"].'?socid=__SOCID__');
|
||||
print '</td>';
|
||||
|
||||
// Label
|
||||
|
|
|
|||
|
|
@ -1885,7 +1885,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
|
|||
$linkObject->objectid = GETPOST('objectid', 'int');
|
||||
$linkObject->label = GETPOST('label', 'alpha');
|
||||
$res = $linkObject->create($user);
|
||||
$langs->load('link');
|
||||
|
||||
if ($res > 0) {
|
||||
setEventMessages($langs->trans("LinkComplete"), null, 'mesgs');
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -6939,7 +6939,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
|
|||
* Creation of a directory (this can create recursive subdir)
|
||||
*
|
||||
* @param string $dir Directory to create (Separator must be '/'. Example: '/mydir/mysubdir')
|
||||
* @param string $dataroot Data root directory (To avoid having the data root in the loop. Using this will also lost the warning on first dir PHP has no permission when open_basedir is used)
|
||||
* @param string $dataroot Data root directory (To avoid having the data root in the loop. Using this will also lost the warning, on first dir, saying PHP has no permission when open_basedir is used)
|
||||
* @param string $newmask Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'
|
||||
* @return int < 0 if KO, 0 = already exists, > 0 if OK
|
||||
*/
|
||||
|
|
@ -6972,6 +6972,7 @@ function dol_mkdir($dir, $dataroot = '', $newmask = '')
|
|||
} else {
|
||||
$ccdir .= $cdir[$i];
|
||||
}
|
||||
$regs = array();
|
||||
if (preg_match("/^.:$/", $ccdir, $regs)) {
|
||||
continue; // Si chemin Windows incomplet, on poursuit par rep suivant
|
||||
}
|
||||
|
|
@ -9145,6 +9146,33 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a variable with name $var start with $text.
|
||||
* Can be used to forge dol_eval() conditions.
|
||||
*
|
||||
* @param $var string Variable
|
||||
* @param $regextext string Text that must be a valid regex string
|
||||
* @param $matchrule int 1=Test if start with, 0=Test if equal
|
||||
* @return boolean|string True or False, text if bad use.
|
||||
*/
|
||||
function isStringVarMatching($var, $regextext, $matchrule = 1)
|
||||
{
|
||||
if ($matchrule == 1) {
|
||||
if ($var == 'mainmenu') {
|
||||
global $mainmenu;
|
||||
return (preg_match('/^'.$regextext.'/', $mainmenu));
|
||||
} elseif ($var == 'leftmenu') {
|
||||
global $leftmenu;
|
||||
return (preg_match('/^'.$regextext.'/', $leftmenu));
|
||||
} else {
|
||||
return 'This variable is not accessible with dol_eval';
|
||||
}
|
||||
} else {
|
||||
return 'This value for matchrule is not implemented';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Verify if condition in string is ok or not
|
||||
*
|
||||
|
|
@ -9153,15 +9181,15 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
|
|||
*/
|
||||
function verifCond($strToEvaluate)
|
||||
{
|
||||
global $user, $conf, $langs;
|
||||
global $conf; // Read of const is done with getDolGlobalString() but we need $conf->currency for example
|
||||
global $user, $langs;
|
||||
global $leftmenu;
|
||||
global $rights; // To export to dol_eval function
|
||||
|
||||
//print $strToEvaluate."<br>\n";
|
||||
$rights = true;
|
||||
if (isset($strToEvaluate) && $strToEvaluate !== '') {
|
||||
//var_dump($strToEvaluate);
|
||||
$rep = dol_eval($strToEvaluate, 1, 1, '1'); // The dol_eval must contains all the global $xxx for all variables $xxx found into the string condition
|
||||
$rep = dol_eval($strToEvaluate, 1, 1, '1'); // The dol_eval() must contains all the "global $xxx;" for all variables $xxx found into the string condition
|
||||
$rights = $rep && (!is_string($rep) || strpos($rep, 'Bad string syntax to evaluate') === false);
|
||||
//var_dump($rights);
|
||||
}
|
||||
|
|
@ -9175,29 +9203,36 @@ function verifCond($strToEvaluate)
|
|||
* @param string $s String to evaluate
|
||||
* @param int $returnvalue 0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
|
||||
* @param int $hideerrors 1=Hide errors
|
||||
* @param string $onlysimplestring '0' (used for computed property of extrafields)=Accept all chars, '1' (most common use)=Accept only simple string with char 'a-z0-9\s^$_+-.*>&|=!?():"\',/@';', '2' (rarely used)=Accept also '[]'
|
||||
* @param string $onlysimplestring '0' (deprecated, used for computed property of extrafields)=Accept all chars,
|
||||
* '1' (most common use)=Accept only simple string with char 'a-z0-9\s^$_+-.*>&|=!?():"\',/@';',
|
||||
* '2' (rarely used)=Accept also '[]'
|
||||
* @return mixed Nothing or return result of eval
|
||||
* @see verifCond()
|
||||
*/
|
||||
function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1')
|
||||
{
|
||||
// Only global variables can be changed by eval function and returned to caller
|
||||
global $db, $langs, $user, $conf, $website, $websitepage;
|
||||
// Only this global variables can be read by eval function and returned to caller
|
||||
global $conf; // Read of const is done with getDolGlobalString() but we need $conf->currency for example
|
||||
global $db, $langs, $user, $website, $websitepage;
|
||||
global $action, $mainmenu, $leftmenu;
|
||||
global $mysoc;
|
||||
global $objectoffield;
|
||||
global $objectoffield; // To allow the use of $objectoffield in computed fields
|
||||
|
||||
// Old variables used
|
||||
global $rights;
|
||||
global $object;
|
||||
global $obj; // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object
|
||||
global $soc; // For backward compatibility
|
||||
global $obj; // To get $obj used into list when dol_eval() is used for computed fields and $obj is not yet $object
|
||||
//global $rights;
|
||||
//global $soc; // For backward compatibility
|
||||
|
||||
if (!in_array($onlysimplestring, array('0', '1', '2'))) {
|
||||
return "Bad call of dol_eval. Parameter onlysimplestring must be '0' (deprecated), '1' or '2'";
|
||||
}
|
||||
|
||||
try {
|
||||
// Test on dangerous char (used for RCE), we allow only characters to make PHP variable testing
|
||||
if ($onlysimplestring == '1') {
|
||||
// We must accept: '1 && getDolGlobalInt("doesnotexist1") && $conf->global->MAIN_FEATURES_LEVEL'
|
||||
// We must accept: '$conf->barcode->enabled || preg_match(\'/^AAA/\',$leftmenu)'
|
||||
// We must accept: '$user->rights->cabinetmed->read && !$object->canvas=="patient@cabinetmed"'
|
||||
// We must accept: '1 && getDolGlobalInt("doesnotexist1") && getDolGlobalString("MAIN_FEATURES_LEVEL")'
|
||||
// We must accept: '$user->hasRight("cabinetmed", "read") && !$object->canvas=="patient@cabinetmed"'
|
||||
if (preg_match('/[^a-z0-9\s'.preg_quote('^$_+-.*>&|=!?():"\',/@', '/').']/i', $s)) {
|
||||
if ($returnvalue) {
|
||||
return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;
|
||||
|
|
@ -9205,10 +9240,24 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
|
|||
dol_syslog('Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s);
|
||||
return '';
|
||||
}
|
||||
// TODO
|
||||
// We can exclude all parenthesis ( that are not '($db' and 'getDolGlobalInt(' and 'getDolGlobalString(' and 'preg_match(' and 'isModEnabled('
|
||||
// ...
|
||||
}
|
||||
$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $s); // accept parenthesis in '...->method(...'
|
||||
$scheck = preg_replace('/^\(/', '__PARENTHESIS__', $scheck); // accept parenthesis in '(...'
|
||||
$scheck = preg_replace('/\s\(/', '__PARENTHESIS__', $scheck); // accept parenthesis in '... ('
|
||||
$scheck = preg_replace('/^[a-zA-Z0-9_]+\(/', '$1__FUNCTION__', $scheck); // accept parenthesis in 'function('
|
||||
$scheck = preg_replace('/\s[a-zA-Z0-9_]+\(/', '$1__FUNCTION__', $scheck); // accept parenthesis in '... function('
|
||||
$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck); // To allow preg_match('/^(aaa|bbb)/'... or isStringVarMatching('leftmenu', '(aaa|bbb)')
|
||||
//print 'scheck='.$scheck." : ".strpos($scheck, '(')."\n";
|
||||
if (strpos($scheck, '(') !== false) {
|
||||
if ($returnvalue) {
|
||||
return 'Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s;
|
||||
} else {
|
||||
dol_syslog('Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s);
|
||||
return '';
|
||||
}
|
||||
}
|
||||
// TODO
|
||||
// We can exclude $ char that are not: $db, $langs, $leftmenu, $topmenu, $user, $langs, $objectoffield, $object...,
|
||||
} elseif ($onlysimplestring == '2') {
|
||||
// We must accept: (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : "Parent project not found"
|
||||
if (preg_match('/[^a-z0-9\s'.preg_quote('^$_+-.*>&|=!?():"\',/@[]', '/').']/i', $s)) {
|
||||
|
|
@ -9218,10 +9267,24 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
|
|||
dol_syslog('Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s);
|
||||
return '';
|
||||
}
|
||||
// TODO
|
||||
// We can exclude all parenthesis ( that are not '($db' and 'getDolGlobalInt(' and 'getDolGlobalString(' and 'preg_match(' and 'isModEnabled('
|
||||
// ...
|
||||
}
|
||||
$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $s); // accept parenthesis in '...->method(...'
|
||||
$scheck = preg_replace('/^\(/', '__PARENTHESIS__', $scheck); // accept parenthesis in '(...'
|
||||
$scheck = preg_replace('/\s\(/', '__PARENTHESIS__', $scheck); // accept parenthesis in '... ('
|
||||
$scheck = preg_replace('/^[a-zA-Z0-9_]+\(/', '$1__FUNCTION__', $scheck); // accept parenthesis in 'function('
|
||||
$scheck = preg_replace('/\s[a-zA-Z0-9_]+\(/', '$1__FUNCTION__', $scheck); // accept parenthesis in '... function('
|
||||
$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck); // To allow preg_match('/^(aaa|bbb)/'... or isStringVarMatching('leftmenu', '(aaa|bbb)')
|
||||
//print 'scheck='.$scheck." : ".strpos($scheck, '(')."\n";
|
||||
if (strpos($scheck, '(') !== false) {
|
||||
if ($returnvalue) {
|
||||
return 'Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s;
|
||||
} else {
|
||||
dol_syslog('Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s);
|
||||
return '';
|
||||
}
|
||||
}
|
||||
// TODO
|
||||
// We can exclude $ char that are not: $db, $leftmenu, $topmenu, $user, $langs, $object...,
|
||||
}
|
||||
if (is_array($s) || $s === 'Array') {
|
||||
return 'Bad string syntax to evaluate (value is Array) '.var_export($s, true);
|
||||
|
|
@ -9255,9 +9318,13 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
|
|||
$forbiddenphpstrings = array('$$');
|
||||
$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
|
||||
|
||||
$forbiddenphpfunctions = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI", "verifCond", "base64_decode");
|
||||
$forbiddenphpfunctions = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen");
|
||||
$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_eval", "executeCLI", "verifCond")); // native dolibarr functions
|
||||
$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("base64_decode", "rawurldecode", "urldecode")); // decode string functions
|
||||
$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));
|
||||
$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("get_defined_functions", "get_defined_vars", "get_defined_constants", "get_declared_classes"));
|
||||
$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));
|
||||
$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
|
||||
|
||||
$forbiddenphpregex = 'global\s+\$|\b('.implode('|', $forbiddenphpfunctions).')\b';
|
||||
|
||||
|
|
|
|||
|
|
@ -1203,7 +1203,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
|
|||
$modulename = strtolower($modulename);
|
||||
|
||||
if (empty($dictionnaires)) {
|
||||
$dictionnaires = array('tabname' => array(), 'tablib' => array(), 'tabsql' => array(), 'tabsqlsort' => array(), 'tabfield' => array(), 'tabfieldvalue' => array(), 'tabfieldinsert' => array(), 'tabrowid' => array(), 'tabcond' => array(), 'tabhelp' => array());
|
||||
$dictionnaires = array('langs' => '', 'tabname' => array(), 'tablib' => array(), 'tabsql' => array(), 'tabsqlsort' => array(), 'tabfield' => array(), 'tabfieldvalue' => array(), 'tabfieldinsert' => array(), 'tabrowid' => array(), 'tabcond' => array(), 'tabhelp' => array());
|
||||
}
|
||||
|
||||
$columns = array(
|
||||
|
|
@ -1243,6 +1243,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
|
|||
}
|
||||
|
||||
// rewrite dictionnary if
|
||||
$dictionnaires['langs'] = $modulename.'@'.$modulename;
|
||||
$dictionnaires['tabname'][] = strtolower($namedic);
|
||||
$dictionnaires['tablib'][] = ucfirst(substr($namedic, 2));
|
||||
$dictionnaires['tabsql'][] = 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.strtolower($namedic).' as f';
|
||||
|
|
|
|||
|
|
@ -434,19 +434,21 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
|
|||
|
||||
// Get more permissions checks from hooks
|
||||
$parameters = array('features'=>$features, 'originalfeatures'=>$originalfeatures, 'objectid'=>$objectid, 'dbt_select'=>$dbt_select, 'idtype'=>$dbt_select, 'isdraft'=>$isdraft);
|
||||
$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
|
||||
if (!empty($hookmanager)) {
|
||||
$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
|
||||
|
||||
if (isset($hookmanager->resArray['result'])) {
|
||||
if ($hookmanager->resArray['result'] == 0) {
|
||||
if ($mode) {
|
||||
return 0;
|
||||
} else {
|
||||
accessforbidden(); // Module returns 0, so access forbidden
|
||||
if (isset($hookmanager->resArray['result'])) {
|
||||
if ($hookmanager->resArray['result'] == 0) {
|
||||
if ($mode) {
|
||||
return 0;
|
||||
} else {
|
||||
accessforbidden(); // Module returns 0, so access forbidden
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($reshook > 0) { // No other test done.
|
||||
return 1;
|
||||
if ($reshook > 0) { // No other test done.
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Features/modules to check
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $c
|
|||
$content = str_replace('href="styles.css.php', 'href="!~!~!~styles.css.php', $content);
|
||||
$content = str_replace('src="javascript.js.php', 'src="!~!~!~javascript.js.php', $content);
|
||||
$content = str_replace('href="http', 'href="!~!~!~http', $content);
|
||||
$content = str_replace('xlink:href="', 'xlink:href="!~!~!~', $content);
|
||||
$content = str_replace('href="//', 'href="!~!~!~//', $content);
|
||||
$content = str_replace('src="//', 'src="!~!~!~//', $content);
|
||||
$content = str_replace('src="viewimage.php', 'src="!~!~!~/viewimage.php', $content);
|
||||
|
|
@ -311,6 +312,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
|
|||
$content = str_replace('href="styles.css.php', 'href="!~!~!~styles.css.php', $content);
|
||||
$content = str_replace('src="javascript.css.php', 'src="!~!~!~javascript.css.php', $content);
|
||||
$content = str_replace('href="http', 'href="!~!~!~http', $content);
|
||||
$content = str_replace('xlink:href="', 'xlink:href="!~!~!~', $content);
|
||||
$content = str_replace('href="//', 'href="!~!~!~//', $content);
|
||||
$content = str_replace('src="//', 'src="!~!~!~//', $content);
|
||||
$content = str_replace(array('src="viewimage.php', 'src="/viewimage.php'), 'src="!~!~!~/viewimage.php', $content);
|
||||
|
|
|
|||
|
|
@ -163,7 +163,6 @@ class modApi extends DolibarrModules
|
|||
'langs'=>'modulebuilder',
|
||||
'position'=>100,
|
||||
'perms'=>'1',
|
||||
//'enabled'=>'isModEnabled("api") && preg_match(\'/^(devtools)/\',$leftmenu)',
|
||||
'enabled'=>'isModEnabled("api")',
|
||||
'target'=>'_apiexplorer',
|
||||
'user'=>0);
|
||||
|
|
|
|||
|
|
@ -91,8 +91,6 @@ class modEmailCollector extends DolibarrModules
|
|||
$this->requiredby = array(); // List of module ids to disable if this one is disabled
|
||||
$this->conflictwith = array(); // List of module class names as string this module is in conflict with
|
||||
$this->langfiles = array("admin");
|
||||
$this->phpmin = array(7, 0); // Minimum version of PHP required by module
|
||||
$this->need_dolibarr_version = array(7, 0); // Minimum version of Dolibarr required by module
|
||||
$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
|
||||
$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
|
||||
//$this->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
|
||||
|
|
@ -159,7 +157,7 @@ class modEmailCollector extends DolibarrModules
|
|||
// Cronjobs (List of cron jobs entries to add when module is enabled)
|
||||
// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
|
||||
$this->cronjobs = array(
|
||||
0=>array('label'=>'Email collector', 'priority'=>50, 'jobtype'=>'method', 'class'=>'/emailcollector/class/emailcollector.class.php', 'objectname'=>'EmailCollector', 'method'=>'doCollect', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>5, 'unitfrequency'=>60, 'status'=>1, 'test'=>'$conf->emailcollector->enabled')
|
||||
0=>array('label'=>'Email collector', 'priority'=>50, 'jobtype'=>'method', 'class'=>'/emailcollector/class/emailcollector.class.php', 'objectname'=>'EmailCollector', 'method'=>'doCollect', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>5, 'unitfrequency'=>60, 'status'=>1, 'test'=>'isModEnabled("emailcollector")')
|
||||
);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
|
|||
// If field is a computed field, we make computation to get value
|
||||
if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) {
|
||||
$objectoffield = $object; //For compatibily with the computed formula
|
||||
$value = dol_eval($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1, 1, '0');
|
||||
$value = dol_eval($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1, 1, '2');
|
||||
if (is_numeric(price2num($value)) && $extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
|
||||
$obj->$tmpkey = price2num($value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1105,8 +1105,8 @@ class EmailCollector extends CommonObject
|
|||
$searchfilterisanswer = 0;
|
||||
$searchfilterisnotanswer = 0;
|
||||
$searchfilterreplyto = 0;
|
||||
$searchfilterexcludebody = '';
|
||||
$searchfilterexcludesubject = '';
|
||||
$searchfilterexcludebodyarray = array();
|
||||
$searchfilterexcludesubjectarray = array();
|
||||
$operationslog = '';
|
||||
|
||||
$now = dol_now();
|
||||
|
|
@ -1300,7 +1300,7 @@ class EmailCollector extends CommonObject
|
|||
if ($rule['type'] == 'subject') {
|
||||
if (strpos($rule['rulevalue'], '!') === 0) {
|
||||
//array_push($criteria, array("NOT SUBJECT" => $rule['rulevalue']));
|
||||
$searchfilterexcludesubject = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
$searchfilterexcludesubjectarray[] = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
} else {
|
||||
array_push($criteria, array("SUBJECT" => $rule['rulevalue']));
|
||||
}
|
||||
|
|
@ -1308,7 +1308,7 @@ class EmailCollector extends CommonObject
|
|||
if ($rule['type'] == 'body') {
|
||||
if (strpos($rule['rulevalue'], '!') === 0) {
|
||||
//array_push($criteria, array("NOT BODY" => $rule['rulevalue']));
|
||||
$searchfilterexcludebody = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
$searchfilterexcludebodyarray[] = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
} else {
|
||||
array_push($criteria, array("BODY" => $rule['rulevalue']));
|
||||
}
|
||||
|
|
@ -1431,7 +1431,7 @@ class EmailCollector extends CommonObject
|
|||
if ($rule['type'] == 'subject') {
|
||||
if (strpos($rule['rulevalue'], '!') === 0) {
|
||||
//$search .= ($search ? ' ' : '').'NOT BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
|
||||
$searchfilterexcludesubject = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
$searchfilterexcludesubjectarray[] = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
} else {
|
||||
$search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
|
||||
}
|
||||
|
|
@ -1439,7 +1439,7 @@ class EmailCollector extends CommonObject
|
|||
if ($rule['type'] == 'body') {
|
||||
if (strpos($rule['rulevalue'], '!') === 0) {
|
||||
//$search .= ($search ? ' ' : '').'NOT BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
|
||||
$searchfilterexcludebody = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
$searchfilterexcludebodyarray[] = preg_replace('/^!/', '', $rule['rulevalue']);
|
||||
} else {
|
||||
// Warning: Google doesn't implement IMAP properly, and only matches whole words,
|
||||
$search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
|
||||
|
|
@ -1771,12 +1771,14 @@ class EmailCollector extends CommonObject
|
|||
continue; // Exclude email
|
||||
}
|
||||
|
||||
if ($searchfilterexcludebody) {
|
||||
if (preg_match('/'.preg_quote($searchfilterexcludebody, '/').'/ms', $messagetext)) {
|
||||
$nbemailprocessed++;
|
||||
$operationslog .= '<br>Discarded - Email body contains string '.$searchfilterexcludebody;
|
||||
dol_syslog(" Discarded - Email body contains string ".$searchfilterexcludebody);
|
||||
continue; // Exclude email
|
||||
if (!empty($searchfilterexcludebodyarray)) {
|
||||
foreach ($searchfilterexcludebodyarray as $searchfilterexcludebody) {
|
||||
if (preg_match('/'.preg_quote($searchfilterexcludebody, '/').'/ms', $messagetext)) {
|
||||
$nbemailprocessed++;
|
||||
$operationslog .= '<br>Discarded - Email body contains string '.$searchfilterexcludebody;
|
||||
dol_syslog(" Discarded - Email body contains string ".$searchfilterexcludebody);
|
||||
continue 2; // Exclude email
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1863,12 +1865,14 @@ class EmailCollector extends CommonObject
|
|||
//var_dump($msgid);exit;
|
||||
}
|
||||
|
||||
if ($searchfilterexcludesubject) {
|
||||
if (preg_match('/'.preg_quote($searchfilterexcludesubject, '/').'/ms', $subject)) {
|
||||
$nbemailprocessed++;
|
||||
$operationslog .= '<br>Discarded - Email subject contains string '.$searchfilterexcludesubject;
|
||||
dol_syslog(" Discarded - Email subject contains string ".$searchfilterexcludesubject);
|
||||
continue; // Exclude email
|
||||
if (!empty($searchfilterexcludesubjectarray)) {
|
||||
foreach ($searchfilterexcludesubjectarray as $searchfilterexcludesubject) {
|
||||
if (preg_match('/'.preg_quote($searchfilterexcludesubject, '/').'/ms', $subject)) {
|
||||
$nbemailprocessed++;
|
||||
$operationslog .= '<br>Discarded - Email subject contains string '.$searchfilterexcludesubject;
|
||||
dol_syslog(" Discarded - Email subject contains string ".$searchfilterexcludesubject);
|
||||
continue 2; // Exclude email
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2272,12 +2276,16 @@ class EmailCollector extends CommonObject
|
|||
}
|
||||
} else {
|
||||
// Regex not found
|
||||
$idtouseforthirdparty = null;
|
||||
$nametouseforthirdparty = null;
|
||||
$emailtouseforthirdparty = null;
|
||||
$namealiastouseforthirdparty = null;
|
||||
if (in_array($propertytooverwrite, array('id', 'email', 'name', 'name_alias'))) {
|
||||
$idtouseforthirdparty = null;
|
||||
$nametouseforthirdparty = null;
|
||||
$emailtouseforthirdparty = null;
|
||||
$namealiastouseforthirdparty = null;
|
||||
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' Regex /'.dol_escape_htmltag($regexstring).'/ms into '.strtoupper($sourcefield).' -> Not found';
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' Regex /'.dol_escape_htmltag($regexstring).'/ms into '.strtoupper($sourcefield).' -> Not found. Property searched is critical so we cancel the search.';
|
||||
} else {
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' Regex /'.dol_escape_htmltag($regexstring).'/ms into '.strtoupper($sourcefield).' -> Not found';
|
||||
}
|
||||
}
|
||||
//var_dump($object->$tmpproperty);exit;
|
||||
} else {
|
||||
|
|
@ -2319,7 +2327,7 @@ class EmailCollector extends CommonObject
|
|||
|
||||
if (!$errorforactions && ($idtouseforthirdparty || $emailtouseforthirdparty || $nametouseforthirdparty || $namealiastouseforthirdparty)) {
|
||||
// We make another search on thirdparty
|
||||
$operationslog .= '<br>We have this data to search thirdparty: '.$idtouseforthirdparty.' '.$emailtouseforthirdparty.' '.$nametouseforthirdparty.' '.$namealiastouseforthirdparty;
|
||||
$operationslog .= '<br>We have this data to search thirdparty: id='.$idtouseforthirdparty.', email='.$emailtouseforthirdparty.', name='.$nametouseforthirdparty.', name_alias='.$namealiastouseforthirdparty;
|
||||
|
||||
$tmpobject = new stdClass();
|
||||
$tmpobject->element == 'generic';
|
||||
|
|
@ -3225,6 +3233,7 @@ class EmailCollector extends CommonObject
|
|||
} else {
|
||||
$langs->load("admin");
|
||||
$output = $langs->trans('NoNewEmailToProcess');
|
||||
$output .= ' (defaultlang='.$langs->defaultlang.')';
|
||||
}
|
||||
|
||||
// Disconnect
|
||||
|
|
|
|||
|
|
@ -725,7 +725,7 @@ class Expedition extends CommonObject
|
|||
$soc->fetch($this->socid);
|
||||
|
||||
// Class of company linked to order
|
||||
$result = $soc->set_as_client();
|
||||
$result = $soc->setAsCustomer();
|
||||
|
||||
// Define new ref
|
||||
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
|
||||
|
|
|
|||
|
|
@ -711,6 +711,44 @@ class Export
|
|||
$remaintopay = $tmpobjforcomputecall->getRemainToPay();
|
||||
}
|
||||
$obj->$alias = $remaintopay;
|
||||
} elseif (is_array($this->array_export_special[$indice][$key]) &&
|
||||
!empty($this->array_export_special[$indice][$key]['rule']) &&
|
||||
$this->array_export_special[$indice][$key]['rule'] == 'compute'
|
||||
) {
|
||||
// Custom compute
|
||||
$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
|
||||
$value = '';
|
||||
if (!empty($this->array_export_special[$indice][$key]['class']) &&
|
||||
!empty($this->array_export_special[$indice][$key]['classfile']) &&
|
||||
!empty($this->array_export_special[$indice][$key]['method'])
|
||||
) {
|
||||
if (!dol_include_once($this->array_export_special[$indice][$key]['classfile'])) {
|
||||
$this->error = "Computed field bad configuration: {$this->array_export_special[$indice][$key]['classfile']} not found";
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!class_exists($this->array_export_special[$indice][$key]['class'])) {
|
||||
$this->error = "Computed field bad configuration: {$this->array_export_special[$indice][$key]['class']} class doesn't exist";
|
||||
return -1;
|
||||
}
|
||||
|
||||
$className = $this->array_export_special[$indice][$key]['class'];
|
||||
$tmpObject = new $className($this->db);
|
||||
if (!method_exists($tmpObject, $this->array_export_special[$indice][$key]['method'])) {
|
||||
$this->error = "Computed field bad configuration: {$this->array_export_special[$indice][$key]['method']} method doesn't exist";
|
||||
return -1;
|
||||
}
|
||||
|
||||
$methodName = $this->array_export_special[$indice][$key]['method'];
|
||||
$params = [];
|
||||
if (!empty($this->array_export_special[$indice][$key]['method_params'])) {
|
||||
foreach ($this->array_export_special[$indice][$key]['method_params'] as $paramName) {
|
||||
$params[] = $obj->$paramName ?? null;
|
||||
}
|
||||
}
|
||||
$value = $tmpObject->$methodName(...$params);
|
||||
}
|
||||
$obj->$alias = $value;
|
||||
} else {
|
||||
// TODO FIXME
|
||||
// Export of compute field does not work. $obj contains $obj->alias_field and formula may contains $obj->field
|
||||
|
|
|
|||
|
|
@ -950,7 +950,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
$this->ref_ext = $obj->ref_ext;
|
||||
$this->entity = $obj->entity;
|
||||
$this->type = empty($obj->type) ? self::TYPE_STANDARD : $obj->type;
|
||||
$this->fk_soc = $obj->fk_soc;
|
||||
$this->socid = $obj->fk_soc;
|
||||
$this->datec = $this->db->jdate($obj->datec);
|
||||
$this->date = $this->db->jdate($obj->datef);
|
||||
$this->datep = $this->db->jdate($obj->datef);
|
||||
|
|
@ -1170,8 +1170,8 @@ class FactureFournisseur extends CommonInvoice
|
|||
if (isset($this->type)) {
|
||||
$this->type = trim($this->type);
|
||||
}
|
||||
if (isset($this->fk_soc)) {
|
||||
$this->fk_soc = trim($this->fk_soc);
|
||||
if (isset($this->socid)) {
|
||||
$this->socid = trim($this->socid);
|
||||
}
|
||||
if (isset($this->label)) {
|
||||
$this->label = trim($this->label);
|
||||
|
|
@ -1251,14 +1251,14 @@ class FactureFournisseur extends CommonInvoice
|
|||
$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
|
||||
$sql .= " entity=".(isset($this->entity) ? ((int) $this->entity) : "null").",";
|
||||
$sql .= " type=".(isset($this->type) ? ((int) $this->type) : "null").",";
|
||||
$sql .= " fk_soc=".(isset($this->fk_soc) ? ((int) $this->fk_soc) : "null").",";
|
||||
$sql .= " fk_soc=".(isset($this->socid) ? ((int) $this->socid) : "null").",";
|
||||
$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
|
||||
$sql .= " datef=".(dol_strlen($this->date) != 0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
|
||||
if (dol_strlen($this->tms) != 0) {
|
||||
$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
|
||||
}
|
||||
$sql .= " libelle=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
|
||||
$sql .= " paye=".(isset($this->paye) ? ((int) $this->paye) : "null").",";
|
||||
$sql .= " paye=".(isset($this->paye) ? ((int) $this->paye) : "0").",";
|
||||
$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
|
||||
$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
|
||||
$sql .= " localtax1=".(isset($this->localtax1) ? ((float) $this->localtax1) : "null").",";
|
||||
|
|
@ -1271,7 +1271,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? ((int) $this->fk_user_valid) : "null").",";
|
||||
$sql .= " fk_facture_source=".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null").",";
|
||||
$sql .= " vat_reverse_charge = ".($this->vat_reverse_charge != '' ? ((int) $this->db->escape($this->vat_reverse_charge)) : 0).",";
|
||||
$sql .= " fk_projet=".(isset($this->fk_project) ? ((int) $this->fk_project) : "null").",";
|
||||
$sql .= " fk_projet=".(!empty($this->fk_project) ? ((int) $this->fk_project) : "null").",";
|
||||
$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? ((int) $this->cond_reglement_id) : "null").",";
|
||||
$sql .= " date_lim_reglement=".(dol_strlen($this->date_echeance) != 0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
|
||||
$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ if (!empty($arrayfields['cp.fk_type']['checked'])) {
|
|||
print_liste_field_titre($arrayfields['cp.fk_type']['label'], $_SERVER["PHP_SELF"], 'cp.fk_type', '', '', '', $sortfield, $sortorder);
|
||||
}
|
||||
if (!empty($arrayfields['cp.fk_user']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], 'cp.fk_user', '', '', '', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], 'u.lastname', '', '', '', $sortfield, $sortorder);
|
||||
}
|
||||
if (!empty($arrayfields['ct.label']['checked'])) {
|
||||
print_liste_field_titre($arrayfields['ct.label']['label'], $_SERVER["PHP_SELF"], 'ct.label', '', '', '', $sortfield, $sortorder);
|
||||
|
|
|
|||
|
|
@ -100,3 +100,8 @@ ALTER TABLE llx_societe_rib ADD COLUMN online_sign_ip varchar(48) AFTER date_sig
|
|||
ALTER TABLE llx_societe_rib ADD COLUMN online_sign_name varchar(64) AFTER online_sign_ip;
|
||||
|
||||
INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('PROPOSAL_ALLOW_ONLINESIGN', 1, '1', 'string', 0);
|
||||
|
||||
|
||||
ALTER TABLE llx_bookcal_availabilities ADD COLUMN fk_bookcal_calendar integer NOT NULL;
|
||||
|
||||
ALTER TABLE llx_bookcal_calendar ADD COLUMN visibility integer NOT NULL DEFAULT 1;
|
||||
|
|
|
|||
|
|
@ -53,15 +53,6 @@ create table llx_adherent
|
|||
url varchar(255) NULL,
|
||||
|
||||
socialnetworks text DEFAULT NULL, -- json with socialnetworks
|
||||
--skype varchar(255), -- deprecated
|
||||
--twitter varchar(255), -- deprecated
|
||||
--facebook varchar(255), -- deprecated
|
||||
--linkedin varchar(255), -- deprecated
|
||||
--instagram varchar(255), -- deprecated
|
||||
--snapchat varchar(255), -- deprecated
|
||||
--googleplus varchar(255), -- deprecated
|
||||
--youtube varchar(255), -- deprecated
|
||||
--whatsapp varchar(255), -- deprecated
|
||||
|
||||
phone varchar(30),
|
||||
phone_perso varchar(30),
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ CREATE TABLE llx_bookcal_calendar(
|
|||
fk_user_creat integer NOT NULL,
|
||||
fk_user_modif integer,
|
||||
import_key varchar(14),
|
||||
status integer NOT NULL,
|
||||
status integer NOT NULL DEFAULT 0,
|
||||
type integer NOT NULL,
|
||||
visibility integer NOT NULL
|
||||
visibility integer NOT NULL DEFAULT 1
|
||||
-- END MODULEBUILDER FIELDS
|
||||
) ENGINE=innodb;
|
||||
|
|
|
|||
|
|
@ -44,16 +44,6 @@ create table llx_socpeople
|
|||
email varchar(255),
|
||||
|
||||
socialnetworks text DEFAULT NULL, -- json with socialnetworks
|
||||
--jabberid varchar(255),
|
||||
--skype varchar(255),
|
||||
--twitter varchar(255), --
|
||||
--facebook varchar(255), --
|
||||
--linkedin varchar(255), --
|
||||
--instagram varchar(255), --
|
||||
--snapchat varchar(255), --
|
||||
--googleplus varchar(255), --
|
||||
--youtube varchar(255), --
|
||||
--whatsapp varchar(255), --
|
||||
|
||||
photo varchar(255),
|
||||
no_email smallint NOT NULL DEFAULT 0, -- deprecated. Use table llx_mailing_unsubscribe instead
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ print 'Option set_empty_time_spent_amount (\'test\' or \'confirmed\') is '.(GETP
|
|||
// Structure
|
||||
print 'Option force_utf8_on_tables (force utf8 + row=dynamic), for mysql/mariadb only (\'test\' or \'confirmed\') is '.(GETPOST('force_utf8_on_tables', 'alpha') ?GETPOST('force_utf8_on_tables', 'alpha') : 'undefined').'<br>'."\n";
|
||||
print "Option force_utf8mb4_on_tables (force utf8mb4 + row=dynamic, EXPERIMENTAL!), for mysql/mariadb only ('test' or 'confirmed') is ".(GETPOST('force_utf8mb4_on_tables', 'alpha') ? GETPOST('force_utf8mb4_on_tables', 'alpha') : 'undefined')."<br>\n";
|
||||
print "Option force_collation_from_conf_on_tables (force ".$conf->db->character_set."/".$conf->db->dolibarr_main_db_collation." + row=dynamic), for mysql/mariadb only ('test' or 'confirmed') is ".(GETPOST('force_collation_from_conf_on_tables', 'alpha') ? GETPOST('force_collation_from_conf_on_tables', 'alpha') : 'undefined')."<br>\n";
|
||||
// Rebuild sequence
|
||||
print 'Option rebuild_sequences, for postgresql only (\'test\' or \'confirmed\') is '.(GETPOST('rebuild_sequences', 'alpha') ?GETPOST('rebuild_sequences', 'alpha') : 'undefined').'<br>'."\n";
|
||||
print '<br>';
|
||||
|
|
@ -178,7 +179,7 @@ $oneoptionset = (GETPOST('standard', 'alpha') || GETPOST('restore_thirdparties_l
|
|||
|| GETPOST('clean_orphelin_dir', 'alpha') || GETPOST('clean_product_stock_batch', 'alpha') || GETPOST('set_empty_time_spent_amount', 'alpha') || GETPOST('rebuild_product_thumbs', 'alpha')
|
||||
|| GETPOST('clean_perm_table', 'alpha')
|
||||
|| GETPOST('force_disable_of_modules_not_found', 'alpha')
|
||||
|| GETPOST('force_utf8_on_tables', 'alpha') || GETPOST('force_utf8mb4_on_tables', 'alpha')
|
||||
|| GETPOST('force_utf8_on_tables', 'alpha') || GETPOST('force_utf8mb4_on_tables', 'alpha') || GETPOST('force_collation_from_conf_on_tables', 'alpha')
|
||||
|| GETPOST('rebuild_sequences', 'alpha'));
|
||||
|
||||
if ($ok && $oneoptionset) {
|
||||
|
|
@ -1366,6 +1367,62 @@ if ($ok && GETPOST('force_utf8mb4_on_tables', 'alpha')) {
|
|||
}
|
||||
}
|
||||
|
||||
if ($ok && GETPOST('force_collation_from_conf_on_tables', 'alpha')) {
|
||||
print '<tr><td colspan="2"><br>*** Force page code and collation of tables into '.$conf->db->character_set.'/'.$conf->db->dolibarr_main_db_collation.' and row_format=dynamic (for mysql/mariadb only)</td></tr>';
|
||||
|
||||
if ($db->type == "mysql" || $db->type == "mysqli") {
|
||||
$force_collation_from_conf_on_tables = GETPOST('force_collation_from_conf_on_tables', 'alpha');
|
||||
|
||||
$listoftables = $db->DDLListTablesFull($db->database_name);
|
||||
|
||||
// Disable foreign key checking for avoid errors
|
||||
if ($force_collation_from_conf_on_tables == 'confirmed') {
|
||||
$sql = 'SET FOREIGN_KEY_CHECKS=0';
|
||||
print '<!-- '.$sql.' -->';
|
||||
$resql = $db->query($sql);
|
||||
}
|
||||
|
||||
foreach ($listoftables as $table) {
|
||||
// do not convert llx_const if mysql encrypt/decrypt is used
|
||||
if ($conf->db->dolibarr_main_db_encryption != 0 && preg_match('/\_const$/', $table[0])) {
|
||||
continue;
|
||||
}
|
||||
if ($table[1] == 'VIEW') {
|
||||
print '<tr><td colspan="2">'.$table[0].' is a '.$table[1].' (Skipped)</td></tr>';
|
||||
continue;
|
||||
}
|
||||
|
||||
print '<tr><td colspan="2">';
|
||||
print $table[0];
|
||||
$sql1 = "ALTER TABLE ".$table[0]." ROW_FORMAT=dynamic";
|
||||
$sql2 = "ALTER TABLE ".$table[0]." CONVERT TO CHARACTER SET ".$conf->db->character_set." COLLATE ".$conf->db->dolibarr_main_db_collation;
|
||||
print '<!-- '.$sql1.' -->';
|
||||
print '<!-- '.$sql2.' -->';
|
||||
if ($force_collation_from_conf_on_tables == 'confirmed') {
|
||||
$resql1 = $db->query($sql1);
|
||||
if ($resql1) {
|
||||
$resql2 = $db->query($sql2);
|
||||
} else {
|
||||
$resql2 = false;
|
||||
}
|
||||
print ' - Done ('.(($resql1 && $resql2) ? 'OK' : 'KO').')';
|
||||
} else {
|
||||
print ' - Disabled';
|
||||
}
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// Enable foreign key checking
|
||||
if ($force_collation_from_conf_on_tables == 'confirmed') {
|
||||
$sql = 'SET FOREIGN_KEY_CHECKS=1';
|
||||
print '<!-- '.$sql.' -->';
|
||||
$resql = $db->query($sql);
|
||||
}
|
||||
} else {
|
||||
print '<tr><td colspan="2">Not available with database type '.$db->type.'</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
// rebuild sequences for pgsql
|
||||
if ($ok && GETPOST('rebuild_sequences', 'alpha')) {
|
||||
print '<tr><td colspan="2"><br>*** Force to rebuild sequences (for postgresql only)</td></tr>';
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=ربط ملف جديد/ وثيقة
|
||||
LinkedFiles=الملفات والمستندات المرتبطة
|
||||
NoLinkFound=لا يوجد روابط مسجلة
|
||||
LinkComplete=تم ربط الملف بنجاح
|
||||
ErrorFileNotLinked=لا يمكن ربط الملف
|
||||
LinkRemoved= الرابط%sتم إزالتة
|
||||
ErrorFailedToDeleteLink= فشل في إزالة الرابط '<b> %s </b>'
|
||||
ErrorFailedToUpdateLink= فشل تحديث الرابط '<b> %s </b>'
|
||||
URLToLink=عنوان URL للربط
|
||||
OverwriteIfExists=إستبدال محتوى الملف إذا كان موجوداً
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Свързване на нов файл / документ
|
||||
LinkedFiles=Свързани файлове и документи
|
||||
NoLinkFound=Няма регистрирани връзки
|
||||
LinkComplete=Файлът е успешно свързан
|
||||
ErrorFileNotLinked=Файлът не може да бъде свързан
|
||||
LinkRemoved=Връзката %s е премахната
|
||||
ErrorFailedToDeleteLink= Премахването на връзката '<b>%s</b>' не е успешно
|
||||
ErrorFailedToUpdateLink= Актуализацията на връзката '<b>%s</b>' не е успешна
|
||||
URLToLink=URL адрес
|
||||
OverwriteIfExists=Презаписване на файл, ако съществува
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Enllaça un nou arxiu/document
|
||||
LinkedFiles=Arxius i documents enllaçats
|
||||
NoLinkFound=No hi ha enllaços registrats
|
||||
LinkComplete=L'arxiu s'ha enllaçat correctament
|
||||
ErrorFileNotLinked=L'arxiu no s'ha enllaçat
|
||||
LinkRemoved=L'enllaç %s s'ha eliminat
|
||||
ErrorFailedToDeleteLink= Error en eliminar l'enllaç '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Error en actualitzar l'enllaç '<b>%s</b>'
|
||||
URLToLink=URL a enllaçar
|
||||
OverwriteIfExists=Sobreescriu el fitxer si existeix
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Připojit nový soubor/dokument
|
||||
LinkedFiles=Připojené soubory a dokumenty
|
||||
NoLinkFound=Žádné odkazy
|
||||
LinkComplete=Soubor byl úspěšně připojen
|
||||
ErrorFileNotLinked=Soubor nemohl být připojen
|
||||
LinkRemoved=Odkaz %s byl odstraněn
|
||||
ErrorFailedToDeleteLink= Nepodařilo se odstranit odkaz '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Nepodařilo se aktualizovat odkaz '<b>%s</b>'
|
||||
URLToLink=Připojit URL
|
||||
OverwriteIfExists=Pokud existuje, přepište soubor
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Cysylltwch ffeil/dogfen newydd
|
||||
LinkedFiles=Ffeiliau a dogfennau cysylltiedig
|
||||
NoLinkFound=Dim dolenni cofrestredig
|
||||
LinkComplete=Mae'r ffeil wedi'i chysylltu'n llwyddiannus
|
||||
ErrorFileNotLinked=Nid oedd modd cysylltu'r ffeil
|
||||
LinkRemoved=Mae'r cyswllt %s wedi'i ddileu
|
||||
ErrorFailedToDeleteLink= Wedi methu tynnu dolen ' <b> %s </b> '
|
||||
ErrorFailedToUpdateLink= Wedi methu diweddaru'r ddolen ' <b> %s </b> '
|
||||
URLToLink=URL i'r ddolen
|
||||
OverwriteIfExists=Trosysgrifo ffeil os yw'n bodoli
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link en ny fil / et dokument
|
||||
LinkedFiles=Sammenkædede filer og dokumenter
|
||||
NoLinkFound=Ingen registrerede links
|
||||
LinkComplete=Filen er blevet linket korrekt
|
||||
ErrorFileNotLinked=Filen kunne ikke forbindes
|
||||
LinkRemoved=Linket %s er blevet fjernet
|
||||
ErrorFailedToDeleteLink= Kunne ikke fjerne linket '<b> %s </b>'
|
||||
ErrorFailedToUpdateLink= Kunne ikke opdatere linket '<b> %s </b>'
|
||||
URLToLink=URL til link
|
||||
OverwriteIfExists=Overskriv fil, hvis den findes
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkANewFile=Verknüpfe eine neue Datei /Dokument
|
||||
LinkComplete=Die Datei wurde erfolgreich verlinkt
|
||||
ErrorFileNotLinked=Die Datei konnte nicht verlinkt werden
|
||||
URLToLink=URL zum Verlinken
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Neue Verknüpfung erstellen
|
||||
LinkedFiles=Verknüpfte Dateien
|
||||
NoLinkFound=Keine verknüpften Links
|
||||
LinkComplete=Die Datei wurde erfolgreich verlinkt.
|
||||
ErrorFileNotLinked=Die Datei konnte nicht verlinkt werden.
|
||||
LinkRemoved=Der Link %s wurde entfernt
|
||||
ErrorFailedToDeleteLink= Fehler beim entfernen des Links '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Fehler beim aktualisieren des Link '<b>%s</b>'
|
||||
URLToLink=zu verlinkende URL
|
||||
OverwriteIfExists=Datei überschreiben, falls vorhanden
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Συνδέστε ένα νέο αρχείο / έγγραφο
|
||||
LinkedFiles=Συνδεδεμένα αρχεία και έγγραφα
|
||||
NoLinkFound=Δεν υπάρχουν εγγεγραμμένοι σύνδεσμοι
|
||||
LinkComplete=Το αρχείο έχει συνδεθεί με επιτυχία
|
||||
ErrorFileNotLinked=Το αρχείο δεν μπορεί να συνδεθεί
|
||||
LinkRemoved=Ο σύνδεσμος %s έχει αφαιρεθεί
|
||||
ErrorFailedToDeleteLink= Απέτυχε η αφαίρεση του συνδέσμου '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Απέτυχε η ενημέρωση του σύνδεσμο '<b>%s</b>'
|
||||
URLToLink=Διεύθυνση URL για σύνδεση
|
||||
OverwriteIfExists=Επανεγγραφή αρχείου εάν υπάρχει
|
||||
|
|
@ -1400,7 +1400,7 @@ PreloadOPCode=Preloaded OPCode is used
|
|||
AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
|
||||
AddVatInList=Display Customer/Vendor VAT number into combo lists.
|
||||
AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
|
||||
AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
|
||||
AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
|
||||
AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
|
||||
FieldEdition=Edition of field %s
|
||||
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
|
||||
|
|
@ -1773,15 +1773,15 @@ FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
|
|||
##### FCKeditor #####
|
||||
AdvancedEditor=Advanced editor
|
||||
ActivateFCKeditor=Activate advanced editor for:
|
||||
FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
|
||||
FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
|
||||
FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
|
||||
FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
|
||||
FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
|
||||
FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
|
||||
FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
|
||||
FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
|
||||
FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
|
||||
FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
|
||||
FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
|
||||
FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
|
||||
FCKeditorForTicket=WYSIWIG creation/edition for tickets
|
||||
FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
|
||||
FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
|
||||
FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
|
||||
FCKeditorForTicket=WYSIWYG creation/edition for tickets
|
||||
##### Stock #####
|
||||
StockSetup=Stock module setup
|
||||
IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
|
||||
|
|
@ -1991,7 +1991,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
|
|||
Enter0or1=Enter 0 or 1
|
||||
UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
|
||||
ColorFormat=The RGB color is in HEX format, eg: FF0000
|
||||
PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
|
||||
PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
|
||||
PositionIntoComboList=Position of line into combo lists
|
||||
SellTaxRate=Sales tax rate
|
||||
RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ AssetDepreciationReversal=Reversal
|
|||
#
|
||||
# Errors
|
||||
#
|
||||
AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound has not been provided
|
||||
AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model found has not been provided
|
||||
AssetErrorFetchAccountancyCodesForMode=Error when retrieving the accounting accounts for the '%s' depreciation mode
|
||||
AssetErrorDeleteAccountancyCodesForMode=Error when deleting accounting accounts from the '%s' depreciation mode
|
||||
AssetErrorInsertAccountancyCodesForMode=Error when inserting the accounting accounts of the depreciation mode '%s'
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
|
|||
ExtraFieldsEcmDirectories=Extrafields Ecm Directories
|
||||
ECMSetup=ECM Setup
|
||||
GenerateImgWebp=Duplicate all images with another version with .webp format
|
||||
ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
|
||||
ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included, webp images will not be generated if size is greater than original)...
|
||||
ConfirmImgWebpCreation=Confirm all images duplication
|
||||
GenerateChosenImgWebp=Duplicate chosen image with another version with .webp format
|
||||
ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
NoErrorCommitIsDone=No error, we commit
|
||||
# Errors
|
||||
ErrorButCommitIsDone=Errors found but we validate despite this
|
||||
ErrorBadEMail=Email %s is incorrect
|
||||
ErrorBadEMail=Email address %s is incorrect
|
||||
ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
|
||||
ErrorBadUrl=Url %s is incorrect
|
||||
ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
|
||||
|
|
@ -240,7 +240,7 @@ ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
|
|||
ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
|
||||
ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
|
||||
ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
|
||||
ErrorSearchCriteriaTooSmall=Search criteria too small.
|
||||
ErrorSearchCriteriaTooSmall=Search criteria too short.
|
||||
ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
|
||||
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
|
||||
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
|
||||
|
|
|
|||
|
|
@ -87,9 +87,9 @@ VacantCheckboxHelper=Checking this option will show unfilled positions (job vaca
|
|||
SaveAddSkill = Skill(s) added
|
||||
SaveLevelSkill = Skill(s) level saved
|
||||
DeleteSkill = Skill removed
|
||||
SkillsExtraFields=Attributs supplémentaires (Compétences)
|
||||
JobsExtraFields=Attributs supplémentaires (Job profile)
|
||||
EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
|
||||
SkillsExtraFields=Complementary attributes (Skills)
|
||||
JobsExtraFields=Complementary attributes (Job profile)
|
||||
EvaluationsExtraFields=Complementary attributes (Evaluations)
|
||||
NeedBusinessTravels=Need business travels
|
||||
NoDescription=No description
|
||||
TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has not skill defined on it. Please fix this before, then delete and restart the evaluation.
|
||||
TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -60,7 +60,7 @@ ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
|
|||
ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
|
||||
ErrorInternalErrorDetected=Error detected
|
||||
ErrorWrongHostParameter=Wrong host parameter
|
||||
ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
|
||||
ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Company/Foundation and post the form again.
|
||||
ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
|
||||
ErrorWrongValue=Wrong value
|
||||
ErrorWrongValueForParameterX=Wrong value for parameter %s
|
||||
|
|
@ -1239,3 +1239,13 @@ DateOfPrinting=Date of printing
|
|||
ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
|
||||
UserNotYetValid=Not yet valid
|
||||
UserExpired=Expired
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite if file exists
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ MakeOrder=Make order
|
|||
SupplierOrder=Purchase order
|
||||
SuppliersOrders=Purchase orders
|
||||
SaleOrderLines=Sales order lines
|
||||
PurchaseOrderLines=Puchase order lines
|
||||
PurchaseOrderLines=Purchase order lines
|
||||
SuppliersOrdersRunning=Current purchase orders
|
||||
CustomerOrder=Sales Order
|
||||
CustomersOrders=Sales Orders
|
||||
|
|
@ -205,4 +205,4 @@ StatusSupplierOrderRefused=Refused
|
|||
StatusSupplierOrderReceivedPartially=Partially received
|
||||
StatusSupplierOrderReceivedAll=All products received
|
||||
NeedAtLeastOneInvoice = There has to be at least one Invoice
|
||||
LineAlreadyDispatched = The order line is already received.
|
||||
LineAlreadyDispatched = The order line is already received.
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ YearInvoice=Invoice year
|
|||
DOL_VALUE_MONTH_LETTERS=Invoice month in letters
|
||||
DOL_VALUE_MONTH=Invoice month
|
||||
DOL_VALUE_DAY=Invoice day
|
||||
DOL_VALUE_DAY_LETTERS=Inovice day in letters
|
||||
DOL_VALUE_DAY_LETTERS=Invoice day in letters
|
||||
DOL_LINE_FEED_REVERSE=Line feed reverse
|
||||
InvoiceID=Invoice ID
|
||||
InvoiceRef=Invoice ref
|
||||
|
|
@ -81,4 +81,4 @@ VendorLastname=Vendor last name
|
|||
VendorFirstname=Vendor first name
|
||||
VendorEmail=Vendor email
|
||||
DOL_VALUE_CUSTOMER_POINTS=Customer points
|
||||
DOL_VALUE_OBJECT_POINTS=Object points
|
||||
DOL_VALUE_OBJECT_POINTS=Object points
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ DetailWarehouseFormat= W:%s (Qty: %d)
|
|||
|
||||
ShipmentDistribution=Shipment distribution
|
||||
|
||||
ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
|
||||
ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
|
||||
ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
|
||||
ErrorNoCombinationBatchcode=No dispatch for line %s as no combination of warehouse, product, batch code was found.
|
||||
|
||||
ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket
|
|||
TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
|
||||
TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
|
||||
TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
|
||||
TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe your question. Provide the most information possible to allow us to correctly identify your request.
|
||||
TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe your request. Provide the most information possible to allow us to correctly identify your request.
|
||||
TicketPublicMsgViewLogIn=Please enter ticket tracking ID
|
||||
TicketTrackId=Public Tracking ID
|
||||
OneOfTicketTrackId=One of your tracking ID
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkANewFile=Enlazar a un nuevo archivo/documento
|
||||
LinkedFiles=Archivos y documentos enlazados
|
||||
NoLinkFound=No hay enlaces registrados
|
||||
LinkComplete=El archivo se ha enlazado correctamente
|
||||
ErrorFileNotLinked=El archivo no pudo ser enlazado
|
||||
LinkRemoved=El enlace %s ha sido eliminado
|
||||
ErrorFailedToDeleteLink=Error al eliminar el enlace '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink=Error al actualizar enlace '<b>%s</b>'
|
||||
URLToLink=URL del enlace
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkANewFile=Enlace un nuevo archivo / documento
|
||||
LinkedFiles=Links archivos y documentos
|
||||
NoLinkFound=No hay enlaces registrados
|
||||
LinkComplete=El archivo ha sido vinculado exitosamente
|
||||
ErrorFileNotLinked=El archivo no pudo ser vinculado
|
||||
LinkRemoved=El enlace %s ha sido eliminado
|
||||
ErrorFailedToDeleteLink=Error al eliminar el enlace '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink=Error al actualizar el enlace '<b>%s</b>'
|
||||
URLToLink=URL para enlazar
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkANewFile=Vincular un nuevo archivo / documento
|
||||
NoLinkFound=No hay enlaces registrados
|
||||
LinkComplete=El archivo se ha vinculado correctamente
|
||||
ErrorFileNotLinked=El archivo no se pudo vincular
|
||||
LinkRemoved=El enlace %s ha sido eliminado
|
||||
ErrorFailedToDeleteLink=Error al eliminar el enlace '<b> %s </b>'
|
||||
ErrorFailedToUpdateLink=Error al actualizar el enlace '<b> %s </b>'
|
||||
URLToLink=URL para vincular
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
NoLinkFound=No hay enlaces registrados
|
||||
LinkComplete=El archivo se ha vinculado con éxito.
|
||||
ErrorFileNotLinked=No se pudo vincular el archivo
|
||||
LinkRemoved=El enlace %s ha sido eliminado
|
||||
ErrorFailedToDeleteLink=Error al eliminar el enlace ' <b> %s </b> '
|
||||
ErrorFailedToUpdateLink=Error al actualizar el enlace '<b> %s </b>'
|
||||
URLToLink=URL para vincular
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkComplete=El archivo se ha vinculado con éxito.
|
||||
ErrorFileNotLinked=No se pudo vincular el archivo
|
||||
LinkRemoved=El enlace %s ha sido eliminado
|
||||
ErrorFailedToDeleteLink=Error al eliminar el enlace ' <b> %s </b> '
|
||||
ErrorFailedToUpdateLink=Error al actualizar el enlace ' <b> %s </b> '
|
||||
URLToLink=URL para vincular
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkedFiles=Archivos enlazados y documentos
|
||||
NoLinkFound=No hay enlaces registrados
|
||||
LinkComplete=El archivo se ha vinculado correctamente
|
||||
ErrorFileNotLinked=No se pudo vincular el archivo.
|
||||
LinkRemoved=Se ha eliminado el enlace %s
|
||||
ErrorFailedToDeleteLink=No se pudo eliminar el vínculo '<b>%s</b>'
|
||||
URLToLink=URL para vincular
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Vincular un nuevo archivo/documento
|
||||
LinkedFiles=Archivos y documentos vinculados
|
||||
NoLinkFound=Sin enlaces registrados
|
||||
LinkComplete=El archivo ha sido vinculado correctamente
|
||||
ErrorFileNotLinked=El archivo no ha podido ser vinculado
|
||||
LinkRemoved=El vínculo %s ha sido eliminado
|
||||
ErrorFailedToDeleteLink= Error al eliminar el vínculo '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Error al actualizar el vínculo '<b>%s</b>'
|
||||
URLToLink=URL a enlazar
|
||||
OverwriteIfExists=Sobrescribir archivo si existe
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkANewFile=Vincular un nuevo archivo / documento
|
||||
LinkedFiles=Archivos enlazados y documentos
|
||||
NoLinkFound=No hay enlaces registrados
|
||||
LinkComplete=El archivo se ha vinculado correctamente
|
||||
ErrorFileNotLinked=No se pudo vincular el archivo.
|
||||
LinkRemoved=Se ha eliminado el enlace %s
|
||||
ErrorFailedToDeleteLink=No se pudo eliminar el vínculo '<b> %s </b>'
|
||||
ErrorFailedToUpdateLink=Error al actualizar el vínculo '<b> %s </b>'
|
||||
URLToLink=URL para vincular
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Fitxategi/dokumentu berria estekatu
|
||||
LinkedFiles=Estekatutako fitxategi eta dokumentuak
|
||||
NoLinkFound=Ez dago gordetako estekarik
|
||||
LinkComplete=Fitxategia ondo estekatu da
|
||||
ErrorFileNotLinked=Ezin izan da fitxategia estekatu
|
||||
LinkRemoved=%s esteka ezabatua izan da
|
||||
ErrorFailedToDeleteLink= Ezin izan da '<b>%s</b>' esteka ezabatu
|
||||
ErrorFailedToUpdateLink= Ezin izan da '<b>%s</b>' esteka berritu
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=پیوند یک فایل/سند
|
||||
LinkedFiles=اسناد و فایلهای مرتبط
|
||||
NoLinkFound=پیوند ثبتشدهای وجود ندارد
|
||||
LinkComplete=فایل با موفقیت پیوند شد
|
||||
ErrorFileNotLinked=امکان پیوند فایل وجود ندارد
|
||||
LinkRemoved=پیوند %s برداشته شد
|
||||
ErrorFailedToDeleteLink= امکان حذف پیوند '<b>%s</b>' نبود
|
||||
ErrorFailedToUpdateLink= امکان روزآمدسازی پیوند '<b>%s</b>' نبود
|
||||
URLToLink=نشانی برای پیوند کردن
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Luo uusi linkki tiedostoon/dokumenttiin
|
||||
LinkedFiles=Linkitetyt tiedostot ja dokumentit
|
||||
NoLinkFound=Rekisteröityjä linkkejä ei ole
|
||||
LinkComplete=Tiedosto on linkitetty onnistuneesti
|
||||
ErrorFileNotLinked=Tiedostoa ei voitu linkittää
|
||||
LinkRemoved=%s linkki on poistettu
|
||||
ErrorFailedToDeleteLink= Linkin '<b>%s</b>' poisto ei onnistunut
|
||||
ErrorFailedToUpdateLink= Linkin '<b>%s</b>' päivitys ei onnistunut
|
||||
URLToLink=URL linkiksi
|
||||
OverwriteIfExists=Korvaa tiedosto jos olemassa
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - link
|
||||
LinkANewFile=Relier un nouveau fichier / document
|
||||
NoLinkFound=Pas de liens enregistrés
|
||||
LinkComplete=Le fichier a été lié avec succès
|
||||
ErrorFailedToDeleteLink=Impossible d'enlever le lien '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink=Impossible de mettre à jour le lien '<b>%s</b>'
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Lier un nouveau fichier/document
|
||||
LinkedFiles=Fichiers et documents liés
|
||||
NoLinkFound=Aucun lien associé
|
||||
LinkComplete=Le fichier a été correctement lié
|
||||
ErrorFileNotLinked=Le fichier n'a pas pu être lié
|
||||
LinkRemoved=Le lien %s a été supprimé
|
||||
ErrorFailedToDeleteLink= Impossible de supprimer le lien '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Impossible de modifier le lien '<b>%s</b>'
|
||||
URLToLink=URL à lier
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Ligar un novo ficheiro/documento
|
||||
LinkedFiles=Ficheiros e documentos ligados
|
||||
NoLinkFound=Sen ligazóns registrados
|
||||
LinkComplete=O ficheiro foi ligado correctamente
|
||||
ErrorFileNotLinked=O ficheiro non puido ser ligado
|
||||
LinkRemoved=A ligazón %s foi eliminada
|
||||
ErrorFailedToDeleteLink= Erro ao eliminar a ligazón '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Erro ao actualizar a ligazón '<b>%s</b>'
|
||||
URLToLink=URL a ligar
|
||||
OverwriteIfExists=Sobrescribir ficheiro se existe
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Poveži novu datoteku/dokument
|
||||
LinkedFiles=Povezane datoteke i dokumenti
|
||||
NoLinkFound=Nema registriranih veza
|
||||
LinkComplete=Datoteka je uspješno povezana
|
||||
ErrorFileNotLinked=Datoteku je nemoguće povezati
|
||||
LinkRemoved=Veza %s je obrisana
|
||||
ErrorFailedToDeleteLink= Neuspješno brisanje veze '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Neuspješna promjena veze '<b>%s</b>'
|
||||
URLToLink=URL prema vezi
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Új fájl/dokumentum hivatkozása
|
||||
LinkedFiles=Hivatkozott fájlok és dokumentumok
|
||||
NoLinkFound=Nincs mentett hivatkozás
|
||||
LinkComplete=A fájlra történt hivatkozás sikerült
|
||||
ErrorFileNotLinked=A fájlra nem lehet hivatkozni
|
||||
LinkRemoved=A %s hivatkozás törölve
|
||||
ErrorFailedToDeleteLink= A '<b>%s</b>' hivakozás törlése sikertelen
|
||||
ErrorFailedToUpdateLink= A '<b>%s</b>' hivakozás frissítése sikertelen
|
||||
URLToLink=A hivatkozás címe
|
||||
OverwriteIfExists=Fájl felülírása, ha létezik
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Tautan untuk berkas/dokumen baru
|
||||
LinkedFiles=Tautan berkas dan dokumen
|
||||
NoLinkFound=Link tidak terdaftar
|
||||
LinkComplete=Berkas telah berhasil ditautkan
|
||||
ErrorFileNotLinked=Berkas tidak dapat ditautkan
|
||||
LinkRemoved=Tautan %s telah dihapus
|
||||
ErrorFailedToDeleteLink= gagal untuk menghapus tautan '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Gagal untuk memperbaharui tautan '<b>%s</b>'
|
||||
URLToLink=URL untuk ditautkan
|
||||
OverwriteIfExists=Timpa file jika ada
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Collega un nuovo file/documento
|
||||
LinkedFiles=File e documenti collegati
|
||||
NoLinkFound=Nessun collegamento registrato
|
||||
LinkComplete=Il file è stato correttamente collegato
|
||||
ErrorFileNotLinked=Il file non può essere collegato
|
||||
LinkRemoved=Il collegamento %s è stato rimosso
|
||||
ErrorFailedToDeleteLink= Impossibile rimuovere il collegamento '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Impossibile caricare il collegamento '<b>%s</b>'
|
||||
URLToLink=Indirizzo del link
|
||||
OverwriteIfExists=Sovrascrivi file se esiste
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=新規ファイル/ドキュメントをリンクする
|
||||
LinkedFiles=ファイルとドキュメントをリンクした
|
||||
NoLinkFound=リンクは登録されていない
|
||||
LinkComplete=ファイルを正常にリンクした
|
||||
ErrorFileNotLinked=ファイルをリンクできなかった
|
||||
LinkRemoved=リンク %s が削除された
|
||||
ErrorFailedToDeleteLink= リンク '<b>%s</b>' を削除できなかった
|
||||
ErrorFailedToUpdateLink= リンク '<b>%s</b>' を更新できなかった
|
||||
URLToLink=リンクの URL
|
||||
OverwriteIfExists=存在する場合はファイルを上書きする
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Жаңа файлды/құжатты байланыстырыңыз
|
||||
LinkedFiles=Байланысты файлдар мен құжаттар
|
||||
NoLinkFound=Тіркелген сілтемелер жоқ
|
||||
LinkComplete=Файл сәтті байланыстырылды
|
||||
ErrorFileNotLinked=Файлды байланыстыру мүмкін болмады
|
||||
LinkRemoved=%s сілтемесі жойылды
|
||||
ErrorFailedToDeleteLink= '<b> %s </b>' сілтемесі жойылмады
|
||||
ErrorFailedToUpdateLink= '<b> %s </b>' сілтемесі жаңартылмады
|
||||
URLToLink=Сілтеме үшін URL
|
||||
OverwriteIfExists=Егер бар болса, файлды қайта жазыңыз
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Link a new file/document
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=ເຊື່ອມໂຍງໄຟລ//ເອກະສານໃ່
|
||||
LinkedFiles=ໄຟລ Linked ແລະເອກະສານທີ່ເຊື່ອມໂຍງ
|
||||
NoLinkFound=ບໍ່ມີລິ້ງເຊື່ອມຕໍ່ທີ່ລົງທະບຽນ
|
||||
LinkComplete=ໄຟລ has ໄດ້ຖືກເຊື່ອມຕໍ່ ສຳ ເລັດແລ້ວ
|
||||
ErrorFileNotLinked=ບໍ່ສາມາດເຊື່ອມໂຍງໄຟລໄດ້
|
||||
LinkRemoved=ລິ້ງ %s ໄດ້ຖືກລຶບອອກແລ້ວ
|
||||
ErrorFailedToDeleteLink= ລຶບລິ້ງ '<b> %s </b> ບໍ່ ສຳ ເລັດ'
|
||||
ErrorFailedToUpdateLink= ອັບເດດລິ້ງ '<b> %s </b> ບໍ່ ສຳ ເລັດ'
|
||||
URLToLink=URL ເພື່ອເຊື່ອມຕໍ່
|
||||
OverwriteIfExists=ຂຽນທັບໄຟລ if ຖ້າມີ
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Dolibarr language file - Source file is en_US - languages
|
||||
LinkANewFile=Susieti naują filą / dokumentą
|
||||
LinkedFiles=Linked files and documents
|
||||
NoLinkFound=No registered links
|
||||
LinkComplete=The file has been linked successfully
|
||||
ErrorFileNotLinked=The file could not be linked
|
||||
LinkRemoved=The link %s has been removed
|
||||
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
|
||||
ErrorFailedToUpdateLink= Nesėkmingas sąsajos '<b>%s</b>' atnaujinimas
|
||||
URLToLink=URL to link
|
||||
OverwriteIfExists=Overwrite file if exists
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue