Fix VAT code removal issue when applying global discounts #29512
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eldy
requested changes
Apr 27, 2024
htdocs/comm/propal/card.php
Outdated
| @@ -959,7 +959,7 @@ | |||
| $remise_percent = (GETPOST('remiseforalllines') ? GETPOST('remiseforalllines') : 0); | |||
| $remise_percent = str_replace('*', '', $remise_percent); | |||
| foreach ($object->lines as $line) { | |||
| $result = $object->updateline($line->id, $line->subprice, $line->qty, $remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice); | |||
| $result = $object->updateline($line->id, $line->subprice, $line->qty, $remise_percent, $line->tva_tx ." ($line->vat_src_code)", $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice); | |||
There was a problem hiding this comment.
If line->vat_src_code is not defined, the concat of " (vatcode)" must not be done.
There was a problem hiding this comment.
I did it like this in next pr:
$tvatx= $line->tva_tx;
if ( !empty($line->vat_src_code) ) {
$tvatx .= '('.$line->vat_src_code.')';
}
$result = $object->updateline($line->id, $line->subprice, $line->qty, $remise_percent, $tvatx, ....)
eldy
added
the
PR to fix or conflict to solve
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
Following the pr: #29484