From 62c602e8216e1856298db6c0071463d0ef8ee083 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 08:50:23 +0200 Subject: [PATCH 01/39] Standardize and update code --- htdocs/contrat/class/contrat.class.php | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 2bcb802000f..398da806c2d 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -2519,8 +2519,16 @@ class ContratLigne extends CommonObjectLine public $tms; + /** + * @var int ID + */ public $fk_contrat; + + /** + * @var int ID + */ public $fk_product; + public $statut; // 0 inactive, 4 active, 5 closed public $type; // 0 for product, 1 for service @@ -2563,6 +2571,10 @@ class ContratLigne extends CommonObjectLine public $qty; public $remise_percent; public $remise; + + /** + * @var int ID + */ public $fk_remise_except; public $subprice; // Unit price HT @@ -2582,13 +2594,30 @@ class ContratLigne extends CommonObjectLine public $total_localtax2; public $total_ttc; + /** + * @var int ID + */ public $fk_fournprice; + public $pa_ht; public $info_bits; + + /** + * @var int ID + */ public $fk_user_author; + + /** + * @var int ID + */ public $fk_user_ouverture; + + /** + * @var int ID + */ public $fk_user_cloture; + public $commentaire; const STATUS_INITIAL = 0; From 69379dc2bb7b032a8564ac9c7b27f0d57258b218 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 09:12:25 +0200 Subject: [PATCH 02/39] Standardize and update code --- htdocs/core/class/comment.class.php | 3 ++ htdocs/core/class/discount.class.php | 46 ++++++++++++++++++---------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php index 287d260f4d2..161ce438e29 100644 --- a/htdocs/core/class/comment.class.php +++ b/htdocs/core/class/comment.class.php @@ -47,6 +47,9 @@ class Comment extends CommonObject public $datec; + /** + * @var int ID + */ public $fk_user_author; /** diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index 6f6e3a09041..067b1f87e57 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -34,9 +34,9 @@ class DiscountAbsolute public $db; /** - * @var string Error code (or message) - */ - public $error; + * @var string Error code (or message) + */ + public $error; /** * @var string[] Array of error strings @@ -48,9 +48,9 @@ class DiscountAbsolute */ public $id; - /** - * @var int Thirdparty ID - */ + /** + * @var int Thirdparty ID + */ public $fk_soc; public $discount_type; // 0 => customer discount, 1 => supplier discount @@ -60,20 +60,34 @@ class DiscountAbsolute public $tva_tx; // Vat rate /** - * @var int User ID Id utilisateur qui accorde la remise - */ - public $fk_user; + * @var int User ID Id utilisateur qui accorde la remise + */ + public $fk_user; /** - * @var string description - */ - public $description; + * @var string description + */ + public $description; public $datec; // Date creation - public $fk_facture_line; // Id invoice line when a discount is used into an invoice line (for absolute discounts) - public $fk_facture; // Id invoice when a discount line is used into an invoice (for credit note) - public $fk_facture_source; // Id facture avoir a l'origine de la remise - public $ref_facture_source; // Ref facture avoir a l'origine de la remise + + /** + * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts) + */ + public $fk_facture_line; + + /** + * @var int ID invoice when a discount line is used into an invoice (for credit note) + */ + public $fk_facture; + + /** + * @var int ID credit note having caused the discount + */ + public $fk_facture_source; + + public $ref_facture_source; // Ref credit note having caused the discount + public $ref_invoice_supplier_source; /** From 90cb6150c41581b5476da5d858b9000205d1d31e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 09:16:01 +0200 Subject: [PATCH 03/39] Standardize and update code --- htdocs/core/class/html.formticket.class.php | 4 ++++ htdocs/core/class/menubase.class.php | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 5d2136bd236..6c4a9703014 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -45,6 +45,10 @@ class FormTicket public $db; public $track_id; + + /** + * @var int ID + */ public $fk_user_create; public $message; diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 7db88051e5e..0daf4fe56da 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -52,9 +52,22 @@ class Menubase public $module; public $type; public $mainmenu; + + /** + * @var int ID + */ public $fk_menu; + + /** + * @var int ID + */ public $fk_mainmenu; + + /** + * @var int ID + */ public $fk_leftmenu; + public $position; public $url; public $target; From c2f73ddf1382a737c46f57a5567be02e257da304 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 09:20:50 +0200 Subject: [PATCH 04/39] Standardize and update code --- htdocs/cron/class/cronjob.class.php | 17 +++++++++++++++++ htdocs/don/class/don.class.php | 9 +++++++++ htdocs/don/class/paymentdonation.class.php | 16 ++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 26b17016a5f..a71088f3286 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -83,8 +83,17 @@ class Cronjob extends CommonObject public $status; public $processing; + + /** + * @var int ID + */ public $fk_user_author; + + /** + * @var int ID + */ public $fk_user_mod; + public $nbrun; public $libname; public $test; // A test condition to know if job is visible/qualified @@ -1390,8 +1399,16 @@ class Cronjobline */ public $status; + /** + * @var int ID + */ public $fk_user_author; + + /** + * @var int ID + */ public $fk_user_mod; + public $note; public $nbrun; public $libname; diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index ed9c629a50d..6abd093c8c3 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -73,8 +73,17 @@ class Don extends CommonObject public $town; public $email; public $public; + + /** + * @var int ID + */ public $fk_project; + + /** + * @var int ID + */ public $fk_typepayment; + public $num_payment; public $date_valid; public $modepaymentid = 0; diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index 69c6e8b5501..b0e3a80b082 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -49,7 +49,11 @@ class PaymentDonation extends CommonObject */ public $rowid; + /** + * @var int ID + */ public $fk_donation; + public $datec=''; public $tms=''; public $datep=''; @@ -57,8 +61,20 @@ class PaymentDonation extends CommonObject public $amounts=array(); // Array of amounts public $typepayment; public $num_payment; + + /** + * @var int ID + */ public $fk_bank; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; /** From 15fee5497570cad2b4f56880fdf7f7536e76b748 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 09:23:55 +0200 Subject: [PATCH 05/39] Standardize and update code --- htdocs/ecm/class/ecmdirectory.class.php | 11 +++++++++++ htdocs/ecm/class/ecmfiles.class.php | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index f477e27b37b..9038b74cb2a 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -52,6 +52,9 @@ class EcmDirectory // extends CommonObject */ public $label; + /** + * @var int ID + */ public $fk_parent; /** @@ -62,7 +65,15 @@ class EcmDirectory // extends CommonObject public $cachenbofdoc=-1; // By default cache initialized with value 'not calculated' public $date_c; public $date_m; + + /** + * @var int ID + */ public $fk_user_m; + + /** + * @var int ID + */ public $fk_user_c; /** diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 50dbcb60dc6..42af7f92635 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -85,8 +85,17 @@ class EcmFiles extends CommonObject public $extraparams; public $date_c = ''; public $date_m = ''; + + /** + * @var int ID + */ public $fk_user_c; + + /** + * @var int ID + */ public $fk_user_m; + public $acl; public $src_object_type; public $src_object_id; @@ -879,8 +888,17 @@ class EcmfilesLine public $extraparams; public $date_c = ''; public $date_m = ''; + + /** + * @var int ID + */ public $fk_user_c; + + /** + * @var int ID + */ public $fk_user_m; + public $acl; public $src_object_type; public $src_object_id; From b2826966e4bfce9b370a6db9a7221e26fbd5dc34 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 11:30:33 +0200 Subject: [PATCH 06/39] Standardize and update code --- htdocs/expedition/class/expedition.class.php | 3 +++ .../class/expensereport.class.php | 15 +++++++++++++ .../class/paymentexpensereport.class.php | 22 +++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 7b764e32093..57a1c8aa6b9 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -2343,6 +2343,9 @@ class ExpeditionLigne extends CommonObjectLine */ public $table_element='expeditiondet'; + /** + * @var int ID + */ public $fk_origin_line; /** diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 4fbca221d65..6cc7b13ee7c 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2426,9 +2426,24 @@ class ExpenseReportLine public $value_unit; public $date; + /** + * @var int ID + */ public $fk_c_type_fees; + + /** + * @var int ID + */ public $fk_c_exp_tax_cat; + + /** + * @var int ID + */ public $fk_projet; + + /** + * @var int ID + */ public $fk_expensereport; public $type_fees_code; diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index 1dd5048991c..35f1fef7b5b 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -50,17 +50,39 @@ class PaymentExpenseReport extends CommonObject */ public $rowid; + /** + * @var int ID + */ public $fk_expensereport; + public $datec=''; public $tms=''; public $datep=''; public $amount; // Total amount of payment public $amounts=array(); // Array of amounts + + /** + * @var int ID + */ public $fk_typepayment; + public $num_payment; + + /** + * @var int ID + */ public $fk_bank; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; + //Unknow field public $chid; public $total; From 9b6367c1ee030e7fe08c3fcc5c3354f21bc622d1 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 12:16:20 +0200 Subject: [PATCH 07/39] Standardize and update code --- htdocs/fichinter/class/fichinter.class.php | 12 +++++++ .../class/fournisseur.commande.class.php | 21 +++++++++++++ .../fournisseur.commande.dispatch.class.php | 16 ++++++++++ .../fourn/class/fournisseur.facture.class.php | 31 ++++++++++++++++++- .../fourn/class/fournisseur.product.class.php | 11 ++++++- 5 files changed, 89 insertions(+), 2 deletions(-) diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 48cbdbf7715..d8be14c298a 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -82,8 +82,16 @@ class Fichinter extends CommonObject */ public $description; + /** + * @var int ID + */ public $fk_contrat = 0; + + /** + * @var int ID + */ public $fk_project = 0; + public $extraparams=array(); public $lines = array(); @@ -1360,7 +1368,11 @@ class FichinterLigne extends CommonObjectLine public $error=''; // From llx_fichinterdet + /** + * @var int ID + */ public $fk_fichinter; + public $desc; // Description ligne public $datei; // Date intervention public $duration; // Duree de l'intervention diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index b52fd4a4a58..ce9665cc6c8 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -128,10 +128,20 @@ class CommandeFournisseur extends CommonOrder public $note_private; public $note_public; public $model_pdf; + + /** + * @var int ID + */ public $fk_project; + public $cond_reglement_id; public $cond_reglement_code; + + /** + * @var int ID + */ public $fk_account; + public $mode_reglement_id; public $mode_reglement_code; public $user_author_id; @@ -157,7 +167,11 @@ class CommandeFournisseur extends CommonOrder public $linked_objects=array(); // Multicurrency + /** + * @var int ID + */ public $fk_multicurrency; + public $multicurrency_code; public $multicurrency_tx; public $multicurrency_total_ht; @@ -3154,7 +3168,14 @@ class CommandeFournisseurLigne extends CommonOrderLine public $fk_commande; // From llx_commande_fournisseurdet + /** + * @var int ID + */ public $fk_parent_line; + + /** + * @var int ID + */ public $fk_facture; /** diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php index 76d3e6e0d96..2bcdce36b3c 100644 --- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php +++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php @@ -65,10 +65,26 @@ class CommandeFournisseurDispatch extends CommonObject */ public $id; + /** + * @var int ID + */ public $fk_commande; + + /** + * @var int ID + */ public $fk_product; + + /** + * @var int ID + */ public $fk_commandefourndet; + public $qty; + + /** + * @var int ID + */ public $fk_entrepot; /** diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index e3943ed7415..f4c37a1113c 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -138,7 +138,12 @@ class FactureFournisseur extends CommonInvoice public $propalid; public $cond_reglement_id; public $cond_reglement_code; + + /** + * @var int ID + */ public $fk_account; + public $mode_reglement_id; public $mode_reglement_code; @@ -153,21 +158,31 @@ class FactureFournisseur extends CommonInvoice */ public $fournisseur; - //Incorterms + /** + * @var int ID Incorterms + */ public $fk_incoterms; + public $location_incoterms; public $libelle_incoterms; //Used into tooltip public $extraparams=array(); // Multicurrency + /** + * @var int ID + */ public $fk_multicurrency; + public $multicurrency_code; public $multicurrency_tx; public $multicurrency_total_ht; public $multicurrency_total_tva; public $multicurrency_total_ttc; //! id of source invoice if replacement invoice or credit note + /** + * @var int ID + */ public $fk_facture_source; /** @@ -2722,18 +2737,32 @@ class SupplierInvoiceLine extends CommonObjectLine public $total_ttc; public $total_localtax1; public $total_localtax2; + + /** + * @var int ID + */ public $fk_product; + public $product_type; public $product_label; public $info_bits; + + /** + * @var int ID + */ public $fk_parent_line; + public $special_code; public $rang; public $localtax1_type; public $localtax2_type; // Multicurrency + /** + * @var int ID + */ public $fk_multicurrency; + public $multicurrency_code; public $multicurrency_subprice; public $multicurrency_total_ht; diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index f97a6c4f4ba..a86e728e028 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -72,12 +72,21 @@ class ProductFournisseur extends Product public $fourn_remise_percent; // discount for quantity (percent) public $fourn_remise; // discount for quantity (amount) public $product_fourn_id; // supplier id - public $fk_availability; // availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay) + + /** + * @var int ID availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay) + */ + public $fk_availability; + public $fourn_unitprice; public $fourn_tva_tx; public $fourn_tva_npr; + /** + * @var int ID + */ public $fk_supplier_price_expression; + public $supplier_reputation; // reputation of supplier public $reputations=array(); // list of available supplier reputations From dd515c9cace1339f897d801230bc702af042e5f2 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 11 Oct 2018 09:22:03 +0200 Subject: [PATCH 08/39] Standardize and update code --- htdocs/holiday/class/holiday.class.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index fe90f85b6a4..a888a4919a6 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -79,14 +79,38 @@ class Holiday extends CommonObject public $date_fin_gmt=''; // Date end in GMT public $halfday=''; // 0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning public $statut=''; // 1=draft, 2=validated, 3=approved + + /** + * @var int ID + */ public $fk_validator; + public $date_valid=''; + + /** + * @var int ID + */ public $fk_user_valid; + public $date_refuse=''; + + /** + * @var int ID + */ public $fk_user_refuse; + public $date_cancel=''; + + /** + * @var int ID + */ public $fk_user_cancel; + public $detail_refuse=''; + + /** + * @var int ID + */ public $fk_type; public $holiday = array(); From c2646886357468181cc36d6c1c39961659b96611 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 11 Oct 2018 09:53:36 +0200 Subject: [PATCH 09/39] Standardize and update code --- htdocs/loan/class/loan.class.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index dd066f0064c..e9f5fbfff72 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -66,9 +66,25 @@ class Loan extends CommonObject public $date_creation; public $date_modification; public $date_validation; + + /** + * @var int ID + */ public $fk_bank; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; + + /** + * @var int ID + */ public $fk_project; From 849a1a94000f9a959423a7f26b2d8b0bb93e5b31 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 09:26:58 +0200 Subject: [PATCH 10/39] Standardize and update code --- .../template/class/myobject.class.php | 9 +++++++++ htdocs/product/class/product.class.php | 3 +++ htdocs/product/class/productbatch.class.php | 16 ++++++++++------ .../product/class/productcustomerprice.class.php | 10 +++++++++- .../class/propalmergepdfproduct.class.php | 13 +++++++++++++ 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index b04dd735e49..19e6bcd64a4 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -130,8 +130,17 @@ class MyObject extends CommonObject public $date_creation; public $tms; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; + public $import_key; // END MODULEBUILDER PROPERTIES diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 050d756ad82..3e1ceb8b2dc 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -290,6 +290,9 @@ class Product extends CommonObject public $oldcopy; + /** + * @var int ID + */ public $fk_price_expression; /* To store supplier price found */ diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index f6a7df212eb..eb4fc32baed 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -37,13 +37,17 @@ class Productbatch extends CommonObject private static $_table_element='product_batch'; //!< Name of table without prefix where object is stored - var $tms=''; - var $fk_product_stock; - var $sellby=''; - var $eatby=''; - var $batch=''; - var $qty; + public $tms=''; + public $fk_product_stock; + public $sellby=''; + public $eatby=''; + public $batch=''; + public $qty; public $warehouseid; + + /** + * @var int ID + */ public $fk_product; diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index 5aaa2c079ea..3079fef5412 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -45,6 +45,10 @@ class Productcustomerprice extends CommonObject public $datec = ''; public $tms = ''; + + /** + * @var int ID + */ public $fk_product; /** @@ -987,12 +991,16 @@ class PriceByCustomerLine public $datec = ''; public $tms = ''; + + /** + * @var int ID + */ public $fk_product; /** * @var int Thirdparty ID */ - public $fk_soc; + public $fk_soc; public $price; public $price_ttc; diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index 3a7f3fb586d..f2aabb86876 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -647,11 +647,24 @@ class PropalmergepdfproductLine */ public $id; + /** + * @var int ID + */ public $fk_product; + public $file_name; public $lang; + + /** + * @var int ID + */ public $fk_user_author; + + /** + * @var int ID + */ public $fk_user_mod; + public $datec=''; public $tms=''; public $import_key; From 357173f0ef55f34e4248ef964cd92fe7a00e8116 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 09:30:53 +0200 Subject: [PATCH 11/39] Standardize and update code --- .../price_global_variable_updater.class.php | 5 +++++ .../product/inventory/class/inventory.class.php | 17 +++++++++++++++++ htdocs/product/stock/class/entrepot.class.php | 4 ++++ .../stock/class/mouvementstock.class.php | 8 ++++++++ htdocs/product/stock/class/productlot.class.php | 13 +++++++++++++ .../stock/class/productstockentrepot.class.php | 9 +++++++++ 6 files changed, 56 insertions(+) diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php index b06a249ccc6..c4dda3481bb 100644 --- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php +++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php @@ -60,7 +60,12 @@ class PriceGlobalVariableUpdater public $description; public $parameters; + + /** + * @var int ID + */ public $fk_variable; + public $update_interval; //!< Interval in mins public $next_update; //!< Next update timestamp public $last_status; diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php index e1be589ac88..39df52a8208 100644 --- a/htdocs/product/inventory/class/inventory.class.php +++ b/htdocs/product/inventory/class/inventory.class.php @@ -114,7 +114,11 @@ class Inventory extends CommonObject */ public $entity; + /** + * @var int ID + */ public $fk_warehouse; + public $date_inventory; public $title; @@ -126,9 +130,22 @@ class Inventory extends CommonObject public $date_creation; public $date_validation; public $tms; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; + + /** + * @var int ID + */ public $fk_user_valid; + public $import_key; // END MODULEBUILDER PROPERTIES diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 575aa2a705d..b2a78a9cd3e 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -78,6 +78,10 @@ class Entrepot extends CommonObject //! Code Postal public $zip; public $town; + + /** + * @var int ID + */ public $fk_parent; // List of short language codes for status diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 0d8338c4d9f..f5fad015636 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -49,6 +49,10 @@ class MouvementStock extends CommonObject public $tms = ''; public $datem = ''; public $price; + + /** + * @var int ID + */ public $fk_user_author; /** @@ -56,7 +60,11 @@ class MouvementStock extends CommonObject */ public $label; + /** + * @var int ID + */ public $fk_origin; + public $origintype; public $inventorycode; public $batch; diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php index d7b77cd83ee..1530e068856 100644 --- a/htdocs/product/stock/class/productlot.class.php +++ b/htdocs/product/stock/class/productlot.class.php @@ -63,14 +63,27 @@ class Productlot extends CommonObject */ public $entity; + /** + * @var int ID + */ public $fk_product; + public $batch; public $eatby = ''; public $sellby = ''; public $datec = ''; public $tms = ''; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; + public $import_key; diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php index 1ab24b553d8..6b12af88c7a 100644 --- a/htdocs/product/stock/class/productstockentrepot.class.php +++ b/htdocs/product/stock/class/productstockentrepot.class.php @@ -51,8 +51,17 @@ class ProductStockEntrepot extends CommonObject public $table_element = 'product_warehouse_properties'; public $tms = ''; + + /** + * @var int ID + */ public $fk_product; + + /** + * @var int ID + */ public $fk_entrepot; + public $seuil_stock_alerte; public $desiredstock; public $import_key; From 7e6cdfb5ec178f7495370f3afe16be2e6b447110 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 09:34:54 +0200 Subject: [PATCH 12/39] Standardize and update code --- htdocs/projet/class/task.class.php | 17 +++++++++++++++++ htdocs/resource/class/dolresource.class.php | 5 +++++ htdocs/societe/class/societe.class.php | 13 +++++++++++++ htdocs/societe/class/societeaccount.class.php | 9 +++++++++ 4 files changed, 44 insertions(+) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index a3fd5fb1703..84829bf85cb 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -49,6 +49,9 @@ class Task extends CommonObject public $picto = 'task'; protected $childtables=array('projet_task_time'); // To test if we can delete object + /** + * @var int ID parent task + */ public $fk_task_parent; /** @@ -67,10 +70,24 @@ class Task extends CommonObject public $date_start; public $date_end; public $progress; + + /** + * @var int ID + */ public $fk_statut; + public $priority; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_valid; + public $rang; public $timespent_min_date; diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 1c04a5633ec..c6e25c4d837 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -47,7 +47,12 @@ class Dolresource extends CommonObject public $element_type; public $busy; public $mandatory; + + /** + * @var int ID + */ public $fk_user_create; + public $type_label; public $tms=''; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index dbc51c93816..6343fcf0e91 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -281,7 +281,12 @@ class Societe extends CommonObject public $remise_supplier_percent; public $mode_reglement_supplier_id; public $cond_reglement_supplier_id; + + /** + * @var int ID + */ public $fk_prospectlevel; + public $name_bis; //Log data @@ -449,12 +454,20 @@ class Societe extends CommonObject public $array_options; // Incoterms + /** + * @var int ID + */ public $fk_incoterms; + public $location_incoterms; public $libelle_incoterms; //Used into tooltip // Multicurrency + /** + * @var int ID + */ public $fk_multicurrency; + public $multicurrency_code; diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php index bcb09675c3d..12a664f2686 100644 --- a/htdocs/societe/class/societeaccount.class.php +++ b/htdocs/societe/class/societeaccount.class.php @@ -127,8 +127,17 @@ class SocieteAccount extends CommonObject public $note_private; public $date_creation; public $tms; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; + public $import_key; /** From b4e254247267bdc1d5c65454c2e3894d02d33ef1 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 12:20:05 +0200 Subject: [PATCH 13/39] Standardize and update code --- htdocs/stripe/class/stripe.class.php | 3 ++ .../class/supplier_proposal.class.php | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php index 3c07c9ae5f6..e66fc769a09 100644 --- a/htdocs/stripe/class/stripe.class.php +++ b/htdocs/stripe/class/stripe.class.php @@ -38,6 +38,9 @@ class Stripe extends CommonObject */ public $fk_soc; + /** + * @var int ID + */ public $fk_key; /** diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 688f6aa1276..adc2c8643ac 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -166,7 +166,11 @@ class SupplierProposal extends CommonObject public $specimen; // Multicurrency + /** + * @var int ID + */ public $fk_multicurrency; + public $multicurrency_code; public $multicurrency_tx; public $multicurrency_total_ht; @@ -2712,9 +2716,21 @@ class SupplierProposalLine extends CommonObjectLine */ public $id; + /** + * @var int ID + */ public $fk_supplier_proposal; + + /** + * @var int ID + */ public $fk_parent_line; + public $desc; // Description ligne + + /** + * @var int ID + */ public $fk_product; // Id produit predefini /** @@ -2733,11 +2749,19 @@ class SupplierProposalLine extends CommonObjectLine public $tva_tx; public $subprice; public $remise_percent; + + /** + * @var int ID + */ public $fk_remise_except; public $rang = 0; + /** + * @var int ID + */ public $fk_fournprice; + public $pa_ht; public $marge_tx; public $marque_tx; @@ -2811,7 +2835,11 @@ class SupplierProposalLine extends CommonObjectLine public $ref_supplier; // Multicurrency + /** + * @var int ID + */ public $fk_multicurrency; + public $multicurrency_code; public $multicurrency_subprice; public $multicurrency_total_ht; From ba40ad4aabf1d7779a61e8cc604f150f3a0e328c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 12:23:45 +0200 Subject: [PATCH 14/39] Standardize and update code --- htdocs/ticket/class/actions_ticket.class.php | 3 +++ htdocs/ticket/class/ticketlogs.class.php | 8 ++++++++ htdocs/user/class/user.class.php | 3 +++ htdocs/website/class/websitepage.class.php | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php index 2fd26b5797b..7e8ae39564a 100644 --- a/htdocs/ticket/class/actions_ticket.class.php +++ b/htdocs/ticket/class/actions_ticket.class.php @@ -70,6 +70,9 @@ class ActionsTicket */ public $description; + /** + * @var int ID + */ public $fk_statut; /** diff --git a/htdocs/ticket/class/ticketlogs.class.php b/htdocs/ticket/class/ticketlogs.class.php index 01ba7972ced..79a4c95efed 100644 --- a/htdocs/ticket/class/ticketlogs.class.php +++ b/htdocs/ticket/class/ticketlogs.class.php @@ -62,8 +62,16 @@ class Ticketlogs// extends CommonObject */ public $id; + /** + * @var int ID + */ public $fk_track_id; + + /** + * @var int ID + */ public $fk_user_create; + public $datec = ''; public $message; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index da0e39d9ad7..d2afacce54a 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -123,6 +123,9 @@ class User extends CommonObject public $socid; public $contactid; + /** + * @var int ID + */ public $fk_member; /** diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php index 4277a03167d..b6ef620b7d2 100644 --- a/htdocs/website/class/websitepage.class.php +++ b/htdocs/website/class/websitepage.class.php @@ -49,7 +49,11 @@ class WebsitePage extends CommonObject */ public $picto = 'label'; + /** + * @var int ID + */ public $fk_website; + public $pageurl; public $aliasalt; public $type_container; From 9d4f6dc44465b6ed0368dee271be2c97222affce Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 15:55:36 +0200 Subject: [PATCH 15/39] Standardize and update code --- htdocs/accountancy/admin/account.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 087f9957f16..c9b72d9cc4c 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -38,11 +38,11 @@ $id = GETPOST('id', 'int'); $rowid = GETPOST('rowid', 'int'); $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'accountingaccountlist'; // To manage different context of search -$search_account = GETPOST("search_account"); -$search_label = GETPOST("search_label"); -$search_accountparent = GETPOST("search_accountparent"); -$search_pcgtype = GETPOST("search_pcgtype"); -$search_pcgsubtype = GETPOST("search_pcgsubtype"); +$search_account = GETPOST('search_account','alpha'); +$search_label = GETPOST('search_label','alpha'); +$search_accountparent = GETPOST('search_accountparent','alpha'); +$search_pcgtype = GETPOST('search_pcgtype','alpha'); +$search_pcgsubtype = GETPOST('search_pcgsubtype','alpha'); // Security check if ($user->societe_id > 0) accessforbidden(); From 181c1e0b77b606fbfc172e4e7e17854937214edd Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 16:01:27 +0200 Subject: [PATCH 16/39] Standardize and update code --- htdocs/accountancy/admin/accountmodel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index e3ed164d60b..c50bb495c09 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -55,8 +55,8 @@ $acts[1] = "disable"; $actl[0] = img_picto($langs->trans("Disabled"),'switch_off'); $actl[1] = img_picto($langs->trans("Activated"),'switch_on'); -$listoffset=GETPOST('listoffset'); -$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000; +$listoffset=GETPOST('listoffset','alpha'); +$listlimit=GETPOST('listlimit','int')>0?GETPOST('listlimit','int'):1000; $active = 1; $sortfield = GETPOST("sortfield",'aZ09comma'); From c5edb3289b9d048074e8dacb486dee27494ef121 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 16:09:05 +0200 Subject: [PATCH 17/39] Standardize and update code --- htdocs/accountancy/admin/accountmodel.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index c50bb495c09..efa23a6a586 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -139,13 +139,13 @@ $sourceList=array(); * Actions */ -if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x')) +if (GETPOST('button_removefilter','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter_x','alpha')) { $search_country_id = ''; } // Actions add or modify an entry into a dictionary -if (GETPOST('actionadd') || GETPOST('actionmodify')) +if (GETPOST('actionadd','alpha') || GETPOST('actionmodify','alpha')) { $listfield=explode(',', str_replace(' ', '',$tabfield[$id])); $listfieldinsert=explode(',',$tabfieldinsert[$id]); @@ -235,7 +235,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]=''; // If empty, we force to null // Si verif ok et action add, on ajoute la ligne - if ($ok && GETPOST('actionadd')) + if ($ok && GETPOST('actionadd','alpha')) { if ($tabrowid[$id]) { @@ -300,7 +300,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) } // Si verif ok et action modify, on modifie la ligne - if ($ok && GETPOST('actionmodify')) + if ($ok && GETPOST('actionmodify','alpha')) { if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } else { $rowidcol="rowid"; } @@ -341,7 +341,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition } -if (GETPOST('actioncancel')) +if (GETPOST('actioncancel','alpha')) { //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition } @@ -560,7 +560,7 @@ if ($id) $obj = new stdClass(); // If data was already input, we define them in obj to populate input fields. - if (GETPOST('actionadd')) + if (GETPOST('actionadd','alpha')) { foreach ($fieldlist as $key=>$val) { From 4df574d58ed36ffbcbf0e1843b8b8e122985f796 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 16:23:27 +0200 Subject: [PATCH 18/39] Standardize and update code --- htdocs/accountancy/admin/card.php | 34 ++++++++++++-------- htdocs/accountancy/admin/categories_list.php | 14 ++++---- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 6a92a3f6080..b64bf291955 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -73,25 +73,28 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) // To manage zero or not at the end of the accounting account if($conf->global->ACCOUNTING_MANAGE_ZERO == 1) { - $account_number = GETPOST('account_number'); + $account_number = GETPOST('account_number','int'); } else { - $account_number = clean_account(GETPOST('account_number')); + $account_number = clean_account(GETPOST('account_number','int')); } - if (GETPOST('account_parent') <= 0) { + if (GETPOST('account_parent','int') <= 0) + { $account_parent = 0; - } else { + } + else + { $account_parent = GETPOST('account_parent','int'); } $object->fk_pcg_version = $obj->pcg_version; - $object->pcg_type = GETPOST('pcg_type'); - $object->pcg_subtype = GETPOST('pcg_subtype'); + $object->pcg_type = GETPOST('pcg_type','alpha'); + $object->pcg_subtype = GETPOST('pcg_subtype','alpha'); $object->account_number = $account_number; $object->account_parent = $account_parent; - $object->account_category = GETPOST('account_category'); + $object->account_category = GETPOST('account_category','alpha'); $object->label = GETPOST('label', 'alpha'); $object->active = 1; @@ -135,25 +138,28 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) // To manage zero or not at the end of the accounting account if($conf->global->ACCOUNTING_MANAGE_ZERO == 1) { - $account_number = GETPOST('account_number'); + $account_number = GETPOST('account_number','int'); } else { - $account_number = clean_account(GETPOST('account_number')); + $account_number = clean_account(GETPOST('account_number','int')); } - if (GETPOST('account_parent') <= 0) { + if (GETPOST('account_parent','int') <= 0) + { $account_parent = 0; - } else { + } + else + { $account_parent = GETPOST('account_parent','int'); } $object->fk_pcg_version = $obj->pcg_version; - $object->pcg_type = GETPOST('pcg_type'); - $object->pcg_subtype = GETPOST('pcg_subtype'); + $object->pcg_type = GETPOST('pcg_type','alpha'); + $object->pcg_subtype = GETPOST('pcg_subtype','alpha'); $object->account_number = $account_number; $object->account_parent = $account_parent; - $object->account_category = GETPOST('account_category'); + $object->account_category = GETPOST('account_category','alpha'); $object->label = GETPOST('label', 'alpha'); $result = $object->update($user); diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index 900205b7588..14a6b56512d 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -51,8 +51,8 @@ $acts[1] = "disable"; $actl[0] = img_picto($langs->trans("Disabled"),'switch_off'); $actl[1] = img_picto($langs->trans("Activated"),'switch_on'); -$listoffset=GETPOST('listoffset'); -$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000; +$listoffset=GETPOST('listoffset','alpha'); +$listlimit=GETPOST('listlimit','int')>0?GETPOST('listlimit','int'):1000; $active = 1; $sortfield = GETPOST("sortfield",'aZ09comma'); @@ -134,13 +134,13 @@ $sourceList=array(); * Actions */ -if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x')) +if (GETPOST('button_removefilter','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter_x','alpha')) { $search_country_id = ''; } // Actions add or modify an entry into a dictionary -if (GETPOST('actionadd') || GETPOST('actionmodify')) +if (GETPOST('actionadd','alpha') || GETPOST('actionmodify','alpha')) { $listfield=explode(',', str_replace(' ', '',$tabfield[$id])); $listfieldinsert=explode(',',$tabfieldinsert[$id]); @@ -250,7 +250,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) } // Si verif ok et action modify, on modifie la ligne - if ($ok && GETPOST('actionmodify')) + if ($ok && GETPOST('actionmodify','alpha')) { if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } else { $rowidcol="rowid"; } @@ -291,7 +291,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition } -if (GETPOST('actioncancel')) +if (GETPOST('actioncancel','alpha')) { //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition } @@ -513,7 +513,7 @@ if ($id) $obj = new stdClass(); // If data was already input, we define them in obj to populate input fields. - if (GETPOST('actionadd')) + if (GETPOST('actionadd','alpha')) { foreach ($fieldlist as $key=>$val) { From bd426d105235080055e852aaa5c39bc39f581414 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 16:44:25 +0200 Subject: [PATCH 19/39] Standardize and update code --- htdocs/accountancy/admin/categories.php | 4 ++-- htdocs/accountancy/admin/defaultaccounts.php | 2 +- htdocs/accountancy/admin/fiscalyear_card.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php index 735c5595ddc..6e003738173 100644 --- a/htdocs/accountancy/admin/categories.php +++ b/htdocs/accountancy/admin/categories.php @@ -37,9 +37,9 @@ $id = GETPOST('id', 'int'); $rowid = GETPOST('rowid', 'int'); $cancel = GETPOST('cancel','alpha'); $action = GETPOST('action','aZ09'); -$cat_id = GETPOST('account_category'); +$cat_id = GETPOST('account_category','int'); $selectcpt = GETPOST('cpt_bk', 'array'); -$cpt_id = GETPOST('cptid'); +$cpt_id = GETPOST('cptid','int'); if ($cat_id == 0) { $cat_id = null; diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php index 8cd45c1cfda..31fc04fa745 100644 --- a/htdocs/accountancy/admin/defaultaccounts.php +++ b/htdocs/accountancy/admin/defaultaccounts.php @@ -76,7 +76,7 @@ $list_account = array ( $accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE; -if (GETPOST('change_chart')) +if (GETPOST('change_chart', 'alpha')) { $chartofaccounts = GETPOST('chartofaccounts', 'int'); diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index cc4dd9dbb7f..05c7a3fd174 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -166,7 +166,7 @@ if ($action == 'create') print ''; // Label - print ''; + print ''; // Date start print ''; print ''; print ''; */ From 1cfb06934c867c208361a6f1ae859830c32a8094 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 16:49:53 +0200 Subject: [PATCH 20/39] Standardize and update code --- htdocs/accountancy/admin/journals_list.php | 18 +++++++++--------- htdocs/accountancy/admin/productaccount.php | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index 20d0a5200a5..ae254788b08 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -51,8 +51,8 @@ $acts[1] = "disable"; $actl[0] = img_picto($langs->trans("Disabled"),'switch_off'); $actl[1] = img_picto($langs->trans("Activated"),'switch_on'); -$listoffset=GETPOST('listoffset'); -$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000; +$listoffset=GETPOST('listoffset', 'alpha'); +$listlimit=GETPOST('listlimit', 'int')>0?GETPOST('listlimit', 'int'):1000; $active = 1; $sortfield = GETPOST("sortfield",'alpha'); @@ -143,13 +143,13 @@ $sourceList = array( * Actions */ -if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x')) +if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) { $search_country_id = ''; } // Actions add or modify an entry into a dictionary -if (GETPOST('actionadd') || GETPOST('actionmodify')) +if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) { $listfield=explode(',', str_replace(' ', '',$tabfield[$id])); $listfieldinsert=explode(',',$tabfieldinsert[$id]); @@ -190,7 +190,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]=''; // If empty, we force to null // Si verif ok et action add, on ajoute la ligne - if ($ok && GETPOST('actionadd')) + if ($ok && GETPOST('actionadd', 'alpha')) { if ($tabrowid[$id]) { @@ -252,7 +252,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) } // Si verif ok et action modify, on modifie la ligne - if ($ok && GETPOST('actionmodify')) + if ($ok && GETPOST('actionmodify', 'alpha')) { if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } else { $rowidcol="rowid"; } @@ -294,7 +294,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition } -//if (GETPOST('actioncancel')) +//if (GETPOST('actioncancel', 'alpha')) //{ // $_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition //} @@ -462,7 +462,7 @@ if ($id) $obj = new stdClass(); // If data was already input, we define them in obj to populate input fields. - if (GETPOST('actionadd')) + if (GETPOST('actionadd', 'alpha')) { foreach ($fieldlist as $key=>$val) { @@ -504,7 +504,7 @@ if ($id) $paramwithsearch = $param; if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder; if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield; - if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha'); + if (GETPOST('from', 'alpha')) $paramwithsearch.= '&from='.GETPOST('from','alpha'); // There is several pages if ($num > $listlimit) diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 2467b89b108..0babd9aab5f 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -62,8 +62,8 @@ $search_current_account_valid = GETPOST('search_current_account_valid', 'alpha') if ($search_current_account_valid == '') $search_current_account_valid='withoutvalidaccount'; $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha'); -$btn_changeaccount = GETPOST('changeaccount'); -$btn_changetype = GETPOST('changetype'); +$btn_changeaccount = GETPOST('changeaccount', 'alpha'); +$btn_changetype = GETPOST('changetype', 'alpha'); $limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION); $sortfield = GETPOST("sortfield",'alpha'); From 18b3238bad56baeb277853af1741b07ca5d7a8d2 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 16:56:01 +0200 Subject: [PATCH 21/39] Standardize and update code --- htdocs/accountancy/bookkeeping/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 5add04d7361..a8ff1e13338 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -217,7 +217,7 @@ else if ($action == "confirm_create") { $action='create'; $error++; } - if (! GETPOST('next_num_mvt')) + if (! GETPOST('next_num_mvt', 'alpha')) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors'); $error++; @@ -253,7 +253,7 @@ else if ($action == "confirm_create") { } if ($action == 'setdate') { - $datedoc = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear')); + $datedoc = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int')); $result = $object->updateByMvt($piece_num,'doc_date',$db->idate($datedoc),$mode); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); @@ -357,7 +357,7 @@ if ($action == 'create') print ''; print ''; - print ''; + print ''; print ''; print ''; From 7e82e3d44c4927b65bc0c907ad904e30c0a0089a Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Fri, 12 Oct 2018 19:13:07 +0200 Subject: [PATCH 22/39] Update card.php --- htdocs/accountancy/admin/card.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index b64bf291955..74958d606ec 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -73,11 +73,11 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) // To manage zero or not at the end of the accounting account if($conf->global->ACCOUNTING_MANAGE_ZERO == 1) { - $account_number = GETPOST('account_number','int'); + $account_number = GETPOST('account_number','string'); } else { - $account_number = clean_account(GETPOST('account_number','int')); + $account_number = clean_account(GETPOST('account_number','string')); } if (GETPOST('account_parent','int') <= 0) @@ -138,11 +138,11 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) // To manage zero or not at the end of the accounting account if($conf->global->ACCOUNTING_MANAGE_ZERO == 1) { - $account_number = GETPOST('account_number','int'); + $account_number = GETPOST('account_number','string'); } else { - $account_number = clean_account(GETPOST('account_number','int')); + $account_number = clean_account(GETPOST('account_number','string')); } if (GETPOST('account_parent','int') <= 0) From 9551cb12f5eabbdc23c11304f928d0191661f62d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 09:59:33 +0200 Subject: [PATCH 23/39] Standardize and update code --- htdocs/admin/dict.php | 2 +- htdocs/contact/list.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index aaa4fb03706..0b5b63d35d6 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -592,7 +592,7 @@ if ($id == 10) * Actions */ -if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x')) +if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) { $search_country_id = ''; $search_code = ''; diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index cd536118f8e..52a2c4bbe7f 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -202,7 +202,7 @@ if (empty($reshook)) include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; // Did we click on purge search criteria ? - if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter')) // All tests are required to be compatible with all browsers + if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers { $sall=""; $search_id=''; From d98ebbd9ee2dec094491d52c7555df1acb862f84 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 10:39:27 +0200 Subject: [PATCH 24/39] Standardize and update code --- htdocs/compta/prelevement/create.php | 2 +- htdocs/fichinter/card-rec.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 0d07c341458..3dccc0ff912 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -46,7 +46,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons'); $action = GETPOST('action','alpha'); $mode = GETPOST('mode','alpha')?GETPOST('mode','alpha'):'real'; $format = GETPOST('format','aZ09'); -$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; +$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit; $page = GETPOST("page",'int'); if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 $offset = $limit * $page; diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 8ef79639e05..66f693858c9 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -60,7 +60,7 @@ $result = restrictedArea($user, 'ficheinter', $id, $objecttype); if ($page == -1) $page = 0 ; -$limit = GETPOST('limit')?GETPOST('limit', 'int'):$conf->liste_limit; +$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit; $offset = $limit * $page ; if ($sortorder == "") From ec12a0d456485b992475b5accf76954efbabbbf3 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 11:03:05 +0200 Subject: [PATCH 25/39] update resources url --- doc/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/index.html b/doc/index.html index b888b13d9a6..5c655136e3e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -11,15 +11,15 @@ informations on Dolibarr.
But if you are looking for other resources (downloads, documentation, addons, ...), you can find this on Internet on web following sites:

-* Dolibarr wiki (documentation)
+* Dolibarr wiki (documentation)

-* Dolibarr portal (official website)
+* Dolibarr portal (official website)

-* Dolibarr demo (online)
+* Dolibarr demo (online)

-* DoliWamp, the Dolibarr for Windows
+* DoliWamp, the Dolibarr for Windows

-* DoliStore (official addons/plugins market place)
+* DoliStore (official addons/plugins market place)
\ No newline at end of file From f8fbb976f662f8f9d1b692ee945ca8838b7657ba Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 11:06:13 +0200 Subject: [PATCH 26/39] fix typo and update resource url --- doc/user/README-FR | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/user/README-FR b/doc/user/README-FR index f3a839de008..fbf67fd89bc 100644 --- a/doc/user/README-FR +++ b/doc/user/README-FR @@ -3,9 +3,9 @@ README (french) Documentation utilisateur -------------------------------- -* Pour une prise en main et installation rapide, consulter le fichier +* Pour une prise en main et installation rapide, consultez le fichier README-FR à la racine. -* Une documentation utilisateur francophone plus consistente est disponible en +* Une documentation utilisateur francophone plus consistante est disponible en ligne sur le site Web de Dolibarr à l'adresse: -http://www.dolibarr.fr +https://www.dolibarr.fr From 653589cc6786fcc380e99be805cf7056981d1f21 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 11:07:04 +0200 Subject: [PATCH 27/39] update resource url --- doc/user/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/README b/doc/user/README index 19507dba0e4..129dff11058 100644 --- a/doc/user/README +++ b/doc/user/README @@ -4,4 +4,4 @@ User guide -------------------------------- * All Dolibarr guides are available, on line, on the Dolibarr Web site: -http://www.dolibarr.org +https://www.dolibarr.org From e71a738209fa0b10aae23dd6724840ec3d4dbd57 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 11:08:58 +0200 Subject: [PATCH 28/39] fix typo and update resource url --- doc/install/README-FR | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/install/README-FR b/doc/install/README-FR index f954601ae0d..2cee29cf2df 100644 --- a/doc/install/README-FR +++ b/doc/install/README-FR @@ -9,19 +9,19 @@ Téléchargement * Dolibarr ERP/CRM can be downloaded at sourceforge: http://sourceforge.net/projects/dolibarr/files or from Dolibarr official web site: -http://www.dolibarr.org +https://www.dolibarr.org * Most external modules are only available on DoliStore: -http://www.dolistore.org +https://www.dolistore.org -------------------------------- Documentation utilisateur -------------------------------- -* Pour une prise en main et installation rapide, consulter le fichier +* Pour une prise en main et installation rapide, consultez le fichier README-FR à la racine. -* Une documentation utilisateur francophone plus consistente est disponible en +* Une documentation utilisateur francophone plus consistante est disponible en ligne sur le wiki de Dolibarr à l'adresse: -http://wiki.dolibarr.org +https://wiki.dolibarr.org From a48554e8757659f20a69e6e7d66f0ef87622fd80 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 11:19:41 +0200 Subject: [PATCH 29/39] fix typo --- dev/dolibarr_changes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt index 6303eaafaae..24832103c6c 100644 --- a/dev/dolibarr_changes.txt +++ b/dev/dolibarr_changes.txt @@ -1,5 +1,5 @@ -This file describe changes made on external library after beeing included +This file describes changes made on external libraries after being included in Dolibarr root. From 1e0cf8dc8a785cec1377d88c017cc495f7ac7085 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 11:42:29 +0200 Subject: [PATCH 30/39] fix typo --- README-FR.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README-FR.md b/README-FR.md index 4435d47d30e..19d4ae25df9 100644 --- a/README-FR.md +++ b/README-FR.md @@ -16,8 +16,8 @@ Dolibarr est distribué sous les termes de la licence GNU General Public License ## INSTALLER DOLIBARR Si vous n'avez pas de connaissances techniques, et que vous recherchez -un programme d'installation qui install Dolibarr ERP/CRM en quelques clics, -vous devez vous réorienter vers DoliWamp (la version tout-en-un +un programme d'installation qui installe Dolibarr ERP/CRM en quelques clics, +vous devez vous ré-orienter vers DoliWamp (la version tout-en-un de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat, OpenSuse, Mandriva ou Mageia). @@ -25,39 +25,39 @@ OpenSuse, Mandriva ou Mageia). Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: https://www.dolibarr.org/ -Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (MariaDb/MySql/PostgreSql), +Si vous avez déjà installé un serveur Web avec PHP et une base de données (MariaDb/MySql/PostgreSql), vous pouvez installer Dolibarr avec cette version de la manière suivante: -- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur - web, ou bien copier le répertoire sur le serveur et configurer ce serveur pour +- Copiez le répertoire "dolibarr" et son contenu dans la racine de votre serveur + web, ou bien copiez le répertoire sur le serveur et configurez ce serveur pour utiliser "dolibarr/htdocs" comme racine d'un nouveau virtual host (ce second choix requiert des compétences et habilitations en administration du serveur web). -- Créer un fichier vide "htdocs/conf/conf.php" et attribuer les permissions +- Créez un fichier vide "htdocs/conf/conf.php" et attribuez les permissions en lecture et écriture pour le user du serveur web (les permissions en écriture seront supprimées une fois l'installation terminée). -- Depuis votre navigateur, appeler la page "install/" de dolibarr. L'url dépend - du choix fait à la première etape: +- Depuis votre navigateur, appelez la page "install/" de dolibarr. L'url dépend + du choix fait à la première étape: http://localhost/dolibarr/htdocs/install/ ou http://yourdolibarrvirtualhost/install/ -- Suivez les instructions fournies par l'installeur... +- Suivez les instructions fournies par l'installateur... ## METTRE A JOUR DOLIBARR -Pour mettre a jour Dolibarr depuis une vieille version vers celle ci: -- Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers +Pour mettre à jour Dolibarr depuis une vieille version vers celle ci: +- Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers fournis dans ce nouveau package. -- Au prochain accès, Dolibarr proposera la page de "mise a jour" des données (si necessaire). - Si un fichier install.lock existe pour vérouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transféré sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents") - -*Note: Le processus de migration peut etre lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/* +- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire). + Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents") + +*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/* ## CE QUI EST NOUVEAU @@ -136,7 +136,7 @@ Dolibarr peut aussi être étendu à volonté avec l'ajout de module/application ## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE -Voici un liste de fonctionnalites pas encore gérées par Dolibarr: +Voici un liste de fonctionnalités pas encore gérées par Dolibarr: - Dolibarr ne contient pas de module de Gestion de la paie. - Les tâches du module de gestion de projets n'ont pas de dépendances entre elle. - Dolibarr n'embarque pas de Webmail intégré nativement. @@ -145,7 +145,7 @@ Voici un liste de fonctionnalites pas encore gérées par Dolibarr: ## DOCUMENTATION -Les documentations utilisateur, développeur et traducteur sont disponible sous forme de ressources de la communautés via la site [Wiki](https://wiki.dolibarr.org). +La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org). ## CONTRIBUER From 30630ff3686a9fdafca8f785ccf367ebe3a5e549 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 11:58:19 +0200 Subject: [PATCH 31/39] fix typo --- .../modules/commande/doc/pdf_einstein.modules.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index d3b5d12d620..37d2742c1b1 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -149,13 +149,13 @@ class pdf_einstein extends ModelePDFCommandes $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10; $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10; - $this->option_logo = 1; // Affiche logo - $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION - $this->option_modereg = 1; // Affiche mode reglement - $this->option_condreg = 1; // Affiche conditions reglement - $this->option_codeproduitservice = 1; // Affiche code produit-service - $this->option_multilang = 1; // Dispo en plusieurs langues - $this->option_escompte = 0; // Affiche si il y a eu escompte + $this->option_logo = 1; // Display logo + $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION + $this->option_modereg = 1; // Display payment mode + $this->option_condreg = 1; // Display payment terms + $this->option_codeproduitservice = 1; // Display product-service code + $this->option_multilang = 1; // Available in several languages + $this->option_escompte = 0; // Displays if there has been a discount $this->option_credit_note = 0; // Support credit notes $this->option_freetext = 1; // Support add of a personalised text $this->option_draft_watermark = 1; // Support add of a watermark on drafts From effd11e1f9bf9a4e875e4db68c6e55a47cda90da Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 12:42:01 +0200 Subject: [PATCH 32/39] translation --- htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 37d2742c1b1..273027f3b99 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -27,7 +27,7 @@ /** * \file htdocs/core/modules/commande/doc/pdf_einstein.modules.php * \ingroup commande - * \brief Fichier de la classe permettant de generer les commandes au modele Einstein + * \brief File of Class to generate PDF orders with template Einstein */ require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'; @@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** - * Classe to generate PDF orders with template Einstein + * Class to generate PDF orders with template Einstein */ class pdf_einstein extends ModelePDFCommandes { From 56f5aaf1ad147d0d85c4cc9cadab75cd3d56ccb2 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 13 Oct 2018 13:56:23 +0200 Subject: [PATCH 33/39] html5 --- dev/examples/mail/dolibarr_mail_simpleHTML.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/examples/mail/dolibarr_mail_simpleHTML.txt b/dev/examples/mail/dolibarr_mail_simpleHTML.txt index 5c552221ca6..391800f5095 100644 --- a/dev/examples/mail/dolibarr_mail_simpleHTML.txt +++ b/dev/examples/mail/dolibarr_mail_simpleHTML.txt @@ -4,4 +4,4 @@ X-Mailer: Dolibarr version 2.7.0-beta (using php mail) MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit -Testé
fdsfsdf
fsdfsfds
fssdfsd
+Testé
fdsfsdf
fsdfsfds
fssdfsd
From 5dd447445a7ff8cd8c341a9e00cb505a1686e1fe Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 14 Oct 2018 09:43:33 +0200 Subject: [PATCH 34/39] html5 --- htdocs/accountancy/bookkeeping/balancebymonth.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php index 3a0a1f73308..a01c42b285a 100644 --- a/htdocs/accountancy/bookkeeping/balancebymonth.php +++ b/htdocs/accountancy/bookkeeping/balancebymonth.php @@ -64,7 +64,7 @@ $result = $db->query($sql); if ($result) { $row = $db->fetch_row($result); $nbfac = $row[0]; - + $db->free($result); } @@ -85,7 +85,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; $sql = "SELECT bk.numero_compte AS 'compte',"; @@ -111,11 +111,11 @@ $resql = $db->query($sql); if ($resql) { $i = 0; $num = $db->num_rows($resql); - + while ( $i < $num ) { - + $row = $db->fetch_row($resql); - + print ''; print ''; print ''; @@ -129,9 +129,9 @@ if ($resql) { print ''; print ''; print ''; - print ''; + print ''; print ''; - + $i ++; } $db->free($resql); From b2677f08a45faa8f99e78f9f31c4e40e7c2d433b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 14 Oct 2018 12:47:26 +0200 Subject: [PATCH 35/39] add links for set-up --- htdocs/accountancy/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index ac674eb95e0..431961a33bd 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -61,13 +61,13 @@ if ($conf->accounting->enabled) // STEPS $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").''.''); print "
\n"; $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").''.''); print "
\n"; $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").''.''); print "
\n"; print "
\n"; From eecc56c1a371dcfd9c97ceb669e2f8d15e921605 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 14 Oct 2018 13:00:01 +0200 Subject: [PATCH 36/39] highlight relevant text --- htdocs/accountancy/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 431961a33bd..23dcc7f9932 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -61,13 +61,13 @@ if ($conf->accounting->enabled) // STEPS $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").''.''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".''.$langs->transnoentitiesnoconv("AccountingJournals").''.''.''); print "
\n"; $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").''.''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".''.$langs->transnoentitiesnoconv("Pcg_version").''.''.''); print "
\n"; $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").''.''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".''.$langs->transnoentitiesnoconv("Chartofaccounts").''.''.''); print "
\n"; print "
\n"; From 5f37e075405db98b01f76376f9e1e848b709aed3 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Oct 2018 14:42:36 +0200 Subject: [PATCH 37/39] add links and highlight relevant text --- htdocs/accountancy/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 29c05eb5516..bc09c33483c 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -76,15 +76,15 @@ if ($conf->accounting->enabled) print "
\n"; $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".''.$langs->transnoentitiesnoconv("MenuDefaultAccounts").''.''.''); print "
\n"; $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuBankAccounts").'')."\n"; + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".''.$langs->transnoentitiesnoconv("MenuBankAccounts").''.''.'')."\n"; print "
\n"; $step++; - $textlink = ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").''; + $textlink = ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.''.$langs->transnoentitiesnoconv("MenuVatAccounts").''.''.''; print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink); print "
\n"; if (! empty($conf->tax->enabled)) From 059c72c678e9dcbfedcd0a540740c56ba64a090e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Oct 2018 14:55:29 +0200 Subject: [PATCH 38/39] add links and highlight relevant text --- htdocs/accountancy/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index bc09c33483c..eac0f23a845 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -89,7 +89,7 @@ if ($conf->accounting->enabled) print "
\n"; if (! empty($conf->tax->enabled)) { - $textlink = ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").''; + $textlink = ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.''.$langs->transnoentitiesnoconv("MenuTaxAccounts").''.''.''; $step++; print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink); print "
\n"; @@ -105,7 +105,7 @@ if ($conf->accounting->enabled) if (! empty($conf->expensereport->enabled)) // TODO Move this in the default account page because this is only one accounting account per purpose, not several. { $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".''.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").''.''.''); print "
\n"; } /* @@ -123,7 +123,7 @@ if ($conf->accounting->enabled) }*/ $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").''); + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, ''.''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".''.$langs->transnoentitiesnoconv("ProductsBinding").''.''.''); print "
\n"; From bd3315528eec2762768727118b1a1e941fbde681 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Oct 2018 15:08:06 +0200 Subject: [PATCH 39/39] add links and highlight relevant text --- htdocs/accountancy/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index eac0f23a845..b2dfdb91e05 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -139,18 +139,18 @@ if ($conf->accounting->enabled) $langs->loadLangs(array('bills', 'trips')); $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), ''.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'')."\n"; + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), ''.''.$langs->transnoentitiesnoconv("MenuAccountancy")."-".''.$langs->transnoentitiesnoconv("CustomersVentilation").''.''.'')."\n"; print "
\n"; $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), ''.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'')."\n"; + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), ''.''.$langs->transnoentitiesnoconv("MenuAccountancy")."-".''.$langs->transnoentitiesnoconv("SuppliersVentilation").''.''.'')."\n"; print "
\n"; if (! empty($conf->expensereport->enabled) || ! empty($conf->deplacement->enabled)) { $step++; - print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), ''.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'')."\n"; - print "
\n"; + print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), ''.''.$langs->transnoentitiesnoconv("MenuAccountancy")."-".''.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").''.''.'')."\n"; + print "
\n"; } $step++;
' . $langs->trans("Label") . '
' . $langs->trans("Label") . '
' . $langs->trans("DateStart") . ''; @@ -183,7 +183,7 @@ if ($action == 'create') print '
' . $langs->trans("Status") . ''; - print $form->selectarray('statut', $statut2label, GETPOST('statut')); + print $form->selectarray('statut', $statut2label, GETPOST('statut', 'int')); print '
' . $langs->trans("Codejournal") . '' . $formaccounting->select_journal(GETPOST('code_journal'),'code_journal',0,1,array(),1,1) . '' . $formaccounting->select_journal(GETPOST('code_journal', 'alpha'),'code_journal',0,1,array(),1,1) . '
' . $langs->trans("SeptemberMin") . '' . $langs->trans("OctoberMin") . '' . $langs->trans("NovemberMin") . '' . $langs->trans("DecemberMin") . 'TotalTotal
' . length_accountg($row[0]) . '' . price($row[1]) . '' . price($row[2]) . '' . price($row[10]) . '' . price($row[11]) . '' . price($row[12]) . '' . price($row[13]) . '' . price($row[13]) . '