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

New: Some changes to support the type of line in entities.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-03-10 01:18:45 +00:00
parent 861899f272
commit 8431675159
5 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/comm/propal.php
View File

@ -1597,7 +1597,8 @@ if ($id > 0 || ! empty($ref))
print '<tr '.$bc[$var].">\n";
print '<td '.$colspan.'>';
print $html->select_type_of_lines(-1,'type',1).'<br>';
print $html->select_type_of_lines(-1,'type',1);
if ($conf->produit->enabled && $conf->service->enabled) print '<br>';
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
@ -1612,9 +1613,9 @@ if ($id > 0 || ! empty($ref))
}
print '</td>';
print '<td align="right">';
//if ($societe->tva_assuj == "0")
//print '<input type="hidden" name="np_tva_tx" value="0">0';
//else
if ($societe->tva_assuj == "0")
print '<input type="hidden" name="np_tva_tx" value="0">0';
else
$html->select_tva('np_tva_tx', $conf->defaulttx, $mysoc, $societe);
print "</td>\n";
print '<td align="right"><input type="text" size="5" name="np_price"></td>';

9
htdocs/commande/fiche.php
View File

@ -1689,7 +1689,8 @@ else
print '<tr '.$bc[$var].'>';
print '<td>';
print $html->select_type_of_lines(-1,'type',1).'<br>';
print $html->select_type_of_lines(-1,'type',1);
if ($conf->produit->enabled && $conf->service->enabled) print '<br>';
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
@ -1704,9 +1705,9 @@ else
}
print '</td>';
print '<td align="right">';
//if($soc->tva_assuj == "0")
//print '<input type="hidden" name="tva_tx" value="0">0';
//else
if($soc->tva_assuj == "0")
print '<input type="hidden" name="tva_tx" value="0">0';
else
print $html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc);
print '</td>';
print '<td align="right"><input type="text" name="pu" size="5"></td>';

10
htdocs/compta/facture.php
View File

@ -2902,6 +2902,7 @@ else
else
{
print $html->select_type_of_lines($objp->product_type,'type',1);
if ($conf->produit->enabled && $conf->service->enabled) print '<br>';
}
// Description - Editor wysiwyg
@ -2998,7 +2999,8 @@ else
print '<tr '.$bc[$var].'>';
print '<td>';
print $html->select_type_of_lines(-1,'type',1).'<br>';
print $html->select_type_of_lines(-1,'type',1);
if ($conf->produit->enabled && $conf->service->enabled) print '<br>';
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
@ -3013,9 +3015,9 @@ else
}
print '</td>';
print '<td align="right">';
//if($soc->tva_assuj == "0")
//print '<input type="hidden" name="tva_tx" value="0">0';
//else
if($soc->tva_assuj == "0")
print '<input type="hidden" name="tva_tx" value="0">0';
else
$html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc);
print '</td>';
print '<td align="right"><input type="text" name="pu" size="6"></td>';

32
htdocs/fourn/commande/fiche.php
View File

@ -693,6 +693,13 @@ if ($id > 0 || ! empty($ref))
$commandline = $commande->lignes[$i];
$var=!$var;
// Show product and description
$type=$commandline->product_type?$commandline->product_type:$commandline->fk_product_type;
// Try to enhance type detection using date_start and date_end for free lines where type
// was not saved.
if (! empty($commandline->date_start)) $type=1;
if (! empty($commandline->date_end)) $type=1;
// Ligne en mode visu
if ($_GET['action'] != 'editline' || $_GET['rowid'] != $commandline->id)
{
@ -775,7 +782,7 @@ if ($id > 0 || ! empty($ref))
print ' - '.nl2br($commandline->product);
print '<br>';
}
// editeur wysiwyg
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
@ -802,14 +809,14 @@ if ($id > 0 || ! empty($ref))
}
/*
* Ajouter une ligne
* Form to add new line
*/
if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer && $_GET["action"] <> 'editline')
{
print '<tr class="liste_titre">';
print '<td>';
print '<a name="add"></a>'; // ancre
print $langs->trans('Label').'</td>';
print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").'</td>';
print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>';
@ -817,7 +824,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="4">&nbsp;</td>';
print '</tr>';
// Ajout produit produits/services personnalises
// Add free products/services form
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'#add" method="post">';
print '<input type="hidden" name="action" value="addligne">';
print '<input type="hidden" name="id" value="'.$comid.'">';
@ -825,7 +832,11 @@ if ($id > 0 || ! empty($ref))
$var=true;
print '<tr '.$bc[$var].'>';
print '<td>';
// editeur wysiwyg
print $html->select_type_of_lines(-1,'type',1);
if ($conf->produit->enabled && $conf->service->enabled) print '<br>';
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
@ -838,10 +849,10 @@ if ($id > 0 || ! empty($ref))
}
print '</td>';
print '<td align="center">';
if($soc->tva_assuj == "0")
print '<input type="hidden" name="tva_tx" value="0">0';
else
print $html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc);
//if($soc->tva_assuj == "0")
//print '<input type="hidden" name="tva_tx" value="0">0';
//else
print $html->select_tva('tva_tx',$conf->defaulttx,$soc,$mysoc);
print '</td>';
print '<td align="right"><input type="text" name="pu" size="5"></td>';
print '<td align="right"><input type="text" name="qty" value="1" size="2"></td>';
@ -856,6 +867,7 @@ if ($id > 0 || ! empty($ref))
{
print '<tr class="liste_titre">';
print '<td colspan="3">';
print $langs->trans("AddNewLine").' - ';
if ($conf->service->enabled)
{
print $langs->trans('RecordedProductsAndServices');
@ -881,7 +893,7 @@ if ($id > 0 || ! empty($ref))
if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
// editeur wysiwyg
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");

12
htdocs/fourn/facture/fiche.php
View File

@ -842,9 +842,9 @@ else
print '</td>';
// Unit price
print '<td align="right" nowrap="nowrap"><input size="6" name="puht" type="text" value="'.price($fac->lignes[$i]->pu_ht).'"></td>';
print '<td align="right" nowrap="nowrap"><input size="4" name="puht" type="text" value="'.price($fac->lignes[$i]->pu_ht).'"></td>';
print '<td align="right" nowrap="nowrap"><input size="6" name="puttc" type="text" value=""></td>';
print '<td align="right" nowrap="nowrap"><input size="4" name="puttc" type="text" value=""></td>';
print '<td align="right"><input size="1" name="qty" type="text" value="'.$fac->lignes[$i]->qty.'"></td>';
@ -956,20 +956,20 @@ else
}
else
{
print '<textarea class="flat" cols="70" name="label" rows="'.ROWS_2.'"></textarea>';
print '<textarea class="flat" cols="60" name="label" rows="'.ROWS_2.'"></textarea>';
}
print '</td>';
print '<td align="center">';
print '<td align="right">';
//if($mysoc->tva_assuj == "0")
//print '<input type="hidden" name="tva_tx" value="0">0';
//else
print $html->select_tva('tauxtva',$conf->defaulttx,$societe,$mysoc);
print '</td>';
print '<td align="right">';
print '<input size="6" name="amount" type="text">';
print '<input size="4" name="amount" type="text">';
print '</td>';
print '<td align="right">';
print '<input size="6" name="amountttc" type="text">';
print '<input size="4" name="amountttc" type="text">';
print '</td>';
print '<td align="right">';
print '<input size="1" name="qty" type="text" value="1">';