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

Fix translation

Browse Source
This commit is contained in:
Laurent Destailleur 2015-08-17 19:42:19 +02:00
parent 7ff149e876
commit 76ce98630f
2 changed files with 213 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
htdocs/core/modules/project/doc/pdf_beluga.modules.php
View File

@ -323,7 +323,6 @@ if ($num> 0)
$pdf->SetXY($this->posxref, $curY); $pdf->SetXY($this->posxref, $curY);
$pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L'); $pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
$selectList = $formproject->select_element($tablename, $project->thirdparty->id); $selectList = $formproject->select_element($tablename, $project->thirdparty->id);
$nexY = $pdf->GetY() + 1; $nexY = $pdf->GetY() + 1;
$curY = $nexY; $curY = $nexY;
@ -333,22 +332,18 @@ if ($num> 0)
$pdf->MultiCell($this->posxsociety - $this->posxdate, 3, $outputlangs->transnoentities("Date"), 1, 'C'); $pdf->MultiCell($this->posxsociety - $this->posxdate, 3, $outputlangs->transnoentities("Date"), 1, 'C');
$pdf->SetXY($this->posxsociety, $curY); $pdf->SetXY($this->posxsociety, $curY);
$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $outputlangs->transnoentities("ThirdParty"), 1, 'L'); $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $outputlangs->transnoentities("ThirdParty"), 1, 'L');
if (empty($value['disableamount'])) if (empty($value['disableamount'])) {
{
$pdf->SetXY($this->posxamountht, $curY); $pdf->SetXY($this->posxamountht, $curY);
$pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHT"), 1, 'R'); $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHT"), 1, 'R');
$pdf->SetXY($this->posxamountttc, $curY); $pdf->SetXY($this->posxamountttc, $curY);
$pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTC"), 1, 'R'); $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTC"), 1, 'R');
} } else {
else
{
$pdf->SetXY($this->posxamountht, $curY); $pdf->SetXY($this->posxamountht, $curY);
$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R'); $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
} }
$pdf->SetXY($this->posxstatut, $curY); $pdf->SetXY($this->posxstatut, $curY);
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Statut"), 1, 'R'); $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Statut"), 1, 'R');
if (is_array($elementarray) && count($elementarray) > 0) if (is_array($elementarray) && count($elementarray) > 0)
{ {
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
@ -357,31 +352,32 @@ if ($num> 0)
$total_ht = 0; $total_ht = 0;
$total_ttc = 0; $total_ttc = 0;
$num = count($elementarray); $num = count($elementarray);
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i ++) {
{
$element = new $classname($this->db); $element = new $classname($this->db);
$element->fetch($elementarray[$i]); $element->fetch($elementarray[$i]);
$element->fetch_thirdparty(); $element->fetch_thirdparty();
// print $classname; // print $classname;
$qualifiedfortotal = true; $qualifiedfortotal = true;
if ($key == 'invoice') if ($key == 'invoice') {
{ if ($element->close_code == 'replaced')
if ($element->close_code == 'replaced') $qualifiedfortotal=false; // Replacement invoice $qualifiedfortotal = false; // Replacement invoice
} }
$pdf->SetXY($this->posxref, $curY); $pdf->SetXY($this->posxref, $curY);
$pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L'); $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
// Date // Date
if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order') $date=$element->date_commande; if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
else $date = $element->date_commande;
{ else {
$date = $element->date; $date = $element->date;
if (empty($date)) $date=$element->datep; if (empty($date))
if (empty($date)) $date=$element->date_contrat; $date = $element->datep;
if (empty($date)) $date=$element->datev; //Fiche inter if (empty($date))
$date = $element->date_contrat;
if (empty($date))
$date = $element->datev; // Fiche inter
} }
$pdf->SetXY($this->posxdate, $curY); $pdf->SetXY($this->posxdate, $curY);
@ -391,19 +387,13 @@ if ($num> 0)
if (is_object($element->thirdparty)) if (is_object($element->thirdparty))
$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $element->thirdparty->name, 1, 'L'); $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $element->thirdparty->name, 1, 'L');
// Amount without tax // Amount without tax
if (empty($value['disableamount'])) if (empty($value['disableamount'])) {
{
$pdf->SetXY($this->posxamountht, $curY); $pdf->SetXY($this->posxamountht, $curY);
$pdf->MultiCell($this->posxamountttc-$this->posxamountht, 3, $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($element->total_ht) : '&nbsp;'), 1, 'R');
(isset($element->total_ht)?price($element->total_ht):'&nbsp;'), 1, 'R');
$pdf->SetXY($this->posxamountttc, $curY); $pdf->SetXY($this->posxamountttc, $curY);
$pdf->MultiCell($this->posxstatut-$this->posxamountttc, 3, $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : '&nbsp;'), 1, 'R');
(isset($element->total_ttc)?price($element->total_ttc):'&nbsp;'), 1, 'R'); } else {
}
else
{
$pdf->SetXY($this->posxamountht, $curY); $pdf->SetXY($this->posxamountht, $curY);
$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R'); $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
} }
@ -416,11 +406,9 @@ if ($num> 0)
$outputstatut = $element->getLibStatut(1); $outputstatut = $element->getLibStatut(1);
} }
$pdf->SetXY($this->posxstatut, $curY); $pdf->SetXY($this->posxstatut, $curY);
$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxstatut, 3, $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputstatut, 1, 'R', false, 1, '', '', true, 0, true);
$outputstatut, 1, 'R',false, 1, '', '', true, 0, true);
if ($qualifiedfortotal) if ($qualifiedfortotal) {
{
$total_ht = $total_ht + $element->total_ht; $total_ht = $total_ht + $element->total_ht;
$total_ttc = $total_ttc + $element->total_ttc; $total_ttc = $total_ttc + $element->total_ttc;
} }
@ -428,21 +416,16 @@ $nexY = $pdf->GetY();
$curY = $nexY; $curY = $nexY;
} }
if (empty($value['disableamount'])) {
if (empty($value['disableamount']))
{
$curY = $nexY; $curY = $nexY;
$pdf->SetXY($this->posxref, $curY); $pdf->SetXY($this->posxref, $curY);
$pdf->MultiCell($this->posxamountttc - $this->posxref, 3, "TOTAL", 1, 'L'); $pdf->MultiCell($this->posxamountttc - $this->posxref, 3, "TOTAL", 1, 'L');
$pdf->SetXY($this->posxamountht, $curY); $pdf->SetXY($this->posxamountht, $curY);
$pdf->MultiCell($this->posxamountttc-$this->posxamountht, 3, $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($total_ht) : '&nbsp;'), 1, 'R');
(isset($element->total_ht)?price($total_ht):'&nbsp;'), 1, 'R');
$pdf->SetXY($this->posxamountttc, $curY); $pdf->SetXY($this->posxamountttc, $curY);
$pdf->MultiCell($this->posxstatut-$this->posxamountttc, 3, $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($total_ttc) : '&nbsp;'), 1, 'R');
(isset($element->total_ttc)?price($total_ttc):'&nbsp;'), 1, 'R');
$pdf->SetXY($this->posxstatut, $curY); $pdf->SetXY($this->posxstatut, $curY);
$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxstatut, 3, $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Nb") . " " . $num, 1, 'L');
$outputlangs->transnoentities("Nb")." ".$num, 1, 'L');
} }
$nexY = $pdf->GetY() + 5; $nexY = $pdf->GetY() + 5;
$curY = $nexY; $curY = $nexY;

3
htdocs/langs/en_US/projects.lang
View File

@ -143,7 +143,8 @@ SelectElement=Select element
AddElement=Link to element AddElement=Link to element
UnlinkElement=Unlink element UnlinkElement=Unlink element
# Documents models # Documents models
DocumentModelBaleine=A complete project's report model (logo...) DocumentModelBeluga=Project template for linked objects overview
DocumentModelBaleine=Project report template for tasks
PlannedWorkload=Planned workload PlannedWorkload=Planned workload
PlannedWorkloadShort=Workload PlannedWorkloadShort=Workload
WorkloadOccupation=Workload assignation WorkloadOccupation=Workload assignation