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

Prepare 3.5.0 beta

Browse Source
This commit is contained in:
Laurent Destailleur 2013-11-07 00:41:27 +01:00
parent 1838d45197
commit db9e9a3372
9 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,9 +1,6 @@
--------------------------------------------------------------
English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 3.4.2 compared to 3.4.1 *****
Fix: Bad rounding on margin calculations and display.
Fix: Option drop table into backup was broken.
***** ChangeLog for 3.5 compared to 3.4.* *****
For users:
@ -129,7 +126,11 @@ parameter. All methods addline in this case were modified to remove this paramet
4) Method ->classer_facturee() is deprecated. It must be replace with ->classifyBilled().
5) Property ->tel on objects is now ->phone
***** ChangeLog for 3.4.2 compared to 3.4.1 *****
Fix: Bad rounding on margin calculations and display.
Fix: Option drop table into backup was broken.
***** ChangeLog for 3.4.1 compared to 3.4.0 *****
Fix: Display buying price on line edit when no supplier price is defined

4
build/exe/doliwamp/doliwamp.iss
View File

@ -17,9 +17,9 @@
; ----- Change this -----
AppName=DoliWamp
; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
AppVerName=DoliWamp-3.5.0-alpha
AppVerName=DoliWamp-3.5.0-beta
; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
OutputBaseFilename=DoliWamp-3.5.0-alpha
OutputBaseFilename=DoliWamp-3.5.0-beta
; Define full path from wich all relative path are defined
; You must modify this to put here your dolibarr root directory
;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx

2
build/makepack-dolibarr.pl
View File

@ -10,7 +10,7 @@ use Cwd;
$PROJECT="dolibarr";
$MAJOR="3";
$MINOR="5";
$BUILD="0-alpha"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$RPMSUBVERSION="auto"; # auto use value found into BUILD
@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages

4
build/rpm/dolibarr_fedora.spec
View File

@ -325,10 +325,10 @@ then
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Sun Feb 17 2013 Laurent Destailleur 3.5.0-0.1.a
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
- Initial version (#723326)

4
build/rpm/dolibarr_generic.spec
View File

@ -553,10 +553,10 @@ then
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Sun Feb 17 2013 Laurent Destailleur 3.5.0-0.1.a
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
- Initial version (#723326)

4
build/rpm/dolibarr_mandriva.spec
View File

@ -329,11 +329,11 @@ then
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Sun Feb 17 2013 Laurent Destailleur 3.5.0-0.1.a
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
- Initial version (#723326)

4
build/rpm/dolibarr_opensuse.spec
View File

@ -339,11 +339,11 @@ then
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
echo "No remove action done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Sun Feb 17 2013 Laurent Destailleur 3.5.0-0.1.a
* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
- Initial version (#723326)

62
dev/initdata/mysqldump_dolibarr_3.5.0.sql
View File

@ -1,8 +1,8 @@
-- MySQL dump 10.13 Distrib 5.5.32, for debian-linux-gnu (x86_64)
-- MySQL dump 10.13 Distrib 5.5.34, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: dolibarr
-- Host: localhost Database: dolibarrnew
-- ------------------------------------------------------
-- Server version 5.5.32-0ubuntu0.12.04.1
-- Server version 5.5.34-0ubuntu0.12.04.1
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@ -304,6 +304,60 @@ INSERT INTO `llx_adherent_extrafields` VALUES (2,'2011-06-19 12:03:23',12,'aaa',
/*!40000 ALTER TABLE `llx_adherent_extrafields` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `llx_adherent_options`
--
DROP TABLE IF EXISTS `llx_adherent_options`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `llx_adherent_options` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`fk_member` int(11) NOT NULL,
PRIMARY KEY (`rowid`),
KEY `idx_adherent_options` (`fk_member`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `llx_adherent_options`
--
LOCK TABLES `llx_adherent_options` WRITE;
/*!40000 ALTER TABLE `llx_adherent_options` DISABLE KEYS */;
/*!40000 ALTER TABLE `llx_adherent_options` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `llx_adherent_options_label`
--
DROP TABLE IF EXISTS `llx_adherent_options_label`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `llx_adherent_options_label` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(64) NOT NULL,
`entity` int(11) NOT NULL DEFAULT '1',
`tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`label` varchar(255) NOT NULL,
`type` varchar(8) DEFAULT NULL,
`size` int(11) DEFAULT '0',
`pos` int(11) DEFAULT '0',
PRIMARY KEY (`rowid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `llx_adherent_options_label`
--
LOCK TABLES `llx_adherent_options_label` WRITE;
/*!40000 ALTER TABLE `llx_adherent_options_label` DISABLE KEYS */;
/*!40000 ALTER TABLE `llx_adherent_options_label` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `llx_adherent_type`
--
@ -7080,4 +7134,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2013-10-22 0:36:10
-- Dump completed on 2013-11-07 0:28:00

4
htdocs/filefunc.inc.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php
*/
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.0-alpha');
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.0-beta');
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants