From 08a3b0c9058a0d3be92b310b098796d458466393 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 6 Aug 2013 15:27:51 +0200 Subject: [PATCH 1/2] Fix : supplier invoice mask + numbering --- htdocs/admin/supplier_invoice.php | 2 +- .../modules/supplier_invoice/mod_facture_fournisseur_tulip.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 66d8fe1002c..7a0e465577b 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -55,7 +55,7 @@ $specimenthirdparty->initAsSpecimen(); if ($action == 'updateMask') { $maskconstinvoice=GETPOST('maskconstinvoice','alpha'); - $maskvalue=GETPOST('maskvalue','alpha'); + $maskvalue=GETPOST('maskinvoice','alpha'); if ($maskconstinvoice) $res = dolibarr_set_const($db,$maskconstinvoice,$maskvalue,'chaine',0,'',$conf->entity); diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php index db600493478..fc47fbdae3b 100644 --- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php +++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php @@ -124,7 +124,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices return 0; } - $numFinal=get_next_value($db,$mask,'facture_fournisseur','ref','',$objsoc->code_fournisseur,$object->datec); + $numFinal=get_next_value($db,$mask,'facture_fourn','ref','',$objsoc->code_fournisseur,$object->datec); return $numFinal; } From 3586c41a8e22b4323424938d696b708cfed56c77 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 6 Aug 2013 15:29:20 +0200 Subject: [PATCH 2/2] Numbering should be on invoice date, not creation date --- .../modules/supplier_invoice/mod_facture_fournisseur_tulip.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php index fc47fbdae3b..c670b5c68df 100644 --- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php +++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php @@ -124,7 +124,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices return 0; } - $numFinal=get_next_value($db,$mask,'facture_fourn','ref','',$objsoc->code_fournisseur,$object->datec); + $numFinal=get_next_value($db,$mask,'facture_fourn','ref','',$objsoc->code_fournisseur,$object->datef); return $numFinal; }