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

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-08-29 10:08:46 +02:00
commit 4da73a8d82
10 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/contrat/fiche.php
View File

@ -1277,9 +1277,10 @@ else
print '<td colspan="3">';
// multiprix
if($conf->global->PRODUIT_MULTIPRICES)
$form->select_produits('','idprod',1,$conf->product->limit_size,$object->thirdparty->price_level);
$form->select_produits('','idprod',1,$conf->product->limit_size,$object->thirdparty->price_level);
else
$form->select_produits('','idprod',1,$conf->product->limit_size);
$form->select_produits('','idprod',1,$conf->product->limit_size);
print '<br>';
print '<textarea name="desc" cols="70" rows="'.ROWS_2.'"></textarea>';
print '</td>';

4
htdocs/core/boxes/box_bookmarks.php
View File

@ -116,7 +116,9 @@ class box_bookmarks extends ModeleBoxes
}
else
{
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else {

4
htdocs/core/boxes/box_comptes.php
View File

@ -141,7 +141,9 @@ class box_comptes extends ModeleBoxes
}
}
else {
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else {

4
htdocs/core/boxes/box_contracts.php
View File

@ -138,7 +138,9 @@ class box_contracts extends ModeleBoxes
}
else
{
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else

4
htdocs/core/boxes/box_factures_fourn.php
View File

@ -139,7 +139,9 @@ class box_factures_fourn extends ModeleBoxes
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoModifiedSupplierBills"));
}
else {
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else {

4
htdocs/core/boxes/box_fournisseurs.php
View File

@ -114,7 +114,9 @@ class box_fournisseurs extends ModeleBoxes
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedSuppliers"));
}
else {
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else {

4
htdocs/core/boxes/box_osc_client.php
View File

@ -92,7 +92,9 @@ class box_osc_clients extends ModeleBoxes
}
}
else {
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else {

4
htdocs/core/boxes/box_propales.php
View File

@ -134,7 +134,9 @@ class box_propales extends ModeleBoxes
}
else
{
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else

4
htdocs/core/boxes/box_services_expired.php
View File

@ -134,7 +134,9 @@ class box_services_expired extends ModeleBoxes
}
else
{
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}

4
htdocs/core/boxes/box_supplier_orders.php
View File

@ -129,7 +129,9 @@ class box_supplier_orders extends ModeleBoxes
}
else
{
dol_print_error($db);
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else