diff --git a/ChangeLog b/ChangeLog index 78bba6e6df5..fffd210862c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,15 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f - Properties "civilite_id" were renamed into "civility_id". + +***** ChangeLog for 3.5.4 compared to 3.5.3 ***** +Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown + properly in module configuration +Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the + supplier order card +Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or + limit date for payment + ***** ChangeLog for 3.5.3 compared to 3.5.2 ***** Fix: Error on field accountancy code for export profile of invoices. Fix: [ bug #1351 ] VIES verification link broken. diff --git a/build/debian/changelog b/build/debian/changelog index d4a3c561ee0..3205fefdafd 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -5,6 +5,13 @@ dolibarr (3.6.0-1) unstable; urgency=low -- Laurent Destailleur (eldy) Sat, 9 May 2014 12:00:00 +0100 +dolibarr (3.5.4-3) unstable; urgency=low + + [ Laurent Destailleur (eldy) ] + * New upstream release. + + -- Laurent Destailleur (eldy) Tue, 1 July 2014 12:00:00 +0100 + dolibarr (3.5.3-3) unstable; urgency=low [ Laurent Destailleur (eldy) ] diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 4eb3a0b25c1..5a3a5d3290c 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -336,6 +336,9 @@ fi * Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b - Upstream release +* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 +- Upstream release + * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 - Upstream release diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 88a80996114..71e9b4d3e65 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -572,6 +572,9 @@ fi * Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b - Upstream release +* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 +- Upstream release + * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 - Upstream release diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 957190a23a1..3dec07b170b 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -341,6 +341,9 @@ fi * Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b - Upstream release +* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 +- Upstream release + * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 - Upstream release diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 92bb1312840..427272dac85 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -352,6 +352,9 @@ fi * Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b - Upstream release +* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 +- Upstream release + * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 - Upstream release diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 6a477cc1302..37a3b2a5a5c 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -376,13 +376,16 @@ foreach ($dirmodels as $reldir) { if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_') { + $var=!$var; + $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); - $var=!$var; + require_once $dir.'/'.$file; + $module = new $classname($db); print ''; - echo "$name"; + print (empty($module->name)?$name:$module->name); print "\n"; require_once $dir.$file; $module = new $classname($db); diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 8b69f8e1441..5745c5f82ba 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -372,9 +372,14 @@ foreach ($dirmodels as $reldir) $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); + require_once $dir.'/'.$file; + $module = new $classname($db, new FactureFournisseur($db)); + $var=!$var; print "\n"; - print "".$name."\n"; + print ""; + print (empty($module->name)?$name:$module->name); + print "\n"; print "\n"; require_once $dir.$file; $module = new $classname($db,$specimenthirdparty); diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 88ab88780fc..ac2ab824233 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -42,6 +42,7 @@ accessforbidden(); $type=GETPOST('type', 'alpha'); $value=GETPOST('value', 'alpha'); +$label = GETPOST('label','alpha'); $action=GETPOST('action', 'alpha'); $specimenthirdparty=new Societe($db); @@ -367,9 +368,14 @@ foreach ($dirmodels as $reldir) $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); + require_once $dir.'/'.$file; + $module = new $classname($db, new CommandeFournisseur($db)); + $var=!$var; print "\n"; - print "".$name."\n"; + print ""; + print (empty($module->name)?$name:$module->name); + print "\n"; print "\n"; require_once $dir.$file; $module = new $classname($db,$specimenthirdparty); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index a9619a33902..278e1099c4f 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -543,7 +543,7 @@ class FactureFournisseur extends CommonInvoice if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid); if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source); if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project); - if (isset($this->fk_cond_reglement)) $this->fk_cond_reglement=trim($this->fk_cond_reglement); + if (isset($this->cond_reglement_id)) $this->cond_reglement_id=trim($this->cond_reglement_id); if (isset($this->note_private)) $this->note=trim($this->note_private); if (isset($this->note_public)) $this->note_public=trim($this->note_public); if (isset($this->model_pdf)) $this->model_pdf=trim($this->model_pdf); @@ -581,7 +581,7 @@ class FactureFournisseur extends CommonInvoice $sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").","; $sql.= " fk_facture_source=".(isset($this->fk_facture_source)?$this->fk_facture_source:"null").","; $sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").","; - $sql.= " fk_cond_reglement=".(isset($this->fk_cond_reglement)?$this->fk_cond_reglement:"null").","; + $sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").","; $sql.= " date_lim_reglement=".(dol_strlen($this->date_echeance)!=0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').","; $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").","; $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";