diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1c2a62c8b624cfc276b93dc4ed546c62c360a391..0a5ae5df34c4de04bb47d6ed3829efd0a635c5ea 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2649,7 +2649,7 @@ abstract class CommonObject
if ($conf->global->MARGIN_TYPE == "1")
print '<td align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
else
- print '<td align="right" width="80">'.$langs->trans('BuyingCost').'</td>';
+ print '<td align="right" width="80">'.$langs->trans('CostPrice').'</td>';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
print '<td align="right" width="50">'.$langs->trans('MarginRate').'</td>';
if (! empty($conf->global->DISPLAY_MARK_RATES))
@@ -3049,7 +3049,10 @@ abstract class CommonObject
print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans('Margins').'</td>';
print '<td width="20%" align="right">'.$langs->trans('SellingPrice').'</td>';
- print '<td width="20%" align="right">'.$langs->trans('BuyingPrice').'</td>';
+ if ($conf->global->MARGIN_TYPE == "1")
+ print '<td width="20%" align="right">'.$langs->trans('BuyingPrice').'</td>';
+ else
+ print '<td width="20%" align="right">'.$langs->trans('CostPrice').'</td>';
print '<td width="20%" align="right">'.$langs->trans('Margin').'</td>';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
print '<td align="right">'.$langs->trans('MarginRate').'</td>';
diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 763e8d414c980676ca80d36d0f689c84bc24dbd3..679e89429fccd493f0e61f63497599bd64e3fe90 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -1,148 +1,155 @@
-<?php
-/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2011 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Need to have following variables defined:
- * $conf
- * $langs
- * $dateSelector
- * $this (invoice, order, ...)
- * $line defined
- */
-
-$usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
-
-?>
-
-<!-- BEGIN PHP TEMPLATE freeproductline_create.tpl.php -->
-<tr class="liste_titre nodrag nodrop">
- <td
- <?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>><div
- id="add"></div> <?php echo $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone"); ?>
- </td>
- <td align="right"><?php echo $langs->trans('VAT'); ?></td>
- <td align="right"><?php echo $langs->trans('PriceUHT'); ?></td>
- <td align="right"><?php echo $langs->trans('Qty'); ?></td>
- <td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
- <?php
- $colspan = 4;
- if (! empty($usemargins))
- {
- ?>
- <td align="right"><?php echo $langs->trans('BuyingPrice'); ?></td>
- <?php
- if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
- if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
- }
- ?>
- <td colspan="<?php echo $colspan; ?>"> </td>
-</tr>
-
-<form name="addproduct" id="addproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="action" value="addline">
-<input type="hidden" name="mode" value="libre">
-<input type="hidden" name="id" value="<?php echo $this->id; ?>">
-
- <tr <?php echo $bcnd[$var]; ?>>
- <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
- <?php
-
- echo '<span>';
- echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
- echo '</span>';
-
- if (is_object($hookmanager))
- {
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
- }
-
- if ((! empty($conf->product->enabled) && ! empty($conf->service->enabled)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
-
- // Editor wysiwyg
- require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $nbrows=ROWS_2;
- $enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
- if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
- $doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,70);
- $doleditor->Create();
- ?>
- </td>
-
- <td align="right"><?php
- if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
- else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
- ?>
- </td>
- <td align="right"><input type="text" size="5" name="price_ht" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>">
- </td>
- <td align="right"><input type="text" size="2" name="qty" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td>
- <td align="right" nowrap><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" name="remise_percent">%</td>
- <?php
- $colspan = 4;
- if (! empty($usemargins))
- {
- ?>
- <td align="right"><input type="text" size="5" name="buying_price"
- value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
- </td>
- <?php
- if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
- if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
- }
- ?>
- <td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline"></td>
- </tr>
-
- <?php
- if (! empty($conf->service->enabled) && $dateSelector)
- {
- if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
- else $colspan = 9;
-
- if (! empty($usemargins))
- {
- $colspan++; // For the buying price
- if($conf->global->DISPLAY_MARGIN_RATES) $colspan++;
- if($conf->global->DISPLAY_MARK_RATES) $colspan++;
- }
- ?>
- <tr <?php echo $bcnd[$var]; ?>>
- <td colspan="<?php echo $colspan; ?>"><?php
- if (! empty($object->element) && $object->element == 'contrat')
- {
+<?php
+/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Need to have following variables defined:
+ * $conf
+ * $langs
+ * $dateSelector
+ * $this (invoice, order, ...)
+ * $line defined
+ */
+
+$usemargins=0;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+
+?>
+
+<!-- BEGIN PHP TEMPLATE freeproductline_create.tpl.php -->
+<tr class="liste_titre nodrag nodrop">
+ <td
+ <?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>><div
+ id="add"></div> <?php echo $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone"); ?>
+ </td>
+ <td align="right"><?php echo $langs->trans('VAT'); ?></td>
+ <td align="right"><?php echo $langs->trans('PriceUHT'); ?></td>
+ <td align="right"><?php echo $langs->trans('Qty'); ?></td>
+ <td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
+ <?php
+ $colspan = 4;
+ if (! empty($usemargins))
+ {
+ ?>
+ <td align="right">
+ <?php
+ if ($conf->global->MARGIN_TYPE == "1")
+ echo $langs->trans('BuyingPrice');
+ else
+ echo $langs->trans('CostPrice');
+ ?>
+ </td>
+ <?php
+ if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+ if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+ }
+ ?>
+ <td colspan="<?php echo $colspan; ?>"> </td>
+</tr>
+
+<form name="addproduct" id="addproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="action" value="addline">
+<input type="hidden" name="mode" value="libre">
+<input type="hidden" name="id" value="<?php echo $this->id; ?>">
+
+ <tr <?php echo $bcnd[$var]; ?>>
+ <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
+ <?php
+
+ echo '<span>';
+ echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
+ echo '</span>';
+
+ if (is_object($hookmanager))
+ {
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
+ }
+
+ if ((! empty($conf->product->enabled) && ! empty($conf->service->enabled)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
+
+ // Editor wysiwyg
+ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+ $nbrows=ROWS_2;
+ $enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+ if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+ $doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,70);
+ $doleditor->Create();
+ ?>
+ </td>
+
+ <td align="right"><?php
+ if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
+ else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
+ ?>
+ </td>
+ <td align="right"><input type="text" size="5" name="price_ht" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>">
+ </td>
+ <td align="right"><input type="text" size="2" name="qty" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td>
+ <td align="right" nowrap><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" name="remise_percent">%</td>
+ <?php
+ $colspan = 4;
+ if (! empty($usemargins))
+ {
+ ?>
+ <td align="right"><input type="text" size="5" name="buying_price"
+ value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
+ </td>
+ <?php
+ if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+ if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+ }
+ ?>
+ <td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline"></td>
+ </tr>
+
+ <?php
+ if (! empty($conf->service->enabled) && $dateSelector)
+ {
+ if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
+ else $colspan = 9;
+
+ if (! empty($usemargins))
+ {
+ $colspan++; // For the buying price
+ if($conf->global->DISPLAY_MARGIN_RATES) $colspan++;
+ if($conf->global->DISPLAY_MARK_RATES) $colspan++;
+ }
+ ?>
+ <tr <?php echo $bcnd[$var]; ?>>
+ <td colspan="<?php echo $colspan; ?>"><?php
+ if (! empty($object->element) && $object->element == 'contrat')
+ {
print $langs->trans("DateStartPlanned").' ';
$form->select_date('',"date_start_sl",$usehm,$usehm,1,"addline_sl");
print ' '.$langs->trans("DateEndPlanned").' ';
- $form->select_date('',"date_end_sl",$usehm,$usehm,1,"addline_sl");
- }
- else
- {
- echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
- echo $form->select_date('','date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
- echo ' '.$langs->trans('to').' ';
- echo $form->select_date('','date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
- }
- ?>
- </td>
- </tr>
- <?php } ?>
-
-</form>
-<!-- END PHP TEMPLATE freeproductline_create.tpl.php -->
+ $form->select_date('',"date_end_sl",$usehm,$usehm,1,"addline_sl");
+ }
+ else
+ {
+ echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
+ echo $form->select_date('','date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
+ echo ' '.$langs->trans('to').' ';
+ echo $form->select_date('','date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
+ }
+ ?>
+ </td>
+ </tr>
+ <?php } ?>
+
+</form>
+<!-- END PHP TEMPLATE freeproductline_create.tpl.php -->
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index 07178b42bb2dcc3aafe01399fb98ea8e40d3c136..7ccf1f634075e8f2db28fcdece9f4f8b3cf84ae2 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -1,200 +1,207 @@
-<?php
-/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Need to have following variables defined:
- * $conf
- * $langs
- * $dateSelector
- * $this (invoice, order, ...)
- * $line defined
- */
-
+<?php
+/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Need to have following variables defined:
+ * $conf
+ * $langs
+ * $dateSelector
+ * $this (invoice, order, ...)
+ * $line defined
+ */
+
$usemargins=0;
if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
-
-?>
-
-<!-- BEGIN PHP TEMPLATE predefinedproductline_create.tpl.php -->
-
-<tr class="liste_titre nodrag nodrop">
- <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
- <?php
- echo $langs->trans("AddNewLine").' - ';
- if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('RecordedProducts');
- else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('RecordedServices');
- else echo $langs->trans('RecordedProductsAndServices');
- ?>
- </td>
- <td align="right"><?php echo $langs->trans('Qty'); ?></td>
- <td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
-<?php
-$colspan = 4;
-if (! empty($usemargins))
-{
- if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
- if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
- ?>
- <td align="right"><?php echo $langs->trans('BuyingPrice'); ?></td>
- <?php
-}
-?>
- <td colspan="<?php echo $colspan; ?>"> </td>
-</tr>
-
-<form name="addpredefinedproduct" id="addpredefinedproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="action" value="addline">
-<input type="hidden" name="mode" value="predefined">
-<input type="hidden" name="id" value="<?php echo $this->id; ?>">
-
-<script type="text/javascript">
-jQuery(document).ready(function() {
- jQuery('#idprod').change(function() {
- if (jQuery('#idprod').val() > 0) jQuery('#np_desc').focus();
- });
-});
-</script>
-
-<tr <?php echo $bcnd[$var]; ?>>
- <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
- <?php
-
- echo '<span>';
- $filtertype='';
- if (! empty($object->element) && $object->element == 'contrat') $filtertype='1';
- $form->select_produits('','idprod',$filtertype,$conf->product->limit_size,$buyer->price_level);
- echo '</span>';
-
- if (is_object($hookmanager))
- {
- $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
- $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
- }
-
- echo '<br>';
-
- // Editor wysiwyg
- require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $nbrows=ROWS_2;
- $enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
- if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
- $doleditor=new DolEditor('np_desc',GETPOST('np_desc"'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,70);
- $doleditor->Create();
- ?>
- </td>
- <td align="right"><input type="text" size="2" name="qty" value="1"></td>
- <td align="right" nowrap><input type="text" size="1" name="remise_percent" value="<?php echo $buyer->remise_client; ?>">%</td>
- <?php
- $colspan = 4;
- if (! empty($usemargins))
- {
- if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
- if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
- ?>
- <td align="right">
- <select id="fournprice" name="fournprice" style="display: none;"></select>
- <input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
- </td>
- <?php
- }
- ?>
- <td align="center" valign="middle" colspan="<?php echo $colspan; ?>">
- <input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>" name="addline">
- </td>
-</tr>
-
-<?php
-if (! empty($conf->service->enabled) && $dateSelector)
-{
- if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
- else $colspan = 9;
- if (! empty($usemargins))
- {
- $colspan++; // For the buying price
- if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
- if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
- }
-?>
-<tr <?php echo $bcnd[$var]; ?>>
- <td colspan="<?php echo $colspan; ?>">
- <?php
+
+?>
+
+<!-- BEGIN PHP TEMPLATE predefinedproductline_create.tpl.php -->
+
+<tr class="liste_titre nodrag nodrop">
+ <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
+ <?php
+ echo $langs->trans("AddNewLine").' - ';
+ if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('RecordedProducts');
+ else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('RecordedServices');
+ else echo $langs->trans('RecordedProductsAndServices');
+ ?>
+ </td>
+ <td align="right"><?php echo $langs->trans('Qty'); ?></td>
+ <td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
+<?php
+$colspan = 4;
+if (! empty($usemargins))
+{
+ if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+ if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+ ?>
+ <td align="right">
+ <?php
+ if ($conf->global->MARGIN_TYPE == "1")
+ echo $langs->trans('BuyingPrice');
+ else
+ echo $langs->trans('CostPrice');
+ ?>
+ </td>
+ <?php
+}
+?>
+ <td colspan="<?php echo $colspan; ?>"> </td>
+</tr>
+
+<form name="addpredefinedproduct" id="addpredefinedproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="action" value="addline">
+<input type="hidden" name="mode" value="predefined">
+<input type="hidden" name="id" value="<?php echo $this->id; ?>">
+
+<script type="text/javascript">
+jQuery(document).ready(function() {
+ jQuery('#idprod').change(function() {
+ if (jQuery('#idprod').val() > 0) jQuery('#np_desc').focus();
+ });
+});
+</script>
+
+<tr <?php echo $bcnd[$var]; ?>>
+ <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
+ <?php
+
+ echo '<span>';
+ $filtertype='';
+ if (! empty($object->element) && $object->element == 'contrat') $filtertype='1';
+ $form->select_produits('','idprod',$filtertype,$conf->product->limit_size,$buyer->price_level);
+ echo '</span>';
+
+ if (is_object($hookmanager))
+ {
+ $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
+ $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
+ }
+
+ echo '<br>';
+
+ // Editor wysiwyg
+ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+ $nbrows=ROWS_2;
+ $enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+ if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+ $doleditor=new DolEditor('np_desc',GETPOST('np_desc"'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,70);
+ $doleditor->Create();
+ ?>
+ </td>
+ <td align="right"><input type="text" size="2" name="qty" value="1"></td>
+ <td align="right" nowrap><input type="text" size="1" name="remise_percent" value="<?php echo $buyer->remise_client; ?>">%</td>
+ <?php
+ $colspan = 4;
+ if (! empty($usemargins))
+ {
+ if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+ if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+ ?>
+ <td align="right">
+ <select id="fournprice" name="fournprice" style="display: none;"></select>
+ <input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
+ </td>
+ <?php
+ }
+ ?>
+ <td align="center" valign="middle" colspan="<?php echo $colspan; ?>">
+ <input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>" name="addline">
+ </td>
+</tr>
+
+<?php
+if (! empty($conf->service->enabled) && $dateSelector)
+{
+ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
+ else $colspan = 9;
+ if (! empty($usemargins))
+ {
+ $colspan++; // For the buying price
+ if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+ if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+ }
+?>
+<tr <?php echo $bcnd[$var]; ?>>
+ <td colspan="<?php echo $colspan; ?>">
+ <?php
if (! empty($object->element) && $object->element == 'contrat')
- {
+ {
print $langs->trans("DateStartPlanned").' ';
$form->select_date('',"date_start",$usehm,$usehm,1,"addline");
print ' '.$langs->trans("DateEndPlanned").' ';
- $form->select_date('',"date_end",$usehm,$usehm,1,"addline");
- }
- else
+ $form->select_date('',"date_end",$usehm,$usehm,1,"addline");
+ }
+ else
{
- echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
- echo $form->select_date('','date_start_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
- echo ' '.$langs->trans('to').' ';
- echo $form->select_date('','date_end_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
- }
- ?>
- </td>
-</tr>
-<?php
-}
-?>
-
-</form>
-
-<?php
-if (! empty($usemargins))
-{
-?>
- <script type="text/javascript">
- $("#idprod").change(function() {
- $("#fournprice options").remove();
- $("#fournprice").hide();
- $("#buying_price").val("").show();
- $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': $(this).val()}, function(data) {
- if (data && data.length > 0) {
- var options = '';
- var i = 0;
- $(data).each(function() {
- i++;
- options += '<option value="'+this.id+'" price="'+this.price+'"';
- if (i == 1) {
- options += ' selected';
- $("#buying_price").val(this.price);
- }
- options += '>'+this.label+'</option>';
- });
- options += '<option value=null><?php echo $langs->trans("InputPrice"); ?></option>';
- $("#buying_price").hide();
- $("#fournprice").html(options).show();
- $("#fournprice").change(function() {
- var selval = $(this).find('option:selected').attr("price");
- if (selval)
- $("#buying_price").val(selval).hide();
- else
- $('#buying_price').show();
- });
- }
- },
- 'json');
- });
- </script>
-<?php
-}
-?>
-<!-- END PHP TEMPLATE predefinedproductline_create.tpl.php -->
+ echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
+ echo $form->select_date('','date_start_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
+ echo ' '.$langs->trans('to').' ';
+ echo $form->select_date('','date_end_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
+ }
+ ?>
+ </td>
+</tr>
+<?php
+}
+?>
+
+</form>
+
+<?php
+if (! empty($usemargins))
+{
+?>
+ <script type="text/javascript">
+ $("#idprod").change(function() {
+ $("#fournprice options").remove();
+ $("#fournprice").hide();
+ $("#buying_price").val("").show();
+ $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': $(this).val()}, function(data) {
+ if (data && data.length > 0) {
+ var options = '';
+ var i = 0;
+ $(data).each(function() {
+ i++;
+ options += '<option value="'+this.id+'" price="'+this.price+'"';
+ if (i == 1) {
+ options += ' selected';
+ $("#buying_price").val(this.price);
+ }
+ options += '>'+this.label+'</option>';
+ });
+ options += '<option value=null><?php echo $langs->trans("InputPrice"); ?></option>';
+ $("#buying_price").hide();
+ $("#fournprice").html(options).show();
+ $("#fournprice").change(function() {
+ var selval = $(this).find('option:selected').attr("price");
+ if (selval)
+ $("#buying_price").val(selval).hide();
+ else
+ $('#buying_price').show();
+ });
+ }
+ },
+ 'json');
+ });
+ </script>
+<?php
+}
+?>
+<!-- END PHP TEMPLATE predefinedproductline_create.tpl.php -->
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 3dfe6de2d64e11c08e451be34007999a2339dbbe..67ffbad93ce94de6ea3beecdd27c5a686fbd16a8 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -73,12 +73,9 @@ if (! empty($idprod))
$objp = $db->fetch_object($result);
$title = $objp->nom.' - '.$objp->ref_fourn.' - ';
- $label = '';
if ($objp->quantity == 1)
{
- $label.= price($objp->fprice).getCurrencySymbol($conf->currency)."/".strtolower($langs->trans("Unit"));
-
$title.= price($objp->fprice);
$title.= getCurrencySymbol($conf->currency)."/";
@@ -100,8 +97,6 @@ if (! empty($idprod))
$title.=" - ";
$title.= price($objp->unitprice).getCurrencySymbol($conf->currency)."/".strtolower($langs->trans("Unit"));
- $label.= price($objp->unitprice).getCurrencySymbol($conf->currency)."/".strtolower($langs->trans("Unit"));
-
$price = $objp->unitprice;
}
if ($objp->unitcharges > 0 && ($conf->global->MARGIN_TYPE == "2")) {
@@ -111,6 +106,8 @@ if (! empty($idprod))
}
if ($objp->duration) $label .= " - ".$objp->duration;
+ $label = price($price).getCurrencySymbol($conf->currency)."/".strtolower($langs->trans("Unit"));
+
$prices[] = array("id" => $objp->idprodfournprice, "price" => price($price,0,'',0), "label" => $label, "title" => $title);
$i++;
}