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

Merge pull request #14369 from Tim-Otte/fix-product-unit-translation

Browse Source 
Fixed translation of product units in documents
This commit is contained in:
Laurent Destailleur 2020-08-04 11:50:50 +02:00 committed by GitHub
commit e455f8afa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/bom/class/bom.class.php
View File

@ -929,6 +929,7 @@ class BOM extends CommonObject
global $conf, $langs;
$langs->load("mrp");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'standard';

1
htdocs/comm/propal/class/propal.class.php
View File

@ -3664,6 +3664,7 @@ class Propal extends CommonObject
global $conf, $langs;
$langs->load("propale");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'azur';

1
htdocs/commande/class/commande.class.php
View File

@ -3859,6 +3859,7 @@ class Commande extends CommonOrder
global $conf, $langs;
$langs->load("orders");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'einstein';

1
htdocs/compta/facture/class/facture.class.php
View File

@ -4296,6 +4296,7 @@ class Facture extends CommonInvoice
global $conf, $langs;
$langs->load("bills");
$outputlangs->load("products");
if (!dol_strlen($modele))
{

1
htdocs/contrat/class/contrat.class.php
View File

@ -2393,6 +2393,7 @@ class Contrat extends CommonObject
global $conf, $langs;
$langs->load("contracts");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'strato';

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

@ -74,12 +74,12 @@ abstract class CommonObjectLine extends CommonObject
$label_type = 'short_label';
}
$sql = 'select '.$label_type.' 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)
{
$res = $this->db->fetch_array($resql);
$label = $res[$label_type];
$label = ($label_type == 'short' ? $res[$label_type] : 'unit'.$res['code']);
$this->db->free($resql);
return $label;
} else {

1
htdocs/expedition/class/expedition.class.php
View File

@ -2463,6 +2463,7 @@ class Expedition extends CommonObject
global $conf, $langs;
$langs->load("sendings");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'rouget';

1
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2966,6 +2966,7 @@ class CommandeFournisseur extends CommonOrder
global $conf, $langs;
$langs->load("suppliers");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'muscadet';

1
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -2641,6 +2641,7 @@ class FactureFournisseur extends CommonInvoice
global $conf, $user, $langs;
$langs->load("suppliers");
$outputlangs->load("products");
// Set the model on the model name to use
if (empty($modele))

1
htdocs/livraison/class/livraison.class.php
View File

@ -1035,6 +1035,7 @@ class Livraison extends CommonObject
global $conf, $user, $langs;
$langs->load("deliveries");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'typhon';

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

@ -4428,6 +4428,7 @@ class Product extends CommonObject
global $conf, $user, $langs;
$langs->load("products");
$outputlangs->load("products");
// Positionne le modele sur le nom du modele a utiliser
if (!dol_strlen($modele)) {

1
htdocs/product/stock/class/entrepot.class.php
View File

@ -859,6 +859,7 @@ class Entrepot extends CommonObject
global $conf, $user, $langs;
$langs->load("stocks");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'standard';

1
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -1167,6 +1167,7 @@ class MouvementStock extends CommonObject
global $conf, $user, $langs;
$langs->load("stocks");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'stdmovement';

1
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -2630,6 +2630,7 @@ class SupplierProposal extends CommonObject
global $conf, $langs;
$langs->load("supplier_proposal");
$outputlangs->load("products");
if (!dol_strlen($modele)) {
$modele = 'aurore';