Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-05 16:42:53 +01:00
Code Issues 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
parent 442fef207c 701b83db38
commit 59bc8ee07c
9 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.
*
* @param string $type Label type (long or short). This can be a translation key.
* @return string|int <0 if ko, label if ok
* @param string $type Label type ('long', 'short' or 'code'). This can be a translation key.
* @return string|int <0 if KO, label if OK (Example: 'long', 'short' or 'unitCODE')
*/
public function getLabelOfUnit($type = 'long')
{
@@ -79,17 +79,16 @@ abstract class CommonObjectLine extends CommonObject
$label_type = 'label';
if ($type == 'short')
{
$label_type = 'short_label';
}
$label_type = 'label';
if ($type == 'short') $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);
if ($resql && $this->db->num_rows($resql) > 0)
{
if ($resql && $this->db->num_rows($resql) > 0) {
$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);
return $label;
} 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
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)
{
global $mysoc;