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

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

Browse Source 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2020-09-14 02:49:19 +02:00
commit 59bc8ee07c
9 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherentstats.class.php
View File

@ -68,7 +68,7 @@ class AdherentStats extends Stats
$this->field = 'subscription'; $this->field = 'subscription';
$this->where .= " m.statut != 0"; $this->where .= " m.statut != -1";
$this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")"; $this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
//if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; //if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($this->memberid) { if ($this->memberid) {

6
htdocs/adherents/stats/byproperties.php
View File

@ -102,17 +102,17 @@ dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'use
// Print title // Print title
if (!count($data)) { if (!count($data)) {
print $langs->trans("NoValidatedMemberYet").'<br>'; print '<span class="opacitymedium">'.$langs->trans("NoValidatedMemberYet").'</span><br>';
print '<br>'; print '<br>';
} else { } else {
print $langs->trans("MembersByNature").'<br>'; print '<span class="opacitymedium">'.$langs->trans("MembersByNature").'</span><br>';
print '<br>'; print '<br>';
} }
// Print array // Print array
print '<table class="liste centpercent">'; print '<table class="liste centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Nature").'</td>'; print '<td>'.$langs->trans("MemberNature").'</td>';
print '<td class="right">'.$langs->trans("NbOfMembers").'</td>'; print '<td class="right">'.$langs->trans("NbOfMembers").'</td>';
print '<td class="center">'.$langs->trans("LastMemberDate").'</td>'; print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>'; print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';

13
htdocs/adherents/stats/geo.php
View File

@ -204,12 +204,13 @@ if ($mode && !count($data)) {
print $langs->trans("NoValidatedMemberYet").'<br>'; print $langs->trans("NoValidatedMemberYet").'<br>';
print '<br>'; print '<br>';
} else { } else {
if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'<br>'; if ($mode == 'memberbycountry') print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';
elseif ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'<br>'; elseif ($mode == 'memberbystate') print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';
elseif ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'<br>'; elseif ($mode == 'memberbytown') print '<span class="opacitymedium">'.$langs->trans("MembersByTownDesc").'</span><br>';
elseif ($mode == 'memberbyregion') print $langs->trans("MembersByRegion").'<br>'; //+ elseif ($mode == 'memberbyregion') print '<span class="opacitymedium">'.$langs->trans("MembersByRegion").'</span><br>'; //+
else { else
print $langs->trans("MembersStatisticsDesc").'<br>'; {
print '<span class="opacitymedium">'.$langs->trans("MembersStatisticsDesc").'</span><br>';
print '<br>'; print '<br>';
print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>'; print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
print '<br>'; print '<br>';

4
htdocs/adherents/stats/index.php
View File

@ -176,9 +176,9 @@ foreach ($data as $val) {
$oldyear--; $oldyear--;
print '<tr class="oddeven" height="24">'; print '<tr class="oddeven" height="24">';
print '<td class="center">'; print '<td class="center">';
print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">'; //print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
print $oldyear; print $oldyear;
print '</a>'; //print '</a>';
print '</td>'; print '</td>';
print '<td class="right">0</td>'; print '<td class="right">0</td>';
print '<td class="right">0</td>'; print '<td class="right">0</td>';

13
htdocs/admin/system/dolibarr.php
View File

@ -367,8 +367,7 @@ foreach ($configfileparameters as $key => $value)
print "<td>"; print "<td>";
if ($newkey == 'dolibarr_main_db_pass') print preg_replace('/./i', '*', ${$newkey}); if ($newkey == 'dolibarr_main_db_pass') print preg_replace('/./i', '*', ${$newkey});
elseif ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/', ${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT'); elseif ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/', ${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT');
elseif ($newkey == 'dolibarr_main_document_root_alt') elseif ($newkey == 'dolibarr_main_document_root_alt') {
{
$tmparray = explode(',', ${$newkey}); $tmparray = explode(',', ${$newkey});
$i = 0; $i = 0;
foreach ($tmparray as $value2) foreach ($tmparray as $value2)
@ -382,8 +381,7 @@ foreach ($configfileparameters as $key => $value)
} }
++$i; ++$i;
} }
} elseif ($newkey == 'dolibarr_main_instance_unique_id') } elseif ($newkey == 'dolibarr_main_instance_unique_id') {
{
//print $conf->file->instance_unique_id; //print $conf->file->instance_unique_id;
global $dolibarr_main_cookie_cryptkey; global $dolibarr_main_cookie_cryptkey;
$valuetoshow = ${$newkey} ? ${$newkey} : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey $valuetoshow = ${$newkey} ? ${$newkey} : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
@ -392,6 +390,13 @@ foreach ($configfileparameters as $key => $value)
print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id'); print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
} }
print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>'; print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
} elseif ($newkey == 'dolibarr_main_prod') {
print ${$newkey};
$valuetoshow = ${$newkey};
if (empty($valuetoshow)) {
print img_warning($langs->trans('SwitchThisForABetterSecurity'));
}
} else { } else {
print ${$newkey}; print ${$newkey};
} }

21
htdocs/core/class/commonobjectline.class.php
View File

@ -61,11 +61,11 @@ abstract class CommonObjectLine extends CommonObject
} }
/** /**
* Returns the translation key from units dictionary. * Returns the label, shot_label or code found in units dictionary from ->fk_unit.
* A langs->trans() must be called on result to get translated value. * A langs->trans() must be called on result to get translated value.
* *
* @param string $type Label type (long or short). This can be a translation key. * @param string $type Label type ('long', 'short' or 'code'). This can be a translation key.
* @return string|int <0 if ko, label if ok * @return string|int <0 if KO, label if OK (Example: 'long', 'short' or 'unitCODE')
*/ */
public function getLabelOfUnit($type = 'long') public function getLabelOfUnit($type = 'long')
{ {
@ -79,17 +79,16 @@ abstract class CommonObjectLine extends CommonObject
$label_type = 'label'; $label_type = 'label';
if ($type == 'short') $label_type = 'label';
{ if ($type == 'short') $label_type = 'short_label';
$label_type = 'short_label'; elseif ($type == 'code') $label_type = 'code';
}
$sql = 'select '.$label_type.',code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit; $sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql && $this->db->num_rows($resql) > 0) if ($resql && $this->db->num_rows($resql) > 0) {
{
$res = $this->db->fetch_array($resql); $res = $this->db->fetch_array($resql);
$label = ($label_type == 'short' ? $res[$label_type] : 'unit'.$res['code']); if ($label_type == 'code') $label = 'unit'.$res['code'];
else $label = $res[$label_type];
$this->db->free($resql); $this->db->free($resql);
return $label; return $label;
} else { } else {

7
htdocs/core/tpl/objectline_title.tpl.php
View File

@ -59,7 +59,12 @@ if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier'
} }
// VAT // VAT
print '<td class="linecolvat right" style="width: 80px">'.$langs->trans('VAT'); print '<td class="linecolvat right" style="width: 80px">'
if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX2_OPTION)) {
print $langs->trans('Taxes');
} else {
print $langs->trans('VAT');
}
if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT)
{ {
global $mysoc; global $mysoc;

1
htdocs/langs/en_US/admin.lang
View File

@ -2056,3 +2056,4 @@ TemplateAdded=Template added
TemplateUpdated=Template updated TemplateUpdated=Template updated
TemplateDeleted=Template deleted TemplateDeleted=Template deleted
MailToSendEventPush=Template for event reminder emails MailToSendEventPush=Template for event reminder emails
SwitchThisForABetterSecurity=Switching this value to 1 is recommended for more security

17
htdocs/product/class/product.class.php
View File

@ -5205,10 +5205,12 @@ class Product extends CommonObject
} }
/** /**
* Returns the text label from units dictionary * Returns the label, shot_label or code found in units dictionary from ->fk_unit.
* A langs->trans() must be called on result to get translated value.
* *
* @param string $type Label type (long or short) * @param string $type Label type (long, short or code)
* @return string|int <0 if ko, label if ok * @return string|int <0 if KO, label if OK (Example: 'long', 'short', 'unitCODE')
* @see getLabelOfUnit() in CommonObjectLine
*/ */
public function getLabelOfUnit($type = 'long') public function getLabelOfUnit($type = 'long')
{ {
@ -5221,16 +5223,15 @@ class Product extends CommonObject
$langs->load('products'); $langs->load('products');
$label_type = 'label'; $label_type = 'label';
if ($type == 'short') $label_type = 'short_label';
if ($type == 'short') { elseif ($type == 'code') $label_type = 'code';
$label_type = 'short_label';
}
$sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit; $sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql && $this->db->num_rows($resql) > 0) { if ($resql && $this->db->num_rows($resql) > 0) {
$res = $this->db->fetch_array($resql); $res = $this->db->fetch_array($resql);
$label = ($label_type == 'short_label' ? $res[$label_type] : 'unit'.$res['code']); if ($label_type == 'code') $label = 'unit'.$res['code'];
else $label = $res[$label_type];
$this->db->free($resql); $this->db->free($resql);
return $label; return $label;
} else { } else {