diff --git a/ChangeLog b/ChangeLog
index 2e8bfc968c7..de1482ea183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,21 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
+
+***** ChangeLog for 15.0.0 compared to 14.0.0 *****
+
+For developers:
+---------------
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* Update hook 'printOriginObjectLine', removed check on product type and special code. Need now reshook.
+* Old deprecated module "SimplePOS" has been completely removed. Use module "TakePOS" is you need a Point Of Sale.
+* The method static ActionComm::getActions($db, ...) is no more static. Use $actioncomm->getActions(...) instead (without $db param).
+
+
+
***** ChangeLog for 14.0.2 compared to 14.0.1 *****
FIX: #18353 Invoice list translation issue
@@ -86,19 +101,6 @@ FIX: using Tulip, deposit mask was not saved
FIX: #yogosha6907
-***** ChangeLog for 15.0.0 compared to 14.0.0 *****
-
-For developers:
----------------
-
-WARNING:
-
-Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* Update hook 'printOriginObjectLine', removed check on product type and special code. Need now reshook.
-* Old deprecated module "SimplePOS" has been completely removed. Use module "TakePOS" is you need a Point Of Sale.
-
-
-
***** ChangeLog for 14.0.0 compared to 13.0.0 *****
For users:
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index dca74e9e720..eb8e3ade6dc 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -57,7 +57,6 @@ RUN echo "host mail" >> /etc/msmtprc
RUN echo "from local@localdomain.com" >> /etc/msmtprc
RUN echo "domain localhost.localdomain" >> /etc/msmtprc
RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
-RUN echo "localhost localhost.localdomain" >> /etc/hosts
EXPOSE 80
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index 2167f069f25..b72118de5fb 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -46,6 +46,8 @@ services:
networks:
- internal-pod
- external-pod
+ extra_hosts:
+ - "localhost.localdomain:127.0.0.1"
mail:
image: maildev/maildev
diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index 933c3b1afa2..37264fb8e4d 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -171,7 +171,10 @@ if [ $res -ne 0 ]; then
fi
if [ -s "$mydir/initdemopostsql.sql" ]; then
+ echo A file initdemopostsql.sql was found, we execute it.
mysql -P$port $base < "$mydir/initdemopostsql.sql"
+else
+ echo No file initdemopostsql.sql found, we extra sql action done.
fi
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index cb931f550d8..2e369e19de1 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -811,7 +811,7 @@ if ($resql) {
// Modify link
if ($canbemodified) {
- print ''.img_edit().' '.img_edit().' ';
}
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index ad1804048c3..c3308393c27 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -439,13 +439,13 @@ if ($resql) {
$e = '';
// Customer
if ($obj->type == 1) {
- $e .= ''.img_edit().' ';
+ $e .= ''.img_edit().' ';
} elseif ($obj->type == 2) {
// Supplier
- $e .= ''.img_edit().' ';
+ $e .= ''.img_edit().' ';
} elseif ($obj->type == 3) {
// User
- $e .= ''.img_edit().' ';
+ $e .= ''.img_edit().' ';
}
print $e;
print ''."\n";
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 1fab2cbf894..c71958691bd 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -433,7 +433,7 @@ if ($action == 'create') {
print $langs->trans('Docdate');
print '';
if ($action != 'editdate') {
- print 'piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).' piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).' ';
@@ -460,7 +460,7 @@ if ($action == 'create') {
print $langs->trans('Codejournal');
print ' ';
if ($action != 'editjournal') {
- print 'piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' ';
@@ -487,7 +487,7 @@ if ($action == 'create') {
print $langs->trans('Piece');
print ' ';
if ($action != 'editdocref') {
- print 'piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' ';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 081d074eab7..1b2f376c33f 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -591,7 +591,7 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
if (!empty($accountancyexport->errors)) {
setEventMessages('', $accountancyexport->errors, 'errors');
- } elseif (!$notifiedexportdate || !$notifiedvalidationdate) {
+ } elseif (!empty($notifiedexportdate) || !empty($notifiedvalidationdate)) {
// Specify as export : update field date_export or date_validated
$error = 0;
$db->begin();
@@ -602,17 +602,18 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
$sql .= " SET";
- if (!$notifiedexportdate && !$notifiedvalidationdate) {
+ if (!empty($notifiedexportdate) && !empty($notifiedvalidationdate)) {
$sql .= " date_export = '".$db->idate($now)."'";
$sql .= ", date_validated = '".$db->idate($now)."'";
- } elseif (!$notifiedexportdate) {
+ } elseif (!empty($notifiedexportdate)) {
$sql .= " date_export = '".$db->idate($now)."'";
- } elseif (!$notifiedvalidationdate) {
+ } elseif (!empty($notifiedvalidationdate)) {
$sql .= " date_validated = '".$db->idate($now)."'";
}
$sql .= " WHERE rowid = ".((int) $movement->id);
- dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported", LOG_DEBUG);
+ dol_syslog("/accountancy/bookkeeping/list.php Function export_file Specify movements as exported", LOG_DEBUG);
+
$result = $db->query($sql);
if (!$result) {
$error++;
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 78160c15954..81060f0e413 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -924,7 +924,7 @@ class AccountancyExport
$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
$date_document = dol_print_date($line->doc_date, '%Y%m%d');
$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
- $date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+ $date_validation = dol_print_date($line->date_validation, '%Y%m%d');
$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
// FEC:JournalCode
@@ -1030,7 +1030,7 @@ class AccountancyExport
$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
$date_document = dol_print_date($line->doc_date, '%Y%m%d');
$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
- $date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+ $date_validation = dol_print_date($line->date_validation, '%Y%m%d');
$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
// FEC:JournalCode
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 55700fe8439..1e7c38b2607 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -369,9 +369,9 @@ if ($result) {
print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
print ''.$langs->trans("DescVentilDoneCustomer").' '.$langs->trans("DescVentilDoneSupplier").' ';
}
- // Login Dolibarr
+ // Login Dolibarr - Link to user
print '';
$editenable = $user->rights->adherent->creer && $user->rights->user->user->creer;
print $form->editfieldkey('LinkedToDolibarrUser', 'login', '', $object, $editenable);
@@ -1907,7 +1907,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Modify
if (!empty($user->rights->adherent->creer)) {
- print ''.$langs->trans("Modify").' '."\n";
+ print ''.$langs->trans("Modify").' '."\n";
} else {
print ''.$langs->trans("Modify").' '."\n";
}
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index f7a8060d9a5..26a45271801 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -587,7 +587,7 @@ if ($rowid > 0) {
print $langs->trans("LinkedToDolibarrThirdParty");
print ' ';
if ($action != 'editthirdparty' && $user->rights->adherent->creer) {
- print 'id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).' id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).' ';
@@ -623,7 +623,7 @@ if ($rowid > 0) {
print ' ';
}
- // Login Dolibarr
+ // Login Dolibarr - Link to user
print '';
print '';
print $langs->trans("LinkedToDolibarrUser");
@@ -631,7 +631,7 @@ if ($rowid > 0) {
if ($action != 'editlogin' && $user->rights->adherent->creer) {
print ' ';
if ($user->rights->user->user->creer) {
- print 'id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).' ';
+ print 'id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).' ';
}
print ' ';
}
@@ -641,7 +641,9 @@ if ($rowid > 0) {
$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
} else {
if ($object->user_id) {
- $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
+ $linkeduser = new User($db);
+ $linkeduser->fetch($object->user_id);
+ print $linkeduser->getNomUrl(-1);
} else {
print ''.$langs->trans("NoDolibarrAccess").' ';
}
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 839e0c8ba47..6a294b0256a 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -481,12 +481,12 @@ if ($rowid > 0) {
// Edit
if ($user->rights->adherent->configurer) {
- print '';
+ print '';
}
// Add
if ($user->rights->adherent->configurer && !empty($object->status)) {
- print '';
+ print '';
} else {
print '';
}
@@ -728,10 +728,10 @@ if ($rowid > 0) {
// Actions
print '';
if ($user->rights->adherent->creer) {
- print ''.img_edit().' ';
+ print ''.img_edit().' ';
}
if ($user->rights->adherent->supprimer) {
- print ''.img_picto($langs->trans("Resiliate"), 'disable.png').' ';
+ print ''.img_picto($langs->trans("Resiliate"), 'disable.png').' ';
}
print " ";
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 63ff01584b0..88f45c9c20e 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -185,9 +185,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/admin/barcode.php b/htdocs/admin/barcode.php
index de05203f5f6..5b48301c30d 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -373,7 +373,7 @@ if ($conf->product->enabled) {
print '';
print '
'.$modBarCode->getExample($langs)." \n";
- if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
+ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM) && $conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
print '
';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index df14ef4c1b0..fab1787f5b9 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -145,7 +145,7 @@ if ($action == 'edit') {
print '
';
print '';
}
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 19a440520b1..3e878b9398b 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -90,7 +90,7 @@ print ''.$langs->trans('ExpenseReportIkDesc').' ';
print ' ';
if ($user->rights->asset->write) {
- print 'rowid.'">'.img_edit().' rowid.'">'.img_edit().' ';
}
@@ -503,7 +503,7 @@ if ($rowid > 0) {
// Edit
if ($user->rights->asset->write) {
- print '';
+ 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 'id.'">'.img_edit().' ';
+ print 'id.'">'.img_edit().' ';
}
print '';
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 839ce4c3f86..d725a659e08 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -186,10 +186,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateBookmark");
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 '
';
if (($action != 'editconditions') && $user->rights->societe->creer) {
- print ' id.'">'.img_edit($langs->trans('SetConditions'), 1).' id.'">'.img_edit($langs->trans('SetConditions'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetMode'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetMode'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetMode'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('Modify'), 1).' ';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index dbfbc84b69f..2ed56683c02 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -749,7 +749,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '
';
+ print $form->buttonsSaveCancel("CreateMailing", '');
print '';
} else {
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 97c6735221f..3283957f8a2 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -424,7 +424,7 @@ if ($object->fetch($id) >= 0) {
print '';
if ($allowaddtarget) {
- print '
';
+ print '
';
} else {
print '
';
//print $langs->trans("MailNoChangePossible");
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 72eee9c22df..cff5c5d0e35 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1974,6 +1974,21 @@ if ($action == 'create') {
$text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object);
}
+ // mandatoryPeriod
+ $nbMandated = 0;
+ foreach ($object->lines as $line) {
+ $res = $line->fetch_product();
+ if ($res > 0 ) {
+ if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+ $nbMandated++;
+ break;
+ }
+ }
+ }
+ if ($nbMandated > 0) {
+ $text .= '
'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'
';
+ }
+
if (!$error) {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
}
@@ -2078,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).' id.'">'.img_edit($langs->trans('SetDate'), 1).' ';
@@ -2105,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).' id.'">'.img_edit($langs->trans('SetConditions'), 1).' ';
@@ -2135,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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).' ';
@@ -2154,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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).' ';
@@ -2183,7 +2198,7 @@ if ($action == 'create') {
}
print ' ';
if ($action != 'editavailability' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
- print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).' ';
@@ -2203,7 +2218,7 @@ if ($action == 'create') {
print $langs->trans('SendingMethod');
print ' ';
if ($action != 'editshippingmethod' && $usercancreate) {
- print 'id.'">'.img_edit($langs->trans('SetShippingMode'), 1).' id.'">'.img_edit($langs->trans('SetShippingMode'), 1).' ';
@@ -2240,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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).' ';
@@ -2261,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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' ';
@@ -2281,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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' ';
@@ -2322,7 +2337,7 @@ if ($action == 'create') {
print $langs->trans('BankAccount');
print ' ';
if ($action != 'editbankaccount' && $usercancreate) {
- print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
@@ -2358,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/comm/propal/list.php b/htdocs/comm/propal/list.php
index bff848c78e2..5791937079b 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -472,11 +472,11 @@ $sql .= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date
$sql .= ' p.note_public, p.note_private,';
$sql .= ' p.fk_cond_reglement,p.fk_mode_reglement,p.fk_shipping_method,p.fk_input_reason,';
$sql .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
-$sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity as user_entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
+$sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity as user_entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= ", sc.fk_soc, sc.fk_user";
}
-if ($search_categ_cus) {
+if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
$sql .= ", cc.fk_categorie, cc.fk_soc";
}
// Add fields from extrafields
@@ -494,7 +494,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_cus)) {
+if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
}
$sql .= ', '.MAIN_DB_PREFIX.'propal as p';
@@ -599,6 +599,7 @@ if ($search_multicurrency_montant_ttc != '') {
if ($sall) {
$sql .= natural_search(array_keys($fieldstosearchall), $sall);
}
+
if ($search_categ_cus > 0) {
$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
}
@@ -1715,8 +1716,8 @@ if ($resql) {
$userstatic->login = $obj->login;
$userstatic->lastname = $obj->lastname;
$userstatic->firstname = $obj->firstname;
- $userstatic->email = $obj->email;
- $userstatic->statut = $obj->statut;
+ $userstatic->email = $obj->user_email;
+ $userstatic->statut = $obj->user_statut;
$userstatic->entity = $obj->user_entity;
$userstatic->photo = $obj->photo;
$userstatic->office_phone = $obj->office_phone;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2e37cdcd0a1..decabedc2e8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -294,6 +294,7 @@ if (empty($reshook)) {
if (!empty($origin) && !empty($originid)) {
// Parse element/subelement (ex: project_task)
$element = $subelement = $origin;
+ $regs = array();
if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
$element = $regs [1];
$subelement = $regs [2];
@@ -1410,6 +1411,7 @@ if (empty($reshook)) {
/*
* View
*/
+
$title = $langs->trans('Order')." - ".$langs->trans('Card');
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
@@ -1922,6 +1924,21 @@ if ($action == 'create' && $usercancreate) {
);
}
+ // mandatoryPeriod
+ $nbMandated = 0;
+ foreach ($object->lines as $line) {
+ $res = $line->fetch_product();
+ if ($res > 0 ) {
+ if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+ $nbMandated++;
+ break;
+ }
+ }
+ }
+ if ($nbMandated > 0 ) $text .= ''.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'
';
+
+
+
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
}
@@ -2358,17 +2375,17 @@ if ($action == 'create' && $usercancreate) {
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
print ' '.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$langs->trans('AmountHT').' ';
- print ''.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).$alert.' ';
+ print ''.price($object->total_ht, 1, '', 1, -1, -1, $conf->currency).$alert.' ';
// Total VAT
- print ''.$langs->trans('AmountVAT').' '.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).' '.$langs->trans('AmountVAT').' '.price($object->total_tva, 1, '', 1, -1, -1, $conf->currency).' '.$langs->transcountry("AmountLT1", $mysoc->country_code).' ';
- print ''.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).' '.price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency).' ';
}
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { // Localtax2 IRPF
print ''.$langs->transcountry("AmountLT2", $mysoc->country_code).' ';
- print ''.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).' '.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).' ';
}
// Total TTC
- print ''.$langs->trans('AmountTTC').' '.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).' '.$langs->trans('AmountTTC').' '.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).' ' . $langs->trans('Status') . ' ' . $object->getLibStatut(4) . ' ';
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).' id.'">'.img_edit($langs->trans('SetConditions'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetMode'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetModel'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('Edit'), 1).' ';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 105c94d6a73..764af7a232a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -408,13 +408,21 @@ if (empty($reshook)) {
} elseif ($action == 'setinvoicedate' && $usercancreate) {
$object->fetch($id);
$old_date_lim_reglement = $object->date_lim_reglement;
- $date = dol_mktime(12, 0, 0, GETPOST('invoicedatemonth', 'int'), GETPOST('invoicedateday', 'int'), GETPOST('invoicedateyear', 'int'));
- if (empty($date)) {
+ $newdate = dol_mktime(0, 0, 0, GETPOST('invoicedatemonth', 'int'), GETPOST('invoicedateday', 'int'), GETPOST('invoicedateyear', 'int'), 'tzserver');
+ if (empty($newdate)) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
- header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate');
+ header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate&token='.newToken());
exit;
}
- $object->date = $date;
+ if ($newdate > (dol_now('tzuserrel') + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+ if (empty($conf->global->INVOICE_MAX_FUTURE_DELAY)) {
+ setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
+ } else {
+ setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
+ }
+ }
+
+ $object->date = $newdate;
$new_date_lim_reglement = $object->calculate_date_lim_reglement();
if ($new_date_lim_reglement > $old_date_lim_reglement) {
$object->date_lim_reglement = $new_date_lim_reglement;
@@ -428,7 +436,9 @@ if (empty($reshook)) {
}
} elseif ($action == 'setdate_pointoftax' && $usercancreate) {
$object->fetch($id);
- $date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
+
+ $date_pointoftax = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'), 'tzserver');
+
$object->date_pointoftax = $date_pointoftax;
$result = $object->update($user);
if ($result < 0) {
@@ -1001,14 +1011,16 @@ if (empty($reshook)) {
$error++;
}
+ $dateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
+ $date_pointoftax = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'), 'tzserver');
+
// Replacement invoice
if (GETPOST('type') == Facture::TYPE_REPLACEMENT) {
- $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
if (empty($dateinvoice)) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = 'create';
- } elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+ } elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
$error++;
setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
$action = 'create';
@@ -1020,8 +1032,6 @@ if (empty($reshook)) {
$action = 'create';
}
- $date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
-
if (!$error) {
// This is a replacement invoice
$result = $object->fetch(GETPOST('fac_replacement', 'int'));
@@ -1064,19 +1074,16 @@ if (empty($reshook)) {
$action = 'create';
}
- $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
if (empty($dateinvoice)) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = 'create';
- } elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+ } elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
$error++;
setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
$action = 'create';
}
- $date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
-
if (!$error) {
if (!empty($originentity)) {
$object->entity = $originentity;
@@ -1280,19 +1287,16 @@ if (empty($reshook)) {
// Standard invoice or Deposit invoice, created from a Predefined template invoice
if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0) {
- $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
if (empty($dateinvoice)) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = 'create';
- } elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+ } elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
$error++;
setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
$action = 'create';
}
- $date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
-
if (!$error) {
$object->socid = GETPOST('socid', 'int');
$object->type = GETPOST('type');
@@ -1327,8 +1331,6 @@ if (empty($reshook)) {
$typeamount = GETPOST('typedeposit', 'aZ09');
$valuestandardinvoice = price2num(str_replace('%', '', GETPOST('valuestandardinvoice', 'alpha')), 'MU');
$valuedeposit = price2num(str_replace('%', '', GETPOST('valuedeposit', 'alpha')), 'MU');
- $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
- $date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
if (GETPOST('socid', 'int') < 1) {
$error++;
@@ -1340,7 +1342,7 @@ if (empty($reshook)) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = 'create';
- } elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+ } elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
$error++;
setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
$action = 'create';
@@ -1822,19 +1824,16 @@ if (empty($reshook)) {
// Situation invoices
if (GETPOST('type') == Facture::TYPE_SITUATION && GETPOST('situations')) {
- $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
if (empty($dateinvoice)) {
$error++;
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
setEventMessages($mesg, null, 'errors');
- } elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+ } elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
$error++;
setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
$action = 'create';
}
- $date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
-
if (!(GETPOST('situations', 'int') > 0)) {
$error++;
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceSituation"));
@@ -3529,7 +3528,8 @@ if ($action == 'create') {
print ' ';
}
- $newdateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+ $newdateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver');
+ $date_pointoftax = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'), 'tzserver');
// Date invoice
print ''.$langs->trans('DateInvoice').' ';
@@ -3539,7 +3539,6 @@ if ($action == 'create') {
// Date point of tax
if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
print ' '.$langs->trans('DatePointOfTax').' ';
- $date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
print $form->selectDate($date_pointoftax ? $date_pointoftax : -1, 'date_pointoftax', '', '', '', "add", 1, 1);
print ' '.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'
';
+
+
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, (($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) ? "no" : "yes"), 2);
}
@@ -4322,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).' id.'">'.img_edit($langs->trans('SetDate'), 1).' ';
@@ -4342,7 +4356,7 @@ if ($action == 'create') {
print '';
print ' ';
if ($action == 'editdate_pointoftax') {
@@ -4359,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).' id.'">'.img_edit($langs->trans('SetConditions'), 1).' ';
@@ -4380,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).' id.'">'.img_edit($langs->trans('SetDate'), 1).' ';
@@ -4404,7 +4418,7 @@ if ($action == 'create') {
print $langs->trans('PaymentMode');
print ' ';
if ($action != 'editmode' && $usercancreate) {
- print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' id.'">'.img_edit($langs->trans('SetMode'), 1).' ';
@@ -4424,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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' ';
@@ -4440,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).' id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).' ';
@@ -4468,7 +4482,7 @@ if ($action == 'create') {
print $langs->trans('BankAccount');
print ' ';
if (($action != 'editbankaccount') && $usercancreate) {
- print ' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
@@ -4488,7 +4502,7 @@ if ($action == 'create') {
print $langs->trans('IncotermLabel');
print ' ';
if ($usercancreate) {
- print ''.img_edit().' ';
+ print ''.img_edit().' ';
} else {
print ' ';
}
@@ -4518,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).' id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).' id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).' id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).' id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).' id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).' id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).' id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).' ';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5186bbb297c..22cd946275c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2267,7 +2267,6 @@ class Facture extends CommonInvoice
$sql .= ' SET fk_facture = NULL, fk_facture_line = NULL';
$sql .= ' WHERE fk_facture_line IN ('.$this->db->sanitize(join(',', $list_rowid_det)).')';
- dol_syslog(get_class($this)."::delete", LOG_DEBUG);
if (!$this->db->query($sql)) {
$this->error = $this->db->error()." sql=".$sql;
$this->errors[] = $this->error;
@@ -2276,6 +2275,30 @@ class Facture extends CommonInvoice
}
}
+ // Remove other links to the deleted invoice
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'eventorganization_conferenceorboothattendee';
+ $sql .= ' SET fk_invoice = NULL';
+ $sql .= ' WHERE fk_invoice = '.((int) $rowid);
+
+ if (!$this->db->query($sql)) {
+ $this->error = $this->db->error()." sql=".$sql;
+ $this->errors[] = $this->error;
+ $this->db->rollback();
+ return -5;
+ }
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time';
+ $sql .= ' SET invoice_id = NULL, invoice_line_id = NULL';
+ $sql .= ' WHERE invoice_id = '.((int) $rowid);
+
+ if (!$this->db->query($sql)) {
+ $this->error = $this->db->error()." sql=".$sql;
+ $this->errors[] = $this->error;
+ $this->db->rollback();
+ return -5;
+ }
+
// If we decrease stock on invoice validation, we increase back if a warehouse id was provided
if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse != -1) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
@@ -2299,17 +2322,13 @@ class Facture extends CommonInvoice
// Invoice line extrafileds
$main = MAIN_DB_PREFIX.'facturedet';
$ef = $main."_extrafields";
- $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture = ".((int) $rowid).")";
+ $sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture = ".((int) $rowid).")";
// Delete invoice line
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facturedet WHERE fk_facture = '.((int) $rowid);
- dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-
if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact()) {
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE rowid = '.((int) $rowid);
- dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-
$resql = $this->db->query($sql);
if ($resql) {
// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index e6a49cf6077..b2074224412 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -549,7 +549,7 @@ $sql .= ' typent.code as typent_code,';
$sql .= ' state.code_departement as state_code, state.nom as state_name,';
$sql .= ' country.code as country_code,';
$sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
-$sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
+$sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
if (!$sall) {
@@ -572,7 +572,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_cus) && $search_categ_cus!=-1) {
+if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
}
@@ -2013,8 +2013,8 @@ if ($resql) {
$userstatic->login = $obj->login;
$userstatic->lastname = $obj->lastname;
$userstatic->firstname = $obj->firstname;
- $userstatic->email = $obj->email;
- $userstatic->statut = $obj->statut;
+ $userstatic->email = $obj->user_email;
+ $userstatic->statut = $obj->user_statut;
$userstatic->entity = $obj->entity;
$userstatic->photo = $obj->photo;
$userstatic->office_phone = $obj->office_phone;
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).' id.'">'.img_edit($langs->trans('SetDate'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetConditions'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetDate'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetMode'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
@@ -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).' id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).' ';
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index ca4d3d6ccaf..5fe028e1268 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -42,7 +42,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
// Load translation files required by the page
$langs->loadLangs(array('bills', 'companies', 'other'));
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOST("mode") ? GETPOST("mode") : 'customer';
if ($mode == 'customer' && !$user->rights->facture->lire) {
accessforbidden();
}
@@ -244,7 +244,7 @@ if (!count($arrayyears)) {
$h = 0;
$head = array();
-$head[$h][0] = DOL_URL_ROOT.'/compta/facture/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT.'/compta/facture/stats/index.php?mode='.urlencode($mode);
$head[$h][1] = $langs->trans("ByMonthYear");
$head[$h][2] = 'byyear';
$h++;
@@ -261,12 +261,12 @@ complete_head_from_modules($conf, $langs, null, $head, $h, $type);
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
// We use select_thirdparty_list instead of select_company so we can use $filter and share same code for customer and supplier.
-$tmp_companies = $form->select_thirdparty_list($socid, 'socid', $filter, 1, 0, 0, array(), '', 1);
-//Array passed as an argument to Form::selectarray to build a proper select input
-$companies = array();
-
-foreach ($tmp_companies as $value) {
- $companies[$value['key']] = $value['label'];
+$filter = '';
+if ($mode == 'customer') {
+ $filter = 's.client in (1,2,3)';
+}
+if ($mode == 'supplier') {
+ $filter = 's.fournisseur = 1';
}
print '';
@@ -281,14 +281,8 @@ print '
';
print ''.$langs->trans("Filter").' '.$langs->trans("ThirdParty").' ';
-if ($mode == 'customer') {
- $filter = 's.client in (1,2,3)';
-}
-if ($mode == 'supplier') {
- $filter = 's.fournisseur = 1';
-}
print img_picto('', 'company', 'class="pictofixedwidth"');
-print $form->selectarray('socid', $companies, $socid, 1, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth300', 1);
+print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300');
print ' id.'">'.img_edit($langs->trans('SetDate'), 1).' id.'">'.img_edit($langs->trans('SetDate'), 1).'
';
print '
';
@@ -554,7 +554,7 @@ if ($action == 'new') {
print '';
print ' ';
if ($action == 'editrefext')
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 257e7617531..58cfe5be72d 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -198,8 +198,7 @@ if ($id > 0 || $ref) {
print '
';
print '';
- //print ''.$langs->trans("Ref").' '.$object->getNomUrl(1).' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Amount").' '.price($object->amount).' ';
+ print ' ';
$labelofbankfield = "BankToReceiveWithdraw";
if ($object->type == 'bank-transfer') {
$labelofbankfield = 'BankToPayCreditTransfer';
@@ -251,7 +250,7 @@ if ($id > 0 || $ref) {
print ' ';
print '';
+ print ' ';
$labelfororderfield = 'WithdrawalFile';
if ($object->type == 'bank-transfer') {
$labelfororderfield = 'CreditTransferFile';
@@ -412,10 +411,9 @@ if ($id > 0 || $ref) {
// Status of line
print " ";
+ print '';
print $ligne->LibStatut($obj->statut, 2);
- print " ";
- print ' ';
- print sprintf("%06s", $obj->rowid);
+ print ''.$obj->rowid.' ';
print ' ';
$thirdparty = new Societe($db);
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 1c57feca37e..dfd8a920f93 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -137,29 +137,31 @@ class LignePrelevement
return $langs->trans($this->statuts[$status]);
} elseif ($mode == 1) {
if ($status == 0) {
- return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
+ return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"').' '.$langs->trans($this->statuts[$status]); // Waiting
} elseif ($status == 2) {
- return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
+ return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"').' '.$langs->trans($this->statuts[$status]); // Credited
} elseif ($status == 3) {
- return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
+ return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"').' '.$langs->trans($this->statuts[$status]); // Refused
}
} elseif ($mode == 2) {
if ($status == 0) {
- return img_picto($langs->trans($this->statuts[$status]), 'statut1');
+ return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"');
} elseif ($status == 2) {
- return img_picto($langs->trans($this->statuts[$status]), 'statut6');
+ return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"');
} elseif ($status == 3) {
- return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+ return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"');
}
} elseif ($mode == 3) {
if ($status == 0) {
- return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
+ return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"');
} elseif ($status == 2) {
- return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
+ return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"');
} elseif ($status == 3) {
- return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+ return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"');
}
}
+
+ //return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
/**
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index c00c29e1c39..a100cd9156f 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -100,8 +100,8 @@ if ($id > 0 || $ref) {
print '
';
print ''."\n";
- //print ''.$langs->trans("Ref").' '.$object->getNomUrl(1).' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Ref").' '.$object->getNomUrl(1).' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Amount").' '.price($object->amount).' ';
+ print ' ';
$labelofbankfield = "BankToReceiveWithdraw";
if ($object->type == 'bank-transfer') {
$labelofbankfield = 'BankToPayCreditTransfer';
@@ -145,7 +145,7 @@ if ($id > 0 || $ref) {
print ' ';
print '';
+ print ' ';
$labelfororderfield = 'WithdrawalFile';
if ($object->type == 'bank-transfer') {
$labelfororderfield = 'CreditTransferFile';
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 8711f663d55..9ff5970e656 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -90,8 +90,8 @@ if ($prev_id > 0 || $ref) {
print '
';
print ''."\n";
- //print ''.$langs->trans("Ref").' '.$object->getNomUrl(1).' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Ref").' '.$object->getNomUrl(1).' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Amount").' '.price($object->amount).' ';
+ print ' ';
$labelofbankfield = "BankToReceiveWithdraw";
if ($object->type == 'bank-transfer') {
$labelofbankfield = 'BankToPayCreditTransfer';
@@ -135,7 +135,7 @@ if ($prev_id > 0 || $ref) {
print ' ';
print '';
+ print ' ';
$labelfororderfield = 'WithdrawalFile';
if ($object->type == 'bank-transfer') {
$labelfororderfield = 'CreditTransferFile';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 4a9bfbf6345..5833f417ddd 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -89,8 +89,8 @@ if ($prev_id > 0 || $ref) {
print '
';
print ''."\n";
- //print ''.$langs->trans("Ref").' '.$object->getNomUrl(1).' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Ref").' '.$object->getNomUrl(1).' '.$langs->trans("Date").' '.dol_print_date($object->datec, 'day').' '.$langs->trans("Amount").' '.price($object->amount).' ';
+ print ' ';
$labelofbankfield = "BankToReceiveWithdraw";
if ($object->type == 'bank-transfer') {
$labelofbankfield = 'BankToPayCreditTransfer';
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 5aa7344eea5..bea351ac46c 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -222,7 +222,7 @@ if ($id) {
print '
';
+ print '
';
print '';
}
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).' id.'">'.img_edit($langs->trans('SetMode'), 1).'
';
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).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'
';
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).' id.'">'.img_edit($langs->trans('SetMode'), 1).'
';
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).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
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 '';
if ($user->rights->societe->contact->creer) {
- print '
'.$langs->trans('Modify').' ';
+ print '
'.$langs->trans('Modify').' ';
}
if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {
- print '
'.$langs->trans("CreateDolibarrLogin").' ';
+ print '
'.$langs->trans("CreateDolibarrLogin").' ';
}
if ($user->rights->societe->contact->supprimer) {
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 835e7f0cafb..8ae2deae1cf 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1288,7 +1288,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
if ($objsoc->id > 0) {
$morehtmlref .= $objsoc->getNomUrl(1, 'contact');
} else {
- $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+ $morehtmlref .= '
'.$langs->trans("ContactNotLinkedToCompany").' ';
}
}
$morehtmlref .= '
';
if ($action != 'editlevel' && $user->rights->societe->contact->creer) {
- print ' id.'">'.img_edit($langs->trans('Modify'), 1).' id.'">'.img_edit($langs->trans('Modify'), 1).' ';
@@ -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/list.php b/htdocs/contact/list.php
index bae32e8b3b1..71e888540b2 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -575,13 +575,13 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
}
$param .= '&begin='.urlencode($begin).'&userid='.urlencode($userid).'&contactname='.urlencode($sall);
$param .= '&type='.urlencode($type).'&view='.urlencode($view);
-if (!empty($search_categ)) {
+if (!empty($search_categ) && $search_categ != '-1') {
$param .= '&search_categ='.urlencode($search_categ);
}
-if (!empty($search_categ_thirdparty)) {
+if (!empty($search_categ_thirdparty) && $search_categ_thirdparty != '-1') {
$param .= '&search_categ_thirdparty='.urlencode($search_categ_thirdparty);
}
-if (!empty($search_categ_supplier)) {
+if (!empty($search_categ_supplier) && $search_categ_supplier != '-1') {
$param .= '&search_categ_supplier='.urlencode($search_categ_supplier);
}
if ($sall != '') {
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/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 2cc477520ea..a6157d2a26b 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -129,6 +129,7 @@ if ($action == 'add' && !empty($permissiontoadd)) {
if (!$error) {
$result = $object->create($user);
+ var_dump($object);exit;
if ($result > 0) {
// Creation OK
if ($conf->categorie->enabled && method_exists($object, 'setCategories')) {
diff --git a/htdocs/core/ajax/fetchKnowledgeRecord.php b/htdocs/core/ajax/fetchKnowledgeRecord.php
index 00294d1b3c9..0182887c225 100644
--- a/htdocs/core/ajax/fetchKnowledgeRecord.php
+++ b/htdocs/core/ajax/fetchKnowledgeRecord.php
@@ -54,7 +54,6 @@ $action = GETPOST('action', 'aZ09');
$idticketgroup = GETPOST('idticketgroup', 'aZ09');
$idticketgroup = GETPOST('idticketgroup', 'aZ09');
$lang = GETPOST('lang', 'aZ09');
-$popupurl = GETPOST('popupurl', 'bool');
/*
* Actions
@@ -69,13 +68,12 @@ $popupurl = GETPOST('popupurl', 'bool');
if ($action == "getKnowledgeRecord") {
$response = '';
- $sql = "SELECT kr.rowid, kr.ref, kr.question, kr.answer,l.url,ctc.code";
- $sql .= " FROM ".MAIN_DB_PREFIX."links as l";
- $sql .= " INNER JOIN ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as kr ON kr.rowid = l.objectid";
- $sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctc ON ctc.rowid = kr.fk_c_ticket_category";
+ $sql = "SELECT kr.rowid, kr.ref, kr.question, kr.answer,kr.url,ctc.code";
+ $sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as kr ";
+ $sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctc ON ctc.rowid = kr.fk_c_ticket_category";
$sql .= " WHERE ctc.code = '".$db->escape($idticketgroup)."'";
- $sql .= " AND ctc.active = 1 AND ctc.public = 1 AND (kr.lang = '".$db->escape($lang)."' OR kr.lang = 0)";
- $sql .= " AND kr.status = 1";
+ $sql .= " AND ctc.active = 1 AND ctc.public = 1 AND (kr.lang = '".$db->escape($lang)."' OR kr.lang = 0 OR kr.lang IS NULL)";
+ $sql .= " AND kr.status = 1 AND (kr.answer IS NOT NULL AND kr.answer <> '')";
$resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
@@ -83,33 +81,7 @@ if ($action == "getKnowledgeRecord") {
$response = array();
while ($i < $num) {
$obj = $db->fetch_object($resql);
- if ($popupurl == "false") {
- $url = "url. "\" target=\"_blank\">".$obj->url." ";
- $response[] = array('title'=>$obj->question,'ref'=>$obj->url,'answer'=>$obj->answer,'url'=>$url);
- } else {
- $name = $obj->ref;
- $buttonstring = $obj->url;
- $url = $obj->url;
- $urltoprint = ''.$buttonstring.' ';
- $urltoprint .= '';
- $urltoprint .= '';
- $response[] = array('title'=>$obj->question,'ref'=>$obj->url,'answer'=>$obj->answer,'url'=>$urltoprint);
- }
+ $response[] = array('title'=>$obj->question,'ref'=>$obj->ref,'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url'=>$obj->url);
$i++;
}
} else {
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 7b271fafdf2..6047d8d289c 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -99,6 +99,8 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
$perm = 1;
} elseif ($table_element_line == 'ecm_files' && $fk_element == 'fk_ticket' && !empty($user->rights->ticket->write)) {
$perm = 1;
+ } elseif ($table_element_line == 'projet_task' && $fk_element == 'fk_projet' && $user->rights->projet->creer) {
+ $perm = 1;
} else {
$tmparray = explode('_', $table_element_line);
$tmpmodule = $tmparray[0]; $tmpobject = preg_replace('/line$/', '', $tmparray[1]);
@@ -111,7 +113,7 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
// We should not be here. If we are not allowed to reorder rows, feature should not be visible on script.
// If we are here, it is a hack attempt, so we report a warning.
print 'Bad permission to modify position of lines for object in table '.$table_element_line;
- dol_syslog('Bad permission to modify position of lines for object in table '.$table_element_line.', fk_element '.$fk_element, LOG_WARNING);
+ dol_syslog('Bad permission to modify position of lines for object in table='.$table_element_line.', fk_element='.$fk_element, LOG_WARNING);
accessforbidden('Bad permission to modify position of lines for object in table '.$table_element_line);
}
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index e4418020bfc..fe01eae730b 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -145,9 +145,9 @@ class box_graph_invoices_permonth extends ModeleBoxes
$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
// default value for customer mode
- $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
if ($mode == 'supplier') {
- $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$endyear.'.png';
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$endyear.'.png';
}
$px1 = new DolGraph();
diff --git a/htdocs/core/boxes/box_graph_invoices_peryear.php b/htdocs/core/boxes/box_graph_invoices_peryear.php
index 14a431bcb84..22d9ad956e7 100644
--- a/htdocs/core/boxes/box_graph_invoices_peryear.php
+++ b/htdocs/core/boxes/box_graph_invoices_peryear.php
@@ -129,8 +129,10 @@ class box_graph_invoices_peryear extends ModeleBoxes
$filenamenb = $dir."/".$prefix."invoicesamountyears-".$endyear.".png";
// default value for customer mode
- $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountyears-'.$endyear.'.png';
- if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountyears-'.$endyear.'.png';
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountyears-'.$endyear.'.png';
+ if ($mode == 'supplier') {
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountyears-'.$endyear.'.png';
+ }
$px2 = new DolGraph();
$mesg = $px2->isGraphKo();
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 5b95b58d29d..0a5e4548e3f 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -68,7 +68,7 @@ class box_members_by_type extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
- $this->hidden = !($user->rights->adherent->lire);
+ $this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index 9de6a3af12f..cf70bcafcb1 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -67,7 +67,7 @@ class box_members_last_modified extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
- $this->hidden = !($user->rights->adherent->lire);
+ $this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index 3cea44c2dc3..949edd567f3 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -67,7 +67,7 @@ class box_members_last_subscriptions extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
- $this->hidden = !($user->rights->adherent->lire);
+ $this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index be835511c6b..fe64f37c805 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -67,7 +67,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
- $this->hidden = !($user->rights->adherent->lire);
+ $this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index eb5edb921f3..7adf7a89079 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3539,7 +3539,7 @@ abstract class CommonObject
$this->db->free($resql);
- // Now update global field total_ht, total_ttc and tva
+ // Now update global field total_ht, total_ttc, total_tva, total_localtax1, total_localtax2, multicurrency_total_*
$fieldht = 'total_ht';
$fieldtva = 'tva';
$fieldlocaltax1 = 'localtax1';
@@ -3582,6 +3582,7 @@ abstract class CommonObject
dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
$resql = $this->db->query($sql);
+
if (!$resql) {
$error++;
$this->error = $this->db->lasterror();
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 66f0b52878c..40bcf3aa529 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -26,6 +26,8 @@
/**
* Parent class for class inheritance lines of business objects
* This class is useless for the moment so no inherit are done on it
+ *
+ * TODO For the moment we use the extends on CommonObject until PHP min is 5.4 so we can use Traits.
*/
abstract class CommonObjectLine extends CommonObject
{
@@ -61,7 +63,7 @@ abstract class CommonObjectLine extends CommonObject
}
/**
- * Returns the label, shot_label or code found in units dictionary from ->fk_unit.
+ * Returns the label, short_label or code found in units dictionary from ->fk_unit.
* A langs->trans() must be called on result to get translated value.
*
* @param string $type Label type ('long', 'short' or 'code'). This can be a translation key.
@@ -104,7 +106,4 @@ abstract class CommonObjectLine extends CommonObject
return -1;
}
}
- // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.
-
- // For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 46159a52519..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 .= ' : ';
@@ -7874,6 +7874,11 @@ class Form
if (empty($conf->expedition->enabled)) {
continue; // Do not show if module disabled
}
+ } elseif ($objecttype == 'mo') {
+ $tplpath = 'mrp/mo';
+ if (empty($conf->mrp->enabled)) {
+ continue; // Do not show if module disabled
+ }
} elseif ($objecttype == 'ficheinter') {
$tplpath = 'fichinter';
if (empty($conf->ficheinter->enabled)) {
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 4b12b4513e5..0590566582d 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -178,7 +178,8 @@ class FormActions
$sortfield = 'a.datep,a.id';
$sortorder = 'DESC,DESC';
- $listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
+ $actioncomm = new ActionComm($this->db);
+ $listofactions = $actioncomm->getActions($socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
if (!is_array($listofactions)) {
dol_print_error($this->db, 'FailedToGetActions');
}
@@ -221,13 +222,14 @@ class FormActions
if ($typeelement == 'project') {
$projectid = $object->id;
}
+ $taskid = 0;
if ($typeelement == 'task') {
$taskid = $object->id;
}
$newcardbutton = '';
if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create)) {
- $url = DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog', 'tzuser')).'&origin='.urlencode($typeelement).'&originid='.$object->id.((!empty($object->socid) && $object->socid > 0) ? '&socid='.$object->socid : ((!empty($socid) && $socid > 0) ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').($taskid > 0 ? '&taskid='.$taskid : '').'&backtopage='.urlencode($urlbacktopage);
+ $url = DOL_URL_ROOT.'/comm/action/card.php?action=create&token='.newToken().'&datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog', 'tzuser')).'&origin='.urlencode($typeelement).'&originid='.((int) $object->id).((!empty($object->socid) && $object->socid > 0) ? '&socid='.((int) $object->socid) : ((!empty($socid) && $socid > 0) ? '&socid='.((int) $socid) : '')).($projectid > 0 ? '&projectid='.((int) $projectid) : '').($taskid > 0 ? '&taskid='.((int) $taskid) : '').'&backtopage='.urlencode($urlbacktopage);
$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
}
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index ac6bad50e41..d1fc8f65edb 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -761,20 +761,21 @@ class FormCompany extends Form
/**
* Return a select list with types of contacts
*
- * @param object $object Object to use to find type of contact
- * @param string $selected Default selected value
- * @param string $htmlname HTML select name
- * @param string $source Source ('internal' or 'external')
- * @param string $sortorder Sort criteria ('position', 'code', ...)
- * @param int $showempty 1=Add en empty line
- * @param string $morecss Add more css to select component
- * @param int $output 0=return HTML, 1= direct print
+ * @param object $object Object to use to find type of contact
+ * @param string $selected Default selected value
+ * @param string $htmlname HTML select name
+ * @param string $source Source ('internal' or 'external')
+ * @param string $sortorder Sort criteria ('position', 'code', ...)
+ * @param int $showempty 1=Add en empty line
+ * @param string $morecss Add more css to select component
+ * @param int $output 0=return HTML, 1= direct print
* @param int $forcehidetooltip Force hide tooltip for admin
- * @return void
+ * @return string|void Depending on $output param, return the HTML select list (recommended method) or nothing
*/
public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '', $output = 1, $forcehidetooltip = 0)
{
global $user, $langs;
+
$out = '';
if (is_object($object) && method_exists($object, 'liste_type_contact')) {
$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 591fb5ed2d1..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) {
@@ -2033,8 +2033,8 @@ class FormFile
print ' '.dol_print_date(dol_now(), "dayhour", "tzuser").' ';
print '';
- print ' ';
} else {
print '';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 04d4ad34e89..823e90fcac3 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -956,15 +956,14 @@ class FormMail extends Form
$out .= ''."\n";
if ($this->withform == 1 || $this->withform == -1) {
- $out .= '';
- $out .= '
'."\n";
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 9696dca7183..18b42c597bf 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -39,6 +39,8 @@ class FormProjets
*/
public $error = '';
+ public $nboftasks;
+
/**
* Constructor
@@ -307,11 +309,11 @@ class FormProjets
* @param int $disabled Disabled
* @param string $morecss More css added to the select component
* @param string $projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
- * @param string $showproject 'all' = Show project info, ''=Hide project info
+ * @param string $showmore 'all' = Show project info, 'progress' = Show task progression, ''=Show nothing more
* @param User $usertofilter User object to use for filtering
* @return int Nbr of tasks if OK, <0 if KO
*/
- public function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+ public function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showmore = 'all', $usertofilter = null)
{
global $user, $conf, $langs;
@@ -336,7 +338,8 @@ class FormProjets
}
// Search all projects
- $sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
+ $sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, t.progress,';
+ $sql .= ' p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, p.usage_task,';
$sql .= ' s.nom as name';
$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
@@ -407,7 +410,7 @@ class FormProjets
$disabled = 1;
}
- if ($showproject == 'all') {
+ if (preg_match('/all/', $showmore)) {
$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
//else $labeltoshow.=' ('.$langs->trans("Private").')';
@@ -442,6 +445,10 @@ class FormProjets
// Label for task
$labeltoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
$titletoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
+ if ($obj->usage_task && preg_match('/progress/', $showmore)) {
+ $labeltoshow .= ' ('.$obj->progress.'%) ';
+ $titletoshow .= ' ('.$obj->progress.'%) ';
+ }
if (!empty($selected) && $selected == $obj->rowid) {
$out .= 'nboftasks = $num;
+
print $out;
$this->db->free($resql);
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index dd43ae0ffae..c37766b24df 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/core/class/html.formticket.class.php
* \ingroup ticket
- * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
+ * \brief File of class to generate the form for creating a new ticket.
*/
require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
require_once DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php";
@@ -32,12 +32,12 @@ if (!class_exists('FormCompany')) {
}
/**
- * Classe permettant la generation du formulaire d'un nouveau ticket.
+ * Class to generate the form for creating a new ticket.
+ * Usage: $formticket = new FormTicket($db)
+ * $formticket->proprietes=1 ou chaine ou tableau de valeurs
+ * $formticket->show_form() affiche le formulaire
*
* @package Ticket
- * \remarks Utilisation: $formticket = new FormTicket($db)
- * \remarks $formticket->proprietes=1 ou chaine ou tableau de valeurs
- * \remarks $formticket->show_form() affiche le formulaire
*/
class FormTicket
{
@@ -258,43 +258,41 @@ class FormTicket
if (idgroupticket != "") {
$.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/fetchKnowledgeRecord.php\',
- data: { action: \'getKnowledgeRecord\', idticketgroup: idgroupticket, token: \''.newToken().'\', lang:\''.$langs->defaultlang.'\', popupurl:false},
+ data: { action: \'getKnowledgeRecord\', idticketgroup: idgroupticket, token: \''.newToken().'\', lang:\''.$langs->defaultlang.'\'},
type: \'GET\',
success: function(response) {
var urllist = \'\';
console.log("We received response "+response);
response = JSON.parse(response)
for (key in response) {
- console.log(response[key])
- urllist += "" + response[key].title + ": " +response[key].url+" ";
+ answer = response[key].answer;
+ urllist += \''.$langs->trans("KMFoundForTicketGroup").' '.$langs->trans("KMFoundForTicketGroup").'
").html($(this).attr("data-html"))
+ .dialog({
+ autoOpen: false,
+ modal: true,
+ height: (window.innerHeight - 150),
+ width: "80%",
+ title: $(this).attr("title"),
+ });
+ $dialog.dialog("open");
+ console.log($dialog);
+ })
}
},
error : function(output) {
- console.log("error");
+ console.error("Error on Fetch of KM articles");
},
});
}
};
- $("#selectcategory_code").bind("change",function() { groupticketchange(); });
- MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
- var trackChange = function(element) {
- var observer = new MutationObserver(function(mutations, observer) {
- if (mutations[0].attributeName == "value") {
- $(element).trigger("change");
- }
- });
- observer.observe(element, {
- attributes: true
- });
- }
-
- trackChange($("#selectcategory_code")[0]);
-
+ $("#selectcategory_code").on("change",function() { groupticketchange(); });
if ($("#selectcategory_code").val() != "") {
groupticketchange();
}
@@ -666,7 +664,7 @@ class FormTicket
dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
- if (empty($outputlangs)) {
+ if (is_null($outputlangs) || !is_object($outputlangs)) {
$outputlangs = $langs;
}
$outputlangs->load("ticket");
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index fb59e2b7c42..bdd0f79a0aa 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -83,7 +83,7 @@ class InfoBox
/**
* Return array of boxes qualified for area and user
*
- * @param DoliDB $db Database handler
+ * @param DoliDB $dbs Database handler
* @param string $mode 'available' or 'activated'
* @param int $zone Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
* @param User|null $user Object user to filter
@@ -91,7 +91,7 @@ class InfoBox
* @param int $includehidden Include also hidden boxes
* @return array Array of boxes
*/
- public static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
+ public static function listBoxes($dbs, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
{
global $conf;
@@ -119,12 +119,12 @@ class InfoBox
}
dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
- $resql = $db->query($sql);
+ $resql = $dbs->query($sql);
if ($resql) {
- $num = $db->num_rows($resql);
+ $num = $dbs->num_rows($resql);
$j = 0;
while ($j < $num) {
- $obj = $db->fetch_object($resql);
+ $obj = $dbs->fetch_object($resql);
if (!in_array($obj->box_id, $excludelist)) {
$regs = array();
@@ -144,7 +144,7 @@ class InfoBox
// Goal is to avoid making a "new" done for each boxes returned by select.
dol_include_once($relsourcefile);
if (class_exists($boxname)) {
- $box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
+ $box = new $boxname($dbs, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
//$box=new stdClass();
// box properties
@@ -204,8 +204,8 @@ class InfoBox
$j++;
}
} else {
- dol_syslog($db->lasterror(), LOG_ERR);
- return array('error'=>$db->lasterror());
+ dol_syslog($dbs->lasterror(), LOG_ERR);
+ return array('error'=>$dbs->lasterror());
}
return $boxes;
@@ -215,13 +215,13 @@ class InfoBox
/**
* Save order of boxes for area and user
*
- * @param DoliDB $db Database handler
+ * @param DoliDB $dbs Database handler
* @param int $zone Name of area (0 for Homepage, ...)
* @param string $boxorder List of boxes with correct order 'A:123,456,...-B:789,321...'
* @param int $userid Id of user
* @return int <0 if KO, 0=Nothing done, > 0 if OK
*/
- public static function saveboxorder($db, $zone, $boxorder, $userid = 0)
+ public static function saveboxorder($dbs, $zone, $boxorder, $userid = 0)
{
global $conf;
@@ -235,18 +235,18 @@ class InfoBox
return 0;
}
- $user = new User($db);
+ $user = new User($dbs);
$user->id = $userid;
- $db->begin();
+ $dbs->begin();
// Save parameters to say user has a dedicated setup
$tab = array();
$confuserzone = 'MAIN_BOXES_'.$zone;
$tab[$confuserzone] = 1;
- if (dol_set_user_param($db, $conf, $user, $tab) < 0) {
- $error = $db->lasterror();
- $db->rollback();
+ if (dol_set_user_param($dbs, $conf, $user, $tab) < 0) {
+ $error = $dbs->lasterror();
+ $dbs->rollback();
return -3;
}
@@ -257,7 +257,7 @@ class InfoBox
$sql .= " AND position = ".((int) $zone);
dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
- $result = $db->query($sql);
+ $result = $dbs->query($sql);
if ($result) {
$colonnes = explode('-', $boxorder);
foreach ($colonnes as $collist) {
@@ -279,12 +279,12 @@ class InfoBox
$sql .= " values (";
$sql .= " ".((int) $id).",";
$sql .= " ".((int) $zone).",";
- $sql .= " '".$db->escape($colonne.$ii)."',";
+ $sql .= " '".$dbs->escape($colonne.$ii)."',";
$sql .= " ".((int) $userid).",";
$sql .= " ".((int) $conf->entity);
$sql .= ")";
- $result = $db->query($sql);
+ $result = $dbs->query($sql);
if ($result < 0) {
$error++;
break;
@@ -297,10 +297,10 @@ class InfoBox
}
if ($error) {
- $db->rollback();
+ $dbs->rollback();
return -2;
} else {
- $db->commit();
+ $dbs->commit();
return 1;
}
}
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 2a5e0f99c64..eaf4804b213 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -274,24 +274,24 @@ class Link extends CommonObject
/**
* Return nb of links
*
- * @param DoliDb $db Database handler
+ * @param DoliDb $dbs Database handler
* @param string $objecttype Type of the associated object in dolibarr
* @param int $objectid Id of the associated object in dolibarr
* @return int Nb of links, -1 if error
**/
- public static function count($db, $objecttype, $objectid)
+ public static function count($dbs, $objecttype, $objectid)
{
global $conf;
$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
- $sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".((int) $objectid);
+ $sql .= " WHERE objecttype = '".$dbs->escape($objecttype)."' AND objectid = ".((int) $objectid);
if ($conf->entity != 0) {
$sql .= " AND entity = ".$conf->entity;
}
- $resql = $db->query($sql);
+ $resql = $dbs->query($sql);
if ($resql) {
- $obj = $db->fetch_object($resql);
+ $obj = $dbs->fetch_object($resql);
if ($obj) {
return $obj->nb;
}
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 9b812df8dc2..c6769ad0619 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -177,6 +177,14 @@ interface Database
*/
public function escape($stringtoencode);
+ /**
+ * Escape a string to insert data
+ *
+ * @param string $stringtoencode String to escape
+ * @return string String escaped
+ */
+ public function escapeunderscore($stringtoencode);
+
/**
* Sanitize a string for SQL forging
*
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 02a1e5d13d3..0db4e16a897 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -440,6 +440,17 @@ class DoliDBMysqli extends DoliDB
return $this->db->real_escape_string($stringtoencode);
}
+ /**
+ * Escape a string to insert data
+ *
+ * @param string $stringtoencode String to escape
+ * @return string String escaped
+ */
+ public function escapeunderscore($stringtoencode)
+ {
+ return str_replace('_', '\_', $stringtoencode);
+ }
+
/**
* Return generic error code of last operation.
*
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 9d17d4b9099..5997349d0c5 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -713,6 +713,17 @@ class DoliDBPgsql extends DoliDB
return pg_escape_string($stringtoencode);
}
+ /**
+ * Escape a string to insert data
+ *
+ * @param string $stringtoencode String to escape
+ * @return string String escaped
+ */
+ public function escapeunderscore($stringtoencode)
+ {
+ return str_replace('_', '\_', $stringtoencode);
+ }
+
/**
* Format a SQL IF
*
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index e2a2c124737..c03d2a5ee04 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -645,6 +645,17 @@ class DoliDBSqlite3 extends DoliDB
return Sqlite3::escapeString($stringtoencode);
}
+ /**
+ * Escape a string to insert data
+ *
+ * @param string $stringtoencode String to escape
+ * @return string String escaped
+ */
+ public function escapeunderscore($stringtoencode)
+ {
+ return str_replace('_', '\_', $stringtoencode);
+ }
+
/**
* Renvoie le code erreur generique de l'operation precedente.
*
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 12022ed178c..702d6673527 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -59,7 +59,10 @@ if (empty($font_loc)) {
if (defined('PHP-BARCODE_PATH_COMMAND')) {
$genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
} else {
- $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+ $genbarcode_loc = '';
+ if (!empty($conf->global->GENBARCODE_LOCATION)) {
+ $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+ }
}
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/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 357fcc9972f..698bf4410da 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2508,7 +2508,7 @@ function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
* False or 0 or 'tzserver' = local to server TZ
* 'auto'
* 'tzuser' = local to user TZ taking dst into account at the current date. Not yet implemented.
- * 'tzuserrel' = local to user TZ taking dst into account at the given date. Use this one to convert date input from user.
+ * 'tzuserrel' = local to user TZ taking dst into account at the given date. Use this one to convert date input from user into a GMT date.
* 'tz,TimeZone' = use specified timezone
* @param int $check 0=No check on parameters (Can use day 32, etc...)
* @return int|string Date as a timestamp, '' or false if error
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 1400dc40458..9d6b9c48192 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -126,7 +126,7 @@ function project_prepare_head(Project $project, $moreparam = '')
if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
|| !empty($conf->propal->enabled) || !empty($conf->commande->enabled)
|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
- || !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled)) {
+ || !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->stock->enabled)) {
$nbElements = 0;
// Enable caching of thirdrparty count Contacts
$cachekey = 'count_elements_project_'.$project->id;
@@ -134,6 +134,9 @@ function project_prepare_head(Project $project, $moreparam = '')
if (!is_null($dataretrieved)) {
$nbElements = $dataretrieved;
} else {
+ if (!empty($conf->stock->enabled)) {
+ $nbElements += $project->getElementCount('stock', 'entrepot', 'fk_project');
+ }
if (!empty($conf->propal->enabled)) {
$nbElements += $project->getElementCount('propal', 'propal');
}
@@ -974,6 +977,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
}
+ // Computed progress
if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
print '';
if ($total_projectlinesa_planned) {
@@ -981,6 +985,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
print ' ';
}
+
+ // Declared progress
if (count($arrayfields) > 0 && !empty($arrayfields['t.progress']['checked'])) {
print '';
if ($total_projectlinesa_planned) {
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 4c36244a5bf..da5d9388bd8 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -513,8 +513,8 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
if (!$user->rights->salaries->delete) {
$deleteok = 0;
}
- } elseif ($feature == 'salaries') {
- if (!$user->rights->salaries->delete) {
+ } elseif ($feature == 'adherent') {
+ if (!$user->rights->adherent->supprimer) {
$deleteok = 0;
}
} elseif (!empty($feature2)) { // This is for permissions on 2 levels
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 .= '';
if ($showfk) {
print '';
- print ' ';
+ print ' ';
print $tab[$x]['title'];
print ' ';
print ' (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 29f208e5254..7a9bb12172b 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -400,7 +400,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if (!file_exists($file)) {
$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
}
- print ' ';
+ print ' ';
if ($subdir == $conf->global->MAIN_THEME) {
$title = $langs->trans("ThemeCurrentlyActive");
} else {
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 89fd777cd20..20380e02aab 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -866,11 +866,11 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
$sql .= " AND (";
$searchalgo = '';
if (preg_match('/meta/', $algo)) {
- $searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escape($searchstring)."%' OR wp.description LIKE '%".$db->escape($searchstring)."%'";
- $searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escape($searchstring).",%' OR wp.keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
+ $searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escapeunderscore($db->escape($searchstring))."%' OR wp.description LIKE '%".$db->escapeunderscore($db->escape($searchstring))."%'";
+ $searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escapeunderscore($db->escape($searchstring)).",%' OR wp.keywords LIKE '% ".$db->escapeunderscore($db->escape($searchstring))."%'"; // TODO Use a better way to scan keywords
}
if (preg_match('/content/', $algo)) {
- $searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($searchstring)."%'";
+ $searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escapeunderscore($db->escape($searchstring))."%'";
}
$sql .= $searchalgo;
if (is_array($otherfilters) && !empty($otherfilters['category'])) {
@@ -879,6 +879,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
$sql .= ")";
$sql .= $db->order($sortfield, $sortorder);
$sql .= $db->plimit($max);
+ //print $sql;
$resql = $db->query($sql);
if ($resql) {
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index b1f48450d0d..f5862bfc5f2 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -175,10 +175,11 @@ class pdf_standard extends ModeleExpenseReport
//$this->posxdate=88;
//$this->posxtype=107;
//$this->posxprojet=120;
- $this->posxtva = 130;
- $this->posxup = 145;
- $this->posxqty = 168;
- $this->postotalttc = 178;
+ $this->posxtva = 112;
+ $this->posxup = 127;
+ $this->posxqty = 150;
+ $this->postotalht = 160;
+ $this->postotalttc = 180;
// if (empty($conf->projet->enabled)) {
// $this->posxtva-=20;
// $this->posxup-=20;
@@ -642,11 +643,15 @@ class pdf_standard extends ModeleExpenseReport
// Quantity
$pdf->SetXY($this->posxqty, $curY);
- $pdf->MultiCell($this->postotalttc - $this->posxqty - 0.8, 4, $object->lines[$linenumber]->qty, 0, 'R');
+ $pdf->MultiCell($this->postotalht - $this->posxqty - 0.8, 4, $object->lines[$linenumber]->qty, 0, 'R');
+
+ // Total without taxes
+ $pdf->SetXY($this->postotalht, $curY);
+ $pdf->MultiCell($this->postotalttc - $this->postotalht - 0.8, 4, price($object->lines[$linenumber]->total_ht), 0, 'R');
// Total with all taxes
$pdf->SetXY($this->postotalttc - 1, $curY);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc, 4, price($object->lines[$linenumber]->total_ttc), 0, 'R');
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc + 1, 4, price($object->lines[$linenumber]->total_ttc), 0, 'R');
// Comments
$pdf->SetXY($this->posxcomment, $curY);
@@ -950,14 +955,14 @@ class pdf_standard extends ModeleExpenseReport
// Accountancy piece
if (empty($hidetop)) {
$pdf->SetXY($this->posxpiece - 1, $tab_top + 1);
- $pdf->MultiCell($this->posxcomment - $this->posxpiece - 1, 1, '', '', 'R');
+ $pdf->MultiCell($this->posxcomment - $this->posxpiece - 0.8, 1, '', '', 'R');
}
// Comments
$pdf->line($this->posxcomment - 1, $tab_top, $this->posxcomment - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
$pdf->SetXY($this->posxcomment - 1, $tab_top + 1);
- $pdf->MultiCell($this->posxdate - $this->posxcomment - 1, 1, $outputlangs->transnoentities("Description"), '', 'L');
+ $pdf->MultiCell($this->posxdate - $this->posxcomment - 0.8, 1, $outputlangs->transnoentities("Description"), '', 'L');
}
// Date
@@ -990,7 +995,7 @@ class pdf_standard extends ModeleExpenseReport
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
- $pdf->SetXY($this->posxtva - 1, $tab_top + 1);
+ $pdf->SetXY($this->posxtva - 0.8, $tab_top + 1);
$pdf->MultiCell($this->posxup - $this->posxtva - 1, 2, $outputlangs->transnoentities("VAT"), '', 'C');
}
}
@@ -998,22 +1003,29 @@ class pdf_standard extends ModeleExpenseReport
// Unit price
$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
- $pdf->SetXY($this->posxup - 1, $tab_top + 1);
- $pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceU"), '', 'C');
+ $pdf->SetXY($this->posxup - 0.8, $tab_top + 1);
+ $pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUTTC"), '', 'C');
}
// Quantity
$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
- $pdf->SetXY($this->posxqty - 1, $tab_top + 1);
- $pdf->MultiCell($this->postotalttc - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+ $pdf->SetXY($this->posxqty - 0.8, $tab_top + 1);
+ $pdf->MultiCell($this->postotalht - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+ }
+
+ // Total without taxes
+ $pdf->line($this->postotalht - 1, $tab_top, $this->postotalht - 1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->postotalht - 0.8, $tab_top + 1);
+ $pdf->MultiCell($this->postotalttc - $this->postotalht + 1, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
}
// Total with all taxes
$pdf->line($this->postotalttc, $tab_top, $this->postotalttc, $tab_top + $tab_height);
if (empty($hidetop)) {
- $pdf->SetXY($this->postotalttc - 1, $tab_top + 1);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc, 2, $outputlangs->transnoentities("TotalTTC"), '', 'R');
+ $pdf->SetXY($this->postotalttc - 0.8, $tab_top + 1);
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc + 1, 2, $outputlangs->transnoentities("TotalTTC"), '', 'R');
}
$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 5bf91ec341e..e89a2a4fe3e 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -300,10 +300,11 @@ class modMultiCurrency extends DolibarrModules
{
global $conf, $user, $langs;
- if (!MultiCurrency::checkCodeAlreadyExists($conf->currency)) {
+ $multicurrency = new MultiCurrency($this->db);
+
+ if (! $multicurrency->checkCodeAlreadyExists($conf->currency)) {
$langs->loadCacheCurrencies('');
- $multicurrency = new MultiCurrency($this->db);
$multicurrency->code = $conf->currency;
$multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
$r = $multicurrency->create($user);
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index eed6871c465..c3eba65673b 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -281,6 +281,9 @@ class modSociete extends DolibarrModules
if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
$this->export_fields_array[$r]['s.price_level'] = 'PriceLevel';
}
+ if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+ $this->export_fields_array[$r] += array('s.accountancy_code_sell'=>'ProductAccountancySellCode', 's.accountancy_code_buy'=>'ProductAccountancyBuyCode');
+ }
// Add multicompany field
if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
$nbofallowedentities = count(explode(',', getEntity('societe'))); // If project are shared, nb will be > 1
@@ -317,7 +320,8 @@ class modSociete extends DolibarrModules
'payterm.libelle'=>'Text', 'paymode.libelle'=>'Text',
's.outstanding_limit'=>'Numeric', 'pbacc.ref'=>'Text', 'incoterm.code'=>'Text',
'u.login'=>'Text', 'u.firstname'=>'Text', 'u.lastname'=>'Text',
- 's.entity'=>'Numeric', 's.price_level'=>'Numeric'
+ 's.entity'=>'Numeric', 's.price_level'=>'Numeric',
+ 's.accountancy_code_sell'=>'Text', 's.accountancy_code_buy'=>'Text'
);
$this->export_entities_array[$r] = array('u.login'=>'user', 'u.firstname'=>'user', 'u.lastname'=>'user'); // We define here only fields that use another picto
@@ -488,6 +492,9 @@ class modSociete extends DolibarrModules
if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
$this->import_fields_array[$r]['s.price_level'] = 'PriceLevel';
}
+ if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+ $this->import_fields_array[$r] += array('s.accountancy_code_sell'=>'ProductAccountancySellCode', 's.accountancy_code_buy'=>'ProductAccountancyBuyCode');
+ }
// Add extra fields
$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
$resql = $this->db->query($sql);
@@ -621,7 +628,9 @@ class modSociete extends DolibarrModules
's.canvas' => "empty / a custom canvas form layout url e.g. mycanvas@mymodule",
's.datec' => 'formatted as '.dol_print_date(dol_now(), '%Y-%m-%d'),
's.fk_multicurrency' => '0 (use system default currency) / 1 (use local currency)',
- 's.multicurrency_code' => 'GBP/USD etc... matches field "code_iso" in table "'.MAIN_DB_PREFIX.'c_currencies"'
+ 's.multicurrency_code' => 'GBP/USD etc... matches field "code_iso" in table "'.MAIN_DB_PREFIX.'c_currencies"',
+ 's.accountancy_code_sell' => '707',
+ 's.accountancy_code_buy' => '607',
);
$this->import_updatekeys_array[$r] = array(
's.nom' => 'Name',
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 88c643c641d..acc5fad8125 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -66,7 +66,7 @@ $(document).ready(function(){
var fk_element = "";
var element_id = "";
var filepath = "";
- var token = ""; // We use old 'token' and not 'newtoken' for Ajax call because the ajax page has the NOTOKENRENEWAL constant set.
+ var token = ""; // We use old 'token' and not 'newtoken' for Ajax call because the ajax page has the NOTOKENRENEWAL constant set.
$.post("/core/ajax/row.php",
{
roworder: roworder,
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index f50276821b1..cd58ae554f2 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -208,7 +208,7 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
$fieldid = 'socid';
}
- print ' '.img_edit().' '.img_edit().'
';
print ' ';
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f978a436354..aeac5d038f3 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -68,6 +68,7 @@ if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf-
if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier'))) {
$colspan++; // With this, there is a column move button
}
+
//print $object->element;
// Lines for extrafield
$objectline = null;
@@ -673,15 +674,27 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
$("#prod_entry_mode_predef").click();
+ if (in_array($this->table_element_line, array('propaldet', 'commandedet', 'facturedet'))) { ?>
+ $("#date_start, #date_end").focusout(function() {
+ let type = $(this).attr('type');
+ let mandatoryP = $(this).attr('mandatoryperiod');
+ if (type == 1 && mandatoryP == 1) {
+ if ($(this).val() == '' && !$(this).hasClass('inputmandatory')) {
+ $(this).addClass('inputmandatory');
+ }else{
+ $(this).removeClass('inputmandatory');
+ }
+ }
+ });
+
/* When changing predefined product, we reload list of supplier prices required for margin combo */
$("#idprod, #idprodfournprice").change(function()
{
console.log("Call method change() after change on #idprod or #idprodfournprice (senderissupplier=). this.val = "+$(this).val());
setforpredef(); // TODO Keep vat combo visible and set it to first entry into list that match result of get_default_tva
-
jQuery('#trlinefordates').show();
rights->margins->creer) {
{ 'id': $(this).val(), 'socid': socid; ?> },
function(data) {
console.log("Load unit price end, we got value "+data.price_ht);
+
+ $('#date_start').removeAttr('type');
+ $('#date_end').removeAttr('type');
+ $('#date_start').attr('type', data.type);
+ $('#date_end').attr('type', data.type);
+
+ $('#date_start').removeAttr('mandatoryperiod');
+ $('#date_end').removeAttr('mandatoryperiod');
+ $('#date_start').attr('mandatoryperiod', data.mandatory_period);
+ $('#date_end').attr('mandatoryperiod', data.mandatory_period);
+
+ // service and we setted mandatory_period to true
+ if (data.mandatory_period == 1 && data.type == 1) {
+ jQuery('#date_start').addClass('inputmandatory');
+ jQuery('#date_end').addClass('inputmandatory');
+ }else{
+ jQuery('#date_start').removeClass('inputmandatory');
+ jQuery('#date_end').removeClass('inputmandatory');
+ }
+
jQuery("#price_ht").val(data.price_ht);
global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
@@ -984,6 +1017,7 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").show();
jQuery("#fournprice_predef").hide();
}
+
function setforpredef() {
console.log("Call setforpredef. We hide some fields and show dates");
jQuery("#select_type").val(-1);
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 9094daaa2d1..611d6a9cce5 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -333,9 +333,18 @@ $coldisplay++;
if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
}
+
+
if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
}
+
+ $res = $line->fetch_product();
+ if ($res > 0 ) {
+ if ( $line->product->isMandatoryPeriod() && $line->product->isService()) {
+ print 'jQuery("#date_start").addClass("error");';
+ }
+ }
}
if (!$line->date_end) {
if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
@@ -344,6 +353,14 @@ $coldisplay++;
if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
}
+
+ $res = $line->fetch_product();
+ // on doit fetch le product là !!! pour connaître le type
+ if ($res > 0 ) {
+ if ($line->product->isMandatoryperiod() && $line->product->isService()) {
+ print 'jQuery("#date_end").addClass("error");';
+ }
+ }
}
print ''
?>
@@ -451,7 +468,17 @@ jQuery(document).ready(function()
}
});
- table_element_line, array('propaldet', 'commandedet', 'facturedet'))) { ?>
+ $("#date_start, #date_end").focusout(function() {
+ if ( $(this).val() == '' && !$(this).hasClass('inputmandatory') ) {
+ $(this).addClass('inputmandatory');
+ } else {
+ $(this).removeClass('inputmandatory');
+ }
+ });
+ margin->enabled)) {
?>
/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index ad27dae210c..6a7d48add5e 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -182,6 +182,22 @@ if (($line->info_bits & 2) == 2) {
if ($line->date_start || $line->date_end) {
print ''.get_date_range($line->date_start, $line->date_end, $format).'
';
}
+ if (!$line->date_start || !$line->date_end) {
+ // show warning under line
+ // we need to fetch product associated to line for some test
+ if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') {
+ $res = $line->fetch_product();
+ if ($res > 0 ) {
+ if ($line->product->isService() && $line->product->isMandatoryPeriod()) {
+ print ''.$langs->trans("mandatoryPeriodNeedTobeSet").'
';
+ }
+ }
+ }
+ }
+
+
+
+
//print get_date_range($line->date_start, $line->date_end, $format);
}
@@ -368,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 ' ';
@@ -376,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 ' ';
}
@@ -386,12 +402,12 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
print ' ';
$coldisplay++;
if ($i > 0) { ?>
- id; ?>">
+ id; ?>">
- id; ?>">
+ id; ?>">
ref = $defaultref;
- $task->date_start = $object->date_start;
- $task->date_end = $object->date_end;
+
+ // TODO Can set offset for start date or endline from setup of task to create when creating event
+ $task->date_start = null;
+ $task->date_end = null;
+
$result = $task->create($user);
if ($result < 0) {
$this->errors=array_merge($this->errors, $task->errors);
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 727bf56f836..270fe3f57c4 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -745,7 +745,7 @@ if (($action == "create") || ($action == "edit")) {
if (!$user->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/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 267c79ab08e..2d9f70a1eb5 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -250,6 +250,17 @@ class TraceableDB extends DoliDB
return $this->db->escape($stringtoencode);
}
+ /**
+ * Escape a string to insert data
+ *
+ * @param string $stringtoencode String to escape
+ * @return string String escaped
+ */
+ public function escapeunderscore($stringtoencode)
+ {
+ return $this->db->escapeunderscore($stringtoencode);
+ }
+
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Get last ID after an insert INSERT
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).' id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' ';
@@ -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/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 54b1e6b6bb8..aed93b51f6f 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -729,10 +729,10 @@ class EcmDirectory extends CommonObject
// We count number of _ to have level (we use strlen that is faster than dol_strlen)
$this->cats[$id_categ]['level'] = strlen(preg_replace('/([^_])/i', '', $this->cats[$id_categ]['fullpath']));
- // Traite ces enfants
+ // Process children
$protection++;
if ($protection > 20) {
- return; // On ne traite pas plus de 20 niveaux
+ return; // We never go more than 20 levels
}
if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children'])) {
foreach ($this->cats[$id_categ]['id_children'] as $key => $val) {
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 4b9d0a847f2..623d626935d 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -55,9 +55,10 @@ class FormEcm
* @param int $selected Id of preselected section
* @param string $select_name Name of HTML select component
* @param string $module Module ('ecm', 'medias', ...)
+ * @param array $ids_to_ignore Array of id to ignore
* @return string String with HTML select
*/
- public function selectAllSections($selected = 0, $select_name = '', $module = 'ecm')
+ public function selectAllSections($selected = 0, $select_name = '', $module = 'ecm', $ids_to_ignore = array())
{
global $conf, $langs;
$langs->load("ecm");
@@ -65,6 +66,9 @@ class FormEcm
if ($select_name == '') {
$select_name = "catParent";
}
+ if (!is_array($ids_to_ignore)) {
+ $ids_to_ignore = array($ids_to_ignore);
+ }
$cate_arbo = null;
if ($module == 'ecm') {
@@ -83,13 +87,15 @@ class FormEcm
} else {
$output .= ' ';
foreach ($cate_arbo as $key => $value) {
- $valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
- if ($selected && $valueforoption == $selected) {
- $add = 'selected ';
- } else {
- $add = '';
+ if (!in_array($cate_arbo[$key]['id'], $ids_to_ignore)) {
+ $valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
+ if ($selected && $valueforoption == $selected) {
+ $add = 'selected ';
+ } else {
+ $add = '';
+ }
+ $output .= ''.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).' ';
}
- $output .= ''.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).' ';
}
}
}
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index fec8151728e..0b42fc17a02 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php';
// Load translation files required by page
$langs->loadLangs(array('ecm', 'companies', 'other'));
@@ -204,6 +205,12 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
// Fetch was already done
$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
+ $fk_parent = GETPOST("catParent", 'int');
+ if ($fk_parent == "-1") {
+ $ecmdir->fk_parent = "0";
+ } else {
+ $ecmdir->fk_parent = $fk_parent;
+ }
$ecmdir->description = GETPOST("description");
$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
if ($ret < 0) {
@@ -219,8 +226,10 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
}
$result = $ecmdir->update($user);
if ($result > 0) {
+ $newdir = $ecmdir->getRelativePath(1);
+ $newdir = $conf->ecm->dir_output.'/'.$newdir;
// Try to rename file if changed
- if ($oldlabel != $ecmdir->label && file_exists($olddir)) {
+ if (($oldlabel != $ecmdir->label && file_exists($olddir)) || ($olddir != $newdir && file_exists($olddir))) {
$newdir = $ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory
$newdir = $conf->ecm->dir_output.'/'.$newdir;
//print $olddir.'-'.$newdir;
@@ -270,6 +279,7 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
*/
$form = new Form($db);
+$formecm = new FormEcm($db);
$object = new EcmDirectory($db); // Need to create a new one instance
$extrafields = new ExtraFields($db);
@@ -317,11 +327,7 @@ if ($module == 'ecm') {
$tmpecmdir->fetch($ecmdir->id);
while ($tmpecmdir && $result > 0) {
$tmpecmdir->ref = $tmpecmdir->label;
- if ($i == 0 && $action == 'edit') {
- $s = ''.$l
print $s;
print ' ';*/
if ($module == 'ecm') {
+ if ($action == 'edit') {
+ print ''.$langs->trans("ECMDirName").' ';
+ print ' '.$langs->trans("ECMParentDirectory").' ';
+ print $formecm->selectAllSections($ecmdir->fk_parent, '', 'ecm', array($ecmdir->id));
+ print ' ';
+ print ' '.$langs->trans("Description").' ';
if ($action == 'edit') {
print '