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

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-17 18:45:10 +02:00
commit 3b69fe1707
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1330,10 +1330,10 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$nophoto=''; $nophoto='';
$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>'; $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>';
} }
//elseif ($conf->browser->layout != 'phone') { // Show no photo link else { // Show no photo link
$nophoto='/public/theme/common/nophoto.png'; $nophoto='/public/theme/common/nophoto.png';
$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo"'.($width?' style="width: '.$width.'px"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>'; $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo"'.($width?' style="width: '.$width.'px"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
//} }
} }
} }
elseif ($object->element == 'ticket') elseif ($object->element == 'ticket')
@ -1349,10 +1349,10 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$nophoto=''; $nophoto='';
$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>'; $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>';
} }
//elseif ($conf->browser->layout != 'phone') { // Show no photo link else { // Show no photo link
$nophoto='/public/theme/common/nophoto.png'; $nophoto='/public/theme/common/nophoto.png';
$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' style="width: '.$width.'px"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>'; $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' style="width: '.$width.'px"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
//} }
} }
} }
else else
@ -5260,7 +5260,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
// Here, object->id, object->ref and modulepart are required. // Here, object->id, object->ref and modulepart are required.
//var_dump($modulepart); //var_dump($modulepart);
if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice', if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice',
'supplier_order','supplier_proposal','shipment','contract','expensereport'))) 'supplier_order','supplier_proposal','shipment','contract','expensereport','ficheinter')))
{ {
$path=($object->ref?$object->ref:$object->id); $path=($object->ref?$object->ref:$object->id);
} }

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

@ -53,11 +53,11 @@ if( (array) $linked_resources && count($linked_resources) > 0)
} }
else else
{ {
$style=''; $class='';
if ($linked_resource['rowid'] == GETPOST('lineid')) if ($linked_resource['rowid'] == GETPOST('lineid'))
$style='style="background: orange;"'; $class='highlight';
print '<div class="tagtr oddeven" '.$style.'>'; print '<div class="tagtr oddeven'.($class?' '.$class:'').'">';
print '<div class="tagtd">'; print '<div class="tagtd">';
print $object_resource->getNomUrl(1); print $object_resource->getNomUrl(1);
@ -81,7 +81,7 @@ if( (array) $linked_resources && count($linked_resources) > 0)
print '</a>'; print '</a>';
print '&nbsp;'; print '&nbsp;';
print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">'; print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
print img_delete(); print img_picto($langs->trans("Unlink"), 'unlink');
print '</a>'; print '</a>';
print '</div>'; print '</div>';

2
htdocs/societe/class/societeaccount.class.php
View File

@ -320,7 +320,7 @@ class SocieteAccount extends CommonObject
* @param string $id Id of customer in external system (example: 'cu_xxxxxxxxxxxxx', ...) * @param string $id Id of customer in external system (example: 'cu_xxxxxxxxxxxxx', ...)
* @param string $site Site (example: 'stripe', '...') * @param string $site Site (example: 'stripe', '...')
* @param int $status Status (0=test, 1=live) * @param int $status Status (0=test, 1=live)
* @return string Id of third party * @return int Id of third party
* @see getCustomerAccount() * @see getCustomerAccount()
*/ */
public function getThirdPartyID($id, $site, $status = 0) public function getThirdPartyID($id, $site, $status = 0)

3
htdocs/stripe/class/stripe.class.php
View File

@ -247,6 +247,8 @@ class Stripe extends CommonObject
*/ */
public function getPaymentMethodStripe($paymentmethod, $key = '', $status = 0) public function getPaymentMethodStripe($paymentmethod, $key = '', $status = 0)
{ {
$stripepaymentmethod = null;
try { try {
// Force to use the correct API key // Force to use the correct API key
global $stripearrayofkeysbyenv; global $stripearrayofkeysbyenv;
@ -261,6 +263,7 @@ class Stripe extends CommonObject
{ {
$this->error = $e->getMessage(); $this->error = $e->getMessage();
} }
return $stripepaymentmethod; return $stripepaymentmethod;
} }