Skip to content

Commit

Permalink
Merge pull request #712 from FHenry/3.3
Browse files Browse the repository at this point in the history
Fix [ bug #747 ]
  • Loading branch information
eldy committed Mar 4, 2013
2 parents ae1e0df + f793ed8 commit c0d2ee1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion htdocs/comm/propal.php
Expand Up @@ -745,7 +745,7 @@
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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion htdocs/commande/fiche.php
Expand Up @@ -660,7 +660,7 @@
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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/facture.php
Expand Up @@ -1100,7 +1100,7 @@
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);
}
}

Expand Down

0 comments on commit c0d2ee1

Please sign in to comment.