From 1f47c4c513fb327ea38097c8f7c02bfc072814c6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 25 Jul 2011 23:20:13 +0000 Subject: [PATCH] Work on debian package --- build/.cvsignore | 1 - build/deb/changelog | 2 +- build/deb/control.DEBIAN | 1 + build/deb/control.debian | 46 +------------------------------------- build/makepack-dolibarr.pl | 17 +++++++------- htdocs/compta/index.php | 23 ++++++++++++++----- 6 files changed, 29 insertions(+), 61 deletions(-) diff --git a/build/.cvsignore b/build/.cvsignore index 830b8b91924..d97289222c3 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -13,4 +13,3 @@ module_pibarcode-1.0.tgz version-phpsane.txt makepack-phpsane.conf html -*.deb diff --git a/build/deb/changelog b/build/deb/changelog index 47667b3cfb5..fc8d0a81a84 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100 # More information into /usr/share/dolibarr/ChangeLog file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN index 627298d5b91..a0bac2f1772 100755 --- a/build/deb/control.DEBIAN +++ b/build/deb/control.DEBIAN @@ -1,4 +1,5 @@ Package: dolibarr +Source: dolibarr Version: __VERSION__ Architecture: all Maintainer: Laurent Destailleur diff --git a/build/deb/control.debian b/build/deb/control.debian index ae498d71ef7..1eb4a37489f 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,49 +4,5 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper - -Package: dolibarr -Depends: ${misc:Depends}, debconf, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all -Section: web -Priority: optional -Recommends: firefox -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory - Contacts directory - Orders management - Commercial proposals management - Invoices management - Products and services catalog - Stock management - Foundations members management - Bank accounts management - Point of Sale - Payments management - Commercial actions management - Contracts management - Standing orders management - Shipping management - Donations management - Bookmarks management - Mass Emailings - Reports - Data export and import tools - LDAP connectivity - PDF exports - And a lot of more modules... - . - You can also add third parties external modules or develop yours. \ No newline at end of file +Build-Depends: debhelper \ No newline at end of file diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 825da0e5258..8fde5827572 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.116 2011/07/26 22:53:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.114 2011/07/25 23:20:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot"; $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION"; -$FILENAMEDEB="$PROJECT_$MAJOR.$MINOR.$BUILD"; +$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app"; $FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD"; if (-d "/usr/src/redhat") { @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.116 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.114 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -494,7 +494,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`; @@ -583,7 +582,7 @@ if ($nboftargetok) { chdir("$BUILDROOT"); # Creation of binary package - $cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; + $cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb"; print "Launch DEB build ($cmd)\n"; $ret=`$cmd`; print $ret."\n"; @@ -617,13 +616,13 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { - print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n"; - $ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`; + print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n"; + $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`; } else { - print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n"; - $ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`; + print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n"; + $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`; } next; } diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..c6a7474c9b8 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -22,7 +22,7 @@ * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.182 2011/06/30 21:53:02 eldy Exp $ */ require('../main.inc.php'); @@ -100,7 +100,12 @@ print_fiche_titre($langs->trans("AccountancyTreasuryArea")); print ''; print ''; -print ''; -print ''; + print '
'; + +if (($conf->facture->enabled && $user->rights->facture->lire) || + ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)) +{ + print ''; +} $max=3; @@ -316,8 +321,16 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) } } -print ''; +if (($conf->facture->enabled && $user->rights->facture->lire) || + ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) +{ + print ''; +} +else +{ + print ''; +} // Last modified customer invoices if ($conf->facture->enabled && $user->rights->facture->lire) @@ -1032,5 +1045,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.182 $'); ?>