' . $langs->trans("EndProcessing") . '
';
- //} else {
- // setEventMessages($langs->trans("NoRecordSelected"), null, 'warnings');
}
}
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 77a97b86322..1ec89dfc9cc 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -161,8 +161,6 @@ if ($massaction == 'ventil') {
}
$msg.='';
$msg.= '' . $langs->trans("EndProcessing") . '
';
- //} else {
- // setEventMessages($langs->trans("NoRecordSelected"), null, 'warnings');
}
}
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 6e709835f42..7063f7fd53e 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -996,7 +996,7 @@ if (empty($action) || $action == 'view') {
if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
- print '' . $langs->trans("EndProcessing") . '
';
- //} else {
- // setEventMessages($langs->trans("NoRecordSelected"), null, 'warnings');
}
}
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index 87190bef2fe..9c6f657d5e0 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -26,17 +26,12 @@ if (empty($conf) || ! is_object($conf))
$contact = $GLOBALS['objcanvas']->control->object;
-?>
+echo "\n";
+echo $this->control->tpl['showhead'];
-
-control->tpl['showhead']; ?>
-
-control->tpl['error'], $this->control->tpl['errors']);
-?>
-
-control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user']; ?>
-control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?>
+if (! empty($this->control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user'];
+if (! empty($this->control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?>
+if (empty($user->societe_id)) {
+ echo '
-
';
+}
echo $this->control->tpl['actionstodo'];
echo $this->control->tpl['actionsdone'];
-?>
-
+echo "\n";
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 06053127c9a..0f2cfc52840 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -866,18 +866,18 @@ else
$object->country_code=$tmparray['code'];
$object->country=$tmparray['label'];
}
-
- if (!empty($socid)) {
-$object = new Societe($db);
-if ($socid > 0) $object->fetch($socid);
-if (! ($object->id > 0))
-{
- $langs->load("errors");
- print($langs->trans('ErrorRecordNotFound'));
- exit;
-}
- }
+ if (!empty($socid)) {
+ $object = new Societe($db);
+ if ($socid > 0) $object->fetch($socid);
+
+ if (! ($object->id > 0))
+ {
+ $langs->load("errors");
+ print($langs->trans('ErrorRecordNotFound'));
+ exit;
+ }
+ }
$adht = new AdherentType($db);
@@ -1679,14 +1679,14 @@ if (! ($object->id > 0))
else
{
if ($object->need_subscription == 0)
- {
- print $langs->trans("SubscriptionNotNeeded");
+ {
+ print $langs->trans("SubscriptionNotNeeded");
}
- elseif (! $adht->subscription)
+ elseif (! $adht->subscription)
{
print $langs->trans("SubscriptionNotRecorded");
if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
- }
+ }
else
{
print $langs->trans("SubscriptionNotReceived");
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index e9bd50de0ff..fbc62083b97 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2471,7 +2471,7 @@ class Adherent extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
- /**
+ /**
* Initialise tableau info (tableau des attributs LDAP)
*
* @return array Tableau info des attributs
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 94df4b10ba0..b4bdb119b29 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -88,8 +88,8 @@ class AdherentType extends CommonObject
/** @var array Array of members */
public $members=array();
-
- public $multilangs=array();
+
+ public $multilangs=array();
/**
@@ -129,9 +129,9 @@ class AdherentType extends CommonObject
$this->description = $obj->description;
$this->email = $obj->email;
}
- $this->multilangs["$obj->lang"]["label"] = $obj->label;
- $this->multilangs["$obj->lang"]["description"] = $obj->description;
- $this->multilangs["$obj->lang"]["email"] = $obj->email;
+ $this->multilangs["$obj->lang"]["label"] = $obj->label;
+ $this->multilangs["$obj->lang"]["description"] = $obj->description;
+ $this->multilangs["$obj->lang"]["email"] = $obj->email;
}
return 1;
}
@@ -141,7 +141,7 @@ class AdherentType extends CommonObject
return -1;
}
}
-
+
/**
* Update or add a translation for a product
*
@@ -248,7 +248,7 @@ class AdherentType extends CommonObject
return 1;
}
-
+
/**
* Delete a language for this product
*
@@ -361,7 +361,7 @@ class AdherentType extends CommonObject
*/
public function update($user, $notrigger = 0)
{
- global $langs, $conf, $hookmanager;
+ global $langs, $conf, $hookmanager;
$error=0;
@@ -383,16 +383,16 @@ class AdherentType extends CommonObject
$result = $this->db->query($sql);
if ($result)
{
- $this->description = $this->db->escape($this->note);
+ $this->description = $this->db->escape($this->note);
- // Multilangs
- if (! empty($conf->global->MAIN_MULTILANGS)) {
- if ($this->setMultiLangs($user) < 0) {
- $this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;
- return -2;
- }
+ // Multilangs
+ if (! empty($conf->global->MAIN_MULTILANGS)) {
+ if ($this->setMultiLangs($user) < 0) {
+ $this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+ return -2;
}
-
+ }
+
$action='update';
// Actions on extra fields
@@ -474,8 +474,8 @@ class AdherentType extends CommonObject
*/
public function fetch($rowid)
{
- global $langs, $conf;
-
+ global $langs, $conf;
+
$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut, d.subscription, d.mail_valid, d.note, d.vote";
$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
$sql .= " WHERE d.rowid = ".(int) $rowid;
@@ -498,11 +498,11 @@ class AdherentType extends CommonObject
$this->mail_valid = $obj->mail_valid;
$this->note = $obj->note;
$this->vote = $obj->vote;
-
- // multilangs
- if (! empty($conf->global->MAIN_MULTILANGS)) {
- $this->getMultiLangs();
- }
+
+ // multilangs
+ if (! empty($conf->global->MAIN_MULTILANGS)) {
+ $this->getMultiLangs();
+ }
}
return 1;
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 8e2ec3ba730..accf7de07b6 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -24,11 +24,7 @@ if (empty($conf) || ! is_object($conf))
exit;
}
-?>
-
-
-
-\n";
global $user;
@@ -39,22 +35,20 @@ $langs->load("members");
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
-?>
-
- trans("Subscription"); ?>
- getNomUrl(1); ?>
- dateh, 'day'); ?>
- ';
+ echo ' '.$langs->trans("Subscription").' ';
+ echo ''.$objectlink->getNomUrl(1).' ';
+ echo ''.dol_print_date($objectlink->dateh, 'day').' ';
+ echo '';
if ($user->rights->adherent->lire) {
$total = $total + $objectlink->amount;
echo price($objectlink->amount);
- } ?>
- ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
-';
+ echo '
';
+ echo '
'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' ';
+ echo '';
}
-?>
-
+echo "\n";
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 2848ed4119e..94978e7f8a9 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -523,14 +523,14 @@ if ($rowid > 0)
{
$sql.= natural_search("d.email", $search_email);
}
- if ($filter == 'uptodate')
- {
- $sql.=" AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
- }
- if ($filter == 'outofdate')
- {
- $sql.=" AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
- }
+ if ($filter == 'uptodate')
+ {
+ $sql.=" AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
+ }
+ if ($filter == 'outofdate')
+ {
+ $sql.=" AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
+ }
$sql.= " ".$db->order($sortfield, $sortorder);
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 5122bebcecf..ac9a269bf29 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -295,7 +295,7 @@ if ($action == 'add' && $user->rights->adherent->configurer)
print '
';
print ''.$langs->trans('Language').' ';
- print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
+ print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
print ' '.$langs->trans('Label').' '.$langs->trans('Description').' ';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 3caa3418af5..beccc9e9d5a 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -268,17 +268,17 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
// Active
if (in_array($name, $def))
{
- print ' '."\n";
- if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
- {
- print 'scandir.'&label='.urlencode($module->name).'&type=action">';
- print img_picto($langs->trans("Enabled"), 'switch_on');
- print ' ';
- }
- else
- {
- print img_picto($langs->trans("Enabled"), 'switch_on');
- }
+ print ' '."\n";
+ if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
+ {
+ print 'scandir.'&label='.urlencode($module->name).'&type=action">';
+ print img_picto($langs->trans("Enabled"), 'switch_on');
+ print ' ';
+ }
+ else
+ {
+ print img_picto($langs->trans("Enabled"), 'switch_on');
+ }
print " ";
}
else
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index b6c9a5dec9a..57031a9822f 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -96,29 +96,29 @@ elseif ($action == 'updateengine')
$resql=$db->query($sql);
if ($resql)
{
- $num = $db->num_rows($resql);
- $i = 0;
+ $num = $db->num_rows($resql);
+ $i = 0;
- while ($i < $num)
- {
- $obj = $db->fetch_object($resql);
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($resql);
- if (GETPOST('coder'.$obj->rowid, 'alpha'))
- {
- $coder = GETPOST('coder'.$obj->rowid, 'alpha');
- $code_id = $obj->rowid;
+ if (GETPOST('coder'.$obj->rowid, 'alpha'))
+ {
+ $coder = GETPOST('coder'.$obj->rowid, 'alpha');
+ $code_id = $obj->rowid;
- $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
- $sqlp.= " SET coder = '" . $coder."'";
- $sqlp.= " WHERE rowid = ". $code_id;
- $sqlp.= " AND entity = ".$conf->entity;
+ $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
+ $sqlp.= " SET coder = '" . $coder."'";
+ $sqlp.= " WHERE rowid = ". $code_id;
+ $sqlp.= " AND entity = ".$conf->entity;
- $upsql=$db->query($sqlp);
- if (! $upsql) dol_print_error($db);
- }
+ $upsql=$db->query($sqlp);
+ if (! $upsql) dol_print_error($db);
+ }
- $i++;
- }
+ $i++;
+ }
}
}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 5bf01de1053..26ea1b12a29 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -430,7 +430,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
}
print '';
- // Info
+ // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='
-
-
-
+ ';
+ print '';
- ';
- print '
';
+ print '';
+ print '
';
- ?>
+ ?>
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index db9efb0e5c7..a0f817a40c1 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -467,7 +467,7 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
+ // Info
$htmltooltip = $langs->trans("Name").': '.$module->name;
$htmltooltip.=''.$langs->trans("DoTestSend").' ';
+ print ''.$langs->trans("DoTestSend").' ';
}
else
{
- print ''.$langs->trans("DoTestSend").' ';
+ print ''.$langs->trans("DoTestSend").' ';
}
print ' ';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 42daea12861..51bf959bb72 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -113,12 +113,12 @@ print ''.$langs->trans("DeStockOnBill").' ';
print '';
if (! empty($conf->facture->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_BILL');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_BILL');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
+ }
}
else
{
@@ -133,12 +133,12 @@ print ' '.$langs->trans("DeStockOnValidateOrder").' ';
print '';
if (! empty($conf->commande->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_VALIDATE_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_VALIDATE_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
+ }
}
else
{
@@ -155,12 +155,12 @@ print ' '.$langs->trans("DeStockOnShipment").' ';
print '';
if (! empty($conf->expedition->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
+ }
}
else
{
@@ -175,12 +175,12 @@ print ' '.$langs->trans("DeStockOnShipmentOnClosing").' ';
print '';
if (! empty($conf->expedition->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
+ }
}
else
{
@@ -215,12 +215,12 @@ print ' '.$langs->trans("ReStockOnBill").' ';
print '';
if (! empty($conf->fournisseur->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_BILL');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_BILL');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
+ }
}
else
{
@@ -236,12 +236,12 @@ print ' '.$langs->trans("ReStockOnValidateOrder").' ';
print '';
if (! empty($conf->fournisseur->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
+ }
}
else
{
@@ -254,29 +254,29 @@ if (!empty($conf->reception->enabled))
{
print ' ';
print ''.$langs->trans("StockOnReception").' ';
- print '';
+ print ' ';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION);
+ }
print " \n \n";
$found++;
-print '';
+ print ' ';
print ''.$langs->trans("StockOnReceptionOnClosing").' ';
- print '';
+ print ' ';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE);
+ }
print " \n \n";
$found++;
}
@@ -284,15 +284,15 @@ else
{
print '';
print ''.$langs->trans("ReStockOnDispatchOrder").' ';
- print '';
+ print ' ';
if (! empty($conf->fournisseur->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
+ }
}
else
{
@@ -338,28 +338,28 @@ if($conf->invoice->enabled)
{
print ' ';
print ''.$langs->trans("StockMustBeEnoughForInvoice").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_INVOICE", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE);
-}
- print " \n";
- print " \n";
+ print '';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_INVOICE", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE);
+ }
+ print " \n";
+ print "\n";
}
if($conf->order->enabled)
{
print '';
print ''.$langs->trans("StockMustBeEnoughForOrder").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_ORDER", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER);
-}
+ print ' ';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_ORDER", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER);
+ }
print " \n";
print " \n";
}
@@ -368,13 +368,13 @@ if($conf->expedition->enabled)
{
print '';
print ''.$langs->trans("StockMustBeEnoughForShipment").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT);
-}
+ print ' ';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT);
+ }
print " \n";
print " \n";
}
@@ -383,27 +383,30 @@ print '
';
print '
';
$virtualdiffersfromphysical=0;
-if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
- || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
- ) $virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs.
+if (
+ ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
+ || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
+) {
+ $virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs.
+}
if ($virtualdiffersfromphysical)
{
-print '
';
-print '';
+ print '';
+ print '';
print "".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))." \n";
- print ''.$langs->trans("Status").' '."\n";
+ print ''.$langs->trans("Status").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("UseVirtualStockByDefault").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_USE_VIRTUAL_STOCK", $arrval, $conf->global->STOCK_USE_VIRTUAL_STOCK);
-}
+ print ' ';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_USE_VIRTUAL_STOCK", $arrval, $conf->global->STOCK_USE_VIRTUAL_STOCK);
+ }
print " \n";
print " \n";
print '
';
@@ -504,7 +507,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
print $form->selectarray("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT", $arrval, $conf->global->INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT);
}
print ' ';
-
print '
';
}
@@ -512,8 +514,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
If not used by a module, I still need to understand in which case user may need this now we can set rule on product page.
if ($conf->global->PRODUIT_SOUSPRODUITS)
{
-
-
print '
';
print ''.$langs->trans("IndependantSubProductStock").' ';
print '';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 6369efb1361..c2a7a5d4077 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -413,8 +413,8 @@ foreach ($dirmodels as $reldir)
print " \n";
require_once $dir.$file;
$module = new $classname($db, $specimenthirdparty);
- if (method_exists($module, 'info')) print $module->info($langs);
- else print $module->description;
+ if (method_exists($module, 'info')) print $module->info($langs);
+ else print $module->description;
print " \n";
// Active
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index bd2cb10a3ad..30a85f2af3b 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -433,7 +433,7 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
+ // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='';
- print '
';
+ print '';
+ print '
';
print '';
print ''.$langs->trans("TableName").' ';
print ''.$langs->trans("NbOfRecord").' ';
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index d08eb564f17..928b193b1ee 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -94,10 +94,10 @@ if ($db->type == 'pgsql')
{
// Check option standard_conforming_strings is on
$paramarray=$db->getServerParametersValues('standard_conforming_strings');
-// if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
-// {
-// $langs->load("errors");
-// }
+ // if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
+ // {
+ // $langs->load("errors");
+ // }
}
print ' ';
print '';
-?>
-
-
-
-
- trans("FileNameToGenerate"); ?> '.$langs->trans("FileNameToGenerate").' ';
+print ''.$val['label'].' ';
}
- else // Disabled export format
+ else
{
+ // Disabled export format
print ''.$val['label'].' ';
print ' ('.$langs->trans("NotAvailable").')';
@@ -451,20 +468,18 @@ foreach($compression as $key => $val)
print '';
print "\n";
-?>
+print " \n";
+print '';
+print '
';
+print '
';
+print '
';
+print '
';
-
-
- '.$langs->trans("RunCommandSummary").': '.$langs->trans("RunCommandSummary").':
+print "
';
-
-?>
-
-
-
+print '
';
+print '
';
-admin->dir_output.'/backup', 'files', 0, '', '', $sortfield, (strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC), 1);
$result=$formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'backup/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousDumpFiles"));
print '
';
+print '
';
+print '';
+print '';
-
-
MySQL (mysql)
-
+ ?>
PostgreSQL Restore (pg_restore or psql)
- trans("RestoreDesc3", $dolibarr_main_db_name).'
- trans('RestoreMySQL') ?>
- ';
+ print ' ';
}
elseif (in_array($type, array('pgsql')))
{
-?>
-
- Restore PostgreSQL
-
+print '';
-
-
+print '
';
+print '';
-close();
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 7db64a8a3ed..1fedf9e40de 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -37,8 +37,8 @@ $confirm=GETPOST('confirm', 'alpha');
// Security check
if ($user->societe_id > 0)
{
- $action = '';
- $socid = $user->societe_id;
+ $action = '';
+ $socid = $user->societe_id;
}
$sortfield = GETPOST("sortfield", 'alpha');
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 3c99e3e10b8..f991bb5752e 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -97,9 +97,9 @@ if (! empty($conf->syslog->enabled))
$filelogparam=$filelog;
if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
{
- $filelogparam ='
'.$filelog.' ';
+ $filelogparam ='
'.$filelog.' ';
}
print '> '.$langs->trans("PurgeDeleteLogFile", $filelogparam);
print '
';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index ba6c3660bcd..1b4c59505db 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -288,9 +288,9 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
- $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
- $htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+ // Info
+ $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+ $htmltooltip.= '
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
if ($module->type == 'pdf')
{
$htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 190391b462b..bd8ae3d5e92 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -235,7 +235,7 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
+ // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
if ($module->type == 'pdf')
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 42fec36ef6a..0277630ae78 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -77,23 +77,23 @@ class FormCron extends Form
$out.='';
}
} else {
- $out='
';
+ $out='
';
- if ($selected=='command') {
- $selected_attr=' selected ';
- } else {
- $selected_attr='';
- }
- $out.= '
'.$langs->trans('CronType_command').' ';
+ if ($selected=='command') {
+ $selected_attr=' selected ';
+ } else {
+ $selected_attr='';
+ }
+ $out.= '
'.$langs->trans('CronType_command').' ';
- if ($selected=='method') {
- $selected_attr=' selected ';
- } else {
- $selected_attr='';
- }
- $out.= '
'.$langs->trans('CronType_method').' ';
+ if ($selected=='method') {
+ $selected_attr=' selected ';
+ } else {
+ $selected_attr='';
+ }
+ $out.= '
'.$langs->trans('CronType_method').' ';
- $out.='';
+ $out.='';
}
return $out;
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 4ac7fb6e716..970d4841fbf 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -660,20 +660,20 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
{
// Copy some files
$filetogenerate = array(
- 'myobject_card.php'=>strtolower($objectname).'_card.php',
- 'myobject_note.php'=>strtolower($objectname).'_note.php',
- 'myobject_document.php'=>strtolower($objectname).'_document.php',
- 'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
- 'myobject_list.php'=>strtolower($objectname).'_list.php',
- 'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
- //'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
- 'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
- 'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
- 'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
- //'scripts/mymodule.php'=>'scripts/'.strtolower($objectname).'.php',
- 'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
- 'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
- //'class/api_mymodule.class.php'=>'class/api_'.strtolower($module).'.class.php'
+ 'myobject_card.php'=>strtolower($objectname).'_card.php',
+ 'myobject_note.php'=>strtolower($objectname).'_note.php',
+ 'myobject_document.php'=>strtolower($objectname).'_document.php',
+ 'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
+ 'myobject_list.php'=>strtolower($objectname).'_list.php',
+ 'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
+ //'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
+ 'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
+ 'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
+ 'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
+ //'scripts/mymodule.php'=>'scripts/'.strtolower($objectname).'.php',
+ 'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+ 'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+ //'class/api_mymodule.class.php'=>'class/api_'.strtolower($module).'.class.php',
);
foreach($filetogenerate as $srcfile => $destfile)
@@ -696,68 +696,81 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
//if (! $error) // If there is error copying 1 file, we still have to make the replacement
//{
- // Scan for object class files
- $listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');
+ // Scan for object class files
+ $listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');
- $firstobjectname='';
- foreach($listofobject as $fileobj)
+ $firstobjectname='';
+ foreach($listofobject as $fileobj)
+ {
+ if (preg_match('/^api_/', $fileobj['name'])) continue;
+ if (preg_match('/^actions_/', $fileobj['name'])) continue;
+
+ $tmpcontent=file_get_contents($fileobj['fullname']);
+ $reg=array();
+ if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg))
{
- if (preg_match('/^api_/', $fileobj['name'])) continue;
- if (preg_match('/^actions_/', $fileobj['name'])) continue;
-
- $tmpcontent=file_get_contents($fileobj['fullname']);
- $reg=array();
- if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg))
- {
- $objectnameloop = $reg[1];
- if (empty($firstobjectname)) $firstobjectname = $objectnameloop;
- }
-
- // Regenerate left menu entry in descriptor for $objectname
- $stringtoadd="
-\t\t\$this->menu[\$r++]=array(
- 'fk_menu'=>'fk_mainmenu=mymodule', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Left menu entry
- 'titre'=>'List MyObject',
- 'mainmenu'=>'mymodule',
- 'leftmenu'=>'mymodule_myobject',
- 'url'=>'/mymodule/myobject_list.php',
- 'langs'=>'mymodule@mymodule', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1100+\$r,
- 'enabled'=>'\$conf->mymodule->enabled', // Define condition to show or hide menu entry. Use '\$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '\$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'1', // Use 'perms'=>'\$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
-\t\t\$this->menu[\$r++]=array(
- 'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=mymodule_myobject', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Left menu entry
- 'titre'=>'New MyObject',
- 'mainmenu'=>'mymodule',
- 'leftmenu'=>'mymodule_myobject',
- 'url'=>'/mymodule/myobject_card.php?action=create',
- 'langs'=>'mymodule@mymodule', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1100+\$r,
- 'enabled'=>'\$conf->mymodule->enabled', // Define condition to show or hide menu entry. Use '\$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '\$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'1', // Use 'perms'=>'\$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
- ";
- $stringtoadd = preg_replace('/MyObject/', $objectnameloop, $stringtoadd);
- $stringtoadd = preg_replace('/mymodule/', strtolower($module), $stringtoadd);
- $stringtoadd = preg_replace('/myobject/', strtolower($objectnameloop), $stringtoadd);
-
- $moduledescriptorfile=$destdir.'/core/modules/mod'.$module.'.class.php';
-
- // TODO Allow a replace with regex using dolReplaceInFile with param arryreplacementisregex to 1
- // TODO Avoid duplicate addition
-
- dolReplaceInFile($moduledescriptorfile, array('END MODULEBUILDER LEFTMENU MYOBJECT */' => '*/'."\n".$stringtoadd."\n\t\t/* END MODULEBUILDER LEFTMENU MYOBJECT */"));
-
- // Add module descriptor to list of files to replace "MyObject' string with real name of object.
- $filetogenerate[]='core/modules/mod'.$module.'.class.php';
-
- // TODO
+ $objectnameloop = $reg[1];
+ if (empty($firstobjectname)) $firstobjectname = $objectnameloop;
}
+
+ // Regenerate left menu entry in descriptor for $objectname
+ $stringtoadd = "
+ \$this->menu[\$r++]=array(
+ // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'fk_menu'=>'fk_mainmenu=mymodule',
+ // This is a Left menu entry
+ 'type'=>'left',
+ 'titre'=>'List MyObject',
+ 'mainmenu'=>'mymodule',
+ 'leftmenu'=>'mymodule_myobject',
+ 'url'=>'/mymodule/myobject_list.php',
+ // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'langs'=>'mymodule@mymodule',
+ 'position'=>1100+\$r,
+ // Define condition to show or hide menu entry. Use '\$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '\$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'enabled'=>'\$conf->mymodule->enabled',
+ // Use 'perms'=>'\$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+ 'perms'=>'1',
+ 'target'=>'',
+ // 0=Menu for internal users, 1=external users, 2=both
+ 'user'=>2,
+ );
+ \$this->menu[\$r++]=array(
+ // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=mymodule_myobject',
+ // This is a Left menu entry
+ 'type'=>'left',
+ 'titre'=>'New MyObject',
+ 'mainmenu'=>'mymodule',
+ 'leftmenu'=>'mymodule_myobject',
+ 'url'=>'/mymodule/myobject_card.php?action=create',
+ // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'langs'=>'mymodule@mymodule',
+ 'position'=>1100+\$r,
+ // Define condition to show or hide menu entry. Use '\$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '\$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'enabled'=>'\$conf->mymodule->enabled',
+ // Use 'perms'=>'\$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+ 'perms'=>'1',
+ 'target'=>'',
+ // 0=Menu for internal users, 1=external users, 2=both
+ 'user'=>2
+ );\n";
+ $stringtoadd = preg_replace('/MyObject/', $objectnameloop, $stringtoadd);
+ $stringtoadd = preg_replace('/mymodule/', strtolower($module), $stringtoadd);
+ $stringtoadd = preg_replace('/myobject/', strtolower($objectnameloop), $stringtoadd);
+
+ $moduledescriptorfile=$destdir.'/core/modules/mod'.$module.'.class.php';
+
+ // TODO Allow a replace with regex using dolReplaceInFile with param arryreplacementisregex to 1
+ // TODO Avoid duplicate addition
+
+ dolReplaceInFile($moduledescriptorfile, array('END MODULEBUILDER LEFTMENU MYOBJECT */' => '*/'."\n".$stringtoadd."\n\t\t/* END MODULEBUILDER LEFTMENU MYOBJECT */"));
+
+ // Add module descriptor to list of files to replace "MyObject' string with real name of object.
+ $filetogenerate[]='core/modules/mod'.$module.'.class.php';
+
+ // TODO
+ }
//}
}
@@ -888,11 +901,12 @@ if ($dirins && $action == 'addproperty' && !empty($module) && ! empty($tabobj))
if (! $error)
{
$addfieldentry = array(
- 'name'=>GETPOST('propname', 'aZ09'),'label'=>GETPOST('proplabel', 'alpha'),'type'=>GETPOST('proptype', 'alpha'),
- 'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'none'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
- 'visible'=>GETPOST('propvisible', 'int'),'enabled'=>GETPOST('propenabled', 'int'),
- 'position'=>GETPOST('propposition', 'int'),'notnull'=>GETPOST('propnotnull', 'int'),'index'=>GETPOST('propindex', 'int'),'searchall'=>GETPOST('propsearchall', 'int'),
- 'isameasure'=>GETPOST('propisameasure', 'int'), 'comment'=>GETPOST('propcomment', 'alpha'),'help'=>GETPOST('prophelp', 'alpha'));
+ 'name'=>GETPOST('propname', 'aZ09'),'label'=>GETPOST('proplabel', 'alpha'),'type'=>GETPOST('proptype', 'alpha'),
+ 'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'none'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
+ 'visible'=>GETPOST('propvisible', 'int'),'enabled'=>GETPOST('propenabled', 'int'),
+ 'position'=>GETPOST('propposition', 'int'),'notnull'=>GETPOST('propnotnull', 'int'),'index'=>GETPOST('propindex', 'int'),'searchall'=>GETPOST('propsearchall', 'int'),
+ 'isameasure'=>GETPOST('propisameasure', 'int'), 'comment'=>GETPOST('propcomment', 'alpha'),'help'=>GETPOST('prophelp', 'alpha')
+ );
if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
{
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
index b4057cf178e..d7077d750b5 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
@@ -69,14 +69,14 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
),
// Geckodriver does not keep the session at the moment?!
// XPath selectors also don't seem to work
-// array(
-// 'browser' => 'Mozilla Firefox on Linux',
-// 'browserName' => 'firefox',
-// 'sessionStrategy' => 'shared',
-// 'desiredCapabilities' => array(
-// 'marionette' => true
-// )
-// )
+ //array(
+ // 'browser' => 'Mozilla Firefox on Linux',
+ // 'browserName' => 'firefox',
+ // 'sessionStrategy' => 'shared',
+ // 'desiredCapabilities' => array(
+ // 'marionette' => true,
+ // ),
+ //)
);
/**
@@ -224,7 +224,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
{
$this->url('/custom/mymodule/admin/about.php');
$this->authenticate();
-return $this->assertEquals(
+ return $this->assertEquals(
'Dolibarr Module Template (aka My Module)',
$this->byTag('h1')->text(),
"Readme title"
@@ -254,7 +254,7 @@ return $this->assertEquals(
{
$this->url('/admin/triggers.php');
$this->authenticate();
-return $this->assertContains(
+ return $this->assertContains(
'interface_99_modMyModule_MyModuleTriggers.class.php',
$this->byTag('body')->text(),
"Trigger declared"
@@ -271,7 +271,7 @@ return $this->assertContains(
{
$this->url('/admin/triggers.php');
$this->authenticate();
-return $this->assertContains(
+ return $this->assertContains(
'tick.png',
$this->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')->attribute('src'),
"Trigger enabled"