diff --git a/ChangeLog b/ChangeLog index 1b6521f5b49..08b90003fc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,8 @@ For users: - New: Add region/country statistics for member module. - New: Can define a proxy for external web access. - New: task #11003: checkbox on checks to deposit +- New: Numbering module for invoice use same number for invoice + and credit note if mask is same. - Fix: Better Postgresql compatibility. For developers: diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/includes/modules/facture/mod_facture_mercure.php index 99fee698c2b..af57c9ff440 100644 --- a/htdocs/includes/modules/facture/mod_facture_mercure.php +++ b/htdocs/includes/modules/facture/mod_facture_mercure.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * @@ -128,8 +128,8 @@ class mod_facture_mercure extends ModeleNumRefFactures } $where=''; - if ($facture->type == 2) $where.= " AND type = 2"; - else $where.=" AND type != 2"; + //if ($facture->type == 2) $where.= " AND type = 2"; + //else $where.=" AND type != 2"; $numFinal=get_next_value($db,$mask,'facture','facnumber',$where,$objsoc,$facture->date,$mode); if (! preg_match('/([0-9])+/',$numFinal)) $this->error = $numFinal;