diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index ba9a9490daa..7c3ca5bd2e6 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -38,9 +38,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_order_odt extends ModelePDFCommandes { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 12b755fa220..9cbd5f31959 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -115,9 +115,9 @@ class pdf_einstein extends ModelePDFCommandes public $marge_basse; /** - * Issuer - * @var Societe - */ + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php index f8940dd95ef..eca3f13d57f 100644 --- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php +++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php @@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_contract_odt extends ModelePDFContract { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index f5e2b182a73..729663bf625 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -39,9 +39,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_shipment_odt extends ModelePdfExpedition { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index ddd2df87b93..77824b75c8c 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -38,9 +38,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_invoice_odt extends ModelePDFFactures { + /** + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php index ca50317fe81..b11e17a6623 100644 --- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php +++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php @@ -36,9 +36,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_product_odt extends ModelePDFProduct { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php index 16efd190836..b163e22c712 100644 --- a/htdocs/core/modules/product/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php @@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFProduct /** * @var array() Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.3 = array(5, 3) + * e.g.: PHP ≥ 5.4 = array(5, 4) */ - public $phpmin = array(5, 2); + public $phpmin = array(5, 4); /** * Dolibarr version of the loaded document @@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFProduct public $marge_haute; public $marge_basse; - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; /** diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index 7846c68af7a..c881c6c5b46 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -54,9 +54,18 @@ if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/ */ class doc_generic_task_odt extends ModelePDFTask { + /** + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index 7483c2a9623..469d154ddc5 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_proposal_odt extends ModelePDFPropales { + /** + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index d5e0f1ba984..4f9de22f975 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -36,9 +36,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_stock_odt extends ModelePDFStock { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php index 66799612d8f..957a4fc2e32 100644 --- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php @@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFStock /** * @var array() Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.3 = array(5, 3) + * e.g.: PHP ≥ 5.4 = array(5, 4) */ - public $phpmin = array(5, 2); + public $phpmin = array(5, 4); /** * Dolibarr version of the loaded document @@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFStock public $marge_haute; public $marge_basse; - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; /** diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php index a4795926cc4..0c9c55b5e7f 100644 --- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php @@ -59,9 +59,9 @@ class pdf_stdmovement extends ModelePDFMovement /** * @var array() Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.3 = array(5, 3) + * e.g.: PHP ≥ 5.4 = array(5, 4) */ - public $phpmin = array(5, 2); + public $phpmin = array(5, 4); /** * Dolibarr version of the loaded document @@ -77,7 +77,11 @@ class pdf_stdmovement extends ModelePDFMovement public $marge_haute; public $marge_basse; - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; /** diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index 5a318a3a6b3..a259fbbe7ee 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index aa8b4c4e3f5..a2201208534 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -30,7 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php'; */ class mod_ticket_simple extends ModeleNumRefTicket { - public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + public $prefix = 'TS'; public $error = ''; public $nom = "Simple"; diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php index c3dad0aa482..ee201740eed 100644 --- a/htdocs/core/modules/ticket/mod_ticket_universal.php +++ b/htdocs/core/modules/ticket/mod_ticket_universal.php @@ -29,7 +29,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php'; */ class mod_ticket_universal extends ModeleNumRefTicket { - public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + public $error = ''; public $nom = 'Universal'; public $name = 'Universal'; diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php index e3d44050149..41fb48ecec5 100644 --- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php +++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php @@ -35,9 +35,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_user_odt extends ModelePDFUser { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php index 76cc423eb32..571a12aaf7b 100644 --- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php +++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php @@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_usergroup_odt extends ModelePDFUserGroup { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 24ccda21579..33e1dd97f7b 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012-2015 Juanjo Menent * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 Philippe Grand * * 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 @@ -921,8 +922,8 @@ if ($id > 0 || ! empty($ref)) } else { - /* Commande non trouvee */ - print "Commande inexistante"; + /* Order not found */ + setEventMessages($langs->trans("NonExistentOrder"), null, 'errors'); } } diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index 7e39f48ea55..1c9cb791900 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -28,3 +28,4 @@ ErrorStockIsNotEnough=There's not enough stock Shippable=Shippable NonShippable=Not Shippable ShowReceiving=Show delivery receipt +NonExistentOrder=Non-existent order