';
print ''.$langs->trans("Entities").' ';
//print ''.$langs->trans("ExportableFields").' ';
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index d49f58ed52e..2702ad6c55e 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -417,15 +417,16 @@ class Interventions extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->statuts_short);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 3f94401bc9d..416f7e11e94 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -333,15 +333,16 @@ class SupplierInvoices extends DolibarrApi
);
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param Object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->rowid);
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 9a898fae3a7..42f7eccf608 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -330,15 +330,16 @@ class SupplierOrders extends DolibarrApi
);
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param Object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->rowid);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index d2c7ad43a00..6b533ae2d21 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1555,9 +1555,10 @@ class FactureFournisseur extends CommonInvoice
* @param int $origin_id id origin document
* @param double $pu_ht_devise Amount in currency
* @param string $ref_supplier Supplier ref
+ * @param string $special_code Special code
* @return int >0 if OK, <0 if KO
*/
- public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0, $ref_supplier = '')
+ public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0, $ref_supplier = '', $special_code = '')
{
global $langs, $mysoc, $conf;
@@ -1727,7 +1728,7 @@ class FactureFournisseur extends CommonInvoice
$this->line->rang=$rang;
$this->line->info_bits=$info_bits;
- $this->line->special_code=$this->special_code;
+ $this->line->special_code=((string) $special_code != '' ? $special_code : $this->special_code);
$this->line->fk_parent_line=$this->fk_parent_line;
$this->line->origin=$this->origin;
$this->line->origin_id=$origin_id;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 3f17d9de915..45f33c0019a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -949,7 +949,8 @@ if (empty($reshook))
$lines[$i]->fk_unit,
$lines[$i]->id,
0,
- $lines[$i]->ref_supplier
+ $lines[$i]->ref_supplier,
+ $lines[$i]->special_code
);
if ($result < 0)
diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php
index 45a95bcbada..cc213007fc0 100644
--- a/htdocs/holiday/common.inc.php
+++ b/htdocs/holiday/common.inc.php
@@ -23,7 +23,7 @@
* \brief Common load of data
*/
-require_once realpath(dirname(__FILE__)).'/../main.inc.php';
+require_once realpath(__DIR__).'/../main.inc.php';
if (! class_exists('Holiday')) {
require_once DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php';
}
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index 5154d7311a9..19c6d2b386c 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -58,6 +58,8 @@ CREATE TABLE llx_pos_cash_fence(
-- For 10.0
+DROP TABLE llx_cotisation;
+
ALTER TABLE llx_loan ADD COLUMN insurance_amount double(24,8) DEFAULT 0;
ALTER TABLE llx_facture DROP INDEX idx_facture_uk_facnumber;
@@ -230,3 +232,13 @@ ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_fk_product (fk_product);
ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_rowid (rowid);
ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_fk_product (fk_product);
ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_fk_bom (fk_bom);
+
+ALTER TABLE llx_facturedet_rec ADD COLUMN buy_price_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet_rec ADD COLUMN fk_product_fournisseur_price integer DEFAULT NULL;
+
+ALTER TABLE llx_facturedet_rec ADD COLUMN fk_user_author integer;
+ALTER TABLE llx_facturedet_rec ADD COLUMN fk_user_modif integer;
+
+ALTER TABLE llx_expensereport_det MODIFY COLUMN value_unit double(24,8) NOT NULL;
+ALTER TABLE llx_expensereport_det ADD COLUMN subprice double(24,8) NOT NULL after qty;
+
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
index fc0bd6e697f..1000e10955f 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_det.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql
@@ -27,7 +27,8 @@ CREATE TABLE llx_expensereport_det
comments text NOT NULL,
product_type integer DEFAULT -1,
qty real NOT NULL,
- value_unit real NOT NULL,
+ subprice double(24,8), -- P.U. HT (example 100)
+ value_unit double(24,8) NOT NULL, -- P.U. TTC (example 120)
remise_percent real,
vat_src_code varchar(10) DEFAULT '', -- Vat code used as source of vat fields. Not strict foreign key here.
tva_tx double(6,3), -- Vat rate
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index ac7142c898d..deb52576a8a 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -55,16 +55,16 @@ create table llx_facturedet
buy_price_ht double(24,8) DEFAULT 0, -- buying price. Note: this value is saved as an always positive value, even on credit notes (it is price we bought the product before selling it).
fk_product_fournisseur_price integer DEFAULT NULL, -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
- fk_code_ventilation integer DEFAULT 0 NOT NULL, -- Id in table llx_accounting_bookeeping to know accounting account for product line
-
special_code integer DEFAULT 0, -- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
rang integer DEFAULT 0, -- position of line
fk_contract_line integer NULL, -- id of contract line when invoice comes from contract lines
+ fk_unit integer DEFAULT NULL, -- id of the unit code
import_key varchar(14),
+ fk_code_ventilation integer DEFAULT 0 NOT NULL, -- Id in table llx_accounting_bookeeping to know accounting account for product line
+
situation_percent real, -- % progression of lines invoicing
- fk_prev_id integer, -- id of the line in the previous situation,
- fk_unit integer DEFAULT NULL, -- id of the unit code¡
+ fk_prev_id integer, -- id of the line in the previous situation
fk_user_author integer, -- user making creation
fk_user_modif integer, -- user making last change
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
index ac79dfd891d..267abcd5053 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
@@ -48,11 +48,18 @@ create table llx_facturedet_rec
date_start_fill integer DEFAULT 0, -- 1=autofill the date_start of invoice with __INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__
date_end_fill integer DEFAULT 0, -- 1=autofill the date_start of invoice with __INVOICE_PREVIOUS_DATE_NEXT_INVOICE_AFTER_GEN__
info_bits integer DEFAULT 0, -- TVA NPR ou non
+
+ buy_price_ht double(24,8) DEFAULT 0, -- buying price. Note: this value is saved as an always positive value, even on credit notes (it is price we bought the product before selling it).
+ fk_product_fournisseur_price integer DEFAULT NULL, -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
+
special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales
rang integer DEFAULT 0, -- ordre d'affichage
fk_contract_line integer NULL, -- id of contract line when template invoice comes from contract lines
fk_unit integer DEFAULT NULL,
import_key varchar(14),
+
+ fk_user_author integer, -- user making creation
+ fk_user_modif integer, -- user making last change
fk_multicurrency integer,
multicurrency_code varchar(255),
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 274efc04eb1..6a821d8dbaf 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -88,7 +88,7 @@ if (! $versionfrom && ! $versionto)
// Test if batch mode
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
- $path=dirname(__FILE__).'/';
+ $path=__DIR__.'/';
if (substr($sapi_type, 0, 3) == 'cli')
{
print 'Syntax from command line: '.$script_file." x.y.z a.b.c\n";
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 2fa5fad38ac..45b5f8fe95c 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -96,7 +96,7 @@ if ((! $versionfrom || preg_match('/version/', $versionfrom)) && (! $versionto |
// Test if batch mode
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
- $path=dirname(__FILE__).'/';
+ $path=__DIR__.'/';
if (substr($sapi_type, 0, 3) == 'cli')
{
print 'Syntax from command line: '.$script_file." x.y.z a.b.c [MAIN_MODULE_NAME1_TO_ENABLE,MAIN_MODULE_NAME2_TO_ENABLE...]\n";
@@ -186,7 +186,7 @@ if (! GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'a
{
// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
// Version to install is DOL_VERSION
- $dolibarrlastupgradeversionarray=preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_UPGRADE:$conf->global->MAIN_VERSION_LAST_INSTALL);
+ $dolibarrlastupgradeversionarray=preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_UPGRADE:(isset($conf->global->MAIN_VERSION_LAST_INSTALL)?$conf->global->MAIN_VERSION_LAST_INSTALL:''));
// Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
// dans la 1ere colonne, la description de l'action a faire
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 6cc85024843..cff8f7d657b 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -14,9 +14,9 @@ OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to prev
AddedByAuthority=Stored into remote authority
NotAddedByAuthorityYet=Not yet stored into remote authority
ShowDetails=Show stored details
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to invoice) logical deletion
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
logPAYMENT_ADD_TO_BANK=Payment added to bank
logPAYMENT_CUSTOMER_CREATE=Customer payment created
logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 6366e93e375..3759a9c881b 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -87,14 +87,14 @@ TicketEmailNotificationFrom=Notification email from
TicketEmailNotificationFromHelp=Used into ticket message answer by example
TicketEmailNotificationTo=Notifications email to
TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket (public interface)
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
TicketParamPublicInterface=Public interface setup
TicketsEmailMustExist=Require an existing email address to create a ticket
TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Public interface URL
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface to another IP address.
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
@@ -124,7 +124,7 @@ TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automaticall
TicketNumberingModules=Tickets numbering module
TicketNotifyTiersAtCreation=Notify third party at creation
TicketGroup=Group
-
+TicketsDisableCustomerEmail=Alsways disable emails when a ticket is created from public interface
#
# Index & list page
#
@@ -154,7 +154,6 @@ TicketMarkedAsRead=Ticket has been marked as read
TicketReadOn=Read on
TicketCloseOn=Clotured on
MarkAsRead=Mark ticket as read
-TicketMarkedAsReadButLogActionNotSaved=Ticket marked as closed but no action saved
TicketHistory=Ticket history
AssignUser=Assign to user
TicketAssigned=Ticket is now assigned
@@ -179,7 +178,6 @@ ConfirmCloseAticket=Confirm ticket closing
ConfirmDeleteTicket=Please confirm ticket deleting
TicketDeletedSuccess=Ticket deleted with success
TicketMarkedAsClosed=Ticket marked as closed
-TicketMarkedAsClosedButLogActionNotSaved=Ticket marked as closed but no log saved !
TicketDurationAuto=Calculated duration
TicketDurationAutoInfos=Duration calculated automatically from intervention related
TicketUpdated=Ticket updated
@@ -226,14 +224,12 @@ Unread=Unread
#
# Logs
#
-TicketLogMesgReadBy=Ticket read by %s
+TicketLogMesgReadBy=Ticket %s read by %s
NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket assigned to %s
-TicketAssignedButLogActionNotSaved=Ticket assigned but no log saved !
-TicketLogPropertyChanged=Change classification: from %s to %s
-TicketLogClosedBy=Ticket closed by %s
-TicketLogProgressSetTo=Progress change to %s percent
-TicketLogReopen=Ticket re-opened
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-opened
#
# Public pages
@@ -267,7 +263,7 @@ ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
TicketNewEmailSubjectAdmin=New ticket created
TicketNewEmailBodyAdmin=Ticket has just been created with ID #%s, see information:
SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=Access for this area: forbidden
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
# notifications
TicketNotificationEmailSubject=Ticket %s updated
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 2ede3bc474e..3072dae1df6 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -73,23 +73,19 @@ EX_PAR_VP=Parking PV
EX_CAM_VP=PV maintenance and repair
DefaultCategoryCar=Default transportation mode
DefaultRangeNumber=Default range number
-
+UploadANewFileNow=Upload a new document now
Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
AucuneLigne=There is no expense report declared yet
-
ModePaiement=Payment mode
-
VALIDATOR=User responsible for approval
VALIDOR=Approved by
AUTHOR=Recorded by
AUTHORPAIEMENT=Paid by
REFUSEUR=Denied by
CANCEL_USER=Deleted by
-
MOTIF_REFUS=Reason
MOTIF_CANCEL=Reason
-
DATE_REFUS=Deny date
DATE_SAVE=Validation date
DATE_CANCEL=Cancelation date
@@ -140,7 +136,6 @@ OnExpense=Expense line
ExpenseReportRuleSave=Expense report rule saved
ExpenseReportRuleErrorOnSave=Error: %s
RangeNum=Range %d
-
ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s is superior to %s %s
byEX_DAY=by day (limitation to %s)
byEX_MON=by month (limitation to %s)
@@ -151,7 +146,6 @@ nolimitbyEX_DAY=by day (no limitation)
nolimitbyEX_MON=by month (no limitation)
nolimitbyEX_YEA=by year (no limitation)
nolimitbyEX_EXP=by line (no limitation)
-
CarCategory=Category of car
ExpenseRangeOffset=Offset amount: %s
RangeIk=Mileage range
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 53ac720d862..fb35cb5e112 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -109,4 +109,4 @@ UserLogoff=User logout
UserLogged=User logged
DateEmployment=Employment Start Date
DateEmploymentEnd=Employment End Date
-CantDisableYourself=You can disable your own user record
\ No newline at end of file
+CantDisableYourself=You can't disable your own user record
\ No newline at end of file
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index eb9d9e14641..a8a4469fb3c 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -95,3 +95,4 @@ InternalURLOfPage=Internal URL of page
ThisPageIsTranslationOf=This page/container is a translation of
ThisPageHasTranslationPages=This page/container has translation
NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 70571964162..4a85cd8ddab 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -395,6 +395,7 @@ if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->
{
dol_syslog("Invalid token, so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
//print 'Unset POST by CSRF protection in main.inc.php.'; // Do not output anything because this create problems when using the BACK button on browsers.
+ if ($conf->global->MAIN_FEATURES_LEVEL>1) setEventMessages('Unset POST by CSRF protection in main.inc.php.', null, 'warnings');
unset($_POST);
unset($_GET['confirm']);
}
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index d88166db424..0885f12af67 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -132,6 +132,8 @@ dol_fiche_end();
print '';
+$invoice_status_except_list = array(Facture::STATUS_DRAFT, Facture::STATUS_ABANDONED);
+
$sql = "SELECT";
$sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
$sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,";
@@ -153,7 +155,7 @@ if (! empty($conf->global->AGENT_CONTACT_TYPE))
$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
else
$sql .= " AND sc.fk_user = u.rowid";
-$sql.= " AND f.fk_statut > 0";
+$sql.= " AND f.fk_statut NOT IN (" . implode(', ', $invoice_status_except_list) . ")";
$sql.= ' AND s.entity IN ('.getEntity('societe').')';
$sql.= " AND d.fk_facture = f.rowid";
if ($agentid > 0) {
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 4203d591541..a3b932e565c 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -183,6 +183,7 @@ dol_fiche_end();
$arrayfields=array();
$massactionbutton='';
+$invoice_status_except_list = array(Facture::STATUS_DRAFT, Facture::STATUS_ABANDONED);
$sql = "SELECT";
$sql .= " f.ref, f.rowid as invoiceid, d.rowid as invoicedetid, d.buy_price_ht, d.total_ht, d.subprice, d.label, d.description , d.qty";
@@ -190,7 +191,7 @@ $sql .= " ,d.fk_product";
$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f ";
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as d ON d.fk_facture = f.rowid";
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
-$sql .= " WHERE f.fk_statut > 0";
+$sql .= " WHERE f.fk_statut NOT IN (" . implode(', ', $invoice_status_except_list) . ")";
$sql .= " AND f.entity IN (" . getEntity('invoice') . ") ";
if (! empty($startdate)) $sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
if (! empty($enddate)) $sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 0e591bc6036..7a3777ecfb5 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -200,6 +200,8 @@ dol_fiche_end();
print '';
+$invoice_status_except_list = array(Facture::STATUS_DRAFT, Facture::STATUS_ABANDONED);
+
$sql = "SELECT";
$sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
if ($client) $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
@@ -218,7 +220,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PRE
$sql.= " WHERE f.fk_soc = s.rowid";
if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
if (!$user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " AND f.fk_statut > 0";
+$sql.= " AND f.fk_statut NOT IN (" . implode(', ', $invoice_status_except_list) . ")";
$sql.= ' AND s.entity IN ('.getEntity('societe').')';
$sql.= " AND d.fk_facture = f.rowid";
$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 7d644931ffc..c390f9599c8 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -174,6 +174,8 @@ dol_fiche_end();
print '';
+$invoice_status_except_list = array(Facture::STATUS_DRAFT, Facture::STATUS_ABANDONED);
+
$sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,";
if ($id > 0) $sql.= " d.fk_product,";
if ($id > 0) $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
@@ -190,7 +192,7 @@ if (! empty($TSelectedCats)) {
}
$sql.= " WHERE f.fk_soc = s.rowid";
$sql.= ' AND f.entity IN ('.getEntity('invoice').')';
-$sql.= " AND f.fk_statut > 0";
+$sql.= " AND f.fk_statut NOT IN (" . implode(', ', $invoice_status_except_list) . ")";
$sql.= " AND d.fk_facture = f.rowid";
if ($id > 0)
$sql.= " AND d.fk_product =".$id;
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index cdb5a4b74f4..acf7f65454d 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -31,7 +31,6 @@ dol_include_once('/mymodule/class/myobject.class.php');
/**
* API class for mymodule myobject
*
- * @smart-auto-routing false
* @access protected
* @class DolibarrApiAccess {@requires user,external}
*/
@@ -205,7 +204,7 @@ class MyModuleApi extends DolibarrApi
$this->myobject->$field = $value;
}
if( ! $this->myobject->create(DolibarrApiAccess::$user)) {
- throw new RestException(500);
+ throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors));
}
return $this->myobject->id;
}
@@ -235,13 +234,18 @@ class MyModuleApi extends DolibarrApi
}
foreach($request_data as $field => $value) {
+ if ($field == 'id') continue;
$this->myobject->$field = $value;
}
- if($this->myobject->update($id, DolibarrApiAccess::$user))
+ if ($this->myobject->update($id, DolibarrApiAccess::$user) > 0)
+ {
return $this->get($id);
-
- return false;
+ }
+ else
+ {
+ throw new RestException(500, $this->myobject->error);
+ }
}
/**
@@ -254,21 +258,21 @@ class MyModuleApi extends DolibarrApi
*/
public function delete($id)
{
- if(! DolibarrApiAccess::$user->rights->myobject->delete) {
+ if (! DolibarrApiAccess::$user->rights->myobject->delete) {
throw new RestException(401);
}
$result = $this->myobject->fetch($id);
- if( ! $result ) {
+ if (! $result) {
throw new RestException(404, 'MyObject not found');
}
- if( ! DolibarrApi::_checkAccessToResource('myobject', $this->myobject->id)) {
+ if (! DolibarrApi::_checkAccessToResource('myobject', $this->myobject->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- if( !$this->myobject->delete(DolibarrApiAccess::$user, 0))
+ if (! $this->myobject->delete(DolibarrApiAccess::$user))
{
- throw new RestException(500);
+ throw new RestException(500, 'Error when deleting MyObject : '.$this->myobject->error);
}
return array(
@@ -280,14 +284,16 @@ class MyModuleApi extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
/*unset($object->note);
@@ -303,10 +309,10 @@ class MyModuleApi extends DolibarrApi
/**
* Validate fields before create or update object
*
- * @param array $data Data to validate
- * @return array
+ * @param array $data Array of data to validate
+ * @return array
*
- * @throws RestException
+ * @throws RestException
*/
private function _validate($data)
{
diff --git a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
index 7416eb1c35e..087f102daef 100644
--- a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
+++ b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
@@ -186,7 +186,7 @@ class mymodulewidget1 extends ModeleBoxes
'tr' => 'class="left"',
'text' => ''
),
- 0 => array( // TR
+ 1 => array( // TR
'tr' => 'class="left"',
'text' => ''
)
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 83644cd1f0e..07419af532d 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -97,9 +97,10 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
* This is the main function that returns the array of emails
*
* @param int $mailing_id Id of emailing
+ * @param array $cibles Array with targets
* @return int <0 if error, number of emails added if ok
*/
- public function add_to_target($mailing_id)
+ public function add_to_target($mailing_id, $cibles)
{
// phpcs:enable
$target = array();
diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
index 97310f11de6..f80a5f67b3e 100644
--- a/htdocs/modulebuilder/template/scripts/myobject.php
+++ b/htdocs/modulebuilder/template/scripts/myobject.php
@@ -25,7 +25,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path=__DIR__.'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index c95bcdcb8f4..756bbde5b29 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -468,15 +468,16 @@ class Products extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->regeximgext);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9ef3ba450cf..0721016a8aa 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1561,7 +1561,7 @@ class Product extends CommonObject
* @param Societe $thirdparty_buyer Buyer
* @param int $pqp Id of product per price if a selection was done of such a price
* @return array Array of price information
- * @see get_buyprice()
+ * @see get_buyprice(), find_min_price_product_fournisseur()
*/
public function getSellPrice($thirdparty_seller, $thirdparty_buyer, $pqp = 0)
{
@@ -1672,8 +1672,8 @@ class Product extends CommonObject
* @param int $product_id Filter on a particular product id
* @param string $fourn_ref Filter on a supplier price ref. 'none' to exclude ref in search.
* @param int $fk_soc If of supplier
- * @return int <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...)
- * @see getSellPrice()
+ * @return int <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...)
+ * @see getSellPrice(), find_min_price_product_fournisseur()
*/
public function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
{
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 51a096d1cd7..45066e5ccdc 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -818,7 +818,7 @@ if ($resql)
// Duration
if ((string) $type == '1' && ! empty($arrayfields['p.duration']['checked']))
{
- print '';
+ print ' ';
if (preg_match('/([^a-z]+)[a-z]$/i', $obj->duration))
{
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 4c5971b8cc4..12cf15110fe 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -274,15 +274,16 @@ class StockMovements extends DolibarrApi
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param MouvementStock $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
// Remove useless data
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 18286cea931..e0a05af4226 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -243,15 +243,16 @@ class Warehouses extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param Entrepot $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
// Remove the subscriptions because they are handled as a subresource.
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 39a9bb94bed..130bece6372 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -88,7 +88,7 @@ class MouvementStock extends CommonObject
$this->db = $db;
}
-
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Add a movement of stock (in one direction only)
*
@@ -111,9 +111,10 @@ class MouvementStock extends CommonObject
* @param int $id_product_batch Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
* @return int <0 if KO, 0 if fk_product is null, >0 if OK
*/
- private function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0)
+ public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0)
{
- global $conf, $langs;
+ // phpcs:disable
+ global $conf, $langs;
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
@@ -710,34 +711,42 @@ class MouvementStock extends CommonObject
* @param date $sellby sell-by date
* @param string $batch batch number
* @param int $id_product_batch Id product_batch
+ * @param string $inventorycode Inventory code
* @return int <0 if KO, >0 if OK
*/
- public function livraison($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $id_product_batch = 0)
+ public function livraison($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $id_product_batch = 0, $inventorycode='')
{
global $conf;
$skip_batch = empty($conf->productbatch->enabled);
- return $this->_create($user, $fk_product, $entrepot_id, (0 - $qty), 2, $price, $label, '', $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
+ return $this->_create($user, $fk_product, $entrepot_id, (0 - $qty), 2, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
}
/**
* Increase stock for product and subproducts
*
- * @param User $user Object user
- * @param int $fk_product Id product
- * @param int $entrepot_id Warehouse id
- * @param int $qty Quantity
- * @param int $price Price
- * @param string $label Label of stock movement
- * @param date $eatby eat-by date
- * @param date $sellby sell-by date
- * @param string $batch batch number
- * @return int <0 if KO, >0 if OK
+ * @param User $user Object user
+ * @param int $fk_product Id product
+ * @param int $entrepot_id Warehouse id
+ * @param int $qty Quantity
+ * @param int $price Price
+ * @param string $label Label of stock movement
+ * @param date $eatby eat-by date
+ * @param date $sellby sell-by date
+ * @param string $batch batch number
+ * @param string $datem Force date of movement
+ * @param int $id_product_batch Id product_batch
+ * @param string $inventorycode Inventory code
+ * @return int <0 if KO, >0 if OK
*/
- public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '')
+ public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '', $datem = '', $id_product_batch = 0, $inventorycode='')
{
- return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, '', '', $eatby, $sellby, $batch);
+ global $conf;
+
+ $skip_batch = empty($conf->productbatch->enabled);
+
+ return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
}
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 532f46ccfe4..9680cd66591 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -534,15 +534,16 @@ class Projects extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->titre);
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 40c3e78f7e6..9fafcb98343 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -547,15 +547,16 @@ class Tasks extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->barcode_type);
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index ca29f89d39e..5e241c4edfb 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -45,10 +45,11 @@ $langs->loadLangs(array('companies', 'other', 'ticket', 'errors'));
$track_id = GETPOST('track_id', 'alpha');
$action = GETPOST('action', 'alpha');
-/***************************************************
- * VIEW
- *
- ****************************************************/
+
+/*
+ * View
+ */
+
$form = new Form($db);
$formticket = new FormTicket($db);
@@ -62,9 +63,9 @@ if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
print '';
print '
' . ($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")) . '
';
print '
';
print '
';
- print '';
+ print '';
// Type
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 97fc83a3545..772d8d3fe10 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -379,15 +379,16 @@ class Contacts extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param Object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->total_ht);
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 3cc1dd51b1a..954535d1c87 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1626,14 +1626,16 @@ $reshook = $hookmanager->executeHooks('replaceThirdparty', array(
}
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->nom); // ->name already defined and nom deprecated
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 15f4278bf49..5ac77fe85bb 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -190,15 +190,16 @@ class Supplierproposals extends DolibarrApi
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
unset($object->name);
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.css b/htdocs/theme/eldy/main_menu_fa_icons.css
index 58890786111..57d422b8395 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.css
+++ b/htdocs/theme/eldy/main_menu_fa_icons.css
@@ -118,6 +118,14 @@ div.mainmenu.products::before {
font-size: 1.5em;
}
+div.mainmenu.mrp::before {
+ font-family: "Font Awesome 5 Free";
+ font-weight: 900;
+ content: "\f468";
+ color: white;
+ font-size: 1.5em;
+}
+
div.mainmenu.project::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index db4b494179d..1f58937d879 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1839,7 +1839,7 @@ a.tmenuimage {
$found=1;
break;
}
- else if (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
+ elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
{
$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found=1;
@@ -3037,7 +3037,7 @@ div.pagination li.paginationafterarrows {
box-shadow: unset;
-webkit-box-shadow: unset;
}
-.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover
+.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover, .tagtr.oddeven
{
font-family: ;
margin-bottom: 1px;
@@ -3051,7 +3051,7 @@ div.pagination li.paginationafterarrows {
background-color: #;
}
-.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover {
+.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
font-family: ;
margin-bottom: 1px;
color: #202020;
@@ -3117,7 +3117,7 @@ div.liste_titre_bydiv {
/*width: calc(100% - 1px); 1px more, i don't know why so i remove */
width: calc(100%);
}
-tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
+tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre
{
height: 26px !important;
}
@@ -3128,11 +3128,10 @@ div.colorback /* for the form "assign user" on time spent view */
margin-top: 5px;
border: 1px solid #ddd;
}
-div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
+div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, .tagtr.liste_titre, .tagtr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
{
background: rgb();
font-weight: ;
-/* border-bottom: 1px solid #ddd; */
color: rgb();
font-family: ;
@@ -3257,19 +3256,24 @@ div.tabBar .noborder {
/* Prepare to remove class pair - impair */
.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre) {
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(even):not(.liste_titre)
+{
background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
}
-.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre) {
+.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre),
+.noborder .oddeven.tagtr:nth-child(even):not(:last-child) .tagtd:not(.liste_titre)
+{
border-bottom: 1px solid #ddd;
}
.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre)
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre)
{
background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
@@ -3277,7 +3281,9 @@ div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) > .border > tbody >
background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
}
-.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre) {
+.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre),
+.noborder .oddeven.tagtr:nth-child(odd):not(:last-child) .tagtd:not(.liste_titre)
+{
border-bottom: 1px solid #ddd;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 85918a43245..1f98c2d25ca 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1764,6 +1764,10 @@ div.mainmenu.products {
background-image: url();
}
+div.mainmenu.mrp {
+ background-image: url();
+}
+
div.mainmenu.project {
background-image: url();
}
@@ -1819,7 +1823,7 @@ foreach($mainmenuusedarray as $val)
$found=1;
break;
}
- else if (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
+ elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
{
$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found=1;
@@ -2765,6 +2769,10 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td {
table.noborder td, div.noborder form, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
padding: 4px 6px 4px 6px; /* t r b l */
}
+form.tagtable {
+ padding: unset !important;
+ border: unset !important;
+}
table.liste td, table.noborder td, div.noborder form div {
padding: 8px 6px 8px 6px; /* t r b l */
@@ -3079,11 +3087,11 @@ div.liste_titre_bydiv {
padding: 2px 0px 2px 0;
width: calc(100% - 1px);
}
-tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
+tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre
{
height: 26px !important;
}
-div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
+div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, .tagtr.liste_titre, .tagtr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
{
background: rgb();
font-weight: ;
@@ -3211,28 +3219,42 @@ div .tdtop {
/* Prepare to remove class pair - impair */
-.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(even):not(.liste_titre)
+{
background: linear-gradient(to bottom, rgb() 85%, rgb() 100%);
background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
}
-.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre) {
+.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre),
+.noborder .tagtr:nth-child(even):not(:last-child) .oddeven.tagtd:not(.liste_titre)
+{
border-bottom: 1px solid #ddd;
}
-.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) {
+.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre)
+{
background: linear-gradient(to bottom, rgb() 85%, rgb() 100%);
background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
}
-.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre) {
+.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre),
+.noborder .tagtr:nth-child(odd):not(:last-child) .oddeven.tagtd:not(.liste_titre)
+{
border-bottom: 1px solid #ddd;
}
+ul.noborder li:nth-child(even):not(.liste_titre) {
+ background-color: rgb() !important;
+}
+
/*
* Boxes
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index c71a2211e7f..fd434ef395f 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -49,8 +49,11 @@ $id = GETPOST('id', 'int');
$track_id = GETPOST('track_id', 'alpha', 3);
$ref = GETPOST('ref', 'alpha');
$projectid = GETPOST('projectid', 'int');
+$cancel = GETPOST('cancel', 'alpha');
$action = GETPOST('action', 'aZ09');
+$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
+
// Initialize technical object to manage hooks of ticket. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('ticketcard','globalcard'));
@@ -155,10 +158,8 @@ if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') &
$ret = $object->update($user);
if ($ret > 0) {
$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
- $ret = $object->createTicketLog($user, $log_action);
- if ($ret > 0) {
- setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
- }
+
+ setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
}
$action = 'view';
}
@@ -183,6 +184,28 @@ $page_title = $actionobject->getTitle($action);
llxHeader('', $page_title, $help_url);
+if ($action == 'create')
+{
+ $formticket = new FormTicket($db);
+
+ print load_fiche_titre($langs->trans('NewTicket'), '', 'title_ticket');
+
+ $formticket->withfromsocid = $socid ? $socid : $user->societe_id;
+ $formticket->withfromcontactid = $contactid ? $contactid : '';
+ $formticket->withtitletopic = 1;
+ $formticket->withnotifytiersatcreate = ($notifyTiers?1:0);
+ $formticket->withusercreate = 1;
+ $formticket->withref = 1;
+ $formticket->fk_user_create = $user->id;
+ $formticket->withfile = 2;
+ $formticket->withextrafields = 1;
+ $formticket->param = array('origin' => GETPOST('origin'), 'originid' => GETPOST('originid'));
+ if (empty($defaultref)) {
+ $defaultref = '';
+ }
+
+ $formticket->showForm(1);
+}
if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'add_message' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
|| $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink')
@@ -721,7 +744,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
if (empty($reshook))
{
// Show link to add a message (if read and not closed)
- if ($object->fk_statut < 8 && $action != "add_message") {
+ if ($object->fk_statut < Ticket::STATUS_CLOSED && $action != "add_message") {
print '';
}
@@ -730,22 +753,22 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
if (!$object->fk_soc && $user->rights->ficheinter->creer) {
print '';
}
- if ($object->fk_soc > 0 && $object->fk_statut < 8 && $user->rights->ficheinter->creer) {
+ if ($object->fk_soc > 0 && $object->fk_statut < Ticket::STATUS_CLOSED && $user->rights->ficheinter->creer) {
print '';
}
// Close ticket if statut is read
- if ($object->fk_statut > 0 && $object->fk_statut < 8 && $user->rights->ticket->write) {
+ if ($object->fk_statut > 0 && $object->fk_statut < Ticket::STATUS_CLOSED && $user->rights->ticket->write) {
print '';
}
// Re-open ticket
- if (!$user->socid && $object->fk_statut == 8 && !$user->societe_id) {
+ if (!$user->socid && $object->fk_statut == Ticket::STATUS_CLOSED && !$user->societe_id) {
print '';
}
// Delete ticket
- if ($user->rights->ticket->delete && !$user->societe_id) {
+ if ($user->rights->ticket->delete && ! $user->societe_id) {
print '';
}
}
@@ -758,7 +781,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
$action = 'presend';
}
- if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'edit_message_init')
+ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'delete' || $action == 'edit_message_init')
{
print '';
print '
'; // ancre
@@ -786,6 +809,8 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
print '
';
print load_fiche_titre($langs->trans('TicketAddMessage'), '', 'messages@ticket');
+ print '
';
}
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 395ab2078c7..f978642311c 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -116,9 +116,9 @@ class ActionsTicket
/*
* Add file in email form
*/
- if (GETPOST('addfile')) {
+ if (GETPOST('addfile', 'alpha')) {
// altairis : allow files from public interface
- if (GETPOST('track_id')) {
+ if (GETPOST('track_id', 'alpha')) {
$res = $object->fetch('', '', GETPOST('track_id', 'alpha'));
}
@@ -133,14 +133,14 @@ class ActionsTicket
dol_mkdir($upload_dir_tmp);
}
dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', dol_print_date(dol_now(), '%Y%m%d%H%M%S') . '-__file__');
- $action = !empty($object->track_id) ? 'add_message' : 'create_ticket';
+ $action = !empty($object->track_id) ? 'add_message' : 'create';
////}
}
/*
* Remove file in email form
*/
- if (GETPOST('removedfile')) {
+ if (GETPOST('removedfile', 'alpha')) {
// altairis : allow files from public interface
if (GETPOST('track_id')) {
$res = $object->fetch('', '', GETPOST('track_id', 'alpha'));
@@ -156,21 +156,21 @@ class ActionsTicket
// TODO Delete only files that was uploaded from email form
dol_remove_file_process($_POST['removedfile'], 0);
- $action = !empty($object->track_id) ? 'add_message' : 'create_ticket';
+ $action = !empty($object->track_id) ? 'add_message' : 'create';
////}
}
- if (GETPOST('add_ticket') && $user->rights->ticket->write) {
+ if (GETPOST('add', 'alpha') && $user->rights->ticket->write) {
$error = 0;
if (!GETPOST("subject")) {
$error++;
$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject"));
- $action = 'create_ticket';
+ $action = 'create';
} elseif (!GETPOST("message")) {
$error++;
$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("message"));
- $action = 'create_ticket';
+ $action = 'create';
}
if (!$error) {
@@ -189,6 +189,8 @@ class ActionsTicket
$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
+ $object->fk_project = GETPOST('projectid', 'int');
+
$extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
@@ -198,7 +200,7 @@ class ActionsTicket
$error++;
$this->error = $object->error;
$this->errors = $object->errors;
- $action = 'create_ticket';
+ $action = 'create';
}
if (!$error && $id > 0)
@@ -338,19 +340,15 @@ class ActionsTicket
if ($action == "mark_ticket_read" && $user->rights->ticket->write) {
$object->fetch('', '', GETPOST("track_id", 'alpha'));
- if ($object->markAsRead($user) > 0) {
- // Log action in ticket logs table
- $log_action = $langs->trans('TicketLogMesgReadBy', $user->getFullName($langs));
- $ret = $object->createTicketLog($user, $log_action);
- if ($ret > 0) {
- setEventMessages($langs->trans('TicketMarkedAsRead'), null, 'mesgs');
- } else {
- setEventMessages($langs->trans('TicketMarkedAsReadButLogActionNotSaved'), null, 'errors');
- }
+ if ($object->markAsRead($user) > 0)
+ {
+ setEventMessages($langs->trans('TicketMarkedAsRead'), null, 'mesgs');
+
header("Location: card.php?track_id=" . $object->track_id . "&action=view");
exit;
} else {
- array_push($this->errors, $object->error);
+ $this->errors = $object->error;
+ $this->error = $object->error;
}
$action = 'view';
}
@@ -396,12 +394,9 @@ class ActionsTicket
// Log action in ticket logs table
$object->fetch_user($usertoassign);
$log_action = $langs->trans('TicketLogAssignedTo', $object->user->getFullName($langs));
- $ret = $object->createTicketLog($user, $log_action);
- if ($ret > 0) {
- setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
- } else {
- setEventMessages($langs->trans('TicketAssignedButLogActionNotSaved'), null, 'errors');
- }
+
+ setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
+
header("Location: card.php?track_id=" . $object->track_id . "&action=view");
exit;
} else {
@@ -436,12 +431,9 @@ class ActionsTicket
if ($object->close()) {
// Log action in ticket logs table
$log_action = $langs->trans('TicketLogClosedBy', $user->getFullName($langs));
- $ret = $object->createTicketLog($user, $log_action);
- if ($ret > 0) {
- setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
- } else {
- setEventMessages($langs->trans('TicketMarkedAsClosedButLogActionNotSaved'), null, 'warnings');
- }
+
+ setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
+
$url = 'card.php?action=view&track_id=' . GETPOST('track_id', 'alpha');
header("Location: " . $url);
} else {
@@ -455,12 +447,9 @@ class ActionsTicket
if (($_SESSION['email_customer'] == $object->origin_email || $_SESSION['email_customer'] == $object->thirdparty->email) && $object->close()) {
// Log action in ticket logs table
$log_action = $langs->trans('TicketLogClosedBy', $_SESSION['email_customer']);
- $ret = $object->createTicketLog($user, $log_action);
- if ($ret > 0) {
- setEventMessages('
' . $langs->trans('TicketMarkedAsClosed') . '
', null, 'mesgs');
- } else {
- setEventMessages($langs->trans('TicketMarkedAsClosedButLogActionNotSaved'), null, 'warnings');
- }
+
+ setEventMessages('
' . $langs->trans('TicketMarkedAsClosed') . '
', null, 'mesgs');
+
$url = 'view.php?action=view_ticket&track_id=' . GETPOST('track_id', 'alpha');
header("Location: " . $url);
} else {
@@ -495,10 +484,8 @@ class ActionsTicket
if ($action == 'set_progression' && $user->rights->ticket->write) {
if ($this->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
- $result = $object->setProgression(GETPOST('progress'));
- // Log action in ticket logs table
- $log_action = $langs->trans('TicketLogProgressSetTo', GETPOST('progress'));
- $ret = $object->createTicketLog($user, $log_action);
+ $result = $object->setProgression(GETPOST('progress', 'alpha'));
+
$url = 'card.php?action=view&track_id=' . $object->track_id;
header("Location: " . $url);
exit();
@@ -529,12 +516,12 @@ class ActionsTicket
if ($action == 'confirm_reopen' && $user->rights->ticket->manage && !GETPOST('cancel')) {
if ($this->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
// prevent browser refresh from reopening ticket several times
- if ($object->fk_statut == 8) {
- $res = $object->setStatut(4);
+ if ($object->fk_statut == Ticket::STATUS_CLOSED) {
+ $res = $object->setStatut(Ticket::STATUS_ASSIGNED);
if ($res) {
// Log action in ticket logs table
$log_action = $langs->trans('TicketLogReopen');
- $ret = $object->createTicketLog($user, $log_action);
+
$url = 'card.php?action=view&track_id=' . $object->track_id;
header("Location: " . $url);
exit();
@@ -544,7 +531,7 @@ class ActionsTicket
} // Categorisation dans projet
elseif ($action == 'classin' && $user->rights->ticket->write) {
if ($this->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
- $object->setProject(GETPOST('projectid'));
+ $object->setProject(GETPOST('projectid', 'int'));
$url = 'card.php?action=view&track_id=' . $object->track_id;
header("Location: " . $url);
exit();
@@ -552,7 +539,7 @@ class ActionsTicket
} // Categorisation dans contrat
elseif ($action == 'setcontract' && $user->rights->ticket->write) {
if ($this->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
- $object->setContract(GETPOST('contractid'));
+ $object->setContract(GETPOST('contractid', 'int'));
$url = 'card.php?action=view&track_id=' . $object->track_id;
header("Location: " . $url);
exit();
@@ -573,10 +560,7 @@ class ActionsTicket
// output the result of comparing two files as plain text
$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));
- $ret = $object->createTicketLog($user, $log_action);
- if ($ret > 0) {
- setEventMessages($langs->trans('TicketMessageSuccesfullyUpdated'), null, 'mesgs');
- }
+ setEventMessages($langs->trans('TicketMessageSuccesfullyUpdated'), null, 'mesgs');
}
}
@@ -590,7 +574,7 @@ class ActionsTicket
if ($res) {
// Log action in ticket logs table
$log_action = $langs->trans('TicketLogStatusChanged', $langs->transnoentities($object->statuts_short[$old_status]), $langs->transnoentities($object->statuts_short[$new_status]));
- $ret = $object->createTicketLog($user, $log_action);
+
$url = 'card.php?action=view&track_id=' . $object->track_id;
header("Location: " . $url);
exit();
@@ -1013,7 +997,7 @@ class ActionsTicket
{
global $langs;
- if ($action == 'create_ticket') {
+ if ($action == 'create') {
return $langs->trans("CreateTicket");
} elseif ($action == 'edit') {
return $langs->trans("EditTicket");
@@ -1498,9 +1482,13 @@ class ActionsTicket
print '
';
if ($status == 1)
+ {
$urlforbutton = $_SERVER['PHP_SELF'] . '?track_id=' . $object->track_id . '&action=mark_ticket_read'; // To set as read, we use a dedicated action
- else
- $urlforbutton = $_SERVER['PHP_SELF'] . '?track_id=' . $object->track_id . '&action=set_status&new_status=' . $status;
+ }
+ else
+ {
+ $urlforbutton = $_SERVER['PHP_SELF'] . '?track_id=' . $object->track_id . '&action=set_status&new_status=' . $status;
+ }
print '
';
print img_picto($langs->trans($object->statuts_short[$status]), 'statut' . $status . '.png@ticket') . ' ' . $langs->trans($object->statuts_short[$status]);
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 005d8084f31..fedadd2c96e 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -513,7 +513,7 @@ class Tickets extends DolibarrApi
return $ticket;
}
-
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
*
@@ -523,9 +523,9 @@ class Tickets extends DolibarrApi
* @todo use an array for properties to clean
*
*/
- private function _cleanObjectDatas($object)
+ protected function _cleanObjectDatas($object)
{
-
+ // phpcs:enable
$object = parent::_cleanObjectDatas($object);
// Other attributes to clean
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index ec1e44e9f86..c603c0489cb 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -528,9 +528,12 @@ class Ticket extends CommonObject
$this->severity_label = $label_severity;
$this->datec = $this->db->jdate($obj->datec);
+ $this->date_creation = $this->db->jdate($obj->datec);
$this->date_read = $this->db->jdate($obj->date_read);
+ $this->date_validation = $this->db->jdate($obj->date_read);
$this->date_close = $this->db->jdate($obj->date_close);
$this->tms = $this->db->jdate($obj->tms);
+ $this->date_modification = $this->db->jdate($obj->tms);
$this->fetch_optionals();
@@ -1396,19 +1399,22 @@ class Ticket extends CommonObject
{
global $conf, $langs;
- if ($this->statut != 9) { // no closed
+ if ($this->statut != self::STATUS_CANCELED) { // no closed
$this->db->begin();
$sql = "UPDATE " . MAIN_DB_PREFIX . "ticket";
$sql .= " SET fk_statut = 1, date_read='" . $this->db->idate(dol_now()) . "'";
$sql .= " WHERE rowid = " . $this->id;
- dol_syslog(get_class($this) . "::markAsRead sql=" . $sql);
+ dol_syslog(get_class($this) . "::markAsRead");
$resql = $this->db->query($sql);
if ($resql) {
+ $this->actionmsg = $langs->trans('TicketLogMesgReadBy', $this->ref, $user->getFullName($langs));
+ $this->actionmsg2 = $langs->trans('TicketLogMesgReadBy', $this->ref, $user->getFullName($langs));
+
if (!$error && !$notrigger) {
// Call trigger
- $result=$this->call_trigger('TICKET_MARK_READ', $user);
+ $result=$this->call_trigger('TICKET_MODIFY', $user);
if ($result < 0) {
$error++;
}
@@ -1490,52 +1496,6 @@ class Ticket extends CommonObject
}
}
- /**
- * Create log for the ticket
- * 1- create entry into database for message storage
- * 2- if trigger, send an email to ticket contacts
- *
- * @param User $user User that create
- * @param string $message Log message
- * @param int $noemail 0=send email after, 1=disable emails
- * @return int <0 if KO, >0 if OK
- */
- public function createTicketLog(User $user, $message, $noemail = 0)
- {
- global $conf, $langs;
-
- $error = 0;
-
- $this->db->begin();
-
- // Clean parameters
- $this->message = trim($this->message);
-
- // Check parameters
- if (!$message) {
- $this->error = 'ErrorBadValueForParameter';
- return -1;
- }
-
- // TODO Should call the trigger TICKET_MODIFY with $this->context with all data to record event
- // so the event is stored by the agenda/event trigger
-
- if (!$error) {
- $this->db->commit();
-
- if ($conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL && !$noemail) {
- $this->sendLogByEmail($user, $message);
- }
-
- return 1;
- }
- else
- {
- $this->db->rollback();
-
- return -1;
- }
- }
/**
* Send notification of changes by email
diff --git a/htdocs/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php
index 1f7ed4810a2..a62a4e00a52 100644
--- a/htdocs/ticket/css/styles.css.php
+++ b/htdocs/ticket/css/styles.css.php
@@ -68,14 +68,17 @@ div.ticketform {
border-radius: 10px 10px 10px 10px;
margin: 1.5em;
background : #ffffff;
-
-
+ text-align: center;
}
div.ticketform .index_create, .index_display {
- float: left;
- width: 33%;
+ display: inline-block;
+ width: 200px;
+ height: 58px;
text-align: center;
+ vertical-align: middle;
+ margin: 20px;
+ text-transform: uppercase;
}
div.ticketform .orange {
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 0b3a1c101e8..7b61bd7c1b5 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -49,13 +49,13 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicate
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
$id = GETPOST('id', 'int');
-$msg_id = GETPOST('msg_id', 'int');
-$socid = GETPOST('socid', 'int');
-$projectid = GETPOST('projectid', 'int');
+$msg_id = GETPOST('msg_id', 'int');
+$socid = GETPOST('socid', 'int');
+$projectid = GETPOST('projectid', 'int');
$search_fk_soc=GETPOST('$search_fk_soc', 'int')?GETPOST('$search_fk_soc', 'int'):GETPOST('socid', 'int');
$search_fk_project=GETPOST('search_fk_project', 'int')?GETPOST('search_fk_project', 'int'):GETPOST('projectid', 'int');
$search_fk_status = GETPOST('search_fk_statut', 'array');
-$mode = GETPOST('mode', 'alpha');
+$mode = GETPOST('mode', 'alpha');
// Load variable for pagination
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
@@ -79,8 +79,8 @@ $extralabels = $extrafields->fetch_name_optionals_label('ticket');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Default sort order (if not yet defined by previous GETPOST)
-if (! $sortfield) $sortfield="t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="t.datec";
+if (! $sortorder) $sortorder="DESC";
if (GETPOST('search_fk_status', 'alpha') == 'non_closed') $_GET['search_fk_statut'][]='openall'; // For backward compatibility
@@ -462,7 +462,7 @@ if ($projectid) print '' . $langs->trans('NewTicket').' ';
+ $newcardbutton = ' ' . $langs->trans('NewTicket').' ';
$newcardbutton.= '';
}
@@ -580,7 +580,7 @@ foreach($object->fields as $key => $val)
if ($key == 'fk_statut') $cssforfield.=($cssforfield?' ':'').'center';
if (! empty($arrayfields['t.'.$key]['checked']))
{
- print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield?'class="'.$cssforfield.'"':''), $sortfield, $sortorder, ($cssforfield?$cssforfield.' ':''))."\n";
+ print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, '', $sortfield, $sortorder, ($cssforfield?$cssforfield.' ':''))."\n";
}
}
// Extra fields
diff --git a/htdocs/ticket/new.php b/htdocs/ticket/new.php
deleted file mode 100644
index 267e3e63847..00000000000
--- a/htdocs/ticket/new.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- * Copyright (C) 2016 Christophe Battarel
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see