lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: switch the variables "$ver" and $upgrade->{'version'}

Browse Source 
Fix: call "etape5" page for fix the new version
This commit is contained in:
Regis Houssin 2010-04-05 17:42:45 +00:00
parent f4ee8e54b5
commit 241cd8e282
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/perl/virtualmin/dolibarr.pl
View File

@ -23,15 +23,29 @@ sub script_dolibarr_longdesc
return "Dolibarr ERP/CRM is a powerful Open Source software to manage a professional or foundation activity (small and medium enterprises, freelancers)."; return "Dolibarr ERP/CRM is a powerful Open Source software to manage a professional or foundation activity (small and medium enterprises, freelancers).";
} }
sub script_dolibarr_author
{
return "Regis Houssin";
}
# script_dolibarr_versions() # script_dolibarr_versions()
sub script_dolibarr_versions sub script_dolibarr_versions
{ {
return ( "2.7.1", "2.8.0" ); return ( "2.8.0", "2.7.1" );
}
sub script_dolibarr_can_upgrade
{
local ($sinfo, $newver) = @_;
if ($newver >= 2.8 && $sinfo->{'version'} < 2.8) {
return 0;
}
return 1;
} }
sub script_dolibarr_category sub script_dolibarr_category
{ {
return "ERP/CRM"; return "Commerce";
} }
sub script_dolibarr_php_vers sub script_dolibarr_php_vers
@ -179,10 +193,10 @@ local $olddocdir = &transname();
local $url; local $url;
$path = &script_path_url($d, $opts); $path = &script_path_url($d, $opts);
if ($path =~ /^https:/) { if ($path =~ /^https:/) {
$url = "https://$d->{'dom'}"; $url = "https://www.$d->{'dom'}";
} }
else { else {
$url = "http://$d->{'dom'}"; $url = "http://www.$d->{'dom'}";
} }
if ($opts->{'path'} =~ /\w/) { if ($opts->{'path'} =~ /\w/) {
$url .= $opts->{'path'}; $url .= $opts->{'path'};
@ -331,9 +345,12 @@ return (1, "Dolibarr directory and tables deleted.");
sub script_dolibarr_latest sub script_dolibarr_latest
{ {
local ($ver) = @_; local ($ver) = @_;
if ($ver >= 2.8) {
return ( "http://www.dolibarr.fr/files/stable/", return ( "http://www.dolibarr.fr/files/stable/",
"dolibarr\\-(2\\.[0-9\\.]+)" ); "dolibarr\\-(2\\.[0-9\\.]+)" );
} }
return ( );
}
sub script_dolibarr_site sub script_dolibarr_site
{ {