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

Fix: use span is better

Browse Source
This commit is contained in:
Regis Houssin 2012-10-22 17:02:17 +02:00
parent 07149b548c
commit 9bbea4f385
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/tpl/freeproductline_create.tpl.php
View File

@ -61,8 +61,10 @@
<tr <?php echo $bcnd[$var]; ?>> <tr <?php echo $bcnd[$var]; ?>>
<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>> <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
<?php <?php
echo '<span>';
echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1); echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
if ((! empty($conf->product->enabled) && ! empty($conf->service->enabled)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>'; echo '</span>';
if (is_object($hookmanager)) if (is_object($hookmanager))
{ {
@ -70,6 +72,8 @@
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action); $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 // Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$nbrows=ROWS_2; $nbrows=ROWS_2;

8
htdocs/core/tpl/objectline_add.tpl.php
View File

@ -84,9 +84,9 @@ if (! empty($conf->margin->enabled)) {
'update_textarea' => array( 'update_textarea' => array(
'product_desc' => 'desc' 'product_desc' => 'desc'
), ),
'show' => array( //'show' => array(
'price_base_type_area' //'price_base_type_area'
), //),
'disabled' => array( 'disabled' => array(
'select_type' 'select_type'
) )
@ -236,7 +236,7 @@ $(document).ready(function() {
//$('#origin_price_ttc_cache').val(data.price_ttc); //$('#origin_price_ttc_cache').val(data.price_ttc);
$('#origin_tva_tx_cache').val(data.tva_tx); $('#origin_tva_tx_cache').val(data.tva_tx);
$('#select_type').val(data.type).attr('disabled','disabled').trigger('change'); $('#select_type').val(data.type).attr('disabled','disabled').trigger('change');
$('#price_base_type_area').show(); //$('#price_base_type_area').show();
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") { if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") {
CKEDITOR.instances['product_desc'].setData(data.desc).focus(); CKEDITOR.instances['product_desc'].setData(data.desc).focus();

2
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -87,6 +87,8 @@
$reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action); $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
} }
echo '<br>';
// editeur wysiwyg // editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$nbrows=ROWS_2; $nbrows=ROWS_2;

5
htdocs/core/tpl/predefinedproductline_create.tpl.php
View File

@ -72,8 +72,9 @@ jQuery(document).ready(function() {
<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>> <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
<?php <?php
echo '<span>';
$form->select_produits('','idprod','',$conf->product->limit_size,$buyer->price_level); $form->select_produits('','idprod','',$conf->product->limit_size,$buyer->price_level);
print '<br>'; echo '</span>';
if (is_object($hookmanager)) if (is_object($hookmanager))
{ {
@ -81,6 +82,8 @@ jQuery(document).ready(function() {
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action); $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
} }
echo '<br>';
// Editor wysiwyg // Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$nbrows=ROWS_2; $nbrows=ROWS_2;