Skip to content
Snippets Groups Projects
Commit e79750dc authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

I continue bug war week-end

parent e5d0bc9d
Branches
Tags
No related merge requests found
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2006-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -85,7 +85,7 @@ if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty')) ...@@ -85,7 +85,7 @@ if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty'))
if (empty($forbarcode) || empty($fk_barcode_type)) if (empty($forbarcode) || empty($fk_barcode_type))
{ {
setEventMessages($langs->trans("DefinitionOfBarCodeForProductNotComplete",$thirdpartytmp->getNomUrl()), null, 'warnings'); setEventMessages($langs->trans("DefinitionOfBarCodeForThirdpartyNotComplete",$thirdpartytmp->getNomUrl()), null, 'warnings');
} }
} }
} }
...@@ -387,11 +387,11 @@ print '<br>'; ...@@ -387,11 +387,11 @@ print '<br>';
if ($producttmp->id > 0) if ($producttmp->id > 0)
{ {
print $langs->trans("BarCodeDataForProduct",$producttmp->getNomUrl(1)).'<br>'; print $langs->trans("BarCodeDataForProduct",'').' '.$producttmp->getNomUrl(1).'<br>';
} }
if ($thirdpartytmp->id > 0) if ($thirdpartytmp->id > 0)
{ {
print $langs->trans("BarCodeDataForThirdparty",$thirdpartytmp->getNomUrl(1)).'<br>'; print $langs->trans("BarCodeDataForThirdparty",'').' '.$thirdpartytmp->getNomUrl(1).'<br>';
} }
print '<div class="tagtable">'; print '<div class="tagtable">';
......
...@@ -362,7 +362,7 @@ HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF ...@@ -362,7 +362,7 @@ HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
HideDescOnPDF=Hide products description on generated PDF HideDescOnPDF=Hide products description on generated PDF
HideRefOnPDF=Hide products ref. on generated PDF HideRefOnPDF=Hide products ref. on generated PDF
HideDetailsOnPDF=Hide products lines details on generated PDF HideDetailsOnPDF=Hide products lines details on generated PDF
PlaceCustomerAddressToIsoLocation=Use french standard position (La Posteà for customer address position PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
Library=Library Library=Library
UrlGenerationParameters=Parameters to secure URLs UrlGenerationParameters=Parameters to secure URLs
SecurityTokenIsUnique=Use a unique securekey parameter for each URL SecurityTokenIsUnique=Use a unique securekey parameter for each URL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment