Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
2aafe5ee
Commit
2aafe5ee
authored
12 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge pull request #370 from simnandez/develop
Develop
parents
765fd934
f164bb67
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+2
-1
2 additions, 1 deletion
ChangeLog
htdocs/product/class/product.class.php
+10
-0
10 additions, 0 deletions
htdocs/product/class/product.class.php
with
12 additions
and
1 deletion
ChangeLog
+
2
−
1
View file @
2aafe5ee
...
@@ -7,7 +7,7 @@ English Dolibarr ChangeLog
...
@@ -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
fea
u
tre is disabled.
feat
u
re 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:
...
@@ -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).
...
...
This diff is collapsed.
Click to expand it.
htdocs/product/class/product.class.php
+
10
−
0
View file @
2aafe5ee
...
@@ -1027,6 +1027,16 @@ class Product extends CommonObject
...
@@ -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
{
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment