';
print '' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . ' ';
if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ' . $langs->trans("Status") . ' ';
print '';
if (empty($object->validated)) {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
}
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index b9339a8150b..1ef500fcf6b 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -9,7 +9,7 @@
* Copyright (C) 2013-2017 Olivier Geffroy
* Copyright (C) 2017 Elarifr. Ari Elbaz
* Copyright (C) 2017-2019 Frédéric France
-
+ * Copyright (C) 2017 André Schild
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -51,6 +51,7 @@ class AccountancyExport
public static $EXPORT_TYPE_AGIRIS = 9;
public static $EXPORT_TYPE_FEC = 11;
public static $EXPORT_TYPE_OPENCONCERTO = 12;
+ public static $EXPORT_TYPE_SAGE50_SWISS = 13;
/**
@@ -106,6 +107,7 @@ class AccountancyExport
self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'),
self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
+ self::$EXPORT_TYPE_SAGE50_SWISS => $langs->trans('Modelcsv_Sage50_Swiss'),
);
}
@@ -130,6 +132,7 @@ class AccountancyExport
self::$EXPORT_TYPE_AGIRIS => 'agiris',
self::$EXPORT_TYPE_OPENCONCERTO => 'openconcerto',
self::$EXPORT_TYPE_FEC => 'fec',
+ self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch',
);
return $formatcode[$type];
@@ -194,6 +197,10 @@ class AccountancyExport
'label' => $langs->trans('Modelcsv_openconcerto'),
'ACCOUNTING_EXPORT_FORMAT' => 'csv',
),
+ self::$EXPORT_TYPE_SAGE50_SWISS => array(
+ 'label' => $langs->trans('Modelcsv_Sage50_Swiss'),
+ 'ACCOUNTING_EXPORT_FORMAT' => 'csv',
+ ),
),
'cr'=> array (
'1' => $langs->trans("Unix"),
@@ -261,6 +268,9 @@ class AccountancyExport
case self::$EXPORT_TYPE_FEC :
$this->exportFEC($TData);
break;
+ case self::$EXPORT_TYPE_SAGE50_SWISS :
+ $this->exportSAGE50SWISS($TData);
+ break;
default:
$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
break;
@@ -616,7 +626,7 @@ class AccountancyExport
$date = dol_print_date($line->doc_date, '%d/%m/%Y');
print $date . $separator;
- print $line->code_journal;
+ print $line->code_journal . $separator;
if (empty($line->subledger_account)) {
print length_accountg($line->numero_compte) . $separator;
} else {
@@ -757,6 +767,157 @@ class AccountancyExport
}
}
+ /**
+ * Export format : SAGE50SWISS
+ *
+ *
+ * https://onlinehelp.sageschweiz.ch/default.aspx?tabid=19984
+ * http://media.topal.ch/Public/Schnittstellen/TAF/Specification/Sage50-TAF-format.pdf
+ *
+ * @param array $objectLines data
+ *
+ * @return void
+ */
+ public function exportSAGE50SWISS($objectLines)
+ {
+ // SAGE50SWISS
+ $this->separator = ',';
+ $this->end_line = "\r\n";
+
+ // Print header line
+ print "Blg,Datum,Kto,S/H,Grp,GKto,SId,SIdx,KIdx,BTyp,MTyp,Code,Netto,Steuer,FW-Betrag,Tx1,Tx2,PkKey,OpId,Flag";
+ print $this->end_line;
+ $thisPieceNum= "";
+ $thisPieceAccountNr= "";
+ $aSize= count($objectLines);
+ foreach ($objectLines as $aIndex=>$line)
+ {
+ $sammelBuchung= false;
+ if ($aIndex-2 >= 0 && $objectLines[$aIndex-2]->piece_num == $line->piece_num)
+ {
+ $sammelBuchung= true;
+ }
+ elseif ($aIndex+2 < $aSize && $objectLines[$aIndex+2]->piece_num == $line->piece_num)
+ {
+ $sammelBuchung= true;
+ }
+ elseif ($aIndex+1 < $aSize
+ && $objectLines[$aIndex+1]->piece_num == $line->piece_num
+ && $aIndex-1 < $aSize
+ && $objectLines[$aIndex-1]->piece_num == $line->piece_num
+ )
+ {
+ $sammelBuchung= true;
+ }
+
+ //Blg
+ print $line->piece_num . $this->separator;
+
+ // Datum
+ $date = dol_print_date($line->doc_date, '%d.%m.%Y');
+ print $date . $this->separator;
+
+ // Kto
+ print length_accountg($line->numero_compte) . $this->separator;
+ // S/H
+ if ($line->sens == 'D')
+ {
+ print 'S' . $this->separator;
+ }
+ else
+ {
+ print 'H' . $this->separator;
+ }
+ //Grp
+ print self::trunc($line->code_journal, 1) . $this->separator;
+ // GKto
+ if (empty($line->code_tiers))
+ {
+ if ($line->piece_num == $thisPieceNum)
+ {
+ print length_accounta($thisPieceAccountNr) . $this->separator;
+ }
+ else
+ {
+ print "div" . $this->separator;
+ }
+ }
+ else
+ {
+ print length_accounta($line->code_tiers) . $this->separator;
+ }
+ //SId
+ print $this->separator;
+ //SIdx
+ print "0" . $this->separator;
+ //KIdx
+ print "0" . $this->separator;
+ //BTyp
+ print "0" . $this->separator;
+
+ //MTyp 1=Fibu Einzelbuchung 2=Sammebuchung
+ if ($sammelBuchung)
+ {
+ print "2" . $this->separator;
+ }
+ else
+ {
+ print "1" . $this->separator;
+ }
+ // Code
+ print '""' . $this->separator;
+ // Netto
+ if ($line->montant >= 0)
+ {
+ print $line->montant . $this->separator;
+ }
+ else
+ {
+ print $line->montant*-1 . $this->separator;
+ }
+ // Steuer
+ print "0.00" . $this->separator;
+ // FW-Betrag
+ print "0.00" . $this->separator;
+ // Tx1
+ $line1= self::toAnsi($line->label_compte, 29);
+ if ($line1 == "LIQ" || $line1 == "LIQ Beleg ok" || strlen($line1) <= 3)
+ {
+ $line1= "";
+ }
+ $line2= self::toAnsi($line->doc_ref, 29);
+ if (strlen($line1) == 0)
+ {
+ $line1= $line2;
+ $line2= "";
+ }
+ if (strlen($line1) > 0 && strlen($line2) > 0 && (strlen($line1) + strlen($line2)) < 27)
+ {
+ $line1= $line1 . ' / ' . $line2;
+ $line2= "";
+ }
+
+ print '"' . self::toAnsi($line1). '"' . $this->separator;
+ // Tx2
+ print '"' . self::toAnsi($line2). '"' . $this->separator;
+ //PkKey
+ print "0" . $this->separator;
+ //OpId
+ print $this->separator;
+
+ // Flag
+ print "0";
+
+ print $this->end_line;
+
+ if ($line->piece_num !== $thisPieceNum)
+ {
+ $thisPieceNum= $line->piece_num;
+ $thisPieceAccountNr= $line->numero_compte;
+ }
+ }
+ }
+
/**
*
* @param string $str data
@@ -767,4 +928,20 @@ class AccountancyExport
{
return dol_trunc($str, $size, 'right', 'UTF-8', 1);
}
+
+ /**
+ *
+ * @param unknown $str Original string to encode and optionaly truncate
+ * @param integer $size trucate string after $size characters
+ * @return string String encoded in Windows-1251 charset
+ */
+ public static function toAnsi($str, $size = -1)
+ {
+ $retVal= dol_string_nohtmltag($str, 1, 'Windows-1251');
+ if ($retVal >= 0 && $size >= 0)
+ {
+ $retVal= mb_substr($retVal, 0, $size, 'Windows-1251');
+ }
+ return $retVal;
+ }
}
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index c8a855c0d8a..a704b1c9789 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -83,13 +83,13 @@ class AccountancySystem
if ($rowid > 0 || $ref)
{
- $sql = "SELECT a.pcg_version, a.label, a.active";
+ $sql = "SELECT a.rowid, a.pcg_version, a.label, a.active";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_system as a";
$sql .= " WHERE";
if ($rowid) {
$sql .= " a.rowid = '" . $rowid . "'";
} elseif ($ref) {
- $sql .= " a.pcg_version = '" . $ref . "'";
+ $sql .= " a.pcg_version = '" . $this->db->escape($ref) . "'";
}
dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 33f8990bc8d..0a0943fe13d 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -151,12 +151,13 @@ class AccountingAccount extends CommonObject
/**
* Load record in memory
*
- * @param int $rowid Id
- * @param string $account_number Account number
- * @param int $limittocurrentchart 1=Do not load record if it is into another accounting system
- * @return int <0 if KO, 0 if not found, Id of record if OK and found
+ * @param int $rowid Id
+ * @param string $account_number Account number
+ * @param int|boolean $limittocurrentchart 1 or true=Load record only if it is into current active char of account
+ * @param string $limittochartaccount 'ABC'=Load record only if it is into chart account with code 'ABC'.
+ * @return int <0 if KO, 0 if not found, Id of record if OK and found
*/
- public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0)
+ public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
{
global $conf;
@@ -174,6 +175,9 @@ class AccountingAccount extends CommonObject
if (! empty($limittocurrentchart)) {
$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $this->db->escape($conf->global->CHARTOFACCOUNTS) . ')';
}
+ if (! empty($limittoachartaccount)) {
+ $sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'";
+ }
dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
$result = $this->db->query($sql);
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 5b2c3e912dd..105251ec114 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -137,7 +137,7 @@ if ($object->id > 0)
print '
';
$object->info($id);
- print dol_print_object_info($object, 1);
+ dol_print_object_info($object, 1);
print '';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index fc61e56115c..3119e044be0 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -596,7 +596,7 @@ class Adherent extends CommonObject
{
while ($obj=$this->db->fetch_object($resql2))
{
- $this->type=$obj->label;
+ $this->type=$obj->label;
}
}
}
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index c310bb18627..3a39632d783 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -65,7 +65,7 @@ class AdherentType extends CommonObject
* @var string Adherent type label
*/
public $label;
-
+
/**
* @var string Adherent type nature
*/
@@ -410,8 +410,8 @@ class AdherentType extends CommonObject
return -1;
}
}
-
- /**
+
+ /**
* Return translated label by the nature of a adherent (physical or moral)
*
* @param string $morphy Nature of the adherent (physical or moral)
@@ -422,7 +422,7 @@ class AdherentType extends CommonObject
global $langs;
if ($morphy == 'phy') { return $langs->trans("Physical"); }
elseif ($morphy == 'mor') { return $langs->trans("Moral"); }
- else return $langs->trans("Physical & Morale");
+ else return $langs->trans("Physical & Morale");
//return $morphy;
}
@@ -463,6 +463,7 @@ class AdherentType extends CommonObject
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
*
@@ -472,7 +473,7 @@ class AdherentType extends CommonObject
* 2=Return key only (uid=qqq)
* @return string DN
*/
- private function _load_ldap_dn($info, $mode = 0)
+ public function _load_ldap_dn($info, $mode = 0)
{
// phpcs:enable
global $conf;
@@ -485,12 +486,13 @@ class AdherentType extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Initialize the info array (array of LDAP values) that will be used to call LDAP functions
*
* @return array Tableau info des attributs
*/
- private function _load_ldap_info()
+ public function _load_ldap_info()
{
// phpcs:enable
global $conf,$langs;
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index 4d860abcc68..885e453c6f1 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -43,13 +43,13 @@ if (empty($sortorder)) { $sortorder="ASC"; }
if (empty($sortfield)) { $sortfield="d.login"; }
if (! isset($statut))
{
- $statut = 1 ;
+ $statut = 1 ;
}
if (! isset($cotis))
{
- // by default, members must be up to date of subscription
- $cotis=1;
+ // by default, members must be up to date of subscription
+ $cotis=1;
}
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 2ae7e2d0001..bffb3418dba 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -235,7 +235,7 @@ else
print ''.$langs->trans("MembersStatisticsByTown").' '.$langs->trans("MembersStatisticsByRegion").' '.$langs->trans("MembersStatisticsByRegion").' ';
print '
';
print ''.$langs->trans("Filter").' '.$langs->trans("Member").' ';
-$filter='s.client in (1,2,3)';
-print $form->select_company($id,'memberid',$filter,1);
+print $form->select_company($id,'memberid','',1);
print ' '.$langs->trans("User").' ';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 574f061b25d..8e8482d4398 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -306,7 +306,7 @@ if (! empty($arrayfields['d.fk_type']['checked']))
{
print ' ';
print ' ';
+ print'';
}
if (! empty($arrayfields['d.lastname']['checked']))
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index e85eed336fb..99e3cc5f526 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -47,10 +47,10 @@ foreach($linkedObjectBlock as $key => $objectlink)
dateh, 'day'); ?>
rights->adherent->lire) {
- $total = $total + $objectlink->amount;
- echo price($objectlink->amount);
- } ?>
+ if ($user->rights->adherent->lire) {
+ $total = $total + $objectlink->amount;
+ echo price($objectlink->amount);
+ } ?>
">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> '.dol_escape_htmltag($objp->label).' ';
print '';
- if ($objp->morphy == 'phy') { print $langs->trans("Physical"); }
- elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); }
- else print $langs->trans("Physical & Morale");
+ if ($objp->morphy == 'phy') { print $langs->trans("Physical"); }
+ elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); }
+ else print $langs->trans("Physical & Morale");
print ' ';
print ''.yn($objp->subscription).' ';
print ''.yn($objp->vote).' ';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 24b4766471d..649bfab3d97 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -143,7 +143,7 @@ print '';
print '';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index b7f1f0e6db9..b6e62973cf7 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -275,7 +275,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index e8e035f8b49..efc192e6de1 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -184,7 +184,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index bf02df80b5b..63597eaa22b 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -256,7 +256,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index a9b7d9e75ca..160e8b079e8 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -120,6 +120,12 @@ $modules=array(
'img' => 'trip'
)*/
),
+ 'holiday' => array(
+ array(
+ 'code' => 'MAIN_DELAY_HOLIDAYS',
+ 'img' => 'holiday'
+ ),
+ ),
);
$labelmeteo = array(0=>$langs->trans("No"), 1=>$langs->trans("Yes"), 2=>$langs->trans("OnMobileOnly"));
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index a27be02acb0..6d1b640f45b 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -608,9 +608,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
print '';
// Delete
- print '';
- print ' '.img_edit().' ';
- print ' ';
+ print ' ';
+ print ''.img_edit().' ';
print ' '.img_delete().' ';
print ' ';
print ' ';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index d67936edfb5..14cb63cd923 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -384,7 +384,7 @@ $parameters=array('arrayfields'=>$arrayfields);
$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print '';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -439,7 +439,7 @@ while ($i < min($num, $limit))
$object->id = $obj->rowid;
foreach($object->fields as $key => $val)
{
- if (isset($obj->$key)) $object->$key = $obj->$key;
+ if (property_exists($obj, $key)) $object->$key = $obj->$key;
}
// Show here line of result
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 04dcf3ddc36..23a154511c1 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -261,7 +261,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print 'scandir.'&label='.urlencode($module->name).'">';
+ print ' scandir.'&label='.urlencode($module->name).'">';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index cac83ef8d8b..da77c0e78d3 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -267,7 +267,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index b9b78e55ec9..94abf8df2ab 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -66,8 +66,8 @@ else
if ($action == 'add' || GETPOST("modify"))
{
- $external_rss_title = "external_rss_title_" . GETPOST("norss");
- $external_rss_urlrss = "external_rss_urlrss_" . GETPOST("norss");
+ $external_rss_title = "external_rss_title_" . GETPOST("norss", 'int');
+ $external_rss_urlrss = "external_rss_urlrss_" . GETPOST("norss", 'int');
if (! empty($_POST[$external_rss_urlrss]))
{
@@ -95,7 +95,7 @@ if ($action == 'add' || GETPOST("modify"))
{
// Ajoute boite box_external_rss dans definition des boites
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
- $sql.= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss").' ('.GETPOST($external_rss_title)).")')";
+ $sql.= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
if (! $db->query($sql))
{
dol_print_error($db);
@@ -103,8 +103,8 @@ if ($action == 'add' || GETPOST("modify"))
}
}
- $result1=dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_" . GETPOST("norss"), GETPOST($external_rss_title), 'chaine', 0, '', $conf->entity);
- if ($result1) $result2=dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_" . GETPOST("norss"), GETPOST($external_rss_urlrss), 'chaine', 0, '', $conf->entity);
+ $result1=dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_" . GETPOST("norss", 'int'), GETPOST($external_rss_title, 'alpha'), 'chaine', 0, '', $conf->entity);
+ if ($result1) $result2=dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_" . GETPOST("norss", 'int'), GETPOST($external_rss_urlrss, 'alpha'), 'chaine', 0, '', $conf->entity);
if ($result1 && $result2)
{
@@ -122,13 +122,13 @@ if ($action == 'add' || GETPOST("modify"))
if ($_POST["delete"])
{
- if(GETPOST("norss"))
+ if (GETPOST("norss", 'int'))
{
$db->begin();
// Supprime boite box_external_rss de definition des boites
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
- $sql.= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss"))." %'";
+ $sql.= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss", 'int'))." %'";
$resql=$db->query($sql);
if ($resql)
@@ -168,8 +168,8 @@ if ($_POST["delete"])
}
- $result1=dolibarr_del_const($db, "EXTERNAL_RSS_TITLE_" . GETPOST("norss"), $conf->entity);
- if ($result1) $result2=dolibarr_del_const($db, "EXTERNAL_RSS_URLRSS_" . GETPOST("norss"), $conf->entity);
+ $result1=dolibarr_del_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), $conf->entity);
+ if ($result1) $result2=dolibarr_del_const($db, "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int'), $conf->entity);
if ($result1 && $result2)
{
@@ -270,13 +270,13 @@ if ($resql)
print '';
print "".$langs->trans("Title")." ";
- print " ";
print '';
print "".$langs->trans("URL")." ";
- print " ";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 57a18afcbd3..765f2e6f995 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -352,7 +352,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index a407edd3864..27f105435d5 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 347d45d729d..e3571fdb253 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -257,7 +257,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index d11d07c5f38..7635c9a3c19 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -252,7 +252,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 517ec9b9dc5..4ee9e214890 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -162,7 +162,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
//$link=img_picto($langs->trans("Active"),'tick').' ';
- $link='';
+ $link=' ';
//$link.=$langs->trans("Disable");
$link.=img_picto($langs->trans("Activated"), 'switch_on');
$link.=' ';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index d74f10ca58c..bc12fd5ddd6 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -519,7 +519,7 @@ else
{
dol_fiche_head($head, 'common', '', -1);
- print $langs->trans("EMailsDesc")."'.$langs->trans("EMailsDesc")." ';
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 4ce8d8c0b72..1e54fdea3dd 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -396,7 +396,7 @@ else
{
dol_fiche_head($head, 'common_emailing', '', -1);
- print $langs->trans("EMailsDesc")."'.$langs->trans("EMailsDesc")." ';
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index fa895f84182..931d1168238 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -356,7 +356,7 @@ $parameters=array('arrayfields'=>$arrayfields);
$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print '';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -406,7 +406,7 @@ while ($i < min($num, $limit))
$object->id = $obj->rowid;
foreach($object->fields as $key => $val)
{
- if (isset($obj->$key)) $object->$key = $obj->$key;
+ if (property_exists($obj, $key)) $object->$key = $obj->$key;
}
// Show here line of result
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index aaba339e30e..4e80fe55e25 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -183,7 +183,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 0bbdf9eefdf..bd2d7782cef 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -61,6 +61,8 @@ if ($action == 'update')
dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", $_POST["MAIN_PROFID2_IN_ADDRESS"], 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", $_POST["MAIN_PROFID3_IN_ADDRESS"], 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", $_POST["MAIN_PROFID4_IN_ADDRESS"], 'chaine', 0, '', $conf->entity);
+ dolibarr_set_const($db, "MAIN_PROFID5_IN_ADDRESS", $_POST["MAIN_PROFID5_IN_ADDRESS"], 'chaine', 0, '', $conf->entity);
+ dolibarr_set_const($db, "MAIN_PROFID6_IN_ADDRESS", $_POST["MAIN_PROFID6_IN_ADDRESS"], 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", $_POST["MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"], 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", $_POST["MAIN_TVAINTRA_NOT_IN_ADDRESS"], 'chaine', 0, '', $conf->entity);
@@ -177,76 +179,25 @@ if ($action == 'edit') // Edit
print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS', (! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0, 1);
print '';
- // Show prof id 1 in address into pdf
-
- if (! $noCountryCode)
+ // Show prof id in address into pdf
+ for($i=1; $i<=6; $i++)
{
- $pid1=$langs->transcountry("ProfId1", $mysoc->country_code);
- if ($pid1 == '-') $pid1=false;
- }
- else
- {
- $pid1 = img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid1)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid1.' ';
- print $form->selectyesno('MAIN_PROFID1_IN_ADDRESS', isset($conf->global->MAIN_PROFID1_IN_ADDRESS)?$conf->global->MAIN_PROFID1_IN_ADDRESS:0, 1, $noCountryCode);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid2)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid2.' ';
- print $form->selectyesno('MAIN_PROFID2_IN_ADDRESS', isset($conf->global->MAIN_PROFID2_IN_ADDRESS)?$conf->global->MAIN_PROFID2_IN_ADDRESS:0, 1, $noCountryCode);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid3)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid3.' ';
- print $form->selectyesno('MAIN_PROFID3_IN_ADDRESS', isset($conf->global->MAIN_PROFID3_IN_ADDRESS)?$conf->global->MAIN_PROFID3_IN_ADDRESS:0, 1, $noCountryCode);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid4)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid4.' ';
- print $form->selectyesno('MAIN_PROFID4_IN_ADDRESS', isset($conf->global->MAIN_PROFID4_IN_ADDRESS)?$conf->global->MAIN_PROFID4_IN_ADDRESS:0, 1, $noCountryCode);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
+ }
+ if ($pid)
+ {
+ print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid.' ';
+ $keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
+ print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant)?$conf->global->$keyforconstant:0, 1, $noCountryCode);
+ print '
';
@@ -419,77 +370,26 @@ else // Show
print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS, 1);
print '';
- // Show prof id 1 in address into pdf
-
- if (! $noCountryCode)
- {
- $pid1=$langs->transcountry("ProfId1", $mysoc->country_code);
- if ($pid1 == '-') $pid1=false;
- }
- else
- {
- $pid1 = img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid1)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid1.' ';
- print yn($conf->global->MAIN_PROFID1_IN_ADDRESS, 1);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid2)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid2.' ';
- print yn($conf->global->MAIN_PROFID2_IN_ADDRESS, 1);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid3)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid3.' ';
- print yn($conf->global->MAIN_PROFID3_IN_ADDRESS, 1);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
- }
- if ($pid4)
- {
- print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid4.' ';
- print yn($conf->global->MAIN_PROFID4_IN_ADDRESS, 1);
- print ' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).' ';
+ }
+ if ($pid)
+ {
+ print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid.' ';
+ $keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
+ print yn($conf->global->$keyforconstant, 1);
+ print '
'."\n";
print '';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index db41876b02c..843de325e73 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -314,7 +314,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index f97c1d7823b..a1fd76e0d5d 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -266,7 +266,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print 'scandir.'&label='.urlencode($module->name).'">';
+ print ' scandir.'&label='.urlencode($module->name).'">';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 96552ed2c0d..e0b4b986969 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -64,10 +64,10 @@ if ($action == 'update' || $action == 'add')
$constnote=$_POST["constnote"][$key];
$res=dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
-
+
if (! $res > 0) $error++;
}
-
+
if (! $error)
{
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -123,9 +123,9 @@ $head = mailmanspip_admin_prepare_head();
if (! empty($conf->global->ADHERENT_USE_SPIP))
{
print '';
}
else
{
dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
-
- $link='';
+
+ $link=' ';
//$link.=$langs->trans("Activate");
$link.=img_picto($langs->trans("Disabled"), 'switch_off');
$link.=' ';
print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
-
+
dol_fiche_end();
}
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 6d8936fbe71..836afc27a7c 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -276,7 +276,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index c414eca8158..e895a0b4005 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -178,7 +178,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
// TODO We add/delete permission here until permission can have a condition on a global var
include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
$newmodule=new modFournisseur($db);
-
+
if ($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
{
// clear default rights array
@@ -191,7 +191,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
$newmodule->rights[$r][3] = 0;
$newmodule->rights[$r][4] = 'commande';
$newmodule->rights[$r][5] = 'approve2';
-
+
// Insert
$newmodule->insert_permissions(1);
}
@@ -199,7 +199,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
{
// Remove all rights with Permission1190
$newmodule->delete_permissions();
-
+
// Add all right without Permission1190
$newmodule->insert_permissions(1);
}
@@ -306,7 +306,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 4cf53e6d82f..49af65bd786 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -268,7 +268,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index b757fb66673..8b17c860fd4 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -283,7 +283,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 8e018bc2255..c04c91e0e66 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -36,7 +36,13 @@ $action=GETPOST('action', 'alpha');
if ($action == 'convert')
{
- $db->query("alter table ".$_GET["table"]." ENGINE=INNODB");
+ $sql="ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." ENGINE=INNODB";
+ $db->query($sql);
+}
+if ($action == 'convertutf8')
+{
+ $sql="ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+ $db->query($sql);
}
@@ -111,23 +117,28 @@ else
print ''.$obj->Name.' '.$obj->Engine.' ';
- if (isset($row[1]) && $row[1] == "MyISAM")
+ if (isset($obj->Engine) && $obj->Engine == "MyISAM")
{
- print ''.$langs->trans("Convert").' '.$langs->trans("Convert").' InnoDB ';
}
print ''.$obj->Row_format.' ';
- print ''.$obj->Rows.' ';
- print ''.$obj->Avg_row_length.' ';
- print ''.$obj->Data_length.' ';
- print ''.$obj->Max_data_length.' ';
- print ''.$obj->Index_length.' ';
- print ''.$obj->Auto_increment.' ';
- print ''.$obj->Check_time.' ';
- print ''.$obj->Collation.' ';
+ print ''.$obj->Rows.' ';
+ print ''.$obj->Avg_row_length.' ';
+ print ''.$obj->Data_length.' ';
+ print ''.$obj->Max_data_length.' ';
+ print ''.$obj->Index_length.' ';
+ print ''.$obj->Auto_increment.' ';
+ print ''.$obj->Check_time.' ';
+ print ''.$obj->Collation;
+ if (isset($obj->Collation) && ($obj->Collation == "utf8mb4_general_ci" || $obj->Collation == "utf8mb4_unicode_ci"))
+ {
+ print ''.$langs->trans("Convert").' UTF8 ';
+ }
+ print ' ';
print '';
$i++;
}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index f9e985cec94..331d7e992ba 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->TICKET_ADDON == 'mod_' . $classname) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '' . img_picto($langs->trans("Disabled"), 'switch_off') . ' ';
+ print '' . img_picto($langs->trans("Disabled"), 'switch_off') . ' ';
}
print '';
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index c593846a29d..c1ddedfea53 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -36,6 +36,8 @@ $export_type=GETPOST('export_type', 'alpha');
$file=GETPOST('zipfilename_template', 'alpha');
$compression = GETPOST('compression');
+$file = dol_sanitizeFileName($file);
+
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
$page = GETPOST("page", 'int');
@@ -57,10 +59,11 @@ $errormsg='';
if ($action == 'delete')
{
- $file=$conf->admin->dir_output.'/'.GETPOST('urlfile');
- $ret=dol_delete_file($file, 1);
- if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
- else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+ $filerelative = dol_sanitizeFileName(GETPOST('urlfile', 'alpha'));
+ $filepath=$conf->admin->dir_output.'/'.$filerelative;
+ $ret=dol_delete_file($filepath, 1);
+ if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filerelative), null, 'mesgs');
+ else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filerelative), null, 'errors');
$action='';
}
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 987f965576a..d508afe63d2 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -255,7 +255,7 @@ if ($result)
//print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index b1e8c310ed0..806f53c463c 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -171,13 +171,13 @@ foreach($workflowcodes as $key => $params)
{
if (! empty($conf->global->$key))
{
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 6d7ac9d2f85..ed23151d99b 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -108,13 +108,13 @@ print ''.$langs->trans("ApiProductionMode").' ';
$production_mode=(empty($conf->global->API_PRODUCTION_MODE)?false:true);
if ($production_mode)
{
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -421,7 +421,7 @@ while ($i < min($num, $limit))
$object->id = $obj->rowid;
foreach($object->fields as $key => $val)
{
- if (isset($obj->$key)) $object->$key = $obj->$key;
+ if (property_exists($obj, $key)) $object->$key = $obj->$key;
}
// Show here line of result
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index a1db711dd3e..a4bf134e3ce 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -23,25 +23,12 @@
*/
// Load Dolibarr environment
-$res=0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
-while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
-if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php";
-if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
-if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
-if (! $res) die("Include of main fails");
-
+require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/bom/class/bom.class.php');
-dol_include_once('/bom/lib/bom.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
// Load translation files required by the page
@@ -196,7 +183,7 @@ if ($object->id > 0)
print '
';
$object->info($object->id);
- print dol_print_object_info($object, 1);
+ dol_print_object_info($object, 1);
print '';
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 42dd3ba7d95..0f2dfb5e52b 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -110,8 +110,40 @@ if (empty($reshook))
$autocopy='MAIN_MAIL_AUTOCOPY_BOM_TO';
$trackid='bom'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-}
+ // Add line
+ if ($action == 'addline' && $user->rights->bom->write)
+ {
+ $langs->load('errors');
+ $error = 0;
+
+ // Set if we used free entry or predefined product
+ $idprod=GETPOST('idprod', 'int');
+ $qty=GETPOST('qty', 'int');
+ $efficiency=GETPOST('efficiency', 'int');
+
+ if ($qty == '') {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+ $error++;
+ }
+ if (! ($idprod > 0)) {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Product')), null, 'errors');
+ $error++;
+ }
+
+ $bomline = new BOMLine($db);
+ $bomline->fk_bom = $id;
+ $bomline->fk_product = $idprod;
+ $bomline->qty = $qty;
+ $bomline->efficiency = $efficiency;
+
+ $result = $bomline->create($user);
+ if ($result <= 0)
+ {
+ setEventMessages($bomline->error, $bomline->errors, 'errors');
+ }
+ }
+}
/*
@@ -307,10 +339,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '';
print '
';
print '
';
- print '
'."\n";
+ print ''."\n";
// Common attributes
- //$keyforbreak='fieldkeytoswithonsecondcolumn';
+ $keyforbreak='description';
include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
// Other attributes
@@ -320,11 +352,67 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '';
print '';
- print '
';
dol_fiche_end();
+
+ /*
+ * Lines
+ */
+
+ if (! empty($object->table_element_line))
+ {
+ // Show object lines
+ $result = $object->getLinesArray();
+
+ print ' \n";
+ }
+
+
+
// Buttons for actions
if ($action != 'presend' && $action != 'editline') {
print ''."\n";
@@ -335,7 +423,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if (empty($reshook))
{
// Send
- print '
' . $langs->trans('SendMail') . ' '."\n";
+ //print '
' . $langs->trans('SendMail') . ' '."\n";
// Modify
if ($user->rights->bom->write)
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 197b9779988..012094fbb05 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -68,8 +68,8 @@ $extralabels = $extrafields->fetch_name_optionals_label('bom');
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/bom/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/bom/" . dol_sanitizeFileName($object->ref);
+//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity?$object->entity:1] . "/bom/" . dol_sanitizeFileName($object->id);
+if ($id > 0 || ! empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity?$object->entity:1] . "/bom/" . dol_sanitizeFileName($object->ref);
/*
@@ -117,7 +117,7 @@ if ($object->id)
print '
';
print '
';
- print '
';
+ print '';
// Number of files
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' ';
foreach($object->fields as $key => $val)
{
- $cssforfield='';
- if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
- if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield.=($cssforfield?' ':'').'right';
- if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
- if (! empty($arrayfields['t.'.$key]['checked'])) print '';
+ if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 0, 0, 0, '', 'maxwidth75');
+ else print ' ';
+ }
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -387,7 +393,7 @@ $parameters=array('arrayfields'=>$arrayfields);
$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print '';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -399,11 +405,11 @@ print ''."\n";
print '';
foreach($object->fields as $key => $val)
{
- $cssforfield='';
- if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
- if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield.=($cssforfield?' ':'').'right';
+ $cssforfield=(empty($val['css'])?'':$val['css']);
if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
+ elseif (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
+ elseif (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+ elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield.=($cssforfield?' ':'').'right';
if (! empty($arrayfields['t.'.$key]['checked']))
{
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield?'class="'.$cssforfield.'"':''), $sortfield, $sortorder, ($cssforfield?$cssforfield.' ':''))."\n";
@@ -444,31 +450,23 @@ while ($i < min($num, $limit))
$object->id = $obj->rowid;
foreach($object->fields as $key => $val)
{
- if (isset($obj->$key)) $object->$key = $obj->$key;
+ if (property_exists($obj, $key)) $object->$key = $obj->$key;
}
// Show here line of result
print ' ';
foreach($object->fields as $key => $val)
{
- $cssforfield='';
- if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
- elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
-
- if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+ $cssforfield=(empty($val['css'])?'':$val['css']);
+ if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
-
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield.=($cssforfield?' ':'').'right';
+ elseif (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
+ elseif (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+ elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield.=($cssforfield?' ':'').'right';
if (! empty($arrayfields['t.'.$key]['checked']))
{
- print '';
+ print '';
if ($key == 'status') print $object->getLibStatut(5);
elseif (in_array($val['type'], array('date','datetime','timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
else print $object->showOutputField($val, $key, $obj->$key, '');
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 9646b5d0d2e..de67cbc82e8 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -16,7 +16,7 @@
*/
/**
- * \file class/bom.class.php
+ * \file bom/class/bom.class.php
* \ingroup bom
* \brief This file is a CRUD class file for BOM (Create/Read/Update/Delete)
*/
@@ -62,7 +62,7 @@ class BOM extends CommonObject
const STATUS_DRAFT = 0;
const STATUS_VALIDATED = 1;
- const STATUS_DISABLED = -1;
+ const STATUS_CANCELED = 9;
/**
@@ -94,18 +94,19 @@ class BOM extends CommonObject
'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1',),
'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
- 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>-1, 'position'=>61, 'notnull'=>-1,),
- 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>-1, 'position'=>62, 'notnull'=>-1,),
- 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
- 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
- 'date_valid' => array('type'=>'datetime', 'label'=>'DateValid', 'enabled'=>1, 'visible'=>-2, 'position'=>502, 'notnull'=>0,),
- 'fk_user_creat' => array('type'=>'integer', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
- 'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
- 'fk_user_valid' => array('type'=>'integer', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>512, 'notnull'=>0,),
- 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>50, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp'),
'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
- 'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Enabled', '-1'=>'Disabled')),
+ 'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLoss'),
+ 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>-1, 'position'=>161, 'notnull'=>-1,),
+ 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>-1, 'position'=>162, 'notnull'=>-1,),
+ 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>300, 'notnull'=>1,),
+ 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
+ 'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502, 'notnull'=>0,),
+ 'fk_user_creat' => array('type'=>'integer', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
+ 'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
+ 'fk_user_valid' => array('type'=>'integer', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>512, 'notnull'=>0,),
+ 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900, 'notnull'=>-1,),
+ 'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Enabled', 9=>'Disabled')),
);
public $rowid;
public $ref;
@@ -121,6 +122,7 @@ class BOM extends CommonObject
public $status;
public $fk_product;
public $qty;
+ public $efficiency;
// END MODULEBUILDER PROPERTIES
@@ -758,8 +760,9 @@ class BOM extends CommonObject
{
global $langs;
//$langs->load("mrp");
- $this->labelstatus[1] = $langs->trans('Enabled');
- $this->labelstatus[0] = $langs->trans('Disabled');
+ $this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+ $this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+ $this->labelstatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
}
if ($mode == 0)
@@ -772,28 +775,23 @@ class BOM extends CommonObject
}
elseif ($mode == 2)
{
- if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
- elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ return img_picto($this->labelstatus[$status], 'statut'.$status, '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
}
elseif ($mode == 3)
{
- if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+ return img_picto($this->labelstatus[$status], 'statut'.$status, '', false, 0, 0, '', 'valignmiddle');
}
elseif ($mode == 4)
{
- if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
- elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ return img_picto($this->labelstatus[$status], 'statut'.$status, '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
}
elseif ($mode == 5)
{
- if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+ return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut'.$status, '', false, 0, 0, '', 'valignmiddle');
}
elseif ($mode == 6)
{
- if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
- elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+ return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut'.$status, '', false, 0, 0, '', 'valignmiddle');
}
}
@@ -850,6 +848,31 @@ class BOM extends CommonObject
}
}
+ /**
+ * Create an array of lines
+ *
+ * @return array|int array of lines if OK, <0 if KO
+ */
+ public function getLinesArray()
+ {
+ $this->lines=array();
+
+ $objectline = new BOMLine($this->db);
+ $result = $objectline->fetchAll('', '', 0, 0, array('fk_bom'=>$this->id));
+
+ if (is_numeric($result))
+ {
+ $this->error = $this->error;
+ $this->errors = $this->errors;
+ return $result;
+ }
+ else
+ {
+ $this->lines = $result;
+ return $this->lines();
+ }
+ }
+
/**
* Initialise object with example values
* Id must be 0 if object instance is a specimen
@@ -923,7 +946,7 @@ class BOMLine extends CommonObject
/**
* @var string String with name of icon for bomline. Must be the part after the 'object_' into object_bomline.png
*/
- public $picto = 'bomline@bom';
+ public $picto = 'bomline';
/**
@@ -951,20 +974,22 @@ class BOMLine extends CommonObject
*/
public $fields=array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+ 'fk_bom' => array('type'=>'integer:BillOfMaterials:societe/class/bom.class.php', 'label'=>'BillOfMaterials', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1,),
+ 'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
+ 'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'notnull'=>1, 'isameasure'=>'1',),
+ 'efficiency' => array('type'=>'double(8,4)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLoss'),
+ 'rank' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'position'=>200, 'notnull'=>1,),
'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
- 'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>-1, 'isameasure'=>'1',),
- 'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>20, 'notnull'=>-1, 'index'=>1,),
- 'fk_bom' => array('type'=>'integer:BillOfMaterials:societe/class/bom.class.php', 'label'=>'BillOfMaterials', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>-1, 'index'=>1,),
- 'rank' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'position'=>40, 'notnull'=>1,),
);
public $rowid;
- public $description;
- public $import_key;
- public $qty;
- public $fk_product;
public $fk_bom;
+ public $fk_product;
+ public $description;
+ public $qty;
+ public $efficiency;
public $rank;
+ public $import_key;
// END MODULEBUILDER PROPERTIES
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
new file mode 100644
index 00000000000..a2aabaeb81b
--- /dev/null
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -0,0 +1,189 @@
+
+ * Copyright (C) 2010-2014 Laurent Destailleur
+ * Copyright (C) 2012-2013 Christophe Battarel
+ * Copyright (C) 2012 Cédric Salvador
+ * Copyright (C) 2014 Florian Henry
+ * Copyright (C) 2014 Raphaël Doursenaud
+ * Copyright (C) 2015-2016 Marcos García
+ * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018 Ferran Marcet
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ global->MAIN_VIEW_LINE_NUMBER)) { ?>
+
+
trans('AddNewLine'); ?> trans("FreeZone"); ?>
+
+ trans('Qty'); ?>
+ global->PRODUCT_USE_UNITS)
+ {
+ print '';
+ print '';
+ print $langs->trans('Unit');
+ print ' ';
+ }
+ ?>
+ trans('ManufacturingEfficiency'); ?>
+
+
+
+
+global->MAIN_VIEW_LINE_NUMBER)) {
+ $coldisplay++;
+ echo '
+
+ product->enabled) || ! empty($conf->service->enabled))
+ {
+ if ($forceall >= 0 && $freelines) echo '';
+
+ $filtertype='';
+ if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
+
+ if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
+ {
+ // hide products in closed warehouse, but show products for internal transfer
+ $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
+ }
+ else
+ {
+ $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
+ }
+
+ echo ' ';
+ }
+
+ $coldisplay++;
+ ?>
+ ';
+ print $form->selectUnits($line->fk_unit, "units");
+ print ' ';
+ }
+ $remise_percent = $buyer->remise_percent;
+ if($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')
+ {
+ $remise_percent = $seller->remise_supplier_percent;
+ }
+
+ $coldisplay++;
+ ?>
+
+
+
+
+showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+}
+?>
+
+
+
+
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
new file mode 100644
index 00000000000..3763b771854
--- /dev/null
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -0,0 +1,325 @@
+
+ * Copyright (C) 2010-2012 Laurent Destailleur
+ * Copyright (C) 2012 Christophe Battarel
+ * Copyright (C) 2012 Cédric Salvador
+ * Copyright (C) 2012-2014 Raphaël Doursenaud
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2018 Frédéric France
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ global->MAIN_VIEW_LINE_NUMBER)) { ?>
+
+
+
+
+ product_type==1) echo img_object($langs->trans('ShowService'), 'service');
+ else print img_object($langs->trans('ShowProduct'), 'product');
+ echo ' '.$line->ref;
+ ?>
+
+ product_label);
+ ?>
+
+
+
+ element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines
+ {
+ $coldisplay++;
+ ?>
+ ' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . ' ';
+ } else {
+ print '
+ info_bits & 2) != 2) {
+ // I comment this because it shows info even when not required
+ // for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
+ // must also not be output for most entities (proposal, intervention, ...)
+ //if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
+ print '
+
+ global->PRODUCT_USE_UNITS)
+ {
+ $coldisplay++;
+ print '';
+ print $form->selectUnits($line->fk_unit, "units");
+ print ' ';
+ }
+ ?>
+
+
+ info_bits & 2) != 2) {
+ print '
+
+
+
+
+
+
+showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+}
+?>
+
+service->enabled) && $line->product_type == 1 && $dateSelector) { ?>
+
+ global->MAIN_VIEW_LINE_NUMBER)) { ?>
+ trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
+ global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
+ print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0);
+ print ' '.$langs->trans('to').' ';
+ print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end?0:1, "updateline", 1, 0);
+ print ''
+ ?>
+
+
+
+
+
+
+
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
new file mode 100644
index 00000000000..46c25e3674c
--- /dev/null
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -0,0 +1,330 @@
+
+ * Copyright (C) 2010-2011 Laurent Destailleur
+ * Copyright (C) 2012-2013 Christophe Battarel
+ * Copyright (C) 2012 Cédric Salvador
+ * Copyright (C) 2012-2014 Raphaël Doursenaud
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2017 Juanjo Menent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see >
+ global->MAIN_VIEW_LINE_NUMBER)) { ?>
+
+ info_bits & 2) == 2) {
+ ?>
+
+ trans("ShowReduc"), 'reduc').' ';
+ if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
+ elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+ elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+ //else $txt=$langs->trans("Discount");
+ print $txt;
+ ?>
+
+ description)
+ {
+ if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fetch($line->fk_remise_except);
+ echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
+ }
+ elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fetch($line->fk_remise_except);
+ echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
+ // Add date of deposit
+ if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
+ echo ' ('.dol_print_date($discount->datec).')';
+ }
+ elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fetch($line->fk_remise_except);
+ echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
+ }
+ elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fetch($line->fk_remise_except);
+ echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
+ }
+ else
+ {
+ echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
+ }
+ }
+ }
+ else
+ {
+ $format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
+
+ if ($line->fk_product > 0)
+ {
+ echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+ }
+ else
+ {
+ if ($type==1) $text = img_object($langs->trans('Service'), 'service');
+ else $text = img_object($langs->trans('Product'), 'product');
+
+ if (! empty($line->label)) {
+ $text.= ' '.$line->label.' ';
+ echo $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, '', '', $i, 0, (!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+ } else {
+ if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
+ echo $text.' '.dol_htmlentitiesbr($line->description);
+ }
+ }
+
+ // Show date range
+ if ($line->element == 'facturedetrec') {
+ if ($line->date_start_fill || $line->date_end_fill) echo '';
+ if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
+ if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
+ if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
+ if ($line->date_start_fill || $line->date_end_fill) echo '
';
+ }
+ else {
+ if ($line->date_start || $line->date_end) echo ''.get_date_range($line->date_start, $line->date_end, $format).'
';
+ //echo get_date_range($line->date_start, $line->date_end, $format);
+ }
+
+ // Add description in form
+ if ($line->fk_product > 0 && ! empty($conf->global->PRODUIT_DESC_IN_FORM))
+ {
+ print (! empty($line->description) && $line->description!=$line->product_label)?'
' . $langs->trans('AccountingAffectation') . ' : ' . $accountingaccount->getNomUrl(0, 1, 1);
+ }
+
+ ?>
+ ref_fourn?$line->ref_fourn:$line->ref_supplier);
+ ?>
+
+ tva_tx)) $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
+ if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
+ if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
+ if (empty($positiverates)) $positiverates='0';
+ echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
+ //echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
+ ?>
+
+ subprice); ?>
+
+ multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
+ multicurrency_subprice); ?>
+
+
+
+ pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?>
+
+
+
+ info_bits & 2) != 2) && $line->special_code != 3) {
+ // I comment this because it shows info even when not required
+ // for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
+ // must also not be output for most entities (proposal, intervention, ...)
+ //if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
+ echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
+ } else echo ' ';
+ ?>
+
+
+ global->PRODUCT_USE_UNITS)
+ {
+ print '';
+ $label = $line->getLabelOfUnit('short');
+ if ($label !== '') {
+ print $langs->trans($label);
+ }
+ print ' ';
+ }
+ ?>
+
+ remise_percent) && $line->special_code != 3) { ?>
+ remise_percent, $langs);
+ ?>
+
+
+ global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+
+ ?>
+
+ special_code == 3) { ?>
+ trans('Option'); ?>
+
+ global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ print 'country_code).'='.price($line->total_ht);
+ print ' ';
+ }
+ ?>
+
+ multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
+ multicurrency_total_ht); ?>
+
+
+
+ total_ttc); ?>
+
+
+
+ statut == 0 && ($object_rights->creer) && $action != 'selectlines' ) { ?>
+
+ info_bits & 2) == 2 || ! empty($disableedit)) { ?>
+
+ id.'#line_'.$line->id; ?>">
+
+
+
+
+
+
+ fk_prev_id == null ) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
+ print 'id . '">';
+ print img_delete();
+ print ' ';
+ }
+ ?>
+
+
+ 1 && $conf->browser->layout != 'phone' && empty($disablemove)) { ?>
+
+ 0) { ?>
+ id; ?>">
+
+
+
+
+ id; ?>">
+
+
+
+
+
+ browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown center"':' class="linecolmove center"'); ?>>
+
+
+
+
+showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+}
+?>
+
+
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 4fcb7450e9d..cdba572f96c 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -121,7 +121,7 @@ print " \n";
print ''.$langs->trans("CashDeskThirdPartyForSell").' ';
print '';
-print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY, 'socid', 's.client in (1,3) AND s.status = 1', 1, 0, 0, array(), 0);
+print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY, 'socid', '(s.client in (1,3) AND s.status = 1)', 1, 0, 0, array(), 0);
print ' ';
$disabled=0;
$langs->load("companies");
if (! empty($conf->global->CASHDESK_ID_THIRDPARTY)) $disabled=1; // If a particular third party is defined, we disable choice
-print $form->select_company(GETPOST('socid', 'int')?GETPOST('socid', 'int'):$conf->global->CASHDESK_ID_THIRDPARTY, 'socid', 's.client in (1,3) AND s.status = 1', !$disabled, $disabled, 1);
+print $form->select_company(GETPOST('socid', 'int')?GETPOST('socid', 'int'):$conf->global->CASHDESK_ID_THIRDPARTY, 'socid', '(s.client IN (1,3) AND s.status = 1)', !$disabled, $disabled, 1);
//print ' ';
print "\n";
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index d65a39fc6aa..bc8bb1bcaed 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -78,7 +78,7 @@ print '