From 706dd838c9cbccd675e9de6f12afb732280e962d Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Wed, 1 Mar 2017 11:21:49 +0100 Subject: [PATCH 1/5] Situation total row left a col if bank enabled --- htdocs/compta/facture.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 6c311224ba0..2bc8b86a19c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3664,6 +3664,9 @@ else if ($id > 0 || ! empty($ref)) print ''; print ''; + if (! empty($conf->banque->enabled)) + print ''; + print '' . price($total_next_ht) . ''; print '' . price($total_next_ttc) . ''; print ' '; From a371b275646e0f693622343744bfa5950c46d5da Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Wed, 1 Mar 2017 16:48:09 +0100 Subject: [PATCH 2/5] better management of situation progress in pdf --- .../core/modules/facture/doc/pdf_crabe.modules.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index fc9bae07c9c..a8284213022 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -453,7 +453,7 @@ class pdf_crabe extends ModelePDFFactures $pageposafter=$pageposbefore; //print $pageposafter.'-'.$pageposbefore;exit; $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it. - pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc); + pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX-$progress_width,3,$curX,$curY,$hideref,$hidedesc); $pageposafter=$pdf->getPage(); $posyafter=$pdf->GetY(); //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit; @@ -1452,6 +1452,17 @@ class pdf_crabe extends ModelePDFFactures $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C'); } } + + if ($this->situationinvoice) + { + $pdf->line($this->postotalht+4, $tab_top, $this->postotalht+4, $tab_top + $tab_height); + if (empty($hidetop)) + { + $pdf->SetXY($this->postotalht-19, $tab_top+1); + $pdf->MultiCell(30,2, $outputlangs->transnoentities("Situation"),'','C'); + } + } + if ($this->atleastonediscount) { $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height); From 83622c62bed27000d45e77282a84ddc588cd2962 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Wed, 1 Mar 2017 21:54:30 +0100 Subject: [PATCH 3/5] Update pdf_crabe.modules.php --- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index a8284213022..2b3209a183b 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1543,6 +1543,7 @@ class pdf_crabe extends ModelePDFFactures if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir"); if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit"); if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat"); + if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation"); $pdf->MultiCell($w, 3, $title, '', 'R'); $pdf->SetFont('','B',$default_font_size); From d3a80795ceed3ed482f33e45fac76b0fb1400bf1 Mon Sep 17 00:00:00 2001 From: dolibarr95 Date: Thu, 2 Mar 2017 11:40:43 +0100 Subject: [PATCH 4/5] Add label tag Add a label html tag for the input radio extrafield tag. --- htdocs/core/class/extrafields.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 1211c334617..24023eb4d89 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1018,8 +1018,9 @@ class ExtraFields { $out.=''; + $out.='/>
'; } } elseif ($type == 'chkbxlst') From 29cb5dd5452d1704c54271f1d91241497e240ec7 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 3 Mar 2017 11:48:04 +0100 Subject: [PATCH 5/5] FIX input stock value not display the good array is "value" (like in the card tabs who give the right value) --- htdocs/product/stock/mouvement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index a5daa87a510..d23dca08282 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -574,7 +574,7 @@ if ($resql) // Value print ''.$langs->trans("EstimatedStockValueShort").''; - print price((empty($calcproducts['qty'])?'0':price2num($calcproducts['qty'],'MT')), 0, $langs, 0, -1, -1, $conf->currency); + print price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency); print ""; // Last movement