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

Merge branch 'develop' of github.com:atm-geoffrey/dolibarr into develop

Browse Source
This commit is contained in:
geoffrey.girard 2014-02-04 18:03:41 +01:00
commit 37dfbe13f6
5 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1408,6 +1408,16 @@ class CommandeFournisseur extends CommonOrder
dol_syslog(get_class($this)."::deleteline sql=".$sql); dol_syslog(get_class($this)."::deleteline sql=".$sql);
if ($resql) if ($resql)
{ {
// Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$result = 0;
$interface=new Interfaces($this->db);
$result = $interface->run_triggers('LINEORDER_SUPPLIER_DELETE',$this,$user,$langs,$conf);
if ($result < 0) {
$error++; $this->errors=$interface->errors;
}
// Fin appel triggers
$result=$this->update_price(); $result=$this->update_price();
return 0; return 0;
} }

25
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -1259,18 +1259,6 @@ class FactureFournisseur extends CommonInvoice
$error=0; $error=0;
$this->db->begin(); $this->db->begin();
if (! $error && ! $notrigger)
{
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('LINEBILL_SUPPLIER_DELETE',$this,$user,$langs,$conf);
if ($result < 0) {
$error++; $this->errors=$interface->errors;
}
// Fin appel triggers
}
if (! $error) if (! $error)
{ {
// Supprime ligne // Supprime ligne
@ -1285,6 +1273,19 @@ class FactureFournisseur extends CommonInvoice
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
} }
} }
if (! $error && ! $notrigger)
{
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('LINEBILL_SUPPLIER_DELETE',$this,$user,$langs,$conf);
if ($result < 0) {
$error++; $this->errors=$interface->errors;
}
// Fin appel triggers
}
if (! $error) if (! $error)
{ {

9
htdocs/fourn/commande/fiche.php
View File

@ -1583,7 +1583,7 @@ elseif (! empty($object->id))
// Edit line // Edit line
if ($action != 'edit_line' || $_GET['rowid'] != $line->id) if ($action != 'edit_line' || $_GET['rowid'] != $line->id)
{ {
print '<tr '.$bc[$var].'>'; print '<tr id="row-'.$line->id.'" '.$bc[$var].'>';
// Show product and description // Show product and description
print '<td>'; print '<td>';
@ -1634,6 +1634,13 @@ elseif (! empty($object->id))
} }
print '<td align="right" class="nowrap">'.price($line->total_ht).'</td>'; print '<td align="right" class="nowrap">'.price($line->total_ht).'</td>';
if (is_object($hookmanager))
{
$parameters=array('line'=>$line,'num'=>$num,'i'=>$i);
$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
}
if ($object->statut == 0 && $user->rights->fournisseur->commande->creer) if ($object->statut == 0 && $user->rights->fournisseur->commande->creer)
{ {
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;rowid='.$line->id.'#'.$line->id.'">'; print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;rowid='.$line->id.'#'.$line->id.'">';

10
htdocs/fourn/facture/fiche.php
View File

@ -1941,7 +1941,7 @@ else
} }
else // Affichage simple de la ligne else // Affichage simple de la ligne
{ {
print '<tr '.$bc[$var].'>'; print '<tr id="row-'.$object->lines[$i]->rowid.'" '.$bc[$var].'>';
// Show product and description // Show product and description
print '<td>'; print '<td>';
@ -1996,7 +1996,13 @@ else
print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ht).'</td>'; print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ht).'</td>';
print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ttc).'</td>'; print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ttc).'</td>';
if (is_object($hookmanager))
{
$parameters=array('line'=>$object->lines[$i],'num'=>$num,'i'=>$i);
$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
}
print '<td align="center" width="16">'; print '<td align="center" width="16">';
if ($object->statut == 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;etat=0&amp;lineid='.$object->lines[$i]->rowid.'">'.img_edit().'</a>'; if ($object->statut == 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;etat=0&amp;lineid='.$object->lines[$i]->rowid.'">'.img_edit().'</a>';
else print '&nbsp;'; else print '&nbsp;';

6
htdocs/product/fournisseurs.php
View File

@ -522,6 +522,12 @@ if ($id || $ref)
print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):"&nbsp;"); print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):"&nbsp;");
print '</td>'; print '</td>';
} }
if (is_object($hookmanager))
{
$parameters=array('id_pfp'=>$productfourn->product_fourn_price_id,'id_fourn'=>$id_fourn,'prod_id'=>$product->id);
$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
}
// Modify-Remove // Modify-Remove
print '<td align="center">'; print '<td align="center">';