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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Maxime Kohlhaas 2013-06-24 10:00:55 +02:00
commit 5bbf914abc
184 changed files with 1460 additions and 988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -19,14 +19,15 @@ For users:
- New: Add object_hour as substitution tag for opendocument generation.
- New: Add option MEMBER_PAYONLINE_SENDEMAIL to send email when paypal or paybox payment is done.
- New: Implement same rule for return value of all command line scripts (0 when success, <>0 if error).
- New: Clone product/service composition
- New: [ task #926 ] Add extrafield feature on order lines
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
- New: Add option ADHERENT_LOGIN_NOT_REQUIRED
- New: Clone product/service composition.
- New: [ task #926 ] Add extrafield feature on order lines.
- New: [ task #927 ] Add extrafield feature on Proposal lines.
- New: [ task #928 ] Add extrafield feature on invoice lines.
- New: Add option ADHERENT_LOGIN_NOT_REQUIRED.
- New: Add a cron module.
For translators:
- Normalized sort order of all languages files with english ref file.
- Normalized sort order of all languages files with english reference files.
For developers:
- New: DolGraph can build graph with three lines.

10
dev/findutf8bomincludes.sh
View File

@ -1,10 +0,0 @@
#!/bin/sh
#
# Checks if files contains UTF-8 BOM
# in dolibarr includes tree excluding
# git repository
#
# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
grep -rlI \
--exclude-dir='.git' \
$'\xEF\xBB\xBF' htdocs/includes

12
dev/fixutf8bomfiles.sh
View File

@ -12,20 +12,26 @@
# Syntax
if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
then
echo "Usage: fixutf8bomfiles.sh [list|fix]"
echo "Usage: fixutf8bomfiles.sh (list|fix) [addincludes]"
fi
if [ "x$2" != "xaddincludes" ]
then
export moreoptions="--exclude-dir='includes'"
fi
# To detec
if [ "x$1" = "xlist" ]
then
#find . \( -iname '*.php' -print0 -o -iname '*.sh' -print0 -o -iname '*.pl' -print0 -o -iname '*.lang' -print0 -o -iname '*.txt' \) -print0 | xargs -0 awk '/^\xEF\xBB\xBF/ {print FILENAME} {nextfile}'
grep -rlIZ --include='*.php' --include='*.sh' --include='*.pl' --include='*.lang' --include='*.txt' --exclude-dir='.git' --exclude-dir='includes' --exclude-dir='custom' . . | xargs -0 awk '/^\xEF\xBB\xBF/ {print FILENAME} {nextfile}'
echo "grep -rlIZ --include='*.php' --include='*.sh' --include='*.pl' --include='*.lang' --include='*.txt' --exclude-dir='.git' --exclude-dir='.tx' $moreoptions --exclude-dir='custom' . . | xargs -0 awk '/^\xEF\xBB\xBF/ {print FILENAME} {nextfile}'"
grep -rlIZ --include='*.php' --include='*.sh' --include='*.pl' --include='*.lang' --include='*.txt' --exclude-dir='.git' --exclude-dir='.tx' $moreoptions --exclude-dir='custom' . . | xargs -0 awk '/^\xEF\xBB\xBF/ {print FILENAME} {nextfile}'
fi
# To convert
if [ "x$1" = "xfix" ]
then
for fic in `grep -rlIZ --include='*.php' --include='*.sh' --include='*.pl' --include='*.lang' --include='*.txt' --exclude-dir='.git' --exclude-dir='includes' --exclude-dir='custom' . . | xargs -0 awk '/^\xEF\xBB\xBF/ {print FILENAME} {nextfile}'`
for fic in `grep -rlIZ --include='*.php' --include='*.sh' --include='*.pl' --include='*.lang' --include='*.txt' --exclude-dir='.git' --exclude-dir='.tx' $moreoptions --exclude-dir='custom' . . | xargs -0 awk '/^\xEF\xBB\xBF/ {print FILENAME} {nextfile}'`
do
echo "Fixing $fic"
sed -i '1s/^\xEF\xBB\xBF//' $fic

2
htdocs/adherents/card_subscriptions.php
View File

@ -700,7 +700,7 @@ if ($rowid)
{
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
$cotisationstatic->ref=$objp->crowid;
$cotisationstatic->id=$objp->crowid;
print '<td>'.$cotisationstatic->getNomUrl(1).'</td>';

2
htdocs/adherents/cotisations.php
View File

@ -136,7 +136,7 @@ if ($result)
print "<form method=\"post\" action=\"cotisations.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
}
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Ref
print '<td>'.$cotisation->getNomUrl(1).'</td>';

10
htdocs/adherents/index.php
View File

@ -135,15 +135,15 @@ print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("SearchAMember").'</td>';
print "</tr>\n";
$var=false;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>';
print $langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="16">';
print '</td><td rowspan="3"><input class="button" type="submit" value="'.$langs->trans("Search").'"></td></tr>';
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>';
print $langs->trans("Name").':</td><td><input type="text" name="search_lastname" class="flat" size="16">';
print '</td></tr>';
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>';
print $langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="16">';
print '</td></tr>';
@ -338,7 +338,7 @@ print "</tr>\n";
foreach ($AdherentType as $key => $adhtype)
{
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</td>';
print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</td>';
@ -402,7 +402,7 @@ krsort($Total);
foreach ($Total as $key=>$value)
{
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td><a href=\"cotisations.php?date_select=$key\">$key</a></td>";
print "<td align=\"right\">".$Number[$key]."</td>";
print "<td align=\"right\">".price($value)."</td>";

2
htdocs/admin/osc-languages.php
View File

@ -72,7 +72,7 @@ if ($resql)
while ($i < $num) {
$objp = $db->fetch_object($resql);
$var=!$var;
print "<TR $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<TD>$objp->languages_id</TD>\n";
print "<TD>$objp->name</TD>\n";
print "<TD>$objp->code</TD>\n";

4
htdocs/admin/system/database-tables.php
View File

@ -103,7 +103,7 @@ else
{
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
print '<td>'.$obj->Engine.'</td>';
@ -156,7 +156,7 @@ else
{
$row = $db->fetch_row($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.$row[0].'</td>';
print '<td align="right">'.$row[1].'</td>';
print '<td align="right">'.$row[2].'</td>';

2
htdocs/admin/system/dbtable.php
View File

@ -112,7 +112,7 @@ else
{
$row = $db->fetch_row($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td>$row[0]</td>";
print "<td>$row[1]</td>";

2
htdocs/admin/system/modules.php
View File

@ -106,7 +106,7 @@ foreach($sortorder as $numero=>$name)
$idperms="";
$var=!$var;
// Module
print "<tr $bc[$var]><td width=\"300\" nowrap=\"nowrap\">";
print "<tr ".$bc[$var]."><td width=\"300\" nowrap=\"nowrap\">";
$alt=$name.' - '.$modules_files[$numero];
if (! empty($picto[$numero]))
{

2
htdocs/admin/tools/listsessions.php
View File

@ -145,7 +145,7 @@ if ($savehandler == 'files')
{
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Login
print '<td>'.$sessionentry['login'].'</td>';

2
htdocs/bookmarks/liste.php
View File

@ -103,7 +103,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Id
print '<td align="left">';

2
htdocs/boutique/client/fiche.php
View File

@ -80,7 +80,7 @@ if ($id > 0)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/boutique/commande/fiche.php?id='.$objp->orders_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Fiche">&nbsp;';

2
htdocs/boutique/client/index.php
View File

@ -70,7 +70,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></td>\n";
print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></td>\n";
print "<td>$objp->customers_email_address</td>\n";

4
htdocs/boutique/commande/ca.php
View File

@ -66,7 +66,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>Somme des commandes</td>';
print '<td align="right">'.price($objp->value).'</td>';
@ -94,7 +94,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>Somme des frais de port</td>';
print '<td align="right">'.price($objp->value).'</td></tr>';
$i++;

2
htdocs/boutique/commande/fiche.php
View File

@ -86,7 +86,7 @@ if ($id > 0)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td align="left" width="40%">';
print '<a href="fiche.php?id='.$objp->products_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" width="16" height="16" alt="Fiche livre"></a>';

2
htdocs/boutique/commande/index.php
View File

@ -69,7 +69,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="fiche.php?id='.$objp->orders_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Fiche">&nbsp;';
print $objp->orders_id ."</a></td><td>";

2
htdocs/boutique/critiques/bestproduct.php
View File

@ -74,7 +74,7 @@ if ($resql)
while ($i < $num) {
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<TR $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<TD><a href="'.DOL_URL_ROOT.'/boutique/livre/fiche.php?oscid='.$objp->products_id.'">'.$objp->products_model.'</a></TD>';
print '<TD align="center">'.$objp->rat."</TD>\n";
print '<TD align="center">'.$objp->products_quantity."</TD>\n";

2
htdocs/boutique/critiques/index.php
View File

@ -70,7 +70,7 @@ if ($resql) {
while ($i < $num) {
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<TR $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<TD>".substr($objp->products_name, 0, 30)."</TD>\n";
print '<TD><a href="fiche.php?id='.$objp->reviews_id.'">'.substr($objp->reviews_text, 0, 40)." ...</a></td>\n";
print "<td align=\"center\">$objp->reviews_rating</TD>\n";

2
htdocs/boutique/index.php
View File

@ -70,7 +70,7 @@ if ($result)
{
$objp = $dbosc->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td align="left">'.$objp->mois.'</td>';
print '<td align="right">'.price($objp->value).'</td>';

2
htdocs/boutique/notification/index.php
View File

@ -70,7 +70,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->customers_firstname $objp->customers_lastname</a></TD>\n";
print '<td><a href="'.DOL_URL_ROOT.'/boutique/livre/fiche.php?oscid='.$objp->products_id.'">'.$objp->products_name."</a></td>";
print "</tr>\n";

2
htdocs/boutique/notification/produits.php
View File

@ -71,7 +71,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<TR $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/boutique/livre/fiche.php?oscid='.$objp->products_id.'">'.$objp->products_name."</a></td>";
print '<td align="center">'.$objp->nb.'</td>';

2
htdocs/boutique/produits/index.php
View File

@ -67,7 +67,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></td>\n";
print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></td>\n";
print "<td>$objp->customers_email_address</td>\n";

2
htdocs/boutique/produits/osc-liste.php
View File

@ -81,7 +81,7 @@ if ($resql)
{
$objp = $dbosc->fetch_object($resql);
$var=!$var;
print "<TR $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<TD>$objp->products_id</TD>\n";
print "<TD>$objp->products_model</TD>\n";
print "<TD>$objp->products_name</TD>\n";

2
htdocs/boutique/promotion/index.php
View File

@ -82,7 +82,7 @@ if ($resql)
$objp = $dbosc->fetch_object($i);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.$objp->products_model."</td>";
print '<td>'.$objp->products_name."</td>";

2
htdocs/comm/action/contact.php
View File

@ -264,7 +264,7 @@ if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="id" value="'.$id.'">';
// Ligne ajout pour contact interne
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
print img_object('','user').' '.$langs->trans("Users");

2
htdocs/comm/action/listactions.php
View File

@ -260,7 +260,7 @@ if ($resql)
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Action (type)
print '<td>';

2
htdocs/comm/bookmark.php
View File

@ -122,7 +122,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
//print "<td>" . ($i + 1 + ($limit * $page)) . "</td>";
print "<td align=\"center\"><b>".$obj->bid."</b></td>";
print "<td><a href='".DOL_URL_ROOT."/user/fiche.php?id=".$obj->fk_user."'>".img_object($langs->trans("ShowUser"),"user").' '.$obj->lastname." ".$obj->firstname."</a></td>\n";

2
htdocs/comm/contact.php
View File

@ -156,7 +156,7 @@ if ($resql)
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
print "<td>$obj->firstname</TD>";

4
htdocs/comm/fiche.php
View File

@ -626,7 +626,7 @@ if ($id > 0)
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
$contrat->id=$objp->id;
$contrat->ref=$objp->ref?$objp->ref:$objp->id;
@ -748,7 +748,7 @@ if ($id > 0)
{
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
$facturestatic->id=$objp->facid;
$facturestatic->ref=$objp->facnumber;

2
htdocs/comm/list.php
View File

@ -233,7 +233,7 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>';
$thirdpartystatic->id=$obj->rowid;
$thirdpartystatic->name=$obj->name;

2
htdocs/comm/mailing/cibles.php
View File

@ -450,7 +450,7 @@ if ($object->fetch($id) >= 0)
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.$obj->email.'</td>';
print '<td>'.$obj->lastname.'</td>';
print '<td>'.$obj->firstname.'</td>';

2
htdocs/comm/mailing/index.php
View File

@ -175,7 +175,7 @@ if ($result)
$obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap"><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
print '<td>'.dol_trunc($obj->titre,38).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>';

2
htdocs/comm/mailing/liste.php
View File

@ -136,7 +136,7 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/fiche.php?id='.$obj->rowid.'">';
print img_object($langs->trans("ShowEMail"),"email").' '.stripslashes($obj->rowid).'</a></td>';
print '<td>'.$obj->titre.'</td>';

2
htdocs/comm/propal/apercu.php
View File

@ -140,7 +140,7 @@ if ($id > 0 || ! empty($ref))
print_titre($langs->trans("Documents"));
print '<table class="border" width="100%">';
print "<tr $bc[$var]><td>".$langs->trans("Propal")." PDF</td>";
print "<tr ".$bc[$var]."><td>".$langs->trans("Propal")." PDF</td>";
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=propal&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';

8
htdocs/comm/propal/index.php
View File

@ -180,7 +180,7 @@ if (! empty($conf->propal->enabled))
{
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
$propalstatic->id=$obj->rowid;
$propalstatic->ref=$obj->ref;
@ -241,7 +241,7 @@ if ($resql)
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td width="20%" class="nowrap">';
$propalstatic->id=$obj->rowid;
@ -402,7 +402,7 @@ if (! empty($conf->propal->enabled))
{
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
$propalstatic->id=$obj->rowid;
@ -474,7 +474,7 @@ if (! empty($conf->propal->enabled))
{
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td width="20%" class="nowrap">';
$propalstatic->id=$obj->rowid;

20
htdocs/comm/propal/list.php
View File

@ -211,7 +211,6 @@ if ($result)
{
$objectstatic=new Propal($db);
$userstatic=new User($db);
$num = $db->num_rows($result);
if ($socid)
@ -394,6 +393,25 @@ if ($result)
$i++;
}
if ($total>0)
{
if($num<$limit){
$var=!$var;
print '<tr class="liste_total"><td align="left">'.$langs->trans("Total HT").'</td>';
print '<td colspan="5" align="right"">'.price($total).'<td colspan="3"</td>';
print '</tr>';
}
else
{
$var=!$var;
print '<tr class="liste_total"><td align="left">'.$langs->trans("Total HT for this page").'</td>';
print '<td colspan="5" align="right"">'.price($total).'<td colspan="3"</td>';
print '</tr>';
}
}
print '</table>';
print '</form>';

6
htdocs/comm/remx.php
View File

@ -338,7 +338,7 @@ if ($socid > 0)
{
$obj = $db->fetch_object($resql);
$var = !$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>';
if ($obj->description == '(CREDIT_NOTE)')
{
@ -384,7 +384,7 @@ if ($socid > 0)
if ($_GET["action"]=='split' && $_GET['remid'] == $obj->rowid)
{
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td colspan="8">';
$amount1=price2num($obj->amount_ttc/2,'MT');
$amount2=($obj->amount_ttc-$amount1);
@ -495,7 +495,7 @@ if ($socid > 0)
{
$obj = array_shift($tab_sqlobj);
$var = !$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>';
if ($obj->description == '(CREDIT_NOTE)')
{

4
htdocs/commande/apercu.php
View File

@ -126,7 +126,7 @@ if ($id > 0 || ! empty($ref))
print_titre($langs->trans("Documents"));
print '<table class="border" width="100%">';
print "<tr $bc[$var]><td>".$langs->trans("Order")." PDF</td>";
print "<tr ".$bc[$var]."><td>".$langs->trans("Order")." PDF</td>";
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=commande&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
print '<td align="right">'.dol_print_size(dol_filesize($file)).'</td>';
@ -137,7 +137,7 @@ if ($id > 0 || ! empty($ref))
// TODO obsolete ?
if (file_exists($filedetail))
{
print "<tr $bc[$var]><td>Commande detaillee</td>";
print "<tr ".$bc[$var]."><td>Commande detaillee</td>";
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=commande&file='.urlencode($relativepathdetail).'">'.$object->ref.'-detail.pdf</a></td>';
print '<td align="right">'.dol_print_size(dol_filesize($filedetail)).'</td>';

2
htdocs/commande/customer.php
View File

@ -154,7 +154,7 @@ if ($resql)
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>';
$result='';

8
htdocs/commande/index.php
View File

@ -194,7 +194,7 @@ if (! empty($conf->commande->enabled))
{
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>';
@ -246,7 +246,7 @@ if ($resql)
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td width="20%" class="nowrap">';
$commandestatic->id=$obj->rowid;
@ -315,7 +315,7 @@ if (! empty($conf->commande->enabled))
{
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap" width="20%">';
$commandestatic->id=$obj->rowid;
@ -386,7 +386,7 @@ if (! empty($conf->commande->enabled))
{
$var=!$var;
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td width="20%" class="nowrap">';
$commandestatic->id=$obj->rowid;

88
htdocs/compta/bank/account.php
View File

@ -55,13 +55,17 @@ $result=restrictedArea($user,'banque',$fieldvalue,'bank_account','','',$fieldtyp
$paiementtype=GETPOST('paiementtype','alpha',3);
$req_nb=GETPOST("req_nb",'',3);
$thirdparty=GETPOST("thirdparty",'',3);
$req_desc=GETPOST("req_desc",'',3);
$req_debit=GETPOST("req_debit",'',3);
$req_credit=GETPOST("req_credit",'',3);
$vline=GETPOST("vline");
$page=GETPOST('page','int');
$negpage=GETPOST('negpage','int');
if ($negpage)
{
$page=$_GET["nbpage"] - $negpage;
if ($page > $_GET["nbpage"]) $page = $_GET["nbpage"];
$page=GETPOST("nbpage") - $negpage;
if ($page > GETPOST("nbpage")) $page = GETPOST("nbpage");
}
$mesg='';
@ -186,22 +190,22 @@ if ($id > 0 || ! empty($ref))
$param.='&amp;req_nb='.urlencode($req_nb);
$mode_search = 1;
}
if (GETPOST("req_desc"))
if ($req_desc)
{
$sql_rech.= " AND b.label LIKE '%".$db->escape(GETPOST("req_desc"))."%'";
$param.='&amp;req_desc='.urlencode(GETPOST("req_desc"));
$sql_rech.= " AND b.label LIKE '%".$db->escape($req_desc)."%'";
$param.='&amp;req_desc='.urlencode($req_desc);
$mode_search = 1;
}
if (GETPOST("req_debit"))
if ($req_debit != '')
{
$sql_rech.=" AND b.amount = -".price2num(GETPOST("req_debit"));
$param.='&amp;req_debit='.urlencode(GETPOST("req_debit"));
$sql_rech.=" AND b.amount = -".price2num($req_debit);
$param.='&amp;req_debit='.urlencode($req_debit);
$mode_search = 1;
}
if (GETPOST("req_credit"))
if ($req_credit != '')
{
$sql_rech.=" AND b.amount = ".price2num(GETPOST("req_credit"));
$param.='&amp;req_credit='.urlencode(GETPOST("req_credit"));
$sql_rech.=" AND b.amount = ".price2num($req_credit);
$param.='&amp;req_credit='.urlencode($req_credit);
$mode_search = 1;
}
if ($thirdparty)
@ -265,6 +269,7 @@ if ($id > 0 || ! empty($ref))
$head=bank_prepare_head($object);
dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account');
print '<table class="border" width="100%">';
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
@ -288,28 +293,32 @@ if ($id > 0 || ! empty($ref))
/**
* Search form
*/
$param.='&amp;account='.$object->id;
$param.='&amp;account='.$object->id.'&amp;vline='.$vline;
// Define transaction list navigation string
$navig = '<form action="'.$_SERVER["PHP_SELF"].'" name="newpage" method="GET">';
//print 'nbpage='.$totalPages.' viewline='.$viewline.' limitsql='.$limitsql;
print '<form action="'.$_SERVER["PHP_SELF"].'" name="newpage" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="vline" value="'.$vline.'">';
print '<input type="hidden" name="paiementtype" value="'.$paiementtype.'">';
print '<input type="hidden" name="req_nb" value="'.$req_nb.'">';
print '<input type="hidden" name="req_desc" value="'.$req_desc.'">';
print '<input type="hidden" name="req_debit" value="'.$req_debit.'">';
print '<input type="hidden" name="req_credit" value="'.$req_credit.'">';
print '<input type="hidden" name="thirdparty" value="'.$thirdparty.'">';
print '<input type="hidden" name="nbpage" value="'.$totalPages.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
$navig ='<div data-role="fieldcontain">';
if ($limitsql > $viewline) $navig.='<a href="account.php?'.$param.'&amp;page='.($page+1).'">'.img_previous().'</a>';
$navig.= $langs->trans("Page")." "; // ' Page ';
$navig.='<input type="text" name="negpage" size="1" class="flat" value="'.($totalPages-$page).'">';
$navig.='<input type="hidden" name="paiementtype" value="'.$paiementtype.'">';
$navig.='<input type="hidden" name="req_nb" value="'.$req_nb.'">';
$navig.='<input type="hidden" name="req_desc" value="'.GETPOST("req_desc").'">';
$navig.='<input type="hidden" name="req_debit" value="'.GETPOST("req_debit").'">';
$navig.='<input type="hidden" name="req_credit" value="'.GETPOST("req_credit").'">';
$navig.='<input type="hidden" name="thirdparty" value="'.$thirdparty.'">';
$navig.='<input type="hidden" name="nbpage" value="'.$totalPages.'">';
$navig.='<input type="hidden" name="id" value="'.$object->id.'">';
$navig.= '<label for="negpage">'.$langs->trans("Page")."</label> "; // ' Page ';
$navig.='<input type="text" name="negpage" id="negpage" size="1" class="flat" value="'.($totalPages-$page).'">';
$navig.='/'.$totalPages.' ';
if ($total_lines > $limitsql )
{
$navig.= '<a href="'.$_SERVER["PHP_SELF"].'?'.$param.'&amp;page='.($page-1).'">'.img_next().'</a>';
}
$navig.='</form>';
$navig.='</fieldset></div>';
//var_dump($navig);
// Confirmation delete
@ -325,18 +334,12 @@ if ($id > 0 || ! empty($ref))
// Show title
if ($action != 'addline' && $action != 'delete')
{
print '<tr><td colspan="9" align="right">'.$navig.'</td></tr>';
print '<tr><td colspan="10" align="right">'.$navig.'</td></tr>';
}
// Form to add a transaction with no invoice
if ($user->rights->banque->modifier && $action == 'addline')
{
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="vline" value="'.$vline.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<tr>';
print '<td align="left" colspan="10"><b>'.$langs->trans("AddBankRecordLong").'</b></td>';
print '</tr>';
@ -375,7 +378,7 @@ if ($id > 0 || ! empty($ref))
print '</td></tr>';
print "</form>";
print '<tr class="noborder"><td colspan="8">&nbsp;</td></tr>'."\n";
print '<tr class="noborder"><td colspan="10">&nbsp;</td></tr>'."\n";
}
/*
@ -412,14 +415,14 @@ if ($id > 0 || ! empty($ref))
print $form->select_types_paiements($paiementtype,'paiementtype',$filtertype,2,1,1,8);
print '</td>';
print '<td><input type="text" class="flat" name="req_nb" value="'.$req_nb.'" size="2"></td>';
print '<td><input type="text" class="flat" name="req_desc" value="'.GETPOST("req_desc").'" size="24"></td>';
print '<td><input type="text" class="flat" name="req_desc" value="'.$req_desc.'" size="24"></td>';
print '<td><input type="text" class="flat" name="thirdparty" value="'.$thirdparty.'" size="14"></td>';
print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.GETPOST("req_debit").'" size="4"></td>';
print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.GETPOST("req_credit").'" size="4"></td>';
print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.$req_debit.'" size="4"></td>';
print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.$req_credit.'" size="4"></td>';
print '<td align="center">&nbsp;</td>';
print '<td align="center" width="40"><input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
print "</tr>\n";
print "</form>\n";
/*
* Another solution
@ -674,7 +677,7 @@ if ($id > 0 || ! empty($ref))
}
// Balance
if ($action != 'search')
if (! $mode_search)
{
if ($total >= 0)
{
@ -759,7 +762,10 @@ if ($id > 0 || ! empty($ref))
print "</table>";
print "\n</div>\n";
print "</form>\n";
dol_fiche_end();
/*
* Boutons actions
@ -773,7 +779,7 @@ if ($id > 0 || ! empty($ref))
{
if ($user->rights->banque->consolidate)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.'">'.$langs->trans("Conciliate").'</a>';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
}
else
{
@ -785,7 +791,7 @@ if ($id > 0 || ! empty($ref))
{
if ($user->rights->banque->modifier)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.'">'.$langs->trans("AddBankRecord").'</a>';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("AddBankRecord").'</a>';
}
else
{

8
htdocs/compta/bank/bilan.php
View File

@ -69,22 +69,22 @@ print "</tr>\n";
$var=!$var;
$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
$paiem = valeur($sql);
print "<tr $bc[$var]><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
print "<tr ".$bc[$var]."><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
$var=!$var;
$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
$credits = valeur($sql);
print "<tr $bc[$var]><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
print "<tr ".$bc[$var]."><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
$var=!$var;
$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
$debits = valeur($sql);
print "<tr $bc[$var]><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
print "<tr ".$bc[$var]."><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
$var=!$var;
$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
$solde = valeur($sql);
print "<tr $bc[$var]><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
print "<tr ".$bc[$var]."><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
print "</table>";

2
htdocs/compta/bank/releve.php
View File

@ -295,7 +295,7 @@ else
$total = $total + $objp->amount;
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Date operation
print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->do),"day").'</td>';

2
htdocs/compta/bank/search.php
View File

@ -206,7 +206,7 @@ if ($resql)
if ($printline) {
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Ref
print '<td align="left" class="nowrap">';

4
htdocs/compta/charges/index.php
View File

@ -132,7 +132,7 @@ if ($resql)
{
$obj = $db->fetch_object($resql);
$var = !$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Date
$date=$obj->periode;
if (empty($date)) $date=$obj->date_ech;
@ -220,7 +220,7 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
$total = $total + $obj->amount;
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').' ? </td>'."\n";
print "<td>".$obj->label."</td>\n";

2
htdocs/compta/clients.php
View File

@ -185,7 +185,7 @@ if ($resql)
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>';
$thirdpartystatic->id=$obj->rowid;
$thirdpartystatic->nom=$obj->nom;

6
htdocs/compta/dons/stats.php
View File

@ -63,12 +63,12 @@ if ($result)
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td align="right">'.$langs->trans("Value").'</td></tr>';
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("DonationsNumber").'</td><td align="right">'.$num.'</td></tr>';
$var=!$var;
print "<tr $bc[$var]>".'<td>'.$langs->trans("AmountTotal").'</td><td align="right">'.price($total).'</td>';
print "<tr ".$bc[$var].">".'<td>'.$langs->trans("AmountTotal").'</td><td align="right">'.price($total).'</td>';
$var=!$var;
print "<tr $bc[$var]>".'<td>'.$langs->trans("Average").'</td><td align="right">'.price($total / ($num?$num:1)).'</td>';
print "<tr ".$bc[$var].">".'<td>'.$langs->trans("Average").'</td><td align="right">'.price($total / ($num?$num:1)).'</td>';
print "</tr>";
print "</table>";

4
htdocs/compta/facture/apercu.php
View File

@ -316,7 +316,7 @@ if ($id > 0 || ! empty($ref))
print_titre($langs->trans("Documents"));
print '<table class="border" width="100%">';
print "<tr $bc[$var]><td>".$langs->trans("Bill")." PDF</td>";
print "<tr ".$bc[$var]."><td>".$langs->trans("Bill")." PDF</td>";
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
print '<td align="right">'.dol_print_size(dol_filesize($file)). '</td>';
@ -326,7 +326,7 @@ if ($id > 0 || ! empty($ref))
// Si fichier detail PDF existe
if (file_exists($filedetail)) // facture detaillee supplementaire
{
print "<tr $bc[$var]><td>Facture detaillee</td>";
print "<tr ".$bc[$var]."><td>Facture detaillee</td>";
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture&file='.urlencode($relativepathdetail).'">'.$object->ref.'-detail.pdf</a></td>';
print '<td align="right">'.dol_print_size(dol_filesize($filedetail)).'</td>';

4
htdocs/compta/facture/fiche-rec.php
View File

@ -437,7 +437,7 @@ else
if (! empty($objp->date_end)) $type=1;
// Show line
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
if ($object->lines[$i]->fk_product > 0)
{
print '<td>';
@ -548,7 +548,7 @@ else
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.$_SERVER['PHP_SELF'].'?id='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->titre;
print "</a></td>\n";

2
htdocs/compta/facture/prelevement.php
View File

@ -546,7 +546,7 @@ if ($object->id > 0)
$obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";

6
htdocs/compta/index.php
View File

@ -679,7 +679,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
while ($i < $num)
{
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
$chargestatic->id=$obj->rowid;
$chargestatic->ref=$obj->libelle;
$chargestatic->lib=$obj->libelle;
@ -762,7 +762,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
{
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
$commandestatic->id=$obj->rowid;
@ -1026,7 +1026,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]><td>".dol_print_date($obj->da,"day")."</td>";
print "<tr ".$bc[$var]."><td>".dol_print_date($obj->da,"day")."</td>";
print "<td><a href=\"action/fiche.php\">$obj->libelle $obj->label</a></td></tr>";
$i++;
}

2
htdocs/compta/localtax/clients.php
View File

@ -244,7 +244,7 @@ if (is_array($coll_list))
$intra = '';
}
}
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td nowrap>".$i."</td>";
$company_static->id=$coll->socid;
$company_static->nom=$coll->nom;

2
htdocs/compta/localtax/index.php
View File

@ -148,7 +148,7 @@ for ($m = 1 ; $m < 13 ; $m++ )
}
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td nowrap>'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</td>';
$x_coll = 0;

2
htdocs/compta/localtax/reglement.php
View File

@ -66,7 +66,7 @@ if ($result)
{
$obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
$localtax_static->id=$obj->rowid;
$localtax_static->ref=$obj->rowid;

2
htdocs/compta/paiement/avalider.php
View File

@ -95,7 +95,7 @@ if ($resql)
{
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.'</a></td>';
print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";

2
htdocs/compta/paiement/cheque/fiche.php
View File

@ -553,7 +553,7 @@ else
$accounts[$objp->bid]=0;
$accounts[$objp->bid] += 1;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td align="center">'.$i.'</td>';
print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>'; // Date operation
print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';

2
htdocs/compta/paiement/cheque/index.php
View File

@ -126,7 +126,7 @@ if ($resql)
$accountstatic->label=$objp->label;
$var=!$var;
print "<tr $bc[$var]>\n";
print "<tr ".$bc[$var].">\n";
print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
print '<td>'.dol_print_date($db->jdate($objp->db),'day').'</td>';

2
htdocs/compta/paiement/cheque/liste.php
View File

@ -111,7 +111,7 @@ if ($resql)
{
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Num ref cheque
print '<td width="80">';

2
htdocs/compta/paiement/liste.php
View File

@ -180,7 +180,7 @@ if ($resql)
{
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td width="40">';
$paymentstatic->id=$objp->rowid;

2
htdocs/compta/paiement_charge.php
View File

@ -255,7 +255,7 @@ if ($_GET["action"] == 'create')
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
//print '<td>'.$charge->getNomUrl(1)."</td>\n";

2
htdocs/compta/prelevement/bons.php
View File

@ -99,7 +99,7 @@ if ($result)
$obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print $bon->LibStatut($obj->statut,2);
print "&nbsp;";

2
htdocs/compta/prelevement/create.php
View File

@ -254,7 +254,7 @@ if ($result)
$obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
$bprev->id=$obj->rowid;
$bprev->ref=$obj->ref;
print $bprev->getNomUrl(1);

4
htdocs/compta/prelevement/factures.php
View File

@ -157,7 +157,7 @@ if ($result)
{
$obj = $db->fetch_object($result);
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
print img_object($langs->trans("ShowBill"),"bill");
@ -194,7 +194,7 @@ if ($result)
if($socid)
{
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print '<td>'.$langs->trans("Total").'</td>';

2
htdocs/compta/prelevement/fiche-stat.php
View File

@ -132,7 +132,7 @@ if ($prev_id)
{
$row = $db->fetch_row($resql);
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print $ligne->LibStatut($row[1],1);

2
htdocs/compta/prelevement/ligne.php
View File

@ -299,7 +299,7 @@ if ($id)
{
$obj = $db->fetch_object($result);
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
print img_object($langs->trans("ShowBill"),"bill");

4
htdocs/compta/prelevement/lignes.php
View File

@ -166,7 +166,7 @@ if ($result)
{
$obj = $db->fetch_object($result);
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print $ligne->LibStatut($obj->statut,2);
print "&nbsp;";
@ -199,7 +199,7 @@ if ($result)
if($socid)
{
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print '<td>Total</td>';

2
htdocs/compta/prelevement/liste.php
View File

@ -141,7 +141,7 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print $ligne->LibStatut($obj->statut_ligne,2);
print "&nbsp;";

2
htdocs/compta/prelevement/rejets.php
View File

@ -101,7 +101,7 @@ if ($result)
{
$obj = $db->fetch_object($result);
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print $ligne->LibStatut($obj->statut,2).'&nbsp;';
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';

4
htdocs/compta/prelevement/stats.php
View File

@ -102,7 +102,7 @@ if ($resql)
{
$row = $db->fetch_row($resql);
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print $ligne->LibStatut($row[2],1);
//print $st[$row[2]];
@ -202,7 +202,7 @@ if ($resql)
{
$row = $db->fetch_row($resql);
print "<tr $bc[$var]><td>";
print "<tr ".$bc[$var]."><td>";
print $Rejet->motifs[$row[2]];
print '</td><td align="center">'.$row[1];

2
htdocs/compta/recap-compta.php
View File

@ -177,7 +177,7 @@ if ($socid > 0)
{
$objp = $db->fetch_object($resqlp);
//$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
print '<td>';
print '&nbsp; &nbsp; &nbsp; '; // Decalage

26
htdocs/compta/resultat/clientfourn.php
View File

@ -198,7 +198,7 @@ if ($result) {
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->nom."</td>\n";
if ($modecompta == 'CREANCES-DETTES')
@ -243,7 +243,7 @@ if ($modecompta != 'CREANCES-DETTES')
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
if ($modecompta == 'CREANCES-DETTES')
@ -266,7 +266,7 @@ if ($modecompta != 'CREANCES-DETTES')
if ($total_ttc == 0)
{
$var=!$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -330,7 +330,7 @@ if ($result) {
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/index.php?socid=".$objp->socid."\">".$objp->nom."</a></td>\n";
if ($modecompta == 'CREANCES-DETTES')
@ -349,7 +349,7 @@ if ($result) {
else
{
$var=!$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -416,7 +416,7 @@ if ($result) {
$subtotal_ttc += $obj->amount;
$var = !$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td>'.$obj->nom.'</td>';
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
print '<td align="right">'.price(-$obj->amount).'</td>';
@ -426,7 +426,7 @@ if ($result) {
}
else {
$var = !$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -493,7 +493,7 @@ if ($result) {
$subtotal_ttc += $obj->amount;
$var = !$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td>'.$obj->nom.'</td>';
if ($modecompta == 'CREANCES-DETTES')
print '<td align="right">'.price(-$obj->amount).'</td>';
@ -504,7 +504,7 @@ if ($result) {
}
else {
$var = !$var;
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -581,7 +581,7 @@ if ($modecompta == 'CREANCES-DETTES')
} else {
dol_print_error($db);
}
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("VATToPay")."</td>\n";
print "<td align=\"right\">&nbsp;</td>\n";
print "<td align=\"right\">".price($amount)."</td>\n";
@ -624,7 +624,7 @@ if ($modecompta == 'CREANCES-DETTES')
} else {
dol_print_error($db);
}
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("VATToCollect")."</td>\n";
print "<td align=\"right\">&nbsp;</td>\n";
print "<td align=\"right\">".price($amount)."</td>\n";
@ -666,7 +666,7 @@ else
} else {
dol_print_error($db);
}
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("VATPaid")."</td>\n";
if ($modecompta == 'CREANCES-DETTES')
print "<td align=\"right\">".price($amount)."</td>\n";
@ -709,7 +709,7 @@ else
{
dol_print_error($db);
}
print "<tr $bc[$var]><td>&nbsp;</td>";
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("VATCollected")."</td>\n";
if ($modecompta == 'CREANCES-DETTES')
print "<td align=\"right\">".price($amount)."</td>\n";

2
htdocs/compta/sociales/index.php
View File

@ -171,7 +171,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var = !$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Ref
print '<td width="60">';

8
htdocs/compta/stats/index.php
View File

@ -284,7 +284,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
for ($mois = 1 ; $mois < 13 ; $mois++)
{
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td>".dol_print_date(dol_mktime(12,0,0,$mois,1,2000),"%B")."</td>";
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@ -439,7 +439,7 @@ print "</table>";
$i++;
}
$var=!$var;
print "<tr $bc[$var]><td align=\"right\" colspan=\"5\"><i>Facture a encaisser : </i></td><td align=\"right\"><i>".price($total_ttc_Rac)."</i></td><td colspan=\"5\"><-- bug ici car n'exclut pas le deja r<>gl<67> des factures partiellement r<>gl<67>es</td></tr>";
print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Facture a encaisser : </i></td><td align=\"right\"><i>".price($total_ttc_Rac)."</i></td><td colspan=\"5\"><-- bug ici car n'exclut pas le deja r<>gl<67> des factures partiellement r<>gl<67>es</td></tr>";
}
$db->free($resql);
}
@ -489,7 +489,7 @@ print "</table>";
$i++;
}
$var=!$var;
print "<tr $bc[$var]><td align=\"right\" colspan=\"5\"><i>Signe et non facture:</i></td><td align=\"right\"><i>".price($total_pr)."</i></td><td colspan=\"5\"><-- bug ici, ca devrait exclure le deja facture</td></tr>";
print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Signe et non facture:</i></td><td align=\"right\"><i>".price($total_pr)."</i></td><td colspan=\"5\"><-- bug ici, ca devrait exclure le deja facture</td></tr>";
}
$db->free($resql);
}
@ -497,7 +497,7 @@ print "</table>";
{
dol_print_error($db);
}
print "<tr $bc[$var]><td align=\"right\" colspan=\"5\"><i>Total CA previsionnel : </i></td><td align=\"right\"><i>".price($total_CA)."</i></td><td colspan=\"3\"><-- bug ici car bug sur les 2 precedents</td></tr>";
print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Total CA previsionnel : </i></td><td align=\"right\"><i>".price($total_CA)."</i></td><td colspan=\"3\"><-- bug ici car bug sur les 2 precedents</td></tr>";
}
print "</table>";

2
htdocs/compta/tva/clients.php
View File

@ -284,7 +284,7 @@ if (is_array($coll_list))
$intra = '';
}
}
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td nowrap>".$i."</td>";
$company_static->id=$coll->socid;
$company_static->nom=$coll->nom;

2
htdocs/compta/tva/index.php
View File

@ -157,7 +157,7 @@ for ($m = 1 ; $m < 13 ; $m++ )
}
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td nowrap><a href="quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</a></td>';
$x_coll = 0;

4
htdocs/compta/tva/quadri.php
View File

@ -261,7 +261,7 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
$x_paye_ht = 0;
foreach($x_both as $rate => $both){
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td>$rate%</td>";
print "<td nowrap align=\"right\">".price($both['coll']['totalht'])."</td>";
print "<td nowrap align=\"right\">".price($both['coll']['vat'])."</td>";
@ -284,7 +284,7 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
$subtotal = $subtotal + $diff;
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td colspan="7"></td>';
print "<td nowrap align=\"right\">".price($diff)."</td>\n";
print "</tr>\n";

2
htdocs/compta/tva/reglement.php
View File

@ -70,7 +70,7 @@ if ($result)
{
$obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
$tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid;

2
htdocs/compta/ventilation/fournisseur/lignes.php
View File

@ -89,7 +89,7 @@ if ($result)
{
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a></td>';

2
htdocs/compta/ventilation/fournisseur/liste.php
View File

@ -74,7 +74,7 @@ if ($result)
{
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a></td>';
print '<td>'.stripslashes(nl2br($objp->description)).'</td>';

2
htdocs/compta/ventilation/lignes.php
View File

@ -104,7 +104,7 @@ if ($result)
$var=!$var;
$codeCompta = $objp->numero.' '.$objp->intitule;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Ref facture
$facture_static->ref=$objp->facnumber;

2
htdocs/compta/ventilation/liste.php
View File

@ -88,7 +88,7 @@ if ($result)
{
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Ref facture
$facture_static->ref=$objp->facnumber;

2
htdocs/contact/class/contact.class.php
View File

@ -107,7 +107,7 @@ class Contact extends CommonObject
$this->db->begin();
// Clean parameters
$this->lastname=$this->lastname?trim($this->lastname):$this->lastname;
$this->lastname=$this->lastname?trim($this->lastname):trim($this->name);
$this->firstname=trim($this->firstname);
if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);

2
htdocs/contact/list.php
View File

@ -318,7 +318,7 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Name
print '<td valign="middle">';

4
htdocs/contrat/fiche.php
View File

@ -1244,7 +1244,7 @@ else
print '<input type="hidden" name="idprod" value="'.($objp->fk_product?$objp->fk_product:'0').'">';
print '<input type="hidden" name="fournprice" value="'.($objp->fk_fournprice?$objp->fk_fournprice:'0').'">';
// Ligne carac
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>';
if ($objp->fk_product)
{
@ -1285,7 +1285,7 @@ else
print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td>';
// Ligne dates prevues
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td colspan="'.($conf->margin->enabled?6:5).'">';
print $langs->trans("DateStartPlanned").' ';
$form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update");

1
htdocs/core/class/commonobject.class.php
View File

@ -64,6 +64,7 @@ abstract class CommonObject
{
global $conf;
//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
$lastname=$this->lastname;
$firstname=$this->firstname;
if (empty($lastname)) $lastname=($this->lastname?$this->lastname:($this->name?$this->name:$this->nom));

2
htdocs/core/class/dolprintipp.class.php
View File

@ -166,7 +166,7 @@ class dolprintIPP
foreach ($jobs as $value )
{
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td>'.$value->job_id->_value0.'</td>';
print '<td>'.$value->job_originating_user_name->_value0.'</td>';
print '<td>'.$value->printer_uri->_value0.'</td>';

10
htdocs/core/class/html.form.class.php
View File

@ -1076,11 +1076,12 @@ class Form
* @param array $exclude Array list of users id to exclude
* @param int $disabled If select list must be disabled
* @param array $include Array list of users id to include
* @param int $enableonly Array list of users id to be enabled. All other must be disabled
* @param array $enableonly Array list of users id to be enabled. All other must be disabled
* @param int $force_entity 0 or Id of environment to force
* @param int $maxlength Maximum length of string into list (0=no limit)
* @return string HTML select string
*/
function select_dolusers($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=0)
function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0)
{
global $conf,$user,$langs;
@ -1161,7 +1162,8 @@ class Form
if ($disableline) $out.= ' disabled="disabled"';
$out.= '>';
}
$out.= $userstatic->getFullName($langs);
$out.= $userstatic->getFullName($langs, 0, 0, $maxlength);
if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{
@ -2685,7 +2687,7 @@ class Form
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
$formproject=new FormProjets($this->db);
$langs->load("project");

62
htdocs/core/class/html.formprojet.class.php
View File

@ -156,5 +156,67 @@ class FormProjets
return -1;
}
}
/**
* Build Select List of element associable to a project
*
* @param TableName Table of the element to update
* @return string The HTML select list of element
*/
function select_element($table_element)
{
$projectkey="fk_projet";
switch ($table_element)
{
case "facture":
$sql = "SELECT rowid, facnumber as ref";
break;
case "facture_fourn":
$sql = "SELECT rowid, ref";
break;
case "facture_rec":
$sql = "SELECT rowid, titre as ref";
break;
case "actioncomm":
$sql = "SELECT id as rowid, label as ref";
$projectkey="fk_project";
break;
default:
$sql = "SELECT rowid, ref";
break;
}
$sql.= " FROM ".MAIN_DB_PREFIX.$table_element;
$sql.= " WHERE ".$projectkey." is null";
if (!empty($this->societe->id)) {
$sql.= " AND fk_soc=".$this->societe->id;
}
$sql.= " ORDER BY ref DESC";
dol_syslog(get_class($this).'::select_element sql='.$sql,LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$i = 0;
if ($num > 0)
{
$sellist = '<select class="flat" name="elementselect">';
while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
$sellist .='<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
$i++;
}
$sellist .='</select>';
}
return $sellist ;
$this->db->free($resql);
}
}
}

5
htdocs/core/class/translate.class.php
View File

@ -759,6 +759,7 @@ class Translate
{
$this->load("dict");
$label=array();
foreach($this->cache_currencies as $key => $val) $label[$key]=$val['label'];
$num = $db->num_rows($resql);
$i = 0;
@ -772,9 +773,9 @@ class Translate
$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
$i++;
}
//print count($label).' '.count($this->cache_currencies);
array_multisort($label, SORT_ASC, $this->cache_currencies);
//var_dump($this->cache_currencies); $this->cache_currencies is now sorted onto label
return $num;
}
else

4
htdocs/core/db/pgsql.class.php
View File

@ -177,6 +177,10 @@ class DoliDBPgsql
}
if ($line != "")
{
// group_concat support (PgSQL >= 9.1)
$line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
$line = preg_replace('/ SEPARATOR/i', ',', $line);
if ($type == 'auto')
{
if (preg_match('/ALTER TABLE/i',$line)) $type='dml';

17
htdocs/core/lib/company.lib.php
View File

@ -92,10 +92,13 @@ function societe_prepare_head($object)
$head[$h][2] = 'note';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Referers");
$head[$h][2] = 'consumption';
$h++;
if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
{
$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Referers");
$head[$h][2] = 'consumption';
$h++;
}
// Attached files
$head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
@ -405,7 +408,9 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
if (! empty($conf->projet->enabled) && $user->rights->projet->creer)
{
//$buttoncreate='<a class="butAction" href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$object->id.'&action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").' '.img_picto($langs->trans("AddProject"),'filenew').'</a>'."\n";
$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject");
if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($langs->trans("AddProject"),'filenew');
$buttoncreate.='</a>'."\n";
}
print "\n";
@ -445,7 +450,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
if ($user->rights->projet->lire && $userAccess > 0)
{
$var = !$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Ref
print '<td><a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.'</a></td>';

51
htdocs/core/lib/cron.lib.php
View File

@ -22,6 +22,7 @@
* \ingroup cron
*/
/**
* Return array of tabs to used on pages to setup cron module.
*
@ -74,3 +75,53 @@ function cron_prepare_head($object)
return $head;
}
/**
* Show information with URLs to launch jobs
*
* @return int 0
*/
function dol_print_cron_urls()
{
global $conf, $langs, $user;
global $dolibarr_main_url_root;
// Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
// Cron launch
print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
$url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
$url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
print '<br>';
print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
$file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]';
print '<textarea rows="'.ROWS_2.'" cols="120">..'.$file."</textarea><br>\n";
print '<br>';
// Add note
$linuxlike=1;
if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
print $langs->trans("Note").': ';
if ($linuxlike)
{
print $langs->trans("CronExplainHowToRunUnix");
}
else
{
print $langs->trans("CronExplainHowToRunWin");
}
return 0;
}

2
htdocs/core/lib/sendings.lib.php
View File

@ -192,7 +192,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
{
$var=!$var;
$objp = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
// Sending id
print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a></td>';

6
htdocs/core/menus/init_menu_auguria.sql
View File

@ -201,9 +201,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-- Check deposit
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->facture->lire', '', 2, 0, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__);
-- Withdrawal
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__);

2
htdocs/core/menus/standard/auguria_menu.php
View File

@ -186,7 +186,7 @@ class MenuManager
print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{
print '<ul data-role="listview" data-inset="true">';
print '<ul class="ulmenu" data-role="listview" data-inset="true">';
print '<li data-role="list-divider">';
if ($val['enabled'] == 1)
{

2
htdocs/core/menus/standard/eldy.lib.php
View File

@ -928,7 +928,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
// Gestion cheques
if (! empty($conf->facture->enabled) && ! empty($conf->banque->enabled))
if (! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))
{
$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks');
$newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new&amp;mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);

2
htdocs/core/menus/standard/eldy_menu.php
View File

@ -140,7 +140,7 @@ class MenuManager
print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{
print '<ul data-role="listview" data-inset="true">';
print '<ul class="ulmenu" data-role="listview" data-inset="true">';
print '<li data-role="list-divider">';
if ($val['enabled'] == 1)
{

2
htdocs/core/menus/standard/empty.php
View File

@ -198,7 +198,7 @@ class MenuManager
{
foreach($this->topmenu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{
print '<ul data-role="listview" data-inset="true">';
print '<ul class="ulmenu" data-role="listview" data-inset="true">';
print '<li data-role="list-divider">';
if ($val['enabled'] == 1)
{

2
htdocs/core/modules/modCron.class.php
View File

@ -48,7 +48,7 @@ class modCron extends DolibarrModules
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i','',get_class($this));
$this->description = "Enable the Dolibarr cron service";
$this->version = 'experimental'; // 'experimental' or 'dolibarr' or version
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)

Some files were not shown because too many files have changed in this diff Show More