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

Merge pull request #1028 from marcosgdf/minor

Browse Source 
Entities problem with error message in predefined invoice creation
This commit is contained in:
Laurent Destailleur 2013-06-08 11:01:34 -07:00
commit 5eac7a0bcc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture/fiche-rec.php
View File

@ -65,7 +65,7 @@ if ($action == 'add')
{ {
if (! GETPOST('titre')) if (! GETPOST('titre'))
{ {
setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Title")), 'errors'); setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), 'errors');
$action = "create"; $action = "create";
$error++; $error++;
} }
@ -138,7 +138,7 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
// Title // Title
print '<tr><td>'.$langs->trans("Title").'</td><td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td>';
print '<input class="flat" type="text" name="titre" size="24" value="'.$_POST["titre"].'">'; print '<input class="flat" type="text" name="titre" size="24" value="'.$_POST["titre"].'">';
print '</td>'; print '</td>';

6
test/phpunit/NumberingModulesTest.php
View File

@ -212,9 +212,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2) $this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2)
// Try an offset when an invoice already exists // Try an offset when an invoice already exists
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}'; $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}'; $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
$result=$numbering->getNextValue($mysoc, $localobject2); $result=$numbering->getNextValue($mysoc, $localobject2);
// Now we try with a different fiscal month (forced by mask) // Now we try with a different fiscal month (forced by mask)
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}'; $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';