diff --git a/ChangeLog b/ChangeLog index c32ab58c1fd..712a52e4617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,9 +73,6 @@ For users: - Fix: [ bug #1517 ] Packages sizes. - Fix: [ bug #1521 ] The second order's page from a provider shows all orders -TODO -- New: Predefined product and free product use same form. - For translators: - Update language files. @@ -113,6 +110,8 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f - Remove add_photo_web() that is ot used anymore by core code. +***** ChangeLog for 3.5.5 compared to 3.5.4 ***** +Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas. ***** ChangeLog for 3.5.4 compared to 3.5.3 ***** Fix: Hide title of event when agenda module disabled. diff --git a/build/debian/changelog b/build/debian/changelog index afa2aabf7ca..06d0d2212d5 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,9 +1,16 @@ -dolibarr (3.6.0-2) unstable; urgency=low +dolibarr (3.6.0-3) unstable; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. - -- Laurent Destailleur (eldy) Sat, 9 May 2014 12:00:00 +0100 + -- Laurent Destailleur (eldy) Tue, 15 July 2014 12:00:00 +0100 + +dolibarr (3.5.5-3) unstable; urgency=low + + [ Laurent Destailleur (eldy) ] + * New upstream release. + + -- Laurent Destailleur (eldy) Tue, 8 July 2014 12:00:00 +0100 dolibarr (3.5.4-3) unstable; urgency=low diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/build/doxygen/dolibarr-doxygen-build.pl index 65fc027ca32..259e5aca766 100755 --- a/build/doxygen/dolibarr-doxygen-build.pl +++ b/build/doxygen/dolibarr-doxygen-build.pl @@ -15,7 +15,7 @@ $CONFFILE="dolibarr-doxygen.doxyfile"; use Cwd; my $dir = getcwd; - + print "Current dir is: $dir\n"; print "Running dir for doxygen must be: $DIR\n"; @@ -24,14 +24,31 @@ if (! -s $CONFFILE) print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n"; print "\n"; print "Change your current directory then, to launch the script, run:\n"; - print '> perl ..\dolibarr-doxygen-build.pl (on Windows)'."\n"; + print '> perl .\dolibarr-doxygen-build.pl (on Windows)'."\n"; print '> perl ../dolibarr-doxygen-build.pl (on Linux or BSD)'."\n"; sleep 4; exit 1; } -print "Running doxygen, please wait...\n"; -$result=`doxygen $OPTIONS $CONFFILE 2>&1`; +$SOURCE="../.."; + +# Get version $MAJOR, $MINOR and $BUILD +$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" ); +if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; } +while () { + if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; } +} +close IN; +($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3); +if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/filefunc.inc.php"; } + + +$version=$MAJOR.".".$MINOR.".".$BUILD; + + +print "Running doxygen for version ".$version.", please wait...\n"; +print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n"; +$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`; print $result; diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index 1f7c5adbb62..912c72b4d69 100644 --- a/build/doxygen/dolibarr-doxygen.doxyfile +++ b/build/doxygen/dolibarr-doxygen.doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 3.6.0 +PROJECT_NUMBER = x.y.z # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/build/doxygen/doxygen_header.html b/build/doxygen/doxygen_header.html index 8d367cccb67..363d408d43c 100755 --- a/build/doxygen/doxygen_header.html +++ b/build/doxygen/doxygen_header.html @@ -35,15 +35,15 @@ File added into doxygen generated documentation
- + + + -
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 7e94899455c..dae90ca7538 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -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.6.0-beta +AppVerName=DoliWamp-3.6.0 ; 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.6.0-beta +OutputBaseFilename=DoliWamp-3.6.0 ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log ; Define full path from which all relative path are defined diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 973b0f65036..1531c049f7d 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -973,12 +973,15 @@ if ($nboftargetok) { "$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM', "$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM' ); + use POSIX qw/strftime/; foreach my $file (sort keys %filestoscansf) { $found=0; my $filesize = -s $file; + my $filedate = (stat $file)[9]; print $file." ".($filesize?"(found)":"(not found)"); print ($filesize?" - ".$filesize:""); + print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):""); print "\n"; } diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index c43d1769458..24e5f809185 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -13,8 +13,6 @@ beta version of Dolibarr, step by step. - Update version number with x.y.z-w in build/debian/changelog - Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss - Update version number with x.y.z-w in build/rpm/*.spec -- Update version number with x.y.z in build/doxygen/dolibarr-doxygen.doxyfile -- Update version number with x.y.z in build/perl/virtualmin/dolibarr.pl - Commit all changes. - Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags - Create a branch (x.y). diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 6aaa712f644..d676e59255e 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -333,7 +333,10 @@ 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 -* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b +* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 +- Upstream release + +* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 - Upstream release * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 7c8304cd56b..ef94435a62a 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -569,7 +569,10 @@ 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 -* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b +* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 +- Upstream release + +* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 - Upstream release * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 707371aed15..dfa148570f0 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -338,7 +338,10 @@ 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 -* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b +* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 +- Upstream release + +* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 - Upstream release * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 417756b486f..b3b304312f5 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -349,7 +349,10 @@ 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 -* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b +* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 +- Upstream release + +* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 - Upstream release * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index f3e452e1465..77f0783202e 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -1,7 +1,7 @@ * Copyright (C) 2002-2003 Jean-Louis Bergamo - * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2013 Raphaël Doursenaud * * This program is free software; you can redistribute it and/or modify @@ -189,7 +189,7 @@ if ($resql) } $param=""; - if (isset($_GET["statut"])) $param.="&statut=".$statut; + if ($statut != "") $param.="&statut=".$statut; if ($search_nom) $param.="&search_nom=".$search_nom; if ($search_login) $param.="&search_login=".$search_login; if ($search_email) $param.="&search_email=".$search_email; @@ -202,7 +202,7 @@ if ($resql) print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall; } - print '
'; + print ''; print ""; // Filter on categories diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index d8b40784c0a..a58ac5899ab 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -57,7 +57,7 @@ $resultmasssend=''; */ // Send remind email -if ($action == 'presend' && GETPOST('cancel')) +if ($action == 'presend' && GETPOST('cancel')) { $action=''; if (GETPOST('models')=='facture_relance') $mode='sendmassremind'; // If we made a cancel from submit email form, this means we must be into mode=sendmassremind @@ -66,7 +66,7 @@ if ($action == 'presend' && GETPOST('cancel')) if ($action == 'presend' && GETPOST('sendmail')) { if (GETPOST('models')=='facture_relance') $mode='sendmassremind'; // If we made a cancel from submit email form, this means we must be into mode=sendmassremind - + if (!isset($user->email)) { $error++; @@ -79,7 +79,7 @@ if ($action == 'presend' && GETPOST('sendmail')) $error++; setEventMessage("InvoiceNotChecked","warnings"); } - + if (! $error) { $nbsent = 0; @@ -92,7 +92,7 @@ if ($action == 'presend' && GETPOST('sendmail')) if ($result > 0) // Invoice was found { - if ($object->statut != 1) + if ($object->statut != 1) { continue; // Payment done or started or canceled } @@ -104,7 +104,7 @@ if ($action == 'presend' && GETPOST('sendmail')) $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref); $file = $filedir . '/' . $filename; $mime = 'application/pdf'; - + if (dol_is_file($file)) { $object->fetch_thirdparty(); @@ -120,7 +120,7 @@ if ($action == 'presend' && GETPOST('sendmail')) $subject = GETPOST('subject'); $message = GETPOST('message'); $sendtocc = GETPOST('sentocc'); - + $substitutionarray=array( '__ID__' => $object->id, '__EMAIL__' => $object->thirdparty->email, @@ -130,7 +130,7 @@ if ($action == 'presend' && GETPOST('sendmail')) '__REF__' => $object->ref, '__REFCLIENT__' => $object->thirdparty->name ); - + $message=make_substitutions($message, $substitutionarray); $actiontypecode='AC_FAC'; @@ -181,7 +181,7 @@ if ($action == 'presend' && GETPOST('sendmail')) if (! $error) { - $resultmasssend.=$langs->trans("MailSent").': '.$sendto."
\n"; + $resultmasssend.=$langs->trans("MailSent").': '.$sendto."
\n"; } else { @@ -216,8 +216,8 @@ if ($action == 'presend' && GETPOST('sendmail')) } } } - - if ($nbsent) + + if ($nbsent) { $action=''; // Do not show form post if there was at least one successfull sent setEventMessage($nbsent. '/'.$countToSend.' '.$langs->trans("RemindSent")); @@ -363,6 +363,7 @@ $(document).ready(function() { $now=dol_now(); $search_ref = GETPOST("search_ref"); +$search_refcustomer=GETPOST('search_refcustomer'); $search_societe = GETPOST("search_societe"); $search_montant_ht = GETPOST("search_montant_ht"); $search_montant_ttc = GETPOST("search_montant_ttc"); @@ -381,7 +382,7 @@ if (! $sortorder) $sortorder="ASC"; $limit = $conf->liste_limit; $sql = "SELECT s.nom, s.rowid as socid, s.email"; -$sql.= ", f.rowid as facid, f.facnumber, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp"; +$sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp"; $sql.= ", f.datef as df, f.date_lim_reglement as datelimite"; $sql.= ", f.paye as paye, f.fk_statut, f.type"; $sql.= ", sum(pf.amount) as am"; @@ -407,6 +408,7 @@ if (GETPOST('filtre')) } } if ($search_ref) $sql .= " AND f.facnumber LIKE '%".$db->escape($search_ref)."%'"; +if ($search_refcustomer) $sql .= " AND f.ref_client LIKE '%".$db->escape($search_refcustomer)."%'"; if ($search_societe) $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'"; if ($search_montant_ht) $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'"; if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'"; @@ -435,6 +437,7 @@ if ($resql) $param.=(! empty($socid)?"&socid=".$socid:""); $param.=(! empty($option)?"&option=".$option:""); if ($search_ref) $param.='&search_ref='.urlencode($search_ref); + if ($search_refcustomer) $param.='&search_ref='.urlencode($search_refcustomer); if ($search_societe) $param.='&search_societe='.urlencode($search_societe); if ($search_montant_ht) $param.='&search_montant_ht='.urlencode($search_montant_ht); if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc); @@ -504,7 +507,7 @@ if ($resql) print $formmail->get_form(); print '
'."\n"; } - + print ''; print ''; if ($late) print ''; @@ -518,11 +521,12 @@ if ($resql) //print $resultmasssend; print '
'; } - + $i = 0; print '
'; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder); @@ -547,6 +551,9 @@ if ($resql) // Ref print ''; + print ''; print ''; print ''; print ''; @@ -621,6 +628,11 @@ if ($resql) print "\n"; + // Customer ref + print ''; + print ''."\n"; print ''."\n"; @@ -678,7 +690,7 @@ if ($resql) } print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php index cf696efb1c1..df71792ee86 100644 --- a/htdocs/core/modules/product/mod_codeproduct_leopard.php +++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php @@ -68,6 +68,7 @@ class mod_codeproduct_leopard extends ModeleProductCode */ function info($langs) { + $langs->load("companies"); return $langs->trans("LeopardNumRefModelDesc"); } diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 4c81a0be77b..313a14ad246 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -67,6 +67,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode */ function info($langs) { + $langs->load("companies"); return $langs->trans("LeopardNumRefModelDesc"); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index bff0fa716f1..b927b0016e8 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -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.6.0-beta'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.0'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c26f7c72433..3d5e2f4f444 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1433,8 +1433,8 @@ ConfirmDeleteLine=Are you sure you want to delete this line ? ##### Tax ##### TaxSetup=Taxes, social contributions and dividends module setup OptionVatMode=VAT due -OptionVATDefault=Standard -OptionVATDebitOption=Option services on Debit +OptionVATDefault=Cash basis +OptionVATDebitOption=Accrual basis OptionVatDefaultDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on payments for services OptionVatDebitOptionDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on invoice (debit) for services SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index ca7b2c4845b..a394b42686e 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -260,13 +260,15 @@ if ($result) print dol_print_date($db->jdate($objp->datef),'day').""; } else { + print '\n"; + print $text.= ' - '.$objp->label; + print "\n"; + //print "\n"; } print "\n"; print "\n"; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 7a77f308509..0bbec7f6b30 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -3182,15 +3182,15 @@ class Product extends CommonObject // On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites if ($photo_vignette && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $photo) && ($product->imgWidth > $maxWidth || $product->imgHeight > $maxHeight)) { - $return.= ''.img_picto($langs->trans('GenerateThumb'),'refresh').'  '; + $return.= ''.img_picto($langs->trans('GenerateThumb'),'refresh').'  '; } if ($user->rights->produit->creer || $user->rights->service->creer) { // Link to resize - $return.= ''.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'   '; + $return.= ''.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'   '; // Link to delete - $return.= ''; + $return.= ''; $return.= img_delete().''; } } @@ -3210,10 +3210,10 @@ class Product extends CommonObject if ($user->rights->produit->creer || $user->rights->service->creer) { // Link to resize - $return.= ''.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'   '; + $return.= ''.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'   '; // Link to delete - $return.= ''; + $return.= ''; $return.= img_delete().''; } } diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index f47813271a8..68c12c64bef 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -469,6 +469,7 @@ form#login img {width:auto; height:auto; opacity:.7;} form#login img#img_logo { width:190px; max-width:190px; + max-height:100px; height:auto; border-radius:6px; padding:6px; diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 47e982404d2..04dc5467520 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -556,6 +556,7 @@ form#login { } #img_logo { max-width: 200px; + max-height: 100px; } div.login_block { diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index ab50dae7ae9..8c1758b8648 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -590,6 +590,7 @@ form#login { } #img_logo { max-width: 200px; + max-height: 100px; } div.login_block { diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 285fcad6880..241621d1aff 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -662,6 +662,7 @@ form#login { } #img_logo { max-width: 200px; + max-height: 100px; } div.login_block { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 63b789a4597..042803e7e7c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -868,6 +868,7 @@ table.login_table tr td table.none tr td { } #img_logo { max-width: 200px; + max-height: 100px; } div.login_block {
'; print ''; + print ''; + print '  '; + print $objp->ref_client; + print ''.dol_print_date($db->jdate($objp->df),'day').''.dol_print_date($db->jdate($objp->datelimite),'day').'
'.$langs->trans("Total").''.$langs->trans("Total").''.price($total_ht).''.price($total_tva).''.price($total_ttc).''; $product_static->type=$objp->fk_product_type; - $product_static->id=$objp->fk_product; + $product_static->id=$objp->rowid; $product_static->ref=$objp->ref; $product_static->libelle=$objp->label; $text=$product_static->getNomUrl(1); - $text.= ' - '.$objp->label; - print "".$product_static->getNomUrl(1)."".$product_static->getNomUrl(1)."".price($pv, null, null, null, null, $rounding)."".price($pa, null, null, null, null, $rounding)."