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

Merge remote-tracking branch 'uptream/develop' into 8.0-a10

Browse Source
This commit is contained in:
Alexandre SPANGARO 2018-03-18 06:11:05 +01:00
commit 17b98b84ad
9 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/prelevement/ligne.php
View File

@ -33,13 +33,12 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->load("banks"); $langs->load("banks");
$langs->load("categories"); $langs->load("categories");
$langs->load("bills");
$langs->load("withdrawals");
// Security check // Security check
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
$langs->load("bills");
$langs->load("withdrawals");
// Get supervariables // Get supervariables
$action = GETPOST('action','alpha'); $action = GETPOST('action','alpha');
$id = GETPOST('id','int'); $id = GETPOST('id','int');

5
htdocs/contrat/card.php
View File

@ -1640,13 +1640,14 @@ else
print '<td align="right" class="nowrap">'; print '<td align="right" class="nowrap">';
if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0)) if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
{ {
print '<a style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">'; print '<!-- link to move service line into another contract -->';
print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
print img_picto($langs->trans("MoveToAnotherContract"),'uparrow'); print img_picto($langs->trans("MoveToAnotherContract"),'uparrow');
print '</a>'; print '</a>';
} }
if ($user->rights->contrat->creer && ($object->statut >= 0)) if ($user->rights->contrat->creer && ($object->statut >= 0))
{ {
print '<a style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">'; print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
print img_edit(); print img_edit();
print '</a>'; print '</a>';
} }

2
htdocs/core/class/extrafields.class.php
View File

@ -134,7 +134,7 @@ class ExtraFields
* *
* @param string $attrname Code of attribute * @param string $attrname Code of attribute
* @param string $label label of attribute * @param string $label label of attribute
* @param int $type Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...) * @param int $type Type of attribute ('boolean','int','varchar','text','html','date','datehour','price','phone','mail','password','url','select','checkbox','separate',...)
* @param int $pos Position of attribute * @param int $pos Position of attribute
* @param string $size Size/length of attribute * @param string $size Size/length of attribute
* @param string $elementtype Element type ('member', 'product', 'thirdparty', ...) * @param string $elementtype Element type ('member', 'product', 'thirdparty', ...)

3
htdocs/core/lib/functions.lib.php
View File

@ -3063,7 +3063,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$pictowithoutext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto); $pictowithoutext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
if (in_array($pictowithoutext, array('delete', 'edit', 'off', 'on', 'resize', 'switch_off', 'switch_on'))) if (in_array($pictowithoutext, array('delete', 'edit', 'off', 'on', 'resize', 'switch_off', 'switch_on', 'uparrow')))
{ {
$fakey = $pictowithoutext; $facolor=''; $fasize=''; $fakey = $pictowithoutext; $facolor=''; $fasize='';
if ($pictowithoutext == 'switch_off') { $fakey = 'fa-toggle-off'; $facolor='#999'; $fasize='2em'; } if ($pictowithoutext == 'switch_off') { $fakey = 'fa-toggle-off'; $facolor='#999'; $fasize='2em'; }
@ -3073,6 +3073,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
elseif ($pictowithoutext == 'delete') { $fakey = 'fa-trash'; $facolor='#444'; } elseif ($pictowithoutext == 'delete') { $fakey = 'fa-trash'; $facolor='#444'; }
elseif ($pictowithoutext == 'edit') { $fakey = 'fa-pencil'; $facolor='#444'; } elseif ($pictowithoutext == 'edit') { $fakey = 'fa-pencil'; $facolor='#444'; }
elseif ($pictowithoutext == 'resize') { $fakey = 'fa-crop'; $facolor='#444'; } elseif ($pictowithoutext == 'resize') { $fakey = 'fa-crop'; $facolor='#444'; }
elseif ($pictowithoutext == 'uparrow') { $fakey = 'fa-mail-forward'; $facolor='#555'; }
else { $fakey = 'fa-'.$pictowithoutext; $facolor='#999'; } else { $fakey = 'fa-'.$pictowithoutext; $facolor='#999'; }
if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) { $morecss.=($morecss?' ':'').$reg[1]; } if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) { $morecss.=($morecss?' ':'').$reg[1]; }

4
htdocs/core/tpl/admin_extrafields_edit.tpl.php
View File

@ -131,8 +131,8 @@ $langs->load("modulebuilder");
}); });
</script> </script>
<!-- Form to edit an extra field -->
<form action="<?php echo $_SERVER["PHP_SELF"]; ?>?attrname=<?php echo $attrname; ?>" method="post"> <form action="<?php echo $_SERVER["PHP_SELF"]; ?>?attrname=<?php echo $attrname; ?>" id="formeditextrafield" method="post">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>"> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
<input type="hidden" name="attrname" value="<?php echo $attrname; ?>"> <input type="hidden" name="attrname" value="<?php echo $attrname; ?>">
<input type="hidden" name="action" value="update"> <input type="hidden" name="action" value="update">

4
htdocs/core/tpl/admin_extrafields_view.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010-2017 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2010-2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2017 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012-2017 Regis Houssin <regis.houssin@capnetworks.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -91,7 +91,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
if (! empty($conf->multicompany->enabled)) { if (! empty($conf->multicompany->enabled)) {
print '<td align="center">'.($extrafields->attributes[$elementtype]['entityid'][$key]==0?$langs->trans("All"):$extrafields->attributes[$elementtype]['entitylabel'][$key]).'</td>'; print '<td align="center">'.($extrafields->attributes[$elementtype]['entityid'][$key]==0?$langs->trans("All"):$extrafields->attributes[$elementtype]['entitylabel'][$key]).'</td>';
} }
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>'; print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n"; print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
print "</tr>"; print "</tr>";
} }

4
htdocs/langs/en_US/withdrawals.lang
View File

@ -1,8 +1,8 @@
# Dolibarr language file - Source file is en_US - withdrawals # Dolibarr language file - Source file is en_US - withdrawals
CustomersStandingOrdersArea=Direct debit payment orders area CustomersStandingOrdersArea=Direct debit payment orders area
SuppliersStandingOrdersArea=Direct credit payment orders area SuppliersStandingOrdersArea=Direct credit payment orders area
StandingOrders=Direct debit payment orders StandingOrdersPayment=Direct debit payment orders
StandingOrder=Direct debit payment order StandingOrderPayment=Direct debit payment order
NewStandingOrder=New direct debit order NewStandingOrder=New direct debit order
StandingOrderToProcess=To process StandingOrderToProcess=To process
WithdrawalsReceipts=Direct debit orders WithdrawalsReceipts=Direct debit orders

3
htdocs/theme/eldy/style.css.php
View File

@ -1331,7 +1331,8 @@ div.nopadding {
.pictowarning { .pictowarning {
vertical-align: text-bottom; vertical-align: text-bottom;
} }
.fiche img.pictoedit, .fiche span.pictoedit { .fiche .arearef img.pictoedit, .fiche .arearef span.pictoedit,
.fiche .fichecenter img.pictoedit, .fiche .fichecenter span.pictoedit {
opacity: 0.4; opacity: 0.4;
} }
.colorthumb { .colorthumb {

3
htdocs/theme/md/style.css.php
View File

@ -1339,7 +1339,8 @@ table.noborder tr.liste_titre td {
.pictowarning { .pictowarning {
vertical-align: text-bottom; vertical-align: text-bottom;
} }
.fiche img.pictoedit, .fiche span.pictoedit { .fiche .arearef img.pictoedit, .fiche .arearef span.pictoedit,
.fiche .fichecenter img.pictoedit, .fiche .fichecenter span.pictoedit {
opacity: 0.9; opacity: 0.9;
} }
img.hideonsmartphone.pictoactionview { img.hideonsmartphone.pictoactionview {