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

Merge pull request #1382 from atm-geoffrey/develop

Browse Source 
Add new doActions and formObjectOptions hook on supplier prices page
This commit is contained in:
Laurent Destailleur 2014-01-27 01:43:08 -08:00
commit 0d0fda8fae
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -199,11 +199,28 @@ class ProductFournisseur extends Product
dol_syslog(get_class($this).'::update_buyprice sql='.$sql); dol_syslog(get_class($this).'::update_buyprice sql='.$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('UPDATE_BUYPRICE',$this,$user,$langs,$conf);
if ($result < 0)
{
$error++; $this->errors=$interface->errors;
}
if (empty($error))
{ {
$this->db->commit(); $this->db->commit();
return 0; return 0;
} }
else else
{
$this->db->rollback();
return 1;
}
}
else
{ {
$this->error=$this->db->error()." sql=".$sql; $this->error=$this->db->error()." sql=".$sql;
$this->db->rollback(); $this->db->rollback();

10
htdocs/product/fournisseurs.php
View File

@ -73,6 +73,10 @@ if (! $sortorder) $sortorder="ASC";
* Actions * Actions
*/ */
$parameters=array('socid'=>$socid, 'id_prod'=>$id);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
if ($action == 'remove_pf') if ($action == 'remove_pf')
{ {
$product = new ProductFournisseur($db); $product = new ProductFournisseur($db);
@ -386,6 +390,12 @@ if ($id || $ref)
print '</tr>'; print '</tr>';
} }
if (is_object($hookmanager))
{
$parameters=array('id_fourn'=>$id_fourn,'prod_id'=>$product->id);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);
}
print '</table>'; print '</table>';
print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'">'; print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'">';