';
*/
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, date_cloture as datec";
-$sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client";
+$sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) {
@@ -185,6 +185,8 @@ if ($resql) {
$companystatic->name = $obj->socname;
$companystatic->client = $obj->client;
$companystatic->canvas = $obj->canvas;
+ $companystatic->email = $obj->email;
+ $companystatic->code_compta = $obj->code_compta;
$filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
@@ -223,7 +225,7 @@ if ($resql) {
* Open (validated) proposals
*/
if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
- $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+ $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
$sql .= ", p.rowid as propalid, p.entity, p.total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql .= ", ".MAIN_DB_PREFIX."propal as p";
@@ -260,6 +262,8 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
$companystatic->name = $obj->socname;
$companystatic->client = $obj->client;
$companystatic->canvas = $obj->canvas;
+ $companystatic->email = $obj->email;
+ $companystatic->code_compta = $obj->code_compta;
$filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 12a6eb97d13..03acd9d88eb 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -8,7 +8,7 @@
* Copyright (C) 2014 Raphaël Doursenaud
* Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
* Copyright (C) 2015 Juanjo Menent
- * Copyright (C) 2018-2019 Frédéric France
+ * Copyright (C) 2018-2021 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -465,7 +465,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Date payment
print ''.$langs->trans('Date').' ';
- $datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+ $datepayment = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
$datepayment = ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepayment);
print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
print ' ';
print "\n";
- $total = 0;
+ $total_ttc = 0;
$totalrecu = 0;
$totalrecucreditnote = 0;
$totalrecudeposits = 0;
@@ -754,15 +754,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Warning
print '';
//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]." ';
print "\n";
- $total += $objp->total;
$total_ttc += $objp->total_ttc;
$totalrecu += $paiement;
$totalrecucreditnote += $creditnotes;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index b337f0980e6..b877909cc58 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -77,12 +77,6 @@ if (!empty($canvas)) {
$objcanvas->getCanvas('contact', 'contactcard', $canvas);
}
-// Security check
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
-
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('contactcard', 'globalcard'));
@@ -96,6 +90,16 @@ if (!($object->id > 0) && $action == 'view') {
exit;
}
+$triggermodname = 'CONTACT_MODIFY';
+$permissiontoadd = $user->rights->societe->contact->creer;
+
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
+
+
/*
* Actions
*/
@@ -144,7 +148,7 @@ if (empty($reshook)) {
// Confirmation desactivation
- if ($action == 'disable') {
+ if ($action == 'disable' && !empty($permissiontoadd)) {
$object->fetch($id);
if ($object->setstatus(0) < 0) {
setEventMessages($object->error, $object->errors, 'errors');
@@ -155,7 +159,7 @@ if (empty($reshook)) {
}
// Confirmation activation
- if ($action == 'enable') {
+ if ($action == 'enable' && !empty($permissiontoadd)) {
$object->fetch($id);
if ($object->setstatus(1) < 0) {
setEventMessages($object->error, $object->errors, 'errors');
@@ -166,7 +170,7 @@ if (empty($reshook)) {
}
// Add contact
- if ($action == 'add' && $user->rights->societe->contact->creer) {
+ if ($action == 'add' && !empty($permissiontoadd)) {
$db->begin();
if ($canvas) {
@@ -307,7 +311,7 @@ if (empty($reshook)) {
}
}
- if ($action == 'update' && empty($cancel) && $user->rights->societe->contact->creer) {
+ if ($action == 'update' && empty($cancel) && !empty($permissiontoadd)) {
if (!GETPOST("lastname", 'alpha')) {
$error++; $errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
$action = 'edit';
@@ -457,7 +461,7 @@ if (empty($reshook)) {
}
}
- if ($action == 'setprospectcontactlevel' && $user->rights->societe->contact->creer) {
+ if ($action == 'setprospectcontactlevel' && !empty($permissiontoadd)) {
$object->fetch($id);
$object->fk_prospectlevel = GETPOST('prospect_contact_level_id', 'alpha');
$result = $object->update($object->id, $user);
@@ -467,7 +471,7 @@ if (empty($reshook)) {
}
// set communication status
- if ($action == 'setstcomm') {
+ if ($action == 'setstcomm' && !empty($permissiontoadd)) {
$object->fetch($id);
$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcommcontact');
$result = $object->update($object->id, $user);
@@ -476,6 +480,31 @@ if (empty($reshook)) {
}
}
+ // Update extrafields
+ if ($action == "update_extras" && !empty($permissiontoadd)) {
+ $object->fetch(GETPOST('id', 'int'));
+
+ $attributekey = GETPOST('attribute', 'alpha');
+ $attributekeylong = 'options_'.$attributekey;
+
+ if (GETPOSTISSET($attributekeylong.'day') && GETPOSTISSET($attributekeylong.'month') && GETPOSTISSET($attributekeylong.'year')) {
+ // This is properties of a date
+ $object->array_options['options_'.$attributekey] = dol_mktime(GETPOST($attributekeylong.'hour', 'int'), GETPOST($attributekeylong.'min', 'int'), GETPOST($attributekeylong.'sec', 'int'), GETPOST($attributekeylong.'month', 'int'), GETPOST($attributekeylong.'day', 'int'), GETPOST($attributekeylong.'year', 'int'));
+ //var_dump(dol_print_date($object->array_options['options_'.$attributekey]));exit;
+ } else {
+ $object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, 'alpha');
+ }
+
+ $result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
+ if ($result > 0) {
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+ $action = 'view';
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ $action = 'edit_extras';
+ }
+ }
+
// Actions to send emails
$triggersendname = 'CONTACT_SENTBYMAIL';
$paramname = 'id';
@@ -821,11 +850,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Other attributes
$parameters = array('socid' => $socid, 'objsoc' => $objsoc, 'colspan' => ' colspan="3"', 'cols' => 3);
- $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
- }
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
print "
@@ -192,7 +192,7 @@ if ($disablenofollow) {
} ?>
';
- print '';
+ print ' ';
+ print '';
print ' ';
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 6a38ae2033d..4da69cfc0c1 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -254,10 +254,10 @@ if ($optioncss != '') {
if ($search_ref) {
$param .= '&search_ref='.urlencode($search_ref);
}
-if ($saerch_day) {
+if ($search_day) {
$param .= '&search_day='.urlencode($search_day);
}
-if ($saerch_month) {
+if ($search_month) {
$param .= '&search_month='.urlencode($search_month);
}
if ($search_year) {
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index bab0655b4c2..97a70782e36 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -163,19 +163,23 @@ if (empty($reshook)) {
$description = trim(GETPOST('description', 'restricthtml'));
// Check that leave is for a user inside the hierarchy or advanced permission for all is set
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write))
- || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id == $fuserid && empty($user->rights->holiday->write))
- || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id != $fuserid && empty($user->rights->holiday->writeall_advance))
- ) {
- $error++;
- setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+ if (empty($user->rights->holiday->write)) {
+ $error++;
+ setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+ } elseif (!in_array($fuserid, $childids)) {
+ $error++;
+ setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+ $action = 'create';
+ }
} else {
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)) {
- if (!in_array($fuserid, $childids)) {
- $error++;
- setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
- $action = 'create';
- }
+ if (empty($user->rights->holiday->write) && empty($user->rights->holiday->writeall_advance)) {
+ $error++;
+ setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+ } elseif (empty($user->rights->holiday->writeall_advance) && !in_array($fuserid, $childids)) {
+ $error++;
+ setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+ $action = 'create';
}
}
@@ -1136,7 +1140,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
}
// On vérifie si l'utilisateur à le droit de lire cette demande
- if ($cancreate) {
+ if ($canread) {
$head = holiday_prepare_head($object);
if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator')) {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index ffd394a35b3..55dd1c4bafb 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1992,8 +1992,6 @@ class Holiday extends CommonObject
*/
public function fetchLog($order, $filter)
{
- global $langs;
-
$sql = "SELECT";
$sql .= " cpl.rowid,";
$sql .= " cpl.date_action,";
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 62991a6e0ee..966dd7e8dee 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -413,7 +413,7 @@ if ($num == 0) {
print ''.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).' ';
}
if (!empty($arrayfields['cp.description']['checked'])) {
- print ''.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).' ';
+ print ''.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).' ';
}
print '';
+ print ' ';
print ' ';
}
@@ -385,7 +385,7 @@ if (!empty($arrayfields['variation']['checked'])) {
// Filter: New Balance
if (!empty($arrayfields['cpl.new_solde']['checked'])) {
- print '';
+ print ' ';
print ' ';
}
@@ -428,12 +428,20 @@ if (!empty($arrayfields['cpl.new_solde']['checked'])) {
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print ''.$langs->trans("ErrorWrongValueForParameterX", 'format').'
';
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 287f9a576db..b58a57fc706 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -254,11 +254,15 @@ $parameters = [
$reshook = $hookmanager->executeHooks('doValidatePayment', $parameters, $object, $action);
// Check security token
+$tmpsource = $source;
+if ($tmpsource == 'membersubscription') {
+ $tmpsource = 'member';
+}
$valid = true;
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
- if ($source && $REF) {
- $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
+ if ($tmpsource && $REF) {
+ $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$tmpsource.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
} else {
$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
}
@@ -758,6 +762,8 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
* View
*/
+$form = new Form($db);
+
$head = '';
if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
$head = '' : '').'
';
llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
// Check link validity
-if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', ''))) {
+if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', 'donation_ref', ''))) {
$langs->load("errors");
dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
// End of page
@@ -1479,32 +1485,42 @@ if ($source == 'member' || $source == 'membersubscription') {
}
if ($member->type) {
- // Last member type
- print '
'.$langs->trans("LastMemberType");
- print ' '.dol_escape_htmltag($member->type);
- print " \n";
+ $oldtypeid = $member->typeid;
+ $newtypeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
- require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
- $adht = new AdherentType($db);
- // Amount by member type
- $amountbytype = $adht->amountByType(1);
- // Set the member type
- $member->typeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
- // If we change the type of membership, we set also label of new type
- $member->type = dol_getIdFromCode($db, $member->typeid, 'adherent_type', 'rowid', 'libelle');
- // Set amount for the subscription
- $amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid] : $member->last_subscription_amount;
- // list member type
- if ( !$action) {
- $form = new Form($db); // so we can call method selectarray
- print '
'.$langs->trans("NewSubscription");
- print ' ';
- print $form->selectarray("typeid", $adht->liste_array(1), $member->typeid, 0, 0, 0, 'onchange="window.location.replace(\''.$urlwithroot.'/public/payment/newpayment.php?source='.urlencode($source).'&ref='.urlencode($ref).'&amount='.urlencode($amount).'&typeid=\' + this.value + \'&securekey='.urlencode($SECUREKEY).'\');"', 0, 0, 0, '', '', 1);
- print " \n";
- } elseif ($action == dopayment) {
- print '
'.$langs->trans("NewMemberType");
+ if ($oldtypeid != $newtypeid && !empty($conf->global->MEMBER_ALLOW_CHANGE_OF_TYPE)) {
+ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+ $adht = new AdherentType($db);
+ // Amount by member type
+ $amountbytype = $adht->amountByType(1);
+
+ // Last member type
+ print ' '.$langs->trans("LastMemberType");
+ print ' '.dol_escape_htmltag($member->type);
+ print " \n";
+
+ // Set the new member type
+ $member->typeid = $newtypeid;
+ $member->type = dol_getIdFromCode($db, $newtypeid, 'adherent_type', 'rowid', 'libelle');
+
+ // list member type
+ if (!$action) {
+ // Set amount for the subscription
+ $amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid] : $member->last_subscription_amount;
+
+ print '
'.$langs->trans("NewSubscription");
+ print ' ';
+ print $form->selectarray("typeid", $adht->liste_array(1), $member->typeid, 0, 0, 0, 'onchange="window.location.replace(\''.$urlwithroot.'/public/payment/newpayment.php?source='.urlencode($source).'&ref='.urlencode($ref).'&amount='.urlencode($amount).'&typeid=\' + this.value + \'&securekey='.urlencode($SECUREKEY).'\');"', 0, 0, 0, '', '', 1);
+ print " \n";
+ } elseif ($action == dopayment) {
+ print '
'.$langs->trans("NewMemberType");
+ print ' '.dol_escape_htmltag($member->type);
+ print ' \n";
+ }
+ } else {
+ print '
'.$langs->trans("MemberType");
print ' '.dol_escape_htmltag($member->type);
- print ' \n";
}
}
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index ce48db9e729..013f290dc6a 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -72,7 +72,7 @@ $hookmanager->initHooks(array('newpayment'));
global $dolibarr_main_instance_unique_id;
// Load translation files
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
+$langs->loadLangs(array("other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
// Security check
// No check on module enabled. Done later according to $validpaymentmethod
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 048df9c41b3..e4a8b495d7c 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -60,13 +60,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
// Init vars
$errmsg = '';
-$num = 0;
$error = 0;
$backtopage = GETPOST('backtopage', 'alpha');
$action = GETPOST('action', 'aZ09');
// Load translation files
-$langs->loadLangs(array("main", "members", "companies", "install", "other"));
+$langs->loadLangs(array("members", "companies", "install", "other"));
// Security check
if (empty($conf->projet->enabled)) {
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 75f5401d401..493a400c891 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -72,7 +72,7 @@ if (!empty($conf->productbatch->enabled)) {
}
$origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'reception'; // Example: commande, propal
-$origin_id = GETPOST('id', 'int') ?GETPOST('id', 'int') : '';
+$origin_id = GETPOST('id', 'int') ? GETPOST('id', 'int') : '';
$id = $origin_id;
if (empty($origin_id)) {
$origin_id = GETPOST('origin_id', 'int'); // Id of order or propal
@@ -86,12 +86,12 @@ if (empty($origin_id)) {
$ref = GETPOST('ref', 'alpha');
$line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
//Select mail models is same action as presend
if (GETPOST('modelselected')) {
$action = 'presend';
}
-$confirm = GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
//PDF
@@ -117,7 +117,6 @@ $permissiondellink = $user->rights->reception->creer; // Used by the include of
$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
-$object = new Reception($db);
if ($id > 0 || !empty($ref)) {
$object->fetch($id, $ref);
$object->fetch_thirdparty();
@@ -725,13 +724,13 @@ if ($action == 'create') {
$classname = ucfirst($origin);
}
- $object = new $classname($db);
- if ($object->fetch($origin_id)) { // This include the fetch_lines
+ $objectsrc = new $classname($db);
+ if ($objectsrc->fetch($origin_id)) { // This include the fetch_lines
$soc = new Societe($db);
- $soc->fetch($object->socid);
+ $soc->fetch($objectsrc->socid);
$author = new User($db);
- $author->fetch($object->user_author_id);
+ $author->fetch($objectsrc->user_author_id);
if (!empty($conf->stock->enabled)) {
$entrepot = new Entrepot($db);
@@ -741,8 +740,7 @@ if ($action == 'create') {
print '
';
print '
';
print '
';
- print '
';
- print '
';
+ print '
';
if (GETPOST('entrepot_id', 'int')) {
print '
';
}
@@ -754,10 +752,10 @@ if ($action == 'create') {
// Ref
print '
';
if ($origin == 'supplierorder' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled))) {
- print $langs->trans("RefOrder").' '.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
+ print $langs->trans("RefOrder").' '.img_object($langs->trans("ShowOrder"), 'order').' '.$objectsrc->ref;
}
if ($origin == 'propal' && !empty($conf->propal->enabled)) {
- print $langs->trans("RefProposal").' '.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
+ print $langs->trans("RefProposal").' '.img_object($langs->trans("ShowProposal"), 'propal').' '.$objectsrc->ref;
}
print ' \n";
@@ -770,7 +768,7 @@ if ($action == 'create') {
print $langs->trans('RefSupplier');
}
print '
';
- print ' ';
print '';
@@ -782,8 +780,8 @@ if ($action == 'create') {
// Project
if (!empty($conf->projet->enabled)) {
$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
- if (empty($projectid) && !empty($object->fk_project)) {
- $projectid = $object->fk_project;
+ if (empty($projectid) && !empty($objectsrc->fk_project)) {
+ $projectid = $objectsrc->fk_project;
}
if ($origin == 'project') {
$projectid = ($originid ? $originid : 0);
@@ -802,7 +800,7 @@ if ($action == 'create') {
// Date delivery planned
print '
'.$langs->trans("DateDeliveryPlanned").' ';
print '';
- $date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
+ $date_delivery = ($date_delivery ? $date_delivery : $objectsrc->delivery_date); // $date_delivery comes from GETPOST
print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
print " \n";
print '';
@@ -810,15 +808,15 @@ if ($action == 'create') {
// Note Public
print '
'.$langs->trans("NotePublic").' ';
print '';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $objectsrc->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print " ";
// Note Private
- if ($object->note_private && !$user->socid) {
+ if ($objectsrc->note_private && !$user->socid) {
print '
'.$langs->trans("NotePrivate").' ';
print '';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $objectsrc->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print " ";
}
@@ -861,15 +859,15 @@ if ($action == 'create') {
// Other attributes
$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
- $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $objectsrc may have been modified by hook
print $hookmanager->resPrint;
- // Here $object can be of an object Order
+ // Here $object can be of an object Reception
$extrafields->fetch_name_optionals_label($object->table_element);
if (empty($reshook) && !empty($extrafields->attributes[$object->table_element]['label'])) {
// copy from order
- if ($object->fetch_optionals() > 0) {
- $recept->array_options = array_merge($recept->array_options, $object->array_options);
+ if ($objectsrc->fetch_optionals() > 0) {
+ $recept->array_options = array_merge($recept->array_options, $objectsrc->array_options);
}
print $object->showOptionals($extrafields, 'edit', $parameters);
}
@@ -877,9 +875,9 @@ if ($action == 'create') {
// Incoterms
if (!empty($conf->incoterm->enabled)) {
print '
';
- print ''.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).' '.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).' ';
- print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+ print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : ''));
print ' ';
}
@@ -898,12 +896,14 @@ if ($action == 'create') {
print dol_get_fiche_end();
-
// Reception lines
$numAsked = 0;
$dispatchLines = array();
foreach ($_POST as $key => $value) {
+ // If create form is coming from the button "Create Reception" of previous page
+
// without batch module enabled
+ $reg = array();
if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
$numAsked++;
@@ -934,6 +934,25 @@ if ($action == 'create') {
$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
}
+
+ // If create form is coming from same page post was sent but an error occured
+ if (preg_match('/^productid([0-9]+)$/i', $key, $reg)) {
+ $numAsked++;
+
+ // eat-by date dispatch
+ // $numline=$reg[2] + 1; // line of product
+ $numline = $numAsked;
+ $prod = 'productid'.$reg[1];
+ $comment = 'comment'.$reg[1];
+ $qty = 'qtyl'.$reg[1];
+ $ent = 'entl'.$reg[1];
+ $pu = 'pul'.$reg[1];
+ $lot = 'batch'.$reg[1];
+ $dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo'.$reg[1].'month', 'int'), GETPOST('dluo'.$reg[1].'day', 'int'), GETPOST('dluo'.$reg[1].'year', 'int'));
+ $dDLC = dol_mktime(12, 0, 0, GETPOST('dlc'.$reg[1].'month', 'int'), GETPOST('dlc'.$reg[1].'day', 'int'), GETPOST('dlc'.$reg[1].'year', 'int'));
+ $fk_commandefourndet = 'fk_commandefournisseurdet'.$reg[1];
+ $dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST($comment), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
+ }
}
@@ -961,7 +980,7 @@ if ($action == 'create') {
print '
';
// Load receptions already done for same order
- $object->loadReceptions();
+ $objectsrc->loadReceptions();
if ($numAsked) {
print '';
@@ -993,14 +1012,13 @@ if ($action == 'create') {
$indiceAsked = 1;
while ($indiceAsked <= $numAsked) {
$product = new Product($db);
- foreach ($object->lines as $supplierLine) {
+ foreach ($objectsrc->lines as $supplierLine) {
if ($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id) {
$line = $supplierLine;
break;
}
}
-
// Show product and description
$type = $line->product_type ? $line->product_type : $line->fk_product_type;
// Try to enhance type detection using date_start and date_end for free lines where type
@@ -1012,7 +1030,7 @@ if ($action == 'create') {
$type = 1;
}
- print ''."\n";
+ print ''."\n";
print ' '."\n";
@@ -1024,6 +1042,7 @@ if ($action == 'create') {
print '';
print ' ';
print ' ';
@@ -1075,13 +1094,14 @@ if ($action == 'create') {
// Qty
print ''.$line->qty;
print ' ';
$qtyProdCom = $line->qty;
// Qty already received
print '';
- $quantityDelivered = $object->receptions[$line->id];
+ $quantityDelivered = $objectsrc->receptions[$line->id];
print $quantityDelivered;
print ' ';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0a3e9207a96..48cc882c052 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1405,7 +1405,7 @@ while ($i < min($num, $limit)) {
}
if (!empty($arrayfields['s.name_alias']['checked'])) {
print '';
- print $companystatic->name_alias;
+ print dol_escape_htmltag($companystatic->name_alias);
print " \n";
if (!$i) {
$totalarray['nbfield']++;
@@ -1413,70 +1413,70 @@ while ($i < min($num, $limit)) {
}
// Barcode
if (!empty($arrayfields['s.barcode']['checked'])) {
- print ''.$obj->barcode.' ';
+ print ''.dol_escape_htmltag($obj->barcode).' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Customer code
if (!empty($arrayfields['s.code_client']['checked'])) {
- print ''.$obj->code_client.' ';
+ print ''.dol_escape_htmltag($obj->code_client).' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Supplier code
if (!empty($arrayfields['s.code_fournisseur']['checked'])) {
- print ''.$obj->code_fournisseur.' ';
+ print ''.dol_escape_htmltag($obj->code_fournisseur).' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Account customer code
if (!empty($arrayfields['s.code_compta']['checked'])) {
- print ''.$obj->code_compta.' ';
+ print ''.dol_escape_htmltag($obj->code_compta).' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Account supplier code
if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
- print ''.$obj->code_compta_fournisseur.' ';
+ print ''.dol_escape_htmltag($obj->code_compta_fournisseur).' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Address
if (!empty($arrayfields['s.address']['checked'])) {
- print ''.$obj->address.' ';
+ print ''.dol_escape_htmltag($obj->address).' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Zip
if (!empty($arrayfields['s.zip']['checked'])) {
- print "".$obj->zip." \n";
+ print "".dol_escape_htmltag($obj->zip)." \n";
if (!$i) {
$totalarray['nbfield']++;
}
}
// Town
if (!empty($arrayfields['s.town']['checked'])) {
- print "".$obj->town." \n";
+ print ''.dol_escape_htmltag($obj->town)." \n";
if (!$i) {
$totalarray['nbfield']++;
}
}
// State
if (!empty($arrayfields['state.nom']['checked'])) {
- print "".$obj->state_name." \n";
+ print "".dol_escape_htmltag($obj->state_name)." \n";
if (!$i) {
$totalarray['nbfield']++;
}
}
// Region
if (!empty($arrayfields['region.nom']['checked'])) {
- print "".$obj->region_name." \n";
+ print "".dol_escape_htmltag($obj->region_name)." \n";
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 7f325090b5e..5614b3c6138 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -514,7 +514,7 @@ class Stripe extends CommonObject
if (!$resql) {
$error++;
$this->error = $this->db->lasterror();
- dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
+ dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.", LOG_ERR);
}
}
} else {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 5180abe6140..61a6d15d9a1 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1112,10 +1112,10 @@ class Ticket extends CommonObject
}
/**
- * print selected status
+ * Print selected status
*
- * @param string $selected selected status
- * @return void
+ * @param string $selected Selected status
+ * @return void
*/
public function printSelectStatus($selected = "")
{
@@ -1124,9 +1124,9 @@ class Ticket extends CommonObject
/**
- * Charge dans cache la liste des types de tickets (paramétrable dans dictionnaire)
+ * Load into a cache the types of tickets (setup done into dictionaries)
*
- * @return int Number of lines loaded, 0 if already loaded, <0 if KO
+ * @return int Number of lines loaded, 0 if already loaded, <0 if KO
*/
public function loadCacheTypesTickets()
{
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 073438bda1f..62d815842ce 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1134,7 +1134,8 @@ if ($action == 'create' || $action == 'adduserldap') {
}
if (!empty($conf->global->MAIN_MULTILANGS)) {
- print ' '.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).' '."\n";
+ print ' '.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).' ';
+ print ''."\n";
print img_picto('', 'language').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
print ' ';
print ''.$langs->trans("DefaultLang").' ';
+ print ' ';
+ print $form->textwithpicto($langs->trans("DefaultLang"), $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup")));
+ print ' ';
//$s=picto_from_langcode($object->default_lang);
//print ($s?$s.' ':'');
- $langs->load("languages");
$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
- print $form->textwithpicto($labellang, $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup")));
+ print $labellang;
print ' ('.$langs->trans("Previous").') , ';
}
- print dol_print_date($object->datelastlogin, "dayhour").' ('.$langs->trans("Current").') ';
+ if ($object->datelastlogin) {
+ print dol_print_date($object->datelastlogin, "dayhour").' ('.$langs->trans("Current").') ';
+ }
print '';
print "\n";
@@ -2500,7 +2505,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Default language
if (!empty($conf->global->MAIN_MULTILANGS)) {
- print ''.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).' '."\n";
+ print ' '.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).' '."\n";
print img_picto('', 'language').$formadmin->select_language($object->lang, 'default_lang', 0, 0, 1);
print ' ';
print '
- * Copyright (C) 2005-2017 Regis Houssin
- * Copyright (C) 2011 Herve Prot
- * Copyright (C) 2012 Florian Henry
- * Copyright (C) 2018 Juanjo Menent
+ * Copyright (C) 2005-2021 Laurent Destailleur
+ * Copyright (C) 2005-2017 Regis Houssin
+ * Copyright (C) 2011 Herve Prot
+ * Copyright (C) 2012 Florian Henry
+ * Copyright (C) 2018 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
/**
* \file htdocs/user/group/card.php
- * \brief Onglet groupes utilisateurs
+ * \brief Tab of a user group
*/
require '../../main.inc.php';
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index edd34dfe9b8..302d697c563 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2018 Laurent Destailleur
* Copyright (C) 2005-2018 Regis Houssin
* Copyright (C) 2011 Herve Prot
- * Copyright (C) 2019 Frédéric France
+ * Copyright (C) 2019-2021 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@ $langs->load("users");
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
$search_group = GETPOST('search_group');
$optioncss = GETPOST('optioncss', 'alpha');
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
// Defini si peux lire/modifier utilisateurs et permisssions
$caneditperms = ($user->admin || $user->rights->user->user->creer);
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 693590ff7d2..bd82824cb05 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -933,13 +933,13 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
}
if (!empty($arrayfields['u.office_phone']['checked'])) {
- print "".dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')." \n";
+ print ''.dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')." \n";
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields['u.user_mobile']['checked'])) {
- print "".dol_print_phone($obj->user_mobile, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'mobile')." \n";
+ print ''.dol_print_phone($obj->user_mobile, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'mobile')." \n";
if (!$i) {
$totalarray['nbfield']++;
}
@@ -992,7 +992,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Salary
if (!empty($arrayfields['u.salary']['checked'])) {
- print ''.($obj->salary ? price($obj->salary) : '').' ';
+ print ''.($obj->salary ? price($obj->salary) : '').' ';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ef5660ce8fa..fe1bdce10d4 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -4098,9 +4098,9 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
print $langs->trans("SearchReplaceInto");
print '';
print '';
- print ''.$langs->trans("Content").' '.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords").' '.$langs->trans("GlobalCSSorJS").'
';
print '';
