Fix: tr-td
This commit is contained in:
Laurent Destailleur
parent
1f47c4c513
commit
39376e0137
@ -13,3 +13,4 @@ module_pibarcode-1.0.tgz
|
||||
version-phpsane.txt
|
||||
makepack-phpsane.conf
|
||||
html
|
||||
*.deb
|
||||
|
||||
@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
|
||||
* New upstream release.
|
||||
closes: bug#634783
|
||||
|
||||
-- Laurent Destailleur <eldy@destailleur.fr> Mon, 18 Jul 2011 12:00:00 +0100
|
||||
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 18 Jul 2011 12:00:00 +0100
|
||||
|
||||
# More information into /usr/share/dolibarr/ChangeLog file.
|
||||
@ -1,5 +1,4 @@
|
||||
Package: dolibarr
|
||||
Source: dolibarr
|
||||
Version: __VERSION__
|
||||
Architecture: all
|
||||
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
|
||||
@ -4,5 +4,49 @@ 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
|
||||
Build-Depends: debhelper
|
||||
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.
|
||||
@ -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.114 2011/07/25 23:20:14 eldy Exp $
|
||||
# \version $Id: makepack-dolibarr.pl,v 1.116 2011/07/26 22:53:13 eldy Exp $
|
||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@ -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.114 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$REVISION='$Revision: 1.116 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$VERSION="1.0 (build $REVISION)";
|
||||
|
||||
|
||||
@ -494,6 +494,7 @@ 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`;
|
||||
@ -582,7 +583,7 @@ if ($nboftargetok) {
|
||||
chdir("$BUILDROOT");
|
||||
|
||||
# Creation of binary package
|
||||
$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb";
|
||||
$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
|
||||
print "Launch DEB build ($cmd)\n";
|
||||
$ret=`$cmd`;
|
||||
print $ret."\n";
|
||||
@ -616,13 +617,13 @@ if ($nboftargetok) {
|
||||
|
||||
if ($OS =~ /windows/i)
|
||||
{
|
||||
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
|
||||
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
||||
print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n";
|
||||
$ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`;
|
||||
}
|
||||
else
|
||||
{
|
||||
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
|
||||
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
||||
print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n";
|
||||
$ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`;
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* \file htdocs/compta/index.php
|
||||
* \ingroup compta
|
||||
* \brief Main page of accountancy area
|
||||
* \version $Id: index.php,v 1.182 2011/06/30 21:53:02 eldy Exp $
|
||||
* \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $
|
||||
*/
|
||||
|
||||
require('../main.inc.php');
|
||||
@ -100,12 +100,7 @@ print_fiche_titre($langs->trans("AccountancyTreasuryArea"));
|
||||
print '<table border="0" width="100%" class="notopnoleftnoright">';
|
||||
|
||||
print '<tr>';
|
||||
|
||||
if (($conf->facture->enabled && $user->rights->facture->lire) ||
|
||||
($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire))
|
||||
{
|
||||
print '<td valign="top" width="30%" class="notopnoleft">';
|
||||
}
|
||||
print '<td valign="top" width="30%" class="notopnoleft">';
|
||||
|
||||
$max=3;
|
||||
|
||||
@ -321,16 +316,8 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)
|
||||
}
|
||||
}
|
||||
|
||||
if (($conf->facture->enabled && $user->rights->facture->lire) ||
|
||||
($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
|
||||
{
|
||||
print '</td>';
|
||||
print '<td valign="top" width="70%" class="notopnoleftnoright">';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<td valign="top" width="100%" class="notopnoleftnoright">';
|
||||
}
|
||||
print '</td>';
|
||||
print '<td valign="top" width="70%" class="notopnoleftnoright">';
|
||||
|
||||
// Last modified customer invoices
|
||||
if ($conf->facture->enabled && $user->rights->facture->lire)
|
||||
@ -1045,5 +1032,5 @@ print '</table>';
|
||||
$db->close();
|
||||
|
||||
|
||||
llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.182 $');
|
||||
llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $');
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user