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

Merge branch '3.4' into translations

Browse Source
This commit is contained in:
Marcos García 2013-06-08 20:29:07 +02:00
commit a06de736c2
4 changed files with 8 additions and 9 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'))
{
setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Title")), 'errors');
setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), 'errors');
$action = "create";
$error++;
}
@ -138,7 +138,7 @@ if ($action == 'create')
print '</td></tr>';
// 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 '</td>';

6
htdocs/compta/facture/stats/index.php
View File

@ -54,8 +54,8 @@ $endyear=$year;
* View
*/
$langs->load("bills");
$langs->load("companies");
$langs->load("bills");
$langs->load("companies");
$form=new Form($db);
@ -233,7 +233,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print $form->select_company($socid,'socid',$filter,1);
print '</td></tr>';
// User
print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
print '<tr><td>'.$langs->trans("Author").'</td><td>';
print $form->select_users($userid,'userid',1);
print '</td></tr>';
// Year

1
htdocs/product/composition/fiche.php
View File

@ -72,7 +72,6 @@ $cancel <> $langs->trans("Cancel") &&
$error=0;
for($i=0;$i<$_POST["max_prod"];$i++)
{
print "<br> : ".$_POST["prod_id_chk".$i];
if ($_POST["prod_id_chk".$i] > 0)
{
if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0)

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)
// Try an offset when an invoice already exists
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
$result=$numbering->getNextValue($mysoc, $localobject2);
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
$result=$numbering->getNextValue($mysoc, $localobject2);
// Now we try with a different fiscal month (forced by mask)
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';