Merge branch 'develop' into patch-3
This commit is contained in:
Laurent Destailleur
GitHub
commit
669a863353
@ -118,9 +118,10 @@ if (empty($reshook)) {
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
$help_url = '';
|
||||
$title = $langs->trans('ChartOfIndividualAccountsOfSubsidiaryLedger');
|
||||
|
||||
llxHeader('', $title);
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
// Customer
|
||||
$sql = "SELECT sa.rowid, sa.nom as label, sa.code_compta as subaccount, '1' as type, sa.entity";
|
||||
@ -314,7 +315,7 @@ if ($resql) {
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 0, 0, 1);
|
||||
|
||||
print '<div class="warning">'.$langs->trans("WarningCreateSubAccounts").'</div>';
|
||||
print '<div class="info">'.$langs->trans("WarningCreateSubAccounts").'</div>';
|
||||
|
||||
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
||||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
||||
|
||||
@ -266,16 +266,16 @@ if ($result) {
|
||||
print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
|
||||
print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->name.'">';
|
||||
print '<input type="hidden" name="const['.$i.'][type]" value="'.$obj->type.'">';
|
||||
print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.htmlspecialchars($obj->value).'">';
|
||||
print '<input type="text" id="value_'.$i.'" class="flat inputforupdate minwidth150" name="const['.$i.'][value]" value="'.htmlspecialchars($obj->value).'">';
|
||||
print '</td>';
|
||||
|
||||
// Note
|
||||
print '<td>';
|
||||
print '<input type="text" id="note_'.$i.'" class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note, 1).'">';
|
||||
print '<input type="text" id="note_'.$i.'" class="flat inputforupdate minwidth200" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note, 1).'">';
|
||||
print '</td>';
|
||||
|
||||
// Date last change
|
||||
print '<td>';
|
||||
print '<td class="nowraponall">';
|
||||
print dol_print_date($db->jdate($obj->tms), 'dayhour');
|
||||
print '</td>';
|
||||
|
||||
|
||||
@ -309,8 +309,9 @@ function getResultColumn($name, array $activated, array $loaded, array $function
|
||||
}
|
||||
if (strtolower($name) == 'xdebug') {
|
||||
$html .= ' '.$langs->trans("ModuleActivated", "xdebug");
|
||||
$html .= ' - '.$langs->trans("ModuleActivatedMayExposeInformation");
|
||||
} else {
|
||||
$html .= ' '.$langs->trans("PHPSupport", $name);
|
||||
$html .= ' <span class="opacitymedium">'.$langs->trans("PHPSupport", $name).'</span>';
|
||||
}
|
||||
} else {
|
||||
if (strtolower($name) == 'xdebug') {
|
||||
|
||||
@ -76,7 +76,7 @@ if ($test) {
|
||||
print '<br>';
|
||||
|
||||
print '<br>';
|
||||
print load_fiche_titre($langs->trans("ConfigurationFile"), '', 'folder');
|
||||
print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffile.')', '', 'folder');
|
||||
|
||||
print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
|
||||
if (empty($dolibarr_main_prod)) {
|
||||
@ -98,7 +98,7 @@ print '<br>';
|
||||
|
||||
print '<br>';
|
||||
print '<br>';
|
||||
print load_fiche_titre($langs->trans("Permissions"), '', 'folder');
|
||||
print load_fiche_titre($langs->trans("PermissionsOnFiles"), '', 'folder');
|
||||
|
||||
print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
|
||||
// TODO Check permission are read only except for custom dir
|
||||
@ -151,9 +151,18 @@ print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"),
|
||||
|
||||
//print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
|
||||
print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? $langs->trans("Undefined") : '')." ";
|
||||
print '<span class="opacitymedium"> If unset: \'md5\'</span> ';
|
||||
print '<span class="opacitymedium"> - Recommanded value: \'password_hash\'</span><br>';
|
||||
print '<strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? $langs->trans("Undefined") : '').'<br>';
|
||||
print '<span class="opacitymedium"> If unset: \'md5\'</span><br>';
|
||||
if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
|
||||
print '<strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? $langs->trans("Undefined") : $conf->global->MAIN_SECURITY_SALT).'<br>';
|
||||
}
|
||||
if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
|
||||
print '<span class="opacitymedium">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
|
||||
print 'If you really want to switch, you must:<br>';
|
||||
print '- Go on home - setup - other and add constant MAIN_SECURITY_HASH_ALGO to value \'password_hash\'<br>';
|
||||
print '- In same session, WITHOUT LOGGING OUT, go into your admin user record and set a new password<br>';
|
||||
print '- You can now logout and login with this new password. You must now reset password of all other users.<br>';
|
||||
print '</span><br>';
|
||||
}
|
||||
print '<br>';
|
||||
// TODO
|
||||
|
||||
|
||||
@ -37,15 +37,18 @@ llxHeader();
|
||||
|
||||
print load_fiche_titre("XDebug", '', 'title_setup');
|
||||
|
||||
print "<br>\n";
|
||||
|
||||
|
||||
if (!function_exists('xdebug_is_enabled')) {
|
||||
print "<br>\n";
|
||||
print 'XDebug seems to be not installed. Function xdebug_is_enabled not found.';
|
||||
llxFooter();
|
||||
exit;
|
||||
}
|
||||
|
||||
print '<span class="opacitymedium">';
|
||||
print $langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
|
||||
print '</span>';
|
||||
|
||||
print '<br><br>';
|
||||
|
||||
if (function_exists('socket_create')) {
|
||||
$address = ini_get('xdebug.remote_host') ?ini_get('xdebug.remote_host') : '127.0.0.1';
|
||||
|
||||
@ -79,19 +79,22 @@ class FactureRec extends CommonInvoice
|
||||
*/
|
||||
public $title;
|
||||
|
||||
public $socid;
|
||||
public $number;
|
||||
public $date;
|
||||
public $remise;
|
||||
public $remise_absolue;
|
||||
public $remise_percent;
|
||||
public $tva;
|
||||
public $total;
|
||||
public $db_table;
|
||||
public $propalid;
|
||||
|
||||
public $date_last_gen;
|
||||
public $date_when;
|
||||
public $nb_gen_done;
|
||||
public $nb_gen_max;
|
||||
|
||||
public $user_author;
|
||||
|
||||
/**
|
||||
* @var int Frequency
|
||||
*/
|
||||
@ -107,9 +110,20 @@ class FactureRec extends CommonInvoice
|
||||
|
||||
public $usenewprice = 0;
|
||||
|
||||
public $date_lim_reglement;
|
||||
public $cond_reglement_code; // Code in llx_c_paiement
|
||||
public $mode_reglement_code; // Code in llx_c_paiement
|
||||
|
||||
public $suspended; // status
|
||||
|
||||
public $auto_validate;
|
||||
public $auto_validate; // 0 to create in draft, 1 to create and validate the new invoice
|
||||
public $generate_pdf; // 1 to generate PDF on invoice generation (default)
|
||||
|
||||
/**
|
||||
* @var int 1 if status is draft
|
||||
* @deprecated
|
||||
*/
|
||||
public $brouillon;
|
||||
|
||||
|
||||
/**
|
||||
@ -528,7 +542,6 @@ class FactureRec extends CommonInvoice
|
||||
$this->title = $obj->title;
|
||||
$this->ref = $obj->title;
|
||||
$this->suspended = $obj->suspended;
|
||||
//$this->date = $obj->df;
|
||||
$this->remise_percent = $obj->remise_percent;
|
||||
$this->remise_absolue = $obj->remise_absolue;
|
||||
$this->remise = $obj->remise;
|
||||
@ -537,8 +550,6 @@ class FactureRec extends CommonInvoice
|
||||
$this->total_localtax1 = $obj->localtax1;
|
||||
$this->total_localtax2 = $obj->localtax2;
|
||||
$this->total_ttc = $obj->total_ttc;
|
||||
$this->close_code = $obj->close_code;
|
||||
$this->close_note = $obj->close_note;
|
||||
$this->socid = $obj->fk_soc;
|
||||
$this->date_lim_reglement = $this->db->jdate($obj->dlr);
|
||||
$this->mode_reglement_id = $obj->fk_mode_reglement;
|
||||
@ -550,14 +561,12 @@ class FactureRec extends CommonInvoice
|
||||
$this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
|
||||
$this->fk_project = $obj->fk_project;
|
||||
$this->fk_account = $obj->fk_account;
|
||||
$this->fk_facture_source = $obj->fk_facture_source;
|
||||
$this->note_private = $obj->note_private;
|
||||
$this->note_public = $obj->note_public;
|
||||
$this->user_author = $obj->fk_user_author;
|
||||
$this->modelpdf = $obj->model_pdf; // deprecated
|
||||
$this->model_pdf = $obj->model_pdf;
|
||||
$this->rang = $obj->rang;
|
||||
$this->special_code = $obj->special_code;
|
||||
//$this->special_code = $obj->special_code;
|
||||
$this->frequency = $obj->frequency;
|
||||
$this->unit_frequency = $obj->unit_frequency;
|
||||
$this->date_when = $this->db->jdate($obj->date_when);
|
||||
@ -640,10 +649,7 @@ class FactureRec extends CommonInvoice
|
||||
$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx, ';
|
||||
$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';
|
||||
$sql .= ' l.info_bits, l.date_start_fill, l.date_end_fill, l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price, l.buy_price_ht as pa_ht,';
|
||||
//$sql.= ' l.situation_percent, l.fk_prev_id,';
|
||||
//$sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
|
||||
$sql .= ' l.rang, l.special_code,';
|
||||
//$sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_product_fournisseur_price, l.buy_price_ht as pa_ht,';
|
||||
$sql .= ' l.fk_unit, l.fk_contract_line,';
|
||||
$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
|
||||
$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
|
||||
@ -665,12 +671,12 @@ class FactureRec extends CommonInvoice
|
||||
$line->rowid = $objp->rowid;
|
||||
$line->desc = $objp->description; // Description line
|
||||
$line->description = $objp->description; // Description line
|
||||
$line->product_type = $objp->product_type; // Type of line
|
||||
$line->ref = $objp->product_ref; // Ref product
|
||||
$line->product_ref = $objp->product_ref; // Ref product
|
||||
$line->libelle = $objp->product_label; // deprecated
|
||||
$line->product_label = $objp->product_label; // Label product
|
||||
$line->product_desc = $objp->product_desc; // Description product
|
||||
$line->product_type = $objp->product_type; // Type of line
|
||||
$line->fk_product_type = $objp->fk_product_type; // Type of product
|
||||
$line->qty = $objp->qty;
|
||||
$line->subprice = $objp->subprice;
|
||||
@ -684,7 +690,7 @@ class FactureRec extends CommonInvoice
|
||||
$line->localtax1_type = $objp->localtax1_type;
|
||||
$line->localtax2_type = $objp->localtax2_type;
|
||||
$line->remise_percent = $objp->remise_percent;
|
||||
$line->fk_remise_except = $objp->fk_remise_except;
|
||||
//$line->fk_remise_except = $objp->fk_remise_except;
|
||||
$line->fk_product = $objp->fk_product;
|
||||
$line->date_start_fill = $objp->date_start_fill;
|
||||
$line->date_end_fill = $objp->date_end_fill;
|
||||
@ -837,6 +843,7 @@ class FactureRec extends CommonInvoice
|
||||
$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
|
||||
|
||||
// Clean vat code
|
||||
$reg = array();
|
||||
$vat_src_code = '';
|
||||
if (preg_match('/\((.*)\)/', $txtva, $reg)) {
|
||||
$vat_src_code = $reg[1];
|
||||
@ -1277,6 +1284,8 @@ class FactureRec extends CommonInvoice
|
||||
|
||||
$facture->type = self::TYPE_STANDARD;
|
||||
$facture->brouillon = 1;
|
||||
$facture->statut = self::STATUS_DRAFT;
|
||||
$facture->status = self::STATUS_DRAFT;
|
||||
$facture->date = (empty($facturerec->date_when) ? $now : $facturerec->date_when); // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
|
||||
$facture->socid = $facturerec->socid;
|
||||
|
||||
@ -1602,6 +1611,7 @@ class FactureRec extends CommonInvoice
|
||||
// Initialize parameters
|
||||
$this->id = 0;
|
||||
$this->ref = 'SPECIMEN';
|
||||
$this->title = 'SPECIMEN';
|
||||
$this->specimen = 1;
|
||||
$this->socid = 1;
|
||||
$this->date = $nownotime;
|
||||
@ -1912,6 +1922,18 @@ class FactureLigneRec extends CommonInvoiceLine
|
||||
public $table_element = 'facturedet_rec';
|
||||
|
||||
|
||||
public $fk_product_fournisseur_price;
|
||||
public $fk_fournprice; // For backward compatibility
|
||||
|
||||
public $rang;
|
||||
|
||||
public $desc;
|
||||
public $description;
|
||||
|
||||
public $fk_product_type; // Use instead product_type
|
||||
|
||||
public $fk_contract_line;
|
||||
|
||||
|
||||
/**
|
||||
* Delete line in database
|
||||
@ -2035,7 +2057,9 @@ class FactureLigneRec extends CommonInvoiceLine
|
||||
$this->multicurrency_total_ht = $objp->multicurrency_total_ht;
|
||||
$this->multicurrency_total_tva = $objp->multicurrency_total_tva;
|
||||
$this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
|
||||
|
||||
$this->buy_price_ht = $objp->buy_price_ht;
|
||||
|
||||
$this->fk_product_fournisseur_price = $objp->fk_product_fournisseur_price;
|
||||
$this->fk_user_author = $objp->fk_user_author;
|
||||
$this->fk_user_modif = $objp->fk_user_modif;
|
||||
|
||||
@ -99,6 +99,12 @@ class Facture extends CommonInvoice
|
||||
*/
|
||||
protected $table_ref_field = 'ref';
|
||||
|
||||
/**
|
||||
* @var int 1 if status is draft
|
||||
* @deprecated
|
||||
*/
|
||||
public $brouillon;
|
||||
|
||||
/**
|
||||
* @var int thirdparty ID
|
||||
*/
|
||||
@ -171,6 +177,7 @@ class Facture extends CommonInvoice
|
||||
//! id of source invoice if replacement invoice or credit note
|
||||
public $fk_facture_source;
|
||||
public $linked_objects = array();
|
||||
|
||||
public $date_lim_reglement;
|
||||
public $cond_reglement_code; // Code in llx_c_paiement
|
||||
public $mode_reglement_code; // Code in llx_c_paiement
|
||||
@ -446,6 +453,8 @@ class Facture extends CommonInvoice
|
||||
$this->mode_reglement_id = 0;
|
||||
}
|
||||
$this->brouillon = 1;
|
||||
$this->status = self::STATUS_DRAFT;
|
||||
$this->statut = self::STATUS_DRAFT;
|
||||
|
||||
// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
|
||||
if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
|
||||
@ -537,6 +546,8 @@ class Facture extends CommonInvoice
|
||||
$this->mode_reglement_id = 0;
|
||||
}
|
||||
$this->brouillon = 1;
|
||||
$this->status = self::STATUS_DRAFT;
|
||||
$this->statut = self::STATUS_DRAFT;
|
||||
|
||||
$this->linked_objects = $_facrec->linkedObjectsIds;
|
||||
// We do not add link to template invoice or next invoice will be linked to all generated invoices
|
||||
@ -1683,7 +1694,7 @@ class Facture extends CommonInvoice
|
||||
$this->fetchPreviousNextSituationInvoice();
|
||||
}
|
||||
|
||||
if ($this->statut == self::STATUS_DRAFT) {
|
||||
if ($this->status == self::STATUS_DRAFT) {
|
||||
$this->brouillon = 1;
|
||||
}
|
||||
|
||||
@ -2584,8 +2595,8 @@ class Facture extends CommonInvoice
|
||||
$this->fetch_lines();
|
||||
|
||||
// Check parameters
|
||||
if (!$this->brouillon) {
|
||||
dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
|
||||
if ($this->statut != self::STATUS_DRAFT) {
|
||||
dol_syslog(get_class($this)."::validate status is not draft. operation canceled.", LOG_WARNING);
|
||||
return 0;
|
||||
}
|
||||
if (count($this->lines) <= 0) {
|
||||
@ -2849,6 +2860,7 @@ class Facture extends CommonInvoice
|
||||
$this->ref = $num;
|
||||
$this->ref = $num;
|
||||
$this->statut = self::STATUS_VALIDATED;
|
||||
$this->status = self::STATUS_VALIDATED;
|
||||
$this->brouillon = 0;
|
||||
$this->date_validation = $now;
|
||||
$i = 0;
|
||||
@ -2887,7 +2899,7 @@ class Facture extends CommonInvoice
|
||||
* Update price of next invoice
|
||||
*
|
||||
* @param Translate $langs Translate object
|
||||
* @return bool false if KO, true if OK
|
||||
* @return bool false if KO, true if OK
|
||||
*/
|
||||
public function updatePriceNextInvoice(&$langs)
|
||||
{
|
||||
@ -2900,6 +2912,7 @@ class Facture extends CommonInvoice
|
||||
}
|
||||
|
||||
$next_invoice->brouillon = 1;
|
||||
|
||||
foreach ($next_invoice->lines as $line) {
|
||||
$result = $next_invoice->updateline(
|
||||
$line->id,
|
||||
@ -2995,12 +3008,14 @@ class Facture extends CommonInvoice
|
||||
$old_statut = $this->statut;
|
||||
$this->brouillon = 1;
|
||||
$this->statut = self::STATUS_DRAFT;
|
||||
$this->status = self::STATUS_DRAFT;
|
||||
|
||||
// Call trigger
|
||||
$result = $this->call_trigger('BILL_UNVALIDATE', $user);
|
||||
if ($result < 0) {
|
||||
$error++;
|
||||
$this->statut = $old_statut;
|
||||
$this->status = $old_statut;
|
||||
$this->brouillon = 0;
|
||||
}
|
||||
// End call triggers
|
||||
@ -3362,7 +3377,7 @@ class Facture extends CommonInvoice
|
||||
|
||||
dol_syslog(get_class($this)."::updateline rowid=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, date_start=$date_start, date_end=$date_end, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, type=$type, fk_parent_line=$fk_parent_line pa_ht=$pa_ht, special_code=$special_code, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
|
||||
|
||||
if ($this->brouillon) {
|
||||
if ($this->statut == self::STATUS_DRAFT) {
|
||||
if (!$this->is_last_in_cycle() && empty($this->error)) {
|
||||
if (!$this->checkProgressLine($rowid, $situation_percent)) {
|
||||
if (!$this->error) {
|
||||
@ -3631,7 +3646,7 @@ class Facture extends CommonInvoice
|
||||
|
||||
dol_syslog(get_class($this)."::deleteline rowid=".$rowid, LOG_DEBUG);
|
||||
|
||||
if (!$this->brouillon) {
|
||||
if ($this->statut != self::STATUS_DRAFT) {
|
||||
$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
|
||||
return -1;
|
||||
}
|
||||
|
||||
2
htdocs/compta/tva/card.php
Normal file → Executable file
2
htdocs/compta/tva/card.php
Normal file → Executable file
@ -549,7 +549,7 @@ if ($id) {
|
||||
print '</td></tr>';
|
||||
|
||||
if ($action == 'edit') {
|
||||
print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . $object->amount . '"></td></tr>';
|
||||
print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
|
||||
} else {
|
||||
print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>';
|
||||
}
|
||||
|
||||
@ -875,6 +875,13 @@ abstract class CommonInvoiceLine extends CommonObjectLine
|
||||
*/
|
||||
public $subprice;
|
||||
|
||||
/**
|
||||
* Unit price before taxes
|
||||
* @var float
|
||||
* @deprecated
|
||||
*/
|
||||
public $price;
|
||||
|
||||
/**
|
||||
* Id of corresponding product
|
||||
* @var int
|
||||
@ -905,12 +912,31 @@ abstract class CommonInvoiceLine extends CommonObjectLine
|
||||
*/
|
||||
public $localtax2_tx;
|
||||
|
||||
/**
|
||||
* Local tax 1 type
|
||||
* @var string
|
||||
*/
|
||||
public $localtax1_type;
|
||||
|
||||
/**
|
||||
* Local tax 2 type
|
||||
* @var string
|
||||
*/
|
||||
public $localtax2_type;
|
||||
|
||||
/**
|
||||
* Percent of discount
|
||||
* @var float
|
||||
*/
|
||||
public $remise_percent;
|
||||
|
||||
/**
|
||||
* Fixed discount
|
||||
* @var float
|
||||
* @deprecated
|
||||
*/
|
||||
public $remise;
|
||||
|
||||
/**
|
||||
* Total amount before taxes
|
||||
* @var float
|
||||
@ -944,6 +970,13 @@ abstract class CommonInvoiceLine extends CommonObjectLine
|
||||
public $date_start_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_start at creation
|
||||
public $date_end_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_end at creation
|
||||
|
||||
public $buy_price_ht;
|
||||
public $buyprice; // For backward compatibility
|
||||
public $pa_ht; // For backward compatibility
|
||||
|
||||
public $marge_tx;
|
||||
public $marque_tx;
|
||||
|
||||
/**
|
||||
* List of cumulative options:
|
||||
* Bit 0: 0 for common VAT - 1 if VAT french NPR
|
||||
@ -960,4 +993,7 @@ abstract class CommonInvoiceLine extends CommonObjectLine
|
||||
public $multicurrency_total_ht;
|
||||
public $multicurrency_total_tva;
|
||||
public $multicurrency_total_ttc;
|
||||
|
||||
public $fk_user_author;
|
||||
public $fk_user_modif;
|
||||
}
|
||||
|
||||
@ -120,7 +120,8 @@ class HookManager
|
||||
if ($resaction) {
|
||||
$controlclassname = 'Actions'.ucfirst($module);
|
||||
$actionInstance = new $controlclassname($this->db);
|
||||
$this->hooks[$context][$module] = $actionInstance;
|
||||
$priority = empty($actionInstance->priority) ? 50 : $actionInstance->priority;
|
||||
$this->hooks[$context][$priority.':'.$module] = $actionInstance;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -130,6 +131,8 @@ class HookManager
|
||||
dol_syslog(get_class($this)."::initHooks Loading hooks: ".join(', ', $arraytolog), LOG_DEBUG);
|
||||
}
|
||||
|
||||
ksort($this->hooks[$context], SORT_NATURAL);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -238,8 +241,10 @@ class HookManager
|
||||
$error = 0;
|
||||
foreach ($this->hooks as $context => $modules) { // $this->hooks is an array with context as key and value is an array of modules that handle this context
|
||||
if (!empty($modules)) {
|
||||
// Loop on each active hooks of module for this context
|
||||
foreach ($modules as $module => $actionclassinstance) {
|
||||
//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
|
||||
$module = preg_replace('/^\d+:/', '', $module);
|
||||
//print "Before hook ".get_class($actionclassinstance)." method=".$method." module=".$module." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
|
||||
|
||||
// test to avoid running twice a hook, when a module implements several active contexts
|
||||
if (in_array($module, $modulealreadyexecuted)) {
|
||||
|
||||
@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
|
||||
YourSession=Your session
|
||||
Sessions=Users Sessions
|
||||
WebUserGroup=Web server user/group
|
||||
PermissionsOnFiles=Permissions on files
|
||||
PermissionsOnFilesInWebRoot=Permissions on files in web root directory
|
||||
PermissionsOnFile=Permissions on file %s
|
||||
NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
|
||||
@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
|
||||
RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
|
||||
RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
|
||||
SecuritySetup=Security setup
|
||||
PHPSetup=PHP setup
|
||||
SecurityFilesDesc=Define here options related to security about uploading files.
|
||||
ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
|
||||
ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
|
||||
@ -2098,7 +2100,7 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
|
||||
DictionaryProductNature= Nature of product
|
||||
CountryIfSpecificToOneCountry=Country (if specific to a given country)
|
||||
YouMayFindSecurityAdviceHere=You may find security advisory here
|
||||
ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
|
||||
ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
|
||||
ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
|
||||
CombinationsSeparator=Separator character for product combinations
|
||||
SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
|
||||
|
||||
@ -1185,6 +1185,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
|
||||
|
||||
print dol_get_fiche_head('');
|
||||
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="border centpercent">';
|
||||
|
||||
// VAT
|
||||
@ -1271,6 +1272,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
|
||||
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||
|
||||
print '</table>';
|
||||
print '</div>';
|
||||
|
||||
print dol_get_fiche_end();
|
||||
|
||||
@ -1318,6 +1320,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
|
||||
print $langs->trans('UseMultipriceRules').' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
|
||||
}
|
||||
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder">';
|
||||
print '<thead><tr class="liste_titre">';
|
||||
|
||||
@ -1392,6 +1395,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
|
||||
print '</tbody>';
|
||||
|
||||
print '</table>';
|
||||
print '</div>';
|
||||
|
||||
//print dol_get_fiche_end();
|
||||
|
||||
@ -1493,7 +1497,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
|
||||
|
||||
print '<tr class="oddeven">';
|
||||
// Date
|
||||
print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour")."</td>";
|
||||
print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour", 'tzuserrel')."</td>";
|
||||
|
||||
// Price level
|
||||
if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
|
||||
@ -1665,13 +1669,11 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<input type="hidden" name="action" value="add_customer_price_confirm">';
|
||||
print '<input type="hidden" name="id" value="'.$object->id.'">';
|
||||
|
||||
print dol_get_fiche_head();
|
||||
|
||||
print '<table class="liste centpercent">';
|
||||
print '<tr>';
|
||||
print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
|
||||
print '<td>';
|
||||
print $form->select_company('', 'socid', 's.client IN (1,2,3)', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
|
||||
print img_picto('', 'company').$form->select_company('', 'socid', 's.client IN (1,2,3)', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
@ -1721,14 +1723,13 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
|
||||
print '</table>';
|
||||
|
||||
print dol_get_fiche_end();
|
||||
|
||||
print '<div class="center">';
|
||||
|
||||
// Update all child soc
|
||||
print '<div class="marginbottomonly">';
|
||||
print '<input type="checkbox" name="updatechildprice" value="1"> ';
|
||||
print $langs->trans('ForceUpdateChildPriceSoc');
|
||||
print '<input type="checkbox" name="updatechildprice" id="updatechildprice" value="1"> ';
|
||||
print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
|
||||
print '</div>';
|
||||
|
||||
print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
|
||||
@ -1753,14 +1754,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<input type="hidden" name="action" value="update_customer_price_confirm">';
|
||||
print '<input type="hidden" name="lineid" value="'.$prodcustprice->id.'">';
|
||||
|
||||
print dol_get_fiche_head();
|
||||
|
||||
print '<table class="liste centpercent">';
|
||||
print '<tr>';
|
||||
print '<td class="titlefield">'.$langs->trans('ThirdParty').'</td>';
|
||||
print '<td class="titlefield fieldrequired">'.$langs->trans('ThirdParty').'</td>';
|
||||
$staticsoc = new Societe($db);
|
||||
$staticsoc->fetch($prodcustprice->fk_soc);
|
||||
print "<td colspan='2'>".$staticsoc->getNomUrl(1)."</td>";
|
||||
print "<td>".$staticsoc->getNomUrl(1)."</td>";
|
||||
print '</tr>';
|
||||
|
||||
// Ref. Customer
|
||||
@ -1768,12 +1767,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<td><input name="ref_customer" size="12" value="' . dol_escape_htmltag($prodcustprice->ref_customer) . '"></td></tr>';
|
||||
|
||||
// VAT
|
||||
print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td colspan="2">';
|
||||
print '<tr><td class="fieldrequired">'.$langs->trans("DefaultTaxRate").'</td><td>';
|
||||
print $form->load_tva("tva_tx", $prodcustprice->default_vat_code ? $prodcustprice->tva_tx.' ('.$prodcustprice->default_vat_code.')' : $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly, $object->type, false, 1);
|
||||
print '</td></tr>';
|
||||
|
||||
// Price base
|
||||
print '<tr><td>';
|
||||
print '<tr><td class="fieldrequired">';
|
||||
print $langs->trans('PriceBase');
|
||||
print '</td>';
|
||||
print '<td>';
|
||||
@ -1782,7 +1781,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '</tr>';
|
||||
|
||||
// Price
|
||||
print '<tr><td>';
|
||||
print '<tr><td class="fieldrequired">';
|
||||
$text = $langs->trans('SellingPrice');
|
||||
print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
|
||||
print '</td><td>';
|
||||
@ -1809,21 +1808,13 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
}
|
||||
print '</tr>';
|
||||
|
||||
// Update all child soc
|
||||
print '<tr><td>';
|
||||
print '</td>';
|
||||
print '<td>';
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
print '</table>';
|
||||
|
||||
print dol_get_fiche_end();
|
||||
|
||||
print '<div class="center">';
|
||||
print '<div class="marginbottomonly">';
|
||||
print '<input type="checkbox" name="updatechildprice" value="1"> ';
|
||||
print $langs->trans('ForceUpdateChildPriceSoc');
|
||||
print '<input type="checkbox" name="updatechildprice" id="updatechildprice" value="1"> ';
|
||||
print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
|
||||
print "</div>";
|
||||
|
||||
print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
|
||||
@ -1866,6 +1857,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="id" value="'.$object->id.'">';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="liste centpercent">';
|
||||
|
||||
print '<tr class="liste_titre">';
|
||||
@ -1915,8 +1907,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<tr class="oddeven">';
|
||||
|
||||
print "<td>".$staticsoc->getNomUrl(1)."</td>";
|
||||
print '<td>' . $line->ref_customer . '</td>';
|
||||
print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
|
||||
print '<td>'.$line->ref_customer.'</td>';
|
||||
print "<td>".dol_print_date($line->datec, "dayhour", 'tzuserrel')."</td>";
|
||||
print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
|
||||
print '<td class="right">';
|
||||
|
||||
@ -1960,6 +1952,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '</tr>';
|
||||
}
|
||||
print "</table>";
|
||||
print '</div>';
|
||||
} else {
|
||||
print $langs->trans('None');
|
||||
}
|
||||
@ -1986,6 +1979,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="id" value="'.$object->id.'">';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="liste centpercent">';
|
||||
|
||||
if (count($prodcustprice->lines) > 0 || $search_soc) {
|
||||
@ -2020,7 +2014,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
|
||||
print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
|
||||
print '<td> </td>';
|
||||
print '<td></td>';
|
||||
print '</tr>';
|
||||
|
||||
// Line for default price
|
||||
@ -2081,15 +2075,14 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<td class="right">';
|
||||
print '</td>';
|
||||
if ($user->rights->produit->supprimer || $user->rights->service->supprimer) {
|
||||
print '<td class="right">';
|
||||
print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&id='.$object->id.'">';
|
||||
print '<td class="nowraponall">';
|
||||
print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&id='.$object->id.'">';
|
||||
print img_info($langs->trans('PriceByCustomerLog'));
|
||||
print '</a>';
|
||||
print ' ';
|
||||
print '<a class="marginleftonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&id='.$object->id.'">';
|
||||
print '<a class="marginleftonly marginrightonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&id='.$object->id.'">';
|
||||
print img_edit('default', 0, 'style="vertical-align: middle;"');
|
||||
print '</a>';
|
||||
print ' ';
|
||||
print '</td>';
|
||||
}
|
||||
print "</tr>\n";
|
||||
@ -2124,8 +2117,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
|
||||
print "<td>".$staticsoc->getNomUrl(1)."</td>";
|
||||
print '<td>' . $line->ref_customer . '</td>';
|
||||
print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
|
||||
|
||||
print "<td>".dol_print_date($line->datec, "dayhour", 'tzuserrel')."</td>";
|
||||
print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
|
||||
print '<td class="right">';
|
||||
|
||||
@ -2142,6 +2134,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
if (empty($positiverates)) {
|
||||
$positiverates = '0';
|
||||
}
|
||||
|
||||
echo vatrate($positiverates.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), '%', ($line->tva_npr ? $line->tva_npr : $line->recuperableonly));
|
||||
|
||||
print "</td>";
|
||||
@ -2185,16 +2178,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print "</tr>\n";
|
||||
}
|
||||
}
|
||||
/*else
|
||||
{
|
||||
$colspan=9;
|
||||
if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1;
|
||||
print "<tr ".$bc[false].">";
|
||||
print '<td colspan="'.$colspan.'">'.$langs->trans('None').'</td>';
|
||||
print "</tr>";
|
||||
}*/
|
||||
|
||||
print "</table>";
|
||||
print '</div>';
|
||||
|
||||
print "</form>";
|
||||
}
|
||||
|
||||
@ -107,6 +107,8 @@ if ($result < 0) {
|
||||
exit;
|
||||
}
|
||||
}
|
||||
$user->getrights();
|
||||
|
||||
$id = GETPOST('id', 'alpha'); // We accept non numeric id. We will filter later.
|
||||
|
||||
|
||||
|
||||
@ -156,7 +156,6 @@ if ($action == 'add' && empty($cancel)) {
|
||||
$object->dateep = $dateep;
|
||||
$object->note = GETPOST("note", 'restricthtml');
|
||||
$object->type_payment = ($type_payment > 0 ? $type_payment : 0);
|
||||
$object->num_payment = GETPOST("num_payment", 'alphanohtml');
|
||||
$object->fk_user_author = $user->id;
|
||||
$object->fk_project = $projectid;
|
||||
|
||||
|
||||
@ -64,7 +64,6 @@ class Salary extends CommonObject
|
||||
public $fk_project;
|
||||
|
||||
public $type_payment;
|
||||
public $num_payment;
|
||||
|
||||
/**
|
||||
* @var string salary payments label
|
||||
@ -141,7 +140,6 @@ class Salary extends CommonObject
|
||||
$sql .= " amount=".price2num($this->amount).",";
|
||||
$sql .= " fk_projet=".((int) $this->fk_project).",";
|
||||
$sql .= " fk_typepayment=".$this->type_payment.",";
|
||||
$sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
|
||||
$sql .= " label='".$this->db->escape($this->label)."',";
|
||||
$sql .= " datesp='".$this->db->idate($this->datesp)."',";
|
||||
$sql .= " dateep='".$this->db->idate($this->dateep)."',";
|
||||
@ -206,7 +204,6 @@ class Salary extends CommonObject
|
||||
$sql .= " s.amount,";
|
||||
$sql .= " s.fk_projet as fk_project,";
|
||||
$sql .= " s.fk_typepayment,";
|
||||
$sql .= " s.num_payment,";
|
||||
$sql .= " s.label,";
|
||||
$sql .= " s.datesp,";
|
||||
$sql .= " s.dateep,";
|
||||
@ -238,7 +235,6 @@ class Salary extends CommonObject
|
||||
$this->amount = $obj->amount;
|
||||
$this->fk_project = $obj->fk_project;
|
||||
$this->type_payment = $obj->fk_typepayment;
|
||||
$this->num_payment = $obj->num_payment;
|
||||
$this->label = $obj->label;
|
||||
$this->datesp = $this->db->jdate($obj->datesp);
|
||||
$this->dateep = $this->db->jdate($obj->dateep);
|
||||
@ -393,7 +389,6 @@ class Salary extends CommonObject
|
||||
$sql .= ", salary";
|
||||
$sql .= ", fk_typepayment";
|
||||
$sql .= ", fk_account";
|
||||
$sql .= ", num_payment";
|
||||
if ($this->note) $sql .= ", note";
|
||||
$sql .= ", label";
|
||||
$sql .= ", datesp";
|
||||
@ -412,7 +407,6 @@ class Salary extends CommonObject
|
||||
$sql .= ", ".($this->salary > 0 ? $this->salary : "null");
|
||||
$sql .= ", ".($this->type_payment > 0 ? $this->type_payment : 0);
|
||||
$sql .= ", ".($this->accountid > 0 ? $this->accountid : "null");
|
||||
$sql .= ", '".$this->db->escape($this->num_payment)."'";
|
||||
if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
|
||||
$sql .= ", '".$this->db->escape($this->label)."'";
|
||||
$sql .= ", '".$this->db->idate($this->datesp)."'";
|
||||
|
||||
@ -570,7 +570,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
|
||||
}
|
||||
|
||||
// Type
|
||||
print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
|
||||
print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).'</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
|
||||
@ -1606,7 +1606,7 @@ td.showDragHandle {
|
||||
float: left;
|
||||
}
|
||||
.classforhorizontalscrolloftabs #id-right {
|
||||
width:calc(100% - 210px);
|
||||
width: calc(100% - 210px);
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
@ -1710,10 +1710,17 @@ div.vmenu, td.vmenu {
|
||||
/* rule to reduce top menu - 3rd reduction: The menu for user is on left */
|
||||
@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */
|
||||
{
|
||||
/* no side-nav */
|
||||
body.sidebar-collapse .side-nav {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* if no side-nav, we don't need to have width forced */
|
||||
.classforhorizontalscrolloftabs #id-right {
|
||||
width: unset;
|
||||
display: unset;
|
||||
}
|
||||
|
||||
body.sidebar-collapse .login_block {
|
||||
display: none;
|
||||
}
|
||||
@ -1767,8 +1774,8 @@ div.vmenu, td.vmenu {
|
||||
|
||||
|
||||
div.fiche {
|
||||
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
|
||||
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '28' : '6')); ?>px;
|
||||
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '32' : '6')); ?>px;
|
||||
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
|
||||
<?php if (!empty($dol_hide_leftmenu)) {
|
||||
print 'margin-bottom: 12px;'."\n";
|
||||
} ?>
|
||||
@ -1815,7 +1822,7 @@ div.fichetwothirdright {
|
||||
} ?>
|
||||
}
|
||||
div.fichetwothirdright div.ficheaddleft {
|
||||
padding-<?php echo $left; ?>: 20px;
|
||||
padding-<?php echo $left; ?>: 28px;
|
||||
}
|
||||
div.fichehalfleft {
|
||||
<?php if ($conf->browser->layout != 'phone') {
|
||||
|
||||
@ -712,7 +712,7 @@ class Ticket extends CommonObject
|
||||
if (!empty($filter)) {
|
||||
foreach ($filter as $key => $value) {
|
||||
if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
|
||||
$sql .= ' AND '.$key." = '".$this->db->scape($value)."'";
|
||||
$sql .= ' AND '.$key." = '".$this->db->escape($value)."'";
|
||||
} elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code') || ($key == 't.fk_soc')) {
|
||||
$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
|
||||
} elseif ($key == 't.fk_statut') {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user