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

Merge pull request #712 from FHenry/3.3

Browse Source 
Fix [ bug #747 ]
This commit is contained in:
Laurent Destailleur 2013-03-04 08:02:58 -08:00
commit c0d2ee19f5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -745,7 +745,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
$tmptxt.=')';
$desc.= dol_concatdesc($desc, $tmptxt);
$desc= dol_concatdesc($desc, $tmptxt);
}
}

2
htdocs/commande/fiche.php
View File

@ -660,7 +660,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
$tmptxt.=')';
$desc.= dol_concatdesc($desc, $tmptxt);
$desc= dol_concatdesc($desc, $tmptxt);
}
}

2
htdocs/compta/facture.php
View File

@ -1100,7 +1100,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
$tmptxt.=')';
$desc.= dol_concatdesc($desc, $tmptxt);
$desc= dol_concatdesc($desc, $tmptxt);
}
}