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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-19 09:58:04 +01:00
commit c94c33696a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -53,6 +53,7 @@ FIX: Remove unexisting link
FIX: substitute lines dates values on doc generator (ODT, ...) FIX: substitute lines dates values on doc generator (ODT, ...)
FIX: Ticket - Load Cache Messages Ticket, wrong message's status FIX: Ticket - Load Cache Messages Ticket, wrong message's status
FIX: Ticket Public - Private messages are displayed FIX: Ticket Public - Private messages are displayed
FIX: wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php
***** ChangeLog for 11.0.2 compared to 11.0.1 ***** ***** ChangeLog for 11.0.2 compared to 11.0.1 *****
FIX: #10309 FIX: #10309

7
htdocs/compta/facture/card.php
View File

@ -2565,7 +2565,12 @@ if (empty($reshook))
$pa_ht = $originLine->pa_ht; $pa_ht = $originLine->pa_ht;
$label = $originLine->label; $label = $originLine->label;
$array_options = $originLine->array_options; $array_options = $originLine->array_options;
$situation_percent = 100; if($object->type == Facture::TYPE_SITUATION){
$situation_percent = 0;
}
else{
$situation_percent = 100;
}
$fk_prev_id = ''; $fk_prev_id = '';
$fk_unit = $originLine->fk_unit; $fk_unit = $originLine->fk_unit;
$pu_ht_devise = $originLine->multicurrency_subprice; $pu_ht_devise = $originLine->multicurrency_subprice;

3
htdocs/core/class/commonobject.class.php
View File

@ -4125,7 +4125,7 @@ abstract class CommonObject
*/ */
public function printObjectLines($action, $seller, $buyer, $selected = 0, $dateSelector = 0, $defaulttpldir = '/core/tpl') public function printObjectLines($action, $seller, $buyer, $selected = 0, $dateSelector = 0, $defaulttpldir = '/core/tpl')
{ {
global $conf, $hookmanager, $langs, $user, $object, $form, $extrafields; global $conf, $hookmanager, $langs, $user, $form, $extrafields, $object;
// TODO We should not use global var for this // TODO We should not use global var for this
global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax; global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
@ -4149,6 +4149,7 @@ abstract class CommonObject
{ {
// Output template part (modules that overwrite templates must declare this into descriptor) // Output template part (modules that overwrite templates must declare this into descriptor)
// Use global variables + $dateSelector + $seller and $buyer // Use global variables + $dateSelector + $seller and $buyer
// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook.
$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir)); $dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
foreach ($dirtpls as $module => $reldir) foreach ($dirtpls as $module => $reldir)
{ {