From 96ab43d49526c9e2c02cc4e2527eac2535014695 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Oct 2019 14:58:15 +0200 Subject: [PATCH 1/9] add some comment --- .../core/modules/barcode/mod_barcode_product_standard.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 6be9aa859c3..3149ea9f516 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -48,8 +48,11 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode * @var string */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - - public $code_auto; // Automatic Numbering + + /** + * @var int Automatic numbering + */ + public $code_auto; public $searchcode; // Search string From 8a7360dd329d6197b9489eb0bb1b769ac90ac5b6 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Thu, 24 Oct 2019 12:59:20 +0000 Subject: [PATCH 2/9] Fixing style errors. --- htdocs/core/modules/barcode/mod_barcode_product_standard.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 3149ea9f516..b8fc623709d 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -48,11 +48,11 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode * @var string */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - + /** * @var int Automatic numbering */ - public $code_auto; + public $code_auto; public $searchcode; // Search string From f1db8e6f038e45c6f1247bec9227696caa8bb2bb Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Oct 2019 15:02:37 +0200 Subject: [PATCH 3/9] add some comment --- htdocs/core/modules/contract/mod_contract_magre.php | 5 ++++- htdocs/core/modules/contract/mod_contract_olive.php | 7 +++++-- htdocs/core/modules/contract/mod_contract_serpis.php | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index 7bb13f79af1..f9401344348 100644 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -52,7 +52,10 @@ class mod_contract_magre extends ModelNumRefContracts * @var string name */ public $name='Magre'; - + + /** + * @var int Automatic numbering + */ public $code_auto=1; /** diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php index 405781a48ae..df45550b6c4 100644 --- a/htdocs/core/modules/contract/mod_contract_olive.php +++ b/htdocs/core/modules/contract/mod_contract_olive.php @@ -57,8 +57,11 @@ class mod_contract_olive extends ModelNumRefContracts * @var string */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - - public $code_auto = 0; // Numerotation automatique + + /** + * @var int Automatic numbering + */ + public $code_auto = 0; /** diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php index 9477e79b96f..6d1f16a35a9 100644 --- a/htdocs/core/modules/contract/mod_contract_serpis.php +++ b/htdocs/core/modules/contract/mod_contract_serpis.php @@ -52,7 +52,10 @@ class mod_contract_serpis extends ModelNumRefContracts * @var string model name */ public $name='Serpis'; - + + /** + * @var int Automatic numbering + */ public $code_auto=1; From 9eb0385a88f70539a38131afe04a4ed757b3d5f1 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Thu, 24 Oct 2019 13:02:34 +0000 Subject: [PATCH 4/9] Fixing style errors. --- htdocs/core/modules/contract/mod_contract_magre.php | 2 +- htdocs/core/modules/contract/mod_contract_olive.php | 4 ++-- htdocs/core/modules/contract/mod_contract_serpis.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index f9401344348..8e723cba8df 100644 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -52,7 +52,7 @@ class mod_contract_magre extends ModelNumRefContracts * @var string name */ public $name='Magre'; - + /** * @var int Automatic numbering */ diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php index df45550b6c4..6a198fdb309 100644 --- a/htdocs/core/modules/contract/mod_contract_olive.php +++ b/htdocs/core/modules/contract/mod_contract_olive.php @@ -57,11 +57,11 @@ class mod_contract_olive extends ModelNumRefContracts * @var string */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - + /** * @var int Automatic numbering */ - public $code_auto = 0; + public $code_auto = 0; /** diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php index 6d1f16a35a9..f8f287d3dd6 100644 --- a/htdocs/core/modules/contract/mod_contract_serpis.php +++ b/htdocs/core/modules/contract/mod_contract_serpis.php @@ -52,7 +52,7 @@ class mod_contract_serpis extends ModelNumRefContracts * @var string model name */ public $name='Serpis'; - + /** * @var int Automatic numbering */ From 480e21b88a9156a50f1b2fd62db234d8bbed832f Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Oct 2019 15:06:56 +0200 Subject: [PATCH 5/9] add some comment --- htdocs/core/modules/holiday/mod_holiday_immaculate.php | 5 ++++- htdocs/core/modules/holiday/mod_holiday_madonna.php | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php index 7defb2f6dad..8a7c6a95236 100644 --- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php +++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php @@ -52,7 +52,10 @@ class mod_holiday_immaculate extends ModelNumRefHolidays * @var string model name */ public $name='Immaculate'; - + + /** + * @var int Automatic numbering + */ public $code_auto=1; /** diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php index 1d290ce0909..1cd1274869f 100644 --- a/htdocs/core/modules/holiday/mod_holiday_madonna.php +++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php @@ -54,6 +54,9 @@ class mod_holiday_madonna extends ModelNumRefHolidays */ public $name='Madonna'; + /** + * @var int Automatic numbering + */ public $code_auto=1; From 3fb0b1ac734d47808d6f8f7513a0c4d1e8e4e62e Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Thu, 24 Oct 2019 13:07:19 +0000 Subject: [PATCH 6/9] Fixing style errors. --- htdocs/core/modules/holiday/mod_holiday_immaculate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php index 8a7c6a95236..dee02685bf6 100644 --- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php +++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php @@ -52,7 +52,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays * @var string model name */ public $name='Immaculate'; - + /** * @var int Automatic numbering */ From ffa5c8cbc0d0a1b50c5b141c55965dc3e50d6384 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Oct 2019 15:10:05 +0200 Subject: [PATCH 7/9] add some comment --- htdocs/core/modules/product/mod_codeproduct_elephant.php | 5 ++++- htdocs/core/modules/product/mod_codeproduct_leopard.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 18d91631d3c..523dc8bd7c4 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -60,7 +60,10 @@ class mod_codeproduct_elephant extends ModeleProductCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $code_auto; // Numerotation automatique + /** + * @var int Automatic numbering + */ + public $code_auto; public $searchcode; // String de recherche diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php index 77e14200264..04a15c9b8a5 100644 --- a/htdocs/core/modules/product/mod_codeproduct_leopard.php +++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php @@ -65,7 +65,10 @@ class mod_codeproduct_leopard extends ModeleProductCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $code_auto; // Numerotation automatique + /** + * @var int Automatic numbering + */ + public $code_auto; /** From ac839204d72ef396ed533b80c7f791f7ad6b3ce7 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Oct 2019 15:12:20 +0200 Subject: [PATCH 8/9] add some comment --- htdocs/core/modules/societe/mod_codeclient_elephant.php | 5 ++++- htdocs/core/modules/societe/mod_codeclient_leopard.php | 5 ++++- htdocs/core/modules/societe/mod_codeclient_monkey.php | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 430c50fb401..3a7d2c00613 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -53,7 +53,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $code_auto; // Numerotation automatique + /** + * @var int Automatic numbering + */ + public $code_auto; public $searchcode; // String de recherche diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 4ba5e490b07..80bb3013904 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -57,7 +57,10 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $code_auto; // Numerotation automatique + /** + * @var int Automatic numbering + */ + public $code_auto; /** diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index 89774161635..6273f5e74ef 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -51,7 +51,10 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $code_auto; // Numerotation automatique + /** + * @var int Automatic numbering + */ + public $code_auto; public $prefixcustomer='CU'; From dde9dcbee39dd1bb794cf31ed6d59eddcfd98548 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Oct 2019 16:29:27 +0200 Subject: [PATCH 9/9] missing translation --- htdocs/langs/en_US/bills.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 0acd25ec536..f7ed7bcade0 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -175,6 +175,7 @@ DraftBills=Draft invoices CustomersDraftInvoices=Customer draft invoices SuppliersDraftInvoices=Vendor draft invoices Unpaid=Unpaid +ErrorNoPaymentDefined=Error No payment defined ConfirmDeleteBill=Are you sure you want to delete this invoice? ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s? ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status?