diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d78ba1e717d..eca19e576fd 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -36,7 +36,7 @@ $PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpd "RPM_FEDORA"=>"rpmbuild", "RPM_MANDRIVA"=>"rpmbuild", "RPM_OPENSUSE"=>"rpmbuild", -"DEB"=>"dpkg", +"DEB"=>"dpkg dpatch", "FLATPACK"=>"flatpack", "EXEDOLIWAMP"=>"ISCC.exe", "SNAPSHOT"=>"tar" @@ -589,6 +589,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/dav/tests`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`; diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index f1770a692c0..477d129d459 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -43,9 +43,9 @@ To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dol - Run makepack-dolibarr.pl to generate all packages. - Check content of built packages. -- Move build files into www.dolibarr.org web site - (/home/dolibarr/wwwroot/files/stable). +- Run makepack-dolibarr.pl again with option to publish files on + dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org). - Run makepack-dolibarr.pl again with option to publish files on sourceforge. This will also add official tag. - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx" diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 8cd35c44c09..b730ce98625 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -731,7 +731,7 @@ if ($resql) if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; $formother->select_year($search_year_lim?$search_year_lim:-1,'search_year_lim',1, 20, 5, 0, 0, '', 'widthauto valignmiddle'); - print '
'.$langs->trans("Late"); + print '
'.$langs->trans("Alert"); print ''; } // Project @@ -993,7 +993,7 @@ if ($resql) print ''.dol_print_date($datelimit,'day'); if ($facturestatic->hasDelay()) { - print img_warning($langs->trans('Late')); + print img_warning($langs->trans('Alert').' - '.$langs->trans('Late')); } print ''; if (! $i) $totalarray['nbfield']++; diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index c5e4c8648d7..4628f241728 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -327,6 +327,7 @@ $head = societe_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company'); $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']); +foreach ($conf->modules_parts['models'] as $mo) $dirsociete[]=$mo.'core/modules/societe/'; //Add more models // Module to manage customer/supplier code