';
if (!empty($conf->global->MAIN_MAIL_SENDMODE_TICKET) && $conf->global->MAIN_MAIL_SENDMODE_TICKET != 'default') {
if ($conf->global->MAIN_MAIL_SENDMODE_TICKET != 'mail' || !$linuxlike) {
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index d15c128d549..4dd5ceab503 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -358,7 +358,7 @@ if ($mode == 'overwrite') {
print ' ';
print '
';
}
@@ -545,9 +545,9 @@ if ($mode == 'searchkey') {
if ($result) {
$obj = $db->fetch_object($result);
}
- print '
');
print $form->textwithpicto('', $htmltext, 1, 'info');
@@ -574,9 +574,9 @@ if ($mode == 'searchkey') {
if ($result) {
$obj = $db->fetch_object($result);
}
- print '
';
print ' ';
$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index f72235eb8b0..f6c92888384 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -136,7 +136,7 @@ if ($action == 'edit') {
print '';
print '
';
}
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 76556fb4d68..83241f2a9e2 100755
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -214,7 +214,7 @@ if ($action == 'edit') {
print '';
print '
'.$langs->trans("NothingToSetup");
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 07da0541619..a90c2b479c4 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -98,7 +98,7 @@ if ($action == 'edit') {
print '';
print '
';
}
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 65175a86c5e..46f455f86d4 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -298,7 +298,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
print '';
if ($user->rights->asset->write) {
- print '
';
}
@@ -503,7 +503,7 @@ if ($rowid > 0) {
// Edit
if ($user->rights->asset->write) {
- print '
';
}
// Delete
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 2c3896a6282..9ef77fb0d98 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -121,7 +121,7 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
$coldisplay++;
if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
} else {
- print '
';
}
print '';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 80f64210bf5..2bbb4b5f0a8 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -231,9 +231,9 @@ print "\n
\n";
if ($action == '') {
if ($user->rights->produit->creer || $user->rights->service->creer) {
- print '
'.$langs->trans('Add').'';
+ print '
'.$langs->trans('Add').'';
if ($cnt_trans > 0) {
- print '
'.$langs->trans('Update').'';
+ print '
'.$langs->trans('Update').'';
}
}
}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 8a10b39826f..e56a2e89fcf 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1688,7 +1688,7 @@ if ($id > 0) {
print img_picto('', 'project', 'class="paddingrightonly"');
$numprojet = $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');
if ($numprojet == 0) {
- print '
';
+ print '
';
}
print '';
}
@@ -2168,7 +2168,7 @@ if ($id > 0) {
if ($action != 'edit') {
if ($user->rights->agenda->allactions->create ||
(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
- print '
';
+ print '
';
} else {
print '
';
}
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index f891bf722cc..c9f422d78c8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -406,7 +406,7 @@ if ($object->id > 0) {
print $langs->trans('PaymentConditions');
print '
';
if (($action != 'editconditions') && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '
';
@@ -424,7 +424,7 @@ if ($object->id > 0) {
print $langs->trans('PaymentMode');
print ' | ';
if (($action != 'editmode') && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -443,7 +443,7 @@ if ($object->id > 0) {
print $langs->trans('PaymentBankAccount');
print ' | ';
if (($action != 'editbankaccount') && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '
';
@@ -569,7 +569,7 @@ if ($object->id > 0) {
print $langs->trans('SendingMethod');
print ' | ';
if (($action != 'editshipping') && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -589,7 +589,7 @@ if ($object->id > 0) {
print $langs->trans('IntracommReportTransportMode');
print ' | ';
if (($action != 'edittransportmode') && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -652,7 +652,7 @@ if ($object->id > 0) {
print $langs->trans('ProspectLevel');
print ' | ';
if ($action != 'editlevel' && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('Modify'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('Modify'), 1).' | ';
}
print '';
print '
';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index b5f05e72795..cff5c5d0e35 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2093,7 +2093,7 @@ if ($action == 'create') {
print $langs->trans('DatePropal');
print ' | ';
if ($action != 'editdate' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
}
print '';
print '
';
@@ -2120,7 +2120,7 @@ if ($action == 'create') {
print $langs->trans('DateEndPropal');
print ' | ';
if ($action != 'editecheance' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '
';
@@ -2150,7 +2150,7 @@ if ($action == 'create') {
print $langs->trans('PaymentConditionsShort');
print ' | ';
if ($action != 'editconditions' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).' | ';
}
print '';
print '
';
@@ -2169,7 +2169,7 @@ if ($action == 'create') {
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -2198,7 +2198,7 @@ if ($action == 'create') {
}
print ' | ';
if ($action != 'editavailability' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).' | ';
}
print '';
print '
';
@@ -2218,7 +2218,7 @@ if ($action == 'create') {
print $langs->trans('SendingMethod');
print ' | ';
if ($action != 'editshippingmethod' && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetShippingMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetShippingMode'), 1).' | ';
}
print '';
print '
';
@@ -2255,7 +2255,7 @@ if ($action == 'create') {
print $langs->trans('Source');
print ' | ';
if ($action != 'editdemandreason' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).' | ';
}
print '';
print '
';
@@ -2276,7 +2276,7 @@ if ($action == 'create') {
print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' | ';
if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT && $usercancreate) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '
';
@@ -2296,7 +2296,7 @@ if ($action == 'create') {
print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' | ';
if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $usercancreate) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '
';
@@ -2337,7 +2337,7 @@ if ($action == 'create') {
print $langs->trans('BankAccount');
print ' | ';
if ($action != 'editbankaccount' && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '
';
@@ -2373,7 +2373,7 @@ if ($action == 'create') {
print $langs->trans('IncotermLabel');
print ' | | ';
if ($usercancreate) {
- print ''.img_edit().'';
+ print ''.img_edit().'';
} else {
print ' ';
}
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 97184c1b8eb..af0b388cb7a 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -364,7 +364,7 @@ if (empty($numref)) {
print ' | ';
if ($user->rights->banque->consolidate && $action != 'editbankreceipt') {
- print 'numr.'">'.img_edit().'';
+ print 'numr).'">'.img_edit().'';
}
print ' | ';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 77db777c077..33b453cd0b4 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -469,7 +469,7 @@ if ($action == 'create') {
if ($object->statut < Deplacement::STATUS_REFUNDED) { // if not refunded
if ($user->rights->deplacement->creer) {
- print '
'.$langs->trans('Modify').'';
+ print '
'.$langs->trans('Modify').'';
} else {
print '
'.$langs->trans('Modify').'';
}
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 153bd58114d..28143d0340a 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1269,7 +1269,7 @@ if ($action == 'create') {
print $langs->trans('PaymentConditionsShort');
print '';
if ($action != 'editconditions' && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '
';
@@ -1290,7 +1290,7 @@ if ($action == 'create') {
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode' && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -1310,7 +1310,7 @@ if ($action == 'create') {
print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' | ';
if ($usercancreate && $action != 'editmulticurrencycode' && !empty($object->brouillon)) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '
';
@@ -1326,7 +1326,7 @@ if ($action == 'create') {
print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' | ';
if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '
';
@@ -1398,7 +1398,7 @@ if ($action == 'create') {
print $langs->trans('BankAccount');
print ' | ';
if (($action != 'editbankaccount') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '
';
@@ -1416,7 +1416,7 @@ if ($action == 'create') {
print $langs->trans('Model');
print ' | ';
if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT) {
- print ' | id.'">'.img_edit($langs->trans('SetModel'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetModel'), 1).' | ';
}
print '';
print '
';
@@ -1463,7 +1463,7 @@ if ($action == 'create') {
print $langs->trans('Frequency');
print ' | ';
if ($action != 'editfrequency' && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('Edit'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('Edit'), 1).' | ';
}
print '';
print '
';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 7ddb90cd4da..764af7a232a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4336,7 +4336,7 @@ if ($action == 'create') {
print $langs->trans('DateInvoice');
print ' | ';
if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {
- print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
}
print '';
print '
';
@@ -4356,7 +4356,7 @@ if ($action == 'create') {
print '';
print ' | ';
if ($action == 'editdate_pointoftax') {
@@ -4373,7 +4373,7 @@ if ($action == 'create') {
print $langs->trans('PaymentConditionsShort');
print ' | ';
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '
';
@@ -4394,7 +4394,7 @@ if ($action == 'create') {
print $langs->trans('DateMaxPayment');
print ' | ';
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
}
print '';
print '
';
@@ -4418,7 +4418,7 @@ if ($action == 'create') {
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode' && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -4438,7 +4438,7 @@ if ($action == 'create') {
print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' | ';
if ($usercancreate && $action != 'editmulticurrencycode' && !empty($object->brouillon)) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '
';
@@ -4454,7 +4454,7 @@ if ($action == 'create') {
print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' | ';
if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '
';
@@ -4482,7 +4482,7 @@ if ($action == 'create') {
print $langs->trans('BankAccount');
print ' | ';
if (($action != 'editbankaccount') && $usercancreate) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '
';
@@ -4502,7 +4502,7 @@ if ($action == 'create') {
print $langs->trans('IncotermLabel');
print ' | | ';
if ($usercancreate) {
- print ''.img_edit().'';
+ print ''.img_edit().'';
} else {
print ' ';
}
@@ -4532,7 +4532,7 @@ if ($action == 'create') {
print $langs->trans('RetainedWarranty');
print ' | ';
if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).' | ';
}
print '';
@@ -4555,7 +4555,7 @@ if ($action == 'create') {
print $langs->trans('PaymentConditionsShortRetainedWarranty');
print '';
if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).' | ';
}
print '';
@@ -4590,7 +4590,7 @@ if ($action == 'create') {
print $langs->trans('RetainedWarrantyDateLimit');
print '';
if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).' | ';
}
print '';
@@ -4676,7 +4676,7 @@ if ($action == 'create') {
print $langs->trans('RevenueStamp');
print '';
if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercancreate) {
- print '
id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).' | ';
}
print '';
print '
';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index e94fd6f5e1b..7e5a7047060 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -363,7 +363,7 @@ if ($object->id > 0) {
print $langs->trans('DateInvoice');
print ' | ';
if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
}
print '';
print '
';
@@ -386,7 +386,7 @@ if ($object->id > 0) {
print $langs->trans('PaymentConditionsShort');
print ' | ';
if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editconditions' && !empty($object->brouillon) && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '
';
@@ -407,7 +407,7 @@ if ($object->id > 0) {
print $langs->trans('DateMaxPayment');
print ' | ';
if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && !empty($object->brouillon) && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
}
print '';
print '
';
@@ -436,7 +436,7 @@ if ($object->id > 0) {
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode' && !empty($object->brouillon) && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -453,7 +453,7 @@ if ($object->id > 0) {
print $langs->trans('BankAccount');
print ' | ';
if (($action != 'editbankaccount') && $user->rights->commande->creer && !empty($object->brouillon)) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '
';
@@ -537,7 +537,7 @@ if ($object->id > 0) {
print $langs->trans('RevenueStamp');
print ' | ';
if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer) {
- print '
id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).' | ';
}
print '';
print '
';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 61d295a29b0..9b235926421 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -529,7 +529,7 @@ if ($action == 'new') {
print $langs->trans('Date');
print ' | ';
if ($action != 'editdate') {
- print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetDate'), 1).' | ';
}
print '';
print '
';
@@ -554,7 +554,7 @@ if ($action == 'new') {
print '';
print ' | ';
if ($action == 'editrefext')
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index f436c47b10e..1223ad3ec36 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -577,7 +577,7 @@ if ($id > 0) {
print $langs->trans('DefaultPaymentMode');
print ' | ';
if ($action != 'editmode') {
- print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -595,7 +595,7 @@ if ($id > 0) {
print $langs->trans('DefaultBankAccount');
print ' | ';
if ($action != 'editbankaccount' && $user->rights->tax->charges->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '
';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 363af314113..83740385f2b 100755
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -573,7 +573,7 @@ if ($id) {
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode') {
- print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '
';
@@ -591,7 +591,7 @@ if ($id) {
print $langs->trans('BankAccount');
print ' | ';
if ($action != 'editbankaccount' && $user->rights->tax->charges->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print '
id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '
';
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index e458cdf3016..adf5bb722d3 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -139,11 +139,11 @@ if (!empty($this->control->tpl['action_delete'])) {
if (empty($user->socid)) {
print ' | ';
@@ -1486,11 +1486,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
}
if ($user->rights->societe->contact->creer) {
- print ''.$langs->trans('Modify').'';
+ print ''.$langs->trans('Modify').'';
}
if (!$object->user_id && $user->rights->user->user->creer) {
- print ''.$langs->trans("CreateDolibarrLogin").'';
+ print ''.$langs->trans("CreateDolibarrLogin").'';
}
// Activer
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index a5b64e37998..285f71cae48 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -311,7 +311,7 @@ if ($action != 'edit') {
print '";
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index bf9208ccb2b..9d8cdb78912 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1541,12 +1541,12 @@ if ($action == 'create') {
print ' | ';
if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0)) {
print '';
- print '';
+ print '';
print img_picto($langs->trans("MoveToAnotherContract"), 'uparrow');
print '';
}
if ($user->rights->contrat->creer && ($object->statut >= 0)) {
- print '';
+ print '';
print img_edit();
print '';
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 01bd1a13141..8deda2ecd09 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -165,7 +165,7 @@ class Form
$ret .= ' | ';
}
if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
- $ret .= 'id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'';
+ $ret .= 'id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'';
}
if (!empty($notabletag) && $notabletag == 1) {
$ret .= ' : ';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ca7e939fb6f..975738b3809 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1454,7 +1454,7 @@ class FormFile
if ($permtoeditline) {
$paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '§ion_dir='.urlencode($relativepath) : '');
- print ''.img_edit('default', 0, 'class="paddingrightonly"').'';
+ print ''.img_edit('default', 0, 'class="paddingrightonly"').'';
}
}
if ($permonobject) {
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 1d8024cf40e..0adcb967991 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1295,7 +1295,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
// Edit
if ($user->rights->societe->contact->creer) {
- print '';
+ print '';
print img_edit();
print '';
}
@@ -2003,7 +2003,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
print ' | '.$obj->code_client.' | ';
print '
';
- print '';
+ print '';
print img_edit();
print ' | ';
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index ba18e415539..e2067240c45 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -699,7 +699,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
if ($user->rights->agenda->allactions->create ||
(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
- $out .= '
';
+ $out .= '
';
}
$out .= '';
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index fda21e28a21..05e6d51a78d 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -190,7 +190,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
print "\n".'
';
if ($showfk) {
print '';
print '';
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 8ebb767a4d8..6a7d48add5e 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -384,7 +384,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
$coldisplay++;
if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
} else { ?>
- id.'#line_'.$line->id; ?>">
+ id.'#line_'.$line->id; ?>">
';
}
print '';
@@ -392,7 +392,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
print '';
$coldisplay++;
if (!$situationinvoicelinewithparent && empty($disableremove)) { // For situation invoice, deletion is not possible if there is a parent company.
- print 'id.'">';
+ print 'id.'">';
print img_delete();
print '';
}
@@ -402,12 +402,12 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
print ' | ';
$coldisplay++;
if ($i > 0) { ?>
- id; ?>">
+ id; ?>">
- id; ?>">
+ id; ?>">
rights->cron->create) {
print ''.$langs->trans("Edit").'';
} else {
- print ''.$langs->trans("Edit").'';
+ print ''.$langs->trans("Edit").'';
}
if ((empty($user->rights->cron->execute))) {
@@ -753,7 +753,7 @@ if (($action == "create") || ($action == "edit")) {
} elseif (empty($object->status)) {
print ''.$langs->trans("CronExecute").'';
} else {
- print ''.$langs->trans("CronExecute").'';
+ print ''.$langs->trans("CronExecute").'';
}
if (!$user->rights->cron->create) {
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index dde8644571e..8f25461eb64 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -175,7 +175,7 @@ if ($action == 'edit') {
print '';
print '';
}
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index c72718ffce2..cca399f43af 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -427,7 +427,7 @@ if ($action == 'create') { // Create. Seems to no be used
print ' | ';
if ($action != 'editdate_delivery') {
- print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
}
print '';
print '';
@@ -451,7 +451,7 @@ if ($action == 'create') { // Create. Seems to no be used
print $langs->trans('IncotermLabel');
print ' | | ';
if ($user->rights->expedition->delivery->creer) {
- print ''.img_edit().'';
+ print ''.img_edit().'';
} else {
print ' ';
}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 528a640b391..8ff0fa62e6c 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -855,7 +855,7 @@ if (!empty($id) && $action != 'edit') {
print ''.$langs->trans("ReOpen").'';
}
- print '';
+ print '';
if ($object->statut == $object::STATUS_DRAFT) {
print '';
@@ -870,7 +870,7 @@ if (!empty($id) && $action != 'edit') {
if ($remaintopay == 0) {
print ' '.$langs->trans('DoPayment').' ';
} else {
- print '';
+ print '';
}
}
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index b6aa59720ae..0b42fc17a02 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -454,11 +454,11 @@ if ($action != 'edit' && $action != 'delete') {
print '';
if ($permtoadd) {
- print ' '.$langs->trans('Edit').'';
+ print ' '.$langs->trans('Edit').'';
}
if ($permtoadd) {
- print ' '.$langs->trans('ECMAddSection').'';
+ print ' '.$langs->trans('ECMAddSection').'';
} else {
print ' '.$langs->trans('ECMAddSection').'';
}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 1ec8d21447e..03e309aa41d 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -651,9 +651,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if (empty($reshook)) {
// Send
if (empty($user->socid)) {
- print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=presend&mode=init#formmailbeforetitle');
+ print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
}
- print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=edit', '', $permissiontoadd);
+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=edit&token='.newToken().'', '', $permissiontoadd);
// Clone
print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=scrumsprint', '', $permissiontoadd);
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index c36442915e6..7b609391ee2 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1760,7 +1760,7 @@ if ($action == 'create') {
print ' | ';
if ($action != 'editdate_livraison') {
- print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
}
print '';
print '';
@@ -1892,7 +1892,7 @@ if ($action == 'create') {
print ' | ';
if ($action != 'editshipping_method_id') {
- print 'id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).' | ';
}
print '';
print '';
@@ -1929,7 +1929,7 @@ if ($action == 'create') {
print $langs->trans('IncotermLabel');
print ' | | ';
if ($user->rights->expedition->creer) {
- print ''.img_edit().'';
+ print ''.img_edit().'';
} else {
print ' ';
}
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index f543b8baee4..a6ab016ef7b 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -370,7 +370,7 @@ if ($id > 0 || !empty($ref)) {
print ' | ';
if ($action != 'editdate_livraison') {
- print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
}
print '';
print '';
@@ -400,7 +400,7 @@ if ($id > 0 || !empty($ref)) {
print $langs->trans('SendingMethod');
print ' | ';
if ($action != 'editshippingmethod' && $user->rights->expedition->creer) {
- print 'id.'">'.img_edit($langs->trans('SetShippingMode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetShippingMode'), 1).' | ';
}
print '';
print '';
@@ -421,7 +421,7 @@ if ($id > 0 || !empty($ref)) {
print $langs->trans('Warehouse');
print ' | ';
if ($action != 'editwarehouse' && $user->rights->commande->creer) {
- print 'id.'">'.img_edit($langs->trans('SetWarehouse'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetWarehouse'), 1).' | ';
}
print '';
print '';
@@ -441,7 +441,7 @@ if ($id > 0 || !empty($ref)) {
print $langs->trans('PaymentConditionsShort');
print ' | ';
- if ($action != 'editconditions' && $object->statut == Expedition::STATUS_VALIDATED) print 'id.'">'.img_edit($langs->trans('SetConditions'),1).' | ';
+ if ($action != 'editconditions' && $object->statut == Expedition::STATUS_VALIDATED) print 'id.'">'.img_edit($langs->trans('SetConditions'),1).' | ';
print '';
print '';
if ($action == 'editconditions')
@@ -459,7 +459,7 @@ if ($id > 0 || !empty($ref)) {
print '';
print ' | ';
if ($action == 'editmode')
@@ -478,7 +478,7 @@ if ($id > 0 || !empty($ref)) {
print $langs->trans('AvailabilityPeriod');
print ' | ';
if ($action != 'editavailability') {
- print 'id.'">'.img_edit($langs->trans('SetAvailability'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetAvailability'), 1).' | ';
}
print '';
print '';
@@ -495,7 +495,7 @@ if ($id > 0 || !empty($ref)) {
print $langs->trans('Source');
print ' | ';
if ($action != 'editdemandreason') {
- print 'id.'">'.img_edit($langs->trans('SetDemandReason'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetDemandReason'), 1).' | ';
}
print '';
print '';
@@ -528,7 +528,7 @@ if ($id > 0 || !empty($ref)) {
print $langs->trans('IncotermLabel');
print ' | | ';
if ($user->rights->commande->creer) {
- print ''.img_edit().'';
+ print ''.img_edit().'';
} else {
print ' ';
}
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 7aa08d30c39..f982b046793 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2554,11 +2554,11 @@ if ($action != 'create' && $action != 'edit') {
if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_DRAFT) {
if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || !empty($user->rights->expensereport->writeall_advance)) {
// Modify
- print '';
+ print '';
// Validate
if (count($object->lines) > 0) {
- print '';
+ print '';
}
}
}
@@ -2571,12 +2571,12 @@ if ($action != 'create' && $action != 'edit') {
if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_REFUSED) {
if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
// Modify
- print '';
+ print '';
// setdraft (le statut refusée est identique à brouillon)
//print ''.$langs->trans('ReOpen').'';
// Enregistrer depuis le statut "Refusée"
- print '';
+ print '';
}
}
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 44eb3734378..d74e0a5c5e8 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -587,7 +587,7 @@ if ($action == 'create') {
print $langs->trans('Frequency');
print ' | ';
if ($action != 'editfrequency' && $user->rights->ficheinter->creer) {
- print '';
+ print ' | ';
print img_edit($langs->trans('Edit'), 1).' | ';
}
print '';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 31f42c9b0fa..6613ea0ed9d 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1350,21 +1350,21 @@ if ($action == 'create') {
// Icon to edit and delete
if ($object->statut == 0 && $user->rights->ficheinter->creer) {
print '';
- print 'rowid.'#'.$objp->rowid.'">';
+ print 'rowid.'#'.$objp->rowid.'">';
print img_edit();
print '';
- print 'rowid.'">';
+ print 'rowid.'">';
print img_delete();
print ' | ';
print '';
if ($num > 1) {
if ($i > 0) {
- print 'rowid.'">';
+ print 'rowid.'">';
print img_up();
print '';
}
if ($i < $num - 1) {
- print 'rowid.'">';
+ print 'rowid.'">';
print img_down();
print '';
}
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 12b7b09cf53..9cfb2fe475f 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -261,7 +261,7 @@ if ($object->id > 0) {
print $langs->trans('PaymentConditions');
print ' | ';
if (($action != 'editconditions') && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '';
@@ -279,7 +279,7 @@ if ($object->id > 0) {
print $langs->trans('PaymentMode');
print ' | ';
if (($action != 'editmode') && $user->rights->societe->creer) {
- print ' | id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index e579c07ac14..ae6c271fec8 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1975,7 +1975,7 @@ if ($action == 'create') {
}
if (empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) || $action != 'edit_thirdparty') {
if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
- $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'';
}
$morehtmlref .= ' : '.$object->thirdparty->getNomUrl(1, 'supplier');
if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
@@ -2075,7 +2075,7 @@ if ($action == 'create') {
print $langs->trans('PaymentConditions');
print ' | ';
if ($action != 'editconditions') {
- print ' | id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '';
@@ -2094,7 +2094,7 @@ if ($action == 'create') {
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode') {
- print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '';
@@ -2114,7 +2114,7 @@ if ($action == 'create') {
print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' | ';
if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT) {
- print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '';
@@ -2134,7 +2134,7 @@ if ($action == 'create') {
print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' | ';
if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '';
@@ -2162,7 +2162,7 @@ if ($action == 'create') {
print $langs->trans('BankAccount');
print ' | ';
if ($action != 'editbankaccount' && $usercancreate) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '';
@@ -2187,7 +2187,7 @@ if ($action == 'create') {
print $langs->trans('DateDeliveryPlanned');
print ' | ';
if ($action != 'editdate_livraison') {
- print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' | ';
}
print '';
print '';
@@ -2221,7 +2221,7 @@ if ($action == 'create') {
print $langs->trans('IncotermLabel');
print ' | | ';
if ($usercancreate) {
- print ''.img_edit().'';
+ print ''.img_edit().'';
} else {
print ' ';
}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index afd99951aa4..16d4b1f25f3 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1294,13 +1294,13 @@ if ($id > 0 || !empty($ref)) {
if ($action != 'editline' || $lineid != $objp->dispatchlineid) {
if (empty($reception->id) || ($reception->statut == Reception::STATUS_DRAFT)) { // only allow edit on draft reception
print ' | ';
- print 'dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
+ print 'dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
print img_edit();
print '';
print ' | ';
print '';
- print 'dispatchlineid.'#dispatch_received_products">';
+ print 'dispatchlineid.'#dispatch_received_products">';
print img_delete();
print '';
print ' | ';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 762436a3a0e..21d6e73eb39 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2779,7 +2779,7 @@ if ($action == 'create') {
print $langs->trans('PaymentConditions');
print '';
if ($action != 'editconditions' && $form_permission) {
- print ' | id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetConditions'), 1).' | ';
}
print '';
print '';
@@ -2808,7 +2808,7 @@ if ($action == 'create') {
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode' && $form_permission2) {
- print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' | ';
}
print '';
print '';
@@ -2828,7 +2828,7 @@ if ($action == 'create') {
print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' | ';
if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT) {
- print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '';
@@ -2847,7 +2847,7 @@ if ($action == 'create') {
print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' | ';
if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
+ print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' | ';
}
print '';
print '';
@@ -2875,7 +2875,7 @@ if ($action == 'create') {
print $langs->trans('BankAccount');
print ' | ';
if ($action != 'editbankaccount' && $usercancreate) {
- print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
+ print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
}
print '';
print '';
@@ -2895,7 +2895,7 @@ if ($action == 'create') {
print $langs->trans('IncotermLabel');
print ' | | ';
if ($usercancreate) {
- print ''.img_edit().'';
+ print ''.img_edit().'';
} else {
print ' ';
}
@@ -2918,7 +2918,7 @@ if ($action == 'create') {
print $langs->trans('IntracommReportTransportMode');
print ' | ';
if ($action != 'editmode' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
- print 'id.'">'.img_edit().' | ';
+ print 'id.'">'.img_edit().' | ';
}
print '';
print '';
@@ -3406,7 +3406,7 @@ if ($action == 'create') {
$ventilExportCompta = $object->getVentilExportCompta(); // Should be 0 since the sum of payments are zero. But we keep the protection.
if ($ventilExportCompta == 0) {
- print ''.$langs->trans('Modify').'';
+ print ''.$langs->trans('Modify').'';
} else {
print ''.$langs->trans('Modify').'';
}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 65c3521bf20..9948b64e460 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -338,25 +338,25 @@ if (empty($reshook)) {
// If no start date
if (empty($_POST['date_debut_'])) {
- header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatedebut');
+ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=nodatedebut');
exit;
}
// If no end date
if (empty($_POST['date_fin_'])) {
- header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatefin');
+ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=nodatefin');
exit;
}
// If start date after end date
if ($date_debut > $date_fin) {
- header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=datefin');
+ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=datefin');
exit;
}
// If no validator designated
if ($approverid < 1) {
- header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=Valideur');
+ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=Valideur');
exit;
}
@@ -1339,7 +1339,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
}
$include_users = $object->fetch_users_approver_holiday();
if (is_array($include_users) && in_array($user->id, $include_users) && $object->statut == Holiday::STATUS_VALIDATED) {
- print ''.img_edit($langs->trans("Edit")).'';
+ print ''.img_edit($langs->trans("Edit")).'';
}
print '';
print '';
@@ -1451,11 +1451,11 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
print '';
if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) {
- print '
'.$langs->trans("EditCP").'';
+ print '
'.$langs->trans("EditCP").'';
}
if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) { // If draft
- print '
'.$langs->trans("Validate").'';
+ print '
'.$langs->trans("Validate").'';
}
if ($object->statut == Holiday::STATUS_VALIDATED) { // If validated
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 9daf1d768b8..0ce7d793003 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -419,7 +419,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
* Action bar
*/
print '
';
}
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 68bcd78636b..ec7ba9b74e3 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -96,7 +96,7 @@ print load_fiche_titre($langs->trans("HRMArea"), '', 'hrm');
if (!empty($setupcompanynotcomplete)) {
$langs->load("errors");
$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
- print '
';
+ print '
';
llxFooter();
exit;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 99aaabe7744..8af0431f361 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -404,12 +404,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
}
if (($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) && $permissiontovalidate) {
- print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
}
// Validate
if ($object->status == $object::STATUS_DRAFT) {
if ((empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) && $permissiontovalidate) {
- print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+ print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&token='.newToken().'&confirm=yes', '', $permissiontoadd);
} else {
$langs->load("errors");
//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
@@ -418,7 +418,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Clone
- print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+ print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=scrumsprint', '', $permissiontoadd);
/*
if ($permissiontoadd) {
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index df24e022d90..a15f6c926a6 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -717,12 +717,12 @@ if ($id > 0) {
// Edit
if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->write) {
- print '
';
+ print '
';
}
// Emit payment
if (($object->paid == 0 || $object->paid == 2) && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) {
- print '
';
+ print '
';
}
// Classify 'paid'
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index db8bc85816e..4a3f9fd6e25 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1999,15 +1999,15 @@ if ($module == 'initmodule') {
print '
| ';
print ' '.$langs->trans("DescriptorFile").' : '.$pathtofile.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
+ print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
print ' |
';
print '
| '.$langs->trans("ReadmeFile").' : '.$pathtofilereadme.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
+ print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
print ' |
';
print '
| '.$langs->trans("ChangeLog").' : '.$pathtochangelog.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
+ print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
print ' |
';
print '';
@@ -2177,8 +2177,8 @@ if ($module == 'initmodule') {
$pathtofile = 'langs/'.$langfile['relativename'];
}
print '
| '.$langs->trans("LanguageFile").' '.basename(dirname($pathtofile)).' : '.$pathtofile.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
- print ' | '.img_picto($langs->trans("Delete"), 'delete').'';
+ print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
+ print ' | '.img_picto($langs->trans("Delete"), 'delete').'';
print ' | ';
}
print '';
@@ -2226,7 +2226,7 @@ if ($module == 'initmodule') {
print '
';
print ' '.$langs->trans("DescriptorFile").' : '.$pathtofile.'';
- print ' '.img_picto($langs->trans("Edit"), 'edit').'';
+ print ' '.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
if (is_array($dicts) && !empty($dicts)) {
print ' '.$langs->trans("LanguageFile").' : ';
@@ -2502,13 +2502,13 @@ if ($module == 'initmodule') {
print '';
print '
'.$langs->trans("ClassFile").' :
'.($realpathtoclass ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtoclass).($realpathtoclass ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
'.$langs->trans("ApiClassFile").' :
'.($realpathtoapi ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).($realpathtoapi ? '' : '').'';
if (dol_is_file($realpathtoapi)) {
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
print ' ';
if (empty($conf->global->$const_name)) { // If module is not activated
print '
'.$langs->trans("GoToApiExplorer").'';
@@ -2517,99 +2517,99 @@ if ($module == 'initmodule') {
}
} else {
//print '
'.$langs->trans("FileNotYetGenerated").' ';
- print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
+ print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
}
// PHPUnit
print '
';
print '
'.$langs->trans("TestClassFile").' :
'.($realpathtophpunit ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtophpunit).($realpathtophpunit ? '' : '').'';
if (dol_is_file($realpathtophpunit)) {
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
} else {
//print '
'.$langs->trans("FileNotYetGenerated").' ';
- print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
+ print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
}
print '
';
print '
';
print '
'.$langs->trans("PageForLib").' :
'.($realpathtolib ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtolib).($realpathtolib ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
'.$langs->trans("PageForObjLib").' :
'.($realpathtoobjlib ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtoobjlib).($realpathtoobjlib ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
'.$langs->trans("Image").' :
'.($realpathtopicto ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtopicto).($realpathtopicto ? '' : '').'';
- //print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ //print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
';
print '
'.$langs->trans("SqlFile").' :
'.($realpathtosql ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtosql).($realpathtosql ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
- print '
'.$langs->trans("DropTableIfEmpty").'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.$langs->trans("DropTableIfEmpty").'';
//print '
'.$langs->trans("RunSql").'';
print '
';
print '
'.$langs->trans("SqlFileKey").' :
'.($realpathtosqlkey ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlkey).($realpathtosqlkey ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
//print '
'.$langs->trans("RunSql").'';
print '
';
print '
'.$langs->trans("SqlFileExtraFields").' :
'.($realpathtosqlextra ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextra).($realpathtosqlextra ? '' : '').'';
if (dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey)) {
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
print ' ';
- print '
'.$langs->trans("DropTableIfEmpty").'';
+ print '
'.$langs->trans("DropTableIfEmpty").'';
} else {
- print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
+ print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
}
//print '
'.$langs->trans("RunSql").'';
print '
';
print '
'.$langs->trans("SqlFileKeyExtraFields").' :
'.($realpathtosqlextrakey ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextrakey).($realpathtosqlextrakey ? '' : '').'';
if (dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey)) {
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
} else {
- print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
+ print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').'';
}
print '
';
print '
';
print '
'.$langs->trans("PageForList").' :
'.($realpathtolist ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtolist).($realpathtolist ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
'.$langs->trans("PageForCreateEditView").' :
'.($realpathtocard ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtocard).($realpathtocard ? '' : '').'?action=create';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
'.$langs->trans("PageForContactTab").' :
'.($realpathtocontact ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtocontact).($realpathtocontact ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
if (dol_is_file($realpathtocontact)) {
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
}
print '
';
print '
'.$langs->trans("PageForDocumentTab").' :
'.($realpathtodocument ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtodocument).($realpathtodocument ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
if (dol_is_file($realpathtodocument)) {
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
}
print '
';
print '
'.$langs->trans("PageForNoteTab").' :
'.($realpathtonote ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtonote).($realpathtonote ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
if (dol_is_file($realpathtonote)) {
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
}
print '
';
print '
'.$langs->trans("PageForAgendaTab").' :
'.($realpathtoagenda ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtoagenda).($realpathtoagenda ? '' : '').'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
if (dol_is_file($realpathtoagenda)) {
print ' ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').'';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').'';
}
print '
';
print '
';
@@ -2928,7 +2928,7 @@ if ($module == 'initmodule') {
$format = 'markdown';
}
print '
'.$langs->trans("SpecificationFile").' :
'.$pathtofile.'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
}
} else {
@@ -3020,7 +3020,7 @@ if ($module == 'initmodule') {
print '
';
print '
'.$langs->trans("DescriptorFile").' :
'.$pathtofile.'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
';
@@ -3153,7 +3153,7 @@ if ($module == 'initmodule') {
print '
';
print '
'.$langs->trans("DescriptorFile").' :
'.$pathtofile.'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
';
@@ -3243,7 +3243,7 @@ if ($module == 'initmodule') {
print '
| ';
print ' '.$langs->trans("DescriptorFile").' : '.$pathtofile.'';
print ' | ';
- print ''.img_picto($langs->trans("Edit"), 'edit').'';
+ print ''.img_picto($langs->trans("Edit"), 'edit').'';
print ' |
';
print '
| ';
@@ -3252,7 +3252,7 @@ if ($module == 'initmodule') {
if (dol_is_file($dirins.'/'.$pathtohook)) {
print ''.$pathtohook.'';
print ' | ';
- print ''.img_picto($langs->trans("Edit"), 'edit').' ';
+ print ' | '.img_picto($langs->trans("Edit"), 'edit').' ';
print ''.img_picto($langs->trans("Delete"), 'delete').' | ';
} else {
print ''.$langs->trans("FileNotYetGenerated").'';
@@ -3302,7 +3302,7 @@ if ($module == 'initmodule') {
print '
| ';
print ' '.$langs->trans("DescriptorFile").' : '.$pathtofile.'';
print ' | ';
- print ''.img_picto($langs->trans("Edit"), 'edit').'';
+ print ''.img_picto($langs->trans("Edit"), 'edit').'';
print ' |
';
if (!empty($triggers)) {
@@ -3311,7 +3311,7 @@ if ($module == 'initmodule') {
print '
| ';
print ' '.$langs->trans("TriggersFile").' : '.$pathtofile.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').' | ';
+ print ''.img_picto($langs->trans("Edit"), 'edit').' | ';
print ''.img_picto($langs->trans("Delete"), 'delete').' | ';
print '
';
}
@@ -3407,11 +3407,11 @@ if ($module == 'initmodule') {
print '
'.$langs->trans("JSFile").' : ';
if (dol_is_file($dirins.'/'.$pathtohook)) {
print '
'.$pathtohook.'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').' | ';
- print '
'.img_picto($langs->trans("Delete"), 'delete').' | ';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').' | ';
+ print '
'.img_picto($langs->trans("Delete"), 'delete').' | ';
} else {
print '
'.$langs->trans("FileNotYetGenerated").'';
- print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').' | ';
+ print '
'.img_picto('Generate', 'generate', 'class="paddingleft"').' | ';
}
print '
';
} else {
@@ -3455,13 +3455,13 @@ if ($module == 'initmodule') {
$pathtofile = $widget['relpath'];
print '
| '.$langs->trans("WidgetFile").' : '.$pathtofile.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').'';
- print ' | '.img_picto($langs->trans("Delete"), 'delete').' | ';
+ print ''.img_picto($langs->trans("Edit"), 'edit').'';
+ print ' | '.img_picto($langs->trans("Delete"), 'delete').' | ';
print '
';
}
} else {
print '
| '.$langs->trans("WidgetFile").' : '.$langs->trans("NoWidget").'';
- print ' | '.img_picto('Generate', 'generate', 'class="paddingleft"').'';
+ print ' | '.img_picto('Generate', 'generate', 'class="paddingleft"').'';
print ' |
';
}
print '';
@@ -3502,7 +3502,7 @@ if ($module == 'initmodule') {
print '
';
print '
'.$langs->trans("DescriptorFile").' :
'.$pathtofile.'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
} else {
$fullpathoffile = dol_buildpath($file, 0);
@@ -3572,13 +3572,13 @@ if ($module == 'initmodule') {
$pathtofile = $clifile['relpath'];
print '
| '.$langs->trans("CLIFile").' : '.$pathtofile.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').' | ';
- print ''.img_picto($langs->trans("Delete"), 'delete').' | ';
+ print ''.img_picto($langs->trans("Edit"), 'edit').' | ';
+ print ''.img_picto($langs->trans("Delete"), 'delete').' | ';
print '
';
}
} else {
print '
| '.$langs->trans("CLIFile").' : '.$langs->trans("FileNotYetGenerated");'';
- print ' | '.img_picto('Generate', 'generate', 'class="paddingleft"').'';
+ print ' | '.img_picto('Generate', 'generate', 'class="paddingleft"').'';
print ' |
';
}
print '';
@@ -3618,7 +3618,7 @@ if ($module == 'initmodule') {
print '
';
print '
'.$langs->trans("DescriptorFile").' :
'.$pathtofile.'';
- print '
'.img_picto($langs->trans("Edit"), 'edit').'';
+ print '
'.img_picto($langs->trans("Edit"), 'edit').'';
print '
';
print '
';
@@ -3746,14 +3746,14 @@ if ($module == 'initmodule') {
}
print '
| ';
print ' '.$langs->trans("SpecificationFile").' : '.$pathtofile.'';
- print ' | '.img_picto($langs->trans("Edit"), 'edit').' | ';
- print ''.img_picto($langs->trans("Delete"), 'delete').' | ';
+ print ''.img_picto($langs->trans("Edit"), 'edit').' | ';
+ print ''.img_picto($langs->trans("Delete"), 'delete').' | ';
print '
';
}
} else {
print '
| ';
print ' '.$langs->trans("SpecificationFile").' : '.$langs->trans("FileNotYetGenerated").'';
- print ' | '.img_picto('Generate', 'generate', 'class="paddingleft"').' | ';
+ print ''.img_picto('Generate', 'generate', 'class="paddingleft"').' | ';
print '
';
}
print '';
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index d0d4a404dcf..7c6c6b2c04e 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -389,7 +389,7 @@ if ($action == 'edit') {
print '';
print '
';
} else {
print '
'.$langs->trans("NothingToSetup");
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 51f35bbc33d..136952662cc 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -609,7 +609,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Modify
if ($object->status == $object::STATUS_DRAFT) {
if ($permissiontoadd) {
- print '
'.$langs->trans("Modify").''."\n";
+ print '
'.$langs->trans("Modify").''."\n";
} else {
print '
'.$langs->trans('Modify').''."\n";
}
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index db637136cad..2a281931046 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -556,7 +556,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if (empty($reshook)) {
// Send
if (empty($user->socid)) {
- print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
+ print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
}
if ($object->status == $object::STATUS_DRAFT) {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index fd9b129e30d..80378bd1b2a 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1262,7 +1262,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '
| '.$langs->trans("DefaultWarehouse").' | ';
print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse', 'int'), 'fk_default_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'minwidth300 widthcentpercentminusxx maxwidth500');
- print ' ';
+ print ' ';
print '';
print '';
print ' | ';
@@ -2543,14 +2543,14 @@ if ($action != 'create' && $action != 'edit') {
if (empty($reshook)) {
if ($usercancreate) {
if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) {
- print 'id.'">'.$langs->trans("Modify").'';
+ print 'id.'">'.$langs->trans("Modify").'';
}
if (!isset($object->no_button_copy) || $object->no_button_copy <> 1) {
if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
print ''.$langs->trans('ToClone').''."\n";
} else {
- print 'id.'">'.$langs->trans("ToClone").'';
+ print 'id.'">'.$langs->trans("ToClone").'';
}
}
}
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 784be41dfe9..893cc654f89 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -204,7 +204,7 @@ print '