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

Merge pull request #370 from simnandez/develop

Browse Source 
Develop
This commit is contained in:
Laurent Destailleur 2012-09-05 05:43:16 -07:00
commit 2aafe5eef1
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,7 +7,7 @@ English Dolibarr ChangeLog
For users: For users:
- New: If field "signature" is filled into user table, text is added - New: If field "signature" is filled into user table, text is added
at end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on, this at end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on, this
feautre is disabled. feature is disabled.
- New: Add link "Back to list" on all cards. - New: Add link "Back to list" on all cards.
- New: After first install, warning are visible onto mandatory setup not - New: After first install, warning are visible onto mandatory setup not
configured. Show also total number of activated modules. configured. Show also total number of activated modules.
@ -67,6 +67,7 @@ For developers:
action/calendar, trips and expenses, dons, vat payment, contact/society, contract, product lines, action/calendar, trips and expenses, dons, vat payment, contact/society, contract, product lines,
expedition, order supplier and order invoice (lines included), intervention card, project, tasks. expedition, order supplier and order invoice (lines included), intervention card, project, tasks.
- New: Add ChromePHP output into syslog module. - New: Add ChromePHP output into syslog module.
- New: Add PRODUCT_PRICE_MODIFY trigger.
For translators: For translators:
- New: Update language files (de, tr, pt, ca, es, en, fr). - New: Update language files (de, tr, pt, ca, es, en, fr).

10
htdocs/product/class/product.class.php
View File

@ -1027,6 +1027,16 @@ class Product extends CommonObject
$this->localtax2_tx = $localtax2; $this->localtax2_tx = $localtax2;
$this->_log_price($user,$level); $this->_log_price($user,$level);
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('PRODUCT_PRICE_MODIFY',$this,$user,$langs,$conf);
if ($result < 0)
{
$error++; $this->errors=$interface->errors;
}
// Fin appel triggers
} }
else else
{ {