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

Modif les noms de variables smarty pour plus de coherence

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2006-12-15 16:27:54 +00:00
parent 99fa9b66d5
commit d1e7782cc2
4 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/product/canvas/livre/livre-create.tpl
View File

@ -126,7 +126,7 @@
<tr> <tr>
<td width="15%">Durée du contrat :</td> <td width="15%">Durée du contrat :</td>
<td width="35%"> <td width="35%">
<input name="contrat_duree" type="text" size="7" maxlength="6" value="{$prod_contrat_duree}" <input name="contrat_duree" type="text" size="7" maxlength="6" value="{$livre_contrat_duree}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
</td> </td>
<td width="15%">Date d'application</td> <td width="15%">Date d'application</td>
@ -136,12 +136,12 @@
<tr> <tr>
<td>Taux conclu</td> <td>Taux conclu</td>
<td> <td>
<input name="contrat_taux" type="text" size="7" maxlength="6" value="{$prod_contrat_taux}" <input name="contrat_taux" type="text" size="7" maxlength="6" value="{$livre_contrat_taux}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">% class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">%
</td> </td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td> <td>
<input name="contrat_quant" type="text" size="7" maxlength="6" value="{$prod_contrat_quant}" <input name="contrat_quant" type="text" size="7" maxlength="6" value="{$livre_contrat_quant}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
</td> </td>
</tr> </tr>

11
htdocs/product/canvas/livre/livre-edit.tpl
View File

@ -107,7 +107,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Stock</td> <td width="15%">Stock disponible</td>
<td width="35%"><b>{$prod_stock_dispo}</b></td> <td width="35%"><b>{$prod_stock_dispo}</b></td>
<td width="15%">Seuil d'alerte stock</td> <td width="15%">Seuil d'alerte stock</td>
<td width="35%"> <td width="35%">
@ -140,25 +140,24 @@
<tr> <tr>
<td width="15%">Durée du contrat :</td> <td width="15%">Durée du contrat :</td>
<td width="35%"> <td width="35%">
<input name="contrat_duree" type="text" size="7" maxlength="6" value="{$prod_contrat_duree}" <input name="contrat_duree" type="text" size="7" maxlength="6" value="{$livre_contrat_duree}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
</td> </td>
<td width="15%">Date d'application</td> <td width="15%">Date d'application</td>
<td width="35%"> <td width="35%">
<input name="contrat_date_app" type="text" size="7" maxlength="6" value="{$prod_contrat_date_app}" {html_select_date field_order='DMY' start_year='-10' reverse_years=True all_extra='class="flat"'}
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Taux conclu</td> <td>Taux conclu</td>
<td> <td>
<input name="contrat_taux" type="text" size="7" maxlength="6" value="{$prod_contrat_taux}" <input name="contrat_taux" type="text" size="7" maxlength="6" value="{$livre_contrat_taux}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">% class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">%
</td> </td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td> <td>
<input name="contrat_quant" type="text" size="7" maxlength="6" value="{$prod_contrat_quant}" <input name="contrat_quant" type="text" size="7" maxlength="6" value="{$livre_contrat_quant}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
</td> </td>
</tr> </tr>

18
htdocs/product/canvas/livre/livre-view.tpl
View File

@ -53,7 +53,7 @@
</tr> </tr>
<tr> <tr>
<td>Prix de vente</td> <td>Prix de vente</td>
<td>{$prod_pxvente}</td> <td>{$prod_pxvente} TTC</td>
<td width="15%">Taux TVA</td> <td width="15%">Taux TVA</td>
<td width="35%">{$prod_tva_tx}</td> <td width="35%">{$prod_tva_tx}</td>
@ -65,10 +65,8 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Stock</td> <td width="15%">Stock disponible</td>
<td width="35%" {$smarty_stock_dispo_class}> <td width="35%" {$smarty_stock_dispo_class}>{$prod_stock_dispo}</td>
{$prod_stock_dispo}
</td>
<td width="15%">Seuil d'alerte</td> <td width="15%">Seuil d'alerte</td>
<td width="35%">{$prod_stock_alert}</td> <td width="35%">{$prod_stock_alert}</td>
</tr> </tr>
@ -87,7 +85,7 @@
<tr> <tr>
<td>Statut</td> <td>Statut</td>
<td colspan="3"></td> <td colspan="3">{$prod_statut}</td>
</tr> </tr>
</table> </table>
@ -96,16 +94,16 @@
<tr> <tr>
<td width="15%">Durée du contrat : </td> <td width="15%">Durée du contrat : </td>
<td width="35%">{$prod_contrat_duree}</td> <td width="35%">{$livre_contrat_duree}</td>
<td width="15%">Date d'application</td> <td width="15%">Date d'application</td>
<td width="35%"></td> <td width="35%">{$livre_contrat_date_app|date_format:"%d %B %Y"}</td>
</tr> </tr>
<tr> <tr>
<td>Taux conclu</td> <td>Taux conclu</td>
<td>{$prod_contrat_taux}</td> <td>{$livre_contrat_taux}</td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td>{$prod_contrat_quant}</td> <td>{$livre_contrat_quant}</td>
</tr> </tr>
</table> </table>

35
htdocs/product/canvas/product.livre.class.php
View File

@ -378,30 +378,31 @@ class ProductLivre extends Product
$smarty->assign('prod_isbn13', '978-'.substr($this->isbn,0,12).substr($this->ean,-1,1)); $smarty->assign('prod_isbn13', '978-'.substr($this->isbn,0,12).substr($this->ean,-1,1));
$smarty->assign('prod_tva_tx', $this->tva_tx); $smarty->assign('prod_tva_tx', $this->tva_tx);
$smarty->assign('prod_pages', $this->pages); $smarty->assign('prod_pages', $this->pages);
$smarty->assign('prod_format', $this->format); $smarty->assign('prod_format', $this->format);
$smarty->assign('prod_pxfeuil', $this->px_feuillet); $smarty->assign('prod_pxfeuil', $this->px_feuillet);
$smarty->assign('prod_pxcouv', $this->couverture->price); $smarty->assign('prod_pxcouv', $this->couverture->price);
$smarty->assign('prod_weight', $this->weight); $smarty->assign('prod_weight', $this->weight);
$smarty->assign('prod_weight_units', $this->weight_units); $smarty->assign('prod_weight_units', $this->weight_units);
$smarty->assign('prod_pxrevient', price($this->px_revient)); $smarty->assign('prod_pxrevient', price($this->px_revient));
$smarty->assign('prod_pxvente', price($this->price_ttc)); $smarty->assign('prod_pxvente', price($this->price_ttc));
$smarty->assign('prod_contrat_taux', $this->contrat->taux); $smarty->assign('livre_contrat_taux', $this->contrat->taux);
$smarty->assign('prod_contrat_duree', $this->contrat->duree); $smarty->assign('livre_contrat_duree', $this->contrat->duree);
$smarty->assign('prod_contrat_quant', $this->contrat->quantite); $smarty->assign('livre_contrat_quant', $this->contrat->quantite);
$smarty->assign('livre_contrat_date_app', $this->contrat->date_app);
$smarty->assign('prod_stock_loc', $this->stock_loc); $smarty->assign('prod_stock_loc', $this->stock_loc);
$smarty->assign('prod_stock_reel', $this->stock_reel); $smarty->assign('prod_stock_reel', $this->stock_reel);
$smarty->assign('prod_stock_dispo', ($this->stock_reel - $this->stock_in_command)); $smarty->assign('prod_stock_dispo', ($this->stock_reel - $this->stock_in_command));
$smarty->assign('prod_stock_in_command', $this->stock_in_command); $smarty->assign('prod_stock_in_command', $this->stock_in_command);
$smarty->assign('prod_stock_alert', $this->seuil_stock_alerte); $smarty->assign('prod_stock_alert', $this->seuil_stock_alerte);
if ($this->status==1) if ($this->status==1)
$smarty->assign('prod_statut', 'En vente'); $smarty->assign('prod_statut', 'En vente');