diff --git a/htdocs/product/canvas/livre/livre-create.tpl b/htdocs/product/canvas/livre/livre-create.tpl index 765f0c50926..5b906521a99 100644 --- a/htdocs/product/canvas/livre/livre-create.tpl +++ b/htdocs/product/canvas/livre/livre-create.tpl @@ -126,7 +126,7 @@ Durée du contrat : - Date d'application @@ -136,12 +136,12 @@ Taux conclu - % Quantité achetée - diff --git a/htdocs/product/canvas/livre/livre-edit.tpl b/htdocs/product/canvas/livre/livre-edit.tpl index 232ed7b084c..8744d49e146 100644 --- a/htdocs/product/canvas/livre/livre-edit.tpl +++ b/htdocs/product/canvas/livre/livre-edit.tpl @@ -107,7 +107,7 @@ - + diff --git a/htdocs/product/canvas/livre/livre-view.tpl b/htdocs/product/canvas/livre/livre-view.tpl index bc330d7e78a..3593e4b04eb 100644 --- a/htdocs/product/canvas/livre/livre-view.tpl +++ b/htdocs/product/canvas/livre/livre-view.tpl @@ -53,7 +53,7 @@ - + @@ -65,10 +65,8 @@
StockStock disponible {$prod_stock_dispo} Seuil d'alerte stock @@ -140,25 +140,24 @@
Durée du contrat : - Date d'application - + {html_select_date field_order='DMY' start_year='-10' reverse_years=True all_extra='class="flat"'}
Taux conclu - % Quantité achetée -
Prix de vente{$prod_pxvente}{$prod_pxvente} TTC Taux TVA {$prod_tva_tx}
- - + + @@ -87,7 +85,7 @@ - +
Stock - {$prod_stock_dispo} - Stock disponible{$prod_stock_dispo} Seuil d'alerte {$prod_stock_alert}
Statut{$prod_statut}
@@ -96,16 +94,16 @@ Durée du contrat : - {$prod_contrat_duree} + {$livre_contrat_duree} Date d'application - + {$livre_contrat_date_app|date_format:"%d %B %Y"} Taux conclu - {$prod_contrat_taux} + {$livre_contrat_taux} Quantité achetée - {$prod_contrat_quant} + {$livre_contrat_quant} diff --git a/htdocs/product/canvas/product.livre.class.php b/htdocs/product/canvas/product.livre.class.php index b221a0123d8..5902e9d9292 100644 --- a/htdocs/product/canvas/product.livre.class.php +++ b/htdocs/product/canvas/product.livre.class.php @@ -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_tva_tx', $this->tva_tx); + $smarty->assign('prod_tva_tx', $this->tva_tx); - $smarty->assign('prod_pages', $this->pages); - $smarty->assign('prod_format', $this->format); - $smarty->assign('prod_pxfeuil', $this->px_feuillet); + $smarty->assign('prod_pages', $this->pages); + $smarty->assign('prod_format', $this->format); + $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_units', $this->weight_units); + $smarty->assign('prod_weight', $this->weight); + $smarty->assign('prod_weight_units', $this->weight_units); - $smarty->assign('prod_pxrevient', price($this->px_revient)); - $smarty->assign('prod_pxvente', price($this->price_ttc)); + $smarty->assign('prod_pxrevient', price($this->px_revient)); + $smarty->assign('prod_pxvente', price($this->price_ttc)); - $smarty->assign('prod_contrat_taux', $this->contrat->taux); - $smarty->assign('prod_contrat_duree', $this->contrat->duree); - $smarty->assign('prod_contrat_quant', $this->contrat->quantite); + $smarty->assign('livre_contrat_taux', $this->contrat->taux); + $smarty->assign('livre_contrat_duree', $this->contrat->duree); + $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_dispo', ($this->stock_reel - $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_reel', $this->stock_reel); + $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_alert', $this->seuil_stock_alerte); if ($this->status==1) $smarty->assign('prod_statut', 'En vente');