clean indent
This commit is contained in:
parent
ac6da28135
commit
16f58f1eee
@ -247,13 +247,13 @@ $formmail = new FormMail($db);
|
|||||||
$nboftemplates = $formmail->fetchAllEMailTemplate('facture_send', $user, null, -1); // We set lang=null to get in priority record with no lang
|
$nboftemplates = $formmail->fetchAllEMailTemplate('facture_send', $user, null, -1); // We set lang=null to get in priority record with no lang
|
||||||
//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
|
//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
|
||||||
$arrayofmessagename=array();
|
$arrayofmessagename=array();
|
||||||
if (is_array($formmail->lines_model))
|
if (is_array($formmail->lines_model)) {
|
||||||
{
|
foreach($formmail->lines_model as $modelmail) {
|
||||||
foreach($formmail->lines_model as $modelmail)
|
|
||||||
{
|
|
||||||
//var_dump($modelmail);
|
//var_dump($modelmail);
|
||||||
$moreonlabel='';
|
$moreonlabel='';
|
||||||
if (! empty($arrayofmessagename[$modelmail->label])) $moreonlabel=' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
|
if (! empty($arrayofmessagename[$modelmail->label])) {
|
||||||
|
$moreonlabel=' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
|
||||||
|
}
|
||||||
$arrayofmessagename[$modelmail->label]=$langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
|
$arrayofmessagename[$modelmail->label]=$langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -157,8 +157,7 @@ $( document ).ready(function() {
|
|||||||
$('#'+val.label).draggable().bind('click', function(){
|
$('#'+val.label).draggable().bind('click', function(){
|
||||||
$(this).focus();
|
$(this).focus();
|
||||||
})
|
})
|
||||||
<?php }
|
<?php } else {?>
|
||||||
else {?>
|
|
||||||
$('body').append('<div class="tablediv" onclick="LoadPlace('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');
|
$('body').append('<div class="tablediv" onclick="LoadPlace('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
});
|
});
|
||||||
|
|||||||
@ -253,8 +253,7 @@ $button = array_pop($action_buttons);
|
|||||||
if ($paycode == 'CHQ') $paycode = 'cheque';
|
if ($paycode == 'CHQ') $paycode = 'cheque';
|
||||||
?>
|
?>
|
||||||
<button type="button" class="calcbutton2" onclick="Validate('<?php echo $langs->trans($paycode); ?>');"><?php echo $langs->trans("PaymentTypeShort".$paiements[2]->code); ?></button>
|
<button type="button" class="calcbutton2" onclick="Validate('<?php echo $langs->trans($paycode); ?>');"><?php echo $langs->trans("PaymentTypeShort".$paiements[2]->code); ?></button>
|
||||||
<?php } else { ?>
|
<?php } else {
|
||||||
<?php
|
|
||||||
$button = array_pop($action_buttons);
|
$button = array_pop($action_buttons);
|
||||||
?>
|
?>
|
||||||
<button type="button" class="calcbutton2" onclick="<?php echo $button["function"];?>"><span <?php echo $button["span"];?>><?php echo $button["text"];?></span></button>
|
<button type="button" class="calcbutton2" onclick="<?php echo $button["function"];?>"><span <?php echo $button["span"];?>><?php echo $button["text"];?></span></button>
|
||||||
|
|||||||
@ -132,7 +132,8 @@ if ($conf->global->TAKEPOS_CUSTOM_RECEIPT && $conf->global->TAKEPOS_SHOW_CUSTOME
|
|||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php if (!empty($line->product_label)) echo $line->product_label;
|
<td>
|
||||||
|
<?php if (!empty($line->product_label)) echo $line->product_label;
|
||||||
else echo $line->description;?>
|
else echo $line->description;?>
|
||||||
</td>
|
</td>
|
||||||
<td class="right"><?php echo $line->qty;?></td>
|
<td class="right"><?php echo $line->qty;?></td>
|
||||||
@ -150,8 +151,7 @@ if ($conf->global->TAKEPOS_CUSTOM_RECEIPT && $conf->global->TAKEPOS_SHOW_CUSTOME
|
|||||||
<th class="right"><?php echo $langs->trans("TotalHT");?></th>
|
<th class="right"><?php echo $langs->trans("TotalHT");?></th>
|
||||||
<td class="right"><?php echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
|
<td class="right"><?php echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php if($conf->global->TAKEPOS_TICKET_VAT_GROUPPED):?>
|
<?php if($conf->global->TAKEPOS_TICKET_VAT_GROUPPED) {
|
||||||
<?php
|
|
||||||
$vat_groups = array();
|
$vat_groups = array();
|
||||||
foreach ($object->lines as $line)
|
foreach ($object->lines as $line)
|
||||||
{
|
{
|
||||||
@ -168,12 +168,11 @@ if ($conf->global->TAKEPOS_CUSTOM_RECEIPT && $conf->global->TAKEPOS_SHOW_CUSTOME
|
|||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
} else { ?>
|
||||||
<?php else: ?>
|
|
||||||
<tr>
|
<tr>
|
||||||
<th class="right"><?php echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
|
<th class="right"><?php echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php endif ?>
|
<?php } ?>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
|
<th class="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@ -4,6 +4,7 @@
|
|||||||
* Copyright (C) 2006-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2006-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
|
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
|
||||||
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
|
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||||
|
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|||||||
@ -27,11 +27,13 @@
|
|||||||
|
|
||||||
require '../main.inc.php';
|
require '../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
|
||||||
if (! empty($conf->categorie->enabled))
|
if (! empty($conf->categorie->enabled)) {
|
||||||
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
|
||||||
|
}
|
||||||
|
|
||||||
if (! $user->rights->user->user->lire && ! $user->admin)
|
if (! $user->rights->user->user->lire && ! $user->admin) {
|
||||||
accessforbidden();
|
accessforbidden();
|
||||||
|
}
|
||||||
|
|
||||||
// Load translation files required by page
|
// Load translation files required by page
|
||||||
$langs->loadLangs(array('users', 'companies', 'hrm'));
|
$langs->loadLangs(array('users', 'companies', 'hrm'));
|
||||||
@ -40,8 +42,9 @@ $contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'userlist
|
|||||||
|
|
||||||
// Security check (for external users)
|
// Security check (for external users)
|
||||||
$socid=0;
|
$socid=0;
|
||||||
if ($user->societe_id > 0)
|
if ($user->societe_id > 0) {
|
||||||
$socid = $user->societe_id;
|
$socid = $user->societe_id;
|
||||||
|
}
|
||||||
|
|
||||||
// Load mode employee
|
// Load mode employee
|
||||||
$mode = GETPOST("mode", 'alpha');
|
$mode = GETPOST("mode", 'alpha');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user