Skip to content

Commit

Permalink
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
  • Loading branch information
@eldy
eldy committed Dec 21, 2017
2 parents 54d7d85 + 6a62e13 commit eab44f6
Show file tree
Hide file tree
Showing 72 changed files with 623 additions and 130 deletions.
9 changes: 9 additions & 0 deletions htdocs/accountancy/tpl/export_journal.tpl.php
View file
Expand Up @@ -15,6 +15,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}


$prefix = $conf->global->ACCOUNTING_EXPORT_PREFIX_SPEC;
$format = $conf->global->ACCOUNTING_EXPORT_FORMAT;
$nodateexport = $conf->global->ACCOUNTING_EXPORT_NO_DATE_IN_FILENAME;
Expand Down
9 changes: 8 additions & 1 deletion htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
View file
Expand Up @@ -14,8 +14,15 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}

?>

<!-- BEGIN PHP TEMPLATE ADHERENTCARD_CREATE.TPL.PHP DEFAULT -->
Expand Down
9 changes: 8 additions & 1 deletion htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
View file
Expand Up @@ -14,9 +14,16 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}


$contact = $GLOBALS['objcanvas']->control->object;

?>
Expand Down
10 changes: 9 additions & 1 deletion htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
View file
Expand Up @@ -14,10 +14,18 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}


$contact = $GLOBALS['objcanvas']->control->object;

?>

<!-- BEGIN PHP TEMPLATE ADHERENTCARD_VIEW.TPL.PHP DEFAULT -->
Expand Down
6 changes: 3 additions & 3 deletions htdocs/adherents/subscription/info.php
View file
Expand Up @@ -36,18 +36,18 @@
if (!$user->rights->adherent->lire)
accessforbidden();

$rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"];
$rowid=GETPOST("rowid",'int');



/*
* View
*/

llxHeader();

$form = new Form($db);

llxHeader();

$object = new Subscription($db);
$result = $object->fetch($rowid);

Expand Down
11 changes: 9 additions & 2 deletions htdocs/adherents/tpl/linkedobjectblock.tpl.php
View file
Expand Up @@ -15,8 +15,15 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}

?>

<!-- BEGIN PHP TEMPLATE -->
Expand All @@ -33,7 +40,7 @@
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{

?>
<tr <?php echo $GLOBALS['bc'][$var]; ?> >
<td><?php echo $langs->trans("Subscription"); ?></td>
Expand Down
8 changes: 8 additions & 0 deletions htdocs/cashdesk/tpl/facturation1.tpl.php
View file
Expand Up @@ -19,6 +19,14 @@
*
*/

// Protection to avoid direct call of template
if (empty($langs) || ! is_object($langs))
{
print "Error, template page can't be called as URL";
exit;
}


$langs->load("main");
$langs->load("bills");
$langs->load("cashdesk");
Expand Down
8 changes: 8 additions & 0 deletions htdocs/cashdesk/tpl/liste_articles.tpl.php
View file
Expand Up @@ -17,6 +17,14 @@
*
*/

// Protection to avoid direct call of template
if (empty($langs) || ! is_object($langs))
{
print "Error, template page can't be called as URL";
exit;
}


require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

Expand Down
8 changes: 8 additions & 0 deletions htdocs/cashdesk/tpl/menu.tpl.php
View file
Expand Up @@ -19,6 +19,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

// Protection to avoid direct call of template
if (empty($langs) || ! is_object($langs))
{
print "Error, template page can't be called as URL";
exit;
}


include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
Expand Down
9 changes: 9 additions & 0 deletions htdocs/cashdesk/tpl/ticket.tpl.php
View file
Expand Up @@ -16,6 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

// Protection to avoid direct call of template
if (empty($langs) || ! is_object($langs))
{
print "Error, template page can't be called as URL";
exit;
}


include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

$langs->load("main");
Expand Down
8 changes: 8 additions & 0 deletions htdocs/cashdesk/tpl/validation1.tpl.php
View file
Expand Up @@ -16,6 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

// Protection to avoid direct call of template
if (empty($langs) || ! is_object($langs))
{
print "Error, template page can't be called as URL";
exit;
}


$langs->load("main");
$langs->load("bills");
$langs->load("banks");
Expand Down
8 changes: 8 additions & 0 deletions htdocs/cashdesk/tpl/validation2.tpl.php
View file
Expand Up @@ -17,6 +17,14 @@
*
*/

// Protection to avoid direct call of template
if (empty($langs) || ! is_object($langs))
{
print "Error, template page can't be called as URL";
exit;
}


$langs->load("main");
$langs->load("bills");

Expand Down
13 changes: 7 additions & 6 deletions htdocs/comm/multiprix.php
View file
Expand Up @@ -30,7 +30,8 @@
$langs->load("orders");
$langs->load("companies");

$_socid = $_GET["id"];
$id = GETPOST('id','int');
$_socid = GETPOST("id",'int');
// Security check
if ($user->societe_id > 0)
{
Expand All @@ -45,10 +46,10 @@
if ($_POST["action"] == 'setpricelevel')
{
$soc = New Societe($db);
$soc->fetch($_GET["id"]);
$soc->fetch($id);
$soc->set_price_level($_POST["price_level"],$user);

header("Location: multiprix.php?id=".$_GET["id"]);
header("Location: multiprix.php?id=".$id);
exit;
}

Expand Down Expand Up @@ -87,7 +88,7 @@
print '<form method="POST" action="multiprix.php?id='.$objsoc->id.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setpricelevel">';

dol_fiche_head($head, $tabchoice, $langs->trans("ThirdParty"), 0, 'company');

print '<table width="100%" border="0">';
Expand Down Expand Up @@ -122,12 +123,12 @@
print "</table>";

dol_fiche_end();

print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';

print "</form>";


print '<br><br>';


Expand Down
12 changes: 10 additions & 2 deletions htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
View file
Expand Up @@ -22,6 +22,14 @@
* \ingroup propal
* \brief Template to show objects linked to proposals
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}

?>

<!-- BEGIN PHP TEMPLATE -->
Expand All @@ -40,7 +48,7 @@
foreach($linkedObjectBlock as $key => $objectlink)
{
$ilink++;

$trclass=($var?'pair':'impair');
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
Expand Down Expand Up @@ -71,7 +79,7 @@
<td align="right"></td>
<td align="right"></td>
</tr>
<?php
<?php
}
?>

Expand Down
13 changes: 10 additions & 3 deletions htdocs/commande/tpl/linkedobjectblock.tpl.php
View file
Expand Up @@ -15,8 +15,15 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}

?>

<!-- BEGIN PHP TEMPLATE -->
Expand All @@ -36,7 +43,7 @@
foreach($linkedObjectBlock as $key => $objectlink)
{
$ilink++;

$trclass=($var?'pair':'impair');
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
Expand Down Expand Up @@ -76,7 +83,7 @@
<td align="right"></td>
<td align="right"></td>
</tr>
<?php
<?php
}
?>

Expand Down
15 changes: 11 additions & 4 deletions htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
View file
Expand Up @@ -15,8 +15,15 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}

?>

<!-- BEGIN PHP TEMPLATE -->
Expand All @@ -36,7 +43,7 @@
foreach($linkedObjectBlock as $key => $objectlink)
{
$ilink++;

$trclass=($var?'pair':'impair');
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
Expand All @@ -54,7 +61,7 @@
$total = $total + $sign * $objectlink->total_ht;
echo price($objectlink->total_ht);
}
else
else
{
echo '<strike>'.price($objectlink->total_ht).'</strike>';
}
Expand All @@ -76,7 +83,7 @@
<td align="right"></td>
<td align="right"></td>
</tr>
<?php
<?php
}
?>

Expand Down
9 changes: 8 additions & 1 deletion htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
View file
Expand Up @@ -15,8 +15,15 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}

?>

<!-- BEGIN PHP TEMPLATE -->
Expand Down

0 comments on commit eab44f6

Please sign in to comment.