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

Modifications proposes par Franky

Browse Source
This commit is contained in:
Regis Houssin 2007-01-27 14:36:20 +00:00
parent c9986ea36c
commit f1e83d2f4f
18 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal.php
View File

@ -1101,7 +1101,7 @@ if ($_GET['propalid'] > 0)
print '<td>'; print '<td>';
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); if ($objp->fk_product_type==1) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a>'; print ' '.$objp->ref.'</a>';
print ' - '.nl2br($objp->product); print ' - '.nl2br($objp->product);
@ -1226,7 +1226,7 @@ if ($_GET['propalid'] > 0)
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); if ($objp->fk_product_type==1) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a>'; print ' '.$objp->ref.'</a>';
print ' - '.nl2br($objp->product); print ' - '.nl2br($objp->product);

23
htdocs/commande/fiche.php
View File

@ -107,14 +107,17 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer)
$commande->adresse_livraison_id = $_POST['adresse_livraison_id']; $commande->adresse_livraison_id = $_POST['adresse_livraison_id'];
$commande->contactid = $_POST['contactidp']; $commande->contactid = $_POST['contactidp'];
$commande->add_product($_POST['idprod1'],$_POST['qty1'],$_POST['remise_percent1']); $NBLINES=8;
$commande->add_product($_POST['idprod2'],$_POST['qty2'],$_POST['remise_percent2']); for ($i = 1 ; $i <= $NBLINES ; $i++)
$commande->add_product($_POST['idprod3'],$_POST['qty3'],$_POST['remise_percent3']); {
$commande->add_product($_POST['idprod4'],$_POST['qty4'],$_POST['remise_percent4']); if ($_POST['idprod'.$i])
$commande->add_product($_POST['idprod5'],$_POST['qty5'],$_POST['remise_percent5']); {
$commande->add_product($_POST['idprod6'],$_POST['qty6'],$_POST['remise_percent6']); $xid = 'idprod'.$i;
$commande->add_product($_POST['idprod7'],$_POST['qty7'],$_POST['remise_percent7']); $xqty = 'qty'.$i;
$commande->add_product($_POST['idprod8'],$_POST['qty8'],$_POST['remise_percent8']); $xremise = 'remise_percent'.$i;
$commande->add_product($_POST[$xid],$_POST[$xqty],$_POST[$xremise]);
}
}
$commande_id = $commande->create($user); $commande_id = $commande->create($user);
@ -1281,7 +1284,7 @@ else
print '<td>'; print '<td>';
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); if ($objp->fk_product_type==1) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a> - '.nl2br($objp->product); print ' '.$objp->ref.'</a> - '.nl2br($objp->product);
print ($objp->description && $objp->description!=$objp->product)?'<br>'.nl2br($objp->description):''; print ($objp->description && $objp->description!=$objp->product)?'<br>'.nl2br($objp->description):'';
@ -1380,7 +1383,7 @@ else
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); if ($objp->fk_product_type==1) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a>'; print ' '.$objp->ref.'</a>';
print ' - '.nl2br($objp->product); print ' - '.nl2br($objp->product);

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

@ -337,7 +337,7 @@ if ($_GET["id"] > 0)
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); if ($objp->fk_product_type==1) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a> - '.nl2br($objp->product); print ' '.$objp->ref.'</a> - '.nl2br($objp->product);
print ($objp->description && $objp->description!=$objp->product)?'<br>'.stripslashes(nl2br($objp->description)):''; print ($objp->description && $objp->description!=$objp->product)?'<br>'.stripslashes(nl2br($objp->description)):'';

4
htdocs/compta/facture.php
View File

@ -2124,7 +2124,7 @@ else
print '<td>'; print '<td>';
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); if ($objp->fk_product_type==1) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a>'; print ' '.$objp->ref.'</a>';
print ' - '.nl2br(stripslashes($objp->product)); print ' - '.nl2br(stripslashes($objp->product));
@ -2227,7 +2227,7 @@ else
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); if ($objp->fk_product_type==1) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a>'; print ' '.$objp->ref.'</a>';
print ' - '.nl2br($objp->product); print ' - '.nl2br($objp->product);

2
htdocs/compta/propal.php
View File

@ -342,7 +342,7 @@ if ($_GET["propalid"] > 0)
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) if ($objp->fk_product_type==1)
print img_object($langs->trans('ShowService'),'service'); print img_object($langs->trans('ShowService'),'service');
else else
print img_object($langs->trans('ShowProduct'),'product'); print img_object($langs->trans('ShowProduct'),'product');

4
htdocs/contrat/fiche.php
View File

@ -79,11 +79,11 @@ if ($_POST["mode"]=='predefined')
$date_end=''; $date_end='';
if ($_POST["date_startmonth"] && $_POST["date_startday"] && $_POST["date_startyear"]) if ($_POST["date_startmonth"] && $_POST["date_startday"] && $_POST["date_startyear"])
{ {
$date_start=mktime(12, 0 , 0, $_POST["date_startmonth"], $_POST["date_startday"], $_POST["date_startyear"]); $date_start=dolibarr_mktime(12, 0 , 0, $_POST["date_startmonth"], $_POST["date_startday"], $_POST["date_startyear"]);
} }
if ($_POST["date_endmonth"] && $_POST["date_endday"] && $_POST["date_endyear"]) if ($_POST["date_endmonth"] && $_POST["date_endday"] && $_POST["date_endyear"])
{ {
$date_end=mktime(12, 0 , 0, $_POST["date_endmonth"], $_POST["date_endday"], $_POST["date_endyear"]); $date_end=dolibarr_mktime(12, 0 , 0, $_POST["date_endmonth"], $_POST["date_endday"], $_POST["date_endyear"]);
} }
} }

2
htdocs/fourn/product/index.php
View File

@ -128,7 +128,7 @@ if ($resql)
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td><a href=\"fiche.php?id=$objp->rowid\">"; print "<td><a href=\"fiche.php?id=$objp->rowid\">";
if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product"); else print img_object($langs->trans("ShowProduct"),"product");
print "</a> <a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></td>\n"; print "</a> <a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></td>\n";
print "<td>$objp->label</td>"; print "<td>$objp->label</td>";

2
htdocs/fourn/product/liste.php
View File

@ -197,7 +197,7 @@ if ($resql)
{ {
$oldid = $objp->rowid; $oldid = $objp->rowid;
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->rowid.'">'; print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->rowid.'">';
if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product"); else print img_object($langs->trans("ShowProduct"),"product");
print "</a> "; print "</a> ";
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->rowid.'">'.$objp->ref.'</a></td>'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->rowid.'">'.$objp->ref.'</a></td>';

2
htdocs/langs/en_US/admin.lang
View File

@ -331,7 +331,7 @@ NbOfDays=Nb of days
AtEndOfMonth=At end of month AtEndOfMonth=At end of month
Offset=Offset Offset=Offset
AlwaysActive=Always active AlwaysActive=Always active
UpdateRequired=Your system need to be updated. For this click on <a href="%s">Update now</a>. UpdateRequired=Your system needs to be updated. For this click on <a href="%s">Update now</a>.
WebServer=Web server WebServer=Web server
DocumentRootServer=Web server root directory DocumentRootServer=Web server root directory
DataRootServer=Data files directory DataRootServer=Data files directory

2
htdocs/langs/en_US/bills.lang
View File

@ -69,7 +69,7 @@ VATRate=VAT Rate
Amount=Amount Amount=Amount
TotalTTCToYourCredit=Total TTC to your credit TotalTTCToYourCredit=Total TTC to your credit
BillStatus=Invoice status BillStatus=Invoice status
BillStatusDraft=Draft (need to be validated) BillStatusDraft=Draft (needs to be validated)
BillStatusPayed=Payed BillStatusPayed=Payed
BillStatusCanceled=Abandonned BillStatusCanceled=Abandonned
BillStatusValidated=Validated (needs to be payed) BillStatusValidated=Validated (needs to be payed)

2
htdocs/langs/en_US/members.lang
View File

@ -34,7 +34,7 @@ MemberTypeLabel=Member type label
MembersTypes=Members types MembersTypes=Members types
MembersAttributes=Members attributes MembersAttributes=Members attributes
SearchAMember=Search a member SearchAMember=Search a member
MemberStatusDraft=Draft (need to be validated) MemberStatusDraft=Draft (needs to be validated)
MemberStatusDraftShort=To validate MemberStatusDraftShort=To validate
MemberStatusActive=Validated MemberStatusActive=Validated
MemberStatusActiveShort=Validated MemberStatusActiveShort=Validated

2
htdocs/langs/en_US/orders.lang
View File

@ -30,7 +30,7 @@ StatusOrderRefusedShort=Refused
StatusOrderReceivedPartiallyShort=Partially received StatusOrderReceivedPartiallyShort=Partially received
StatusOrderReceivedAllShort=Everything received StatusOrderReceivedAllShort=Everything received
StatusOrderCanceled=Canceled StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (need to be validated) StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated StatusOrderValidated=Validated
StatusOrderOnProcess=On process StatusOrderOnProcess=On process
StatusOrderProcessed=Processed StatusOrderProcessed=Processed

4
htdocs/langs/en_US/propal.lang
View File

@ -30,11 +30,11 @@ ShowPropal=Show proposal
PropalsDraft=Drafts PropalsDraft=Drafts
PropalsOpened=Opened PropalsOpened=Opened
PropalsNotBilled=Closed not billed PropalsNotBilled=Closed not billed
PropalStatusDraft=Draft (need to be validated) PropalStatusDraft=Draft (needs to be validated)
PropalStatusValidated=Validated (proposal is opened) PropalStatusValidated=Validated (proposal is opened)
PropalStatusOpened=Validated (proposal is opened) PropalStatusOpened=Validated (proposal is opened)
PropalStatusClosed=Closed PropalStatusClosed=Closed
PropalStatusSigned=Signed (need to be billed) PropalStatusSigned=Signed (needs to be billed)
PropalStatusNotSigned=Not signed (closed) PropalStatusNotSigned=Not signed (closed)
PropalStatusBilled=Billed PropalStatusBilled=Billed
PropalStatusDraftShort=Draft PropalStatusDraftShort=Draft

2
htdocs/product/index.php
View File

@ -157,7 +157,7 @@ if ($result)
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td nowrap="nowrap"><a href="fiche.php?id='.$objp->rowid.'">'; print '<td nowrap="nowrap"><a href="fiche.php?id='.$objp->rowid.'">';
if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product"); else print img_object($langs->trans("ShowProduct"),"product");
print "</a> <a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></td>\n"; print "</a> <a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></td>\n";
print '<td>'.dolibarr_trunc($objp->label,40).'</td>'; print '<td>'.dolibarr_trunc($objp->label,40).'</td>';

2
htdocs/product/liste.php
View File

@ -268,7 +268,7 @@ if ($resql)
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td nowrap="nowrap">'; print '<tr '.$bc[$var].'><td nowrap="nowrap">';
print "<a href=\"fiche.php?id=$objp->rowid\">"; print "<a href=\"fiche.php?id=$objp->rowid\">";
if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product"); else print img_object($langs->trans("ShowProduct"),"product");
print '</a> '; print '</a> ';
print '<a href="fiche.php?id='.$objp->rowid.'">'.$objp->ref."</a></td>\n"; print '<a href="fiche.php?id='.$objp->rowid.'">'.$objp->ref."</a></td>\n";

2
htdocs/product/popuprop.php
View File

@ -112,7 +112,7 @@ if ($result)
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="'.DOL_URL_ROOT.'/product/stats/fiche.php?id='.$objp->rowid.'">'; print '<td><a href="'.DOL_URL_ROOT.'/product/stats/fiche.php?id='.$objp->rowid.'">';
if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product"); else print img_object($langs->trans("ShowProduct"),"product");
print " "; print " ";
print $objp->ref.'</a></td>'; print $objp->ref.'</a></td>';

2
htdocs/product/reassort.php
View File

@ -249,7 +249,7 @@ if ($resql)
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td nowrap="nowrap">'; print '<tr '.$bc[$var].'><td nowrap="nowrap">';
print "<a href=\"fiche.php?id=$objp->rowid\">"; print "<a href=\"fiche.php?id=$objp->rowid\">";
if ($objp->fk_product_type) if ($objp->fk_product_type==1)
{ {
print img_object($langs->trans("ShowService"),"service"); print img_object($langs->trans("ShowService"),"service");
} }

2
htdocs/telephonie/client/facture.php
View File

@ -406,7 +406,7 @@ if ($_GET["facid"] > 0)
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product"); else print img_object($langs->trans("ShowProduct"),"product");
print ' '.stripslashes(nl2br($objp->description)).'</a>'; print ' '.stripslashes(nl2br($objp->description)).'</a>';
if ($objp->date_start && $objp->date_end) { print " (Du ".dolibarr_print_date($objp->date_start)." au ".dolibarr_print_date($objp->date_end).")"; } if ($objp->date_start && $objp->date_end) { print " (Du ".dolibarr_print_date($objp->date_start)." au ".dolibarr_print_date($objp->date_end).")"; }