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

Fix: W3C when module margin is on

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-15 13:44:40 +02:00
parent 1fb26e2ab2
commit 4566595d44
2 changed files with 95 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*
* Need to have following variables defined: * Need to have following variables defined:
* $conf * $conf
* $langs * $langs
@ -28,100 +27,114 @@
<!-- BEGIN PHP TEMPLATE freeproductline_create.tpl.php --> <!-- BEGIN PHP TEMPLATE freeproductline_create.tpl.php -->
<tr class="liste_titre nodrag nodrop"> <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
<?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('VAT'); ?></td>
<td align="right"><?php echo $langs->trans('PriceUHT'); ?></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('Qty'); ?></td>
<td align="right"><?php echo $langs->trans('ReductionShort'); ?></td> <td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
<?php <?php
$colspan = 4; $colspan = 4;
if (! empty($conf->margin->enabled)) { if (! empty($conf->margin->enabled)) {
?> ?>
<td align="right"><?php echo $langs->trans('BuyingPrice'); ?></td> <td align="right"><?php echo $langs->trans('BuyingPrice'); ?></td>
<?php <?php
if($conf->global->DISPLAY_MARGIN_RATES) if($conf->global->DISPLAY_MARGIN_RATES)
$colspan++; $colspan++;
if($conf->global->DISPLAY_MARK_RATES) if($conf->global->DISPLAY_MARK_RATES)
$colspan++; $colspan++;
} }
?> ?>
<td colspan="<?php echo $colspan; ?>">&nbsp;</td> <td colspan="<?php echo $colspan; ?>">&nbsp;</td>
</tr> </tr>
<form name="addproduct" id="addproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST"> <form name="addproduct" id="addproduct"
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add"
<input type="hidden" name="action" value="addline" /> method="POST">
<input type="hidden" name="id" value="<?php echo $this->id; ?>" /> <input type="hidden" name="token"
value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden"
name="action" value="addline" /> <input type="hidden" name="id"
value="<?php echo $this->id; ?>" />
<tr <?php echo $bcnd[$var]; ?>> <tr <?php echo $bcnd[$var]; ?>>
<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>> <td
<?php <?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1); <?php
if (($conf->product->enabled && $conf->service->enabled) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>'; echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
if (($conf->product->enabled && $conf->service->enabled) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
if (is_object($hookmanager)) if (is_object($hookmanager))
{ {
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action); $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
} }
// 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;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
$doleditor->Create(); $doleditor->Create();
?> ?>
</td> </td>
<td align="right"> <td align="right"><?php
<?php if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
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);
else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer); ?>
?> </td>
</td> <td align="right"><input type="text" size="5" name="price_ht"
<td align="right"><input type="text" size="5" name="price_ht" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>"></td> value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>">
<td align="right"><input type="text" size="2" name="qty" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td> </td>
<td align="right" nowrap><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" name="remise_percent">%</td> <td align="right"><input type="text" size="2" name="qty"
<?php value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td>
$colspan = 4; <td align="right" nowrap><input type="text" size="1"
if (! empty($conf->margin->enabled)) { value="<?php echo $buyer->remise_client; ?>" name="remise_percent">%</td>
?> <?php
<td align="right"><input type="text" size="5" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>"></td> $colspan = 4;
<?php if (! empty($conf->margin->enabled)) {
if($conf->global->DISPLAY_MARGIN_RATES) ?>
$colspan++; <td align="right"><input type="text" size="5" name="buying_price"
if($conf->global->DISPLAY_MARK_RATES) value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
$colspan++; </td>
} <?php
?> if($conf->global->DISPLAY_MARGIN_RATES)
<td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline"></td> $colspan++;
</tr> if($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 ($conf->service->enabled && $dateSelector) { <?php if ($conf->service->enabled && $dateSelector) {
if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
$colspan = 10; $colspan = 10;
else else
$colspan = 9; $colspan = 9;
if (! empty($conf->margin->enabled)) { if (! empty($conf->margin->enabled)) {
if($conf->global->DISPLAY_MARGIN_RATES) $colspan++; // For the buying price
$colspan++; if($conf->global->DISPLAY_MARGIN_RATES)
if($conf->global->DISPLAY_MARK_RATES) $colspan++;
$colspan++; if($conf->global->DISPLAY_MARK_RATES)
} $colspan++;
?> }
<tr <?php echo $bcnd[$var]; ?>> ?>
<td colspan="<?php echo $colspan; ?>"> <tr <?php echo $bcnd[$var]; ?>>
<?php <td colspan="<?php echo $colspan; ?>"><?php
echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; 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 $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 ' '.$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"); 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> </td>
</tr> </tr>
<?php } ?> <?php } ?>
</form> </form>
<!-- END PHP TEMPLATE freeproductline_create.tpl.php --> <!-- END PHP TEMPLATE freeproductline_create.tpl.php -->

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

@ -115,6 +115,7 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
else else
$colspan = 9; $colspan = 9;
if (! empty($conf->margin->enabled)) { if (! empty($conf->margin->enabled)) {
$colspan++; // For the buying price
if($conf->global->DISPLAY_MARGIN_RATES) if($conf->global->DISPLAY_MARGIN_RATES)
$colspan++; $colspan++;
if($conf->global->DISPLAY_MARK_RATES) if($conf->global->DISPLAY_MARK_RATES)