From 3a053e3fedd5bb3b7668d128750461a6adc8b4ed Mon Sep 17 00:00:00 2001 From: Gregory DAVID Date: Fri, 7 Feb 2014 18:08:25 +0100 Subject: [PATCH 0001/1190] =?UTF-8?q?Donne=20la=20possibilit=C3=A9=20de=20?= =?UTF-8?q?faire=20un=20filtrage=20sur=20les=20agenda=20en=20fonction=20du?= =?UTF-8?q?=20num=C3=A9ro=20de=20projet=20pass=C3=A9=20en=20GET=20:=20&pro?= =?UTF-8?q?ject=3DXX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/action/class/actioncomm.class.php | 1 + htdocs/public/agenda/agendaexport.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 10082062d06..9f1a5cdfeff 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -893,6 +893,7 @@ class ActionComm extends CommonObject if ($key == 'id') $sql.=" AND a.id=".(is_numeric($value)?$value:0); if ($key == 'idfrom') $sql.=" AND a.id >= ".(is_numeric($value)?$value:0); if ($key == 'idto') $sql.=" AND a.id <= ".(is_numeric($value)?$value:0); + if ($key == 'project') $sql.=" AND a.fk_project=".(is_numeric($value)?$value:0); if ($key == 'login') { $login=$value; diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index efc4f132764..63889f89385 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -65,6 +65,7 @@ if (! empty($_GET["year"])) $filters['year']=$_GET["year"]; if (! empty($_GET["id"])) $filters['id']=$_GET["id"]; if (! empty($_GET["idfrom"])) $filters['idfrom']=$_GET["idfrom"]; if (! empty($_GET["idto"])) $filters['idto']=$_GET["idto"]; +if (! empty($_GET["project"])) $filters['project']=$_GET["project"]; if (! empty($_GET["login"])) $filters['login']=$_GET["login"]; if (! empty($_GET["logina"])) $filters['logina']=$_GET["logina"]; if (! empty($_GET["logint"])) $filters['logint']=$_GET["logint"]; @@ -107,6 +108,7 @@ foreach ($filters as $key => $value) if ($key == 'id') $filename.='-id'.$value; if ($key == 'idfrom') $filename.='-idfrom'.$value; if ($key == 'idto') $filename.='-idto'.$value; + if ($key == 'project') $filename.='-project'.$value; if ($key == 'login') $filename.='-login'.$value; if ($key == 'logina') $filename.='-logina'.$value; // Author if ($key == 'logind') $filename.='-logind'.$value; // Affected to From 7318d0fbc01fd0d2cef26c3e4ed65b06ebf9b2e2 Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Fri, 1 Aug 2014 15:13:21 +0200 Subject: [PATCH 0002/1190] Highliting IBAN (sepa) Highliting IBAN code in pdf ( SEPA ) --- htdocs/core/lib/pdf.lib.php | 266 +++++++++++++++++++----------------- 1 file changed, 139 insertions(+), 127 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 543c2f5ef43..fb4d67d3f14 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -492,154 +492,166 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text) */ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default_font_size=10) { - global $mysoc, $conf; + global $mysoc, $conf; - $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE); - $diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT); + $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE); + $diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT); - $pdf->SetXY($curx, $cury); + $pdf->SetXY($curx, $cury); - if (empty($onlynumber)) - { - $pdf->SetFont('','B',$default_font_size - $diffsizetitle); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); - $cury+=4; - } + if (empty($onlynumber)) + { + $pdf->SetFont('','B',$default_font_size - $diffsizetitle); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); + $cury+=4; + } - $outputlangs->load("banks"); + $outputlangs->load("banks"); - // Get format of bank account according to its country - $usedetailedbban=$account->useDetailedBBAN(); + // Get format of bank account according to its country + $usedetailedbban=$account->useDetailedBBAN(); - //$onlynumber=0; $usedetailedbban=0; // For tests - if ($usedetailedbban) - { - $savcurx=$curx; + //$onlynumber=0; $usedetailedbban=0; // For tests + if ($usedetailedbban) + { + $savcurx=$curx; - if (empty($onlynumber)) - { - $pdf->SetFont('','',$default_font_size - $diffsizecontent); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); - $cury+=3; - } + if (empty($onlynumber)) + { + $pdf->SetFont('','',$default_font_size - $diffsizecontent); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); + $cury+=3; + } - if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8); + // Use correct name of bank id according to country + $ibankey="IBANNumber"; + if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; + if (! empty($account->iban)) + { - if ($usedetailedbban == 1) - { - $fieldstoshow=array('bank','desk','number','key'); - if ($conf->global->BANK_SHOW_ORDER_OPTION==1) $fieldstoshow=array('bank','desk','key','number'); - } - else if ($usedetailedbban == 2) - { - $fieldstoshow=array('bank','number'); - } - else dol_print_error('','Value returned by function useDetailedBBAN not managed'); + $ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban); + $ibanDisplay = ""; - foreach ($fieldstoshow as $val) - { - if ($val == 'bank') - { - // Bank code - $tmplength=18; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - if ($val == 'desk') - { - // Desk - $tmplength=18; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - if ($val == 'number') - { - // Number - $tmplength=24; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - if ($val == 'key') - { - // Key - $tmplength=13; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - } + for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){ + $ibanDisplay .= $ibanDisplay_temp[$i]; + if($i%4 == 3 && $i > 0){ + $ibanDisplay .= " "; + } + } - $curx=$savcurx; - $cury+=10; - } - else - { - $pdf->SetFont('','B',$default_font_size - $diffsizecontent); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); - $cury+=3; + $pdf->SetFont('','B',$default_font_size - 3); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0); + $cury+=3; + } - $pdf->SetFont('','B',$default_font_size - $diffsizecontent); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0); - $cury+=3; + if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8); - if ($diffsizecontent <= 2) $cury+=1; - } + if ($usedetailedbban == 1) + { + $fieldstoshow=array('bank','desk','number','key'); + if ($conf->global->BANK_SHOW_ORDER_OPTION==1) $fieldstoshow=array('bank','desk','key','number'); + } + else if ($usedetailedbban == 2) + { + $fieldstoshow=array('bank','number'); + } + else dol_print_error('','Value returned by function useDetailedBBAN not managed'); - // Use correct name of bank id according to country - $ibankey="IBANNumber"; - $bickey="BICNumber"; - if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; - if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; + foreach ($fieldstoshow as $val) + { + if ($val == 'bank') + { + // Bank code + $tmplength=18; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + if ($val == 'desk') + { + // Desk + $tmplength=18; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + if ($val == 'number') + { + // Number + $tmplength=24; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + if ($val == 'key') + { + // Key + $tmplength=13; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + } - $pdf->SetFont('','',$default_font_size - $diffsizecontent); + $curx=$savcurx; + $cury+=10; + } + else + { + $pdf->SetFont('','B',$default_font_size - $diffsizecontent); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); + $cury+=3; - if (empty($onlynumber) && ! empty($account->domiciliation)) - { - $pdf->SetXY($curx, $cury); - $val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation); - $pdf->MultiCell(100, 3, $val, 0, 'L', 0); - //$nboflines=dol_nboflines_bis($val,120); - //$cury+=($nboflines*3)+2; - $tmpy=$pdf->getStringHeight(100, $val); - $cury+=$tmpy; - } - else if (! $usedetailedbban) $cury+=1; + $pdf->SetFont('','B',$default_font_size - $diffsizecontent); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0); + $cury+=3; - if (! empty($account->iban)) - { - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $outputlangs->convToOutputCharset($account->iban), 0, 'L', 0); - $cury+=3; - } + if ($diffsizecontent <= 2) $cury+=1; + } - if (! empty($account->bic)) - { - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); - } + // Use correct name of bank id according to country + $bickey="BICNumber"; + if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; - return $pdf->getY(); + $pdf->SetFont('','',$default_font_size - $diffsizecontent); + + if (empty($onlynumber) && ! empty($account->domiciliation)) + { + $pdf->SetXY($curx, $cury); + $val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation); + $pdf->MultiCell(100, 3, $val, 0, 'L', 0); + //$nboflines=dol_nboflines_bis($val,120); + //$cury+=($nboflines*3)+2; + $tmpy=$pdf->getStringHeight(100, $val); + $cury+=$tmpy; + } + else if (! $usedetailedbban) $cury+=1; + + if (! empty($account->bic)) + { + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); + } + + return $pdf->getY(); } - /** * Show footer of page for PDF generation * From 92a5030f8fa6dad8fe8c060a30b840bcab2095b0 Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Mon, 4 Aug 2014 10:11:56 +0200 Subject: [PATCH 0003/1190] replace with space by tab --- htdocs/core/lib/pdf.lib.php | 305 ++++++++++++++++++------------------ 1 file changed, 152 insertions(+), 153 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index fb4d67d3f14..2731ec59e18 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1,11 +1,12 @@ - * Copyright (C) 2006 Rodolphe Quiedeville - * Copyright (C) 2007 Patrick Raguin - * Copyright (C) 2010-2012 Regis Houssin - * Copyright (C) 2010 Juanjo Menent - * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2014 Cedric GROSS +/* Copyright (C) 2006-2011 Laurent Destailleur + * Copyright (C) 2006 Rodolphe Quiedeville + * Copyright (C) 2007 Patrick Raguin + * Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2014 Cedric GROSS + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -166,7 +167,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P') * This class is an enhanced FPDI class that support method writeHTMLCell */ class FPDI_DolExtended extends FPDI - { + { /** * __call * @@ -432,9 +433,9 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height) // Add a background image on document if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) { - $pdf->SetAutoPageBreak(0,0); // Disable auto pagebreak before adding image + $pdf->SetAutoPageBreak(0,0); // Disable auto pagebreak before adding image $pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height); - $pdf->SetAutoPageBreak(1,0); // Restore pagebreak + $pdf->SetAutoPageBreak(1,0); // Restore pagebreak } } @@ -492,164 +493,162 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text) */ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default_font_size=10) { - global $mysoc, $conf; + global $mysoc, $conf; - $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE); - $diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT); + $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE); + $diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT); + $pdf->SetXY($curx, $cury); - $pdf->SetXY($curx, $cury); + if (empty($onlynumber)) + { + $pdf->SetFont('','B',$default_font_size - $diffsizetitle); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); + $cury+=4; + } - if (empty($onlynumber)) - { - $pdf->SetFont('','B',$default_font_size - $diffsizetitle); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); - $cury+=4; - } + $outputlangs->load("banks"); - $outputlangs->load("banks"); + // Get format of bank account according to its country + $usedetailedbban=$account->useDetailedBBAN(); - // Get format of bank account according to its country - $usedetailedbban=$account->useDetailedBBAN(); + //$onlynumber=0; $usedetailedbban=0; // For tests + if ($usedetailedbban) + { + $savcurx=$curx; - //$onlynumber=0; $usedetailedbban=0; // For tests - if ($usedetailedbban) - { - $savcurx=$curx; + if (empty($onlynumber)) + { + $pdf->SetFont('','',$default_font_size - $diffsizecontent); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); + $cury+=3; + } - if (empty($onlynumber)) - { - $pdf->SetFont('','',$default_font_size - $diffsizecontent); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); - $cury+=3; - } + // Use correct name of bank id according to country + $ibankey="IBANNumber"; + if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; + if (! empty($account->iban)) + { + $ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban); + $ibanDisplay = ""; - // Use correct name of bank id according to country - $ibankey="IBANNumber"; - if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; - if (! empty($account->iban)) - { + for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){ + $ibanDisplay .= $ibanDisplay_temp[$i]; + if($i%4 == 3 && $i > 0){ + $ibanDisplay .= " "; + } + } - $ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban); - $ibanDisplay = ""; + $pdf->SetFont('','B',$default_font_size - 3); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0); + $cury+=3; + } - for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){ - $ibanDisplay .= $ibanDisplay_temp[$i]; - if($i%4 == 3 && $i > 0){ - $ibanDisplay .= " "; - } - } + if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8); - $pdf->SetFont('','B',$default_font_size - 3); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0); - $cury+=3; - } + if ($usedetailedbban == 1) + { + $fieldstoshow=array('bank','desk','number','key'); + if ($conf->global->BANK_SHOW_ORDER_OPTION==1) $fieldstoshow=array('bank','desk','key','number'); + } + else if ($usedetailedbban == 2) + { + $fieldstoshow=array('bank','number'); + } + else dol_print_error('','Value returned by function useDetailedBBAN not managed'); - if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8); + foreach ($fieldstoshow as $val) + { + if ($val == 'bank') + { + // Bank code + $tmplength=18; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + if ($val == 'desk') + { + // Desk + $tmplength=18; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + if ($val == 'number') + { + // Number + $tmplength=24; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + if ($val == 'key') + { + // Key + $tmplength=13; + $pdf->SetXY($curx, $cury+5); + $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); + $pdf->SetXY($curx, $cury+1); + $curx+=$tmplength; + $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); + if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); + } + } - if ($usedetailedbban == 1) - { - $fieldstoshow=array('bank','desk','number','key'); - if ($conf->global->BANK_SHOW_ORDER_OPTION==1) $fieldstoshow=array('bank','desk','key','number'); - } - else if ($usedetailedbban == 2) - { - $fieldstoshow=array('bank','number'); - } - else dol_print_error('','Value returned by function useDetailedBBAN not managed'); + $curx=$savcurx; + $cury+=10; + } + else + { + $pdf->SetFont('','B',$default_font_size - $diffsizecontent); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); + $cury+=3; - foreach ($fieldstoshow as $val) - { - if ($val == 'bank') - { - // Bank code - $tmplength=18; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - if ($val == 'desk') - { - // Desk - $tmplength=18; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - if ($val == 'number') - { - // Number - $tmplength=24; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - if ($val == 'key') - { - // Key - $tmplength=13; - $pdf->SetXY($curx, $cury+5); - $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); - $pdf->SetXY($curx, $cury+1); - $curx+=$tmplength; - $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); - if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); - } - } + $pdf->SetFont('','B',$default_font_size - $diffsizecontent); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0); + $cury+=3; - $curx=$savcurx; - $cury+=10; - } - else - { - $pdf->SetFont('','B',$default_font_size - $diffsizecontent); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0); - $cury+=3; + if ($diffsizecontent <= 2) $cury+=1; + } - $pdf->SetFont('','B',$default_font_size - $diffsizecontent); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0); - $cury+=3; + // Use correct name of bank id according to country + $bickey="BICNumber"; + if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; - if ($diffsizecontent <= 2) $cury+=1; - } + $pdf->SetFont('','',$default_font_size - $diffsizecontent); - // Use correct name of bank id according to country - $bickey="BICNumber"; - if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; + if (empty($onlynumber) && ! empty($account->domiciliation)) + { + $pdf->SetXY($curx, $cury); + $val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation); + $pdf->MultiCell(100, 3, $val, 0, 'L', 0); + //$nboflines=dol_nboflines_bis($val,120); + //$cury+=($nboflines*3)+2; + $tmpy=$pdf->getStringHeight(100, $val); + $cury+=$tmpy; + } + else if (! $usedetailedbban) $cury+=1; - $pdf->SetFont('','',$default_font_size - $diffsizecontent); + if (! empty($account->bic)) + { + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); + } - if (empty($onlynumber) && ! empty($account->domiciliation)) - { - $pdf->SetXY($curx, $cury); - $val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation); - $pdf->MultiCell(100, 3, $val, 0, 'L', 0); - //$nboflines=dol_nboflines_bis($val,120); - //$cury+=($nboflines*3)+2; - $tmpy=$pdf->getStringHeight(100, $val); - $cury+=$tmpy; - } - else if (! $usedetailedbban) $cury+=1; - - if (! empty($account->bic)) - { - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); - } - - return $pdf->getY(); + return $pdf->getY(); } /** @@ -681,11 +680,11 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass { // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $fromcompany->nom, - '__FROM_EMAIL__' => $fromcompany->email, - '__TOTAL_TTC__' => $object->total_ttc, - '__TOTAL_HT__' => $object->total_ht, - '__TOTAL_VAT__' => $object->total_vat + '__FROM_NAME__' => $fromcompany->nom, + '__FROM_EMAIL__' => $fromcompany->email, + '__TOTAL_TTC__' => $object->total_ttc, + '__TOTAL_HT__' => $object->total_ht, + '__TOTAL_VAT__' => $object->total_vat ); complete_substitutions_array($substitutionarray,$outputlangs,$object); $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray); From 9c7647a7aeb8778faa5361dbd97cc765476b03c8 Mon Sep 17 00:00:00 2001 From: astebert Date: Tue, 12 Aug 2014 11:45:11 +0200 Subject: [PATCH 0004/1190] Update bills.lang Ligne 252 : Changement grammatical - de "Paiements issue de l'acompte" - en "Paiement issu de l'acompte" --- htdocs/langs/fr_FR/bills.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index debbe4f4d33..9e9980f9091 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -249,7 +249,7 @@ AddCreditNote=Créer facture avoir Deposit=Acompte Deposits=Acomptes DiscountFromCreditNote=Remise issue de l'avoir %s -DiscountFromDeposit=Paiements issue de l'acompte %s +DiscountFromDeposit=Paiement issu de l'acompte %s AbsoluteDiscountUse=Ce type de crédit ne peut s'utiliser que sur une facture non validée CreditNoteDepositUse=La facture doit être validée pour pouvoir utiliser ce type de crédit NewGlobalDiscount=Nouvelle ligne de déduction From 05ed96f7fa52c5be4550393b725164ac70b11285 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Tue, 2 Sep 2014 10:45:53 +0200 Subject: [PATCH 0005/1190] Update modContrat.class.php add export contract/service feature --- htdocs/core/modules/modContrat.class.php | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php index 2ffc46b60bb..e77067fc25e 100644 --- a/htdocs/core/modules/modContrat.class.php +++ b/htdocs/core/modules/modContrat.class.php @@ -114,6 +114,54 @@ class modContrat extends DolibarrModules $this->rights[5][3] = 0; $this->rights[5][4] = 'supprimer'; + // Exports + //-------- + $r=1; + + $this->export_code[$r]=$this->rights_class.'_'.$r; + $this->export_label[$r]='ContractAndServices'; // Translation key (used only if key ExportDataset_xxx_z not found) + $this->export_icon[$r]='contract'; + $this->export_permission[$r]=array(array("contrat","export")); + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','c.code'=>'CountryCode', + 's.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode', + 's.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra', + 'co.rowid'=>"contractId",'co.ref'=>"contactRef",'co.datec'=>"contractDateCreation",'co.date_contrat'=>"DateContract",'co.mise_en_service'=>"DateMiseService", + 'co.fin_validite'=>"EndValidity",'co.date_cloture'=>"Cloture",'co.fk_statut'=>'ContractStatus','co.note'=>"NotePrivate",'co.note_public'=>"NotePublic", + 'cod.rowid'=>'LineId','cod.label'=>"LineLabel",'cod.description'=>"LineDescription",'cod.price_ht'=>"LineUnitPrice",'cod.tva_tx'=>"LineVATRate", + 'cod.qty'=>"LineQty",'cod.total_ht'=>"LineTotalHT",'cod.total_tva'=>"LineTotalVAT",'cod.total_ttc'=>"LineTotalTTC", + 'cod.date_ouverture'=>"DateStart",'cod.date_ouverture_prevue'=>"DateStartPrevis",'cod.date_fin_validite'=>"EndValidity",'cod.date_cloture'=>"DateEnd", + 'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); + + $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company', + 's.ville'=>'company','c.code'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company', + 's.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company', + 'co.rowid'=>"Contract",'co.ref'=>"Contract",'co.datec'=>"Contract",'co.date_contrat'=>"Contract",'co.mise_en_service'=>"Contract", + 'co.fin_validite'=>"Contract",'co.date_cloture'=>"Contract",'co.fk_statut'=>'Contract','co.note'=>"Contract",'co.note_public'=>"Contract", + 'cod.rowid'=>'contract_line','cod.label'=>"contract_line",'cod.description'=>"contract_line",'cod.price_ht'=>"contract_line",'cod.tva_tx'=>"contract_line", + 'cod.qty'=>"contract_line",'cod.total_ht'=>"contract_line",'cod.total_tva'=>"contract_line",'cod.total_ttc'=>"contract_line", + 'cod.date_ouverture'=>"contract_line",'cod.date_ouverture_prevue'=>"contract_line",'cod.date_fin_validite'=>"contract_line",'cod.date_cloture'=>"contract_line", + 'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); + + $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text', + 's.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text', + 's.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text', + 'co.ref'=>"Text",'co.datec'=>"Date",'co.date_contrat'=>"Date",'co.mise_en_service'=>"Date", + 'co.fin_validite'=>"Date",'co.date_cloture'=>"Date",'co.fk_statut'=>'Statut','co.note'=>"Text",'co.note_public'=>"Text", + 'cod.label'=>"Text",'cod.description'=>"Text",'cod.price_ht'=>"Numeric",'cod.tva_tx'=>"Numeric", + 'cod.qty'=>"Numeric",'cod.total_ht'=>"Numeric",'cod.total_tva'=>"Numeric",'cod.total_ttc'=>"Numeric", + 'cod.date_ouverture'=>"Date",'cod.date_ouverture_prevue'=>"Date",'cod.date_fin_validite'=>"Date",'cod.date_cloture'=>"Date", + 'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); + + + $this->export_sql_start[$r]='SELECT DISTINCT '; + $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c on s.fk_pays = c.rowid,'; + $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contrat as co,'; + $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contratdet as cod'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cod.fk_product = p.rowid)'; + $this->export_sql_end[$r] .=' WHERE co.fk_soc = s.rowid and co.rowid = cod.fk_contrat'; + $this->export_sql_end[$r] .=' AND co.entity = '.$conf->entity; + } From 86d88709394adfe0cc9059e675f71778fb3546c6 Mon Sep 17 00:00:00 2001 From: Cedric Date: Thu, 11 Sep 2014 14:01:39 +0200 Subject: [PATCH 0006/1190] Add create button on predefined invoice details Check invoice creation right --- ChangeLog | 1 + htdocs/compta/facture/fiche-rec.php | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f7bee20186..2d07bcb5114 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ For users: - Fix: Iban was used instead of Bic into SEPA file. - Fix: Must unaccent strings into SEPA file. - Fix: Extrafield feature select from table should try to translate multiple column when not needed +- New: Direct invoice creation from predefined invoice ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 1929a8a3721..dc794a394c4 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -507,9 +507,14 @@ else */ print '
'; + if ($object->statut == 0 && $user->rights->facture->creer) + { + echo '
'.$langs->trans("CreateBill").'
'; + } + if ($object->statut == 0 && $user->rights->facture->supprimer) { - print ''.$langs->trans('Delete').''; + print '
'.$langs->trans('Delete').'
'; } print '
'; @@ -569,23 +574,18 @@ else print ''.price($objp->total).''."\n"; - if (! $objp->paye) + echo ''; + + if ($user->rights->facture->creer) { - if ($objp->fk_statut == 0) - { - print ''.$langs->trans("Draft").''; - } - else - { - print ''.$langs->trans("Validated").''; - } + echo ''; + echo $langs->trans("CreateBill"),''; } else { - print ' '; + echo " "; } - - print "\n"; + echo "\n"; $i++; } } From 287e2ca032034586a97257a4c6b192c11bfd7a95 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 15 Sep 2014 09:58:44 +0200 Subject: [PATCH 0007/1190] Add ref_ext into fetch product (else fetch and update set this column to null) --- htdocs/product/class/product.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index c3b337c4a16..fa241367462 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1351,6 +1351,7 @@ class Product extends CommonObject $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,"; $sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,"; $sql.= " datec, tms, import_key, entity, desiredstock, tobatch"; + $sql.= " ,ref_ext"; $sql.= " FROM ".MAIN_DB_PREFIX."product"; if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id); else @@ -1424,6 +1425,8 @@ class Product extends CommonObject $this->date_modification = $obj->tms; $this->import_key = $obj->import_key; $this->entity = $obj->entity; + + $this->ref_ext = $obj->ref_ext; $this->db->free($resql); From e71dc6bc325241e9d8629b164346598a73691f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 12:30:37 +0200 Subject: [PATCH 0008/1190] Created a method generateDocument for several classes Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create --- htdocs/comm/propal/class/propal.class.php | 104 ++++++++++++++++ htdocs/commande/class/commande.class.php | 103 ++++++++++++++++ htdocs/compta/facture/class/facture.class.php | 111 ++++++++++++++++- htdocs/contrat/class/contrat.class.php | 100 +++++++++++++++ .../modules/commande/modules_commande.php | 92 +------------- .../modules/contract/modules_contract.php | 90 +------------- .../modules/expedition/modules_expedition.php | 98 +-------------- .../core/modules/facture/modules_facture.php | 98 +-------------- .../modules/livraison/modules_livraison.php | 89 +------------- .../core/modules/project/modules_project.php | 90 +------------- .../modules/project/task/modules_task.php | 89 +------------- .../core/modules/propale/modules_propale.php | 92 +------------- .../modules_facturefournisseur.php | 100 +-------------- .../modules_commandefournisseur.php | 101 +--------------- htdocs/expedition/class/expedition.class.php | 105 ++++++++++++++++ .../class/fournisseur.commande.class.php | 114 +++++++++++++++++- .../fourn/class/fournisseur.facture.class.php | 112 +++++++++++++++++ htdocs/livraison/class/livraison.class.php | 98 +++++++++++++++ htdocs/projet/class/project.class.php | 102 ++++++++++++++++ htdocs/projet/class/task.class.php | 101 ++++++++++++++++ 20 files changed, 1087 insertions(+), 902 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index bb55cde5103..52d57c5251c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -10,6 +10,7 @@ * Copyright (C) 2010-2011 Philippe Grand * Copyright (C) 2012-214 Christophe Battarel * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2673,6 +2674,109 @@ class Propal extends CommonObject } } + /** + * Create a document onto disk according to template module. + * + * @param string $modele Force model to use ('' to not force) + * @param Translate $outputlangs Object langs to use for output + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) + { + global $conf,$user,$langs; + + $langs->load("propale"); + + $error=0; + + $srctemplatepath=''; + + // Positionne le modele sur le nom du modele a utiliser + if (! dol_strlen($modele)) + { + if (! empty($conf->global->PROPALE_ADDON_PDF)) + { + $modele = $conf->global->PROPALE_ADDON_PDF; + } + else + { + $modele = 'azur'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir."core/modules/propale/doc/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + //$obj->message = $message; + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // We delete old preview + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + // Success in building document. We build meta file. + dol_meta_create($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_print_error($this->db,"propal_pdf_create Error: ".$obj->error); + return -1; + } + + } + else + { + dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); + return -1; + } + } + + } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index a12b6dc7256..dd4505ecc95 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -7,6 +7,7 @@ * Copyright (C) 2011 Jean Heimburger * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -3011,6 +3012,108 @@ class Commande extends CommonOrder } } + /** + * Create a document onto disk accordign to template module. + * + * @param string $modele Force le mnodele a utiliser ('' to not force) + * @param Translate $outputlangs objet lang a utiliser pour traduction + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) + { + global $conf,$user,$langs,$hookmanager; + + $langs->load("orders"); + + $error=0; + + $srctemplatepath=''; + + // Positionne le modele sur le nom du modele a utiliser + if (! dol_strlen($modele)) + { + if (! empty($conf->global->COMMANDE_ADDON_PDF)) + { + $modele = $conf->global->COMMANDE_ADDON_PDF; + } + else + { + $modele = 'einstein'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir."core/modules/commande/doc/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + //$obj->message = $message; + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // We delete old preview + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + // Success in building document. We build meta file. + dol_meta_create($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_print_error($this->db,"order_pdf_create Error: ".$obj->error); + return -1; + } + + } + else + { + dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); + return -1; + } + } + } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index c46f48ed1c6..ca42b77033b 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -9,7 +9,7 @@ * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2012 Marcos García + * Copyright (C) 2012-2014 Marcos García * Copyright (C) 2013 Cedric Gross * Copyright (C) 2013 Florian Henry * @@ -3222,6 +3222,115 @@ class Facture extends CommonInvoice } } + /** + * Create a document onto disk according to template module. + * + * @param string $modele Force template to use ('' to not force) + * @param Translate $outputlangs objet lang a utiliser pour traduction + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @return int <0 if KO, >0 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) + { + global $conf,$user,$langs; + + $langs->load("bills"); + + $error=0; + + // Increase limit for PDF build + $err=error_reporting(); + error_reporting(0); + @set_time_limit(120); + error_reporting($err); + + $srctemplatepath=''; + + // Positionne le modele sur le nom du modele a utiliser + if (! dol_strlen($modele)) + { + if (! empty($conf->global->FACTURE_ADDON_PDF)) + { + $modele = $conf->global->FACTURE_ADDON_PDF; + } + else + { + $modele = 'crabe'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir."core/modules/facture/doc/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // We delete old preview + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + // Success in building document. We build meta file. + dol_meta_create($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_print_error($this->db,"facture_pdf_create Error: ".$obj->error); + return -1; + } + + } + else + { + dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); + return -1; + } + } + + + } diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index b4cf7c20322..7861846c4a4 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -7,6 +7,7 @@ * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2013 Christophe Battarel * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2339,6 +2340,105 @@ class ContratLigne extends CommonObject } } + /** + * Create a contract document on disk using template defined into CONTRACT_ADDON_PDF + * + * @param string $modele force le modele a utiliser ('' par defaut) + * @param Translate $outputlangs objet lang a utiliser pour traduction + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) + { + global $conf,$langs,$user,$hookmanager; + + $langs->load("contracts"); + + $error=0; + + $srctemplatepath=''; + + // Positionne modele sur le nom du modele de contrat a utiliser + if (! dol_strlen($modele)) + { + if (! empty($conf->global->CONTRACT_ADDON_PDF)) + { + $modele = $conf->global->CONTRACT_ADDON_PDF; + } + else + { + $modele = 'strato'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir."core/modules/contract/doc/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // We delete old preview + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + // Success in building document. We build meta file. + dol_meta_create($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_print_error($this->db,"contract_pdf_create Error: ".$obj->error); + return 0; + } + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); + return 0; + } + } } diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index 63806e4cb46..18a586d3b63 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -159,94 +160,9 @@ abstract class ModeleNumRefCommandes * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int 0 if KO, 1 if OK + * @deprecated Use the new function generateDocument of Commande class */ -function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) +function commande_pdf_create(DoliDB $db, Commande $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { - global $conf,$user,$langs,$hookmanager; - $langs->load("orders"); - - $error=0; - - $srctemplatepath=''; - - // Positionne le modele sur le nom du modele a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->COMMANDE_ADDON_PDF)) - { - $modele = $conf->global->COMMANDE_ADDON_PDF; - } - else - { - $modele = 'einstein'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/commande/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - //$obj->message = $message; - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - // Success in building document. We build meta file. - dol_meta_create($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($db,"order_pdf_create Error: ".$obj->error); - return -1; - } - - } - else - { - dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); - return -1; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php index 689509f2a59..9ffd5d93881 100644 --- a/htdocs/core/modules/contract/modules_contract.php +++ b/htdocs/core/modules/contract/modules_contract.php @@ -6,6 +6,7 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2011 Juanjo Menent * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -154,92 +155,9 @@ class ModelNumRefContracts * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int 0 if KO, 1 if OK + * @deprecated Use the new function generateDocument of Contrat class */ -function contract_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) +function contract_pdf_create(DoliDB $db, Contrat $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { - global $conf,$langs,$user,$hookmanager; - $langs->load("contracts"); - - $error=0; - - $srctemplatepath=''; - - // Positionne modele sur le nom du modele de contrat a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->CONTRACT_ADDON_PDF)) - { - $modele = $conf->global->CONTRACT_ADDON_PDF; - } - else - { - $modele = 'strato'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/contract/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - // Success in building document. We build meta file. - dol_meta_create($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($db,"contract_pdf_create Error: ".$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php index 3f2938ef25f..43292ae95c4 100644 --- a/htdocs/core/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -6,6 +6,7 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2011 Juanjo Menent * Copyright (C) 2011-2013 Philippe Grand + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -149,100 +150,9 @@ abstract class ModelNumRefExpedition * @param string $modele Force le modele a utiliser ('' to not force) * @param Translate $outputlangs Objet lang a utiliser pour traduction * @return int <=0 if KO, >0 if OK + * @deprecated Use the new function generateDocument of Expedition class */ -function expedition_pdf_create($db, $object, $modele, $outputlangs) +function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs) { - global $conf,$user,$langs; - - $langs->load("sendings"); - - $error=0; - - $srctemplatepath=''; - - // Sets the model on the model name to use - if (! dol_strlen($modele)) - { - if (! empty($conf->global->EXPEDITION_ADDON_PDF)) - { - $modele = $conf->global->EXPEDITION_ADDON_PDF; - } - else - { - $modele = 'rouget'; - } - } - - // If selected model is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // We check the model location - $file=dol_buildpath($reldir."core/modules/expedition/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Load the model - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - - $result=$object->fetch_origin(); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - //require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - //dol_delete_preview($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans expedition_pdf_create"); - dol_print_error($db,$obj->error); - return 0; - } - } - else - { - if (! $conf->global->EXPEDITION_ADDON_PDF) - { - print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_PDF_NotDefined"); - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - } - return 0; - } + return $object->generateDocument($modele, $outputlangs); } diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index ae0d9f98cda..bca513e3fd6 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -154,101 +155,10 @@ abstract class ModeleNumRefFactures * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int <0 if KO, >0 if OK + * @deprecated Use the new function generateDocument of Facture class */ -function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) +function facture_pdf_create(DoliDB $db, Facture $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { - global $conf,$user,$langs; - - $langs->load("bills"); - - $error=0; - - // Increase limit for PDF build - $err=error_reporting(); - error_reporting(0); - @set_time_limit(120); - error_reporting($err); - - $srctemplatepath=''; - - // Positionne le modele sur le nom du modele a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->FACTURE_ADDON_PDF)) - { - $modele = $conf->global->FACTURE_ADDON_PDF; - } - else - { - $modele = 'crabe'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/facture/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - // Success in building document. We build meta file. - dol_meta_create($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($db,"facture_pdf_create Error: ".$obj->error); - return -1; - } - - } - else - { - dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); - return -1; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index fe8e4220281..22c25bcfd5f 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -4,6 +4,7 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2006-2011 Regis Houssin * Copyright (C) 2011-2012 Philippe Grand + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -154,92 +155,10 @@ abstract class ModeleNumRefDeliveryOrder * @param string $modele force le modele a utiliser ('' to not force) * @param Translate $outputlangs objet lang a utiliser pour traduction * @return int 0 if KO, 1 if OK + * @deprecated Use the new function generateDocument of Livraison class */ -function delivery_order_pdf_create($db, $object, $modele, $outputlangs='') +function delivery_order_pdf_create(DoliDB $db, Livraison $object, $modele, $outputlangs='') { - global $conf,$user,$langs; - - $langs->load("deliveries"); - - $error=0; - - $srctemplatepath=''; - - // Positionne modele sur le nom du modele de bon de livraison a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->LIVRAISON_ADDON_PDF)) - { - $modele = $conf->global->LIVRAISON_ADDON_PDF; - } - else - { - $modele = 'typhon'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/livraison/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object,$outputlangs) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans delivery_order_pdf_create"); - dol_print_error($db,$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $object->generateDocument($modele, $outputlangs); } diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index ecaf0213bc0..54d981e51a4 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -1,5 +1,6 @@ + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -151,93 +152,10 @@ abstract class ModeleNumRefProjects * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int 0 if KO, 1 if OK + * @deprecated Use the new function generateDocument of Project class */ -function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) +function project_pdf_create(DoliDB $db, Project $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { - global $conf,$langs; - $langs->load("projects"); - - $error=0; - - $srctemplatepath=''; - - // Positionne modele sur le nom du modele de projet a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->PROJECT_ADDON_PDF)) - { - $modele = $conf->global->PROJECT_ADDON_PDF; - } - else - { - $modele='baleine'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/project/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - // Success in building document. We build meta file. - dol_meta_create($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($db,"project_pdf_create Error: ".$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php index c72d221ead1..f861b1bf002 100644 --- a/htdocs/core/modules/project/task/modules_task.php +++ b/htdocs/core/modules/project/task/modules_task.php @@ -1,6 +1,7 @@ * Copyright (C) 2010 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -152,92 +153,10 @@ abstract class ModeleNumRefTask * @param int $hideref Hide ref * @param HookManager $hookmanager Hook manager instance * @return int 0 if KO, 1 if OK + * @deprecated Use the new function generateDocument of Task class */ -function task_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) +function task_pdf_create(DoliDB $db, Task $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) { - global $conf,$langs; - $langs->load("projects"); - - $error=0; - - $srctemplatepath=''; - - // Positionne modele sur le nom du modele de projet a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->PROJECT_TASK_ADDON_PDF)) - { - $modele = $conf->global->PROJECT_TASK_ADDON_PDF; - } - else - { - $modele='nodefault'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/project/task/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - // Success in building document. We build meta file. - dol_meta_create($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($db,"task_pdf_create Error: ".$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index 04b75bae091..9b0cc1d82a2 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -155,95 +156,10 @@ abstract class ModeleNumRefPropales * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int 0 if KO, 1 if OK + * @deprecated Use the new function generateDocument of Propal class */ -function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) +function propale_pdf_create(DoliDB $db, Propal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { - global $conf,$user,$langs; - $langs->load("propale"); - - $error=0; - - $srctemplatepath=''; - - // Positionne le modele sur le nom du modele a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->PROPALE_ADDON_PDF)) - { - $modele = $conf->global->PROPALE_ADDON_PDF; - } - else - { - $modele = 'azur'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/propale/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($db); - //$obj->message = $message; - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - // Success in building document. We build meta file. - dol_meta_create($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($db,"propal_pdf_create Error: ".$obj->error); - return -1; - } - - } - else - { - dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); - return -1; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index 1d4e9f262f8..51eb675057e 100644 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -2,6 +2,7 @@ /* Copyright (C) 2010 Juanjo Menent * Copyright (C) 2012 Regis Houssin * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -143,105 +144,10 @@ abstract class ModeleNumRefSuppliersInvoices * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int 0 if KO, 1 if OK + * */ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { - global $conf, $user, $langs; - - $langs->load("suppliers"); - - $error=0; - - // Increase limit for PDF build - $err=error_reporting(); - error_reporting(0); - @set_time_limit(120); - error_reporting($err); - - $srctemplatepath=''; - - // Set the model on the model name to use - if (! dol_strlen($modele)) - { - if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) - { - $modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF; - } - else - { - $modele = 'canelle'; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // We checked the location of the model - $file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Load the model - if ($filefound) - { - require_once $file; - - $obj = new $classname($db,$object); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans supplier_invoice_pdf_create"); - dol_print_error($db,$obj->error); - return 0; - } - } - else - { - if (! $conf->global->INVOICE_SUPPLIER_ADDON_PDF) - { - print $langs->trans("Error")." ".$langs->trans("Error_INVOICE_SUPPLIER_ADDON_PDF_NotDefined"); - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - } - return 0; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index edf2f928ddb..bc544363b39 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2011-2013 Philippe Grand + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -149,104 +150,10 @@ abstract class ModeleNumRefSuppliersOrders * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int 0 if KO, 1 if OK + * @deprecated Use the new function generateDocument of CommandeFournisseur class */ -function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) +function supplier_order_pdf_create(DoliDB $db, CommandeFournisseur $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { - global $conf, $user, $langs; - $langs->load("suppliers"); - - $error=0; - - // Increase limit for PDF build - $err=error_reporting(); - error_reporting(0); - @set_time_limit(120); - error_reporting($err); - - $srctemplatepath=''; - - // Sets the model on the model name to use - if (! dol_strlen($modele)) - { - if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) - { - $modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF; - } - else - { - $modele = 'muscadet'; - } - } - - // If selected model is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // We check the model location - $file=dol_buildpath($reldir."core/modules/supplier_order/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Load the model - if ($filefound) - { - require_once $file; - - $obj = new $classname($db,$object); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($object); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans supplier_order_pdf_create"); - dol_print_error($db,$obj->error); - return 0; - } - } - else - { - if (! $conf->global->COMMANDE_SUPPLIER_ADDON_PDF) - { - print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_SUPPLIER_ADDON_PDF_NotDefined"); - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - } - return 0; - } + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index d2527d1fca0..ebadc9d0f4e 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -6,6 +6,7 @@ * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Cedric GROSS + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1532,6 +1533,110 @@ class Expedition extends CommonObject } } + /** + * Cree un bon d'expedition sur disque + * + * @param string $modele Force le modele a utiliser ('' to not force) + * @param Translate $outputlangs Objet lang a utiliser pour traduction + * @return int <=0 if KO, >0 if OK + */ + public function generateDocument($modele, $outputlangs) + { + global $conf,$user,$langs; + + $langs->load("sendings"); + + $error=0; + + $srctemplatepath=''; + + // Sets the model on the model name to use + if (! dol_strlen($modele)) + { + if (! empty($conf->global->EXPEDITION_ADDON_PDF)) + { + $modele = $conf->global->EXPEDITION_ADDON_PDF; + } + else + { + $modele = 'rouget'; + } + } + + // If selected model is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // We check the model location + $file=dol_buildpath($reldir."core/modules/expedition/doc/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Load the model + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + + $result=$this->fetch_origin(); + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // we delete preview files + //require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + //dol_delete_preview($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_syslog("Erreur dans expedition_pdf_create"); + dol_print_error($this->db,$obj->error); + return 0; + } + } + else + { + if (! $conf->global->EXPEDITION_ADDON_PDF) + { + print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_PDF_NotDefined"); + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); + } + return 0; + } + } + } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 4e8c3a650b0..279050d0cd4 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -5,7 +5,7 @@ * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2010-2014 Philippe Grand - * Copyright (C) 2012 Marcos García + * Copyright (C) 2012-2014 Marcos García * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Cédric Salvador * @@ -2005,6 +2005,118 @@ class CommandeFournisseur extends CommonOrder return ''; } + + /** + * Create a document onto disk according to template model. + * + * @param string $modele Force template to use ('' to not force) + * @param Translate $outputlangs Object lang to use for traduction + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) + { + global $conf, $user, $langs; + $langs->load("suppliers"); + + $error=0; + + // Increase limit for PDF build + $err=error_reporting(); + error_reporting(0); + @set_time_limit(120); + error_reporting($err); + + $srctemplatepath=''; + + // Sets the model on the model name to use + if (! dol_strlen($modele)) + { + if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) + { + $modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF; + } + else + { + $modele = 'muscadet'; + } + } + + // If selected model is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // We check the model location + $file=dol_buildpath($reldir."core/modules/supplier_order/pdf/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Load the model + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db,$this); + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // we delete preview files + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_syslog("Erreur dans supplier_order_pdf_create"); + dol_print_error($this->db,$obj->error); + return 0; + } + } + else + { + if (! $conf->global->COMMANDE_SUPPLIER_ADDON_PDF) + { + print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_SUPPLIER_ADDON_PDF_NotDefined"); + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); + } + return 0; + } + } + + } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 4ceea058b4f..d4828338432 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -7,6 +7,7 @@ * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2013 Philippe Grand * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1670,4 +1671,115 @@ class FactureFournisseur extends CommonInvoice } } + /** + * Create a document onto disk according to template model. + * + * @param string $modele Force template to use ('' to not force) + * @param Translate $outputlangs Object lang a utiliser pour traduction + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) + { + global $conf, $user, $langs; + + $langs->load("suppliers"); + + $error=0; + + // Increase limit for PDF build + $err=error_reporting(); + error_reporting(0); + @set_time_limit(120); + error_reporting($err); + + $srctemplatepath=''; + + // Set the model on the model name to use + if (! dol_strlen($modele)) + { + if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) + { + $modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF; + } + else + { + $modele = 'canelle'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // We checked the location of the model + $file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Load the model + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db,$this); + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // we delete preview files + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_syslog("Erreur dans supplier_invoice_pdf_create"); + dol_print_error($this->db,$obj->error); + return 0; + } + } + else + { + if (! $conf->global->INVOICE_SUPPLIER_ADDON_PDF) + { + print $langs->trans("Error")." ".$langs->trans("Error_INVOICE_SUPPLIER_ADDON_PDF_NotDefined"); + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); + } + return 0; + } + } + } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index ffa17862939..3fa7cc3eadc 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -5,6 +5,7 @@ * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2011-2012 Philippe Grand * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -926,6 +927,103 @@ class Livraison extends CommonObject } } + /** + * Create object on disk + * + * @param string $modele force le modele a utiliser ('' to not force) + * @param Translate $outputlangs objet lang a utiliser pour traduction + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs='') + { + global $conf,$user,$langs; + + $langs->load("deliveries"); + + $error=0; + + $srctemplatepath=''; + + // Positionne modele sur le nom du modele de bon de livraison a utiliser + if (! dol_strlen($modele)) + { + if (! empty($conf->global->LIVRAISON_ADDON_PDF)) + { + $modele = $conf->global->LIVRAISON_ADDON_PDF; + } + else + { + $modele = 'typhon'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir."core/modules/livraison/pdf/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this,$outputlangs) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // we delete preview files + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_syslog("Erreur dans delivery_order_pdf_create"); + dol_print_error($this->db,$obj->error); + return 0; + } + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); + return 0; + } + } + + + } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 8cbaea46c39..4cc130f548b 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -3,6 +3,7 @@ * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1305,5 +1306,106 @@ class Project extends CommonObject } } + + /** + * Create an intervention document on disk using template defined into PROJECT_ADDON_PDF + * + * @param string $modele force le modele a utiliser ('' par defaut) + * @param Translate $outputlangs objet lang a utiliser pour traduction + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) + { + global $conf,$langs; + + $langs->load("projects"); + + $error=0; + + $srctemplatepath=''; + + // Positionne modele sur le nom du modele de projet a utiliser + if (! dol_strlen($modele)) + { + if (! empty($conf->global->PROJECT_ADDON_PDF)) + { + $modele = $conf->global->PROJECT_ADDON_PDF; + } + else + { + $modele='baleine'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir."core/modules/project/pdf/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // we delete preview files + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + // Success in building document. We build meta file. + dol_meta_create($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_print_error($this->db,"project_pdf_create Error: ".$obj->error); + return 0; + } + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); + return 0; + } + } + } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index acfad6108e9..5bc94d740f7 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1312,4 +1313,104 @@ class Task extends CommonObject } } + /** + * Create an intervention document on disk using template defined into PROJECT_TASK_ADDON_PDF + * + * @param string $modele force le modele a utiliser ('' par defaut) + * @param Translate $outputlangs objet lang a utiliser pour traduction + * @param int $hidedetails Hide details of lines + * @param int $hidedesc Hide description + * @param int $hideref Hide ref + * @param HookManager $hookmanager Hook manager instance + * @return int 0 if KO, 1 if OK + */ + public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) + { + global $conf,$langs; + $langs->load("projects"); + + $error=0; + + $srctemplatepath=''; + + // Positionne modele sur le nom du modele de projet a utiliser + if (! dol_strlen($modele)) + { + if (! empty($conf->global->PROJECT_TASK_ADDON_PDF)) + { + $modele = $conf->global->PROJECT_TASK_ADDON_PDF; + } + else + { + $modele='nodefault'; + } + } + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir."core/modules/project/task/pdf/".$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // we delete preview files + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + // Success in building document. We build meta file. + dol_meta_create($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_print_error($this->db,"task_pdf_create Error: ".$obj->error); + return 0; + } + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); + return 0; + } + } + + } From b7ef2db5d9aa13fa8ae00bbc9c26eb37aaecbfc4 Mon Sep 17 00:00:00 2001 From: braito4 Date: Tue, 16 Sep 2014 19:33:07 +0200 Subject: [PATCH 0009/1190] problem with type of product the column should be product_type --- htdocs/webservices/server_invoice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index c79c862146c..0b601347f38 100644 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -528,7 +528,7 @@ function createInvoice($authentication,$invoice) { // $key can be 'line' or '0','1',... $newline=new FactureLigne($db); - $newline->type=$line['type']; + $newline->product_type=$line['type']; $newline->desc=$line['desc']; $newline->fk_product=$line['fk_product']; $newline->tva_tx=$line['vat_rate']; From 144da16391a1e9e2e6c2d1f10c308133c6638071 Mon Sep 17 00:00:00 2001 From: braito4 Date: Tue, 16 Sep 2014 19:42:11 +0200 Subject: [PATCH 0010/1190] Missing date_start, date_end in webserver server_invoice.php --- htdocs/webservices/server_invoice.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index c79c862146c..c59544aa3f8 100644 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -537,6 +537,8 @@ function createInvoice($authentication,$invoice) $newline->total_ht=$line['total_net']; $newline->total_tva=$line['total_vat']; $newline->total_ttc=$line['total']; + $newline->date_start=dol_stringtotime($line['date_start']); + $newline->date_end=dol_stringtotime($line['date_end']); $newline->fk_product=$line['product_id']; $newobject->lines[]=$newline; } From c195c6fd104ced7ffdb0b17ef0119f1854fe6217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 20:35:31 +0200 Subject: [PATCH 0011/1190] Removed deprecated usage of commande_pdf_create --- htdocs/commande/fiche.php | 29 ++++++++++++++++------------- htdocs/webservices/server_order.php | 2 +- test/phpunit/BuildDocTest.php | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index d73a4c068e1..ccf92cc2b0b 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -178,7 +178,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret = $object->fetch($object->id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); @@ -491,7 +491,7 @@ else if ($action == 'setconditions' && $user->rights->commande->creer) { } $ret = $object->fetch($object->id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } } @@ -722,7 +722,7 @@ else if ($action == 'addline' && $user->rights->commande->creer) { $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST ['prod_entry_mode']); @@ -847,7 +847,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST(' } $ret = $object->fetch($object->id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST ['qty']); @@ -911,8 +911,9 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } } } } @@ -958,7 +959,7 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) { } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret = $object->fetch($object->id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } } @@ -1023,8 +1024,9 @@ else if ($action == 'up' && $user->rights->commande->creer) { $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $object->generateDocument($object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid')); exit(); @@ -1044,8 +1046,9 @@ else if ($action == 'down' && $user->rights->commande->creer) { $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $object->generateDocument($object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid')); exit(); @@ -1073,7 +1076,7 @@ else if ($action == 'builddoc') // In get or post $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - $result = commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db, $result); @@ -2462,7 +2465,7 @@ if ($action == 'create' && $user->rights->commande->creer) { // Build document if it not exists if (! $file || ! is_readable($file)) { - $result = commande_pdf_create($db, $object, GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db, $result); exit(); diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php index d70725b468f..c799f0c8169 100644 --- a/htdocs/webservices/server_order.php +++ b/htdocs/webservices/server_order.php @@ -755,7 +755,7 @@ function validOrder($authentication,$id='') { // Define output language $outputlangs = $langs; - commande_pdf_create($db, $order, $order->modelpdf, $outputlangs, 0, 0, 0); + $order->generateDocument($order->modelpdf, $outputlangs); } else diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 50f9598e79e..01bfdc73fa8 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -274,7 +274,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Einstein $localobject->modelpdf='einstein'; - $result=commande_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; From 610dc8cd0ccf152def10264cecbc94b9f862963a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 20:38:28 +0200 Subject: [PATCH 0012/1190] Removed deprecated usage of expedition_pdf_create --- htdocs/expedition/fiche.php | 6 +++--- test/phpunit/BuildDocTest.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 15b0a16a13e..b618ac59a80 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -261,7 +261,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs); + $result = $object->generateDocument($object->modelpdf, $outputlangs); } if ($result < 0) { @@ -362,7 +362,7 @@ else if ($action == 'builddoc') // En get ou en post $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs); + $result = $object->generateDocument($object->modelpdf, $outputlangs); if ($result <= 0) { dol_print_error($db,$result); @@ -1598,7 +1598,7 @@ else if ($id || $ref) // Build document if it not exists if (! $file || ! is_readable($file)) { - $result=expedition_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref)); if ($result <= 0) { dol_print_error($db,$result); diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 01bfdc73fa8..3f2e9d39b37 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -409,14 +409,14 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Merou $localobject->modelpdf='merou'; - $result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result= $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; // Rouget $localobject->modelpdf='rouget'; - $result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result= $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; From 4b3191b64e7bd21aa4dc161785b5718d7dfef6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 20:49:05 +0200 Subject: [PATCH 0013/1190] Removed deprecated usage of facture_pdf_create --- htdocs/adherents/card_subscriptions.php | 3 ++- htdocs/compta/facture.php | 24 +++++++++++++----------- htdocs/compta/paiement/fiche.php | 4 +++- htdocs/compta/payment_sc/fiche.php | 4 +++- htdocs/core/lib/invoice2.lib.php | 2 +- test/phpunit/BuildDocTest.php | 14 +++++++------- 6 files changed, 29 insertions(+), 22 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index c3fdd1176a1..9e2f1f2a8eb 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -482,7 +482,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ } // Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - facture_pdf_create($db, $invoice, $invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + + $invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 7bd05f9f806..eb7bd367468 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -190,7 +190,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret = $object->fetch($id); // Reload to get new records - $result = facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } if ($result >= 0) { header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $id); @@ -402,7 +402,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret = $object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } else { if (count($object->errors)) setEventMessage($object->errors, 'errors'); @@ -477,7 +477,7 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_ } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret = $object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } } @@ -1285,7 +1285,7 @@ else if ($action == 'addline' && $user->rights->facture->creer) } $ret = $object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST ['prod_entry_mode']); @@ -1416,7 +1416,7 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST(' } $ret = $object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST['qty']); @@ -1459,8 +1459,9 @@ else if ($action == 'up' && $user->rights->facture->creer) { $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '#' . $_GET ['rowid']); exit(); @@ -1481,8 +1482,9 @@ else if ($action == 'down' && $user->rights->facture->creer) { $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '#' . $_GET ['rowid']); exit(); @@ -1705,7 +1707,7 @@ else if ($action == 'builddoc') // En get ou en post $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - $result = facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db, $result); @@ -3707,7 +3709,7 @@ if ($action == 'create') // Build document if it not exists if (! $file || ! is_readable($file)) { - $result = facture_pdf_create($db, $object, GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db, $result); exit(); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 74ec9f4cb69..e8e19010b83 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -112,7 +112,9 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture-> $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($_REQUEST['lang_id']); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $fac->generateDocument($fac->modelpdf, $outputlangs); + } } header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 5c6562b6fc0..d71f73a15e5 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -98,7 +98,9 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->char $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($_REQUEST['lang_id']); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $fac->generateDocument($fac->modelpdf, $outputlangs); + } } header('Location: fiche.php?id='.$paiement->id); diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php index 39405db4468..d5be39aff0f 100644 --- a/htdocs/core/lib/invoice2.lib.php +++ b/htdocs/core/lib/invoice2.lib.php @@ -174,7 +174,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte if ($regenerate || ! dol_is_file($filename)) { if ($usestdout) print "Build PDF for invoice ".$obj->facnumber." - Lang = ".$outputlangs->defaultlang."\n"; - $result=facture_pdf_create($db, $fac, $regenerate?$regenerate:$fac->modelpdf, $outputlangs); + $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs); } else { if ($usestdout) print "PDF for invoice ".$obj->facnumber." already exists\n"; diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 3f2e9d39b37..b2ea825f514 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -173,7 +173,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Crabe (english) $localobject->modelpdf='crabe'; - $result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -181,7 +181,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase $newlangs1=new Translate("",$conf); $newlangs1->setDefaultLang('ja_JP'); $localobject->modelpdf='crabe'; - $result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs1); + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -189,7 +189,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase $newlangs2a=new Translate("",$conf); $newlangs2a->setDefaultLang('sa_SA'); $localobject->modelpdf='crabe'; - $result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs2a); + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -197,7 +197,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase $newlangs2b=new Translate("",$conf); $newlangs2b->setDefaultLang('en_SA'); $localobject->modelpdf='crabe'; - $result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs2b); + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -205,7 +205,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase $newlangs3=new Translate("",$conf); $newlangs3->setDefaultLang('el_GR'); $localobject->modelpdf='crabe'; - $result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs3); + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -213,7 +213,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase $newlangs4=new Translate("",$conf); $newlangs4->setDefaultLang('zh_CN'); $localobject->modelpdf='crabe'; - $result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs4); + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -221,7 +221,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase $newlangs5=new Translate("",$conf); $newlangs5->setDefaultLang('ru_RU'); $localobject->modelpdf='crabe'; - $result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs5); + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; From 9dbf054026f763dd10f9fd5ddbd2f168daaa2302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 20:53:43 +0200 Subject: [PATCH 0014/1190] Removed deprecated usage of project_pdf_create --- htdocs/livraison/fiche.php | 4 ++-- htdocs/projet/fiche.php | 2 +- htdocs/projet/tasks/task.php | 2 +- test/phpunit/BuildDocTest.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 322635354bf..664a44e644a 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -129,7 +129,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - $result=delivery_order_pdf_create($db, $object,$_REQUEST['model'],$outputlangs); + $result= $object->generateDocument($_REQUEST['model'],$outputlangs); } if ($result < 0) { @@ -202,7 +202,7 @@ if ($action == 'builddoc') // En get ou en post if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - $result=delivery_order_pdf_create($db, $object, $object->modelpdf, $outputlangs); + $result= $object->generateDocument($object->modelpdf, $outputlangs); } if ($result < 0) { diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index b87a89181c5..09b85f38cbe 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -276,7 +276,7 @@ if (empty($reshook)) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang(GETPOST('lang_id')); } - $result=project_pdf_create($db, $object, $object->modelpdf, $outputlangs); + $result= $object->generateDocument($object->modelpdf, $outputlangs); if ($result <= 0) { dol_print_error($db,$result); diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 7337c152f4e..c9539c424b1 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -159,7 +159,7 @@ if ($action == 'builddoc' && $user->rights->projet->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang(GETPOST('lang_id')); } - $result=task_pdf_create($db, $object, $object->modelpdf, $outputlangs); + $result= $object->generateDocument($object->modelpdf, $outputlangs); if ($result <= 0) { dol_print_error($db,$result); diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index b2ea825f514..e78a6602f6a 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -355,7 +355,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Baleine $localobject->modelpdf='baleine'; - $result=project_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; From 3561c8e6f3f6ff70ee431f8f3ef3e6e23fb20208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 20:57:17 +0200 Subject: [PATCH 0015/1190] Removed deprecated usage of propale_pdf_create --- htdocs/comm/propal.php | 20 ++++++++++---------- htdocs/comm/propal/class/propal.class.php | 4 ++-- test/phpunit/BuildDocTest.php | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index bd95e5a67e4..3e530ef8676 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -156,7 +156,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id); @@ -176,7 +176,7 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } else { $langs->load("errors"); @@ -475,7 +475,7 @@ else if ($action == 'add' && $user->rights->propal->creer) { $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id); @@ -676,7 +676,7 @@ if ($action == 'modif' && $user->rights->propal->creer) { $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } @@ -890,7 +890,7 @@ else if ($action == 'addline' && $user->rights->propal->creer) { $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST ['prod_entry_mode']); @@ -1018,7 +1018,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST ['qty']); @@ -1060,7 +1060,7 @@ else if ($action == 'builddoc' && $user->rights->propal->creer) { $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - $result = propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db, $result); @@ -1146,7 +1146,7 @@ else if ($action == 'up' && $user->rights->propal->creer) { $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id . '#' . GETPOST('rowid')); @@ -1165,7 +1165,7 @@ else if ($action == 'down' && $user->rights->propal->creer) { $outputlangs->setDefaultLang($newlang); } $ret = $object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id . '#' . GETPOST('rowid')); @@ -2333,7 +2333,7 @@ if ($action == 'create') { // Build document if it not exists if (! $file || ! is_readable($file)) { - $result = propale_pdf_create($db, $object, GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db, $result); exit(); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 52d57c5251c..cb1046f86ee 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1747,7 +1747,7 @@ class Propal extends CommonObject $outputlangs->setDefaultLang($newlang); } //$ret=$object->fetch($id); // Reload to get new records - propale_pdf_create($this->db, $this, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $this->generateDocument($conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } // Call trigger @@ -1769,7 +1769,7 @@ class Propal extends CommonObject $outputlangs->setDefaultLang($newlang); } //$ret=$object->fetch($id); // Reload to get new records - propale_pdf_create($this->db, $this, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $this->generateDocument($conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } // Call trigger diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index e78a6602f6a..5462121d7ae 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -329,7 +329,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Azur $localobject->modelpdf='azur'; - $result=propale_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; From 9ae7486555dfaa4d4cb76dfea7b49d2650fad71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 21:42:07 +0200 Subject: [PATCH 0016/1190] Removed deprecated usage of supplier_order_pdf_create and supplier_invoice_pdf_create --- htdocs/fourn/commande/fiche.php | 24 ++++++++++++++---------- htdocs/fourn/facture/fiche.php | 10 +++++----- test/phpunit/BuildDocTest.php | 4 ++-- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index f4f69fbd269..17475a08b6b 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -352,7 +352,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer) $outputlangs->setDefaultLang($newlang); } - supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST ['prod_entry_mode']); @@ -448,7 +448,7 @@ else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($object->id); // Reload to get new records - supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } else @@ -473,7 +473,7 @@ else if ($action == 'confirm_deleteproductline' && $confirm == 'yes' && $user->r if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($object->id); // Reload to get new records - supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } else @@ -504,7 +504,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($object->id); // Reload to get new records - supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } else @@ -550,7 +550,7 @@ else if ($action == 'confirm_approve' && $confirm == 'yes' && $user->rights->fou if ($result > 0) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; @@ -582,7 +582,7 @@ else if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fo if ($result > 0) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; @@ -689,7 +689,9 @@ else if ($action == 'up' && $user->rights->fournisseur->commande->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($_REQUEST['lang_id']); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid'])); exit; } @@ -703,7 +705,9 @@ else if ($action == 'down' && $user->rights->fournisseur->commande->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($_REQUEST['lang_id']); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid'])); exit; } @@ -721,7 +725,7 @@ else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer) / $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang(GETPOST('lang_id')); } - $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref); + $result= $object->generateDocument($object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); @@ -2033,7 +2037,7 @@ elseif (! empty($object->id)) // Build document if it not exists if (! $file || ! is_readable($file)) { - $result=supplier_order_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 9d20c2b9722..de70bf696cc 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -475,7 +475,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $outputlangs = $langs; - $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); @@ -699,7 +699,7 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer) } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); @@ -776,7 +776,7 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer) $outputlangs->setDefaultLang($_REQUEST['lang_id']); } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); @@ -1016,7 +1016,7 @@ elseif ($action == 'builddoc') $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); @@ -2348,7 +2348,7 @@ else // Build document if it not exists if (! $file || ! is_readable($file)) { - $result=supplier_invoice_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 5462121d7ae..3f20b99fd14 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -247,7 +247,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Canelle $localobject->modelpdf='canelle'; - $result=supplier_invoice_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -302,7 +302,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Muscadet $localobject->modelpdf='muscadet'; - $result=supplier_order_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result= $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; From 9ed77c60605d44ebbf61324f03ba316f08adaae4 Mon Sep 17 00:00:00 2001 From: Cubexed Date: Fri, 12 Sep 2014 18:00:55 +0200 Subject: [PATCH 0017/1190] Closed projects are greyed out in project selector --- htdocs/core/class/html.formprojet.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 4042bb16e31..eafe9d9f166 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -115,12 +115,17 @@ class FormProjets { $disabled=0; $labeltoshow.=' '.dol_trunc($obj->title,$maxlength); - if (! $obj->fk_statut > 0) + if ($obj->fk_statut == 0) { $disabled=1; $labeltoshow.=' - '.$langs->trans("Draft"); } - if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid)) + else if ($obj->fk_statut == 2) + { + $disabled=1; + $labeltoshow.=' - '.$langs->trans("Closed"); + } + else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid)) { $disabled=1; $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany"); From de6e1c50366ca6532175d4f0774436ce3c7e3da1 Mon Sep 17 00:00:00 2001 From: Drosis Nikos Date: Wed, 17 Sep 2014 18:01:59 +0300 Subject: [PATCH 0018/1190] Correct view greek language in PDF --- htdocs/core/lib/functions2.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 67e94ee7af2..494b06f09da 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1220,7 +1220,7 @@ function dol_print_reduction($reduction,$langs) $string = ''; if ($reduction == 100) { - $string = $langs->trans("Offered"); + $string = $langs->transnoentities("Offered"); } else { From a41dc3acd9ff9a4b3b8ce0786185cdc2f327c0f6 Mon Sep 17 00:00:00 2001 From: Drosis Nikos Date: Wed, 17 Sep 2014 18:06:31 +0300 Subject: [PATCH 0019/1190] Correct view greek language --- htdocs/societe/consumption.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index bedc41e2446..a22a49e35eb 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -246,7 +246,7 @@ $typeElementString = $form->selectarray("type_element",$elementTypeArray,GETPOST $button = ''; $param="&sref=".$sref."&month=".$month."&year=".$year."&sprod_fulldescr=".$sprod_fulldescr."&socid=".$socid."&type_element=".$type_element; -print_barre_liste($langs->trans('ProductsIntoElements', $typeElementString.' '.$button), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', ''); +print_barre_liste($langs->transnoentitiesnoconv('ProductsIntoElements', $typeElementString.' '.$button), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', ''); if ($sql_select) { From 7a9ce455d97359d293233590202df4d825e3c375 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 18 Sep 2014 20:13:38 +0200 Subject: [PATCH 0020/1190] Uniformize code $_SERVER["PHP_SELF"] --- htdocs/accountancy/admin/account.php | 12 ++++++------ htdocs/adherents/cotisations.php | 16 ++++++++-------- htdocs/boutique/client/index.php | 6 +++--- htdocs/boutique/notification/index.php | 2 +- htdocs/boutique/produits/index.php | 6 +++--- htdocs/commande/orderstoinvoice.php | 8 ++++---- htdocs/compta/paiement.php | 10 +++++----- htdocs/compta/paiement/avalider.php | 10 +++++----- htdocs/compta/prelevement/bons.php | 6 +++--- htdocs/compta/prelevement/factures.php | 6 +++--- htdocs/compta/prelevement/lignes.php | 8 ++++---- htdocs/compta/prelevement/rejets.php | 8 ++++---- htdocs/contrat/services.php | 20 ++++++++++---------- htdocs/cron/list.php | 18 +++++++++--------- htdocs/expedition/liste.php | 12 ++++++------ htdocs/fourn/contact.php | 8 ++++---- htdocs/fourn/facture/paiement.php | 16 ++++++++-------- htdocs/product/popuprop.php | 10 +++++----- htdocs/product/reassort.php | 18 +++++++++--------- htdocs/public/members/public_list.php | 9 ++++----- htdocs/societe/notify/fiche.php | 20 ++++++++++---------- htdocs/societe/notify/index.php | 8 ++++---- 22 files changed, 118 insertions(+), 119 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index c42a8d7079b..0c929ef5de5 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -139,12 +139,12 @@ if ($result) { print ''; print ''; - print_liste_field_titre($langs->trans("AccountNumber"), "account.php", "aa.account_number", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Label"), "account.php", "aa.label", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Accountparent"), "account.php", "aa.account_parent", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Pcgtype"), "account.php", "aa.pcg_type", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Pcgsubtype"), "account.php", "aa.pcg_subtype", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Active"), "account.php", "aa.active", "", $param, "", $sortfield, $sortorder); + print_liste_field_titre($langs->trans("AccountNumber"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, "", $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "aa.label", "", $param, "", $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Accountparent"), $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, "", $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $param, "", $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $param, "", $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Active"), $_SERVER["PHP_SELF"], "aa.active", "", $param, "", $sortfield, $sortorder); print_liste_field_titre(" "); print ''; diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 2bb7a438f3e..160f47365fa 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -97,17 +97,17 @@ if ($result) print '
'; print ''; - print_liste_field_titre($langs->trans("Ref"),"cotisations.php","c.rowid",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Name"),"cotisations.php","d.lastname",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Login"),"cotisations.php","d.login",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Label"),"cotisations.php","c.note",$param,"",'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"c.note",$param,"",'align="left"',$sortfield,$sortorder); if (! empty($conf->banque->enabled)) { - print_liste_field_titre($langs->trans("Account"),"cotisations.php","b.fk_account",$pram,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"b.fk_account",$pram,"","",$sortfield,$sortorder); } - print_liste_field_titre($langs->trans("Date"),"cotisations.php","c.dateadh",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateEnd"),"cotisations.php","c.datef",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Amount"),"cotisations.php","c.cotisation",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"c.dateadh",$param,"",'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"c.datef",$param,"",'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"c.cotisation",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; // Static objects diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index 358a74a750f..b22c478f320 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -47,7 +47,7 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des clients", $page, "index.php"); +print_barre_liste("Liste des clients", $page, $_SERVER["PHP_SELF"]); $sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c"; @@ -61,8 +61,8 @@ if ($resql) $i = 0; print "
"; print ""; - print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname"); - print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname"); + print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"], "c.customers_firstname"); + print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"], "c.customers_lastname"); print ''; print "\n"; $var=True; diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index f8a24c5a52c..f94c08018d8 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -62,7 +62,7 @@ if ($resql) $i = 0; print "
'.$langs->trans("EMail").''.$langs->trans("Newsletter").'
"; print ""; - print_liste_field_titre("Client","index.php", "c.customers_lastname"); + print_liste_field_titre("Client",$_SERVER["PHP_SELF"], "c.customers_lastname"); print ''; print "\n"; $var=True; diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index 02db7d5db2b..13ad3463af9 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -44,7 +44,7 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des clients", $page, "index.php"); +print_barre_liste("Liste des clients", $page, $_SERVER["PHP_SELF"]); $sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; $sql .= " FROM ".DB_NAME_OSC.".customers as c"; @@ -58,8 +58,8 @@ if ($resql) $i = 0; print "
'.$langs->trans("Product").'
"; print ""; - print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname"); - print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname"); + print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"], "c.customers_firstname"); + print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"], "c.customers_lastname"); print ''; print "\n"; $var=True; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index f6cb4a27863..eb29889f115 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -579,10 +579,10 @@ if (($action != 'create' && $action != 'add') || !$error) print '
'.$langs->trans("EMail").''.$langs->trans("Newsletter").'
'; print ''; - print_liste_field_titre($langs->trans('Ref'),'orderstoinvoice.php','c.ref','','&socid='.$socid,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('RefCustomerOrder'),'orderstoinvoice.php','c.ref_client','','&socid='.$socid,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('OrderDate'),'orderstoinvoice.php','c.date_commande','','&socid='.$socid, 'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('DeliveryDate'),'orderstoinvoice.php','c.date_livraison','','&socid='.$socid, 'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'c.ref','','&socid='.$socid,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('RefCustomerOrder'),$_SERVER["PHP_SELF"],'c.ref_client','','&socid='.$socid,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('OrderDate'),$_SERVER["PHP_SELF"],'c.date_commande','','&socid='.$socid, 'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('DeliveryDate'),$_SERVER["PHP_SELF"],'c.date_livraison','','&socid='.$socid, 'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Status'),'','','','','align="right"'); print_liste_field_titre($langs->trans('GenerateBill'),'','','','','align="center"'); print ''; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index e7d11fb1b99..1cfc507e4df 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -686,13 +686,13 @@ if (! GETPOST('action')) $i = 0; $var=True; - print_barre_liste($langs->trans('Payments'), $page, 'paiement.php','',$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num); print '
'; print ''; - print_liste_field_titre($langs->trans('Invoice'),'paiement.php','facnumber','','','',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Date'),'paiement.php','dp','','','',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Type'),'paiement.php','libelle','','','',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Amount'),'paiement.php','fa_amount','','','align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'facnumber','','','',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','','','',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'libelle','','','',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'fa_amount','','','align="right"',$sortfield,$sortorder); print ''; print "\n"; diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 70e7507b96e..3d5fa3935de 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -80,14 +80,14 @@ if ($resql) $i = 0; $var=True; - print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, "avalider.php","",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num); print '
 
'; print ''; - print_liste_field_titre($langs->trans("Ref"),"avalider.php","p.rowid","","",'width="60"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Date"),"avalider.php","dp","","",'width="80" align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Type"),"avalider.php","c.libelle","","","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("AmountTTC"),"avalider.php","c.libelle","","",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.rowid","","",'width="60"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","","",'width="80" align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle","","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"c.libelle","","",'align="right"',$sortfield,$sortorder); print ""; print "\n"; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 97e4401ec27..8c55d8b556c 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -73,14 +73,14 @@ if ($result) $urladd= "&statut=".$statut; - print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print '
 
'; print ''; - print_liste_field_titre($langs->trans("WithdrawalsReceipts"),"bons.php","p.ref",'','','class="liste_titre"'); - print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"'); + print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref",'','','class="liste_titre"'); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'class="liste_titre" align="center"'); print ''; print ''; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 92cd8c4c6a9..31a726828ff 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -144,9 +144,9 @@ if ($result) print"\n\n"; print '
'.$langs->trans("Amount").'
'; print ''; - print_liste_field_titre($langs->trans("Bill"),"factures.php","p.ref",'',$urladd,'class="liste_titre"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ThirdParty"),"factures.php","s.nom",'',$urladd,'class="liste_titre"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Amount"),"factures.php","f.total_ttc","",$urladd,'class="liste_titre" align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"p.ref",'',$urladd,'class="liste_titre"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd,'class="liste_titre"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"f.total_ttc","",$urladd,'class="liste_titre" align="center"',$sortfield,$sortorder); print ''; $var=false; diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index d7dac30b3af..16f1793c372 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -149,13 +149,13 @@ if ($result) $urladd = "&id=".$prev_id; - print_barre_liste("", $page, "lignes.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste("", $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print '
 
'; print ''; - print_liste_field_titre($langs->trans("Lines"),"lignes.php","pl.rowid",'',$urladd); - print_liste_field_titre($langs->trans("ThirdParty"),"lignes.php","s.nom",'',$urladd); - print_liste_field_titre($langs->trans("Amount"),"lignes.php","pl.amount","",$urladd,'align="center"'); + print_liste_field_titre($langs->trans("Lines"),$_SERVER["PHP_SELF"],"pl.rowid",'',$urladd); + print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd); + print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","",$urladd,'align="center"'); print ''; $var=false; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 30b36a59775..6cc88d41835 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -85,13 +85,13 @@ if ($result) $num = $db->num_rows($result); $i = 0; - print_barre_liste($langs->trans("WithdrawsRefused"), $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("WithdrawsRefused"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print '
 
'; print ''; - print_liste_field_titre($langs->trans("Line"),"rejets.php","p.ref",'',$urladd); - print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd); - print_liste_field_titre($langs->trans("Reason"),"rejets.php","pr.motif","",$urladd); + print_liste_field_titre($langs->trans("Line"),$_SERVER["PHP_SELF"],"p.ref",'',$urladd); + print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd); + print_liste_field_titre($langs->trans("Reason"),$_SERVER["PHP_SELF"],"pr.motif","",$urladd); print ''; $var=True; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 2f656d14211..4318d81e923 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -136,24 +136,24 @@ if ($resql) if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices"); if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices"); if ($mode == "5") $title=$langs->trans("ListOfClosedServices"); - print_barre_liste($title, $page, "services.php", $param, $sortfield, $sortorder,'',$num); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num); print '
'; print ''; - print_liste_field_titre($langs->trans("Contract"),"services.php", "c.rowid",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Service"),"services.php", "p.description",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),"services.php", "s.nom",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Contract"),$_SERVER["PHP_SELF"], "c.rowid",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Service"),$_SERVER["PHP_SELF"], "p.description",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"], "s.nom",$param,"","",$sortfield,$sortorder); // Date debut - if ($mode == "0") print_liste_field_titre($langs->trans("DateStartPlannedShort"),"services.php", "cd.date_ouverture_prevue",$param,'',' align="center"',$sortfield,$sortorder); - if ($mode == "" || $mode > 0) print_liste_field_titre($langs->trans("DateStartRealShort"),"services.php", "cd.date_ouverture",$param,'',' align="center"',$sortfield,$sortorder); + if ($mode == "0") print_liste_field_titre($langs->trans("DateStartPlannedShort"),$_SERVER["PHP_SELF"], "cd.date_ouverture_prevue",$param,'',' align="center"',$sortfield,$sortorder); + if ($mode == "" || $mode > 0) print_liste_field_titre($langs->trans("DateStartRealShort"),$_SERVER["PHP_SELF"], "cd.date_ouverture",$param,'',' align="center"',$sortfield,$sortorder); // Date fin - if ($mode == "" || $mode < 5) print_liste_field_titre($langs->trans("DateEndPlannedShort"),"services.php", "cd.date_fin_validite",$param,'',' align="center"',$sortfield,$sortorder); - else print_liste_field_titre($langs->trans("DateEndRealShort"),"services.php", "cd.date_cloture",$param,'',' align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),"services.php", "cd.statut,c.statut",$param,"","align=\"right\"",$sortfield,$sortorder); + if ($mode == "" || $mode < 5) print_liste_field_titre($langs->trans("DateEndPlannedShort"),$_SERVER["PHP_SELF"], "cd.date_fin_validite",$param,'',' align="center"',$sortfield,$sortorder); + else print_liste_field_titre($langs->trans("DateEndRealShort"),$_SERVER["PHP_SELF"], "cd.date_cloture",$param,'',' align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "cd.statut,c.statut",$param,"","align=\"right\"",$sortfield,$sortorder); print "\n"; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index dd9eb8b6289..a9789ec055e 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -150,17 +150,17 @@ print ''; print '
'; print ''; $arg_url='&page='.$page.'&status='.$status.'&search_label='.$search_label; -print_liste_field_titre($langs->trans("CronLabel"),$_SERVEUR['PHP_SELF'],"t.label","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronLabel"),$_SERVER["PHP_SELF"],"t.label","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronTask"),'','',"",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("CronDtStart"),$_SERVEUR['PHP_SELF'],"t.datestart","",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVEUR['PHP_SELF'],"t.dateend","",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVEUR['PHP_SELF'],"t.datelastrun","",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVEUR['PHP_SELF'],"t.datenextrun","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtStart"),$_SERVER["PHP_SELF"],"t.datestart","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVER["PHP_SELF"],"t.dateend","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVER["PHP_SELF"],"t.datelastrun","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVER["PHP_SELF"],"t.datenextrun","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronFrequency"),'',"","",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Enabled"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronNbRun"),$_SERVER["PHP_SELF"],"t.nbrun","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronLastResult"),$_SERVER["PHP_SELF"],"t.lastresult","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVER["PHP_SELF"],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("Enabled"),$_SERVER["PHP_SELF"],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder); print ''; print ''; diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index 29ab105ee91..100198478e0 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -96,20 +96,20 @@ if ($resql) $param="&socid=$socid"; - print_barre_liste($langs->trans('ListOfSendings'), $page, "liste.php",$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; print ''; - print_liste_field_titre($langs->trans("Ref"),"liste.php","e.ref","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom", "", $param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateDeliveryPlanned"),"liste.php","e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateDeliveryPlanned"),$_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder); if($conf->livraison_bon->enabled) { - print_liste_field_titre($langs->trans("DateReceived"),"liste.php","e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateReceived"),$_SERVER["PHP_SELF"],"e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder); } - print_liste_field_titre($langs->trans("Status"),"liste.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder); print "\n"; $var=True; diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 70748c8bd57..8764acdbda3 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -94,13 +94,13 @@ if ($result) $num = $db->num_rows($result); $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); - print_barre_liste($title." (".$langs->trans("Suppliers").")",$page, "contact.php", "",$sortfield,$sortorder,"",$num); + print_barre_liste($title." (".$langs->trans("Suppliers").")",$page, $_SERVER["PHP_SELF"], "",$sortfield,$sortorder,"",$num); print '
'; print ''; - print_liste_field_titre($langs->trans("Lastname"),"contact.php","p.name", $begin, "", "", $sortfield,$sortorder); - print_liste_field_titre($langs->trans("Firstname"),"contact.php","p.firstname", $begin, "", "", $sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),"contact.php","s.nom", $begin, "", "", $sortfield,$sortorder); + print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin, "", "", $sortfield,$sortorder); + print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, "", "", $sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, "", "", $sortfield,$sortorder); print ''; print ''; print "\n"; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index c66a03382de..2859620445e 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -514,18 +514,18 @@ if (empty($action)) $paramlist.=(! empty($search_company)?"&search_company=".$search_company:""); $paramlist.=(! empty($search_amount)?"&search_amount=".$search_amount:""); - print_barre_liste($langs->trans('SupplierPayments'), $page, 'paiement.php',$paramlist,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num); print ''; print '
'.$langs->trans("Email").''.$langs->trans("Phone").'
'; print ''; - print_liste_field_titre($langs->trans('RefPayment'),'paiement.php','p.rowid','',$paramlist,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Date'),'paiement.php','dp','',$paramlist,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('ThirdParty'),'paiement.php','s.nom','',$paramlist,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Type'),'paiement.php','c.libelle','',$paramlist,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Account'),'paiement.php','ba.label','',$paramlist,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Amount'),'paiement.php','f.amount','',$paramlist,'align="right"',$sortfield,$sortorder); - //print_liste_field_titre($langs->trans('Invoice'),'paiement.php','ref_supplier','',$paramlist,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('RefPayment'),$_SERVER["PHP_SELF"],'p.rowid','',$paramlist,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','',$paramlist,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('ThirdParty'),$_SERVER["PHP_SELF"],'s.nom','',$paramlist,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'c.libelle','',$paramlist,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'f.amount','',$paramlist,'align="right"',$sortfield,$sortorder); + //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder); print "\n"; // Lines for filters fields diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 7d1f4da5682..523926d5084 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -89,16 +89,16 @@ if (isset($type)) if ($type == 1) $title = $langs->trans("ListServiceByPopularity"); } -print_barre_liste($title, $page, "popuprop.php",$param,"","","",$num); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$param,"","","",$num); print '
'; print ""; -print_liste_field_titre($langs->trans('Ref'), 'popuprop.php', 'p.ref', '', '', '', $sortfield, $sortorder); -print_liste_field_titre($langs->trans('Type'), 'popuprop.php', 'p.type', '', '', '', $sortfield, $sortorder); -print_liste_field_titre($langs->trans('Label'), 'popuprop.php', 'p.label', '', '', '', $sortfield, $sortorder); -print_liste_field_titre($langs->trans('NbOfProposals'), 'popuprop.php', 'c', '', '', 'align="right"', $sortfield, $sortorder); +print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', '', '', $sortfield, $sortorder); +print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.type', '', '', '', $sortfield, $sortorder); +print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', '', '', $sortfield, $sortorder); +print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', '', 'align="right"', $sortfield, $sortorder); print "\n"; $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, count(*) as c"; diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index d0b8c961afa..eaad17afd40 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -194,11 +194,11 @@ if ($resql) if ($sref || $snom || $sall || GETPOST('search')) { - print_barre_liste($texte, $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num); + print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num); } else { - print_barre_liste($texte, $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); + print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); } if (! empty($catid)) @@ -211,7 +211,7 @@ if ($resql) print "
"; } - print ''; + print ''; print ''; print ''; print ''; @@ -240,12 +240,12 @@ if ($resql) // Lignes des titres print ""; - print_liste_field_titre($langs->trans("Ref"),"reassort.php", "p.ref",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Label"),"reassort.php", "p.label",$param,"","",$sortfield,$sortorder); - if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"),"reassort.php", "p.duration",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("StockLimit"),"reassort.php", "p.seuil_stock_alerte",$param,"",'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DesiredStock"),"reassort.php", "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("PhysicalStock"),"reassort.php", "stock_physique",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder); + if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("StockLimit"), $_SERVER["PHP_SELF"], "p.seuil_stock_alerte",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder); // TODO Add info of running suppliers/customers orders //print_liste_field_titre($langs->trans("TheoreticalStock"),"reassort.php", "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder); print ''; diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index d88e87c2d12..e672a6d59d3 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -126,10 +126,10 @@ if ($result) print ''."\n"; - //print_liste_field_titre($langs->trans("DateToBirth"),"public_list.php","birth",'',$param,$sortfield,$sortorder); // est-ce nécessaire ?? - print_liste_field_titre($langs->trans("EMail"),"public_list.php","email",'',$param,$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Zip"),"public_list.php","zip","",$param,$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Town"),"public_list.php","town","",$param,$sortfield,$sortorder); + //print_liste_field_titre($langs->trans("DateToBirth"), $_SERVER["PHP_SELF"],"birth",'',$param,$sortfield,$sortorder); // est-ce nécessaire ?? + print_liste_field_titre($langs->trans("EMail"), $_SERVER["PHP_SELF"],"email",'',$param,$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Zip"), $_SERVER["PHP_SELF"],"zip","",$param,$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Town"), $_SERVER["PHP_SELF"],"town","",$param,$sortfield,$sortorder); print "\n"; print "\n"; @@ -140,7 +140,6 @@ if ($result) $var=!$var; print ""; print ''."\n"; - //print "\n"; // est-ce nécessaire ?? print ''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index 18de91a6a31..0f1b7c010f9 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -203,7 +203,7 @@ if ($result > 0) // Add notification form print_fiche_titre($langs->trans("AddNewNotification"),'',''); - print ''; + print ''; print ''; print ''; @@ -212,9 +212,9 @@ if ($result > 0) // Line with titles print '
 '.$langs->trans("Firstname").''; print ' '.$langs->trans("Lastname").''; print ' / '.$langs->trans("Company").'".$langs->trans("Photo")."
'.dolGetFirstLastname($obj->firstname, $obj->lastname).($objp->societe?' / '.$objp->societe:'').'$objp->birth'.$objp->email.''.$objp->zip.''.$objp->town.'
'; print ''; - print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder); print_liste_field_titre(''); print ''; @@ -265,9 +265,9 @@ if ($result > 0) // Line with titles print '
'; print ''; - print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder); print_liste_field_titre('','',''); print ''; @@ -343,9 +343,9 @@ if ($result > 0) // Line with titles print '
'; print ''; - print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.lastname",'',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Date"),"fiche.php","a.daten",'',$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.daten",'',$param,'align="right"',$sortfield,$sortorder); print ''; // List diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 47054424212..457542d21f3 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -78,13 +78,13 @@ if ($result) $i = 0; $paramlist=''; - print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, "index.php", $paramlist, $sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num); print '
'; print ''; - print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Contact"),"index.php","c.lastname","","",'valign="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),"index.php","a.titre","","",'valign="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder); print "\n"; $var=True; while ($i < $num) From b22aef3521a8e09c6f697234164075c6822785b2 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 18 Sep 2014 20:33:37 +0200 Subject: [PATCH 0021/1190] Qual: Renamed all files & links "liste.php" into "list.php" --- ChangeLog | 1 + htdocs/adherents/agenda.php | 2 +- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/adherents/document.php | 2 +- htdocs/adherents/fiche.php | 4 +- htdocs/adherents/index.php | 2 +- htdocs/adherents/{liste.php => list.php} | 2 +- htdocs/adherents/note.php | 2 +- htdocs/adherents/type.php | 6 +- htdocs/bookmarks/bookmarks.lib.php | 2 +- htdocs/bookmarks/fiche.php | 6 +- htdocs/bookmarks/{liste.php => list.php} | 2 +- .../produits/{osc-liste.php => osc-list.php} | 4 +- htdocs/categories/categorie.php | 2 +- htdocs/comm/fiche.php | 4 +- htdocs/comm/index.php | 4 +- htdocs/comm/mailing/cibles.php | 4 +- htdocs/comm/mailing/fiche.php | 4 +- htdocs/comm/mailing/index.php | 4 +- htdocs/comm/mailing/{liste.php => list.php} | 2 +- htdocs/comm/propal/index.php | 6 +- htdocs/commande/contact.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/commande/index.php | 8 +- htdocs/commande/{liste.php => list.php} | 2 +- htdocs/commande/note.php | 2 +- htdocs/compta/dons/fiche.php | 4 +- htdocs/compta/dons/index.php | 2 +- htdocs/compta/dons/{liste.php => list.php} | 2 +- htdocs/compta/index.php | 4 +- .../paiement/cheque/{liste.php => list.php} | 2 +- htdocs/compta/paiement/fiche.php | 2 +- .../compta/paiement/{liste.php => list.php} | 2 +- .../prelevement/{liste.php => list.php} | 4 +- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/stats/cabyuser.php | 8 +- htdocs/compta/stats/casoc.php | 8 +- .../fournisseur/{liste.php => list.php} | 4 +- .../ventilation/{liste.php => list.php} | 4 +- htdocs/contact/fiche.php | 2 +- htdocs/contrat/contact.php | 2 +- htdocs/contrat/document.php | 2 +- htdocs/contrat/fiche.php | 2 +- htdocs/contrat/index.php | 2 +- htdocs/contrat/{liste.php => list.php} | 2 +- htdocs/contrat/note.php | 2 +- htdocs/core/boxes/box_activity.php | 4 +- htdocs/core/boxes/box_bookmarks.php | 4 +- htdocs/core/menus/init_menu_auguria.sql | 64 +++++++------- htdocs/core/menus/standard/eldy.lib.php | 88 +++++++++---------- htdocs/core/search_page.php | 6 +- htdocs/expedition/contact.php | 2 +- htdocs/expedition/fiche.php | 2 +- htdocs/expedition/index.php | 2 +- htdocs/expedition/{liste.php => list.php} | 2 +- htdocs/expedition/note.php | 2 +- htdocs/fourn/commande/contact.php | 2 +- htdocs/fourn/commande/document.php | 2 +- htdocs/fourn/commande/fiche.php | 4 +- htdocs/fourn/commande/history.php | 2 +- htdocs/fourn/commande/index.php | 8 +- htdocs/fourn/commande/{liste.php => list.php} | 2 +- htdocs/fourn/commande/note.php | 2 +- htdocs/fourn/fiche.php | 4 +- htdocs/fourn/index.php | 2 +- htdocs/fourn/{liste.php => list.php} | 4 +- htdocs/fourn/product/index.php | 6 +- htdocs/fourn/product/{liste.php => list.php} | 6 +- htdocs/index.php | 16 ++-- htdocs/livraison/fiche.php | 2 +- htdocs/main.inc.php | 6 +- htdocs/product/fiche.php | 2 +- htdocs/product/index.php | 14 +-- htdocs/product/{liste.php => list.php} | 8 +- htdocs/product/stock/fiche.php | 4 +- htdocs/product/stock/index.php | 2 +- htdocs/product/stock/{liste.php => list.php} | 2 +- htdocs/product/stock/mouvement.php | 2 +- htdocs/projet/contact.php | 2 +- htdocs/projet/document.php | 2 +- htdocs/projet/element.php | 2 +- htdocs/projet/fiche.php | 2 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/index.php | 4 +- htdocs/projet/{liste.php => list.php} | 4 +- htdocs/projet/note.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/societe/index.php | 2 +- 89 files changed, 225 insertions(+), 224 deletions(-) rename htdocs/adherents/{liste.php => list.php} (99%) rename htdocs/bookmarks/{liste.php => list.php} (99%) rename htdocs/boutique/produits/{osc-liste.php => osc-list.php} (97%) rename htdocs/comm/mailing/{liste.php => list.php} (99%) rename htdocs/commande/{liste.php => list.php} (99%) rename htdocs/compta/dons/{liste.php => list.php} (99%) rename htdocs/compta/paiement/cheque/{liste.php => list.php} (99%) rename htdocs/compta/paiement/{liste.php => list.php} (99%) rename htdocs/compta/prelevement/{liste.php => list.php} (98%) rename htdocs/compta/ventilation/fournisseur/{liste.php => list.php} (94%) rename htdocs/compta/ventilation/{liste.php => list.php} (97%) rename htdocs/contrat/{liste.php => list.php} (99%) rename htdocs/expedition/{liste.php => list.php} (99%) rename htdocs/fourn/commande/{liste.php => list.php} (99%) rename htdocs/fourn/{liste.php => list.php} (99%) rename htdocs/fourn/product/{liste.php => list.php} (97%) rename htdocs/product/{liste.php => list.php} (98%) rename htdocs/product/stock/{liste.php => list.php} (99%) rename htdocs/projet/{liste.php => list.php} (98%) diff --git a/ChangeLog b/ChangeLog index 24e22202555..f3287e51215 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ For developers: - Qual: Renamed table llx_c_civilite into llx_c_civility, field civilite into label in the same table, and field civilite into civility in other table +- Qual: Renamed all files & links "liste.php" into "list.php" WARNING: Following changes may create regression for some external modules, but was necessary to make Dolibarr better: diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index f1a18c5e4bf..5d19cad1ffb 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -84,7 +84,7 @@ if ($object->id > 0) print '
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Reference print ''; diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index c3fdd1176a1..3000974a389 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -554,7 +554,7 @@ if ($rowid) print ''; print '
'.$langs->trans('Ref').'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index a3d7fe1cb40..1d780eb21a5 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -113,7 +113,7 @@ if ($id > 0) print '
'.$langs->trans("Ref").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 777cead2469..069bbe0669e 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -564,7 +564,7 @@ if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confir } else { - header("Location: liste.php"); + header("Location: list.php"); exit; } } @@ -1355,7 +1355,7 @@ else print '
'.$langs->trans("Ref").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index eff3f85fdf6..1ec3d71c664 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -127,7 +127,7 @@ print '
'; // Formulaire recherche adherent -print ''; +print ''; print ''; print ''; print '
'.$langs->trans("Ref").'
'; diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/list.php similarity index 99% rename from htdocs/adherents/liste.php rename to htdocs/adherents/list.php index e5715bff99b..0cd2b215086 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/list.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/adherents/liste.php + * \file htdocs/adherents/list.php * \ingroup member * \brief Page to list all members of foundation */ diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 96ccd19b928..727b3a9bcdc 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -87,7 +87,7 @@ if ($id) print '
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Reference print ''; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 7dc0a43ac26..ec7aa7383c8 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -364,7 +364,7 @@ if ($rowid > 0) print ""; - // Show list of members (nearly same code than in page liste.php) + // Show list of members (nearly same code than in page list.php) $membertypestatic=new AdherentType($db); @@ -588,12 +588,12 @@ if ($rowid > 0) print '"; diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index ebfe7e78db6..e59ae0af845 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -48,7 +48,7 @@ function printBookmarksList($aDb, $aLangs) // Menu bookmark $ret.= '
'; $ret.= '
'.$langs->trans('Ref').''; if ($user->rights->adherent->creer) { - print ''.img_edit().''; + print ''.img_edit().''; } print ' '; if ($user->rights->adherent->supprimer) { - print ''.img_picto($langs->trans("Resiliate"),'disable.png').''; + print ''.img_picto($langs->trans("Resiliate"),'disable.png').''; } print "
'; - print ''; + print ''; } else { diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 76176930da3..9aaadc70eea 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -592,7 +592,7 @@ if ($id > 0) print '
'; - $ret.= ''.$langs->trans('Bookmarks').''; + $ret.= ''.$langs->trans('Bookmarks').''; $ret.= ''; if ($user->rights->bookmark->creer) { diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index 6a7394f6fc6..18698d3a3b7 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -54,7 +54,7 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') if (GETPOST("cancel")) { - if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/liste.php')); + if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/list.php')); header("Location: ".$backtopage); exit; } @@ -86,7 +86,7 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') if ($res > 0) { - if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):DOL_URL_ROOT.'/bookmarks/liste.php'); + if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):DOL_URL_ROOT.'/bookmarks/list.php'); header("Location: ".$backtopage); exit; } @@ -285,7 +285,7 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) // Remove if ($user->rights->bookmark->supprimer && $action != 'edit') { - print " id."&action=delete\">".$langs->trans("Delete")."\n"; + print " id."&action=delete\">".$langs->trans("Delete")."\n"; } print ''; diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/list.php similarity index 99% rename from htdocs/bookmarks/liste.php rename to htdocs/bookmarks/list.php index 87f98072045..7d0c326f894 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/list.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/bookmarks/liste.php + * \file htdocs/bookmarks/list.php * \brief Page to display list of bookmarks * \ingroup bookmark */ diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-list.php similarity index 97% rename from htdocs/boutique/produits/osc-liste.php rename to htdocs/boutique/produits/osc-list.php index d8888505254..4edf156dd05 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-list.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/boutique/produits/osc-liste.php + * \file htdocs/boutique/produits/osc-list.php * \ingroup boutique * \brief Page gestion produits du module OsCommerce */ @@ -46,7 +46,7 @@ $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des produits oscommerce", $page, "osc-liste.php"); +print_barre_liste("Liste des produits oscommerce", $page, "osc-list.php"); $sql = "SELECT p.products_id, p.products_model, p.products_quantity, p.products_status, d.products_name, m.manufacturers_name, m.manufacturers_id"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as d, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."manufacturers as m"; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 7f8ceac853e..f760cd736f0 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -551,7 +551,7 @@ else if ($id || $ref) { $langs->load("mails"); print ''.$langs->trans("NbOfEMailingsReceived").''.$object->getNbOfEMailings().''.$object->getNbOfEMailings().'
'; print ''; - print ''; print '\n"; - print "\n"; - print '\n"; + $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type; + print "\n"; + print '\n"; print ""; $totalpaye += $objp->amount; $i++; From bbf07641edf4b2ebea0fad0b7b87a08ff340fe04 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 29 Sep 2014 20:39:19 +0200 Subject: [PATCH 0122/1190] Fix: checkstyle --- htdocs/compta/facture.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 83587861f7b..f41ac9ef4e5 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -865,7 +865,7 @@ else if ($action == 'add' && $user->rights->facture->creer) $object->origin_id = $originid; // Possibility to add external linked objects with hooks - $object->linked_objects [$object->origin] = $object->origin_id; + $object->linked_objects[$object->origin] = $object->origin_id; // link with order if it is a shipping invoice if ($object->origin == 'shipping') { @@ -873,10 +873,11 @@ else if ($action == 'add' && $user->rights->facture->creer) $exp = new Expedition($db); $exp->fetch($object->origin_id); $exp->fetchObjectLinked(); - if (count ($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0]; + if (count($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0]; } - - if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) { + + if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) + { $object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']); } From ba95251ea2c302394b800e62b8ddab16748a96c5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 29 Sep 2014 20:31:48 +0200 Subject: [PATCH 0123/1190] Fix: uniformize code --- htdocs/livraison/card.php | 182 ++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 98 deletions(-) diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 34380c8843c..7f9c4130284 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2005 Rodolphe Quiedeville * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005 Simon TOSSER - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2013 Florian Henry * @@ -53,22 +53,33 @@ $id = GETPOST('id', 'int'); if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,'expedition',$id,'livraison','livraison'); +$object = new Livraison($db); +// Load object +if ($id > 0 || ! empty($ref)) { + $ret = $object->fetch($id, $ref); + if ($ret > 0) + $ret = $object->fetch_thirdparty(); + if ($ret < 0) + dol_print_error('', $object->error); +} + +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('deliverycard')); /* * Actions */ +$parameters=array(); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($action == 'add') { $db->begin(); - // Creation de l'objet livraison - $delivery = new Livraison($db); - - $delivery->date_livraison = time(); - $delivery->note = $_POST["note"]; - $delivery->commande_id = $_POST["commande_id"]; + $object->date_livraison = time(); + $object->note = $_POST["note"]; + $object->commande_id = $_POST["commande_id"]; if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled)) { @@ -78,7 +89,7 @@ if ($action == 'add') // On boucle sur chaque ligne de commande pour completer objet livraison // avec qte a livrer $commande = new Commande($db); - $commande->fetch($delivery->commande_id); + $commande->fetch($object->commande_id); $commande->fetch_lines(); $num=count($commande->lines); for ($i = 0; $i < $num; $i++) @@ -87,20 +98,20 @@ if ($action == 'add') $idl = "idl".$i; if ($_POST[$qty] > 0) { - $delivery->addline($_POST[$idl],$_POST[$qty]); + $object->addline($_POST[$idl],$_POST[$qty]); } } - $ret=$delivery->create($user); + $ret=$object->create($user); if ($ret > 0) { $db->commit(); - header("Location: ".$_SERVER['PHP_SELF']."?id=".$delivery->id); + header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; } else { - setEventMessage($delivery->error, 'errors'); + setEventMessage($object->error, 'errors'); $db->rollback(); $_GET["commande_id"]=$_POST["commande_id"]; @@ -110,10 +121,6 @@ if ($action == 'add') else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->livraison->valider) { - $object = new Livraison($db); - $object->fetch($id); - $object->fetch_thirdparty(); - $result = $object->valid($user); // Define output language @@ -140,10 +147,6 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->livraison->supprimer) { - $object = new Livraison($db); - $object->fetch($id); - $object->fetch_thirdparty(); - $db->begin(); $result=$object->delete(); @@ -162,14 +165,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio if ($action == 'setdate_livraison' && $user->rights->expedition->livraison->creer) { - $object = new Livraison($db); - $object->fetch($id); - $object->fetch_thirdparty(); - - //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year']; $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int')); - - $object->fetch($id); $result=$object->set_date_livraison($user,$datedelivery); if ($result < 0) { @@ -182,10 +178,6 @@ if ($action == 'setdate_livraison' && $user->rights->expedition->livraison->cree */ if ($action == 'builddoc') // En get ou en post { - $object = new Livraison($db); - $object->fetch($id); - $object->fetch_thirdparty(); - // Save last template used to generate document if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha')); @@ -216,16 +208,11 @@ elseif ($action == 'remove_file') { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $object = new Livraison($db); - if ($object->fetch($id)) - { - $object->fetch_thirdparty(); - $upload_dir = $conf->expedition->dir_output . "/receipt"; - $file = $upload_dir . '/' . GETPOST('file'); - $ret=dol_delete_file($file,0,0,0,$object); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); - } + $upload_dir = $conf->expedition->dir_output . "/receipt"; + $file = $upload_dir . '/' . GETPOST('file'); + $ret=dol_delete_file($file,0,0,0,$object); + if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); + else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); } @@ -256,7 +243,7 @@ if ($action == 'create') $commande = new Commande($db); $commande->livraison_array(); - if ($commande->fetch($_GET["commande_id"])) + if ($commande->fetch(GETPOST("commande_id"))) { $soc = new Societe($db); $soc->fetch($commande->socid); @@ -271,7 +258,7 @@ if ($action == 'create') /* * Commande */ - print '
'; + print ''; print ''; print ''; print ''; @@ -461,29 +448,29 @@ else /* */ /* *************************************************************************** */ { - if ($id > 0) + if ($object->id > 0) { - $delivery = new Livraison($db); - $result = $delivery->fetch($id); - $delivery->fetch_thirdparty(); - // Origin of a 'livraison' (delivery) is ALWAYS 'expedition' (shipment). // However, origin of shipment in future may differs (commande, proposal, ...) + // TODO REGIS: + // Je ne suis pas d'accord, beaucoup entreprises n'utilisent pas les bons d'expéditions car ces derniers sont gérés par le transporteur, + // donc les bons de livraisons peuvent avoir une origine différente de 'expedition' + // les bons de livraisons et d'expéditions devraient être considérés comme des objets à part entière, voir des modules différents comme une propal ou autres. $expedition=new Expedition($db); - $result = $expedition->fetch($delivery->origin_id); + $result = $expedition->fetch($object->origin_id); $typeobject = $expedition->origin; // example: commande - if ($delivery->origin_id > 0) + if ($object->origin_id > 0) { - $delivery->fetch_origin(); + $object->fetch_origin(); } - if ($delivery->id > 0) + if ($object->id > 0) { $soc = new Societe($db); - $soc->fetch($delivery->socid); + $soc->fetch($object->socid); - $head=delivery_prepare_head($delivery); + $head=delivery_prepare_head($object); dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending'); /* @@ -493,7 +480,7 @@ else if ($action == 'delete') { $expedition_id = GETPOST("expid"); - print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&expid='.$expedition_id.'&backtopage='.urlencode($backtopage),$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1); + print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&expid='.$expedition_id.'&backtopage='.urlencode($backtopage),$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$object->ref),'confirm_delete','','',1); } @@ -502,7 +489,7 @@ else */ if ($action == 'valid') { - print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1); + print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$object->ref),'confirm_valid','','',1); } @@ -513,7 +500,7 @@ else print '
'; + print ''; print ''; } $i = 0; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index eada82f7f6a..0e17380ea9e 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -91,7 +91,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { $var=false; print '
'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' ('.$num.')'; print ''; //if($num2 > 0) print ''; //else print ''; @@ -647,7 +647,7 @@ if ($id > 0) print ''; print ''; + print '
'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' ('.$num.')'.img_picto($langs->trans("Statistics"),'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'
'; - print '
'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllContracts").' ('.$num.')
'.$langs->trans("AllContracts").' ('.$num.')
'; - print ''; + print ''; print ''; print ''; print '
'.$langs->trans("SearchACustomerOrder").'
'; @@ -105,7 +105,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) { $var=false; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index e10ea970b43..49d2f1befa2 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -144,7 +144,7 @@ if ($action == 'delete') } else { - header("Location: liste.php"); + header("Location: list.php"); exit; } } @@ -180,7 +180,7 @@ if ($object->fetch($id) >= 0) print '
'.$langs->trans("SearchAContract").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; print ''; print ''; - - print '
'.$langs->trans("Ref").''; diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index d64d9188de8..803ea4f81d8 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -631,7 +631,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') { if ($object->delete($object->id)) { - $url= (! empty($urlfrom) ? $urlfrom : 'liste.php'); + $url= (! empty($urlfrom) ? $urlfrom : 'list.php'); header("Location: ".$url); exit; } @@ -769,7 +769,7 @@ else print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; print ''; print ''; - + //$var=true; //print ''; //print ''; @@ -181,7 +181,7 @@ if ($mode == 'test' && $user->admin) print ''; print ''; print "\n"; - + $list = $printer->getlist_available_printers(); $var = true; foreach ($list as $value) @@ -203,13 +203,13 @@ if ($mode == 'test' && $user->admin) print "\n"; } print '
'.$langs->trans("Ref").''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index a0175bad448..a657423f095 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -51,7 +51,7 @@ print '
'; // Recherche emails $var=false; -print ''; +print ''; print ''; print ''; print ''; @@ -162,7 +162,7 @@ if ($result) print ''; print ''; print ''; - print ''; + print ''; $num = $db->num_rows($result); if ($num > 0) diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/list.php similarity index 99% rename from htdocs/comm/mailing/liste.php rename to htdocs/comm/mailing/list.php index 3e06e5af005..15fd830987c 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/list.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/comm/mailing/liste.php + * \file htdocs/comm/mailing/list.php * \ingroup mailing * \brief Liste des mailings */ diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index f89b6bfda86..facf34a78da 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -127,7 +127,7 @@ if ($resql) $var=!$var; print ""; print ''; - print ''; + print ''; print "\n"; } } @@ -399,7 +399,7 @@ if (! empty($conf->propal->enabled)) print '
'.$langs->trans("SearchAMailing").'
'.$langs->trans("LastMailings",$limit).''.$langs->trans("DateCreation").''.$langs->trans("NbOfEMails").''.$langs->trans("AllEMailings").'
'.$langs->trans("AllEMailings").'
'.$propalstatic->LibStatut($status,0).''.(isset($vals[$status])?$vals[$status]:0).''.(isset($vals[$status])?$vals[$status]:0).'
'; print ''; - print ''; + print ''; if ($num) { @@ -471,7 +471,7 @@ if (! empty($conf->propal->enabled)) print '
'.$langs->trans("ProposalsToProcess").' ('.$num.')
'.$langs->trans("ProposalsToProcess").' ('.$num.')
'; print ''; - print ''; + print ''; if ($num) { diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 5a886664c17..c36f19c166b 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -152,7 +152,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("OnProcessOrders").' ('.$num.')
'.$langs->trans("OnProcessOrders").' ('.$num.')
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print '"; print ''; print ''; @@ -185,7 +185,7 @@ else dol_print_error($db); } +llxFooter(); + $db->close(); -llxFooter(); -?> diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index e1662708489..856640e306e 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -420,4 +420,3 @@ elseif (file_exists($fileimagebis)) $db->close(); llxFooter(); -?> diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index f13113487c1..3af164abfab 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -229,5 +229,3 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO } } - -?> \ No newline at end of file diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php index 3b2bbef75bb..74f576cf852 100644 --- a/htdocs/core/actions_setnotes.inc.php +++ b/htdocs/core/actions_setnotes.inc.php @@ -43,5 +43,3 @@ else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST(' $result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES),'_private'); if ($result < 0) setEventMessage($object->error,'errors'); } - -?> \ No newline at end of file diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php index 768741d9368..942ee3da3c3 100644 --- a/htdocs/core/class/dolprintipp.class.php +++ b/htdocs/core/class/dolprintipp.class.php @@ -201,4 +201,3 @@ class dolprintIPP return $ipp->printer_attributes; } } -?> diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php index dd299ab5c2c..6b4877b14b2 100644 --- a/htdocs/core/lib/holiday.lib.php +++ b/htdocs/core/lib/holiday.lib.php @@ -50,4 +50,3 @@ function holiday_prepare_head($object) return $head; } -?> diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index e8c86b37db9..a252b361dcf 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -357,5 +357,3 @@ function measuring_units_string($unit,$measuring_style='') return $measuring_units[$unit]; } - -?> diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php index 60794497554..7d58e9e01b1 100644 --- a/htdocs/core/lib/trip.lib.php +++ b/htdocs/core/lib/trip.lib.php @@ -54,10 +54,8 @@ function trip_prepare_head($object) $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; $h++; - + complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove'); return $head; } - -?> \ No newline at end of file diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index d6097b6f5a1..75a78627f52 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -342,4 +342,3 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '
'.$langs->trans("Ref").''; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index d939b106c7f..2d9c80e9d2d 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -106,7 +106,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print 'attribute_required [$key])) - print ' class="fieldrequired"'; + if (! empty($extrafields->attribute_required [$key])) print ' class="fieldrequired"'; print '>' . $label . ''; - $colspan='0'; - } - else - { - $out .= ''; - } - // Convert date into timestamp format - if (in_array($extrafields->attribute_type[$key],array('date','datetime'))) - { - $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$this->db->jdate($this->array_options['options_'.$key]); - } - - if($extrafields->attribute_required[$key]) - $label = ''.$label.''; - - $out .= ''; - $out .=''; - - switch($mode) { - case "view": - $out .= $extrafields->showOutputField($key,$value); - break; - case "edit": - $out .= $extrafields->showInputField($key,$value,'',$keyprefix); - break; - } - - $out .= ''."\n"; - - if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= ''; - else $out .= ''; - $e++; - } - } - $out .= "\n"; - $out .= ' '; - $out .= ' - '; - } - return $out; - } - - /** * Function to check if an object is used by others. * Check is done into this->childtables. There is no check into llx_element_element. @@ -3473,38 +3152,6 @@ abstract class CommonObject } } - /** - * Call trigger based on this instance - * NB: Error from trigger are stacked in interface->errors - * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction. - * - * @param string $trigger_name trigger's name to execute - * @param User $user Object user - * @return int Result of run_triggers - */ - function call_trigger($trigger_name, $user) - { - global $langs,$conf; - - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($this->db); - $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf); - - if ($result < 0) - { - if (!empty($this->errors)) - { - $this->errors=array_merge($this->errors,$interface->errors); - } - else - { - $this->errors=$interface->errors; - } - } - - return $result; - } - /** * Common function for all objects extending CommonObject for generating documents * @@ -3597,4 +3244,366 @@ abstract class CommonObject } } + + /* Functions common to commonobject and commonobjectline */ + + + /* For triggers */ + + + /** + * Call trigger based on this instance + * NB: Error from trigger are stacked in interface->errors + * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction. + * + * @param string $trigger_name trigger's name to execute + * @param User $user Object user + * @return int Result of run_triggers + */ + function call_trigger($trigger_name, $user) + { + global $langs,$conf; + + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + $interface=new Interfaces($this->db); + $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf); + + if ($result < 0) + { + if (!empty($this->errors)) + { + $this->errors=array_merge($this->errors,$interface->errors); + } + else + { + $this->errors=$interface->errors; + } + } + + return $result; + } + + + /* Functions for extrafields */ + + + /** + * Function to get extra fields of a member into $this->array_options + * This method is in most cases called by method fetch of objects but you can call it separately. + * + * @param int $rowid Id of line + * @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label() + * @return int <0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded + */ + function fetch_optionals($rowid='',$optionsArray='') + { + if (empty($rowid)) $rowid=$this->id; + + if (! is_array($optionsArray)) + { + // optionsArray not already loaded, so we load it + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + $extrafields = new ExtraFields($this->db); + $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element); + } + + // Request to get complementary values + if (count($optionsArray) > 0) + { + $sql = "SELECT rowid"; + foreach ($optionsArray as $name => $label) + { + $sql.= ", ".$name; + } + $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields"; + $sql.= " WHERE fk_object = ".$rowid; + + dol_syslog(get_class($this)."::fetch_optionals", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $numrows=$this->db->num_rows($resql); + if ($numrows) + { + $tab = $this->db->fetch_array($resql); + + foreach ($tab as $key => $value) + { + // Test fetch_array ! is_int($key) because fetch_array seult is a mix table with Key as alpha and Key as int (depend db engine) + if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key)) + { + // we can add this attribute to adherent object + $this->array_options["options_".$key]=$value; + } + } + } + + $this->db->free($resql); + + if ($numrows) return $numrows; + else return 0; + } + else + { + dol_print_error($this->db); + return -1; + } + } + return 0; + } + + /** + * Delete all extra fields values for the current object. + * + * @return int <0 if KO, >0 if OK + */ + function deleteExtraFields() + { + global $langs; + + $error=0; + + $this->db->begin(); + + $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; + dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG); + $resql=$this->db->query($sql_del); + if (! $resql) + { + $this->error=$this->db->lasterror(); + $this->db->rollback(); + return -1; + } + else + { + $this->db->commit(); + return 1; + } + } + + /** + * Add/Update all extra fields values for the current object. + * All data to describe values to insert are stored into $this->array_options=array('keyextrafield'=>'valueextrafieldtoadd') + * + * @return int -1=error, O=did nothing, 1=OK + */ + function insertExtraFields() + { + global $conf,$langs; + + $error=0; + + if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used + + if (! empty($this->array_options)) + { + // Check parameters + $langs->load('admin'); + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + $extrafields = new ExtraFields($this->db); + $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element); + + foreach($this->array_options as $key => $value) + { + $attributeKey = substr($key,8); // Remove 'options_' prefix + $attributeType = $extrafields->attribute_type[$attributeKey]; + $attributeSize = $extrafields->attribute_size[$attributeKey]; + $attributeLabel = $extrafields->attribute_label[$attributeKey]; + switch ($attributeType) + { + case 'int': + if (!is_numeric($value) && $value!='') + { + $error++; $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel); + return -1; + } + elseif ($value=='') + { + $this->array_options[$key] = null; + } + break; + case 'price': + $this->array_options[$key] = price2num($this->array_options[$key]); + break; + case 'date': + $this->array_options[$key]=$this->db->idate($this->array_options[$key]); + break; + case 'datetime': + $this->array_options[$key]=$this->db->idate($this->array_options[$key]); + break; + } + } + $this->db->begin(); + + $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; + dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG); + $this->db->query($sql_del); + $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object"; + foreach($this->array_options as $key => $value) + { + $attributeKey = substr($key,8); // Remove 'options_' prefix + // Add field of attribut + if ($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate + $sql.=",".$attributeKey; + } + $sql .= ") VALUES (".$this->id; + foreach($this->array_options as $key => $value) + { + $attributeKey = substr($key,8); // Remove 'options_' prefix + // Add field o fattribut + if($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate) + { + if ($this->array_options[$key] != '') + { + $sql.=",'".$this->db->escape($this->array_options[$key])."'"; + } + else + { + $sql.=",null"; + } + } + } + $sql.=")"; + + dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) + { + $this->error=$this->db->lasterror(); + $this->db->rollback(); + return -1; + } + else + { + $this->db->commit(); + return 1; + } + } + else return 0; + } + + /** + * Function to show lines of extrafields with output datas + * + * @param object $extrafields Extrafield Object + * @param string $mode Show output (view) or input (edit) for extrafield + * @param array $params Optionnal parameters + * @param string $keyprefix Prefix string to add into name and id of field (can be used to avoid duplicate names) + * + * @return string + */ + function showOptionals($extrafields, $mode='view', $params=0, $keyprefix='') + { + global $_POST, $conf; + + $out = ''; + + if (count($extrafields->attribute_label) > 0) + { + $out .= "\n"; + $out .= ' '; + $out .= "\n"; + + $e = 0; + foreach($extrafields->attribute_label as $key=>$label) + { + if (is_array($params) && count($params)>0) { + if (array_key_exists('colspan',$params)) { + $colspan=$params['colspan']; + } + }else { + $colspan='3'; + } + switch($mode) { + case "view": + $value=$this->array_options["options_".$key]; + break; + case "edit": + $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$this->array_options["options_".$key]); + break; + } + if ($extrafields->attribute_type[$key] == 'separate') + { + $out .= $extrafields->showSeparator($key); + } + else + { + $csstyle=''; + if (is_array($params) && count($params)>0) { + if (array_key_exists('style',$params)) { + $csstyle=$params['style']; + } + } + if ( !empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) + { + $out .= ''; + $colspan='0'; + } + else + { + $out .= ''; + } + // Convert date into timestamp format + if (in_array($extrafields->attribute_type[$key],array('date','datetime'))) + { + $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$this->db->jdate($this->array_options['options_'.$key]); + } + + if($extrafields->attribute_required[$key]) + $label = ''.$label.''; + + $out .= ''; + $out .=''; + + switch($mode) { + case "view": + $out .= $extrafields->showOutputField($key,$value); + break; + case "edit": + $out .= $extrafields->showInputField($key,$value,'',$keyprefix); + break; + } + + $out .= ''."\n"; + + if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= ''; + else $out .= ''; + $e++; + } + } + $out .= "\n"; + $out .= ' '; + $out .= ' + '; + } + return $out; + } + } diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 675e1cf0794..c3c8d823a34 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -26,36 +26,12 @@ * Parent class for class inheritance lines of business objects * This class is useless for the moment so no inherit are done on it */ -abstract class CommonObjectLine +abstract class CommonObjectLine extends CommonObject { - /** - * Call trigger based on this instance - * NB: Error from trigger are stacked in interface->errors - * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction. - * - * @param string $trigger_name trigger's name to execute - * @param User $user Object user - * @return int Result of run_triggers - */ - function call_trigger($trigger_name, $user) - { - global $langs,$conf; + // TODO - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($this->db); - $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf); - if ($result < 0) - { - if (!empty($this->errors)) - { - $this->errors=array_merge($this->errors,$interface->errors); - } - else - { - $this->errors=$interface->errors; - } - } - return $result; - } + // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code. + + // For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits. } diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index c56ffc30aea..777732aa192 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -194,7 +194,8 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0; showOptionals($extrafieldsline,'view',array('style'=>$bcdd[$var],'colspan'=>$coldisplay)); } ?> From f6445f9cef7d72a43a71b6dd57f8f6d086bc5e42 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 00:51:36 +0200 Subject: [PATCH 0067/1190] Fix: Pb into repair function --- htdocs/install/repair.php | 232 ++++++++++++++++++++++++++------------ 1 file changed, 159 insertions(+), 73 deletions(-) diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 47456c21c62..48f4b5a6aa6 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -132,7 +132,7 @@ if ($ok) } } -// Affiche version +// Show database version if ($ok) { $version=$db->getVersion(); @@ -143,12 +143,15 @@ if ($ok) //print ''; } -// Force l'affichage de la progression +// Show wait message print ''; flush(); -// Run repair SQL file +/* Start action here */ + + +// run_sql: Run repair SQL file if ($ok) { $dir = "mysql/migration/"; @@ -191,86 +194,169 @@ if ($ok) } -// Search list of fields declared and list of fields created into databases and create fields missing -$extrafields=new ExtraFields($db); -$listofmodulesextra=array('societe'=>'societe','adherent'=>'adherent','product'=>'product', - 'socpeople'=>'socpeople', 'commande'=>'commande', 'facture'=>'facture', - 'commande_fournisseur'=>'commande_fournisseur', 'actioncomm'=>'actioncomm', - 'adherent_type'=>'adherent_type','user'=>'user','projet'=>'projet', 'projet_task'=>'projet_task'); -foreach($listofmodulesextra as $tablename => $elementtype) +// sync_extrafields: Search list of fields declared and list of fields created into databases and create fields missing +if ($ok) { - // Get list of fields - $tableextra=MAIN_DB_PREFIX.$tablename.'_extrafields'; + $extrafields=new ExtraFields($db); + $listofmodulesextra=array('societe'=>'societe','adherent'=>'adherent','product'=>'product', + 'socpeople'=>'socpeople', 'commande'=>'commande', 'facture'=>'facture', + 'commande_fournisseur'=>'commande_fournisseur', 'actioncomm'=>'actioncomm', + 'adherent_type'=>'adherent_type','user'=>'user','projet'=>'projet', 'projet_task'=>'projet_task'); + foreach($listofmodulesextra as $tablename => $elementtype) + { + // Get list of fields + $tableextra=MAIN_DB_PREFIX.$tablename.'_extrafields'; - // Define $arrayoffieldsdesc - $arrayoffieldsdesc=$extrafields->fetch_name_optionals_label($elementtype); + // Define $arrayoffieldsdesc + $arrayoffieldsdesc=$extrafields->fetch_name_optionals_label($elementtype); - // Define $arrayoffieldsfound - $arrayoffieldsfound=array(); - $resql=$db->DDLDescTable($tableextra); - if ($resql) - { - print '\n"; - } + print "\n"; + } + } } -// Clean data into ecm_directories table -clean_data_ecm_directories(); + +// clean_data_ecm_dir: Clean data into ecm_directories table +if ($ok) +{ + clean_data_ecm_directories(); +} -// Check and clean linked elements -if (GETPOST('clean_linked_elements')) + +/* From here, actions need a parameter */ + + + +// clean_linked_elements: Check and clean linked elements +if ($ok && GETPOST('restore_thirdparties_logos')) +{ + //$exts=array('gif','png','jpg'); + + $ext=''; + //foreach($exts as $ext) + //{ + $sql="SELECT s.rowid, s.nom as name, s.logo FROM ".MAIN_DB_PREFIX."societe as s ORDER BY s.nom"; + $resql=$db->query($sql); + if ($resql) + { + $num=$db->num_rows($resql); + $i=0; + + while($i < $num) + { + $obj=$db->fetch_object($resql); + + /* + $name=preg_replace('/é/','',$obj->name); + $name=preg_replace('/ /','_',$name); + $name=preg_replace('/\'/','',$name); + */ + + $tmp=explode('.',$obj->logo); + $name=$tmp[0]; + if (isset($tmp[1])) $ext='.'.$tmp[1]; + + if (! empty($name)) + { + $filetotest=$dolibarr_main_data_root.'/societe/logos/'.$name.$ext; + $filetotestsmall=$dolibarr_main_data_root.'/societe/logos/thumbs/'.$name.$ext; + $exists=dol_is_file($filetotest); + print 'Check thirdparty '.$obj->rowid.' name='.$obj->name.' logo='.$obj->logo.' file '.$filetotest." exists=".$exists."
\n"; + if ($exists) + { + $filetarget=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/'.$name.$ext; + $filetargetsmall=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/thumbs/'.$name.'_small'.$ext; + $existt=dol_is_file($filetarget); + if (! $existt) + { + dol_mkdir($dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos'); + + print "       -> Copy file ".$filetotest." -> ".$filetarget."
\n"; + dol_copy($filetotest, $filetarget, '', 0); + } + + $existtt=dol_is_file($filetargetsmall); + if (! $existtt) + { + dol_mkdir($dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/thumbs'); + + print "       -> Copy file ".$filetotestsmall." -> ".$filetargetsmall."
\n"; + dol_copy($filetotestsmall, $filetargetsmall, '', 0); + } + } + } + + $i++; + } + } + else + { + $ok=0; + dol_print_error($db); + } + //} +} + + +// clean_linked_elements: Check and clean linked elements +if ($ok && GETPOST('clean_linked_elements')) { // propal => order print "\n"; @@ -292,8 +378,8 @@ if (GETPOST('clean_linked_elements')) } -// Run purge of directory -if (GETPOST('purge')) +// clean_orphelin_dir: Run purge of directory +if ($ok && GETPOST('clean_orphelin_dir')) { $conf->setValues($db); From 40c1b02a6c6a7a43082ab942882e627d9b263396 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 01:15:34 +0200 Subject: [PATCH 0068/1190] Correction repair.sql --- htdocs/install/mysql/migration/repair.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index 868acf7fff0..fbc1572a2ab 100644 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -142,7 +142,7 @@ update llx_societe set barcode = null where (rowid, barcode) in (select max_rowi drop table tmp_societe_double; -UPDATE llx_projet_task SET fk_task_parent = 0 WHERE fk_task_parent = rowid +UPDATE llx_projet_task SET fk_task_parent = 0 WHERE fk_task_parent = rowid; UPDATE llx_actioncomm set fk_user_action = fk_user_done where fk_user_done > 0 and (fk_user_action is null or fk_user_action = 0); From a4d8739477d4de409f1fdb69bb3b25628f88ec38 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 01:35:29 +0200 Subject: [PATCH 0069/1190] Qual: Clean a lot of deprecated code --- htdocs/comm/action/card.php | 39 +++++++++---------- htdocs/comm/action/class/actioncomm.class.php | 14 ++++--- htdocs/comm/action/document.php | 19 ++++----- htdocs/projet/class/project.class.php | 2 - htdocs/user/class/user.class.php | 12 ++++-- htdocs/webservices/server_actioncomm.php | 18 ++++----- 6 files changed, 51 insertions(+), 53 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 7ca82a2751e..aef2d5fad3d 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -240,12 +240,15 @@ if ($action == 'add') } $object->note = trim($_POST["note"]); + if (isset($_POST["contactid"])) $object->contact = $contact; + if (GETPOST('socid','int') > 0) { $societe = new Societe($db); $societe->fetch(GETPOST('socid','int')); - $object->societe = $societe; + $object->societe = $societe; // deprecated + $object->thirdparty = $societe; } // Special for module webcal and phenix @@ -359,8 +362,10 @@ if ($action == 'update') $object->priority = $_POST["priority"]; $object->fulldayevent= $_POST["fullday"]?1:0; $object->location = GETPOST('location'); - $object->societe->id = $_POST["socid"]; - $object->contact->id = $_POST["contactid"]; + $object->socid = $_POST["socid"]; + $object->contactid = $_POST["contactid"]; + $object->societe->id = $_POST["socid"]; // deprecated + $object->contact->id = $_POST["contactid"]; // deprecated $object->fk_project = $_POST["projectid"]; $object->note = $_POST["note"]; $object->pnote = $_POST["note"]; @@ -795,22 +800,16 @@ if ($action == 'create') if ($id > 0) { $result1=$object->fetch($id); - $result2=$object->fetch_userassigned(); - $result3=$object->fetch_optionals($id,$extralabels); + $result2=$object->fetch_thirdparty(); + $result3=$object->fetch_userassigned(); + $result4=$object->fetch_optionals($id,$extralabels); - if ($result1 < 0 || $result2 < 0 || $result3 < 0) + if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0) { dol_print_error($db,$object->error); exit; } - $societe = new Societe($db); - if ($object->societe->id) - { - $result=$societe->fetch($object->societe->id); - } - $object->societe = $societe; - if ($object->author->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->author->id); $object->author=$tmpuser; } if ($object->usermod->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermod->id); $object->usermod=$tmpuser; } if ($object->usertodo->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usertodo->id); $object->usertodo=$tmpuser; } @@ -959,12 +958,12 @@ if ($id > 0) print ''; // Contact print ''; } @@ -978,7 +977,7 @@ if ($id > 0) $langs->load("project"); print ''; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index ffe07614b7d..1d7cf0efd68 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -192,10 +192,10 @@ class ActionComm extends CommonObject $sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").","; // deprecated $sql.= (isset($this->type_id)?$this->type_id:"null").","; $sql.= (isset($this->code)?" '".$this->code."'":"null").","; - $sql.= (isset($this->societe->id) && $this->societe->id > 0?" '".$this->societe->id."'":"null").","; + $sql.= (isset($this->socid) && $this->socid > 0?" '".$this->socid."'":"null").","; $sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").","; $sql.= " '".$this->db->escape($this->note)."',"; - $sql.= (isset($this->contact->id) && $this->contact->id > 0?"'".$this->contact->id."'":"null").","; + $sql.= (isset($this->contactid) && $this->contactid > 0?"'".$this->contactid."'":"null").","; $sql.= (isset($user->id) && $user->id > 0 ? "'".$user->id."'":"null").","; $sql.= (isset($this->usertodo->id) && $this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").","; $sql.= (isset($this->userdone->id) && $this->userdone->id > 0?"'".$this->userdone->id."'":"null").","; @@ -358,10 +358,12 @@ class ActionComm extends CommonObject $this->location = $obj->location; $this->transparency = $obj->transparency; - $this->socid = $obj->fk_soc; // To have fetch_thirdparty method working - $this->societe->id = $obj->fk_soc; - $this->contact->id = $obj->fk_contact; - $this->fk_project = $obj->fk_project; + $this->socid = $obj->fk_soc; // To have fetch_thirdparty method working + $this->contactid = $obj->fk_contact; + $this->fk_project = $obj->fk_project; // To have fetch_project method working + + $this->societe->id = $obj->fk_soc; // For backward compatibility + $this->contact->id = $obj->fk_contact; // For backward compatibility $this->fk_element = $obj->fk_element; $this->elementtype = $obj->elementtype; diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index b000d2017d7..0556e532f35 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -60,12 +60,7 @@ $object = new ActionComm($db); if ($objectid > 0) { $ret = $object->fetch($objectid); - if ($ret > 0) { - $company=new Societe($db); - $company->fetch($object->societe->id); - $object->societe=$company; // For backward compatibility - $object->thirdparty=$company; - } + $object->fetch_thirdparty(); } // Get parameters @@ -112,7 +107,7 @@ if ($object->id > 0) $now=dol_now(); $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60; - + dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'action'); // Affichage fiche action en mode visu @@ -202,17 +197,17 @@ if ($object->id > 0) print ''; - + print '
'.$langs->trans('Ref').''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index f05f516e188..e54844ac938 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1875,7 +1875,7 @@ if ($action == 'create' && $user->rights->commande->creer) { print ''; - $linkback = '' . $langs->trans("BackToList") . ''; + $linkback = '' . $langs->trans("BackToList") . ''; // Ref print ''; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 37e88f37d85..c00d057ca33 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -63,7 +63,7 @@ print '
'; // Search customer orders $var=false; print '
' . $langs->trans('Ref') . '
'; -print ''; +print ''; print ''; print ''; print '"; print ''; - print ''; @@ -303,7 +303,7 @@ if (! empty($conf->commande->enabled)) print '
'.$langs->trans("SearchOrder").'
'; @@ -141,7 +141,7 @@ if ($resql) $var=!$var; print "
'.$commandestatic->LibStatut($status,$bool,0).''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' '; + print ''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' '; print $commandestatic->LibStatut($status,$bool,3); print ''; print '
'; print ''; - print ''; + print ''; if ($num) { @@ -374,7 +374,7 @@ if (! empty($conf->commande->enabled)) print '
'.$langs->trans("OrdersToProcess").' ('.$num.')
'.$langs->trans("OrdersToProcess").' ('.$num.')
'; print ''; - print ''; + print ''; if ($num) { diff --git a/htdocs/commande/liste.php b/htdocs/commande/list.php similarity index 99% rename from htdocs/commande/liste.php rename to htdocs/commande/list.php index bcfdd80d29d..d699192acbf 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/list.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/commande/liste.php + * \file htdocs/commande/list.php * \ingroup commande * \brief Page to list orders */ diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index ae5aab0491b..6f3519e9ced 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -79,7 +79,7 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("OnProcessOrders").' ('.$num.')
'.$langs->trans("OnProcessOrders").' ('.$num.')
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; + print "
'.$langs->trans("Ref").''; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 1b09863d4dd..68b2bef1b58 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -164,7 +164,7 @@ if ($action == 'add') if ($action == 'delete') { $don->delete($id); - header("Location: liste.php"); + header("Location: list.php"); exit; } if ($action == 'commentaire') @@ -459,7 +459,7 @@ if (! empty($id) && $action != 'edit') print ''; print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; $nbrows=12; if (! empty($conf->projet->enabled)) $nbrows++; diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index 30b34b6b85b..100380bc128 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -118,7 +118,7 @@ foreach ($listofstatus as $status) { $var=!$var; print ""; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/list.php similarity index 99% rename from htdocs/compta/dons/liste.php rename to htdocs/compta/dons/list.php index 62700ae5cb0..badc71c96e2 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/list.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/dons/liste.php + * \file htdocs/compta/dons/list.php * \ingroup don * \brief Page de liste des dons */ diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 442016f38fd..b6d54787f7f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -127,7 +127,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) if (! empty($conf->don->enabled) && $user->rights->don->lire) { $langs->load("donations"); - print ''; + print ''; print ''; print '
'.$donstatic->LibStatut($status,4).''.$donstatic->LibStatut($status,4).''.(! empty($nb[$status])?$nb[$status]:' ').''.(! empty($nb[$status])?price($somme[$status],'MT'):' ').''.(! empty($nb[$status])?price(price2num($somme[$status]/$nb[$status],'MT')):' ').'
'; print ''; @@ -639,7 +639,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $i = 0; print '
'.$langs->trans("SearchADonation").'
'; print ""; - print ''; + print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/list.php similarity index 99% rename from htdocs/compta/paiement/cheque/liste.php rename to htdocs/compta/paiement/cheque/list.php index cafe8493b71..1699656acb1 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/paiement/cheque/liste.php + * \file htdocs/compta/paiement/cheque/list.php * \ingroup compta * \brief Page list of cheque deposits */ diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 74ec9f4cb69..a589ea219e3 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -79,7 +79,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture-> if ($result > 0) { $db->commit(); - header("Location: liste.php"); + header("Location: list.php"); exit; } else diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/list.php similarity index 99% rename from htdocs/compta/paiement/liste.php rename to htdocs/compta/paiement/list.php index 6e3e1bc54ff..c96d1affbd6 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/list.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/paiement/liste.php + * \file htdocs/compta/paiement/list.php * \ingroup compta * \brief Page liste des paiements des factures clients */ diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/list.php similarity index 98% rename from htdocs/compta/prelevement/liste.php rename to htdocs/compta/prelevement/list.php index a9fb6024992..4427d08b2d2 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/list.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/prelevement/liste.php + * \file htdocs/compta/prelevement/list.php * \ingroup prelevement * \brief Page liste des prelevements */ @@ -120,7 +120,7 @@ if ($result) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index d55930ef80f..08ae52a3d51 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -639,7 +639,7 @@ if ($result) $var = !$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 708c77708cf..db6c0d2f149 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -359,9 +359,9 @@ if (count($amount)) { if ($modecompta != 'CREANCES-DETTES') { if ($key > 0) { - print ''; + print ''; } else { - print ''; + print ''; } } else { if ($key > 0) { @@ -377,9 +377,9 @@ if (count($amount)) { print ''; print '
'.$langs->trans("OrdersToBill").' ('.$num.')'.$langs->trans("OrdersToBill").' ('.$num.')'.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("ToBill").' 
 ".$langs->trans("Donation")." nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."".$langs->trans("Donation")." nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."'.price($obj->amount).''.price($obj->amount).''; if ($modecompta != 'CREANCES-DETTES') { if ($key > 0) { - print ''; + print ''; } else { - print ''; + print ''; } } else { if ($key > 0) { diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 3535db5594a..cea623a144b 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -429,9 +429,9 @@ if (count($amount)) { print ''; if ($modecompta != 'CREANCES-DETTES') { if ($key > 0) { - print ''; + print ''; } else { - print ''; + print ''; } } else { if ($key > 0) { @@ -447,9 +447,9 @@ if (count($amount)) { print ''; if ($modecompta != 'CREANCES-DETTES') { if ($key > 0) { - print ''; + print ''; } else { - print ''; + print ''; } } else { if ($key > 0) { diff --git a/htdocs/compta/ventilation/fournisseur/liste.php b/htdocs/compta/ventilation/fournisseur/list.php similarity index 94% rename from htdocs/compta/ventilation/fournisseur/liste.php rename to htdocs/compta/ventilation/fournisseur/list.php index e3eb4cf487d..e7a05c8fe24 100644 --- a/htdocs/compta/ventilation/fournisseur/liste.php +++ b/htdocs/compta/ventilation/fournisseur/list.php @@ -20,7 +20,7 @@ /** - * \file htdocs/compta/ventilation/liste.php + * \file htdocs/compta/ventilation/list.php * \ingroup compta * \brief Page de ventilation des lignes de facture */ @@ -60,7 +60,7 @@ if ($result) $num_lignes = $db->num_rows($result); $i = 0; - print_barre_liste("Lignes de facture à ventiler",$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes); + print_barre_liste("Lignes de facture à ventiler",$page,"list.php","",$sortfield,$sortorder,'',$num_lignes); print ''; print ''; diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/list.php similarity index 97% rename from htdocs/compta/ventilation/liste.php rename to htdocs/compta/ventilation/list.php index effa7689821..5fa2a5a1ee5 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/list.php @@ -20,7 +20,7 @@ /** - * \file htdocs/compta/ventilation/liste.php + * \file htdocs/compta/ventilation/list.php * \ingroup compta * \brief Page de ventilation des lignes de facture */ @@ -69,7 +69,7 @@ if ($result) $num_lignes = $db->num_rows($result); $i = 0; - print_barre_liste($langs->trans("InvoiceLinesToDispatch"),$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes); + print_barre_liste($langs->trans("InvoiceLinesToDispatch"),$page,"list.php","",$sortfield,$sortorder,'',$num_lignes); print '
Facture
'; print ''; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 4f793fe8538..a86965f5c8b 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -975,7 +975,7 @@ else { $langs->load("mails"); print ''; - print ''; + print ''; } else { diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 7156b69777c..1528e472cbe 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("Invoice").''.$langs->trans("NbOfEMailingsSend").''.$object->getNbOfEMailings().''.$object->getNbOfEMailings().'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Reference du contrat print ''; // Location - print ''; + if (empty($conf->global->AGENDA_DISABLE_LOCATION)) + { + print ''; + } // Assigned to print ''; // Location - print ''; + if (empty($conf->global->AGENDA_DISABLE_LOCATION)) + { + print ''; + } // Assigned to print ''; + $rowspan=4; + if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++; + // Date start print ''; - print ''; // Location - print ''; + if (empty($conf->global->AGENDA_DISABLE_LOCATION)) + { + print ''; + } // Assigned to print ''; print '
'.$langs->trans("Ref").''; diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index e17a0c67389..6c520105c36 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -107,7 +107,7 @@ if ($object->id) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Reference print ''; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 165e8ae3c69..81d50edb211 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -1110,7 +1110,7 @@ else print '
'.$langs->trans('Ref').''.$form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '').'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref du contrat if (!empty($modCodeContract->code_auto)) { diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 680ea9c201f..d23e789d92e 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -75,7 +75,7 @@ print '
'; if (! empty($conf->contrat->enabled)) { $var=false; - print ''; + print ''; print ''; print '
'; print ''; diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/list.php similarity index 99% rename from htdocs/contrat/liste.php rename to htdocs/contrat/list.php index 6bd9e249bc7..e6a0750aa4e 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/list.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/contrat/liste.php + * \file htdocs/contrat/list.php * \ingroup contrat * \brief Page liste des contrats */ diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index cd782d73444..502b354ee69 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -75,7 +75,7 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("SearchAContract").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Reference print ''; diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index f37079fa037..d118bc8a4bc 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -114,7 +114,7 @@ class box_activity extends ModeleBoxes $billurl="viewstatut=2&paye=1&year=".$objp->annee; $this->info_box_contents[$i][2] = array('td' => 'align="right"', - 'text' => $objp->nb, 'url' => DOL_URL_ROOT."/compta/facture/liste.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills" + 'text' => $objp->nb, 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills" ); $this->info_box_contents[$i][3] = array('td' => 'align="right"', @@ -214,7 +214,7 @@ class box_activity extends ModeleBoxes $this->info_box_contents[$i][2] = array('td' => 'align="right"', 'text' => $objp->nb, - 'url' => DOL_URL_ROOT."/commande/liste.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$objp->fk_statut + 'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$objp->fk_statut ); $totalnb += $objp->nb; diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php index 5cb1e3ddad4..968eefef4b9 100644 --- a/htdocs/core/boxes/box_bookmarks.php +++ b/htdocs/core/boxes/box_bookmarks.php @@ -53,7 +53,7 @@ class box_bookmarks extends ModeleBoxes $this->max=$max; $this->info_box_head = array('text' => $langs->trans("BoxMyLastBookmarks",$max), - 'sublink' => DOL_URL_ROOT.'/bookmarks/liste.php'); + 'sublink' => DOL_URL_ROOT.'/bookmarks/list.php'); if ($user->rights->bookmark->creer) { $this->info_box_head['subpicto']='object_bookmark'; @@ -101,7 +101,7 @@ class box_bookmarks extends ModeleBoxes { $mytxt=$langs->trans("NoRecordedBookmarks"); if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd"); - $this->info_box_contents[$i][0] = array('td' => 'align="center" colspan="2"', 'url'=> DOL_URL_ROOT.'/bookmarks/liste.php', 'text'=>$mytxt); + $this->info_box_contents[$i][0] = array('td' => 'align="center" colspan="2"', 'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt); } $db->free($result); diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 36291883755..8d8448cedb3 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -64,7 +64,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Third parties insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/fourn/liste.php?leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/fourn/list.php?leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/soc.php?leftmenu=supplier&action=create&type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/comm/prospect/list.php?leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/soc.php?leftmenu=prospects&action=create&type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); @@ -90,18 +90,18 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Product - Product insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2800__+MAX_llx_menu__, 'products', 'product', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=product&type=0', 'Products', 0, 'products', '$user->rights->produit->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/fiche.php?leftmenu=product&action=create&type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/liste.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/list.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 5, __ENTITY__); -- Product - Services insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2900__+MAX_llx_menu__, 'products', 'service', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=service&type=1', 'Services', 0, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/fiche.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/liste.php?leftmenu=service&type=1', 'List', 1, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/list.php?leftmenu=service&type=1', 'List', 1, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=1', 'Statistics', 1, 'main', '$user->rights->service->lire', '', 2, 5, __ENTITY__); -- Product - Stocks insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3100__+MAX_llx_menu__, 'products', 'stock', 3__+MAX_llx_menu__, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/fiche.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/liste.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__); @@ -112,7 +112,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Product - Shipment insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled', __HANDLER__, 'left', 1300__+MAX_llx_menu__, 'commercial', 'sendings', 3__+MAX_llx_menu__, '/expedition/index.php?leftmenu=sendings', 'Shipments', 0, 'sendings', '$user->rights->expedition->lire', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/fiche.php?action=create2&leftmenu=sendings', 'NewSending', 1, 'sendings', '$user->rights->expedition->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/liste.php?leftmenu=sendings', 'List', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/list.php?leftmenu=sendings', 'List', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1303__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/stats/index.php?leftmenu=sendings', 'Statistics', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 2, __ENTITY__); -- Commercial - Proposals @@ -128,23 +128,23 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Commercial - Customer's orders insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1200__+MAX_llx_menu__, 'commercial', 'orders', 5__+MAX_llx_menu__, '/commande/index.php?leftmenu=orders', 'CustomersOrders', 0, 'orders', '$user->rights->commande->lire', '', 2, 5, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/fiche.php?action=create&leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1202__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders', 'List', 1, 'orders', '$user->rights->commande->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1203__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1204__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1205__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&viewstatut=2', 'StatusOrderOnProcessShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1206__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&viewstatut=3', 'StatusOrderToBill', 1, 'orders', '$user->rights->commande->lire', '', 2, 5, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 7, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1202__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders', 'List', 1, 'orders', '$user->rights->commande->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1203__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1204__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1205__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=2', 'StatusOrderOnProcessShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1206__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=3', 'StatusOrderToBill', 1, 'orders', '$user->rights->commande->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 7, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__); -- Commercial - Supplier's orders insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5100__+MAX_llx_menu__, 'commercial', 'orders_suppliers', 5__+MAX_llx_menu__, '/fourn/commande/index.php?leftmenu=orders_suppliers', 'SuppliersOrders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/fiche.php?action=create&leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5102__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/liste.php?leftmenu=orders_suppliers&viewstatut=0', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5102__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/list.php?leftmenu=orders_suppliers&viewstatut=0', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5108__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier', 'Statistics', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 7, __ENTITY__); -- Commercial - Contracts insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1400__+MAX_llx_menu__, 'commercial', 'contracts', 5__+MAX_llx_menu__, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/fiche.php?&action=create&leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/liste.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/list.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__); @@ -165,15 +165,15 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture.php?action=create&leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills', 'Unpaid', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/liste.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'accountancy', '', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__); -- Accountancy - Orders to bill -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__); -- Donations insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/fiche.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/liste.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/stats.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); -- Special expenses insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)', '', 0, 6, __ENTITY__); @@ -190,14 +190,14 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); -- Ventilation (accounting) insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'ventil', 6__+MAX_llx_menu__, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/liste.php', 'ToDispatch', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/list.php', 'ToDispatch', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/lignes.php', 'Dispatched', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2404__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2404__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2405__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/fiche.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); -- Rapports insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); @@ -211,12 +211,12 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Check deposit insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/list.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); -- Withdrawal insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2503__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/bons.php?leftmenu=withdraw', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2504__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/liste.php?leftmenu=withdraw', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2504__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/list.php?leftmenu=withdraw', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2506__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/rejets.php?leftmenu=withdraw', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 5, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2507__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/stats.php?leftmenu=withdraw', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__); -- Bank @@ -229,11 +229,11 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Project insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/fiche.php?leftmenu=projects&action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/liste.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3611__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/fiche.php?leftmenu=projects&action=create&mode=mine', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3612__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/liste.php?leftmenu=projects&mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3612__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects&mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); @@ -247,7 +247,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3900__+MAX_llx_menu__, 'tools', 'mailing', 8__+MAX_llx_menu__, '/comm/mailing/index.php?leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->lire', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3901__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/fiche.php?leftmenu=mailing&action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3902__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/liste.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3902__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/list.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->export->enabled', __HANDLER__, 'left', 4100__+MAX_llx_menu__, 'tools', 'export', 8__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'FormatedExport', 0, 'exports', '$user->rights->export->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->export->enabled', __HANDLER__, 'left', 4101__+MAX_llx_menu__, 'tools', '', 4100__+MAX_llx_menu__, '/exports/export.php?leftmenu=export', 'NewExport', 1, 'exports', '$user->rights->export->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->import->enabled', __HANDLER__, 'left', 4130__+MAX_llx_menu__, 'tools', 'import', 8__+MAX_llx_menu__, '/imports/index.php?leftmenu=import', 'FormatedImport', 0, 'exports', '$user->rights->import->run', '', 2, 2, __ENTITY__); @@ -255,16 +255,16 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Members insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4200__+MAX_llx_menu__, 'members', 'members', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=members&mainmenu=members', 'Members', 0, 'members', '$user->rights->adherent->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4201__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/fiche.php?leftmenu=members&action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4202__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/liste.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4203__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=-1', 'MenuMembersToValidate', 2, 'members', '$user->rights->adherent->lire', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4204__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1', 'MenuMembersValidated', 2, 'members', '$user->rights->adherent->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4202__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/list.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4203__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&statut=-1', 'MenuMembersToValidate', 2, 'members', '$user->rights->adherent->lire', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4204__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&statut=1', 'MenuMembersValidated', 2, 'members', '$user->rights->adherent->lire', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&statut=1&filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?leftmenu=members&mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); -- Members - Subscriptions insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=members&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/list.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4302__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/cotisations.php?leftmenu=members', 'List', 1, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4303__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4500__+MAX_llx_menu__, 'members', 'export', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=export&mainmenu=members', 'Exports', 0, 'members', '$user->rights->adherent->export', '', 2, 3, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 1d7aa1a5a9a..e7fa68aae85 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -617,9 +617,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->societe->enabled) && ! empty($conf->fournisseur->enabled)) { $langs->load("suppliers"); - $newmenu->add("/fourn/liste.php?leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, $user->rights->fournisseur->lire, '', $mainmenu, 'suppliers'); + $newmenu->add("/fourn/list.php?leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, $user->rights->fournisseur->lire, '', $mainmenu, 'suppliers'); $newmenu->add("/societe/soc.php?leftmenu=suppliers&action=create&type=f",$langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire); - //$newmenu->add("/fourn/liste.php?leftmenu=suppliers", $langs->trans("List"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire); + //$newmenu->add("/fourn/list.php?leftmenu=suppliers", $langs->trans("List"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire); //$newmenu->add("/contact/list.php?leftmenu=suppliers&type=f",$langs->trans("Contacts"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire && $user->rights->societe->contact->lire); } @@ -652,7 +652,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/categories/index.php?leftmenu=cat&type=1", $langs->trans("SuppliersCategoriesShort"), 0, $user->rights->categorie->lire); $newmenu->add("/categories/fiche.php?action=create&type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); } - //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire); + //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } } @@ -686,13 +686,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("orders"); $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); $newmenu->add("/commande/fiche.php?action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer); - $newmenu->add("/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later - if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire); + $newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later + if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire); $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire); } @@ -702,16 +702,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("orders"); $newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers'); $newmenu->add("/fourn/commande/fiche.php?action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer); - $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire); + $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcess"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartially"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcess"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartially"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire); $newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire); @@ -723,7 +723,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("contracts"); $newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts'); $newmenu->add("/contrat/fiche.php?&action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer); - $newmenu->add("/contrat/liste.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire); + $newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire); $newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire); if (empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire); if (empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire); @@ -760,7 +760,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/compta/facture/impayees.php?leftmenu=customers_bills",$langs->trans("Unpaid"),1,$user->rights->facture->lire); - $newmenu->add("/compta/paiement/liste.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),1,$user->rights->facture->lire); + $newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),1,$user->rights->facture->lire); if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { @@ -787,7 +787,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->commande->enabled)) { $langs->load("orders"); - if (! empty($conf->facture->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-3", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); + if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); // if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire); } @@ -797,7 +797,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("donations"); $newmenu->add("/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations'); if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/fiche.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); - if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/liste.php",$langs->trans("List"), 1, $user->rights->don->lire); + if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/list.php",$langs->trans("List"), 1, $user->rights->don->lire); //if ($leftmenu=="donations") $newmenu->add("/compta/dons/stats.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); } @@ -1002,7 +1002,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/bons.php?mainmenu=bank",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire); - if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/liste.php?mainmenu=bank",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire); + if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/list.php?mainmenu=bank",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire); if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank",$langs->trans("Rejects"),1,$user->rights->prelevement->bons->lire); if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/stats.php?mainmenu=bank",$langs->trans("Statistics"),1,$user->rights->prelevement->bons->lire); @@ -1014,7 +1014,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks'); $newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); - $newmenu->add("/compta/paiement/cheque/liste.php?leftmenu=checks&mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->cheque); + $newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks&mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->cheque); } } @@ -1029,7 +1029,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $newmenu->add("/product/index.php?leftmenu=product&type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product'); $newmenu->add("/product/fiche.php?leftmenu=product&action=create&type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer); - $newmenu->add("/product/liste.php?leftmenu=product&type=0", $langs->trans("List"), 1, $user->rights->produit->lire); + $newmenu->add("/product/list.php?leftmenu=product&type=0", $langs->trans("List"), 1, $user->rights->produit->lire); if (! empty($conf->propal->enabled)) { $newmenu->add("/product/popuprop.php?leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire); @@ -1045,7 +1045,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $newmenu->add("/product/index.php?leftmenu=service&type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service'); $newmenu->add("/product/fiche.php?leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->service->creer); - $newmenu->add("/product/liste.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->service->lire); + $newmenu->add("/product/list.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->service->lire); if (! empty($conf->propal->enabled)) { $newmenu->add("/product/popuprop.php?leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire); @@ -1058,7 +1058,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("categories"); $newmenu->add("/categories/index.php?leftmenu=cat&type=0", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); $newmenu->add("/categories/fiche.php?action=create&type=0", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); - //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire); + //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } // Stocks @@ -1067,7 +1067,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("stocks"); $newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Stocks"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock'); if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/fiche.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); - if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/liste.php", $langs->trans("List"), 1, $user->rights->stock->lire); + if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire); if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire); if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); @@ -1079,7 +1079,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("sendings"); $newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings'); $newmenu->add("/expedition/fiche.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer); - $newmenu->add("/expedition/liste.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire); + $newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire); $newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire); } @@ -1099,7 +1099,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu // Security check $newmenu->add("/societe/soc.php?leftmenu=suppliers&action=create&type=f",$langs->trans("NewSupplier"), 1, $user->rights->societe->creer && $user->rights->fournisseur->lire); - $newmenu->add("/fourn/liste.php",$langs->trans("List"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire); + $newmenu->add("/fourn/list.php",$langs->trans("List"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire); $newmenu->add("/contact/list.php?leftmenu=suppliers&type=f",$langs->trans("Contacts"), 1, $user->rights->societe->contact->lire && $user->rights->fournisseur->lire); $newmenu->add("/fourn/stats.php",$langs->trans("Statistics"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire); } @@ -1117,7 +1117,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("orders"); $newmenu->add("/fourn/commande/index.php?leftmenu=suppliers",$langs->trans("Orders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'suppliers'); $newmenu->add("/societe/societe.php?leftmenu=supplier", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer); - $newmenu->add("/fourn/commande/liste.php?leftmenu=suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire); + $newmenu->add("/fourn/commande/list.php?leftmenu=suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire); } if (! empty($conf->categorie->enabled)) @@ -1125,7 +1125,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("categories"); $newmenu->add("/categories/index.php?leftmenu=cat&type=1", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); $newmenu->add("/categories/fiche.php?action=create&type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); - //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire); + //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } } @@ -1142,12 +1142,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu // Project affected to user $newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects'); $newmenu->add("/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $newmenu->add("/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); + $newmenu->add("/projet/list.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); // All project i have permission on $newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire); $newmenu->add("/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer); - $newmenu->add("/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire); + $newmenu->add("/projet/list.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire); // Project affected to user $newmenu->add("/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); @@ -1204,7 +1204,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing'); $newmenu->add("/comm/mailing/fiche.php?leftmenu=mailing&action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer); - $newmenu->add("/comm/mailing/liste.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire); + $newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire); } if (! empty($conf->export->enabled)) @@ -1235,16 +1235,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Members"),0,$user->rights->adherent->lire, '', $mainmenu, 'members'); $newmenu->add("/adherents/fiche.php?leftmenu=members&action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer); - $newmenu->add("/adherents/liste.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->lire); - $newmenu->add("/adherents/liste.php?leftmenu=members&statut=-1",$langs->trans("MenuMembersToValidate"),2,$user->rights->adherent->lire); - $newmenu->add("/adherents/liste.php?leftmenu=members&statut=1",$langs->trans("MenuMembersValidated"),2,$user->rights->adherent->lire); - $newmenu->add("/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate"),2,$user->rights->adherent->lire); - $newmenu->add("/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),2,$user->rights->adherent->lire); - $newmenu->add("/adherents/liste.php?leftmenu=members&statut=0",$langs->trans("MenuMembersResiliated"),2,$user->rights->adherent->lire); + $newmenu->add("/adherents/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->lire); + $newmenu->add("/adherents/list.php?leftmenu=members&statut=-1",$langs->trans("MenuMembersToValidate"),2,$user->rights->adherent->lire); + $newmenu->add("/adherents/list.php?leftmenu=members&statut=1",$langs->trans("MenuMembersValidated"),2,$user->rights->adherent->lire); + $newmenu->add("/adherents/list.php?leftmenu=members&statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate"),2,$user->rights->adherent->lire); + $newmenu->add("/adherents/list.php?leftmenu=members&statut=1&filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),2,$user->rights->adherent->lire); + $newmenu->add("/adherents/list.php?leftmenu=members&statut=0",$langs->trans("MenuMembersResiliated"),2,$user->rights->adherent->lire); $newmenu->add("/adherents/stats/geo.php?leftmenu=members&mode=memberbycountry",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire); $newmenu->add("/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire); - $newmenu->add("/adherents/liste.php?leftmenu=members&statut=-1,1&mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer); + $newmenu->add("/adherents/list.php?leftmenu=members&statut=-1,1&mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer); $newmenu->add("/adherents/cotisations.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire); $newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire); @@ -1254,7 +1254,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("categories"); $newmenu->add("/categories/index.php?leftmenu=cat&type=3", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); $newmenu->add("/categories/fiche.php?action=create&type=3", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); - //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire); + //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } $newmenu->add("/adherents/index.php?leftmenu=export&mainmenu=members",$langs->trans("Exports"),0,$user->rights->adherent->export, '', $mainmenu, 'export'); diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php index c83fdafcf7e..9f1734b2326 100644 --- a/htdocs/core/search_page.php +++ b/htdocs/core/search_page.php @@ -85,7 +85,7 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) { $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/product/liste.php', DOL_URL_ROOT.'/product/liste.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall'); $nbofsearch++; } @@ -93,14 +93,14 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) { $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/liste.php', DOL_URL_ROOT.'/fourn/product/liste.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier'); $nbofsearch++; } if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) { $langs->load("members"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/liste.php', DOL_URL_ROOT.'/adherents/liste.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall'); $nbofsearch++; } diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index 49b83692630..c09b3e415cd 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -159,7 +159,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans('Ref').''.$form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '').'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; print "\n"; + // Other attributes + $parameters=array('colspan' => ' colspan="2"'); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields,'edit'); + } + print "
'.$langs->trans("Ref").''; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 15b0a16a13e..de557cfcde1 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -1087,7 +1087,7 @@ else if ($id || $ref) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 5ce833e5e3f..d299bda1422 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -51,7 +51,7 @@ print '
'; $var=false; print '
'.$langs->trans("Ref").'
'; -print ''; +print ''; print ''; print ''; print ''; print ''; print "\n"; + + // Other attributes + $parameters=array('colspan' => ' colspan="2"'); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields); + } + + print "
'.$langs->trans("SearchASending").'
'; diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/list.php similarity index 99% rename from htdocs/expedition/liste.php rename to htdocs/expedition/list.php index 657cf00b514..4e1adf7221e 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/list.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/expedition/liste.php + * \file htdocs/expedition/list.php * \ingroup expedition * \brief Page to list all shipments */ diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php index 27d53b03cd6..01a341d7ab5 100644 --- a/htdocs/expedition/note.php +++ b/htdocs/expedition/note.php @@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index ba32a143f8c..b8eabb9be6c 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -146,7 +146,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("Ref").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index a3681b8fc02..2949aedcf14 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -110,7 +110,7 @@ if ($object->id > 0) print '
'.$langs->trans("Ref").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index f4f69fbd269..0131ddb72dd 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -599,7 +599,7 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->four $result=$object->delete($user); if ($result > 0) { - header("Location: ".DOL_URL_ROOT.'/fourn/commande/liste.php'); + header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php'); exit; } else @@ -1325,7 +1325,7 @@ elseif (! empty($object->id)) print '
'.$langs->trans("Ref").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index e53b3974cf4..e26bc867640 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -76,7 +76,7 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 85557877d76..bd3b18fc87c 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -59,7 +59,7 @@ print ''; print ''; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index bfdf1b1ce45..01f4ad3b1bf 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -86,7 +86,7 @@ if ($resql) print ""; print ''; print ''; - print ''; + print ''; print "\n"; $i++; diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/list.php similarity index 99% rename from htdocs/fourn/liste.php rename to htdocs/fourn/list.php index 341f3ffca54..571c4a9925c 100644 --- a/htdocs/fourn/liste.php +++ b/htdocs/fourn/list.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/fourn/liste.php + * \file htdocs/fourn/list.php * \ingroup fournisseur * \brief Home page of supplier area */ @@ -118,7 +118,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit+1, $offset); -dol_syslog('fourn/liste.php:', LOG_DEBUG); +dol_syslog('fourn/list.php:', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php index 14f4790f5af..68cf81745a3 100644 --- a/htdocs/fourn/product/index.php +++ b/htdocs/fourn/product/index.php @@ -43,7 +43,7 @@ print ''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index dea52ae6ef9..6c3ed0db3bc 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1553,20 +1553,20 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) { $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/product/liste.php', DOL_URL_ROOT.'/product/liste.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P'); } if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER)) { $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/liste.php', DOL_URL_ROOT.'/fourn/product/liste.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier'); } if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) { $langs->load("members"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/liste.php', DOL_URL_ROOT.'/adherents/liste.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M'); } // Execute hook printSearchForm diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 3ae836d0214..5cd4ca7103d 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -464,7 +464,7 @@ if (empty($reshook)) if ($result > 0) { - header('Location: '.DOL_URL_ROOT.'/product/liste.php?type='.$object->type.'&delprod='.urlencode($object->ref)); + header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref)); exit; } else diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 0ace0fdc190..fb2830e9e57 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -77,7 +77,7 @@ print '
'; */ $rowspan=2; if (! empty($conf->barcode->enabled)) $rowspan++; -print ''; +print ''; print ''; print '
'.$langs->trans("Ref").'
'; */ $var=false; print ''; -print ''; +print ''; print ''; print ''; print '"; print ''; - print ''; + print ''; print "\n"; } } @@ -184,7 +184,7 @@ if ($resql) print ""; print ''; - print ''; + print ''; print "\n"; $i++; @@ -387,7 +387,7 @@ $num = $db->num_rows($resql); print '
'.$langs->trans("SearchOrder").'
'; @@ -125,7 +125,7 @@ if ($resql) $var=!$var; print "
'.$commandestatic->LibStatut($statut,0).''.(isset($vals[$statut])?$vals[$statut]:0).''.(isset($vals[$statut])?$vals[$statut]:0).'
'.$langs->trans($commandestatic->statuts[$row[1]]).''.$row[0].' '.$commandestatic->LibStatut($row[1],3).''.$row[0].' '.$commandestatic->LibStatut($row[1],3).'
'; print ''; -print ''; +print ''; if ($num) { diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/list.php similarity index 99% rename from htdocs/fourn/commande/liste.php rename to htdocs/fourn/commande/list.php index c02ab0685f7..62e427d842c 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/list.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/fourn/commande/liste.php + * \file htdocs/fourn/commande/list.php * \ingroup fournisseur * \brief List of suppliers orders */ diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index b9cbf6e33b7..6a1c6cfe80e 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("OrdersToProcess").' ('.$num.')
'.$langs->trans("OrdersToProcess").' ('.$num.')
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 11e505334cd..0294e78986e 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -285,7 +285,7 @@ if ($object->fetch($id)) print '
'.$langs->trans("Ref").'
'; print ''; print '
'.$langs->trans("ProductsAndServices").''; - print ''.$langs->trans("All").' ('.$object->nbOfProductRefs().')'; + print ''.$langs->trans("All").' ('.$object->nbOfProductRefs().')'; print '
'; } @@ -319,7 +319,7 @@ if ($object->fetch($id)) print '
'; print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("LastOrders",($num<$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' ('.$num.')'.$langs->trans("AllOrders").' ('.$num.')'.img_picto($langs->trans("Statistics"),'stats').'
'; print '
'.$langs->trans($commande->statuts[$row[1]]).''.$row[0].''.$commande->LibStatut($row[1],3).''.$commande->LibStatut($row[1],3).'
'; /* * Zone recherche produit/service */ -print ''; +print ''; print ''; print ''; print "\n"; @@ -81,13 +81,13 @@ print '"; - print ''; + print ''; print ""; } if (! empty($conf->service->enabled)) { print ""; - print ''; + print ''; print ""; } print '
'.$langs->trans("Statistics").'product->enabled)) { print "
'.$langs->trans("Products").''.round($prodser[0]).''.$langs->trans("Products").''.round($prodser[0]).'
'.$langs->trans("Services").''.round($prodser[1]).''.$langs->trans("Services").''.round($prodser[1]).'
'; diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/list.php similarity index 97% rename from htdocs/fourn/product/liste.php rename to htdocs/fourn/product/list.php index c8911837a40..481e7d22771 100644 --- a/htdocs/fourn/product/liste.php +++ b/htdocs/fourn/product/list.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/fourn/product/liste.php + * \file htdocs/fourn/product/list.php * \ingroup produit * \brief Page liste des produits ou services */ @@ -121,7 +121,7 @@ if ($fourn_id > 0) $sql .= " ORDER BY ".$sortfield." ".$sortorder; $sql .= $db->plimit($limit + 1, $offset); -dol_syslog("fourn/product/liste.php:", LOG_DEBUG); +dol_syslog("fourn/product/list.php:", LOG_DEBUG); $resql = $db->query($sql); if ($resql) { @@ -150,7 +150,7 @@ if ($resql) { print "
"; $c = new Categorie($db); - $ways = $c->print_all_ways(' > ','fourn/product/liste.php'); + $ways = $c->print_all_ways(' > ','fourn/product/list.php'); print " > ".$ways[0]."
\n"; print "

"; } diff --git a/htdocs/index.php b/htdocs/index.php index 6dbccde9cf0..138ddc4e3a9 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -213,14 +213,14 @@ if (empty($user->societe_id)) // Dashboard Link lines $links=array(DOL_URL_ROOT.'/comm/list.php', DOL_URL_ROOT.'/comm/prospect/list.php', - DOL_URL_ROOT.'/fourn/liste.php', - DOL_URL_ROOT.'/adherents/liste.php?statut=1&mainmenu=members', - DOL_URL_ROOT.'/product/liste.php?type=0&mainmenu=products', - DOL_URL_ROOT.'/product/liste.php?type=1&mainmenu=products', + DOL_URL_ROOT.'/fourn/list.php', + DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members', + DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products', + DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products', DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial', - DOL_URL_ROOT.'/commande/liste.php?mainmenu=commercial', + DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial', DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy', - DOL_URL_ROOT.'/contrat/liste.php'); + DOL_URL_ROOT.'/contrat/list.php'); // Translation lang files $langfile=array("companies", "prospects", @@ -317,7 +317,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) $board->load_board($user); $board->warning_delay=$conf->commande->client->warning_delay/60/60/24; $board->label=$langs->trans("OrdersToProcess"); - $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-3'; + $board->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3'; $board->img=img_object($langs->trans("Orders"),"order"); $rowspan++; $dashboardlines[]=$board; @@ -477,7 +477,7 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use $board->load_board($user); $board->warning_delay=$conf->adherent->cotisation->warning_delay/60/60/24; $board->label=$langs->trans("MembersWithSubscriptionToReceive"); - $board->url=DOL_URL_ROOT.'/adherents/liste.php?mainmenu=members&statut=1'; + $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=1'; $board->img=img_object($langs->trans("Members"),"user"); $rowspan++; $dashboardlines[]=$board; diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 322635354bf..7d94413f559 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -515,7 +515,7 @@ else // Shipment if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0) { - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print '
'.$langs->trans("RefSending").'
'; print ""; @@ -123,26 +123,26 @@ print '"; - $statProducts.= ''; + $statProducts.= ''; $statProducts.= ""; $statProducts.= ""; - $statProducts.= ''; + $statProducts.= ''; $statProducts.= ""; $statProducts.= ""; - $statProducts.= ''; + $statProducts.= ''; $statProducts.= ""; } if (! empty($conf->service->enabled)) { $statServices = ""; - $statServices.= ''; + $statServices.= ''; $statServices.= ""; $statServices.= ""; - $statServices.= ''; + $statServices.= ''; $statServices.= ""; $statServices.= ""; - $statServices.= ''; + $statServices.= ''; $statServices.= ""; } diff --git a/htdocs/product/liste.php b/htdocs/product/list.php similarity index 98% rename from htdocs/product/liste.php rename to htdocs/product/list.php index 682cd1dda6a..cd4cf11e80c 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/list.php @@ -25,7 +25,7 @@ */ /** - * \file htdocs/product/liste.php + * \file htdocs/product/list.php * \ingroup produit * \brief Page to list products and services */ @@ -239,13 +239,13 @@ else $param.=($search_categ?"&search_categ=".$search_categ:""); $param.=isset($type)?"&type=".$type:""; - print_barre_liste($texte, $page, "liste.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); + print_barre_liste($texte, $page, "list.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); if (! empty($catid)) { print "
"; $c = new Categorie($db); - $ways = $c->print_all_ways(' > ','product/liste.php'); + $ways = $c->print_all_ways(' > ','product/list.php'); print " > ".$ways[0]."
\n"; print "

"; } @@ -523,7 +523,7 @@ else $param.=($fourn_id?"&fourn_id=".$fourn_id:""); $param.=($search_categ?"&search_categ=".$search_categ:""); $param.=isset($type)?"&type=".$type:""; - print_barre_liste('', $page, "liste.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords); + print_barre_liste('', $page, "list.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords); $db->free($resql); diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 86e930d8cf1..366f3b040b8 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -94,7 +94,7 @@ if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->right $result=$object->delete($user); if ($result > 0) { - header("Location: ".DOL_URL_ROOT.'/product/stock/liste.php'); + header("Location: ".DOL_URL_ROOT.'/product/stock/list.php'); exit; } else @@ -238,7 +238,7 @@ else print '
'.$langs->trans("Statistics").'product->enabled)) { $statProducts = "
'.$langs->trans("ProductsNotOnSell").''.round($prodser[0][0]).''.$langs->trans("ProductsNotOnSell").''.round($prodser[0][0]).'
'.$langs->trans("ProductsOnSell").''.round($prodser[0][1]).''.$langs->trans("ProductsOnSell").''.round($prodser[0][1]).'
'.$langs->trans("ProductsOnSellAndOnBuy").''.round($prodser[0][2]).''.$langs->trans("ProductsOnSellAndOnBuy").''.round($prodser[0][2]).'
'.$langs->trans("ServicesNotOnSell").''.round($prodser[1][0]).''.$langs->trans("ServicesNotOnSell").''.round($prodser[1][0]).'
'.$langs->trans("ServicesOnSell").''.round($prodser[1][1]).''.$langs->trans("ServicesOnSell").''.round($prodser[1][1]).'
'.$langs->trans("ServicesOnSellAndOnBuy").''.round($prodser[1][2]).''.$langs->trans("ServicesOnSellAndOnBuy").''.round($prodser[1][2]).'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; // Realised by - if ($conf->global->AGENDA_ENABLE_DONEBY) + if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) { print ''; print '
'.$langs->trans("Ref").''; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index 1309da95a2a..faea23ab770 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -51,7 +51,7 @@ print '
'; /* * Zone recherche entrepot */ -print ''; +print ''; print ''; print ''; print ""; diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/list.php similarity index 99% rename from htdocs/product/stock/liste.php rename to htdocs/product/stock/list.php index 04a9c03aa59..c63e4cfc898 100644 --- a/htdocs/product/stock/liste.php +++ b/htdocs/product/stock/list.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/product/stock/liste.php + * \file htdocs/product/stock/list.php * \ingroup stock * \brief Page with warehouse and stock value */ diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 1498b12a033..2feeee7aa2d 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -213,7 +213,7 @@ if ($resql) print '
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; // Assigned to - $var=false; print ''; print '
'.$langs->trans("Ref").''; diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index f359f789c3f..b570d5720d9 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -156,7 +156,7 @@ if ($id > 0 || ! empty($ref)) */ print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; } else diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 20b030a9226..c7b8de5a461 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1940,29 +1940,31 @@ function img_pdf($titlealt = 'default', $size = 3) * Show logo + * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. + * @param string $other Add more attributes on img * @return string Return tag img */ -function img_edit_add($titlealt = 'default') +function img_edit_add($titlealt = 'default', $other = '') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Add'); - return img_picto($titlealt, 'edit_add.png'); + return img_picto($titlealt, 'edit_add.png', $other); } /** * Show logo - * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. + * @param string $other Add more attributes on img * @return string Return tag img */ -function img_edit_remove($titlealt = 'default') +function img_edit_remove($titlealt = 'default', $other='') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Remove'); - return img_picto($titlealt, 'edit_remove.png'); + return img_picto($titlealt, 'edit_remove.png', $other); } /** @@ -2265,9 +2267,9 @@ function img_search($titlealt = 'default', $other = '') global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Search'); - + $img = img_picto($titlealt, 'search.png', $other, false, 1); - + $input = ''; @@ -2286,9 +2288,9 @@ function img_searchclear($titlealt = 'default', $other = '') global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Search'); - + $img = img_picto($titlealt, 'searchclear.png', $other, false, 1); - + $input = ''; diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 36291883755..210fe8d647e 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -39,22 +39,22 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Home - Sytem info insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', 'admintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=admintools', 'InfoDolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 208__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/modules.php?leftmenu=admintools', 'Modules', 2, 'admin', '', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 207__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/triggers.php?leftmenu=admintools', 'Triggers', 2, 'admin', '', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/modules.php?leftmenu=admintools', 'Modules', 2, 'admin', '', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 203__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/triggers.php?leftmenu=admintools', 'Triggers', 2, 'admin', '', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 204__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/browser.php?leftmenu=admintools', 'InfoBrowser', 1, 'admin', '', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 204__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/os.php?leftmenu=admintools', 'InfoOS', 1, 'admin', '', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 205__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/web.php?leftmenu=admintools', 'InfoWebServer', 1, 'admin', '', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 206__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/phpinfo.php?leftmenu=admintools', 'InfoPHP', 1, 'admin', '', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 205__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/os.php?leftmenu=admintools', 'InfoOS', 1, 'admin', '', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 206__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/web.php?leftmenu=admintools', 'InfoWebServer', 1, 'admin', '', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 207__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/phpinfo.php?leftmenu=admintools', 'InfoPHP', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 210__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/database.php?leftmenu=admintools', 'InfoDatabase', 1, 'admin', '', '', 2, 5, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php?leftmenu=admintools', 'Backup', 1, 'admin', '', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php?leftmenu=admintools', 'Restore', 1, 'admin', '', '', 2, 7, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 305__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/update.php?leftmenu=admintools', 'MenuUpgrade', 1, 'admin', '', '', 2, 8, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools" && function_exists("eaccelerator_info")', __HANDLER__, 'left', 304__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/eaccelerator.php?leftmenu=admintools', 'EAccelerator', 1, 'admin', '', '', 2, 9, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 306__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 1, 'admin', '', '', 2, 10, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools" && function_exists("eaccelerator_info")', __HANDLER__, 'left', 306__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/eaccelerator.php?leftmenu=admintools', 'EAccelerator', 1, 'admin', '', '', 2, 9, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 1, 'admin', '', '', 2, 10, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 308__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listsessions.php?leftmenu=admintools', 'Sessions', 1, 'admin', '', '', 2, 11, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 303__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 12, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 13, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 203__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 14, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 309__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 12, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 310__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 13, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 14, __ENTITY__); -- Home - Menu users and groups insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 400__+MAX_llx_menu__, 'home', 'users', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php?leftmenu=users', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0, __ENTITY__); From ee4d697172bbf95b013cee30e3a2cc36eafe6fae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Sep 2014 14:57:31 +0200 Subject: [PATCH 0031/1190] Fix several bugs reported by scrutinizer --- htdocs/admin/prelevement.php | 2 +- htdocs/admin/triggers.php | 2 +- .../admin/categorie_extrafields.php | 2 +- htdocs/categories/categorie.php | 4 +- htdocs/comm/action/class/actioncomm.class.php | 7 +- htdocs/comm/fiche.php | 4 +- htdocs/compta/bank/class/account.class.php | 6 +- htdocs/compta/bank/fiche.php | 10 +-- .../deplacement/class/deplacement.class.php | 7 +- htdocs/compta/deplacement/document.php | 2 +- htdocs/compta/facture.php | 64 ++++++++++++------- htdocs/compta/paiement/info.php | 6 +- htdocs/core/class/html.form.class.php | 2 +- .../install/mysql/migration/3.6.0-3.7.0.sql | 3 + .../install/mysql/tables/llx_bank_account.sql | 2 + 15 files changed, 78 insertions(+), 45 deletions(-) diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 2247df9493e..6094bb7e4f1 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -55,7 +55,7 @@ if ($action == "set") if (! $res > 0) $error++; $id=GETPOST('PRELEVEMENT_ID_BANKACCOUNT','int'); - $account = new Account($db, $id); + $account = new Account($db); if($account->fetch($id)>0) { diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index fc9d0489e9a..85139b56ba9 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -50,7 +50,7 @@ print "
\n"; $template_dir = DOL_DOCUMENT_ROOT.'/core/tpl/'; $interfaces = new Interfaces($db); -$triggers = $interfaces->getTriggersList(0,'priority'); +$triggers = $interfaces->getTriggersList(); print '
'.$langs->trans('Ref').''; diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 611fc314481..cb9742e40cc 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -104,7 +104,7 @@ if ($object->id > 0) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print '
'.$langs->trans("Ref").''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index b5a1d089c96..52149da9039 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -101,7 +101,7 @@ dol_fiche_head($head, 'element', $langs->trans("Project"),0,($project->public?'p print ''; -$linkback = ''.$langs->trans("BackToList").''; +$linkback = ''.$langs->trans("BackToList").''; print ''; -print ''; +print ''; print ''; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 62e427d842c..37f2384b4b1 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -204,7 +204,7 @@ if ($resql) print ""; // Ref - print ''."\n"; // Author diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index fc1942e0f61..3a9d8f5bebe 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -45,7 +45,7 @@ foreach($linkedObjectBlock as $object) $var=!$var; ?> > + trans("ShowOrder"),"order").' '.$object->ref; ?>"; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/card.php similarity index 99% rename from htdocs/fourn/facture/fiche.php rename to htdocs/fourn/facture/card.php index 9d20c2b9722..fb55ce74052 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/card.php @@ -24,7 +24,7 @@ */ /** - * \file htdocs/fourn/facture/fiche.php + * \file htdocs/fourn/facture/card.php * \ingroup facture, fournisseur * \brief Page for supplier invoice card (view, edit, validate) */ @@ -1699,7 +1699,7 @@ else $objp = $db->fetch_object($result); $var=!$var; print ''; - print '\n"; + print '\n"; print ''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index c9969543d20..adc62ee4cd8 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -213,8 +213,8 @@ if ($action == 'confirm_paiement' && $confirm == 'yes') else $invoiceid=$facid; } } - if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$invoiceid; - else $loc = DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$paiement_id; + if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid; + else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id; header('Location: '.$loc); exit; } @@ -556,7 +556,7 @@ if (empty($action)) print ''; // Ref payment - print ''; + print ''; // Date print '\n"; diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index c10fea8bb8a..211d6c4ad8f 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -46,7 +46,7 @@ foreach($linkedObjectBlock as $object) $var=!$var; ?> > + trans("ShowBill"),"bill").' '.$object->ref; ?>"; - print '\n"; + print '\n"; print ''; print ''; print "\n"; diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/card.php similarity index 95% rename from htdocs/fourn/paiement/fiche.php rename to htdocs/fourn/paiement/card.php index f5f7114ada5..684985ed261 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/card.php @@ -19,10 +19,10 @@ */ /** - * \file htdocs/fourn/paiement/fiche.php + * \file htdocs/fourn/paiement/card.php * \ingroup facture, fournisseur * \brief Tab to show a payment of a supplier invoice - * \remarks Fichier presque identique a compta/paiement/fiche.php + * \remarks Fichier presque identique a compta/paiement/card.php */ require '../../main.inc.php'; @@ -268,13 +268,13 @@ if ($result > 0) $var=!$var; print ''; // Ref - print '\n"; // Ref supplier print '\n"; // Third party - print ''; + print ''; // Expected to pay print ''; // Status diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php index b2d353046df..448cf19e61e 100644 --- a/htdocs/fourn/product/categorie.php +++ b/htdocs/fourn/product/categorie.php @@ -72,7 +72,7 @@ if ($_GET["id"]) $h=0; - $head[$h][0] = DOL_URL_ROOT."/fourn/product/fiche.php?id=".$product->id; + $head[$h][0] = DOL_URL_ROOT."/fourn/product/card.php?id=".$product->id; $head[$h][1] = $langs->trans("Card"); $h++; @@ -95,7 +95,7 @@ if ($_GET["id"]) $head[$h][1] = $langs->trans("Photos"); $h++; - $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id; + $head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$product->id; $head[$h][1] = $langs->trans('Statistics'); $h++; diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php index 68cf81745a3..28e84e30f6a 100644 --- a/htdocs/fourn/product/index.php +++ b/htdocs/fourn/product/index.php @@ -125,10 +125,10 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print "\n"; + print "rowid\">$objp->ref\n"; print ""; print ""; print "\n"; - print "\n"; + print "\n"; print ''; print '\n"; @@ -149,7 +149,7 @@ if ($socid > 0) print '\n"; // Author - print ''; + print ''; print "\n"; @@ -176,7 +176,7 @@ if ($socid > 0) print '\n"; print ''; + print ''.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.''; print "\n"; print "\n"; print ''; @@ -184,7 +184,7 @@ if ($socid > 0) print '\n"; // Auteur - print ''; + print ''; print ''; diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/card.php similarity index 89% rename from htdocs/holiday/fiche.php rename to htdocs/holiday/card.php index 9fc3e278ac5..31a4e40599f 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/holiday/fiche.php + * \file htdocs/holiday/card.php * \ingroup holiday * \brief Form and file creation of paid holiday. */ @@ -84,21 +84,21 @@ if ($action == 'create') // Si pas de date de début if (empty($date_debut)) { - header('Location: fiche.php?action=request&error=nodatedebut'); + header('Location: card.php?action=request&error=nodatedebut'); exit; } // Si pas de date de fin if (empty($date_fin)) { - header('Location: fiche.php?action=request&error=nodatefin'); + header('Location: card.php?action=request&error=nodatefin'); exit; } // Si date de début après la date de fin if ($date_debut > $date_fin) { - header('Location: fiche.php?action=request&error=datefin'); + header('Location: card.php?action=request&error=datefin'); exit; } @@ -106,7 +106,7 @@ if ($action == 'create') $verifCP = $cp->verifDateHolidayCP($userID, $date_debut, $date_fin, $halfday); if (! $verifCP) { - header('Location: fiche.php?action=request&error=alreadyCP'); + header('Location: card.php?action=request&error=alreadyCP'); exit; } @@ -114,14 +114,14 @@ if ($action == 'create') $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday); if($nbopenedday < 0.5) { - header('Location: fiche.php?action=request&error=DureeHoliday'); + header('Location: card.php?action=request&error=DureeHoliday'); exit; } // Si pas de validateur choisi if ($valideur < 1) { - header('Location: fiche.php?action=request&error=Valideur'); + header('Location: card.php?action=request&error=Valideur'); exit; } @@ -137,13 +137,13 @@ if ($action == 'create') // Si pas d'erreur SQL on redirige vers la fiche de la demande if ($verif > 0) { - header('Location: fiche.php?id='.$verif); + header('Location: card.php?id='.$verif); exit; } else { // Sinon on affiche le formulaire de demande avec le message d'erreur SQL - header('Location: fiche.php?action=request&error=SQL_Create&msg='.$cp->error); + header('Location: card.php?action=request&error=SQL_Create&msg='.$cp->error); exit; } } @@ -165,7 +165,7 @@ if ($action == 'update') // Si pas le droit de modifier une demande if (! $user->rights->holiday->write) { - header('Location: fiche.php?action=request&error=CantUpdate'); + header('Location: card.php?action=request&error=CantUpdate'); exit; } @@ -185,25 +185,25 @@ if ($action == 'update') // Si pas de date de début if (empty($_POST['date_debut_'])) { - header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatedebut'); + header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatedebut'); exit; } // Si pas de date de fin if (empty($_POST['date_fin_'])) { - header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatefin'); + header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatefin'); exit; } // Si date de début après la date de fin if ($date_debut > $date_fin) { - header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=datefin'); + header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=datefin'); exit; } // Si pas de valideur choisi if ($valideur < 1) { - header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=Valideur'); + header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=Valideur'); exit; } @@ -211,7 +211,7 @@ if ($action == 'update') $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday); if ($nbopenedday < 0.5) { - header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=DureeHoliday'); + header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=DureeHoliday'); exit; } @@ -225,18 +225,18 @@ if ($action == 'update') $verif = $cp->update($user->id); if ($verif > 0) { - header('Location: fiche.php?id='.$_POST['holiday_id']); + header('Location: card.php?id='.$_POST['holiday_id']); exit; } else { // Sinon on affiche le formulaire de demande avec le message d'erreur SQL - header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=SQL_Create&msg='.$cp->error); + header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=SQL_Create&msg='.$cp->error); exit; } } } else { - header('Location: fiche.php?id='.$_POST['holiday_id']); + header('Location: card.php?id='.$_POST['holiday_id']); exit; } } @@ -305,7 +305,7 @@ if ($action == 'confirm_send') if (!$emailTo) { - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } @@ -354,7 +354,7 @@ if ($action == 'confirm_send') $message.= "\n"; $message.= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; $message.= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($cp->date_debut,'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($cp->date_fin,'day')."\n"; - $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n"; + $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n"; $message.= "\n"; $mail = new CMailFile($subject,$emailTo,$emailFrom,$message); @@ -364,16 +364,16 @@ if ($action == 'confirm_send') if (!$result) { - header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); + header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); exit; } - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } else { // Sinon on affiche le formulaire de demande avec le message d'erreur SQL - header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); + header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); exit; } } @@ -417,7 +417,7 @@ if($action == 'confirm_valid') if (!$emailTo) { - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } @@ -439,7 +439,7 @@ if($action == 'confirm_valid') $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; - $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n"; + $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n"; $message.= "\n"; $mail = new CMailFile($subject,$emailTo,$emailFrom,$message); @@ -448,15 +448,15 @@ if($action == 'confirm_valid') $result=$mail->sendfile(); if(!$result) { - header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); + header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); exit; } - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } else { // Sinon on affiche le formulaire de demande avec le message d'erreur SQL - header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); + header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); exit; } @@ -491,7 +491,7 @@ if ($action == 'confirm_refuse') if (!$emailTo) { - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } @@ -514,7 +514,7 @@ if ($action == 'confirm_refuse') $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; - $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n"; + $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n"; $message.= "\n"; $mail = new CMailFile($subject,$emailTo,$emailFrom,$message); @@ -523,22 +523,22 @@ if ($action == 'confirm_refuse') $result=$mail->sendfile(); if(!$result) { - header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); + header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); exit; } - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } else { // Sinon on affiche le formulaire de demande avec le message d'erreur SQL - header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); + header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); exit; } } } else { - header('Location: fiche.php?id='.$_GET['id'].'&error=NoMotifRefuse'); + header('Location: card.php?id='.$_GET['id'].'&error=NoMotifRefuse'); exit; } } @@ -600,7 +600,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes') if (!$emailTo) { - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } @@ -622,7 +622,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes') $message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n"; $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; - $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n"; + $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n"; $message.= "\n"; $mail = new CMailFile($subject,$emailTo,$emailFrom,$message); @@ -632,17 +632,17 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes') if(!$result) { - header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); + header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error); exit; } - header('Location: fiche.php?id='.$_GET['id']); + header('Location: card.php?id='.$_GET['id']); exit; } else { // Sinon on affiche le formulaire de demande avec le message d'erreur SQL - header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); + header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error); exit; } @@ -901,33 +901,33 @@ else { if($user->rights->holiday->delete) { - print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1); + print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1); } } // Si envoi en validation if ($action == 'sendToValidate' && $cp->statut == 1 && $user->id == $cp->fk_user) { - print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1); + print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1); } // Si validation de la demande if ($action == 'valid') { - print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1); + print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1); } // Si refus de la demande if ($action == 'refuse') { $array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>"")); - print $form->formconfirm("fiche.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0); + print $form->formconfirm("card.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0); } // Si annulation de la demande if ($action == 'cancel') { - print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1); + print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1); } $head=holiday_prepare_head($cp); @@ -1126,26 +1126,26 @@ else // Boutons d'actions if ($canedit && $cp->statut == 1) { - print ''.$langs->trans("EditCP").''; + print ''.$langs->trans("EditCP").''; } if ($canedit && $cp->statut == 1) { - print ''.$langs->trans("Validate").''; + print ''.$langs->trans("Validate").''; } if ($user->rights->holiday->delete && $cp->statut == 1) // If draft { - print ''.$langs->trans("DeleteCP").''; + print ''.$langs->trans("DeleteCP").''; } if ($user->id == $cp->fk_validator && $cp->statut == 2) { - print ''.$langs->trans("Approve").''; - print ''.$langs->trans("ActionRefuseCP").''; + print ''.$langs->trans("Approve").''; + print ''.$langs->trans("ActionRefuseCP").''; } if (($user->id == $cp->fk_validator || $user->id == $cp->fk_user) && ($cp->statut == 2 || $cp->statut == 3)) // Status validated or approved { - if (($cp->date_debut > dol_now()) || $user->admin) print ''.$langs->trans("ActionCancelCP").''; + if (($cp->date_debut > dol_now()) || $user->admin) print ''.$langs->trans("ActionCancelCP").''; else print ''.$langs->trans("ActionCancelCP").''; } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index b88547729c1..119a4980a78 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -659,7 +659,7 @@ class Holiday extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='holiday'; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 26f413a4e43..9b0d1bbba62 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -386,7 +386,7 @@ if ($user_id == $user->id) { print '
'; print ''; } diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/card.php similarity index 94% rename from htdocs/livraison/fiche.php rename to htdocs/livraison/card.php index 7d94413f559..48f1fa388b3 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/card.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/livraison/fiche.php + * \file htdocs/livraison/card.php * \ingroup livraison * \brief Fiche descriptive d'un bon de livraison=reception */ @@ -271,7 +271,7 @@ if ($action == 'create') /* * Commande */ - print ''; + print ''; print ''; print ''; print ''; @@ -281,7 +281,7 @@ if ($action == 'create') } print '
'.$langs->trans("Ref").''; // Define a complementary filter for search of next/prev ref. diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 1fe3d91346d..978e142b1ad 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -615,7 +615,7 @@ else { print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print '"; // Sending id - print ''; + print ''; // Description if ($objp->fk_product > 0) @@ -310,7 +310,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='') // Ref print ''; // Qty received //print ''; print "\n"; @@ -926,7 +926,7 @@ if ($action == 'create') $img=img_warning($langs->trans("StockTooLow")); } print ""; } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index d2527d1fca0..dc54ea3670b 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1171,7 +1171,7 @@ class Expedition extends CommonObject $result=''; - $url = DOL_URL_ROOT.'/expedition/fiche.php?id='.$this->id; + $url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id; if ($short) return $url; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index d299bda1422..188127f0304 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -101,10 +101,10 @@ if ($resql) print $shipment->getNomUrl(1); print ""; print ''; print ''; $i++; } @@ -253,9 +253,9 @@ if ($resql) { $var=!$var; $obj = $db->fetch_object($resql); - print ''; - print ''; + print ''; print ''; + print ''; print ''; print ''; print ''; @@ -606,7 +606,7 @@ if ($id > 0 || ! empty($ref)) { if ($user->rights->expedition->creer) { - print ''.$langs->trans("NewSending").''; + print ''.$langs->trans("NewSending").''; if ($toBeShippedTotal <= 0) { print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend")); @@ -628,7 +628,7 @@ if ($id > 0 || ! empty($ref)) { print_titre($langs->trans("NewSending")); - print ''; + print ''; print ''; print ''; print ''; @@ -647,7 +647,7 @@ if ($id > 0 || ! empty($ref)) print $formproduct->selectWarehouses(-1,'entrepot_id','',1); if (count($formproduct->cache_warehouses) <= 0) { - print '   '.$langs->trans("WarehouseSourceNotDefined").' '.$langs->trans("AddOne").''; + print '   '.$langs->trans("WarehouseSourceNotDefined").' '.$langs->trans("AddOne").''; } print ''; } diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php index 364afb92177..72206c13e2b 100644 --- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -47,7 +47,7 @@ foreach($linkedObjectBlock as $object) $var=!$var; ?> > + trans("ShowShipping"),"sending").' '.$object->ref; ?>"; print ''; print ''; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/card.php similarity index 98% rename from htdocs/fichinter/fiche.php rename to htdocs/fichinter/card.php index edd5372471e..ae44f5bb8b7 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/fichinter/fiche.php + * \file htdocs/fichinter/card.php * \brief Page of intervention * \ingroup ficheinter */ @@ -1044,7 +1044,7 @@ if ($action == 'create') $numprojet=$formproject->select_projects($soc->id,GETPOST('projectid','int'),'projectid'); if ($numprojet==0) { - print '   '.$langs->trans("AddProject").''; + print '   '.$langs->trans("AddProject").''; } print ''; } @@ -1057,7 +1057,7 @@ if ($action == 'create') $numcontrat=$formcontract->select_contract($soc->id,GETPOST('contratid','int'),'contratid',0,1); if ($numcontrat==0) { - print '   '.$langs->trans("AddContract").''; + print '   '.$langs->trans("AddContract").''; } print ''; } @@ -1303,7 +1303,7 @@ else if ($id > 0 || ! empty($ref)) { $contratstatic = new Contrat($db); $contratstatic->fetch($object->fk_contrat); - //print ''.$projet->title.''; + //print ''.$projet->title.''; print $contratstatic->getNomUrl(0,'',1); } else @@ -1620,14 +1620,14 @@ else if ($id > 0 || ! empty($ref)) // Validate if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) { - print '
'.$langs->trans("Valid").'
'; } // Modify if ($object->statut == 1 && $user->rights->ficheinter->creer) { - print '
'; + print '
'; if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify"); else print $langs->trans("SetToDraft"); print '
'; @@ -1651,7 +1651,7 @@ else if ($id > 0 || ! empty($ref)) $langs->load("agenda"); if ($object->statut < 2) { - if ($user->rights->agenda->myactions->create) print '
'.$langs->trans("AddEvent").'
'; + if ($user->rights->agenda->myactions->create) print '
'.$langs->trans("AddEvent").'
'; else print '
'.$langs->trans("AddEvent").'
'; } } diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 6aaf29c7ac2..6f613dda5c8 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -545,7 +545,7 @@ class Fichinter extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='intervention'; diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php index e104bea2a7a..4e0d6b753e7 100644 --- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php @@ -42,7 +42,7 @@ foreach($linkedObjectBlock as $object) $var=!$var; ?>
> + trans("ShowIntervention"),"intervention").' '.$object->ref; ?> diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/card.php similarity index 96% rename from htdocs/fourn/fiche.php rename to htdocs/fourn/card.php index 0294e78986e..313f82547e7 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/fourn/fiche.php + * \file htdocs/fourn/card.php * \ingroup fournisseur, facture * \brief Page for supplier third party card (view, edit) */ @@ -331,7 +331,7 @@ if ($object->fetch($id)) $var=!$var; print ""; - print ''; + print ''; print ''; print ''; print ''; print ''; @@ -431,13 +431,13 @@ if ($object->fetch($id)) if ($user->rights->fournisseur->commande->creer) { $langs->load("orders"); - print ''.$langs->trans("AddOrder").''; + print ''.$langs->trans("AddOrder").''; } if ($user->rights->fournisseur->facture->creer) { $langs->load("bills"); - print ''.$langs->trans("AddBill").''; + print ''.$langs->trans("AddBill").''; } // Add action @@ -445,7 +445,7 @@ if ($object->fetch($id)) { if ($user->rights->agenda->myactions->create) { - print ''.$langs->trans("AddAction").''; + print ''.$langs->trans("AddAction").''; } else { diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 4e8c3a650b0..d3e15bd1ded 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -523,7 +523,7 @@ class CommandeFournisseur extends CommonOrder $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='order'; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 4ceea058b4f..0ce9381fa38 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1438,7 +1438,7 @@ class FactureFournisseur extends CommonInvoice } else { - $lien = ''; + $lien = ''; $lienfin=''; } $label=$langs->trans("ShowInvoice").': '.$this->ref; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index f41cee3c2b7..59dc5dab3d1 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -488,7 +488,7 @@ class PaiementFourn extends Paiement $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $text=$this->ref; // Sometimes ref contains label diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/card.php similarity index 99% rename from htdocs/fourn/commande/fiche.php rename to htdocs/fourn/commande/card.php index 0131ddb72dd..39a382d8d62 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/card.php @@ -24,7 +24,7 @@ */ /** - * \file htdocs/fourn/commande/fiche.php + * \file htdocs/fourn/commande/card.php * \ingroup supplier, order * \brief Card supplier order */ @@ -1871,7 +1871,7 @@ elseif (! empty($object->id)) { if ($user->rights->fournisseur->facture->creer) { - print ''.$langs->trans("CreateBill").''; + print ''.$langs->trans("CreateBill").''; } //if ($user->rights->fournisseur->commande->creer && $object->statut > 2) @@ -1942,7 +1942,7 @@ elseif (! empty($object->id)) * Commander (action=commande) */ print '
'; - print ''; + print ''; print ''; print ''; print '
'.$langs->trans("Ref").''; diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 0c06c30ba57..e6fdd3264ca 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/card.php similarity index 89% rename from htdocs/compta/payment_sc/fiche.php rename to htdocs/compta/payment_sc/card.php index 5c6562b6fc0..326903dc67d 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/card.php @@ -19,10 +19,10 @@ */ /** - * \file htdocs/compta/payment_sc/fiche.php + * \file htdocs/compta/payment_sc/card.php * \ingroup facture * \brief Onglet payment of a social contribution - * \remarks Fichier presque identique a fournisseur/paiement/fiche.php + * \remarks Fichier presque identique a fournisseur/paiement/card.php */ require '../../main.inc.php'; @@ -101,7 +101,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->char if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs); } - header('Location: fiche.php?id='.$paiement->id); + header('Location: card.php?id='.$paiement->id); exit; } else @@ -124,7 +124,7 @@ $form = new Form($db); $h=0; -$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$_GET["id"]; +$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$_GET["id"]; $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++; @@ -142,7 +142,7 @@ dol_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), 0, */ if ($action == 'delete') { - print $form->formconfirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2); + print $form->formconfirm('card.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2); } @@ -152,7 +152,7 @@ if ($action == 'delete') if ($action == 'valide') { $facid = $_GET['facid']; - print $form->formconfirm('fiche.php?id='.$paiement->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2); + print $form->formconfirm('card.php?id='.$paiement->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2); } @@ -211,7 +211,7 @@ $sql.= ' WHERE pf.fk_charge = f.rowid AND f.fk_type = pc.id'; $sql.= ' AND f.entity = '.$conf->entity; $sql.= ' AND pf.rowid = '.$paiement->id; -dol_syslog("compta/payment_sc/fiche.php", LOG_DEBUG); +dol_syslog("compta/payment_sc/card.php", LOG_DEBUG); $resql=$db->query($sql); if ($resql) { @@ -291,7 +291,7 @@ if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { if ($user->rights->facture->paiement) { - print ''.$langs->trans('Valid').''; + print ''.$langs->trans('Valid').''; } } } @@ -303,7 +303,7 @@ if ($_GET['action'] == '') { if (! $disable_delete) { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } else { diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 8c55d8b556c..c2d67b4551b 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -104,7 +104,7 @@ if ($result) print $bon->LibStatut($obj->statut,2); print " "; - print ''.$obj->ref."\n"; + print ''.$obj->ref."\n"; print '\n"; diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/card.php similarity index 88% rename from htdocs/compta/prelevement/fiche.php rename to htdocs/compta/prelevement/card.php index e594beae1d6..e2a5e846b0a 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/compta/prelevement/fiche.php + * \file htdocs/compta/prelevement/card.php * \ingroup prelevement * \brief Fiche prelevement */ @@ -69,7 +69,7 @@ if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes') $bon->set_credite(); - header("Location: fiche.php?id=".$id); + header("Location: card.php?id=".$id); exit; } @@ -92,7 +92,7 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send) $bon->set_infotrans($user, $dt, GETPOST('methode','alpha')); } - header("Location: fiche.php?id=".$id); + header("Location: card.php?id=".$id); exit; } else @@ -105,7 +105,7 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send) if ($error) { - header("Location: fiche.php?id=".$id."&error=$error"); + header("Location: card.php?id=".$id."&error=$error"); exit; } } @@ -120,7 +120,7 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit) if ($error) { - header("Location: fiche.php?id=".$id."&error=$error"); + header("Location: card.php?id=".$id."&error=$error"); exit; } } @@ -150,7 +150,7 @@ if ($id > 0) /*if ($action == 'credite') { - print $form->formconfirm("fiche.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1); + print $form->formconfirm("card.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1); }*/ @@ -201,7 +201,7 @@ if ($id > 0) if (empty($bon->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted') { - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 4e81c2efca3..d986c1ca079 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -77,7 +77,7 @@ print '
'; if (! empty($conf->projet->enabled) && $user->rights->projet->lire) { $var=false; - print ''; + print ''; print ''; print ''; print ''; @@ -135,7 +135,7 @@ if ( $resql ) print $langs->trans("OthersNotLinkedToThirdParty"); } print ''; - print ''; + print ''; print "\n"; $i++; diff --git a/htdocs/projet/liste.php b/htdocs/projet/list.php similarity index 98% rename from htdocs/projet/liste.php rename to htdocs/projet/list.php index a7404e5c23b..2a427558eb4 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/list.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/projet/liste.php + * \file htdocs/projet/list.php * \ingroup projet * \brief Page to list projects */ @@ -39,7 +39,7 @@ if ($socid > 0) { $soc = new Societe($db); $soc->fetch($socid); - $title .= ' ('.$soc->nom.')'; + $title .= ' ('.$soc->nom.')'; } if (!$user->rights->projet->lire) accessforbidden(); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index a086f632a36..b581ca01be9 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -83,7 +83,7 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("SearchAProject").'
'.$obj->nb.''.$obj->nb.'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; // Id - print ''; + print ''; // Type print ''; // Date diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/card.php similarity index 96% rename from htdocs/compta/dons/fiche.php rename to htdocs/compta/dons/card.php index 68b2bef1b58..a9c8a42448b 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/card.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/dons/fiche.php + * \file htdocs/compta/dons/card.php * \ingroup don * \brief Page of donation card */ @@ -268,7 +268,7 @@ if ($action == 'create') { print_fiche_titre($langs->trans("AddDonation")); - print ''; + print ''; print ''; print '
'.$langs->trans("Ref").''; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 994779fcac9..8461321e071 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -203,7 +203,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print '"; - $statstring2.= ''; + $statstring2.= ''; $statstring2.= ""; } print $statstring; From 0b20369dd7ebe2efae0f80360f980ebe5208f75d Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 18 Sep 2014 21:18:25 +0200 Subject: [PATCH 0022/1190] Qual: Renamed all files & links "fiche.php" into "card.php" --- ChangeLog | 3 +- htdocs/accountancy/supplier/list.php | 4 +- htdocs/adherents/agenda.php | 2 +- htdocs/adherents/{fiche.php => card.php} | 30 +++--- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/adherents/list.php | 8 +- htdocs/adherents/type.php | 10 +- htdocs/bookmarks/bookmarks.lib.php | 2 +- htdocs/bookmarks/{fiche.php => card.php} | 4 +- htdocs/bookmarks/list.php | 6 +- .../boutique/client/{fiche.php => card.php} | 4 +- htdocs/boutique/client/index.php | 4 +- .../boutique/commande/{fiche.php => card.php} | 14 +-- htdocs/boutique/commande/index.php | 4 +- htdocs/boutique/critiques/bestproduct.php | 2 +- .../critiques/{fiche.php => card.php} | 2 +- htdocs/boutique/critiques/index.php | 2 +- htdocs/boutique/notification/index.php | 4 +- htdocs/boutique/notification/produits.php | 2 +- htdocs/boutique/produits/index.php | 4 +- htdocs/categories/{fiche.php => card.php} | 2 +- htdocs/categories/categorie.php | 2 +- htdocs/categories/viewcat.php | 2 +- htdocs/comm/action/{fiche.php => card.php} | 14 +-- htdocs/comm/action/class/actioncomm.class.php | 4 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/peruser.php | 4 +- htdocs/comm/address.php | 4 +- htdocs/comm/{fiche.php => card.php} | 26 ++--- htdocs/comm/contact.php | 8 +- htdocs/comm/index.php | 6 +- htdocs/comm/mailing/{fiche.php => card.php} | 20 ++-- htdocs/comm/mailing/index.php | 2 +- htdocs/comm/mailing/list.php | 2 +- htdocs/comm/propal.php | 10 +- htdocs/comm/propal/index.php | 4 +- htdocs/comm/propal/list.php | 2 +- htdocs/comm/prospect/list.php | 2 +- htdocs/comm/remise.php | 2 +- htdocs/comm/remx.php | 4 +- htdocs/commande/apercu.php | 2 +- htdocs/commande/{fiche.php => card.php} | 12 +-- htdocs/commande/class/commande.class.php | 2 +- htdocs/commande/index.php | 10 +- htdocs/commande/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/{fiche.php => card.php} | 2 +- htdocs/compta/bank/class/account.class.php | 2 +- htdocs/compta/bank/index.php | 2 +- htdocs/compta/bank/ligne.php | 12 +-- htdocs/compta/bank/rappro.php | 4 +- htdocs/compta/bank/releve.php | 4 +- .../deplacement/{fiche.php => card.php} | 2 +- .../deplacement/class/deplacement.class.php | 2 +- htdocs/compta/deplacement/list.php | 2 +- htdocs/compta/dons/{fiche.php => card.php} | 18 ++-- htdocs/compta/dons/class/don.class.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/apercu.php | 2 +- htdocs/compta/facture/prelevement.php | 4 +- htdocs/compta/index.php | 2 +- .../compta/localtax/{fiche.php => card.php} | 8 +- .../compta/localtax/class/localtax.class.php | 4 +- htdocs/compta/paiement.php | 2 +- htdocs/compta/paiement/avalider.php | 4 +- .../compta/paiement/{fiche.php => card.php} | 4 +- .../paiement/cheque/{fiche.php => card.php} | 2 +- .../cheque/class/remisecheque.class.php | 2 +- htdocs/compta/paiement/cheque/index.php | 2 +- .../compta/paiement/class/paiement.class.php | 10 +- htdocs/compta/paiement/list.php | 2 +- .../compta/payment_sc/{fiche.php => card.php} | 18 ++-- htdocs/compta/prelevement/bons.php | 2 +- .../prelevement/{fiche.php => card.php} | 22 ++-- .../class/bonprelevement.class.php | 4 +- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/ligne.php | 4 +- htdocs/compta/prelevement/lignes.php | 2 +- htdocs/compta/prelevement/list.php | 6 +- htdocs/compta/prelevement/rejets.php | 2 +- htdocs/compta/recap-compta.php | 2 +- .../compta/salaries/{fiche.php => card.php} | 8 +- .../salaries/class/paymentsalary.class.php | 6 +- htdocs/compta/sociales/charges.php | 2 +- .../class/paymentsocialcontribution.class.php | 4 +- htdocs/compta/stats/cabyprodserv.php | 2 +- htdocs/compta/stats/cabyuser.php | 2 +- htdocs/compta/tva/{fiche.php => card.php} | 8 +- htdocs/compta/tva/class/tva.class.php | 4 +- htdocs/compta/tva/quadri.php | 2 +- .../ventilation/{fiche.php => card.php} | 4 +- .../fournisseur/{fiche.php => card.php} | 4 +- .../compta/ventilation/fournisseur/list.php | 4 +- htdocs/compta/ventilation/list.php | 2 +- htdocs/contact/{fiche.php => card.php} | 10 +- htdocs/contact/class/contact.class.php | 4 +- htdocs/contact/list.php | 8 +- htdocs/contrat/{fiche.php => card.php} | 2 +- htdocs/contrat/class/contrat.class.php | 4 +- htdocs/contrat/index.php | 8 +- htdocs/contrat/list.php | 4 +- htdocs/contrat/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/core/boxes/box_actions.php | 4 +- htdocs/core/boxes/box_clients.php | 2 +- htdocs/core/boxes/box_commandes.php | 8 +- htdocs/core/boxes/box_contacts.php | 4 +- htdocs/core/boxes/box_contracts.php | 8 +- htdocs/core/boxes/box_factures.php | 4 +- htdocs/core/boxes/box_factures_fourn.php | 10 +- htdocs/core/boxes/box_factures_fourn_imp.php | 10 +- htdocs/core/boxes/box_factures_imp.php | 4 +- htdocs/core/boxes/box_ficheinter.php | 8 +- htdocs/core/boxes/box_fournisseurs.php | 4 +- htdocs/core/boxes/box_members.php | 4 +- htdocs/core/boxes/box_produits.php | 4 +- .../core/boxes/box_produits_alerte_stock.php | 4 +- htdocs/core/boxes/box_propales.php | 4 +- htdocs/core/boxes/box_prospect.php | 4 +- htdocs/core/boxes/box_services_contracts.php | 8 +- htdocs/core/boxes/box_services_expired.php | 8 +- htdocs/core/boxes/box_supplier_orders.php | 4 +- htdocs/core/class/html.form.class.php | 6 +- htdocs/core/class/notify.class.php | 6 +- htdocs/core/lib/agenda.lib.php | 2 +- htdocs/core/lib/bank.lib.php | 2 +- htdocs/core/lib/company.lib.php | 26 ++--- htdocs/core/lib/contact.lib.php | 2 +- htdocs/core/lib/contract.lib.php | 2 +- htdocs/core/lib/emailing.lib.php | 2 +- htdocs/core/lib/fichinter.lib.php | 2 +- htdocs/core/lib/fourn.lib.php | 4 +- htdocs/core/lib/functions.lib.php | 6 +- htdocs/core/lib/holiday.lib.php | 2 +- htdocs/core/lib/member.lib.php | 2 +- htdocs/core/lib/order.lib.php | 2 +- htdocs/core/lib/payments.lib.php | 4 +- htdocs/core/lib/prelevement.lib.php | 2 +- htdocs/core/lib/product.lib.php | 6 +- htdocs/core/lib/project.lib.php | 2 +- htdocs/core/lib/sendings.lib.php | 12 +-- htdocs/core/lib/stock.lib.php | 2 +- htdocs/core/lib/trip.lib.php | 2 +- htdocs/core/lib/usergroups.lib.php | 4 +- htdocs/core/menus/init_menu_auguria.sql | 58 +++++----- htdocs/core/menus/standard/auguria.lib.php | 2 +- htdocs/core/menus/standard/eldy.lib.php | 66 ++++++------ .../modules/mailings/contacts1.modules.php | 2 +- .../modules/mailings/contacts2.modules.php | 2 +- .../modules/mailings/contacts3.modules.php | 2 +- .../modules/mailings/contacts4.modules.php | 2 +- .../core/modules/mailings/fraise.modules.php | 2 +- .../modules/mailings/framboise.modules.php | 2 +- .../core/modules/mailings/pomme.modules.php | 2 +- htdocs/core/modules/modAgenda.class.php | 2 +- htdocs/core/modules/modHoliday.class.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 2 +- htdocs/expedition/{fiche.php => card.php} | 14 +-- htdocs/expedition/class/expedition.class.php | 2 +- htdocs/expedition/index.php | 8 +- htdocs/expedition/shipment.php | 8 +- .../expedition/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fichinter/apercu.php | 2 +- htdocs/fichinter/{fiche.php => card.php} | 14 +-- htdocs/fichinter/class/fichinter.class.php | 2 +- .../fichinter/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fourn/{fiche.php => card.php} | 12 +-- .../class/fournisseur.commande.class.php | 2 +- .../fourn/class/fournisseur.facture.class.php | 2 +- htdocs/fourn/class/paiementfourn.class.php | 2 +- htdocs/fourn/commande/{fiche.php => card.php} | 8 +- htdocs/fourn/commande/history.php | 2 +- htdocs/fourn/commande/index.php | 8 +- htdocs/fourn/commande/list.php | 4 +- .../commande/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fourn/contact.php | 4 +- htdocs/fourn/facture/{fiche.php => card.php} | 4 +- htdocs/fourn/facture/paiement.php | 6 +- .../facture/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fourn/index.php | 4 +- htdocs/fourn/paiement/{fiche.php => card.php} | 8 +- htdocs/fourn/product/categorie.php | 4 +- htdocs/fourn/product/index.php | 4 +- htdocs/fourn/product/list.php | 2 +- htdocs/fourn/product/photos.php | 4 +- htdocs/fourn/recap-fourn.php | 8 +- htdocs/holiday/{fiche.php => card.php} | 100 +++++++++--------- htdocs/holiday/class/holiday.class.php | 2 +- htdocs/holiday/index.php | 2 +- htdocs/livraison/{fiche.php => card.php} | 22 ++-- htdocs/livraison/class/livraison.class.php | 2 +- htdocs/main.inc.php | 2 +- htdocs/margin/tabs/productMargins.php | 2 +- htdocs/product/{fiche.php => card.php} | 6 +- htdocs/product/class/product.class.php | 4 +- .../composition/{fiche.php => card.php} | 8 +- htdocs/product/list.php | 2 +- htdocs/product/popuprop.php | 2 +- htdocs/product/price.php | 2 +- htdocs/product/reassort.php | 2 +- htdocs/product/stats/{fiche.php => card.php} | 2 +- htdocs/product/stats/commande.php | 4 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 4 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stats/propal.php | 2 +- htdocs/product/stock/{fiche.php => card.php} | 12 +-- htdocs/product/stock/class/entrepot.class.php | 2 +- htdocs/product/stock/index.php | 6 +- htdocs/product/stock/list.php | 2 +- htdocs/product/stock/replenishorders.php | 4 +- htdocs/product/stock/valo.php | 2 +- htdocs/projet/{fiche.php => card.php} | 16 +-- htdocs/projet/class/project.class.php | 2 +- htdocs/projet/element.php | 6 +- htdocs/projet/index.php | 2 +- htdocs/societe/agenda.php | 2 +- .../canvas/actions_card_common.class.php | 4 +- htdocs/societe/class/societe.class.php | 6 +- htdocs/societe/commerciaux.php | 4 +- htdocs/societe/notify/{fiche.php => card.php} | 4 +- htdocs/societe/notify/index.php | 2 +- htdocs/societe/soc.php | 4 +- htdocs/societe/societecontact.php | 2 +- htdocs/user/{fiche.php => card.php} | 18 ++-- htdocs/user/class/user.class.php | 6 +- htdocs/user/group/{fiche.php => card.php} | 4 +- htdocs/user/group/index.php | 2 +- htdocs/user/home.php | 6 +- htdocs/user/index.php | 2 +- scripts/emailings/mailing-send.php | 4 +- test/selenium/test_thirdparty.xml | 2 +- 234 files changed, 665 insertions(+), 664 deletions(-) rename htdocs/adherents/{fiche.php => card.php} (96%) rename htdocs/bookmarks/{fiche.php => card.php} (98%) rename htdocs/boutique/client/{fiche.php => card.php} (93%) rename htdocs/boutique/commande/{fiche.php => card.php} (85%) rename htdocs/boutique/critiques/{fiche.php => card.php} (97%) rename htdocs/categories/{fiche.php => card.php} (99%) rename htdocs/comm/action/{fiche.php => card.php} (98%) rename htdocs/comm/{fiche.php => card.php} (95%) rename htdocs/comm/mailing/{fiche.php => card.php} (97%) rename htdocs/commande/{fiche.php => card.php} (99%) rename htdocs/compta/bank/{fiche.php => card.php} (99%) rename htdocs/compta/deplacement/{fiche.php => card.php} (99%) rename htdocs/compta/dons/{fiche.php => card.php} (96%) rename htdocs/compta/localtax/{fiche.php => card.php} (95%) rename htdocs/compta/paiement/{fiche.php => card.php} (98%) rename htdocs/compta/paiement/cheque/{fiche.php => card.php} (99%) rename htdocs/compta/payment_sc/{fiche.php => card.php} (89%) rename htdocs/compta/prelevement/{fiche.php => card.php} (88%) rename htdocs/compta/salaries/{fiche.php => card.php} (97%) rename htdocs/compta/tva/{fiche.php => card.php} (96%) rename htdocs/compta/ventilation/{fiche.php => card.php} (96%) rename htdocs/compta/ventilation/fournisseur/{fiche.php => card.php} (96%) rename htdocs/contact/{fiche.php => card.php} (98%) rename htdocs/contrat/{fiche.php => card.php} (99%) rename htdocs/expedition/{fiche.php => card.php} (99%) rename htdocs/fichinter/{fiche.php => card.php} (98%) rename htdocs/fourn/{fiche.php => card.php} (96%) rename htdocs/fourn/commande/{fiche.php => card.php} (99%) rename htdocs/fourn/facture/{fiche.php => card.php} (99%) rename htdocs/fourn/paiement/{fiche.php => card.php} (95%) rename htdocs/holiday/{fiche.php => card.php} (89%) rename htdocs/livraison/{fiche.php => card.php} (94%) rename htdocs/product/{fiche.php => card.php} (99%) rename htdocs/product/composition/{fiche.php => card.php} (98%) rename htdocs/product/stats/{fiche.php => card.php} (99%) rename htdocs/product/stock/{fiche.php => card.php} (97%) rename htdocs/projet/{fiche.php => card.php} (96%) rename htdocs/societe/notify/{fiche.php => card.php} (98%) rename htdocs/user/{fiche.php => card.php} (98%) rename htdocs/user/group/{fiche.php => card.php} (98%) diff --git a/ChangeLog b/ChangeLog index f3287e51215..2c0a5353f60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,7 +112,8 @@ For developers: - Qual: Renamed table llx_c_civilite into llx_c_civility, field civilite into label in the same table, and field civilite into civility in other table -- Qual: Renamed all files & links "liste.php" into "list.php" +- Qual: Renamed all files & links "liste.php" into "list.php" +- Qual: Renamed all files & links "fiche.php" into "card.php" WARNING: Following changes may create regression for some external modules, but was necessary to make Dolibarr better: diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 84f548344b8..7cb53a99a83 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -176,9 +176,9 @@ if ($result) { print ' '; print ''; - // print ''; + // print ''; - // print ''; + // print ''; print ''; diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 5d19cad1ffb..501b5ed87d1 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -139,7 +139,7 @@ if ($object->id > 0) if (! empty($conf->agenda->enabled)) { - print '
'.$langs->trans("AddAction").'
'; + print '
'.$langs->trans("AddAction").'
'; } print ''; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/card.php similarity index 96% rename from htdocs/adherents/fiche.php rename to htdocs/adherents/card.php index 069bbe0669e..3b1f61df5b5 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/card.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/adherents/fiche.php + * \file htdocs/adherents/card.php * \ingroup member * \brief Page of member */ @@ -1284,13 +1284,13 @@ else if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP)) { $formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>''); } - print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1); + print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1); } // Confirm send card by mail if ($action == 'sendinfo') { - print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1); + print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1); } // Confirm resiliate @@ -1321,7 +1321,7 @@ else $formquestion=array(); if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false')); if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])); - print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion); + print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion); } // Confirm remove member @@ -1329,7 +1329,7 @@ else { $formquestion=array(); if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])); - print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1); + print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1); } /* @@ -1337,7 +1337,7 @@ else */ if ($action == 'add_spip') { - print $form->formconfirm("fiche.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip'); + print $form->formconfirm("card.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip'); } /* @@ -1345,7 +1345,7 @@ else */ if ($action == 'del_spip') { - print $form->formconfirm("fiche.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip'); + print $form->formconfirm("card.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip'); } $rowspan=17; @@ -1543,7 +1543,7 @@ else // Modify if ($user->rights->adherent->creer) { - print '
'.$langs->trans("Modify")."
"; + print '
'.$langs->trans("Modify")."
"; } else { @@ -1555,7 +1555,7 @@ else { if ($user->rights->adherent->creer) { - print '
'.$langs->trans("Validate")."
\n"; + print '
'.$langs->trans("Validate")."
\n"; } else { @@ -1568,7 +1568,7 @@ else { if ($user->rights->adherent->creer) { - print '
'.$langs->trans("Reenable")."
\n"; + print '
'.$langs->trans("Reenable")."
\n"; } else { @@ -1581,7 +1581,7 @@ else { if ($object->statut >= 1) { - if ($object->email) print '
'.$langs->trans("SendCardByMail")."
\n"; + if ($object->email) print '
'.$langs->trans("SendCardByMail")."
\n"; else print '
'.$langs->trans("SendCardByMail")."
\n"; } else @@ -1599,7 +1599,7 @@ else { if ($user->rights->adherent->supprimer) { - print '
'.$langs->trans("Resiliate")."
\n"; + print '
'.$langs->trans("Resiliate")."
\n"; } else { @@ -1638,7 +1638,7 @@ else // Delete if ($user->rights->adherent->supprimer) { - print '
'.$langs->trans("Delete")."
\n"; + print '
'.$langs->trans("Delete")."
\n"; } else { @@ -1652,11 +1652,11 @@ else if ($isinspip == 1) { - print '
'.$langs->trans("DeleteIntoSpip")."
\n"; + print '
'.$langs->trans("DeleteIntoSpip")."
\n"; } if ($isinspip == 0) { - print '
'.$langs->trans("AddIntoSpip")."
\n"; + print '
'.$langs->trans("AddIntoSpip")."
\n"; } } diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 3000974a389..eade23f7a3a 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -299,7 +299,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ $insertid=$acct->addline($dateop, $operation, $label, $cotisation, $num_chq, '', $user, $emetteur_nom, $emetteur_banque); if ($insertid > 0) { - $inserturlid=$acct->add_url_line($insertid, $object->id, DOL_URL_ROOT.'/adherents/fiche.php?rowid=', $object->getFullname($langs), 'member'); + $inserturlid=$acct->add_url_line($insertid, $object->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $object->getFullname($langs), 'member'); if ($inserturlid > 0) { // Met a jour la table cotisation diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 2de6a6e159e..bd43ed134af 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1558,7 +1558,7 @@ class Adherent extends CommonObject if ($option == 'card') { - $lien = ''; + $lien = ''; $lienfin=''; } if ($option == 'subscription') diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 0cd2b215086..887bac4e1e7 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -294,7 +294,7 @@ if ($resql) print "\n"; // Lastname - print ""; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index ec7aa7383c8..d9b04e3c506 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -353,7 +353,7 @@ if ($rowid > 0) } // Add - print '
'.$langs->trans("AddMember").'
'; + print '
'.$langs->trans("AddMember").'
'; // Delete if ($user->rights->adherent->configurer) @@ -526,11 +526,11 @@ if ($rowid > 0) print ''; if ($objp->societe != '') { - print ''."\n"; + print ''."\n"; } else { - print ''."\n"; + print ''."\n"; } // Login @@ -588,12 +588,12 @@ if ($rowid > 0) print '"; diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index e59ae0af845..a9d2d7eb6c0 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -52,7 +52,7 @@ function printBookmarksList($aDb, $aLangs) $ret.= ''; $lieninterne=0; @@ -178,7 +178,7 @@ if ($resql) print '"; - print '\n"; diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index b22c478f320..dae59eb50cb 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -71,8 +71,8 @@ if ($resql) $objp = $dbosc->fetch_object($resql); $var=!$var; print ""; - print '\n"; - print '\n"; + print '\n"; + print '\n"; print "\n"; print "\n"; print "\n"; diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/card.php similarity index 85% rename from htdocs/boutique/commande/fiche.php rename to htdocs/boutique/commande/card.php index 1e2e90dd41c..f6719bb40bb 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/card.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/boutique/commande/fiche.php + * \file htdocs/boutique/commande/card.php * \ingroup boutique * \brief Page fiche commande OSCommerce */ @@ -49,7 +49,7 @@ if ($id > 0) print '
'; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index dad3c5cb5e0..e6a251a2d78 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -148,7 +148,7 @@ else if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) { $statstring2 = "
'.$langs->trans("Suppliers").''.round($third['supplier']).''.$langs->trans("Suppliers").''.round($third['supplier']).'
'.$objp->ref.''.$objp->ref.''.$objp->ref_supplier.''.$objp->ref_supplier.'' . dol_trunc($objp->product_label, 24) . 'rowid\">"; + print "rowid\">"; print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : ''); print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : ''); print (! empty($companyname) ? dol_trunc($companyname, 32) : ''); @@ -348,16 +348,16 @@ if ($resql) print ''; if ($user->rights->adherent->creer) { - print "rowid."&action=edit&backtopage=1\">".img_edit().""; + print "rowid."&action=edit&backtopage=1\">".img_edit().""; } print ' '; if ($user->rights->adherent->supprimer && $objp->statut == -1) { - print "rowid."&action=delete&backtopage=1\">".img_picto($langs->trans("Delete"),'disable.png').""; + print "rowid."&action=delete&backtopage=1\">".img_picto($langs->trans("Delete"),'disable.png').""; } if ($user->rights->adherent->supprimer && $objp->statut == 1) { - print "rowid."&action=resign&backtopage=1\">".img_picto($langs->trans("Resiliate"),'disable.png').""; + print "rowid."&action=resign&backtopage=1\">".img_picto($langs->trans("Resiliate"),'disable.png').""; } print "
'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).''.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).''.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,32).''.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,32).''; if ($user->rights->adherent->creer) { - print ''.img_edit().''; + print ''.img_edit().''; } print ' '; if ($user->rights->adherent->supprimer) { - print ''.img_picto($langs->trans("Resiliate"),'disable.png').''; + print ''.img_picto($langs->trans("Resiliate"),'disable.png').''; } print "'; if ($user->rights->bookmark->creer) { - $ret.= ''; + $ret.= ''; //$ret.=img_picto($langs->trans('AddThisPageToBookmarks'),'edit_add').' '; $ret.=img_object($langs->trans('AddThisPageToBookmarks'),'bookmark'); $ret.= ''; diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/card.php similarity index 98% rename from htdocs/bookmarks/fiche.php rename to htdocs/bookmarks/card.php index 18698d3a3b7..640e7e72c57 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/card.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/bookmarks/fiche.php + * \file htdocs/bookmarks/card.php * \brief Page display/creation of bookmarks * \ingroup bookmark */ @@ -205,7 +205,7 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) print ''; print ''; print ''; - print ''; + print ''; print ''; } diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 7d0c326f894..61dc0a91d7e 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -112,7 +112,7 @@ if ($resql) // Id print ''; - print "bid."\">".img_object($langs->trans("ShowBookmark"),"bookmark").' '.$obj->bid.""; + print "bid."\">".img_object($langs->trans("ShowBookmark"),"bookmark").' '.$obj->bid.""; print ''; if ($user->rights->bookmark->creer) { - print "bid."&backtopage=".urlencode($_SERVER["PHP_SELF"])."\">".img_edit()." "; + print "bid."&backtopage=".urlencode($_SERVER["PHP_SELF"])."\">".img_edit()." "; } if ($user->rights->bookmark->supprimer) { @@ -206,7 +206,7 @@ print "
\n"; if ($user->rights->bookmark->creer) { - print ''.$langs->trans("NewBookmark").''; + print ''.$langs->trans("NewBookmark").''; } print '
'; diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/card.php similarity index 93% rename from htdocs/boutique/client/fiche.php rename to htdocs/boutique/client/card.php index 895eea66e79..4944911f408 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/card.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/boutique/client/fiche.php + * \file htdocs/boutique/client/card.php * \ingroup boutique * \brief Page fiche client OSCommerce */ @@ -82,7 +82,7 @@ if ($id > 0) $var=!$var; print "
Fiche '; + print 'Fiche '; print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour')."\n"; print $objp->total . "
'.$objp->customers_firstname."'.$objp->customers_lastname."'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter
'; print ''; - print ''; + print ''; print ''; @@ -88,14 +88,14 @@ if ($id > 0) $var=!$var; print ""; print '"; - print '\n"; - print "\n"; - print "\n"; + print '\n"; + print "\n"; + print "\n"; print "\n"; $i++; diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index cc683994565..0ce6b7b3655 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -71,10 +71,10 @@ if ($resql) $var=!$var; print ""; - print ''; - print '\n"; + print '\n"; print ''; print "\n"; $i++; diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index 1b7b9ff0669..dd3cda24d96 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -75,7 +75,7 @@ if ($resql) $objp = $dbosc->fetch_object($resql); $var=!$var; print ""; - print ''; + print ''; print '\n"; print '\n"; print '\n"; diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/card.php similarity index 97% rename from htdocs/boutique/critiques/fiche.php rename to htdocs/boutique/critiques/card.php index a5ea716ed8c..1c75faebbee 100644 --- a/htdocs/boutique/critiques/fiche.php +++ b/htdocs/boutique/critiques/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/boutique/critiques/fiche.php + * \file htdocs/boutique/critiques/card.php * \ingroup boutique * \brief Page fiche critique OS Commerce */ diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index 98294d5d09c..35e536ed66e 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -72,7 +72,7 @@ if ($resql) { $var=!$var; print ""; print "\n"; - print '\n"; + print '\n"; print "\n"; print "\n"; $i++; diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index f94c08018d8..6799af10708 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -71,8 +71,8 @@ if ($resql) $objp = $dbosc->fetch_object($resql); $var=!$var; print ""; - print "\n"; - print '"; + print "\n"; + print '"; print "\n"; $i++; } diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index 6b4b82b60f5..ad04d7d61b0 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -73,7 +73,7 @@ if ($resql) $var=!$var; print ""; - print '"; + print '"; print ''; print ''; diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index 13ad3463af9..2574b7cb7f4 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -68,8 +68,8 @@ if ($resql) $objp = $dbosc->fetch_object($resql); $var=!$var; print ""; - print '\n"; - print '\n"; + print '\n"; + print '\n"; print "\n"; print "\n"; print "\n"; diff --git a/htdocs/categories/fiche.php b/htdocs/categories/card.php similarity index 99% rename from htdocs/categories/fiche.php rename to htdocs/categories/card.php index 9a41d1b389a..3b5fa5d3189 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/categories/fiche.php + * \file htdocs/categories/card.php * \ingroup category * \brief Page to create a new category */ diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index f760cd736f0..9ff2ce11871 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -642,7 +642,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) if ($user->rights->categorie->creer) { print ''; } @@ -749,7 +749,7 @@ if ($id > 0) // Confirmation suppression action if ($action == 'delete') { - print $form->formconfirm("fiche.php?id=".$id,$langs->trans("DeleteAction"),$langs->trans("ConfirmDeleteAction"),"confirm_delete",'','',1); + print $form->formconfirm("card.php?id=".$id,$langs->trans("DeleteAction"),$langs->trans("ConfirmDeleteAction"),"confirm_delete",'','',1); } if ($action == 'edit') @@ -884,7 +884,7 @@ if ($id > 0) $numprojet=$formproject->select_projects($object->societe->id,$object->fk_project,'projectid'); if ($numprojet==0) { - print '   '.$langs->trans("AddProject").''; + print '   '.$langs->trans("AddProject").''; } print ''; } @@ -1139,7 +1139,7 @@ if ($id > 0) if ($user->rights->agenda->allactions->create || (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->create)) { - print '
'.$langs->trans("Modify").'
'; + print '
'.$langs->trans("Modify").'
'; } else { @@ -1149,7 +1149,7 @@ if ($id > 0) if ($user->rights->agenda->allactions->delete || (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->delete)) { - print '
'.$langs->trans("Delete").'
'; + print '
'.$langs->trans("Delete").'
'; } else { diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 393082f3427..8bf2a1036bf 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -760,7 +760,7 @@ class ActionComm extends CommonObject $result=''; if ($option=='birthday') $lien = ''; - else $lien = ''; + else $lien = ''; $lienfin=''; $label=$this->label; if (empty($label)) $label=$this->libelle; // Fro backward compatibility @@ -952,7 +952,7 @@ class ActionComm extends CommonObject $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current - $url=$urlwithroot.'/comm/action/fiche.php?id='.$obj->id; + $url=$urlwithroot.'/comm/action/card.php?id='.$obj->id; $event['url']=$url; $event['created']=$this->db->jdate($obj->datec)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600)); $event['modified']=$this->db->jdate($obj->datem)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600)); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 2318c45f132..44d1e209694 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1104,7 +1104,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa //$param='month='.$monthshown.'&year='.$year; $hourminsec='100000'; - print ''; + print ''; print img_picto($langs->trans("NewAction"),'edit_add.png'); print ''; } diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 8bcd1c7289b..abd8b71a699 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -656,7 +656,7 @@ jQuery(document).ready(function() { if (ids == \'none\') /* No event */ { /* alert(\'no event\'); */ - url = "'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&affectedto="+userid+"&datep="+year+month+day+hour+min+"00&backtopage='.urlencode($_SERVER["PHP_SELF"].'?year='.$year.'&month='.$month.'&day='.$day).'" + url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=create&affectedto="+userid+"&datep="+year+month+day+hour+min+"00&backtopage='.urlencode($_SERVER["PHP_SELF"].'?year='.$year.'&month='.$month.'&day='.$day).'" window.location.href = url; } else if (ids.indexOf(",") > -1) /* There is several events */ @@ -668,7 +668,7 @@ jQuery(document).ready(function() { else /* One event */ { /* alert(\'one event\'); */ - url = "'.DOL_URL_ROOT.'/comm/action/fiche.php?action=view&id="+ids + url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=view&id="+ids window.location.href = url; } }); diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 289c2acb7ef..0ffcb351500 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -95,7 +95,7 @@ if ($action == 'add' || $action == 'update') } elseif ($origin == 'shipment') { - header("Location: ../expedition/fiche.php?id=".$originid); + header("Location: ../expedition/card.php?id=".$originid); exit; } else @@ -135,7 +135,7 @@ if ($action == 'add' || $action == 'update') } elseif ($origin == 'shipment') { - header("Location: ../expedition/fiche.php?id=".$originid); + header("Location: ../expedition/card.php?id=".$originid); exit; } else diff --git a/htdocs/comm/fiche.php b/htdocs/comm/card.php similarity index 95% rename from htdocs/comm/fiche.php rename to htdocs/comm/card.php index 9aaadc70eea..c3f28a36ed6 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/card.php @@ -23,7 +23,7 @@ */ /** - * \file htdocs/comm/fiche.php + * \file htdocs/comm/card.php * \ingroup commercial compta * \brief Page to show customer card of a third party */ @@ -439,11 +439,11 @@ if ($id > 0) // Status print ''; print ''; } @@ -606,7 +606,7 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print '\n"; print ''; print ''; @@ -719,7 +719,7 @@ if ($id > 0) $fichinter_static->statut=$objp->fk_statut; print ""; - print ''."\n"; + print ''."\n"; //print ''."\n"; print ''."\n"; print ''."\n"; @@ -835,19 +835,19 @@ if ($id > 0) if (! empty($conf->commande->enabled) && $user->rights->commande->creer) { $langs->load("orders"); - print '
'.$langs->trans("AddOrder").'
'; + print '
'.$langs->trans("AddOrder").'
'; } if ($user->rights->contrat->creer) { $langs->load("contracts"); - print '
'.$langs->trans("AddContract").'
'; + print '
'.$langs->trans("AddContract").'
'; } if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) { $langs->load("fichinter"); - print '
'.$langs->trans("AddIntervention").'
'; + print '
'.$langs->trans("AddIntervention").'
'; } // Add invoice @@ -856,7 +856,7 @@ if ($id > 0) if (! empty($conf->deplacement->enabled)) { $langs->load("trips"); - print '
'.$langs->trans("AddTrip").'
'; + print '
'.$langs->trans("AddTrip").'
'; } if (! empty($conf->facture->enabled)) @@ -888,7 +888,7 @@ if ($id > 0) { if ($user->rights->agenda->myactions->create) { - print '
'.$langs->trans("AddAction").'
'; + print '
'.$langs->trans("AddAction").'
'; } else { diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 279044ccf25..d4652b57353 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -59,12 +59,12 @@ llxHeader('','Contacts'); if ($type == "c" || $type == "p") { $label = $langs->trans("Customers"); - $urlfiche="fiche.php"; + $urlfiche="card.php"; } if ($type == "f") { $label = $langs->trans("Suppliers"); - $urlfiche="fiche.php"; + $urlfiche="card.php"; } /* @@ -154,8 +154,8 @@ if ($resql) $var=!$var; print ""; - print ''; + print ''; print ""; print ''; + print ''; print '"; + print ""; print '"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''; diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/card.php similarity index 97% rename from htdocs/comm/mailing/fiche.php rename to htdocs/comm/mailing/card.php index 803ea4f81d8..441e51ef293 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/comm/mailing/fiche.php + * \file htdocs/comm/mailing/card.php * \ingroup mailing * \brief Fiche mailing, onglet general */ @@ -174,7 +174,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id; - dol_syslog("fiche.php: select targets", LOG_DEBUG); + dol_syslog("card.php: select targets", LOG_DEBUG); $resql=$db->query($sql); if ($resql) { @@ -182,7 +182,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') if ($num) { - dol_syslog("comm/mailing/fiche.php: nb of targets = ".$num, LOG_DEBUG); + dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG); $now=dol_now(); @@ -280,7 +280,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') // Mail successful $nbok++; - dol_syslog("comm/mailing/fiche.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG); + dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG); $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles"; $sql.=" SET statut=1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid; @@ -296,7 +296,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') { //Update status communication of thirdparty prospect $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")"; - dol_syslog("fiche.php: set prospect thirdparty status", LOG_DEBUG); + dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG); $resql2=$db->query($sql); if (! $resql2) { @@ -305,7 +305,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') //Update status communication of contact prospect $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)"; - dol_syslog("fiche.php: set prospect contact status", LOG_DEBUG); + dol_syslog("card.php: set prospect contact status", LOG_DEBUG); $resql2=$db->query($sql); if (! $resql2) @@ -323,7 +323,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') // Mail failed $nbko++; - dol_syslog("comm/mailing/fiche.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING); + dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING); $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles"; $sql.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid; @@ -364,7 +364,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') } $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id; - dol_syslog("comm/mailing/fiche.php: update global status", LOG_DEBUG); + dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG); $resql2=$db->query($sql); if (! $resql2) { @@ -858,7 +858,7 @@ else print ''.$langs->trans("EditMailing").''; } - //print ''.$langs->trans("PreviewMailing").''; + //print ''.$langs->trans("PreviewMailing").''; if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send) { @@ -1066,7 +1066,7 @@ else print ""; print "\n"; - print ''."\n"; + print ''."\n"; print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index a657423f095..5c6ae896e42 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -176,7 +176,7 @@ if ($result) $var=!$var; print ""; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index 15fd830987c..ef2e2c48bf8 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -136,7 +136,7 @@ if ($result) $var=!$var; print ""; - print ''; print ''; // Date creation diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 9c5ffd03234..71470fd8665 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1460,7 +1460,7 @@ if ($action == 'create') $numprojet = $formproject->select_projects($soc->id, $projectid); if ($numprojet == 0) { $langs->load("projects"); - print '   ' . $langs->trans("AddProject") . ''; + print '   ' . $langs->trans("AddProject") . ''; } print ''; print ''; @@ -1961,7 +1961,7 @@ if ($action == 'create') print ''; @@ -2201,7 +2201,7 @@ if ($action == 'create') // else on // page. { - print '' . $langs->trans("AddAction") . ''; + print '' . $langs->trans("AddAction") . ''; } // Edit if ($object->statut == 1 && $user->rights->propal->creer) { @@ -2225,7 +2225,7 @@ if ($action == 'create') // Create an order if (! empty($conf->commande->enabled) && $object->statut == 2) { if ($user->rights->commande->creer) { - print '
' . $langs->trans("AddOrder") . '
'; + print '
' . $langs->trans("AddOrder") . '
'; } } @@ -2234,7 +2234,7 @@ if ($action == 'create') $langs->load("contracts"); if ($user->rights->contrat->creer) { - print '
' . $langs->trans('AddContract') . '
'; + print '
' . $langs->trans('AddContract') . '
'; } } diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index facf34a78da..8c7f38ed607 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -433,7 +433,7 @@ if (! empty($conf->propal->enabled)) print ''; - print ''; + print ''; print ''; @@ -505,7 +505,7 @@ if (! empty($conf->propal->enabled)) print ''; - print ''; + print ''; print ''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index ba0a49f2772..4b43eadeebf 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -370,7 +370,7 @@ if ($result) print $objp->ref_client; print ''; - $url = DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->rowid; + $url = DOL_URL_ROOT.'/comm/card.php?socid='.$objp->rowid; // Company $companystatic->id=$objp->rowid; diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index d4b47283bf3..6e138c1153c 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -242,7 +242,7 @@ if ($resql) if ($num == 1 && $socname) { $obj = $db->fetch_object($resql); - header("Location: fiche.php?socid=".$obj->rowid); + header("Location: card.php?socid=".$obj->rowid); exit; } else diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 544ef619720..fe3e39d266d 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -184,7 +184,7 @@ if ($socid > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; $i++; } diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 905f73e3c9b..79f952fe7fd 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -367,7 +367,7 @@ if ($socid > 0) print ''; print ''; print ''; if ($user->rights->societe->creer || $user->rights->facture->creer) { @@ -524,7 +524,7 @@ if ($socid > 0) print ''; print ''; print ''; print ''; print ''; diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 97671510bfd..1257769b954 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -167,7 +167,7 @@ if ($id > 0 || ! empty($ref)) // Client print ""; print ''; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/card.php similarity index 99% rename from htdocs/commande/fiche.php rename to htdocs/commande/card.php index e54844ac938..2a3188e19bc 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/card.php @@ -26,7 +26,7 @@ */ /** - * \file htdocs/commande/fiche.php + * \file htdocs/commande/card.php * \ingroup commande * \brief Page to show customer order */ @@ -1553,7 +1553,7 @@ if ($action == 'create' && $user->rights->commande->creer) { print ''; } @@ -2296,14 +2296,14 @@ if ($action == 'create' && $user->rights->commande->creer) { } // Edit if ($object->statut == 1 && $user->rights->commande->creer) { - print '
' . $langs->trans('Modify') . '
'; + print '
' . $langs->trans('Modify') . '
'; } // Create event if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) // Add hidden condition because this is not a // "workflow" action so should appears somewhere else on // page. { - print '' . $langs->trans("AddAction") . ''; + print '' . $langs->trans("AddAction") . ''; } // Send if ($object->statut > 0) { @@ -2338,7 +2338,7 @@ if ($action == 'create' && $user->rights->commande->creer) { if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfServicesLines() > 0) { if ($user->rights->ficheinter->creer) { - print '
' . $langs->trans('AddIntervention') . '
'; + print '
' . $langs->trans('AddIntervention') . '
'; } else { print '
' . $langs->trans('AddIntervention') . '
'; } @@ -2355,7 +2355,7 @@ if ($action == 'create' && $user->rights->commande->creer) { $langs->load("contracts"); if ($user->rights->contrat->creer) { - print '
' . $langs->trans('AddContract') . '
'; + print '
' . $langs->trans('AddContract') . '
'; } } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index a12b6dc7256..f6e6238585d 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2699,7 +2699,7 @@ class Commande extends CommonOrder $result=''; if (! empty($conf->expedition->enabled) && ($option == 1 || $option == 2)) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id; - else $url = DOL_URL_ROOT.'/commande/fiche.php?id='.$this->id; + else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id; if ($short) return $url; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index c00d057ca33..705354d401b 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -194,8 +194,8 @@ if (! empty($conf->commande->enabled)) $obj = $db->fetch_object($resql); print ""; print '"; - print ''; + print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.""; + print ''; $i++; } } @@ -268,7 +268,7 @@ if ($resql) print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -337,7 +337,7 @@ if (! empty($conf->commande->enabled)) print ''; - print ''; + print ''; print ''; @@ -408,7 +408,7 @@ if (! empty($conf->commande->enabled)) print ''; - print ''; + print ''; print ''; diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index d2fe19c5b6f..c47aefe0958 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -48,7 +48,7 @@ foreach($linkedObjectBlock as $object) $var=!$var; ?> > + trans("ShowOrder"),"order").' '.$object->ref; ?>
Date'.$commande->date.'
Client'.$commande->client_name.'
Client'.$commande->client_name.'
Paiement'.$commande->payment_method.'
'; - print 'Fiche livre'; + print 'Fiche livre'; - print ''.$objp->products_name.''; + print ''.$objp->products_name.''; print "$objp->products_quantityrowid\">".price($objp->products_price)."rowid\">".price($objp->final_price)."$objp->products_quantityrowid\">".price($objp->products_price)."rowid\">".price($objp->final_price)."
Fiche '; + print 'Fiche '; print $objp->orders_id .""; print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour').''.$objp->customers_name."'.$objp->customers_name."'.price($objp->value).'
'.$objp->products_model.''.$objp->products_model.''.$objp->rat."'.$objp->products_quantity."'.$objp->products_status."
".substr($objp->products_name, 0, 30)."'.substr($objp->reviews_text, 0, 40)." ...'.substr($objp->reviews_text, 0, 40)." ...$objp->reviews_rating
rowid\">$objp->customers_firstname $objp->customers_lastname'.$objp->products_name."rowid\">$objp->customers_firstname $objp->customers_lastname'.$objp->products_name."
'.$objp->products_name."'.$objp->products_name."'.$objp->nb.'Voir les clients
'.$objp->customers_firstname."'.$objp->customers_lastname."'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter
'; - print 'id.'&type='.$typeid).'">'; + print 'id.'&type='.$typeid).'">'; print $langs->trans("CreateCat").' '; print img_picto($langs->trans("Create"),'filenew'); print ""; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 898d6626539..29ed8a5d6b8 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -212,7 +212,7 @@ else print "
".$langs->trans("SubCats").''; if ($user->rights->categorie->creer) { - print ""; + print ""; print img_picto($langs->trans("Create"),'filenew'); print ""; } diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/card.php similarity index 98% rename from htdocs/comm/action/fiche.php rename to htdocs/comm/action/card.php index 27be46bd9e1..426faf46297 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/card.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/comm/action/fiche.php + * \file htdocs/comm/action/card.php * \ingroup agenda * \brief Page for event card */ @@ -250,7 +250,7 @@ if ($action == 'add') } elseif($idaction) { - header("Location: ".DOL_URL_ROOT.'/comm/action/fiche.php?id='.$idaction); + header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction); } else { @@ -652,7 +652,7 @@ if ($action == 'create') $numproject=$formproject->select_projects((! empty($societe->id)?$societe->id:0),GETPOST("projectid")?GETPOST("projectid"):'','projectid'); if ($numproject==0) { - print '   '.$langs->trans("AddProject").''; + print '   '.$langs->trans("AddProject").''; } print '
'.$langs->trans("StatusProsp").''.$object->getLibProspCommStatut(4).''; - if ($object->stcomm_id != -1) print ''.img_action(0,-1).''; - if ($object->stcomm_id != 0) print ''.img_action(0,0).''; - if ($object->stcomm_id != 1) print ''.img_action(0,1).''; - if ($object->stcomm_id != 2) print ''.img_action(0,2).''; - if ($object->stcomm_id != 3) print ''.img_action(0,3).''; + if ($object->stcomm_id != -1) print ''.img_action(0,-1).''; + if ($object->stcomm_id != 0) print ''.img_action(0,0).''; + if ($object->stcomm_id != 1) print ''.img_action(0,1).''; + if ($object->stcomm_id != 2) print ''.img_action(0,2).''; + if ($object->stcomm_id != 3) print ''.img_action(0,3).''; print '
'.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."\n"; + print ''.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."\n"; print ''.dol_print_date($db->jdate($objp->dc),'day')."'.price($objp->total_ht).''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'
'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.''.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.''.dol_print_date($db->jdate($objp->startdate)).''.convertSecondToTime($objp->duration).''.$fichinter_static->getLibStatut(5).'
'.img_object($langs->trans("ShowContact"),"contact"); - print ' '.$obj->name.''.img_object($langs->trans("ShowContact"),"contact"); + print ' '.$obj->name.'$obj->firstname'.img_object($langs->trans("ShowCompany"),"company").' '; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 0e17380ea9e..22068860076 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -217,7 +217,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { $var=!$var; $obj = $db->fetch_object($resql); - print '
'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'
'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''; $companystatic->id=$obj->socid; $companystatic->name=$obj->name; @@ -417,7 +417,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO while ($i < $num) { $obj = $db->fetch_object($resql); - print "
contratid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."
contratid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."'; $companystatic->id=$objp->rowid; $companystatic->name=$objp->name; @@ -497,7 +497,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print "'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).''; print dol_print_date($db->jdate($obj->dp),'day').''.price($obj->total_ttc).'
'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.''.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.''.dol_trunc($obj->titre,38).''.dol_print_date($db->jdate($obj->date_creat),'day').''.($obj->nbemail?$obj->nbemail:"0").'
'; + print ''; print img_object($langs->trans("ShowEMail"),"email").' '.stripslashes($obj->rowid).''.$obj->titre.'
'; $proj = new Project($db); $proj->fetch($object->fk_project); - print ''; + print ''; print $proj->ref; print ''; print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''.dol_print_date($db->jdate($obj->dc),"dayhour").''.price2num($obj->remise_percent).'%'.$obj->note.''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'
'.price2num($obj->tva_tx,'MU').'%'.price($obj->amount_ttc).''; - print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; + print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; print ''.price2num($obj->tva_tx,'MU').'%'.price($obj->amount_ttc).''; - print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; + print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; print ' 
".$langs->trans("Customer")."'; - print ''.$soc->nom.''; + print ''.$soc->nom.''; print '
' . $langs->trans('Project') . ''; $numprojet = $formproject->select_projects($soc->id, $projectid); if ($numprojet == 0) { - print '   ' . $langs->trans("AddProject") . ''; + print '   ' . $langs->trans("AddProject") . ''; } print '
'; - print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.dol_print_date($db->jdate($obj->datem),'day').''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'
- trans("ShowOrder"),"order").' '.$object->ref; ?> date,'day'); ?> rights->commande->lire) { diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 0adf68ca741..14b586c6d80 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -589,7 +589,7 @@ if ($id > 0 || ! empty($ref)) } elseif ($links[$key]['type']=='payment_sc') { - print ''; + print ''; print ' '.img_object($langs->trans('ShowPayment'),'payment').' '; //print $langs->trans("SocialContributionPayment"); print ''; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/card.php similarity index 99% rename from htdocs/compta/bank/fiche.php rename to htdocs/compta/bank/card.php index c118186df27..e511a163c79 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/compta/bank/fiche.php + * \file htdocs/compta/bank/card.php * \ingroup banque * \brief Page to create/view a bank account */ diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 4ca6175d785..96ab643623b 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -882,7 +882,7 @@ class Account extends CommonObject if (empty($mode)) { - $lien = ''; + $lien = ''; $lienfin=''; } else if ($mode == 'transactions') diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index fdac94091eb..921b1739767 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -250,7 +250,7 @@ print "
"; print '
'."\n"; if ($user->rights->banque->configurer) { - print ''.$langs->trans("NewFinancialAccount").''; + print ''.$langs->trans("NewFinancialAccount").''; } print '
'; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 89fd5727dc7..2be5d4336d6 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -304,13 +304,13 @@ if ($result) { if ($key) print '
'; if ($links[$key]['type']=='payment') { - print ''; + print ''; print img_object($langs->trans('ShowPayment'),'payment').' '; print $langs->trans("Payment"); print ''; } else if ($links[$key]['type']=='payment_supplier') { - print ''; + print ''; print img_object($langs->trans('ShowPayment'),'payment').' '; print $langs->trans("Payment"); print ''; @@ -328,25 +328,25 @@ if ($result) print ''; } else if ($links[$key]['type']=='payment_sc') { - print ''; + print ''; print img_object($langs->trans('ShowPayment'),'payment').' '; print $langs->trans("SocialContributionPayment"); print ''; } else if ($links[$key]['type']=='payment_vat') { - print ''; + print ''; print img_object($langs->trans('ShowVAT'),'payment').' '; print $langs->trans("VATPayment"); print ''; } else if ($links[$key]['type']=='payment_salary') { - print ''; + print ''; print img_object($langs->trans('ShowPaymentSalary'),'payment').' '; print $langs->trans("SalaryPayment"); print ''; } else if ($links[$key]['type']=='member') { - print ''; + print ''; print img_object($langs->trans('ShowMember'),'user').' '; print $links[$key]['label']; print ''; diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 37c27afc0b6..c926c0414f6 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -325,7 +325,7 @@ if ($resql) else if ($links[$key]['type']=='payment_sc') { // We don't show anything because there is 1 payment for 1 social contribution and we already show link to social contribution - /*print ''; + /*print ''; print img_object($langs->trans('ShowPayment'),'payment').' '; print $langs->trans("SocialContributionPayment"); print '';*/ @@ -345,7 +345,7 @@ if ($resql) print ''; } else if ($links[$key]['type']=='member') { - print ''; + print ''; print img_object($langs->trans('ShowMember'),'user').' '; print $links[$key]['label']; print ''; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 172140c2c64..e4afe6f2b25 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -349,7 +349,7 @@ else } elseif ($links[$key]['type']=='payment_sc') { - print ''; + print ''; print ' '.img_object($langs->trans('ShowPayment'),'payment').' '; print $langs->trans("SocialContributionPayment"); print ''; @@ -398,7 +398,7 @@ else $newline=0; } elseif ($links[$key]['type']=='member') { - print ''; + print ''; print img_object($langs->trans('ShowMember'),'user').' '; print $links[$key]['label']; print ''; diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/card.php similarity index 99% rename from htdocs/compta/deplacement/fiche.php rename to htdocs/compta/deplacement/card.php index b6bb980c462..80d1858d167 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/compta/deplacement/fiche.php + * \file htdocs/compta/deplacement/card.php * \brief Page to show a trip card */ diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 4d24aac9a83..d4402b03a55 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -355,7 +355,7 @@ class Deplacement extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='trip'; diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 89df2428ca9..bc4406448df 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -134,7 +134,7 @@ if ($resql) $var=!$var; print '
'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.''.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.''.$langs->trans($obj->type).'
'; @@ -352,7 +352,7 @@ if (! empty($id) && $action == 'edit') dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic'); - print ''; + print ''; print ''; print '
'; @@ -455,7 +455,7 @@ if (! empty($id) && $action != 'edit') dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic'); - print ""; + print ""; print ''; print '
'; @@ -529,16 +529,16 @@ if (! empty($id) && $action != 'edit') */ print '
'; - print '
'.$langs->trans('Modify').'
'; + print '
'.$langs->trans('Modify').'
'; if ($don->statut == 0) { - print '
'.$langs->trans("ValidPromess").'
'; + print '
'.$langs->trans("ValidPromess").'
'; } if (($don->statut == 0 || $don->statut == 1) && $resteapayer == 0 && $don->paye == 0) { - print '
'.$langs->trans("ClassifyCanceled")."
"; + print '
'.$langs->trans("ClassifyCanceled")."
"; } // TODO Gerer action emettre paiement @@ -549,12 +549,12 @@ if (! empty($id) && $action != 'edit') if ($don->statut == 1 && $resteapayer == 0 && $don->paye == 0) { - print '
'.$langs->trans("ClassifyPaid")."
"; + print '
'.$langs->trans("ClassifyPaid")."
"; } if ($user->rights->don->supprimer) { - print '
'.$langs->trans("Delete")."
"; + print '
'.$langs->trans("Delete")."
"; } else { diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 993eda5a0f7..ab33bdbb43d 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -711,7 +711,7 @@ class Don extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='generic'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 7bd05f9f806..3c73a6610e5 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2976,7 +2976,7 @@ if ($action == 'create') $objp = $db->fetch_object($result); $var = ! $var; print '
'; $label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label; print ''; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 856640e306e..ee197e9cee3 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -375,7 +375,7 @@ if ($id > 0 || ! empty($ref)) { $project = New Project($db); $project->fetch($object->fk_project); - print ''.$project->title.''; + print ''.$project->title.''; } else { diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index d86b2148715..4bfa4d81048 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -507,7 +507,7 @@ if ($object->id > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print '\n"; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index b6d54787f7f..eecf5e75746 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -916,7 +916,7 @@ if ($resql) $var=!$var; print ""; - print ""; + print ""; $i++; } $db->free($resql); diff --git a/htdocs/compta/localtax/fiche.php b/htdocs/compta/localtax/card.php similarity index 95% rename from htdocs/compta/localtax/fiche.php rename to htdocs/compta/localtax/card.php index ec40eba55b9..1b16064ed9e 100644 --- a/htdocs/compta/localtax/fiche.php +++ b/htdocs/compta/localtax/card.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/compta/localtax/fiche.php + * \file htdocs/compta/localtax/card.php * \ingroup tax * \brief Page of IRPF payments */ @@ -149,7 +149,7 @@ if ($id) if ($_GET["action"] == 'create') { - print "\n"; + print "\n"; print ''; print ''; print ''; @@ -208,7 +208,7 @@ if ($id) if ($mesg) print $mesg; $h = 0; - $head[$h][0] = DOL_URL_ROOT.'/compta/localtax/fiche.php?id='.$vatpayment->id; + $head[$h][0] = DOL_URL_ROOT.'/compta/localtax/card.php?id='.$vatpayment->id; $head[$h][1] = $langs->trans('Card'); $head[$h][2] = 'card'; $h++; @@ -259,7 +259,7 @@ if ($id) */ print "
\n"; if ($vatpayment->rappro == 0) - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; else print ''.$langs->trans("Delete").''; print "
"; diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 749da49a7d0..4174d693da3 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -516,7 +516,7 @@ class Localtax extends CommonObject } // Mise a jour liens - $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/fiche.php?id=', "(VATPayment)", "payment_vat"); + $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat"); if ($result < 0) { $this->error=$acc->error; @@ -586,7 +586,7 @@ class Localtax extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='payment'; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index ec3fdb23027..cabaf87e4d0 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -237,7 +237,7 @@ if ($action == 'confirm_paiement' && $confirm == 'yes') } } if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture.php?facid='.$invoiceid; - else $loc = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$paiement_id; + else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id; header('Location: '.$loc); exit; } diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 3d5fa3935de..1afdf0e2c80 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -96,7 +96,7 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print ''; + print ''; print '\n"; print "\n"; print ''; @@ -104,7 +104,7 @@ if ($resql) if ($objp->statut == 0) { - print ''.$langs->trans("PaymentStatusToValidShort").''; + print ''.$langs->trans("PaymentStatusToValidShort").''; } else { diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/card.php similarity index 98% rename from htdocs/compta/paiement/fiche.php rename to htdocs/compta/paiement/card.php index a589ea219e3..25dbaf92738 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/card.php @@ -20,10 +20,10 @@ */ /** - * \file htdocs/compta/paiement/fiche.php + * \file htdocs/compta/paiement/card.php * \ingroup facture * \brief Page of a customer payment - * \remarks Nearly same file than fournisseur/paiement/fiche.php + * \remarks Nearly same file than fournisseur/paiement/card.php */ require '../../main.inc.php'; diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/card.php similarity index 99% rename from htdocs/compta/paiement/cheque/fiche.php rename to htdocs/compta/paiement/cheque/card.php index 920a1328a62..0c5eeca3689 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/compta/paiement/cheque/fiche.php + * \file htdocs/compta/paiement/cheque/card.php * \ingroup bank, invoice * \brief Page for cheque deposits */ diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 39b8f209247..922ab54ac7c 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -770,7 +770,7 @@ class RemiseCheque extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"),'payment').$lienfin); diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 4e1d6190a4f..27f2cf3e2e7 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -77,7 +77,7 @@ if ($resql) print ""; print ''; print ''; print "
'; - print '' . img_object($langs->trans('ShowPayment'), 'payment') . ' '; + print '' . img_object($langs->trans('ShowPayment'), 'payment') . ' '; print dol_print_date($db->jdate($objp->dp), 'day') . '' . $label . ' ' . $objp->num_paiement . ''.$langs->trans("OrderWaiting").''.price($obj->amount).'-'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.' '; print ''; @@ -563,7 +563,7 @@ if ($object->id > 0) print $withdrawreceipt->getNomUrl(1); print "'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'  
".dol_print_date($obj->da,"day")."$obj->libelle $obj->label
$obj->libelle $obj->label
'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.''.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."$objp->paiement_type $objp->num_paiement'.price($objp->amount).'
'.$langs->trans("BankChecksToReceipt").''; - print ''.$num.''; + print ''.$num.''; print '
\n"; } diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 842050c61bc..cd6ba5c59a2 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -453,8 +453,8 @@ class Paiement extends CommonObject if ( ! $error) { $url=''; - if ($mode == 'payment') $url=DOL_URL_ROOT.'/compta/paiement/fiche.php?id='; - if ($mode == 'payment_supplier') $url=DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='; + if ($mode == 'payment') $url=DOL_URL_ROOT.'/compta/paiement/card.php?id='; + if ($mode == 'payment_supplier') $url=DOL_URL_ROOT.'/fourn/paiement/card.php?id='; if ($url) { $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); @@ -482,7 +482,7 @@ class Paiement extends CommonObject $result=$acc->add_url_line( $bank_line_id, $fac->thirdparty->id, - DOL_URL_ROOT.'/comm/fiche.php?socid=', + DOL_URL_ROOT.'/comm/card.php?socid=', $fac->thirdparty->nom, 'company' ); @@ -500,7 +500,7 @@ class Paiement extends CommonObject $result=$acc->add_url_line( $bank_line_id, $fac->thirdparty->id, - DOL_URL_ROOT.'/fourn/fiche.php?socid=', + DOL_URL_ROOT.'/fourn/card.php?socid=', $fac->thirdparty->nom, 'company' ); @@ -747,7 +747,7 @@ class Paiement extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index c96d1affbd6..46fa00df68c 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -218,7 +218,7 @@ if ($resql) if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { print '
'; - if ($objp->statut == 0) print ''; + if ($objp->statut == 0) print ''; print $paymentstatic->LibStatut($objp->statut,5); if ($objp->statut == 0) print ''; print ''.dol_print_date($db->jdate($obj->datec),'day')."
'; @@ -224,7 +224,7 @@ if ($id > 0) if (! empty($bon->date_trans) && $bon->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited') { - print ''; + print ''; print ''; print ''; print '
'; @@ -247,15 +247,15 @@ if ($id > 0) if (empty($bon->date_trans) && $user->rights->prelevement->bons->send) { - print "id."\">".$langs->trans("SetToStatusSent").""; + print "id."\">".$langs->trans("SetToStatusSent").""; } if (! empty($bon->date_trans) && $bon->date_credit == 0) { - print "id."\">".$langs->trans("ClassCredited").""; + print "id."\">".$langs->trans("ClassCredited").""; } - print "id."\">".$langs->trans("Delete").""; + print "id."\">".$langs->trans("Delete").""; print ""; } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 25065b24590..6a67ce5766b 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1118,12 +1118,12 @@ class BonPrelevement extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; if ($option == 'xxx') { - $lien = ''; + $lien = ''; $lienfin=''; } diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 31a726828ff..3833a45215a 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -165,7 +165,7 @@ if ($result) print ''.$obj->ref."\n"; - print '\n"; print '\n"; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 905ab6f6bf1..e43ea95ae44 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -152,7 +152,7 @@ if ($resql) print img_picto('', 'statut'.$obj->statut).' '; print substr('000000'.$obj->rowid, -6); print ''; - print '\n"; + print '\n"; print '\n"; print ''; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index ebf5180eb0e..45bab4d69dc 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -131,7 +131,7 @@ if ($id) print '
'; + print ''; print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."'.price($obj->total_ttc)."'.stripslashes($obj->nom)."'.stripslashes($obj->nom)."'.price($obj->amount)."'.$rej->motifs[$obj->motif].'
'; print ''; + print ''.$lipre->bon_ref.''; print ''; print ''; print '\n"; - print '\n"; print '\n"; diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index 16f1793c372..ef884f50edf 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -175,7 +175,7 @@ if ($result) print substr('000000'.$obj->rowid, -6); print ''; - print '\n"; + print '\n"; print '\n"; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 4427d08b2d2..819d879b098 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -155,16 +155,16 @@ if ($result) print $bon->LibStatut($obj->statut,2); print " "; - print ''.$obj->ref."\n"; + print ''.$obj->ref."\n"; print '\n"; print ''; - print '\n"; + print '\n"; - print '\n"; + print '\n"; print '\n"; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 6cc88d41835..0582e4f4091 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -108,7 +108,7 @@ if ($result) print substr('000000'.$obj->rowid, -6).""; - print '\n"; + print '\n"; print ''; print "\n"; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 42f91e3132b..f56652fc4b6 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -181,7 +181,7 @@ if ($socid > 0) print '\n"; print ''; + print ''.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.''; print "\n"; print "\n"; print ''; diff --git a/htdocs/compta/salaries/fiche.php b/htdocs/compta/salaries/card.php similarity index 97% rename from htdocs/compta/salaries/fiche.php rename to htdocs/compta/salaries/card.php index c46f83dd6fb..2cef32b136e 100644 --- a/htdocs/compta/salaries/fiche.php +++ b/htdocs/compta/salaries/card.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/compta/salaries/fiche.php + * \file htdocs/compta/salaries/card.php * \ingroup salaries * \brief Page of salaries payments */ @@ -206,7 +206,7 @@ if ($action == 'create') $datesp=dol_get_first_day($pastmonthyear,$pastmonth,false); $dateep=dol_get_last_day($pastmonthyear,$pastmonth,false); } - print "\n"; + print "\n"; print ''; print ''; @@ -290,7 +290,7 @@ if ($action == 'create') if ($id) { $h = 0; - $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/fiche.php?id='.$salpayment->id; + $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$salpayment->id; $head[$h][1] = $langs->trans('Card'); $head[$h][2] = 'card'; $h++; @@ -367,7 +367,7 @@ if ($id) { if (! empty($user->rights->tax->charges->supprimer)) { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } else { diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 5e728b0cc64..0644a5ae4fe 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -395,7 +395,7 @@ class PaymentSalary extends CommonObject if (! $error) { // Add link 'payment_salary' in bank_url between payment and bank transaction - $url=DOL_URL_ROOT.'/compta/salaries/fiche.php?id='; + $url=DOL_URL_ROOT.'/compta/salaries/card.php?id='; $result=$acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary"); if ($result <= 0) @@ -412,7 +412,7 @@ class PaymentSalary extends CommonObject $result=$acc->add_url_line( $bank_line_id, $this->fk_user, - DOL_URL_ROOT.'/user/fiche.php?id=', + DOL_URL_ROOT.'/user/card.php?id=', $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), '(User)', 'user' @@ -488,7 +488,7 @@ class PaymentSalary extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='payment'; diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index bce22caaed6..059a3ccf544 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -319,7 +319,7 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print "'; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print '\n"; print "\n"; print '\n"; diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 972fa762b96..fe2062e1ad7 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -506,7 +506,7 @@ class PaymentSocialContribution extends CommonObject // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction $url=''; - if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='; + if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/card.php?id='; if ($url) { $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); @@ -588,7 +588,7 @@ class PaymentSocialContribution extends CommonObject if (!empty($this->id)) { - $lien = ''; + $lien = ''; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' '); diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index 1bc88e176d9..aa1047934f5 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -336,7 +336,7 @@ if ($modecompta == 'CREANCES-DETTES') // Product $fullname=$name[$key]; if ($key >= 0) { - $linkname=''.img_object($langs->trans("ShowProduct"),'product').' '.$fullname.''; + $linkname=''.img_object($langs->trans("ShowProduct"),'product').' '.$fullname.''; } else { $linkname=$langs->trans("PaymentsNotLinkedToProduct"); } diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index db6c0d2f149..04cf00b4388 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -348,7 +348,7 @@ if (count($amount)) { // Third party $fullname=$name[$key]; if ($key >= 0) { - $linkname=''.img_object($langs->trans("ShowUser"),'user').' '.$fullname.''; + $linkname=''.img_object($langs->trans("ShowUser"),'user').' '.$fullname.''; } else { $linkname=$langs->trans("PaymentsNotLinkedToUser"); } diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/card.php similarity index 96% rename from htdocs/compta/tva/fiche.php rename to htdocs/compta/tva/card.php index a4a5a8831c4..c87530e6511 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/compta/tva/fiche.php + * \file htdocs/compta/tva/card.php * \ingroup tax * \brief Page of VAT payments */ @@ -181,7 +181,7 @@ if ($id) // Formulaire saisie tva if ($action == 'create') { - print "\n"; + print "\n"; print ''; print ''; @@ -246,7 +246,7 @@ if ($action == 'create') if ($id) { $h = 0; - $head[$h][0] = DOL_URL_ROOT.'/compta/tva/fiche.php?id='.$vatpayment->id; + $head[$h][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$vatpayment->id; $head[$h][1] = $langs->trans('Card'); $head[$h][2] = 'card'; $h++; @@ -307,7 +307,7 @@ if ($id) { if (! empty($user->rights->tax->charges->supprimer)) { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } else { diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index 4e049594b49..5d0762d3e35 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -571,7 +571,7 @@ class Tva extends CommonObject } // Update links - $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/fiche.php?id=', "(VATPayment)", "payment_vat"); + $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat"); if ($result < 0) { $this->error=$acc->error; @@ -639,7 +639,7 @@ class Tva extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='payment'; diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index 0e22dc77f1b..d991ac8ac88 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -250,7 +250,7 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") } $x_both[$my_paye_rate]['paye']['links'] = ''; foreach($x_paye[$my_paye_rate]['facid'] as $id=>$dummy){ - $x_both[$my_paye_rate]['paye']['links'] .= '..'.substr($x_paye[$my_paye_rate]['facnum'][$id],-2).' '; + $x_both[$my_paye_rate]['paye']['links'] .= '..'.substr($x_paye[$my_paye_rate]['facnum'][$id],-2).' '; } } //now we have an array (x_both) indexed by rates for coll and paye diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/card.php similarity index 96% rename from htdocs/compta/ventilation/fiche.php rename to htdocs/compta/ventilation/card.php index b55f2b59475..7201dfe9e29 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/compta/ventilation/fiche.php + * \file htdocs/compta/ventilation/card.php * \ingroup compta * \brief Page fiche ventilation */ @@ -106,7 +106,7 @@ if($_GET["id"]) if($objp->fk_code_ventilation == 0) { - print ''."\n"; + print ''."\n"; print ''; print ''; } diff --git a/htdocs/compta/ventilation/fournisseur/fiche.php b/htdocs/compta/ventilation/fournisseur/card.php similarity index 96% rename from htdocs/compta/ventilation/fournisseur/fiche.php rename to htdocs/compta/ventilation/fournisseur/card.php index 168b99eea35..d62694512fc 100644 --- a/htdocs/compta/ventilation/fournisseur/fiche.php +++ b/htdocs/compta/ventilation/fournisseur/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/compta/ventilation/fournisseur/fiche.php + * \file htdocs/compta/ventilation/fournisseur/card.php * \ingroup compta * \brief Page fiche ventilation */ @@ -95,7 +95,7 @@ if($_GET["id"]) if($objp->fk_code_ventilation == 0) { - print ''."\n"; + print ''."\n"; print ''; print ''; } diff --git a/htdocs/compta/ventilation/fournisseur/list.php b/htdocs/compta/ventilation/fournisseur/list.php index e7a05c8fe24..5213a4686be 100644 --- a/htdocs/compta/ventilation/fournisseur/list.php +++ b/htdocs/compta/ventilation/fournisseur/list.php @@ -76,14 +76,14 @@ if ($result) $var=!$var; print ""; - print ''; + print ''; print ''; print ''; - print ''; diff --git a/htdocs/compta/ventilation/list.php b/htdocs/compta/ventilation/list.php index 5fa2a5a1ee5..03a1b658cd2 100644 --- a/htdocs/compta/ventilation/list.php +++ b/htdocs/compta/ventilation/list.php @@ -111,7 +111,7 @@ if ($result) print price($objp->price); print ''; - print ''; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/card.php similarity index 98% rename from htdocs/contact/fiche.php rename to htdocs/contact/card.php index a86965f5c8b..ce607091267 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/card.php @@ -23,7 +23,7 @@ */ /** - * \file htdocs/contact/fiche.php + * \file htdocs/contact/card.php * \ingroup societe * \brief Card of a contact */ @@ -221,7 +221,7 @@ if (empty($reshook)) { $db->commit(); if (! empty($backtopage)) $url=$backtopage; - else $url='fiche.php?id='.$id; + else $url='card.php?id='.$id; header("Location: ".$url); exit; } @@ -1082,17 +1082,17 @@ else { if ($user->rights->societe->contact->creer) { - print ''.$langs->trans('Modify').''; + print ''.$langs->trans('Modify').''; } if (! $object->user_id && $user->rights->user->user->creer) { - print ''.$langs->trans("CreateDolibarrLogin").''; + print ''.$langs->trans("CreateDolibarrLogin").''; } if ($user->rights->societe->contact->supprimer) { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } // Activer if ($object->statut == 0 && $user->rights->societe->contact->creer) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 878ee1fa956..19ce91f9c82 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -885,12 +885,12 @@ class Contact extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; if ($option == 'xxx') { - $lien = ''; + $lien = ''; $lienfin=''; } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index d8e21b8cc4c..11eb366e98c 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -77,12 +77,12 @@ $titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans(" if ($type == "c" || $type=="p") { $titre.=' ('.$langs->trans("ThirdPartyCustomers").')'; - $urlfiche="fiche.php"; + $urlfiche="card.php"; } else if ($type == "f") { $titre.=' ('.$langs->trans("ThirdPartySuppliers").')'; - $urlfiche="fiche.php"; + $urlfiche="card.php"; } else if ($type == "o") { @@ -378,7 +378,7 @@ if ($result) print ''; - print ''; @@ -496,7 +496,7 @@ if ($resql) } else { - print ''.img_object($langs->trans("ShowService"),"service"); + print ''.img_object($langs->trans("ShowService"),"service"); if ($obj->label) print ' '.dol_trunc($obj->label,20).''; else print ' '.dol_trunc($obj->note,20); } @@ -576,7 +576,7 @@ if ($resql) } else { - print ''.img_object($langs->trans("ShowService"),"service"); + print ''.img_object($langs->trans("ShowService"),"service"); if ($obj->label) print ' '.dol_trunc($obj->label,20).''; else print ' '.dol_trunc($obj->note,20); } diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index e6a0750aa4e..7970e80603c 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -152,12 +152,12 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; print ''; - print ''; print ''; - print ''; + print ''; //print ''; print ''; //print ''; diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index 702ed8d81ff..d94d45489fd 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php @@ -43,7 +43,7 @@ foreach($linkedObjectBlock as $object) $var=!$var; ?> > + trans("ShowContract"),"contract").' '.$object->ref; ?> diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index ae138ae1422..8b88b6ff557 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -100,12 +100,12 @@ class box_actions extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => ("action"), - 'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id); + 'url' => DOL_URL_ROOT."/comm/action/card.php?id=".$objp->id); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => dol_trunc($label,32), 'text2'=> $late, - 'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id); + 'url' => DOL_URL_ROOT."/comm/action/card.php?id=".$objp->id); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => ($objp->socid?'company':''), diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index 12145294d64..ae6b6b7ef15 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -78,7 +78,7 @@ class box_clients extends ModeleBoxes if ($result) { $num = $db->num_rows($result); - if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url= DOL_URL_ROOT."/comm/fiche.php?socid="; + if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url= DOL_URL_ROOT."/comm/card.php?socid="; else $url= DOL_URL_ROOT."/societe/soc.php?socid="; $i = 0; diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index 1b7de3cca7f..f88eaa939ac 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -90,19 +90,19 @@ class box_commandes extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/commande/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/commande/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $objp->ref, - 'url' => DOL_URL_ROOT."/commande/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/commande/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datem,'day'), diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index a6fe663087e..e10c9ae7ed9 100644 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -96,11 +96,11 @@ class box_contacts extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/contact/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contact/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $contactstatic->getFullName($langs,0), - 'url' => DOL_URL_ROOT."/contact/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contact/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => ($objp->fk_soc > 0?'company':''), diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index 26c3f269f3d..4297d4de46e 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -96,20 +96,20 @@ class box_contracts extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref 'text2'=> $late, - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => dol_trunc($objp->nom,40), - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day')); diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index 2e8f94e29ff..92af03f57ad 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -110,12 +110,12 @@ class box_factures extends ModeleBoxes $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => $objp->nom, 'maxlength'=>40, - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day'), diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index d9cfa9bf5cd..20d2a11bf9c 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -99,24 +99,24 @@ class box_factures_fourn extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => ($objp->ref?$objp->ref:$objp->facid), 'text2'=> $late, - 'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid); $this->info_box_contents[$i][2] = array('td' => 'align="left"', 'text' => $objp->ref_supplier, - 'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid); $this->info_box_contents[$i][3] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left"', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][5] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day')); diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index 742bd04cf82..dadfe58a27a 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -95,24 +95,24 @@ class box_factures_fourn_imp extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => ($objp->ref?$objp->ref:$objp->facid), 'text2'=> $late, - 'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid); $this->info_box_contents[$i][2] = array('td' => 'align="left"', 'text' => $objp->ref_supplier, - 'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid); $this->info_box_contents[$i][3] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left"', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][5] = array('td' => 'align="right"', 'text' => dol_print_date($datelimite,'day')); diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 72c34dee559..8aab8fa9b15 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -107,12 +107,12 @@ class box_factures_imp extends ModeleBoxes $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => $objp->nom, 'maxlength'=>44, - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datelimite,'day'), diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 32038c61928..118a18a007a 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -98,19 +98,19 @@ class box_ficheinter extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some interventions have no ref - 'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => dol_trunc($objp->nom,40), - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day')); diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index 0157e5acada..3423d8bee63 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -86,11 +86,11 @@ class box_fournisseurs extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', 'text' => dol_print_date($datem, "day")); diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index 966a8ab7d10..4760a3aaf89 100644 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -115,11 +115,11 @@ class box_members extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/adherents/fiche.php?rowid=".$objp->rowid); + 'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $memberstatic->getFullName($langs), - 'url' => DOL_URL_ROOT."/adherents/fiche.php?rowid=".$objp->rowid); + 'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', 'text' => dol_print_date($datem, "day")); diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index 30669c4f392..d3772ff65f1 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -101,11 +101,11 @@ class box_produits extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => ($objp->fk_product_type==1?'object_service':'object_product'), - 'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $objp->label, - 'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid); if ($objp->price_base_type == 'HT') { diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php index ec526a76492..1079f623492 100644 --- a/htdocs/core/boxes/box_produits_alerte_stock.php +++ b/htdocs/core/boxes/box_produits_alerte_stock.php @@ -108,11 +108,11 @@ class box_produits_alerte_stock extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => ($objp->fk_product_type==1?'object_service':'object_product'), - 'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $objp->label, - 'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid); if ($objp->price_base_type == 'HT') { diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index 73e554de2b6..19c007bb287 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -103,11 +103,11 @@ class box_propales extends ModeleBoxes $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => dol_trunc($objp->nom,40), - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day')); diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index c0234f97dc3..8c1a0afd288 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -89,11 +89,11 @@ class box_prospect extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', 'text' => dol_print_date($datem, "day")); diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index 264178cc3ea..d6e525e42d4 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -113,21 +113,21 @@ class box_services_contracts extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => ($objp->fk_product_type==1?'object_service':'object_product'), - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => $objp->label, 'maxlength' => 16, - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => $objp->nom, 'maxlength' => 28, - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datem,'day')); diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index 5e488b3c6db..8bfe5749215 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -93,19 +93,19 @@ class box_services_expired extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', 'text' => dol_trunc($objp->nom,40), - 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="center"', 'text' => dol_print_date($dateline,'day'), diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index a976112c1ad..0634b1548a8 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -86,8 +86,8 @@ class box_supplier_orders extends ModeleBoxes $objp = $db->fetch_object($result); $datem=$db->jdate($objp->tms); - $urlo = DOL_URL_ROOT."/fourn/commande/fiche.php?id=".$objp->rowid; - $urls = DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid; + $urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid; + $urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid; $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5cf872eb3d8..73955bb82fc 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2843,7 +2843,7 @@ class Form // JQUI method dialog is broken with jmobile, we use standard HTML. // Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx - // See page product/fiche.php for example + // See page product/card.php for example if (! empty($conf->dol_use_jmobile)) $useajax=0; if (empty($conf->use_javascript_ajax)) $useajax=0; @@ -3027,7 +3027,7 @@ class Form { $projet = new Project($this->db); $projet->fetch($selected); - //print ''.$projet->title.''; + //print ''.$projet->title.''; print $projet->getNomUrl(0,'',1); } else @@ -3360,7 +3360,7 @@ class Form { $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); print 'Cette societe n\'a pas de contact, veuillez en cr�er un avant de faire votre proposition commerciale
'; - print ''.$addcontact.''; + print ''.$addcontact.''; } print ''; print ''; diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index b0be8bd1cdd..43a504fd04f 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -178,7 +178,7 @@ class Notify switch($objet_type) { case 'ficheinter': - $link='/fichinter/fiche.php?id='.$objet_id; + $link='/fichinter/card.php?id='.$objet_id; break; case 'propal': $link='/comm/propal.php?id='.$objet_id; @@ -187,10 +187,10 @@ class Notify $link='/compta/facture.php?facid='.$objet_id; break; case 'order': - $link='/commande/fiche.php?id='.$objet_id; + $link='/commande/card.php?id='.$objet_id; break; case 'order_supplier': - $link='/fourn/commande/fiche.php?id='.$objet_id; + $link='/fourn/commande/card.php?id='.$objet_id; break; } // Define $urlwithroot diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 27b02e060e8..ddfcd239a41 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -435,7 +435,7 @@ function actions_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/comm/action/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/comm/action/card.php?id='.$object->id; $head[$h][1] = $langs->trans("CardAction"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index 349cb15063f..488a4c3a530 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -36,7 +36,7 @@ function bank_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT . '/compta/bank/fiche.php?id=' . $object->id; + $head[$h][0] = DOL_URL_ROOT . '/compta/bank/card.php?id=' . $object->id; $head[$h][1] = $langs->trans("AccountCard"); $head[$h][2] = 'bankname'; $h++; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index e3ad4ef3eb7..20b7b23a857 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -48,7 +48,7 @@ function societe_prepare_head($object) if ($object->client==1 || $object->client==2 || $object->client==3) { - $head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id; $head[$h][1] = ''; if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($object->client==2 || $object->client==3)) $head[$h][1] .= $langs->trans("Prospect"); if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client==3) $head[$h][1] .= '/'; @@ -58,7 +58,7 @@ function societe_prepare_head($object) } if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire)) { - $head[$h][0] = DOL_URL_ROOT.'/fourn/fiche.php?socid='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id; $head[$h][1] = $langs->trans("Supplier"); $head[$h][2] = 'supplier'; $h++; @@ -109,7 +109,7 @@ function societe_prepare_head($object) // Notifications if (! empty($conf->notification->enabled)) { - $head[$h][0] = DOL_URL_ROOT.'/societe/notify/fiche.php?socid='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id; $head[$h][1] = $langs->trans("Notifications"); $head[$h][2] = 'notify'; $h++; @@ -440,8 +440,8 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') $buttoncreate=''; if (! empty($conf->projet->enabled) && $user->rights->projet->creer) { - //$buttoncreate=''.$langs->trans("AddProject").''; - $buttoncreate=''.$langs->trans("AddProject"); + //$buttoncreate=''.$langs->trans("AddProject").''; + $buttoncreate=''.$langs->trans("AddProject"); if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($langs->trans("AddProject"),'filenew'); $buttoncreate.=''."\n"; } @@ -486,7 +486,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') print ""; // Ref - print ''; + print ''; // Label print ''; // Date start @@ -557,7 +557,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') if ($user->rights->societe->contact->creer) { $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); - $buttoncreate=''.$addcontact; + $buttoncreate=''.$addcontact; if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($addcontact,'filenew'); $buttoncreate.=''."\n"; } @@ -741,11 +741,11 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''; } @@ -754,7 +754,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') if ($user->rights->societe->contact->creer) { print ''; } @@ -917,7 +917,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0) $permok=$user->rights->agenda->myactions->create; if (($object->id || $objcon->id) && $permok) { - $out.='id; $out.=(! empty($objcon->id)?'&contactid='.$objcon->id:'').'&backtopage=1&percentage=-1">'; $out.=$langs->trans("AddAnAction").' '; @@ -1200,7 +1200,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0) $permok=$user->rights->agenda->myactions->create; if ((! empty($object->id) || ! empty($objcon->id)) && $permok) { - $out.='id; $out.=(! empty($objcon->id)?'&contactid='.$objcon->id:'').'&backtopage=1&percentage=-1">'; $out.=$langs->trans("AddAnAction").' '; @@ -1238,7 +1238,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0) } if (isset($histo[$key]['type']) && $histo[$key]['type']=='mailing') { - $out.=''.img_object($langs->trans("ShowEMailing"),"email").' '; + $out.=''.img_object($langs->trans("ShowEMailing"),"email").' '; $transcode=$langs->trans("Action".$histo[$key]['acode']); $libelle=($transcode!="Action".$histo[$key]['acode']?$transcode:'Send mass mailing'); $out.=dol_trunc($libelle,40); diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php index 2518f7b7883..8d9ba9296a4 100644 --- a/htdocs/core/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -35,7 +35,7 @@ function contact_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/contact/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php index e51f7594ac9..51dba11df23 100644 --- a/htdocs/core/lib/contract.lib.php +++ b/htdocs/core/lib/contract.lib.php @@ -34,7 +34,7 @@ function contract_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/contrat/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/contrat/card.php?id='.$object->id; $head[$h][1] = $langs->trans("ContractCard"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php index 613b12dadad..239f36721ee 100644 --- a/htdocs/core/lib/emailing.lib.php +++ b/htdocs/core/lib/emailing.lib.php @@ -34,7 +34,7 @@ function emailing_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT."/comm/mailing/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/comm/mailing/card.php?id=".$object->id; $head[$h][1] = $langs->trans("MailCard"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php index b8d2e87fdff..d231b767753 100644 --- a/htdocs/core/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -38,7 +38,7 @@ function fichinter_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/fichinter/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php index 58d553e36d5..cc14c5ca4aa 100644 --- a/htdocs/core/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -37,7 +37,7 @@ function facturefourn_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id; $head[$h][1] = $langs->trans('CardBill'); $head[$h][2] = 'card'; $h++; @@ -100,7 +100,7 @@ function ordersupplier_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id; $head[$h][1] = $langs->trans("OrderCard"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 20b030a9226..68d0f4e7639 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1227,7 +1227,7 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid= if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) { $type='AC_EMAIL'; $link=''; - if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; + if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; $newemail='
'.$langs->trans("WithdrawalsReceipts").''; - print ''.$lipre->bon_ref.'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($lipre->amount).'
'.$langs->trans("Status").''; @@ -307,7 +307,7 @@ if ($id) print ''.$obj->ref."'; + print ''; print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."'.price($obj->total_ttc)."'.stripslashes($obj->nom)."'.stripslashes($obj->nom)."'.price($obj->amount)."'; print img_object($langs->trans("ShowBill"),"bill"); print ' '.$obj->facnumber."'.$obj->nom."'.$obj->nom."'.$obj->code_client."'.$obj->code_client."'.dol_print_date($db->jdate($obj->datec),'day')."'.stripslashes($obj->nom)."'.stripslashes($obj->nom)."'.$rej->motifs[$obj->motif].'
'.dol_print_date($db->jdate($objp->dp),'day')."'; print '      '; // Decalage - print ''.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.'  '.price($objp->amount).'
"; - print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."
'.$objp->facnumber.''.$objp->facnumber.''.stripslashes(nl2br($objp->description)).''; print price($objp->price); print ''; + print ''; print img_edit(); print ''; + print ''; print img_edit(); print ''; if ($obj->socid) { - print ''; + print ''; print img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,20).''; } else @@ -410,7 +410,7 @@ if ($result) // Links Add action and Export vcard print ''; - print ''.img_object($langs->trans("AddAction"),"action").''; + print ''.img_object($langs->trans("AddAction"),"action").''; print '   '; print ''; print img_picto($langs->trans("VCard"),'vcard.png').' '; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/card.php similarity index 99% rename from htdocs/contrat/fiche.php rename to htdocs/contrat/card.php index 81d50edb211..5cb25a5bed4 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/card.php @@ -23,7 +23,7 @@ */ /** - * \file htdocs/contrat/fiche.php + * \file htdocs/contrat/card.php * \ingroup contrat * \brief Page of a contract */ diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index b4cf7c20322..02859df9158 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1531,7 +1531,7 @@ class Contrat extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='contract'; @@ -2013,7 +2013,7 @@ class ContratLigne extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='contract'; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index d23e789d92e..400899993ae 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -416,7 +416,7 @@ if ($resql) } else { - print ''.img_object($langs->trans("ShowService"),"service"); + print ''.img_object($langs->trans("ShowService"),"service"); if ($obj->label) print ' '.dol_trunc($obj->label,20).''; else print ' '.dol_trunc($obj->note,20); } @@ -426,7 +426,7 @@ if ($resql) $staticcompany->nom=$obj->nom; print $staticcompany->getNomUrl(1,'',20); print ''; + print ''; $dateend=$db->jdate($obj->date_fin_validite); print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0); print '
'; + print ''; print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .''; if ($obj->nb_late) print img_warning($langs->trans("Late")); print ''.$obj->ref_customer.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.dol_print_date($obj->datec).''.dol_print_date($db->jdate($obj->date_contrat)).''.$staticcontrat->LibStatut($obj->statut,3).'
- trans("ShowContract"),"contract").' '.$object->ref; ?> date_contrat,'day'); ?>   getLibStatut(6); ?>
'.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.''.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.''.$obj->title.''; if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) { - print ''; + print ''; print img_object($langs->trans("Rendez-Vous"),"action_rdv"); print ' '; } - print ''; + print ''; print img_object($langs->trans("Event"),"action"); print ''; - print ''; + print ''; print img_edit(); print '
'.$newemail.'  '.$link.'
'; } } @@ -1275,7 +1275,7 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64) if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) { $type='AC_SKYPE'; $link=''; - if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; + if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; $newskype='
'.$newskype.'  '.$link.'
'; } } @@ -1373,7 +1373,7 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ=" { $type='AC_TEL'; $link=''; if ($addlink == 'AC_FAX') $type='AC_FAX'; - if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; + if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; if ($link) $newphone='
'.$newphone.'  '.$link.'
'; } } diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php index 209ca16f585..bb42f2e0760 100644 --- a/htdocs/core/lib/holiday.lib.php +++ b/htdocs/core/lib/holiday.lib.php @@ -34,7 +34,7 @@ function holiday_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT . '/holiday/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT . '/holiday/card.php?id='.$object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php index 67b6794f3a3..20a05a701aa 100644 --- a/htdocs/core/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -34,7 +34,7 @@ function member_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id; $head[$h][1] = $langs->trans("MemberCard"); $head[$h][2] = 'general'; $h++; diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index 43427acd59a..0aa3c980911 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -42,7 +42,7 @@ function commande_prepare_head($object) if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { - $head[$h][0] = DOL_URL_ROOT.'/commande/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id; $head[$h][1] = $langs->trans("OrderCard"); $head[$h][2] = 'order'; $h++; diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php index f4d3b80ee8c..591956bbffc 100644 --- a/htdocs/core/lib/payments.lib.php +++ b/htdocs/core/lib/payments.lib.php @@ -32,7 +32,7 @@ function payment_prepare_head(Paiement $object) { $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'payment'; $h++; @@ -67,7 +67,7 @@ function payment_supplier_prepare_head(Paiement $object) { $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'payment'; $h++; diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php index dde5981cf75..257f13558ee 100644 --- a/htdocs/core/lib/prelevement.lib.php +++ b/htdocs/core/lib/prelevement.lib.php @@ -39,7 +39,7 @@ function prelevement_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'prelevement'; $h++; diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index d8f814e06c3..b126df7bdc3 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -39,7 +39,7 @@ function product_prepare_head($object, $user) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/product/card.php?id=".$object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h++; @@ -83,13 +83,13 @@ function product_prepare_head($object, $user) // Sub products if (! empty($conf->global->PRODUIT_SOUSPRODUITS)) { - $head[$h][0] = DOL_URL_ROOT."/product/composition/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id; $head[$h][1] = $langs->trans('AssociatedProducts'); $head[$h][2] = 'subproduct'; $h++; } - $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id; $head[$h][1] = $langs->trans('Statistics'); $head[$h][2] = 'stats'; $h++; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 7a8f2302c12..f99034e088a 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -38,7 +38,7 @@ function project_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/projet/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id; $head[$h][1] = $langs->trans("Project"); $head[$h][2] = 'project'; $h++; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index d2ff595b734..dd08c8b6c79 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -41,7 +41,7 @@ function shipping_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT."/expedition/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->id; $head[$h][1] = $langs->trans("SendingCard"); $head[$h][2] = 'shipping'; $h++; @@ -52,7 +52,7 @@ function shipping_prepare_head($object) $object->fetchObjectLinked($object->id,$object->element); if (! empty($object->linkedObjectsIds['delivery'][0])) // If there is a delivery { - $head[$h][0] = DOL_URL_ROOT."/livraison/fiche.php?id=".$object->linkedObjectsIds['delivery'][0]; + $head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->linkedObjectsIds['delivery'][0]; $head[$h][1] = $langs->trans("DeliveryCard"); $head[$h][2] = 'delivery'; $h++; @@ -99,13 +99,13 @@ function delivery_prepare_head($object) if ($conf->expedition_bon->enabled && $user->rights->expedition->lire) { - $head[$h][0] = DOL_URL_ROOT."/expedition/fiche.php?id=".$object->origin_id; + $head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->origin_id; $head[$h][1] = $langs->trans("SendingCard"); $head[$h][2] = 'shipping'; $h++; } - $head[$h][0] = DOL_URL_ROOT."/livraison/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->id; $head[$h][1] = $langs->trans("DeliveryCard"); $head[$h][2] = 'delivery'; $h++; @@ -207,7 +207,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='') print "
'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.''.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.''; print $receiving->getNomUrl($db); - //print ''.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.''; + //print ''.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.''; print ''; diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php index 3305f76875d..758b2e96582 100644 --- a/htdocs/core/lib/stock.lib.php +++ b/htdocs/core/lib/stock.lib.php @@ -34,7 +34,7 @@ function stock_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id; $head[$h][1] = $langs->trans("WarehouseCard"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php index ae38a1bf706..45619b10d6f 100644 --- a/htdocs/core/lib/trip.lib.php +++ b/htdocs/core/lib/trip.lib.php @@ -34,7 +34,7 @@ function trip_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/fiche.php?id=' . $object->id; + $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/card.php?id=' . $object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 276efe85f02..af1b003e731 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -44,7 +44,7 @@ function user_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id; $head[$h][1] = $langs->trans("UserCard"); $head[$h][2] = 'user'; $h++; @@ -140,7 +140,7 @@ function group_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/user/group/fiche.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id; $head[$h][1] = $langs->trans("GroupCard"); $head[$h][2] = 'group'; $h++; diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 8d8448cedb3..060524181d8 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -58,9 +58,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Home - Menu users and groups insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 400__+MAX_llx_menu__, 'home', 'users', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php?leftmenu=users', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/fiche.php?leftmenu=users&action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/card.php?leftmenu=users&action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php?leftmenu=users', 'Groups', 1, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/fiche.php?leftmenu=users&action=create', 'NewGroup', 2, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/card.php?leftmenu=users&action=create', 'NewGroup', 2, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin', '', 2, 0, __ENTITY__); -- Third parties insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); @@ -72,7 +72,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); -- Third parties - Contacts insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/fiche.php?leftmenu=contacts&action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/card.php?leftmenu=contacts&action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 602__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 604__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts&type=p', 'ThirdPartyProspects', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 605__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts&type=c', 'ThirdPartyCustomers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 2, __ENTITY__); @@ -80,27 +80,27 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 607__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts&type=o', 'Others', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 4, __ENTITY__); -- Third parties - Category customer insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 650__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=1', 'SuppliersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 651__+MAX_llx_menu__, 'companies', '', 650__+MAX_llx_menu__, '/categories/fiche.php?action=create&type=1', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 651__+MAX_llx_menu__, 'companies', '', 650__+MAX_llx_menu__, '/categories/card.php?action=create&type=1', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); -- Third parties - Category supplier insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 660__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=2', 'CustomersProspectsCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 661__+MAX_llx_menu__, 'companies', '', 660__+MAX_llx_menu__, '/categories/fiche.php?action=create&type=2', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 661__+MAX_llx_menu__, 'companies', '', 660__+MAX_llx_menu__, '/categories/card.php?action=create&type=2', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); -- Third parties - Category contact insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 670__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=4', 'ContactCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 671__+MAX_llx_menu__, 'companies', '', 670__+MAX_llx_menu__, '/categories/fiche.php?action=create&type=4', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 671__+MAX_llx_menu__, 'companies', '', 670__+MAX_llx_menu__, '/categories/card.php?action=create&type=4', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); -- Product - Product insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2800__+MAX_llx_menu__, 'products', 'product', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=product&type=0', 'Products', 0, 'products', '$user->rights->produit->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/fiche.php?leftmenu=product&action=create&type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/card.php?leftmenu=product&action=create&type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/list.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 5, __ENTITY__); -- Product - Services insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2900__+MAX_llx_menu__, 'products', 'service', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=service&type=1', 'Services', 0, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/fiche.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/card.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/list.php?leftmenu=service&type=1', 'List', 1, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=1', 'Statistics', 1, 'main', '$user->rights->service->lire', '', 2, 5, __ENTITY__); -- Product - Stocks insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3100__+MAX_llx_menu__, 'products', 'stock', 3__+MAX_llx_menu__, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/fiche.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); @@ -108,10 +108,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Product - Categories insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3201__+MAX_llx_menu__, 'products', '', 3200__+MAX_llx_menu__, '/categories/fiche.php?action=create&type=0', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3201__+MAX_llx_menu__, 'products', '', 3200__+MAX_llx_menu__, '/categories/card.php?action=create&type=0', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); -- Product - Shipment insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled', __HANDLER__, 'left', 1300__+MAX_llx_menu__, 'commercial', 'sendings', 3__+MAX_llx_menu__, '/expedition/index.php?leftmenu=sendings', 'Shipments', 0, 'sendings', '$user->rights->expedition->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/fiche.php?action=create2&leftmenu=sendings', 'NewSending', 1, 'sendings', '$user->rights->expedition->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/card.php?action=create2&leftmenu=sendings', 'NewSending', 1, 'sendings', '$user->rights->expedition->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/list.php?leftmenu=sendings', 'List', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1303__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/stats/index.php?leftmenu=sendings', 'Statistics', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 2, __ENTITY__); @@ -127,7 +127,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 1110__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal/stats/index.php?leftmenu=propals', 'Statistics', 1, 'propal', '$user->rights->propale->lire', '', 2, 4, __ENTITY__); -- Commercial - Customer's orders insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1200__+MAX_llx_menu__, 'commercial', 'orders', 5__+MAX_llx_menu__, '/commande/index.php?leftmenu=orders', 'CustomersOrders', 0, 'orders', '$user->rights->commande->lire', '', 2, 5, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/fiche.php?action=create&leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/card.php?action=create&leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1202__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders', 'List', 1, 'orders', '$user->rights->commande->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1203__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1204__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 2, 3, __ENTITY__); @@ -138,12 +138,12 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__); -- Commercial - Supplier's orders insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5100__+MAX_llx_menu__, 'commercial', 'orders_suppliers', 5__+MAX_llx_menu__, '/fourn/commande/index.php?leftmenu=orders_suppliers', 'SuppliersOrders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 6, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/fiche.php?action=create&leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/card.php?action=create&leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5102__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/list.php?leftmenu=orders_suppliers&viewstatut=0', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5108__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier', 'Statistics', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 7, __ENTITY__); -- Commercial - Contracts insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1400__+MAX_llx_menu__, 'commercial', 'contracts', 5__+MAX_llx_menu__, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/fiche.php?&action=create&leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/card.php?&action=create&leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/list.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__); @@ -152,11 +152,11 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__); -- Commercial - Interventions insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1500__+MAX_llx_menu__, 'commercial', 'ficheinter', 5__+MAX_llx_menu__, '/fichinter/list.php?leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1501__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/fiche.php?action=create&leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1501__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/card.php?action=create&leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1502__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/list.php?leftmenu=ficheinter', 'List', 1, 'interventions', '$user->rights->ficheinter->lire', '', 2, 1, __ENTITY__); -- Accountancy - Supplier invoice insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 1600__+MAX_llx_menu__, 'accountancy', 'supplier_bills', 6__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'BillsSuppliers', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/fiche.php?action=create&leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/card.php?action=create&leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/impayees.php?leftmenu=suppliers_bills', 'Unpaid', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 1603__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/paiement.php?leftmenu=suppliers_bills', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__); @@ -172,19 +172,19 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__); -- Donations insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/fiche.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/card.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/stats.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); -- Special expenses insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)', '', 0, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/fiche.php?leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/card.php?leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->read', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'accountancy', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'accountancy', 'tax_vat', 2200__+MAX_llx_menu__, '/compta/tva/index.php?leftmenu=tax_vat&mainmenu=accountancy', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/fiche.php?leftmenu=tax_vat&action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/card.php?leftmenu=tax_vat&action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'Payments', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); @@ -194,7 +194,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/lignes.php', 'Dispatched', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2404__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2405__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/fiche.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2405__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/card.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); @@ -210,7 +210,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -- Check deposit insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/list.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); -- Withdrawal insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__); @@ -221,18 +221,18 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2507__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/stats.php?leftmenu=withdraw', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__); -- Bank insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled', __HANDLER__, 'left', 2600__+MAX_llx_menu__, 'accountancy', 'bank', 14__+MAX_llx_menu__, '/compta/bank/index.php?leftmenu=bank&mainmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2601__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/fiche.php?action=create&leftmenu=bank', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2601__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/card.php?action=create&leftmenu=bank', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2602__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/categ.php?leftmenu=bank', 'Rubriques', 1, 'categories', '$user->rights->banque->configurer', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/search.php?leftmenu=bank', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php?leftmenu=bank', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/virement.php?leftmenu=bank', 'BankTransfers', 1, 'banks', '$user->rights->banque->transfer', '', 0, 5, __ENTITY__); -- Project insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/fiche.php?leftmenu=projects&action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3611__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/fiche.php?leftmenu=projects&action=create&mode=mine', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3611__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&action=create&mode=mine', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3612__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects&mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); @@ -246,7 +246,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3803__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/activity/list.php?leftmenu=projects&mode=mine', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3900__+MAX_llx_menu__, 'tools', 'mailing', 8__+MAX_llx_menu__, '/comm/mailing/index.php?leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3901__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/fiche.php?leftmenu=mailing&action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3901__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/card.php?leftmenu=mailing&action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3902__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/list.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->export->enabled', __HANDLER__, 'left', 4100__+MAX_llx_menu__, 'tools', 'export', 8__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'FormatedExport', 0, 'exports', '$user->rights->export->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->export->enabled', __HANDLER__, 'left', 4101__+MAX_llx_menu__, 'tools', '', 4100__+MAX_llx_menu__, '/exports/export.php?leftmenu=export', 'NewExport', 1, 'exports', '$user->rights->export->creer', '', 2, 0, __ENTITY__); @@ -254,7 +254,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->import->enabled', __HANDLER__, 'left', 4131__+MAX_llx_menu__, 'tools', '', 4130__+MAX_llx_menu__, '/imports/import.php?leftmenu=import', 'NewImport', 1, 'exports', '$user->rights->import->run', '', 2, 0, __ENTITY__); -- Members insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4200__+MAX_llx_menu__, 'members', 'members', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=members&mainmenu=members', 'Members', 0, 'members', '$user->rights->adherent->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4201__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/fiche.php?leftmenu=members&action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4201__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/card.php?leftmenu=members&action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4202__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/list.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4203__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&statut=-1', 'MenuMembersToValidate', 2, 'members', '$user->rights->adherent->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4204__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&statut=1', 'MenuMembersValidated', 2, 'members', '$user->rights->adherent->lire', '', 2, 3, __ENTITY__); @@ -276,16 +276,16 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__); -- Members - Category member insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5200__+MAX_llx_menu__, 'members', 'cat', 13__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=3', 'MembersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5201__+MAX_llx_menu__, 'members', '', 5200__+MAX_llx_menu__, '/categories/fiche.php?action=create&type=3', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5201__+MAX_llx_menu__, 'members', '', 5200__+MAX_llx_menu__, '/categories/card.php?action=create&type=3', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__); -- HRM - Holiday insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5000__+MAX_llx_menu__, 'hrm', 'hrm', 15__+MAX_llx_menu__, '/holiday/index.php?&leftmenu=hrm', 'CPTitreMenu', 0, 'holiday', '$user->rights->holiday->write', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/fiche.php?&action=request', 'MenuAddCP', 1, 'holiday', '$user->rights->holiday->write', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?&action=request', 'MenuAddCP', 1, 'holiday', '$user->rights->holiday->write', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5002__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/define_holiday.php?&action=request', 'MenuConfCP', 1, 'holiday', '$user->rights->holiday->define_holiday', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5003__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/view_log.php?&action=request', 'MenuLogCP', 1, 'holiday', '$user->rights->holiday->view_log', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/month_report.php?&action=request', 'MenuReportMonth', 1, 'holiday', '$user->rights->holiday->month_report', '', 0, 4, __ENTITY__); -- HRM - Trips and expenses insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2100__+MAX_llx_menu__, 'accountancy', 'tripsandexpenses', 15__+MAX_llx_menu__, '/compta/deplacement/index.php?leftmenu=tripsandexpenses', 'TripsAndExpenses', 0, 'trips', '$user->rights->deplacement->lire', '', 0, 5, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2101__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses', 'New', 1, 'trips', '$user->rights->deplacement->creer', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2101__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/card.php?action=create&leftmenu=tripsandexpenses', 'New', 1, 'trips', '$user->rights->deplacement->creer', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2102__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/list.php?leftmenu=tripsandexpenses', 'List', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2103__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses', 'Statistics', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__); diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index bf5de3c6a91..76866123673 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -262,7 +262,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM while ($i < $numr) { $objp = $db->fetch_object($resql); - $newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire); + $newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire); if ($objp->rappro && $objp->courant != 2 && empty($objp->clos)) // If not cash account and not closed and can be reconciliate { $newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index e7fa68aae85..b45957a984b 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -562,9 +562,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (empty($leftmenu) || $leftmenu=="users") { $newmenu->add("/user/index.php", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin); - $newmenu->add("/user/fiche.php?action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin); + $newmenu->add("/user/card.php?action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin); $newmenu->add("/user/group/index.php", $langs->trans("Groups"), 1, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin); - $newmenu->add("/user/group/fiche.php?action=create", $langs->trans("NewGroup"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin); + $newmenu->add("/user/group/card.php?action=create", $langs->trans("NewGroup"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin); } } @@ -625,7 +625,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu // Contacts $newmenu->add("/contact/list.php?leftmenu=contacts", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts'); - $newmenu->add("/contact/fiche.php?leftmenu=contacts&action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer); + $newmenu->add("/contact/card.php?leftmenu=contacts&action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer); $newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire); if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire); if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire); @@ -641,16 +641,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { // Categories prospects/customers $newmenu->add("/categories/index.php?leftmenu=cat&type=2", $langs->trans("CustomersProspectsCategoriesShort"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); - $newmenu->add("/categories/fiche.php?action=create&type=2", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); + $newmenu->add("/categories/card.php?action=create&type=2", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); } // Categories Contact $newmenu->add("/categories/index.php?leftmenu=cat&type=4", $langs->trans("ContactCategoriesShort"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); - $newmenu->add("/categories/fiche.php?action=create&type=4", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); + $newmenu->add("/categories/card.php?action=create&type=4", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); // Categories suppliers if (! empty($conf->fournisseur->enabled)) { $newmenu->add("/categories/index.php?leftmenu=cat&type=1", $langs->trans("SuppliersCategoriesShort"), 0, $user->rights->categorie->lire); - $newmenu->add("/categories/fiche.php?action=create&type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); + $newmenu->add("/categories/card.php?action=create&type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); } //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } @@ -685,7 +685,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("orders"); $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); - $newmenu->add("/commande/fiche.php?action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer); + $newmenu->add("/commande/card.php?action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer); $newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire); if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire); if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire); @@ -701,7 +701,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("orders"); $newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers'); - $newmenu->add("/fourn/commande/fiche.php?action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer); + $newmenu->add("/fourn/commande/card.php?action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer); $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire); if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire); @@ -722,7 +722,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("contracts"); $newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts'); - $newmenu->add("/contrat/fiche.php?&action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer); + $newmenu->add("/contrat/card.php?&action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer); $newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire); $newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire); if (empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire); @@ -736,7 +736,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("interventions"); $newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter'); - $newmenu->add("/fichinter/fiche.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer); + $newmenu->add("/fichinter/card.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer); $newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire); } @@ -776,7 +776,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("bills"); $newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),0,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills'); - $newmenu->add("/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer); + $newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer); $newmenu->add("/fourn/facture/impayees.php", $langs->trans("Unpaid"),1,$user->rights->fournisseur->facture->lire); $newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire); @@ -796,7 +796,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("donations"); $newmenu->add("/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations'); - if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/fiche.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); + if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/card.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/list.php",$langs->trans("List"), 1, $user->rights->don->lire); //if ($leftmenu=="donations") $newmenu->add("/compta/dons/stats.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); } @@ -814,7 +814,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("salaries"); $newmenu->add("/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy",$langs->trans("Salaries"),1,$user->rights->salaries->read, '', $mainmenu, 'tax_salary'); - if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/fiche.php?leftmenu=tax_salary&action=create",$langs->trans("NewPayment"),2,$user->rights->salaries->write); + if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/card.php?leftmenu=tax_salary&action=create",$langs->trans("NewPayment"),2,$user->rights->salaries->write); if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/index.php?leftmenu=tax_salary",$langs->trans("Payments"),2,$user->rights->salaries->read); } @@ -828,7 +828,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (empty($conf->global->TAX_DISABLE_VAT_MENUS)) { $newmenu->add("/compta/tva/index.php?leftmenu=tax_vat&mainmenu=accountancy",$langs->trans("VAT"),1,$user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat'); - if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer); + if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer); if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/reglement.php?leftmenu=tax_vat",$langs->trans("Payments"),2,$user->rights->tax->charges->lire); if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire); if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire); @@ -839,7 +839,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj=="1")) { $newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&mainmenu=accountancy&localTaxType=1",$langs->transcountry("LT1",$mysoc->country_code),1,$user->rights->tax->charges->lire); - if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/fiche.php?leftmenu=tax_vat&action=create&localTaxType=1",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer); + if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/card.php?leftmenu=tax_vat&action=create&localTaxType=1",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer); if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat&localTaxType=1",$langs->trans("Payments"),2,$user->rights->tax->charges->lire); if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat&localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire); if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat&localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire); @@ -848,7 +848,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj=="1")) { $newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&mainmenu=accountancy&localTaxType=2",$langs->transcountry("LT2",$mysoc->country_code),1,$user->rights->tax->charges->lire); - if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/fiche.php?leftmenu=tax_vat&action=create&localTaxType=2",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer); + if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/card.php?leftmenu=tax_vat&action=create&localTaxType=2",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer); if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat&localTaxType=2",$langs->trans("Payments"),2,$user->rights->tax->charges->lire); if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat&localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire); if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat&localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire); @@ -982,7 +982,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $newmenu->add("/compta/bank/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire, '', $mainmenu, 'bank'); - $newmenu->add("/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer); + $newmenu->add("/compta/bank/card.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer); $newmenu->add("/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer); $newmenu->add("/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire); @@ -1013,7 +1013,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)) { $newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks'); - $newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); + $newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); $newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks&mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->cheque); } @@ -1028,7 +1028,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->product->enabled)) { $newmenu->add("/product/index.php?leftmenu=product&type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product'); - $newmenu->add("/product/fiche.php?leftmenu=product&action=create&type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer); + $newmenu->add("/product/card.php?leftmenu=product&action=create&type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer); $newmenu->add("/product/list.php?leftmenu=product&type=0", $langs->trans("List"), 1, $user->rights->produit->lire); if (! empty($conf->propal->enabled)) { @@ -1044,7 +1044,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->service->enabled)) { $newmenu->add("/product/index.php?leftmenu=service&type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service'); - $newmenu->add("/product/fiche.php?leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->service->creer); + $newmenu->add("/product/card.php?leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->service->creer); $newmenu->add("/product/list.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->service->lire); if (! empty($conf->propal->enabled)) { @@ -1057,7 +1057,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("categories"); $newmenu->add("/categories/index.php?leftmenu=cat&type=0", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); - $newmenu->add("/categories/fiche.php?action=create&type=0", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); + $newmenu->add("/categories/card.php?action=create&type=0", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } @@ -1066,7 +1066,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("stocks"); $newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Stocks"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock'); - if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/fiche.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); + if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire); if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire); if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); @@ -1078,7 +1078,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("sendings"); $newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings'); - $newmenu->add("/expedition/fiche.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer); + $newmenu->add("/expedition/card.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer); $newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire); $newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire); } @@ -1108,7 +1108,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("bills"); $newmenu->add("/fourn/facture/list.php?leftmenu=orders", $langs->trans("Bills"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'orders'); - $newmenu->add("/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer); + $newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer); $newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire); } @@ -1124,7 +1124,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("categories"); $newmenu->add("/categories/index.php?leftmenu=cat&type=1", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); - $newmenu->add("/categories/fiche.php?action=create&type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); + $newmenu->add("/categories/card.php?action=create&type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } @@ -1141,12 +1141,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu // Project affected to user $newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects'); - $newmenu->add("/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); + $newmenu->add("/projet/card.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); $newmenu->add("/projet/list.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); // All project i have permission on $newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire); - $newmenu->add("/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer); + $newmenu->add("/projet/card.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer); $newmenu->add("/projet/list.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire); // Project affected to user @@ -1174,7 +1174,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("holiday"); $newmenu->add("/holiday/index.php?&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->write, '', $mainmenu, 'hrm'); - $newmenu->add("/holiday/fiche.php?&action=request", $langs->trans("MenuAddCP"), 1,$user->rights->holiday->write); + $newmenu->add("/holiday/card.php?&action=request", $langs->trans("MenuAddCP"), 1,$user->rights->holiday->write); $newmenu->add("/holiday/define_holiday.php?&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->define_holiday); $newmenu->add("/holiday/view_log.php?&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->view_log); $newmenu->add("/holiday/month_report.php?&action=request", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->month_report); @@ -1185,7 +1185,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("trips"); $newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses'); - $newmenu->add("/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer); + $newmenu->add("/compta/deplacement/card.php?action=create&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer); $newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire); $newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire); } @@ -1203,7 +1203,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("mails"); $newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing'); - $newmenu->add("/comm/mailing/fiche.php?leftmenu=mailing&action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer); + $newmenu->add("/comm/mailing/card.php?leftmenu=mailing&action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer); $newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire); } @@ -1234,7 +1234,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("compta"); $newmenu->add("/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Members"),0,$user->rights->adherent->lire, '', $mainmenu, 'members'); - $newmenu->add("/adherents/fiche.php?leftmenu=members&action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer); + $newmenu->add("/adherents/card.php?leftmenu=members&action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer); $newmenu->add("/adherents/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->lire); $newmenu->add("/adherents/list.php?leftmenu=members&statut=-1",$langs->trans("MenuMembersToValidate"),2,$user->rights->adherent->lire); $newmenu->add("/adherents/list.php?leftmenu=members&statut=1",$langs->trans("MenuMembersValidated"),2,$user->rights->adherent->lire); @@ -1253,7 +1253,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("categories"); $newmenu->add("/categories/index.php?leftmenu=cat&type=3", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat'); - $newmenu->add("/categories/fiche.php?action=create&type=3", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); + $newmenu->add("/categories/card.php?action=create&type=3", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer); //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } @@ -1294,7 +1294,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu while ($i < $numr) { $objp = $db->fetch_object($resql); - $newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire); + $newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire); if ($objp->rappro && $objp->courant != 2 && empty($objp->clos)) // If not cash account and not closed and can be reconciliate { $newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate); diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index 2729234483f..3f8df87cd7a 100644 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -158,7 +158,7 @@ class mailing_contacts1 extends MailingTargets */ function url($id) { - return ''.img_object('',"contact").''; + return ''.img_object('',"contact").''; } diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php index 35d840125a7..fe49ce56b35 100644 --- a/htdocs/core/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -61,7 +61,7 @@ class mailing_contacts2 extends MailingTargets */ function url($id) { - return ''.img_object('',"contact").''; + return ''.img_object('',"contact").''; } /** diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php index 327e36cf826..92640291088 100644 --- a/htdocs/core/modules/mailings/contacts3.modules.php +++ b/htdocs/core/modules/mailings/contacts3.modules.php @@ -59,7 +59,7 @@ class mailing_contacts3 extends MailingTargets */ function url($id) { - return ''.img_object('',"contact").''; + return ''.img_object('',"contact").''; } /** diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php index c86ca871c17..59355b372fe 100644 --- a/htdocs/core/modules/mailings/contacts4.modules.php +++ b/htdocs/core/modules/mailings/contacts4.modules.php @@ -59,7 +59,7 @@ class mailing_contacts4 extends MailingTargets */ function url($id) { - return ''.img_object('',"contact").''; + return ''.img_object('',"contact").''; } /** diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index aa76e6b9efc..dd6e18dfa91 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -140,7 +140,7 @@ class mailing_fraise extends MailingTargets */ function url($id) { - return ''.img_object('',"user").''; + return ''.img_object('',"user").''; } diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php index 4572d894bac..d8f88ef766c 100644 --- a/htdocs/core/modules/mailings/framboise.modules.php +++ b/htdocs/core/modules/mailings/framboise.modules.php @@ -233,7 +233,7 @@ class mailing_framboise extends MailingTargets //$companystatic->id=$id; //$companystatic->nom=''; //return $companystatic->getNomUrl(1); // Url too long - return ''.img_object('',"user").''; + return ''.img_object('',"user").''; } } diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php index 61c3e2fb464..2c93b588524 100644 --- a/htdocs/core/modules/mailings/pomme.modules.php +++ b/htdocs/core/modules/mailings/pomme.modules.php @@ -129,7 +129,7 @@ class mailing_pomme extends MailingTargets */ function url($id) { - return ''.img_object('',"user").''; + return ''.img_object('',"user").''; } diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index 8d7b930df08..7533018373a 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -214,7 +214,7 @@ class modAgenda extends DolibarrModules 'type'=>'left', 'titre'=>'NewAction', 'mainmenu'=>'agenda', - 'url'=>'/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create', + 'url'=>'/comm/action/card.php?mainmenu=agenda&leftmenu=agenda&action=create', 'langs'=>'commercial', 'position'=>101, 'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)', diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php index eadfa84ba6c..e45b40a3f57 100644 --- a/htdocs/core/modules/modHoliday.class.php +++ b/htdocs/core/modules/modHoliday.class.php @@ -213,7 +213,7 @@ class modHoliday extends DolibarrModules 'titre'=>'MenuAddCP', 'mainmenu'=>'holiday', 'leftmenu'=>'holiday_add', - 'url'=>'/holiday/fiche.php?mainmenu=holiday&action=request', + 'url'=>'/holiday/card.php?mainmenu=holiday&action=request', 'langs'=>'holiday', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>101, 'enabled'=>'$conf->holiday->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 5d34ccfb19d..68a19c0bb73 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -60,7 +60,7 @@ $coldisplay=-1; // We remove first td fk_product > 0) { ?> - + product_type==1) echo img_object($langs->trans('ShowService'),'service'); else print img_object($langs->trans('ShowProduct'),'product'); diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/card.php similarity index 99% rename from htdocs/expedition/fiche.php rename to htdocs/expedition/card.php index de557cfcde1..9a12508ec18 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/card.php @@ -23,7 +23,7 @@ */ /** - * \file htdocs/expedition/fiche.php + * \file htdocs/expedition/card.php * \ingroup expedition * \brief Fiche descriptive d'une expedition */ @@ -207,7 +207,7 @@ if ($action == 'add') if (! $error) { $db->commit(); - header("Location: fiche.php?id=".$object->id); + header("Location: card.php?id=".$object->id); exit; } else @@ -226,7 +226,7 @@ else if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user- $result = $object->create_delivery($user); if ($result > 0) { - header("Location: ".DOL_URL_ROOT.'/livraison/fiche.php?id='.$result); + header("Location: ".DOL_URL_ROOT.'/livraison/card.php?id='.$result); exit; } else @@ -336,7 +336,7 @@ else if ($action == 'settrackingnumber' || $action == 'settrackingurl' { if ($object->update($user) >= 0) { - header("Location: fiche.php?id=".$object->id); + header("Location: card.php?id=".$object->id); exit; } setEventMessage($object->error,'errors'); @@ -634,11 +634,11 @@ if ($action == 'create') print '
'; if ($origin == 'commande' && ! empty($conf->commande->enabled)) { - print $langs->trans("RefOrder").''.img_object($langs->trans("ShowOrder"),'order').' '.$object->ref; + print $langs->trans("RefOrder").''.img_object($langs->trans("ShowOrder"),'order').' '.$object->ref; } if ($origin == 'propal' && ! empty($conf->propal->enabled)) { - print $langs->trans("RefProposal").''.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref; + print $langs->trans("RefProposal").''.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref; } print '
      -> - ".$value['fullpath']." + ".$value['fullpath']." (".$value['nb'].") ".$value['nb_total']."   ".$value['stock']." ".$img."
'; - print ''.$obj->nom.''; + print ''.$obj->nom.''; print ''; - if ($obj->commande_id) print ''.$obj->commande_ref.''; + if ($obj->commande_id) print ''.$obj->commande_ref.''; print '
'.img_object($langs->trans("ShowSending"),"sending").' '; + print '
'.img_object($langs->trans("ShowSending"),"sending").' '; print $obj->ref.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; if ($obj->commande_id) { diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 0ad306ef8a3..07f004ca8d2 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -563,7 +563,7 @@ if ($id > 0 || ! empty($ref)) { $img=img_warning($langs->trans("StockTooLow")); } - print '
      -> '.$value['fullpath'].' ('.$value['nb'].')
      -> '.$value['fullpath'].' ('.$value['nb'].') '.$value['nb_total'].'  
- trans("ShowShipping"),"sending").' '.$object->ref; ?> date_creation,'day'); ?> date_delivery,'day'); ?> 0 || ! empty($ref)) // Client print "
".$langs->trans("Customer")."'; - print ''.$soc->nom.''; + print ''.$soc->nom.''; print '
- trans("ShowIntervention"),"intervention").' '.$object->ref; ?> datev,'day'); ?> getLibStatut(3); ?>
'.img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref.''.img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref.''; if ($obj->dc) { @@ -397,7 +397,7 @@ if ($object->fetch($id)) $var=!$var; print '
'; - print ''; + print ''; print img_object($langs->trans('ShowBill'),'bill').' '.$obj->ref_supplier.' '.dol_trunc($obj->libelle,14).''.dol_print_date($db->jdate($obj->df),'day').''.price($obj->amount).'
'; @@ -1968,7 +1968,7 @@ elseif (! empty($object->id)) * Receptionner (action=livraison) */ print '
'; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index e26bc867640..c864dce3b88 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -160,7 +160,7 @@ if ($id > 0 || ! empty($ref)) print '\n"; // User - print ''; // Comment diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index bd3b18fc87c..fd430ba4508 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -232,8 +232,8 @@ if (! empty($conf->fournisseur->enabled)) $obj = $db->fetch_object($resql); print ""; print '"; - print ''; + print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.""; + print ''; $i++; } } @@ -353,7 +353,7 @@ if ($resql) print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -421,7 +421,7 @@ print '
'.$commande->LibStatut($obj->fk_statut,4)."'; + print ''; print img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'
'; - print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.dol_print_date($db->jdate($obj->tms),'day').''.$commandestatic->LibStatut($obj->fk_statut,5).'
'; print '		'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'
'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''; + print ''.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref); print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); @@ -215,7 +215,7 @@ if ($resql) // Company - print ''.img_object($langs->trans("ShowCompany"),"company").' '; + print ''.img_object($langs->trans("ShowCompany"),"company").' '; print $obj->nom.'
- trans("ShowOrder"),"order").' '.$object->ref; ?> date,'day'); ?> rights->fournisseur->commande->lire) { diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 8764acdbda3..acdac3ab9a1 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -114,9 +114,9 @@ if ($result) print "
'.img_object($langs->trans("ShowContact"),"contact").' '.$obj->lastname.''.img_object($langs->trans("ShowContact"),"contact").' '.$obj->lastname.''.$obj->firstname.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''.$obj->email.''.$obj->phone.'
'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."'; print $form->form_modes_reglement(null, $objp->paiement_type,'none').' '.$objp->num_paiement; print '
'.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.''.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.''.dol_print_date($db->jdate($objp->dp),'day')."
- trans("ShowBill"),"bill").' '.$object->ref; ?> date,'day'); ?> rights->fournisseur->facture->lire) { diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 01f4ad3b1bf..f0f825d3ff7 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -266,8 +266,8 @@ if ($resql) $var=!$var; print "
'.img_object($langs->trans("ShowSupplier"),"company").''; - print " socid."\">".$obj->nom."'.img_object($langs->trans("ShowSupplier"),"company").''; + print " socid."\">".$obj->nom."'.$obj->code_fournisseur.' '.dol_print_date($db->jdate($obj->tms),'day').'
'.img_object($langs->trans('ShowBill'),'bill').' '; + print ''.img_object($langs->trans('ShowBill'),'bill').' '; print ($objp->ref?$objp->ref:$objp->rowid); print "'.$objp->ref_supplier."'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.''.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.''.price($objp->total_ttc).'
rowid\">"; + print "rowid\">"; if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service"); else print img_object($langs->trans("ShowProduct"),"product"); - print " rowid\">$objp->ref $objp->label"; if ($objp->fk_product_type==1) print $langs->trans('ShowService'); diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 481e7d22771..89c3928f134 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -132,7 +132,7 @@ if ($resql) if ($num == 1 && (GETPOST("mode") == 'search')) { $objp = $db->fetch_object($resql); - header("Location: ".DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid); + header("Location: ".DOL_URL_ROOT."/product/card.php?id=".$objp->rowid); exit; } diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php index d60a4aab4d0..f20c360de6c 100644 --- a/htdocs/fourn/product/photos.php +++ b/htdocs/fourn/product/photos.php @@ -65,7 +65,7 @@ if ($id) $h=0; - $head[$h][0] = DOL_URL_ROOT."/fourn/product/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/fourn/product/card.php?id=".$object->id; $head[$h][1] = $langs->trans("Card"); $h++; @@ -89,7 +89,7 @@ if ($id) $h++; } - $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/product/card.php?id=".$object->id; $head[$h][1] = $langs->trans("CommercialCard"); $h++; diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 3d3fd9f2dcb..c09f52b8407 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -139,7 +139,7 @@ if ($socid > 0) print "
".dol_print_date($fac->date)."id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."'.$fac->getLibStatut(2,$totalpaye).''.price($fac->total_ttc)."'.price($solde)."'.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.''.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.'
'.dol_print_date($db->jdate($objp->dp))."'; print '      '; // Decalage - print ''.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.'  '.price($objp->amount).''.price($solde)."'.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.''.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.'
'; print ''; - print ''; + print ''; print '"; print "\n"; - print '\n"; print ''; @@ -300,7 +300,7 @@ if ($action == 'create') print ''; print ''; } @@ -372,7 +372,7 @@ if ($action == 'create') $label = (! empty($line->label)?$line->label:$product->label); print ''; } @@ -620,7 +620,7 @@ else $entrepot = new Entrepot($db); $entrepot->fetch($delivery->entrepot_id); print ''; - print ''; + print ''; print ''; } @@ -678,7 +678,7 @@ else print '\n"; - print ''; + print ''; print "\n"; print ""; diff --git a/htdocs/product/fiche.php b/htdocs/product/card.php similarity index 99% rename from htdocs/product/fiche.php rename to htdocs/product/card.php index 5cd4ca7103d..1ddc6dac50b 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/card.php @@ -27,7 +27,7 @@ */ /** - * \file htdocs/product/fiche.php + * \file htdocs/product/card.php * \ingroup product * \brief Page to show product */ @@ -652,7 +652,7 @@ if (empty($reshook)) if ($result > 0) { - header("Location: ".DOL_URL_ROOT."/commande/fiche.php?id=".$commande->id); + header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".$commande->id); exit; } } @@ -1562,7 +1562,7 @@ $formquestionclone=array( if (($action == 'delete' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile))) // Output when action = clone if jmobile or no js || (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) // Always output when not jmobile nor js { - print $form->formconfirm("fiche.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete"); + print $form->formconfirm("card.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete"); } // Clone confirmation diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bd8632e2e1..13a6d1dfa41 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2798,7 +2798,7 @@ class Product extends CommonObject } else if ($option == 'composition') { - $lien = ''; + $lien = ''; $lienfin=''; } else if ($option == 'category') @@ -2807,7 +2807,7 @@ class Product extends CommonObject } else { - $lien = ''; + $lien = ''; $lienfin=''; } $newref=$this->ref; diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/card.php similarity index 98% rename from htdocs/product/composition/fiche.php rename to htdocs/product/composition/card.php index 47f7bf9c42a..efe03b0b024 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/card.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/product/composition/fiche.php + * \file htdocs/product/composition/card.php * \ingroup product * \brief Page de la fiche produit */ @@ -112,7 +112,7 @@ $cancel <> $langs->trans("Cancel") && if ($cancel == $langs->trans("Cancel")) { $action = ''; - header("Location: fiche.php?id=".$_POST["id"]); + header("Location: card.php?id=".$_POST["id"]); exit; } @@ -418,7 +418,7 @@ if ($id > 0 || ! empty($ref)) if (! empty($conf->categorie->enabled)) $rowspan++; print_fiche_titre($langs->trans("ProductToAddSearch"),'',''); - print ''; + print ''; print '
'.$langs->trans("Customer").''.$soc->nom.''.$soc->nom.''; @@ -290,7 +290,7 @@ if ($action == 'create') print "
".$langs->trans("Date")."".dol_print_date($commande->date,'dayhourtext')."'.$langs->trans("Order").''.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref.''; + print ''.$langs->trans("Order").''.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref.''; print "
'.$langs->trans("Warehouse").''; $ents = $entrepot->list_array(); - print ''.img_object($langs->trans("ShowWarehouse"),'stock').' '.$ents[$_GET["entrepot_id"]].''; + print ''.img_object($langs->trans("ShowWarehouse"),'stock').' '.$ents[$_GET["entrepot_id"]].''; print ''; - print ''.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.' - '.$label; + print ''.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.' - '.$label; if ($line->description) print nl2br($line->description); print '
'.$langs->trans("Warehouse").''.$entrepot->libelle.''.$entrepot->libelle.'
'; // Affiche ligne produit - $text = ''; + $text = ''; if ($delivery->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service'); else $text.= img_object($langs->trans('ShowProduct'),'product'); $text.= ' '.$delivery->lines[$i]->product_ref.''; @@ -732,18 +732,18 @@ else if ($delivery->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0) { - print ''.$langs->trans("Validate").''; + print ''.$langs->trans("Validate").''; } if ($user->rights->expedition->livraison->supprimer) { if ($conf->expedition_bon->enabled) { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index ffa17862939..62c089a22af 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -648,7 +648,7 @@ class Livraison extends CommonObject $urlOption=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='sending'; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 6c3ed0db3bc..18d1b7d4e4e 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1402,7 +1402,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $companylink=' ('.$thirdpartystatic->getNomUrl('','').')'; $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')'; } - $logintext=''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'".$objp->code_client.""; print dol_print_date($db->jdate($objp->datef),'day')."
"; - print ''; // User - print ''; + print ''; // Action if ($user->rights->produit->supprimer) { diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index eaad17afd40..d9b3538eb72 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -173,7 +173,7 @@ if ($resql) if ($num == 1 && ($sall or $snom or $sref)) { $objp = $db->fetch_object($resql); - header("Location: fiche.php?id=$objp->rowid"); + header("Location: card.php?id=$objp->rowid"); exit; } diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/card.php similarity index 99% rename from htdocs/product/stats/fiche.php rename to htdocs/product/stats/card.php index 8b366a40958..9600e6c0a44 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/product/stats/fiche.php + * \file htdocs/product/stats/card.php * \ingroup product * \brief Page of product statistics */ diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 97e9a612ae1..82483d59805 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -164,10 +164,10 @@ if ($id > 0 || ! empty($ref)) $var=!$var; print ""; - print '\n"; - print ''; + print ''; print "\n"; print ""; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 22e3e2b30ba..f9056187cec 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -163,7 +163,7 @@ if ($id > 0 || ! empty($ref)) print ""; print '\n"; print "\n"; - print ''; + print ''; print "\n"; print '"; print "\n"; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 518daf2b8f1..60d3b9b50c8 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -170,10 +170,10 @@ if ($id > 0 || ! empty($ref)) $var=!$var; print ""; - print '\n"; - print ''; + print ''; print "\n"; print ""; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 6f717dd4e73..376263e122d 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -169,7 +169,7 @@ if ($id > 0 || ! empty($ref)) $invoicestatic->ref=$objp->facnumber; print $invoicestatic->getNomUrl(1); print "\n"; - print ''; + print ''; print "\n"; print '"; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 4cbeaec7e76..2f1d37602ce 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -172,7 +172,7 @@ if ($id > 0 || ! empty($ref)) $supplierinvoicestatic->ref=$objp->facnumber; print $supplierinvoicestatic->getNomUrl(1); print "\n"; - print ''; + print ''; print "\n"; print ""; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index e9a78f18b05..ad81e93e299 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -160,7 +160,7 @@ if ($id > 0 || ! empty($ref)) print ''."\n"; - print ''; + print ''; print '"; print "\n"; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/card.php similarity index 97% rename from htdocs/product/stock/fiche.php rename to htdocs/product/stock/card.php index 366f3b040b8..950b9b4e82b 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/card.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/product/stock/fiche.php + * \file htdocs/product/stock/card.php * \ingroup stock * \brief Page fiche entrepot */ @@ -73,7 +73,7 @@ if ($action == 'add' && $user->rights->stock->creer) $id = $object->create($user); if ($id > 0) { - header("Location: fiche.php?id=".$id); + header("Location: card.php?id=".$id); exit; } @@ -159,7 +159,7 @@ if ($action == 'create') { print_fiche_titre($langs->trans("NewWarehouse")); - print "\n"; + print "\n"; print ''; print ''; print ''."\n"; @@ -336,12 +336,12 @@ else if (empty($action)) { if ($user->rights->stock->creer) - print "id."\">".$langs->trans("Modify").""; + print "id."\">".$langs->trans("Modify").""; else print "".$langs->trans("Modify").""; if ($user->rights->stock->supprimer) - print "id."\">".$langs->trans("Delete").""; + print "id."\">".$langs->trans("Delete").""; else print "".$langs->trans("Delete").""; } @@ -491,7 +491,7 @@ else { $langs->trans("WarehouseEdit"); - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 78d4cc55a4e..fb3882c3bad 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -513,7 +513,7 @@ class Entrepot extends CommonObject $result=''; - $lien=''; + $lien=''; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"),'stock').$lienfin.' '); diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index faea23ab770..d2078d473e7 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -89,7 +89,7 @@ if ($result) $objp = $db->fetch_object($result); $var=!$var; print ""; - print "\n"; + print "\n"; print ''; print "\n"; $i++; @@ -146,10 +146,10 @@ if ($resql) $var=!$var; print ""; print ''; - print "\n"; - print '\n"; print '"; - print ''; + print ''; // Location print ''; // PMP value diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 5ebb36a7054..d0b0d5d4f53 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -260,7 +260,7 @@ if ($resql) $var = !$var; if (!dispatched($obj->rowid) && (!$sproduct || in_array($sproduct, getProducts($obj->rowid)))) { - $href = DOL_URL_ROOT . '/fourn/commande/fiche.php?id=' . $obj->rowid; + $href = DOL_URL_ROOT . '/fourn/commande/card.php?id=' . $obj->rowid; print ''. // Ref ''; // Company - $href = DOL_URL_ROOT . '/fourn/fiche.php?socid=' . $obj->socid; + $href = DOL_URL_ROOT . '/fourn/card.php?socid=' . $obj->socid; print '"; - print ''; + print ''; print ''; // PMP value print ''; print ''; print ''; diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index 1ad1eeceed5..b25129580ff 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -160,7 +160,7 @@ if ($socid) { if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create)) { - print ''.$langs->trans("AddAction").''; + print ''.$langs->trans("AddAction").''; } else { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 27630fa4dfe..f076812d9e2 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -242,14 +242,14 @@ abstract class ActionsCardCommon if ( $this->object->client == 1 ) { - header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=".$this->object->id); + header("Location: ".DOL_URL_ROOT."/comm/card.php?socid=".$this->object->id); return; } else { if ( $this->object->fournisseur == 1 ) { - header("Location: ".DOL_URL_ROOT."/fourn/fiche.php?socid=".$this->object->id); + header("Location: ".DOL_URL_ROOT."/fourn/card.php?socid=".$this->object->id); return; } else diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index cfd37436b72..071f0ff9b65 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1685,15 +1685,15 @@ class Societe extends CommonObject if ($option == 'customer' || $option == 'compta') { - $lien = 'global->SOCIETE_DISABLE_PROSPECTS)) { - $lien = ''; + print ''; print img_object($langs->trans("ShowUser"),"user").' '; print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n"; print ' '; @@ -253,7 +253,7 @@ if ($_GET["socid"]) $obj = $db->fetch_object($resql); $var=!$var; print "'; - print ''; + print ''; print ''; $i++; } diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 457542d21f3..1832e7851ea 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -94,7 +94,7 @@ if ($result) $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; print "\n"; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 8317a628c6a..cf801c0b3dd 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -340,8 +340,8 @@ if (empty($reshook)) else { $url=$_SERVER["PHP_SELF"]."?socid=".$object->id; - if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/fiche.php?socid=".$object->id; - else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/fiche.php?socid=".$object->id; + if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id; + else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id; header("Location: ".$url); exit; diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index 60e114be6a5..9e82e1a052f 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -254,7 +254,7 @@ if ($id > 0 || ! empty($ref)) print "\n"; // Lastname - print "'; print ''."\n"; @@ -1574,7 +1574,7 @@ else print '"; print ''; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index d0766655d6a..547a89d3451 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -101,7 +101,7 @@ if ($resql) $var=!$var; print ""; - print '"; - print '"; - print '"; - print ' - + From 3a38153889907238094121a24f56bd306dcf3ac0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Sep 2014 22:42:43 +0200 Subject: [PATCH 0023/1190] Typo error --- build/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/debian/control b/build/debian/control index f4f9e12aa58..fc0cee30319 100755 --- a/build/debian/control +++ b/build/debian/control @@ -68,4 +68,4 @@ Description: Web based software to manage a company or foundation PDF exports, And a lot more modules... . - You can also add third parties external modules or develop yours. + You can also add external modules from third parties or develop yours. From ab9226aab6bc4a53574e8dab2c81ed4c84214f53 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 19 Sep 2014 05:55:54 +0200 Subject: [PATCH 0024/1190] Delete elements have a link with old module ventilation - Replace today by module Accounting Expert --- htdocs/compta/ventilation/fiche.php | 165 ------------------ .../compta/ventilation/fournisseur/fiche.php | 149 ---------------- .../compta/ventilation/fournisseur/index.php | 127 -------------- .../compta/ventilation/fournisseur/lignes.php | 114 ------------ .../compta/ventilation/fournisseur/liste.php | 105 ----------- htdocs/compta/ventilation/index.php | 102 ----------- htdocs/compta/ventilation/lignes.php | 141 --------------- htdocs/compta/ventilation/liste.php | 129 -------------- htdocs/core/lib/files.lib.php | 6 +- htdocs/core/menus/init_menu_auguria.sql | 10 -- htdocs/core/menus/standard/eldy.lib.php | 4 +- htdocs/core/modules/modComptabilite.class.php | 24 --- htdocs/langs/ar_SA/admin.lang | 3 - htdocs/langs/bg_BG/admin.lang | 3 - htdocs/langs/bs_BA/admin.lang | 3 - htdocs/langs/ca_ES/admin.lang | 3 - htdocs/langs/cs_CZ/admin.lang | 3 - htdocs/langs/da_DK/admin.lang | 3 - htdocs/langs/de_DE/admin.lang | 3 - htdocs/langs/el_GR/admin.lang | 3 - htdocs/langs/en_US/admin.lang | 3 - htdocs/langs/es_ES/admin.lang | 3 - htdocs/langs/et_EE/admin.lang | 3 - htdocs/langs/eu_ES/admin.lang | 3 - htdocs/langs/fa_IR/admin.lang | 3 - htdocs/langs/fi_FI/admin.lang | 3 - htdocs/langs/fr_FR/admin.lang | 3 - htdocs/langs/fr_FR/compta.lang | 3 - htdocs/langs/he_IL/admin.lang | 3 - htdocs/langs/hr_HR/admin.lang | 3 - htdocs/langs/hu_HU/admin.lang | 3 - htdocs/langs/id_ID/admin.lang | 3 - htdocs/langs/is_IS/admin.lang | 3 - htdocs/langs/it_IT/admin.lang | 3 - htdocs/langs/ja_JP/admin.lang | 3 - htdocs/langs/ko_KR/admin.lang | 3 - htdocs/langs/lt_LT/admin.lang | 3 - htdocs/langs/lv_LV/admin.lang | 3 - htdocs/langs/mk_MK/admin.lang | 3 - htdocs/langs/nb_NO/admin.lang | 3 - htdocs/langs/nl_NL/admin.lang | 3 - htdocs/langs/pl_PL/admin.lang | 3 - htdocs/langs/pt_BR/admin.lang | 3 - htdocs/langs/pt_PT/admin.lang | 3 - htdocs/langs/ro_RO/admin.lang | 3 - htdocs/langs/ru_RU/admin.lang | 3 - htdocs/langs/sk_SK/admin.lang | 3 - htdocs/langs/sl_SI/admin.lang | 3 - htdocs/langs/sq_AL/admin.lang | 3 - htdocs/langs/sv_SE/admin.lang | 3 - htdocs/langs/th_TH/admin.lang | 3 - htdocs/langs/tr_TR/admin.lang | 3 - htdocs/langs/uk_UA/admin.lang | 3 - htdocs/langs/uz_UZ/admin.lang | 3 - htdocs/langs/vi_VN/admin.lang | 3 - htdocs/langs/zh_CN/admin.lang | 3 - htdocs/langs/zh_TW/admin.lang | 3 - 57 files changed, 5 insertions(+), 1206 deletions(-) delete mode 100644 htdocs/compta/ventilation/fiche.php delete mode 100644 htdocs/compta/ventilation/fournisseur/fiche.php delete mode 100644 htdocs/compta/ventilation/fournisseur/index.php delete mode 100644 htdocs/compta/ventilation/fournisseur/lignes.php delete mode 100644 htdocs/compta/ventilation/fournisseur/liste.php delete mode 100644 htdocs/compta/ventilation/index.php delete mode 100644 htdocs/compta/ventilation/lignes.php delete mode 100644 htdocs/compta/ventilation/liste.php diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php deleted file mode 100644 index b55f2b59475..00000000000 --- a/htdocs/compta/ventilation/fiche.php +++ /dev/null @@ -1,165 +0,0 @@ - - * Copyright (C) 2005-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/compta/ventilation/fiche.php - * \ingroup compta - * \brief Page fiche ventilation - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; - -$langs->load("bills"); - -$mesg = ''; - -if (!$user->rights->compta->ventilation->creer) accessforbidden(); - - -/* - * Actions - */ - -if ($_POST["action"] == 'ventil' && $user->rights->compta->ventilation->creer) -{ - $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet"; - $sql .= " SET fk_code_ventilation = ".$_POST["codeventil"]; - $sql .= " WHERE rowid = ".$_GET["id"]; - - $db->query($sql); -} - -llxHeader("","","Fiche ventilation"); - -if ($cancel == $langs->trans("Cancel")) -{ - $action = ''; -} -/* - * - * - */ - -$sql = "SELECT rowid, numero, intitule"; -$sql .= " FROM ".MAIN_DB_PREFIX."compta_compte_generaux"; -$sql .= " ORDER BY numero ASC"; - -$result = $db->query($sql); -if ($result) -{ - $num = $db->num_rows($result); - $i = 0; - - while ($i < $num) - { - $row = $db->fetch_row($result); - $cgs[$row[0]] = $row[1] . ' ' . $row[2]; - $i++; - } -} - -/* - * Cr�ation - * - */ -$form = new Form($db); -$facture_static=new Facture($db); - -if($_GET["id"]) -{ - $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,"; - $sql .= " l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,"; - $sql .= " l.date_start as date_start, l.date_end as date_end,"; - $sql .= " l.fk_code_ventilation "; - $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l"; - $sql .= " , ".MAIN_DB_PREFIX."facture as f"; - $sql .= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND l.rowid = ".$_GET["id"]; - - $result = $db->query($sql); - if ($result) - { - $num_lignes = $db->num_rows($result); - $i = 0; - - if ($num_lignes) - { - - $objp = $db->fetch_object($result); - - - if($objp->fk_code_ventilation == 0) - { - print ''."\n"; - print ''; - print ''; - } - - - print_fiche_titre("Ventilation"); - - print '
'; print ''; print $langs->trans("KeywordFilter").'   '; @@ -444,7 +444,7 @@ if ($id > 0 || ! empty($ref)) if ($action == 'search') { print '
'; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index cd4cf11e80c..ebcd3245e7d 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -210,7 +210,7 @@ else if ($num == 1 && ($sall || $snom || $sref || $sbarcode) && $action != 'list') { $objp = $db->fetch_object($resql); - header("Location: fiche.php?id=".$objp->rowid); + header("Location: card.php?id=".$objp->rowid); exit; } diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 523926d5084..8607cfeeb8e 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -141,7 +141,7 @@ if ($result) $var=!$var; print "
'; + print ''; if ($objp->type==1) print img_object($langs->trans("ShowService"),"service"); else print img_object($langs->trans("ShowProduct"),"product"); print " "; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index cc566e3ba6d..6971a5bb125 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -801,7 +801,7 @@ if ($result) { print '' . price($objp->price_min_ttc) . '' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '
'.img_object($langs->trans("ShowOrder"),"order").' '; + print ''.img_object($langs->trans("ShowOrder"),"order").' '; print $objp->ref; print "'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'".$objp->code_client.""; print dol_print_date($db->jdate($objp->date_commande))."
'.$commandestatic->getNomUrl(1)."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'".$objp->code_client."'.dol_print_date($db->jdate($objp->date_commande))."".$objp->qty."
'.img_object($langs->trans("ShowContract"),"contract").' '; + print ''.img_object($langs->trans("ShowContract"),"contract").' '; print $objp->rowid; print "'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'".$objp->code_client.""; print dol_print_date($db->jdate($objp->date_contrat))."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'".$objp->code_client."'; print dol_print_date($db->jdate($objp->datef),'day')."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'".$objp->code_client.""; print dol_print_date($db->jdate($objp->datef))."'.img_object($langs->trans("ShowPropal"),"propal").' '; print $objp->ref; print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; print dol_print_date($db->jdate($objp->datep))."".$objp->qty."
rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."'.$entrepot->LibStatut($objp->statut,5).'
'.dol_print_date($db->jdate($objp->datem),'dayhour').'rowid\">"; + print "rowid\">"; print img_object($langs->trans("ShowProduct"),"product").' '.$objp->produit; print "'; + print ''; print img_object($langs->trans("ShowWarehouse"),"stock").' '.$objp->stock; print "'; diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index c63e4cfc898..0d7b3c60c23 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -104,7 +104,7 @@ if ($result) { $objp = $db->fetch_object($result); print "
'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.''.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.''.$objp->lieu.'
'. @@ -269,7 +269,7 @@ if ($resql) ''. ''. img_object($langs->trans('ShowCompany'), 'company'). ' '. diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 03c779c0991..6f5cb7ae578 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -103,7 +103,7 @@ if ($result) { $objp = $db->fetch_object($result); print "
'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.''.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.''.$objp->lieu.''; diff --git a/htdocs/projet/fiche.php b/htdocs/projet/card.php similarity index 96% rename from htdocs/projet/fiche.php rename to htdocs/projet/card.php index 978e142b1ad..e801598b530 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/projet/fiche.php + * \file htdocs/projet/card.php * \ingroup projet * \brief Project card */ @@ -171,7 +171,7 @@ if (empty($reshook)) { $db->commit(); - header("Location:fiche.php?id=".$object->id); + header("Location:card.php?id=".$object->id); exit; } else @@ -685,7 +685,7 @@ else { if ($userWrite > 0) { - print ''.$langs->trans("Valid").''; + print ''.$langs->trans("Valid").''; } else { @@ -698,7 +698,7 @@ else { if ($userWrite > 0) { - print ''.$langs->trans("Modify").''; + print ''.$langs->trans("Modify").''; } else { @@ -711,7 +711,7 @@ else { if ($userWrite > 0) { - print ''.$langs->trans("Close").''; + print ''.$langs->trans("Close").''; } else { @@ -724,7 +724,7 @@ else { if ($userWrite > 0) { - print ''.$langs->trans("ReOpen").''; + print ''.$langs->trans("ReOpen").''; } else { @@ -737,7 +737,7 @@ else { if ($userWrite > 0) { - print ''.$langs->trans('ToClone').''; + print ''.$langs->trans('ToClone').''; } else { @@ -750,7 +750,7 @@ else { if ($userDelete > 0) { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } else { diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 8cbaea46c39..00eb39ac3c9 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -759,7 +759,7 @@ class Project extends CommonObject } else { - $lien = ''; + $lien = ''; $lienfin = ''; } } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 52149da9039..8899f3891e8 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -350,7 +350,7 @@ foreach ($listofreferent as $key => $value) } if ($key == 'order' && ! empty($conf->commande->enabled) && $user->rights->commande->creer) { - print ''.$langs->trans("AddCustomerOrder").''; + print ''.$langs->trans("AddCustomerOrder").''; } if ($key == 'invoice' && ! empty($conf->facture->enabled) && $user->rights->facture->creer) { @@ -361,11 +361,11 @@ foreach ($listofreferent as $key => $value) { if ($key == 'order_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer) { - print ''.$langs->trans("AddSupplierInvoice").''; + print ''.$langs->trans("AddSupplierInvoice").''; } if ($key == 'invoice_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer) { - print ''.$langs->trans("AddSupplierOrder").''; + print ''.$langs->trans("AddSupplierOrder").''; } } } diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index d986c1ca079..7e324841af2 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -222,7 +222,7 @@ if ( $resql ) $projectstatic->ref=$obj->ref; $projectstatic->title=$obj->title; print $projectstatic->getNomUrl(1,'',16); - //print ''.$obj->title.''; + //print ''.$obj->title.''; print ''.$obj->label.''.dol_print_date($db->jdate($obj->dateo)).'
"; - print ''; + print ''; print img_object($langs->trans("ShowUser"),"user").' '; print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n"; print ''; diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/card.php similarity index 98% rename from htdocs/societe/notify/fiche.php rename to htdocs/societe/notify/card.php index 0f1b7c010f9..8604b229134 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/societe/notify/fiche.php + * \file htdocs/societe/notify/card.php * \ingroup societe notification * \brief Tab for notifications of third party */ @@ -321,7 +321,7 @@ if ($result > 0) if ($obj->type == 'email') print $langs->trans("Email"); if ($obj->type == 'sms') print $langs->trans("SMS"); print ''.img_delete().''.img_delete().'
socid."\">".$obj->nom."socid."\">".$obj->nom."".dolGetFirstLastname($obj->firstname, $obj->lastname)."".$obj->titre."
rowid\">"; + print "rowid\">"; print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : ''); print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : ''); print (! empty($companyname) ? dol_trunc($companyname, 32) : ''); diff --git a/htdocs/user/fiche.php b/htdocs/user/card.php similarity index 98% rename from htdocs/user/fiche.php rename to htdocs/user/card.php index ffe6336bc41..996d7e7440d 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/card.php @@ -25,7 +25,7 @@ */ /** - * \file htdocs/user/fiche.php + * \file htdocs/user/card.php * \brief Tab of user card */ @@ -1068,7 +1068,7 @@ else */ if ($action == 'password') { - print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1); + print $form->formconfirm("card.php?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1); } /* @@ -1076,7 +1076,7 @@ else */ if ($action == 'passwordsend') { - print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1); + print $form->formconfirm("card.php?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1); } /* @@ -1084,7 +1084,7 @@ else */ if ($action == 'disable') { - print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1); + print $form->formconfirm("card.php?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1); } /* @@ -1092,7 +1092,7 @@ else */ if ($action == 'enable') { - print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1); + print $form->formconfirm("card.php?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1); } /* @@ -1100,7 +1100,7 @@ else */ if ($action == 'delete') { - print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1); + print $form->formconfirm("card.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1); } /* @@ -1352,7 +1352,7 @@ else $contact->fetch($object->contact_id); if ($object->societe_id > 0) print ' / '; else print '
'; - print ''.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).''; + print ''.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).''; } print '
'; if ($caneditgroup) { - print ''.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.''; + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.''; } else { @@ -2029,7 +2029,7 @@ else { $contact = new Contact($db); $contact->fetch($object->contact_id); - print ' / '.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).''; + print ' / '.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).''; } } else diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 0e4c5596194..5177bb3dbed 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1775,7 +1775,7 @@ class User extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; if ($withpicto) @@ -1800,12 +1800,12 @@ class User extends CommonObject $result=''; - $lien = ''; + $lien = ''; $lienfin=''; if ($option == 'xxx') { - $lien = ''; + $lien = ''; $lienfin=''; } diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/card.php similarity index 98% rename from htdocs/user/group/fiche.php rename to htdocs/user/group/card.php index f97ef35ae6e..c5f8ef6ad89 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/user/group/fiche.php + * \file htdocs/user/group/card.php * \brief Onglet groupes utilisateurs */ @@ -412,7 +412,7 @@ else print "
'; - print ''.img_object($langs->trans("ShowUser"),"user").' '.$useringroup->login.''; + print ''.img_object($langs->trans("ShowUser"),"user").' '.$useringroup->login.''; if ($useringroup->admin && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar'); else if ($useringroup->admin) print img_picto($langs->trans("Administrator"),'star'); print '
'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; if (! $obj->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 824f505fddd..c888dcdf632 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -26,7 +26,7 @@ require '../main.inc.php'; if (! $user->rights->user->user->lire && ! $user->admin) { // Redirection vers la page de l'utilisateur - header("Location: fiche.php?id=".$user->id); + header("Location: card.php?id=".$user->id); exit; } @@ -129,7 +129,7 @@ if ($resql) $var=!$var; print "
'.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($obj->firstname,$obj->lastname).''; + print ''.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($obj->firstname,$obj->lastname).''; if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity) { print img_picto($langs->trans("SuperAdministrator"),'redstar'); @@ -230,7 +230,7 @@ if ($canreadperms) $var=!$var; print "
'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; if (! $obj->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 8b7ba96a7f3..30b0c9b3a8e 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -145,7 +145,7 @@ if ($result) $var=!$var; print "
'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''; + print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''; if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity) { print img_picto($langs->trans("SuperAdministrator"),'redstar'); diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index b1577cb26a2..1de66b491ed 100755 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -226,7 +226,7 @@ if ($resql) { //Update status communication of thirdparty prospect $sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj2->rowid.")"; - dol_syslog("fiche.php: set prospect thirdparty status", LOG_DEBUG); + dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG); $resqlx=$db->query($sqlx); if (! $resqlx) { @@ -236,7 +236,7 @@ if ($resql) //Update status communication of contact prospect $sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj2->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)"; - dol_syslog("fiche.php: set prospect contact status", LOG_DEBUG); + dol_syslog("card.php: set prospect contact status", LOG_DEBUG); $resqlx=$db->query($sqlx); if (! $resqlx) diff --git a/test/selenium/test_thirdparty.xml b/test/selenium/test_thirdparty.xml index 47a9b8091a9..dbc24905cbf 100644 --- a/test/selenium/test_thirdparty.xml +++ b/test/selenium/test_thirdparty.xml @@ -13,7 +13,7 @@
open/dolibarrnew/fourn/fiche.php?socid=14/dolibarrnew/fourn/card.php?socid=14
'; - - // Ref facture - print ''; - $facture_static->ref=$objp->facnumber; - $facture_static->id=$objp->facid; - print ''; - print ''; - - print ''; - print ''; - print ''; - - if($objp->fk_code_ventilation == 0) - { - print ''; - } - print '
'.$langs->trans("Invoice").''.$facture_static->getNomUrl(1).'
Ligne'.nl2br($objp->description).'
Ventiler dans le compte :'; - - if($objp->fk_code_ventilation == 0) - { - print $form->selectarray("codeventil",$cgs, $objp->fk_code_ventilation); - } - else - { - print $cgs[$objp->fk_code_ventilation]; - } - - print '
 
'; - print ''; - } - else - { - print "Error"; - } - } - else - { - print "Error"; - } -} -else -{ - print "Error ID incorrect"; -} - -$db->close(); - -llxFooter(); diff --git a/htdocs/compta/ventilation/fournisseur/fiche.php b/htdocs/compta/ventilation/fournisseur/fiche.php deleted file mode 100644 index 168b99eea35..00000000000 --- a/htdocs/compta/ventilation/fournisseur/fiche.php +++ /dev/null @@ -1,149 +0,0 @@ - - * Copyright (C) 2005 Simon TOSSER - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/compta/ventilation/fournisseur/fiche.php - * \ingroup compta - * \brief Page fiche ventilation - */ - -require '../../../main.inc.php'; - -$mesg = ''; - -if (!$user->rights->compta->ventilation->creer) accessforbidden(); - -if ($_POST["action"] == 'ventil' && $user->rights->compta->ventilation->creer) -{ - $sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det"; - $sql .= " SET fk_code_ventilation = ".$_POST["codeventil"]; - $sql .= " WHERE rowid = ".$_GET["id"]; - - $db->query($sql); -} - -llxHeader("","","Fiche ventilation"); - -if ($cancel == $langs->trans("Cancel")) -{ - $action = ''; -} -/* - * - * - */ - -$sql = "SELECT rowid, numero, intitule"; -$sql .= " FROM ".MAIN_DB_PREFIX."compta_compte_generaux"; -$sql .= " ORDER BY numero ASC"; - -$result = $db->query($sql); -if ($result) -{ - $num = $db->num_rows($result); - $i = 0; - - while ($i < $num) - { - $row = $db->fetch_row($result); - $cgs[$row[0]] = $row[1] . ' ' . $row[2]; - $i++; - } -} - -/* - * Creation - * - */ -$form = new Form($db); - -if($_GET["id"]) -{ - $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc, l.qty, l.rowid, l.tva_tx, l.fk_code_ventilation "; - $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l"; - $sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f"; - $sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND l.rowid = ".$_GET["id"]; - - $result = $db->query($sql); - - if ($result) - { - $num_lignes = $db->num_rows($result); - $i = 0; - - if ($num_lignes) - { - - $objp = $db->fetch_object($result); - - - if($objp->fk_code_ventilation == 0) - { - print '
'."\n"; - print ''; - print ''; - } - - - print_titre("Ventilation"); - - print ''; - print ''; - print ''; - - print ''; - print ''; - print ''; - - if($objp->fk_code_ventilation == 0) - { - print ''; - } - print '
Facture'.$objp->facnumber.'
Ligne'.stripslashes(nl2br($objp->description)).'
Ventiler dans le compte :'; - - if($objp->fk_code_ventilation == 0) - { - print $form->selectarray("codeventil",$cgs, $objp->fk_code_ventilation); - } - else - { - print $cgs[$objp->fk_code_ventilation]; - } - - print '
 
'; - print '
'; - } - else - { - print "Error"; - } - } - else - { - print "Error"; - } -} -else -{ - print "Error ID incorrect"; -} - -$db->close(); - -llxFooter(); diff --git a/htdocs/compta/ventilation/fournisseur/index.php b/htdocs/compta/ventilation/fournisseur/index.php deleted file mode 100644 index ebd4d2c4af5..00000000000 --- a/htdocs/compta/ventilation/fournisseur/index.php +++ /dev/null @@ -1,127 +0,0 @@ - - * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2005 Simon TOSSER - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/compta/ventilation/fournisseur/index.php - * \ingroup compta - * \brief Page accueil ventilation - */ - -require '../../../main.inc.php'; -$langs->load("suppliers"); - - -llxHeader('','Compta - Ventilation'); - -print_titre("Ventilation Comptable"); - -print ''; - -print '
'; - - - -$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet"; -$sql .= " WHERE fk_code_ventilation = 0"; -$result = $db->query($sql); -if ($result) -{ - $row = $db->fetch_row($result); - $nbfac = $row[0]; - - $db->free($result); -} - -$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."paiement"; -$sql .= " WHERE fk_code_ventilation = 0"; - -$result = $db->query($sql); -if ($result) -{ - $row = $db->fetch_row($result); - $nbp = $row[0]; - - $db->free($result); -} - -$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facture_fourn_det"; -$sql .= " WHERE fk_code_ventilation = 0"; -$result = $db->query($sql); -if ($result) -{ - $row = $db->fetch_row($result); - $nbfacfourn = $row[0]; - - $db->free($result); -} - -/*$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."paiementfourn"; -$sql .= " WHERE fk_code_ventilation = 0"; - -$result = $db->query($sql); -if ($result) -{ - $row = $db->fetch_row($result); - $nbpfourn = $row[0]; - - $db->free($result); -}*/ - -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -//print ''; -print "
Lignes a ventiler
TypeNb
Factures clients'.$nbfac.'
Paiements clients'.$nbp.'
Factures fournisseurs'.$nbfacfourn.'
Paiements fournisseurs'.$nbpfourn.'
\n"; - -print '		'; - -print ''; -print ''; - -$sql = "SELECT count(*), ccg.intitule FROM ".MAIN_DB_PREFIX."facturedet as fd"; -$sql .= " ,".MAIN_DB_PREFIX."compta_compte_generaux as ccg"; -$sql .= " WHERE fd.fk_code_ventilation = ccg.rowid"; -$sql .= " GROUP BY ccg.rowid"; - -$resql = $db->query($sql); -if ($resql) -{ - $i = 0; - $num = $db->num_rows($resql); - - while ($i < $num) - { - - $row = $db->fetch_row($resql); - - print ''; - $i++; - } - $db->free($resql); -} -print "
TypeNb de lignes
'.$row[1].''.$row[0].'
\n"; - -print '
'; - -llxFooter(); - diff --git a/htdocs/compta/ventilation/fournisseur/lignes.php b/htdocs/compta/ventilation/fournisseur/lignes.php deleted file mode 100644 index cb2a0e1439a..00000000000 --- a/htdocs/compta/ventilation/fournisseur/lignes.php +++ /dev/null @@ -1,114 +0,0 @@ - - * Copyright (C) 2005 Simon TOSSER - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/compta/ventilation/fournisseur/lignes.php - * \ingroup facture - * \brief Page de detail des lignes de ventilation d'une facture - */ - -require '../../../main.inc.php'; - -$langs->load("bills"); - -if (!$user->rights->facture->lire) accessforbidden(); -if (!$user->rights->compta->ventilation->creer) accessforbidden(); -/* - * Securite acces client - */ -if ($user->societe_id > 0) accessforbidden(); - -llxHeader(''); - -/* - * Lignes de factures - * - */ -$page = $_GET["page"]; -if ($page < 0) $page = 0; -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc as price, l.qty, l.rowid, l.tva_tx, l.fk_code_ventilation, c.intitule, c.numero "; -$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l"; -$sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f"; -$sql .= " , ".MAIN_DB_PREFIX."compta_compte_generaux as c"; - -$sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND l.fk_code_ventilation <> 0 "; -$sql .= " AND c.rowid = l.fk_code_ventilation"; - -if (dol_strlen(trim($_GET["search_facture"]))) -{ - $sql .= " AND f.facnumber like '%".$_GET["search_facture"]."%'"; -} - -$sql .= " ORDER BY l.rowid DESC"; -$sql .= $db->plimit($limit+1,$offset); - -$result = $db->query($sql); - -if ($result) -{ - $num_lignes = $db->num_rows($result); - $i = 0; - - print_barre_liste("Lignes de facture ventilées",$page,"lignes.php","",$sortfield,$sortorder,'',$num_lignes); - - print '
'; - print ''; - print ""; - print ''; - print ''; - print ''; - print "\n"; - - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - - $var=True; - while ($i < min($num_lignes, $limit)) - { - $objp = $db->fetch_object($result); - $var=!$var; - print ""; - - print ''; - - print ''; - print ''; - print ''; - print ''; - - print ""; - $i++; - } -} -else -{ - print $db->error(); -} - -print "
Facture'.$langs->trans("Description").''.$langs->trans("Montant").''.$langs->trans("Compte").'
   
'.$objp->facnumber.''.stripslashes(nl2br($objp->description)).''.price($objp->price).''.$objp->numero.''.stripslashes($objp->intitule).'
"; - -$db->close(); - -llxFooter(); diff --git a/htdocs/compta/ventilation/fournisseur/liste.php b/htdocs/compta/ventilation/fournisseur/liste.php deleted file mode 100644 index e3eb4cf487d..00000000000 --- a/htdocs/compta/ventilation/fournisseur/liste.php +++ /dev/null @@ -1,105 +0,0 @@ - - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2004 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - - -/** - * \file htdocs/compta/ventilation/liste.php - * \ingroup compta - * \brief Page de ventilation des lignes de facture - */ - -require '../../../main.inc.php'; - -$langs->load("bills"); - -if (!$user->rights->facture->lire) accessforbidden(); -if (!$user->rights->compta->ventilation->creer) accessforbidden(); -/* - * Securite acces client - */ -if ($user->societe_id > 0) accessforbidden(); - - -llxHeader('','Ventilation'); - -/* - * Lignes de factures - * - */ -$page = $_GET["page"]; -if ($page < 0) $page = 0; -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc as price, l.rowid, l.fk_code_ventilation "; -$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l"; -$sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f"; -$sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND fk_code_ventilation = 0"; -$sql .= " ORDER BY l.rowid DESC ".$db->plimit($limit+1,$offset); - -$result = $db->query($sql); -if ($result) -{ - $num_lignes = $db->num_rows($result); - $i = 0; - - print_barre_liste("Lignes de facture à ventiler",$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes); - - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - - $var=True; - while ($i < min($num_lignes, $limit)) - { - $objp = $db->fetch_object($result); - $var=!$var; - print ""; - - print ''; - print ''; - - print ''; - - print ''; - - print ""; - $i++; - } - -print "
Facture'.$langs->trans("Description").'  
'.$objp->facnumber.''.stripslashes(nl2br($objp->description)).''; - print price($objp->price); - print ''; - print img_edit(); - print '
"; - - - -} -else -{ - print $db->error(); -} -$db->close(); - -llxFooter(); diff --git a/htdocs/compta/ventilation/index.php b/htdocs/compta/ventilation/index.php deleted file mode 100644 index 8b9710844a7..00000000000 --- a/htdocs/compta/ventilation/index.php +++ /dev/null @@ -1,102 +0,0 @@ - - * Copyright (C) 2004-2005 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/compta/ventilation/index.php - * \ingroup compta - * \brief Page accueil ventilation - */ - -require '../../main.inc.php'; - -$langs->load("compta"); -$langs->load("bills"); - -llxHeader('','Compta - Ventilation'); - -print_fiche_titre("Ventilation Comptable"); - -//print ''; -//print '
'; -print '
'; - -$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet as fd"; -$sql.= " , ".MAIN_DB_PREFIX."facture as f"; -$sql.= " WHERE fd.fk_code_ventilation = 0"; -$sql.= " AND f.rowid = fd.fk_facture AND f.fk_statut = 1"; - -$result = $db->query($sql); -if ($result) -{ - $row = $db->fetch_row($result); - $nbfac = $row[0]; - - $db->free($result); -} - -$var=true; - -print ''; -print ''; -print ''; -$var=!$var; -print "".''; -$var=!$var; -print "
'.$langs->trans("Lines").'
'.$langs->trans("Type").''.$langs->trans("Nb").'
'.$langs->trans("Invoices").''.$nbfac.'
\n"; - - -//print '
'; -print '
'; - - -print ''; -print ''; - -$sql = "SELECT count(*), ccg.intitule, ccg.rowid,ccg.numero FROM ".MAIN_DB_PREFIX."facturedet as fd"; -$sql.= " ,".MAIN_DB_PREFIX."compta_compte_generaux as ccg"; -$sql.= " WHERE fd.fk_code_ventilation = ccg.rowid"; -$sql.= " GROUP BY ccg.rowid"; - -$resql = $db->query($sql); -if ($resql) -{ - $i = 0; - $num = $db->num_rows($resql); - $var=true; - - while ($i < $num) - { - - $row = $db->fetch_row($resql); - $var=!$var; - print ''; - print ''; - $i++; - } - $db->free($resql); -} -print "
'.$langs->trans("Type").''.$langs->trans("NbOfLines").''.$langs->trans("AccountNumber").''.$langs->trans("TransID").'
'.$row[1].''.$row[0].''.$row[3].''.$row[2].'
\n"; - -//print '
'; -print ''; - - -llxFooter(); - -$db->close(); diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php deleted file mode 100644 index 46276937afe..00000000000 --- a/htdocs/compta/ventilation/lignes.php +++ /dev/null @@ -1,141 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/compta/ventilation/lignes.php - * \ingroup facture - * \brief Page de detail des lignes de ventilation d'une facture - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; - -$langs->load("bills"); -$langs->load("compta"); - -if (!$user->rights->facture->lire) accessforbidden(); -if (!$user->rights->compta->ventilation->creer) accessforbidden(); - -// Securite acces client -if ($user->societe_id > 0) accessforbidden(); - - -llxHeader(''); - -/* -* Lignes de factures -* -*/ -$page = $_GET["page"]; -if ($page < 0) $page = 0; -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, f.total_ttc as price, l.qty, l.rowid, l.tva_tx, l.fk_code_ventilation, c.intitule, c.numero,"; -$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type"; -$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; -$sql.= " , ".MAIN_DB_PREFIX."compta_compte_generaux as c"; -$sql.= " , ".MAIN_DB_PREFIX."facturedet as l"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product"; -$sql.= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND l.fk_code_ventilation <> 0 "; -$sql.= " AND f.entity = ".$conf->entity; -$sql.= " AND c.rowid = l.fk_code_ventilation"; -if (dol_strlen(trim($_GET["search_facture"]))) -{ - $sql .= " AND f.facnumber LIKE '%".$_GET["search_facture"]."%'"; -} - -$sql .= " ORDER BY l.rowid DESC"; -$sql .= $db->plimit($limit+1,$offset); - -$result = $db->query($sql); - -if ($result) -{ - $num_lignes = $db->num_rows($result); - $i = 0; - - print_barre_liste($langs->trans("InvoiceDispatched"),$page,"lignes.php","",$sortfield,$sortorder,'',$num_lignes); - - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - - $facture_static=new Facture($db); - $product_static=new Product($db); - - $var=True; - while ($i < min($num_lignes, $limit)) - { - $objp = $db->fetch_object($result); - $var=!$var; - $codeCompta = $objp->numero.' '.$objp->intitule; - - print ""; - - // Ref facture - $facture_static->ref=$objp->facnumber; - $facture_static->id=$objp->facid; - print ''; - - // Ref produit - $product_static->ref=$objp->product_ref; - $product_static->id=$objp->product_id; - $product_static->type=$objp->type; - print ''; - - print ''; - print ''; - print ''; - print ''; - - print ""; - $i++; - } -} -else -{ - print $db->error(); -} - -print "
'.$langs->trans("Invoice").''.$langs->trans("Ref").''.$langs->trans("Label").''.$langs->trans("Description").''.$langs->trans("Montant").''.$langs->trans("Compte").'
    '; - print ''; - print '
'.$facture_static->getNomUrl(1).''; - if ($product_static->id) print $product_static->getNomUrl(1); - else print ' '; - print ''.dol_trunc($objp->product_label,24).''.nl2br(dol_trunc($objp->description,32)).''.price($objp->price).''.$codeCompta.'
"; - - -llxFooter(); -$db->close(); diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php deleted file mode 100644 index effa7689821..00000000000 --- a/htdocs/compta/ventilation/liste.php +++ /dev/null @@ -1,129 +0,0 @@ - - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2004-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - - -/** - * \file htdocs/compta/ventilation/liste.php - * \ingroup compta - * \brief Page de ventilation des lignes de facture - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; - -$langs->load("compta"); -$langs->load("bills"); - -if (!$user->rights->facture->lire) accessforbidden(); -if (!$user->rights->compta->ventilation->creer) accessforbidden(); - -// Securite acces client -if ($user->societe_id > 0) accessforbidden(); - - -llxHeader('','Ventilation'); - -/* - * Lignes de factures - */ - -$sortfield = GETPOST("sortfield",'alpha'); -$sortorder = GETPOST("sortorder",'alpha'); -$page = GETPOST("page",'int'); -if ($page == -1) { $page = 0; } -$offset = $conf->liste_limit * $page; -$pageprev = $page - 1; -$pagenext = $page + 1; -$limit = $conf->liste_limit; - -$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, f.total as price, l.rowid, l.fk_code_ventilation,"; -$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type"; -$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; -$sql.= " , ".MAIN_DB_PREFIX."facturedet as l"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product"; -$sql.= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND fk_code_ventilation = 0"; -$sql.= " AND f.entity = ".$conf->entity; -$sql.= " ORDER BY l.rowid DESC ".$db->plimit($limit+1,$offset); - -$result = $db->query($sql); -if ($result) -{ - $num_lignes = $db->num_rows($result); - $i = 0; - - print_barre_liste($langs->trans("InvoiceLinesToDispatch"),$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes); - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - - $facture_static=new Facture($db); - $product_static=new Product($db); - - $var=True; - while ($i < min($num_lignes, $limit)) - { - $objp = $db->fetch_object($result); - $var=!$var; - print ""; - - // Ref facture - $facture_static->ref=$objp->facnumber; - $facture_static->id=$objp->facid; - print ''; - - // Ref produit - $product_static->ref=$objp->product_ref; - $product_static->id=$objp->product_id; - $product_static->type=$objp->type; - print ''; - - print ''; - print ''; - - print ''; - - print ''; - - print ""; - $i++; - } - print "
'.$langs->trans("Invoice").''.$langs->trans("Ref").''.$langs->trans("Label").''.$langs->trans("Description").''.$langs->trans("Montant").' 
'.$facture_static->getNomUrl(1).''; - if ($product_static->id) print $product_static->getNomUrl(1); - else print ' '; - print ''.dol_trunc($objp->product_label,24).''.nl2br(dol_trunc($objp->description,32)).''; - print price($objp->price); - print ''; - print img_edit(); - print '
"; -} -else -{ - print $db->error(); -} - -llxFooter(); -$db->close(); diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 8590f63803f..56536fc3240 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1636,14 +1636,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu else $original_file=$conf->facture->dir_output.'/payments/'.$original_file; } - // Wrapping pour les exports de compta + // Wrapping for accounting exports else if ($modulepart == 'export_compta') { - if ($fuser->rights->compta->ventilation->creer || preg_match('/^specimen/i',$original_file)) + if ($fuser->rights->accounting->ventilation->dispatch || preg_match('/^specimen/i',$original_file)) { $accessallowed=1; } - $original_file=$conf->compta->dir_output.'/'.$original_file; + $original_file=$conf->accounting->dir_output.'/'.$original_file; } // Wrapping pour les expedition diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 36291883755..28b0444602a 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -188,16 +188,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'Payments', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); --- Ventilation (accounting) -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'ventil', 6__+MAX_llx_menu__, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/liste.php', 'ToDispatch', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/lignes.php', 'Dispatched', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2404__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2405__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/fiche.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); -- Rapports insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 1d7aa1a5a9a..7c3793d1c6d 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -863,13 +863,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("accountancy"); $newmenu->add("/accountancy/customer/index.php?leftmenu=ventil_customer",$langs->trans("CustomersVentilation"),0,$user->rights->accounting->ventilation->read, '', $mainmenu, 'ventil_customer'); - if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/customer/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->read); + if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/customer/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->dispatch); if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/customer/lines.php",$langs->trans("Dispatched"),1,$user->rights->accounting->ventilation->read); if (! empty($conf->fournisseur->enabled)) { $newmenu->add("/accountancy/supplier/index.php?leftmenu=ventil_supplier",$langs->trans("SuppliersVentilation"),0,$user->rights->accounting->ventilation->read, '', $mainmenu, 'ventil_supplier'); - if (empty($leftmenu) || $leftmenu=="ventil_supplier") $newmenu->add("/accountancy/supplier/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->read); + if (empty($leftmenu) || $leftmenu=="ventil_supplier") $newmenu->add("/accountancy/supplier/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->dispatch); if (empty($leftmenu) || $leftmenu=="ventil_supplier") $newmenu->add("/accountancy/supplier/lines.php",$langs->trans("Dispatched"),1,$user->rights->accounting->ventilation->read); } } diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php index f4f943bc3cc..74002f0065f 100644 --- a/htdocs/core/modules/modComptabilite.class.php +++ b/htdocs/core/modules/modComptabilite.class.php @@ -93,30 +93,6 @@ class modComptabilite extends DolibarrModules $this->rights[$r][3] = 1; $this->rights[$r][4] = 'resultat'; $this->rights[$r][5] = 'lire'; - - $r++; - $this->rights[$r][0] = 96; - $this->rights[$r][1] = 'Parametrer la ventilation'; - $this->rights[$r][2] = 'r'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'ventilation'; - $this->rights[$r][5] = 'parametrer'; - - $r++; - $this->rights[$r][0] = 97; - $this->rights[$r][1] = 'Lire les ventilations de factures'; - $this->rights[$r][2] = 'r'; - $this->rights[$r][3] = 1; - $this->rights[$r][4] = 'ventilation'; - $this->rights[$r][5] = 'lire'; - - $r++; - $this->rights[$r][0] = 98; - $this->rights[$r][1] = 'Ventiler les lignes de factures'; - $this->rights[$r][2] = 'r'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'ventilation'; - $this->rights[$r][5] = 'creer'; } diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index d38f47ae047..0abd2969be1 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -582,9 +582,6 @@ Permission92=إنشاء / تعديل المساهمات الاجتماعية و Permission93=حذف المساهمات الاجتماعية وضريبة القيمة المضافة Permission94=تصدير المساهمات الاجتماعية Permission95=قراءة تقارير -Permission96=ارسال الإعداد -Permission97=قراءة ارسال الفواتير والمحاسبة -Permission98=ارسال الفاتورة 'sخطوط المحاسبة Permission101=قراءة الإرسال Permission102=إنشاء / تعديل الإرسال Permission104=صحة الإرسال diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 9f18e950065..b28cc902eb4 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -582,9 +582,6 @@ Permission92=Създаване / промяна на социалните вн Permission93=Изтриване на социалноосигурителните вноски и ДДС Permission94=Експортиране на социалноосигурителните вноски Permission95=Прочети доклада -Permission96=Настройка на експедиция -Permission97=Фактура за счетоводството експедиция -Permission98=Изпращането фактура линии счетоводни Permission101=Прочети sendings Permission102=Създаване / промяна sendings Permission104=Проверка на sendings diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 74afea9adf9..8d527fff116 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Otpremanje postavki -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index eaebca0fecb..a9dc6ca7622 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -582,9 +582,6 @@ Permission92=Crear/modificar impostos i IVA Permission93=Eliminar impostos i IVA Permission94=Exporta impostos Permission95=Consultar balanços i resultats -Permission96=Parametritzar desglossament -Permission97=Llegir línies de factures -Permission98=Desglossar línies de factures Permission101=Consultar expedicions Permission102=Crear/modificar expedicions Permission104=Validar expedicions diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index 982001ce693..1f0e2230599 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -582,9 +582,6 @@ Permission92=Vytvořit / upravit příspěvky na sociální zabezpečení a dan Permission93=Odstranění sociální příspěvky a daně z přidané hodnoty Permission94=Export příspěvky na sociální zabezpečení Permission95=Přečtěte si zprávy -Permission96=Nastavení zasílání -Permission97=Přečtěte si faktury účetnictví dispečink -Permission98=Po odeslání faktury účetní linky Permission101=Přečtěte si sendings Permission102=Vytvořit / upravit sendings Permission104=Ověřit sendings diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 4e568f96adb..6480df62616 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -582,9 +582,6 @@ Permission92=Opret / ændre sociale bidrag og moms Permission93=Slet sociale bidrag og moms Permission94=Eksporter sociale bidrag Permission95=Læs rapporter -Permission96=Setup lastfordelingen -Permission97=Læs faktura regnskabspool lastfordelingen -Permission98=Ekspeditionscentre faktura's regnskabslinjer Permission101=Læs sendings Permission102=Opret / ændre sendings Permission104=Valider sendings diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 76c256dc01e..5ff8d011e79 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -582,9 +582,6 @@ Permission92=Steuern/Sozialbeiträge erstellen/bearbeiten Permission93=Steuern/Sozialbeiträge löschen Permission94=Sozialbeiträge exportieren Permission95=Berichte einsehen -Permission96=Verbuchung einstellen -Permission97=Rechnungszuweisung einsehen -Permission98=Zuweisung der Rechnungszeilen Permission101=Sendungen einsehen Permission102=Sendungen erstellen/bearbeiten Permission104=Sendungen freigeben diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index c0006d73d07..d3482b561ab 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 13003ea5cf3..d2a597aa7d3 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -584,9 +584,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 6d136f38157..a627f83c8bb 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -582,9 +582,6 @@ Permission92=Crear/modificar impuestos e IVA Permission93=Eliminar impuestos e IVA Permission94=Exportar impuestos Permission95=Consultar balances y resultados -Permission96=Parametrizar desglose -Permission97=Leer líneas de facturas -Permission98=Desglosar líneas de facturas Permission101=Consultar expediciones Permission102=Crear/modificar expediciones Permission104=Validar expediciones diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 8b54a6035fe..3eddc28456e 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -582,9 +582,6 @@ Permission92=Sotsiaal- ja käibemaksu loomine/muutmine Permission93=Sotsiaal- ja käibemaksu kustutamine Permission94=Sotsiaalmaksu eksport Permission95=Aruannete vaatamine -Permission96=Saatmise seadistamine -Permission97=Arvete raamatupidamisse saatmise vaatamine -Permission98=Arvete raamatupidamisse saatmise read Permission101=Saatmiste vaatamine Permission102=Saatmiste loomine/muutmine Permission104=Saatmiste kinnitamine diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index d6df2ee709c..475bf8e4b1e 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index a4dec3598a9..8372785b3d2 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -582,9 +582,6 @@ Permission92=ایجاد / تغییر مشارکتهای اجتماعی و مال Permission93=حذف کمک های اجتماعی و مالیات بر ارزش افزوده Permission94=کمک های اجتماعی صادرات Permission95=دفعات بازدید: گزارش -Permission96=راه اندازی اعزام -Permission97=خوانده شده فاکتور اعزام حسابداری -Permission98=خطوط حسابداری فاکتور اعزام Permission101=خوانده شده sendings Permission102=ایجاد / تغییر sendings Permission104=اعتبارسنجی sendings diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 9e0d48b261b..1e9c918502a 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -582,9 +582,6 @@ Permission92=Luoda / muuttaa sosiaaliturvamaksut ja alv Permission93=Poista sosiaaliturvamaksut ja alv Permission94=Vienti sosiaaliturvamaksut Permission95=Lue raportit -Permission96=Setup lähetyskeskukset -Permission97=Lue laskun kirjanpitotietojen lähetyskeskukset -Permission98=Lähetysvaihetta laskun n kirjanpitotapahtumaa Permission101=Lue sendings Permission102=Luoda / muuttaa sendings Permission104=Validate sendings diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 8fa7ed80885..0ea2d9d51f4 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -584,9 +584,6 @@ Permission92=Créer/modifier les charges et la TVA Permission93=Supprimer les charges et la TVA Permission94=Exporter les charges Permission95=Consulter CA, bilans et résultats -Permission96=Paramétrer la ventilation -Permission97=Lire les lignes de factures -Permission98=Ventiler les lignes de factures Permission101=Consulter les expéditions Permission102=Créer/modifier les expéditions Permission104=Valider les expéditions diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index daf273cee3d..f2d37be1a38 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -164,9 +164,6 @@ NotUsedForGoods=Non utilisé pour les biens ProposalStats=Statistiques sur les propales OrderStats=Statistiques sur les commandes InvoiceStats=Statistiques sur les factures -Dispatch=Ventilation -Dispatched=Ventilés -ToDispatch=A ventiler ThirdPartyMustBeEditAsCustomer=Le tiers doit être défini comme client SellsJournal=Journal des ventes PurchasesJournal=Journal des achats diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index d06a1f0dde4..7f9c373236e 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -582,9 +582,6 @@ Permission92=צור / לשנות לביטוח הלאומי ומס ערך מוס Permission93=מחק לביטוח הלאומי ומס ערך מוסף Permission94=ייצוא הפרשות סוציאליות Permission95=לקרוא דוחות -Permission96=הגדרת שיגור -Permission97=קרא את חשבון חשבונית שיגור -Permission98=שדר הקווים חשבונאות של חשבוניות Permission101=לקרוא sendings Permission102=צור / לשנות sendings Permission104=אמת sendings diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 158b2bdd437..218e2009fd5 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 3a6875cd6c1..64dc34cbf8a 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -582,9 +582,6 @@ Permission92=Létrehozza / módosítja a társadalombiztosítási járulékok é Permission93=Törlés társadalombiztosítási járulékok és az áfa Permission94=Export társadalombiztosítási járulékok Permission95=Olvassa jelentések -Permission96=Setup szállítási -Permission97=Olvassa el szállítási nyilvántartási számla -Permission98=A számla elküldése számviteli vonalak Permission101=Olvassa küldések Permission102=Létrehozza / módosítja küldések Permission104=Érvényesítés küldések diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index c845f70844e..2f855e7e151 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index a648d649de8..80483ecae25 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -582,9 +582,6 @@ Permission92=Búa til / breyta félagslegum framlögum og VSK Permission93=Eyða félagsleg framlög og VSK Permission94=Útflutningur tryggingagjöld Permission95=Lesa skýrslur -Permission96=Skipulag dispatching -Permission97=Lesa Reikningar bókhalds dispatching -Permission98=bókhalds línur Sending Reikningar's Permission101=Lesa sendings Permission102=Búa til / breyta sendings Permission104=Staðfesta sendings diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 0d4332fee0d..e383a6e57f8 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -582,9 +582,6 @@ Permission92=Creare/modificare contributi e iva Permission93=Eliminare contributi e iva Permission94=Esportare contributi Permission95=Vedere report -Permission96=Impostazioni della contabilità -Permission97=Vedere la contabilità delle fatture -Permission98=Contabilità linee delle fatture Permission101=Vedere invii Permission102=Creare/modificare spedizioni Permission104=Convalidare spedizioni diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index c5f883d9c31..9c9d4c0d0cf 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -582,9 +582,6 @@ Permission92=社会貢献とバットを作成/変更 Permission93=社会貢献とバットを削除します。 Permission94=社会貢献をエクスポートします。 Permission95=レポートを読む -Permission96=派遣セットアップ -Permission97=派遣請求書会計を読む -Permission98=請求書の会計の行を派遣 Permission101=sendingsを読む Permission102=sendingsを作成/変更 Permission104=sendingsを検証する diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 2928f5fecd7..76a8938f3b5 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 18fdd228ff1..56b2cf0674f 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -582,9 +582,6 @@ Permission92=Sukurti/keisti socialines įmokas ir PVM Permission93=Ištrinti socialines įmokas ir PVM Permission94=Eksportuoti socialinės įmokas Permission95=Skaityti ataskaitas -Permission96=Atlikimo/įvykdymo nustatymai -Permission97=Skaityti sąskaitų apskaitos atlikimą -Permission98=Atlikti sąskaitos apskaitos eilutes Permission101=Skaityti siuntinius Permission102=Sukurti/keisti siuntinius Permission104=Patvirtinti siuntinius diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 3ffb466ca1d..c839e869079 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -582,9 +582,6 @@ Permission92=Izveidot/labot sociālās iemaksas un PVN Permission93=Dzēst sociālās iemaksas un PVN Permission94=Eksportēt sociālās iemaksas Permission95=Lasīt atskaites -Permission96=Nosūtīšanas iestatīšana -Permission97=Lasīt rēķina grāmatvedību nosūtīšana -Permission98=Nosūtīšanas rēķinu grāmatvedības līnijas Permission101=Lasīt sūtījumus Permission102=Izveidot/mainīt sūtījumus Permission104=Apstiprināt sūtījumus diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index 5edacce6285..d09bf84402e 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index ab94039a15f..8fa90e77d40 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -582,9 +582,6 @@ Permission92=Lage/endre avgifter og MVA Permission93=Slette avgifter og MVA Permission94=Eksporter sosiale bidrag Permission95=Vise rapporter -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice's accountancy lines Permission101=Vise forsendelser Permission102=Lage/endre forsendelser Permission104=Godjenne forsendelser diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 5f351a33161..4e191a84619 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -582,9 +582,6 @@ Permission92=Creëer / wijzig sociale bijdragen en BTW Permission93=Verwijder sociale bijdragen en BTW Permission94=Exporteer sociale bijdragen Permission95=Bekijk de verslagen -Permission96=Verzendingsinstellingen -Permission97=Bekijk factuur boekhouding verzending -Permission98=Verzending van de factuur boekhoudkundige regel Permission101=Bekijk verzendingen Permission102=Creëer / wijzig verzendingen Permission104=Valideer verzendingen diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index a818d93c182..72dd5fc0842 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -582,9 +582,6 @@ Permission92=Tworzenie / modyfikacji składek na ubezpieczenia społeczne i poda Permission93=Usuń składek na ubezpieczenia społeczne i podatku VAT Permission94=Eksport składek na ubezpieczenia społeczne Permission95=Przeczytaj raporty -Permission96=Konfiguracja wysyłek -Permission97=Czytaj faktury rachunkowych wysyłkowe -Permission98=Wysłanie faktury w księgowości linie Permission101=Czytaj sendings Permission102=Utwórz / Modyfikuj sendings Permission104=Validate sendings diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index d9c7953d06f..3014e494d16 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -575,9 +575,6 @@ Permission92=Criar/Modificar Impostos e ICMS Permission93=Eliminar Impostos e ICMS Permission94=Exportar Impostos Sociais Permission95=Consultar balanços e resultados -Permission96=Parametrizar repartição -Permission97=Ler linhas de faturas -Permission98=Repartir linhas de faturas Permission101=Consultar Expedições Permission102=Criar/Modificar Expedições Permission104=Confirmar Expedições diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 19fdcf07f24..85cfc54d096 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -582,9 +582,6 @@ Permission92=Criar/Modificar Impostos e IVA Permission93=Eliminar Impostos e IVA Permission94=Exportar Impostos Sociais Permission95=Consultar balanços e resultados -Permission96=Parametrizar repartição -Permission97=Leer linhas de facturas -Permission98=Repartir linhas de facturas Permission101=Consultar Expedições Permission102=Criar/Modificar Expedições Permission104=Confirmar Expedições diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index 384cbca7ce1..e298ca883b8 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -582,9 +582,6 @@ Permission92=Creare / Modificare a contribuţiilor sociale şi a TVA-ului Permission93=Ştergere a contribuţiilor sociale şi a TVA-ului Permission94=Export contribuţiilor sociale Permission95=Citeşte rapoarte -Permission96=Setup expediţie -Permission97=Citeşte contabilitate factura de expediţie -Permission98=Expedierii facturii de contabilitate linii Permission101=Citeşte sendings Permission102=Creare / Modificare Livrare Permission104=Validează livrari diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 8a13b087e70..ad8925b7feb 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -582,9 +582,6 @@ Permission92=Создать / изменить социальных отчисл Permission93=Удалить социального взноса и налога на добавленную стоимость Permission94=Экспорт социальных взносов Permission95=Читать сообщения -Permission96=Установка диспетчерского -Permission97=Читать счета бухгалтерского диспетчерского -Permission98=Отправка счета в бухгалтерских линий Permission101=Читать отправок Permission102=Создать / изменить отправок Permission104=Проверка отправок diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 257aa133bb6..33fc0967a1d 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -582,9 +582,6 @@ Permission92=Vytvoriť / upraviť príspevky na sociálne zabezpečenie a dane z Permission93=Odstránenie sociálne príspevky a dane z pridanej hodnoty Permission94=Export príspevky na sociálne zabezpečenie Permission95=Prečítajte si správy -Permission96=Nastavenie zasielania -Permission97=Prečítajte si faktúry účtovníctva dispečing -Permission98=Po odoslaní faktúry účtovné linky Permission101=Prečítajte si sendings Permission102=Vytvoriť / upraviť sendings Permission104=Overiť sendings diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index ff646146e9b..49084a49e17 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -582,9 +582,6 @@ Permission92=Kreiranje/spreminjanje socialnih prispevkov in DDV Permission93=Brisanje socialnih prispevkov in DDV Permission94=Izvoz socialnih prispevkov Permission95=Branje poročil -Permission96=Nastavitve odpreme -Permission97=Branje odposlanih računovodskih listin -Permission98=Branje postavk računovodskih listin Permission101=Branje pošiljk Permission102=Kreiranje/spreminjanje pošiljk Permission104=Potrjevanje pošiljk diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index 5edacce6285..d09bf84402e 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 2f72442cb8d..5f565bc5490 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -582,9 +582,6 @@ Permission92=Skapa / ändra sociala avgifter och moms Permission93=Ta bort sociala avgifter och moms Permission94=Export sociala avgifter Permission95=Läs rapporter -Permission96=Setup avsändning -Permission97=Läs faktura bokföring expedierar -Permission98=Dispatch fakturornas bokföringsposter Permission101=Läs sendings Permission102=Skapa / ändra sendings Permission104=Validate sendings diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index 2438be65b08..508231555a8 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 7901a4a402c..7660bf06ad0 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -582,9 +582,6 @@ Permission92=Sosyal katkı payı ve KDV oluştur/düzenle Permission93=Sosyal katkı payı ve KDV sil Permission94=Sosyal katkı payı dışaaktar Permission95=Rapor oku -Permission96=Dağıtım ayarla -Permission97=Fatura kayıtları dağıtımlarını oku -Permission98=Faturaların muhasebesel satırlarını dağıt Permission101=Gönderilenleri oku Permission102=Gönderilenleri oluştur/düzenle Permission104=Gönderilenleri doğrula diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index 5edacce6285..d09bf84402e 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 5edacce6285..d09bf84402e 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index 040fed807a6..df38162024f 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -582,9 +582,6 @@ Permission92=Create/modify social contributions and vat Permission93=Delete social contributions and vat Permission94=Export social contributions Permission95=Read reports -Permission96=Setup dispatching -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index b1657754173..c81842512b0 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -582,9 +582,6 @@ Permission92=建立/修改的社会贡献和增值税 Permission93=删除社会贡献和增值税 Permission94=导出社会贡献 Permission95=阅读报告 -Permission96=设置调度 -Permission97=Read invoice accountancy dispatching -Permission98=Dispatch invoice accountancy lines Permission101=读取发货资讯 Permission102=建立/修改发货单 Permission104=确认发货单 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 7a5926d32f9..8072eb8011e 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -582,9 +582,6 @@ Permission92=建立/修改的社會貢獻和增值稅 Permission93=刪除的社會貢獻和增值稅 Permission94=出口社會貢獻 Permission95=閲讀報告 -Permission96=安裝調度 -Permission97=瞭解會計調度發票 -Permission98=調度發票的會計行 Permission101=讀取出貨資訊 Permission102=建立/修改出貨單 Permission104=驗證出貨單 From d16a1e587e1cf72c6fe586d7919eb7d95daf521d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 19 Sep 2014 09:04:45 +0200 Subject: [PATCH 0025/1190] Trad: Syncro es_ES from transifex --- htdocs/langs/es_ES/admin.lang | 2 ++ htdocs/langs/es_ES/agenda.lang | 13 +++++++------ htdocs/langs/es_ES/dict.lang | 6 ++---- htdocs/langs/es_ES/main.lang | 1 + htdocs/langs/es_ES/salaries.lang | 4 ++++ htdocs/langs/es_ES/users.lang | 1 + 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 6d136f38157..7e07827309a 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, este módulo requiere una versión %s o ErrorDecimalLargerThanAreForbidden=Error, las precisiones superiores a %s no están soportadas. DictionarySetup=Diccionarios Dictionary=Diccionarios +Chartofaccounts=Plan contable +Fiscalyear=Años fiscales ErrorReservedTypeSystemSystemAuto=El uso del tipo 'system' y 'systemauto' está reservado. Puede utilizar 'user' como valor para añadir su propio registro ErrorCodeCantContainZero=El código no puede contener el valor 0 DisableJavascript=Deshabilitar Javascript y funciones Ajax (Recomendado para personas ciegas o navegadores de texto) diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index 2bc22e55b67..b3aa4a58375 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -2,11 +2,11 @@ IdAgenda=ID de evento Actions=Eventos ActionsArea=Área de eventos (acciones y tareas) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendario -Calendars= Calendarios -LocalAgenda=Calendario local +Agenda=Agenda +Agendas=Agendas +Calendar=Calendario +Calendars=Calendarios +LocalAgenda=Calendario interno AffectedTo=Asignada a DoneBy=Realizado por Event=Evento @@ -22,7 +22,7 @@ MenuToDoActions=Eventos incompletos MenuDoneActions=Eventos terminados MenuToDoMyActions=Mis eventos incompletos MenuDoneMyActions=Mis eventos terminados -ListOfEvents=Listado de eventos Dolibarr +ListOfEvents=Listado de eventos (calendario interno) ActionsAskedBy=Eventos registrados por ActionsToDoBy=Eventos asignados a ActionsDoneBy=Eventos realizados por @@ -88,3 +88,4 @@ ExtSiteUrlAgenda=Url de acceso al archivo .ical ExtSiteNoLabel=Sin descripción WorkingTimeRange=Rango temporal WorkingDaysRange=Rango diario +AddEvent=Crear evento diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang index 7b440d71211..42c6d967657 100644 --- a/htdocs/langs/es_ES/dict.lang +++ b/htdocs/langs/es_ES/dict.lang @@ -253,7 +253,6 @@ CivilityMR=Señor CivilityMLE=Señorita CivilityMTRE=Don CivilityDR=Doctor - ##### Currencies ##### Currencyeuros=Euros CurrencyAUD=Dólares Aus. @@ -290,10 +289,10 @@ CurrencyXOF=Francos CFA BCEAO CurrencySingXOF=Franco CFA BCEAO CurrencyXPF=Francos CFP CurrencySingXPF=Franco CFP - CurrencyCentSingEUR=céntimo +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=milésimo - #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Campaña correo @@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Boca a boca DemandReasonTypeSRC_PARTNER=Socio DemandReasonTypeSRC_EMPLOYEE=Empleado DemandReasonTypeSRC_SPONSORING=Patrocinador - #### Paper formats #### PaperFormatEU4A0=Formato 4A0 PaperFormatEU2A0=Formato 2A0 diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 7764545ed0a..d92caea7ab2 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -645,6 +645,7 @@ OptionalFieldsSetup=Configuración de los atributos opcionales URLPhoto=Url de la foto/logo SetLinkToThirdParty=Vincular a otro tercero CreateDraft=Crear borrador +SetToDraft=Volver a borrador ClickToEdit=Clic para editar ObjectDeleted=Objeto %s eliminado ByCountry=Par país diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang index bc4079feb21..c8e3707d5df 100644 --- a/htdocs/langs/es_ES/salaries.lang +++ b/htdocs/langs/es_ES/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable pago de salarios +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable cargas financieras Salary=Salario Salaries=Salarios Employee=Empleado @@ -6,3 +8,5 @@ NewSalaryPayment=Nuevo pago SalaryPayment=Pago de salario SalariesPayments=Pagos de salarios ShowSalaryPayment=Ver pago +THM=Precio medio por hora +TJM=Precio medio por día diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang index 37851adb724..65b6d8ed0a0 100644 --- a/htdocs/langs/es_ES/users.lang +++ b/htdocs/langs/es_ES/users.lang @@ -119,3 +119,4 @@ HierarchicView=Vista jerárquica UseTypeFieldToChange=Modificar el campo Tipo para cambiar OpenIDURL=Dirección OpenID LoginUsingOpenID=Usar OpenID para iniciar sesión +WeeklyHours=Horas semanales From c87e28d5f959b52e367a4ee4cda0d78613cca89e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 19 Sep 2014 09:57:35 +0200 Subject: [PATCH 0026/1190] - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line --- ChangeLog | 1 + htdocs/fourn/facture/fiche.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4331635592..079219e6c7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ For users: - Fix: Extrafield feature select from table should try to translate multiple column when not needed - Fix: cents for indian ruppes are calle paisa and paise. - Fix: Invoices payments may be older than invoices. +- Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index d60059cd17f..98522e21342 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -517,11 +517,11 @@ elseif ($action == 'update_line' && $user->rights->fournisseur->facture->creer) } - $localtax1tx= get_localtax($_POST['tauxtva'], 1, $mysoc,$object->thirdparty); - $localtax2tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty); + $localtax1_tx= get_localtax($_POST['tauxtva'], 1, $mysoc,$object->thirdparty); + $localtax2_tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty); $remise_percent=GETPOST('remise_percent'); - $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1tx, $localtax2tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent); + $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent); if ($result >= 0) { unset($_POST['label']); @@ -617,13 +617,13 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer) $tvatx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']); $npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']); - $localtax1tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty); - $localtax2tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty); + $localtax1_tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty); + $localtax2_tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty); $type = $productsupplier->type; // TODO Save the product supplier ref into database into field ref_supplier (must rename field ref into ref_supplier first) - $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1tx, $localtax2tx, $qty, $idprod, $remise_percent, '', '', 0, $npr); + $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, '', '', 0, $npr); } if ($idprod == -2 || $idprod == 0) { @@ -662,7 +662,7 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer) $price_base_type = 'HT'; //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0 - $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type); + $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type); } else { @@ -670,7 +670,7 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer) $ht = $ttc / (1 + ($tva_tx / 100)); $price_base_type = 'HT'; //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0 - $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type); + $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type); } } From e39373ed9acb288f66f808f06e397bd1d91b1440 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 19 Sep 2014 09:57:35 +0200 Subject: [PATCH 0027/1190] - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line --- ChangeLog | 1 + htdocs/fourn/facture/fiche.php | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24e22202555..531c4802c61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -141,6 +141,7 @@ For users: - Fix: Extrafield feature select from table should try to translate multiple column when not needed - Fix: cents for indian ruppes are calle paisa and paise. - Fix: Invoices payments may be older than invoices. +- Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 9d20c2b9722..49518bdb1e6 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -526,11 +526,11 @@ elseif ($action == 'update_line' && $user->rights->fournisseur->facture->creer) } - $localtax1tx= get_localtax($_POST['tauxtva'], 1, $mysoc,$object->thirdparty); - $localtax2tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty); + $localtax1_tx= get_localtax($_POST['tauxtva'], 1, $mysoc,$object->thirdparty); + $localtax2_tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty); $remise_percent=GETPOST('remise_percent'); - $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1tx, $localtax2tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent); + $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent); if ($result >= 0) { unset($_POST['label']); @@ -626,13 +626,13 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer) $tvatx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']); $npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']); - $localtax1tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty); - $localtax2tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty); + $localtax1_tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty); + $localtax2_tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty); $type = $productsupplier->type; // TODO Save the product supplier ref into database into field ref_supplier (must rename field ref into ref_supplier first) - $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1tx, $localtax2tx, $qty, $idprod, $remise_percent, '', '', 0, $npr); + $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, '', '', 0, $npr); } if ($idprod == -2 || $idprod == 0) { From f9976bdb6af11cc2c1518ee8f55f1bbc29d358eb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Sep 2014 11:03:07 +0200 Subject: [PATCH 0028/1190] Qual: Uniformize field names. --- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 7 +++++++ htdocs/install/mysql/tables/llx_commande.sql | 7 ++++--- htdocs/install/mysql/tables/llx_commande_fournisseur.sql | 9 +++++---- htdocs/install/mysql/tables/llx_facture.sql | 5 +++-- htdocs/install/mysql/tables/llx_facture_fourn.sql | 5 +++-- htdocs/install/mysql/tables/llx_fichinter.sql | 7 ++++--- htdocs/install/mysql/tables/llx_product.sql | 5 +++-- htdocs/install/mysql/tables/llx_propal.sql | 7 ++++--- 8 files changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 635154768bb..229f2dee541 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -19,6 +19,13 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); +ALTER TABLE llx_propal ADD COLUMN fk_user_modif integer after fk_user_author; +ALTER TABLE llx_commande ADD COLUMN fk_user_modif integer after fk_user_author; +ALTER TABLE llx_facture ADD COLUMN fk_user_modif integer after fk_user_author; +ALTER TABLE llx_product ADD COLUMN fk_user_modif integer after fk_user_author; +ALTER TABLE llx_fichinter ADD COLUMN fk_user_modif integer after fk_user_author; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_modif integer after fk_user_author; +ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_modif integer after fk_user_author; ALTER TABLE llx_fichinter ADD COLUMN ref_ext varchar(255); diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 3cf3fdac226..90e8fd7af71 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -36,9 +36,10 @@ create table llx_commande date_valid datetime, -- date de validation date_cloture datetime, -- date de cloture date_commande date, -- date de la commande - fk_user_author integer, -- createur de la commande - fk_user_valid integer, -- valideur de la commande - fk_user_cloture integer, -- auteur cloture + fk_user_author integer, -- user making creation + fk_user_modif integer, -- user making last change + fk_user_valid integer, -- user validating + fk_user_cloture integer, -- user closing source smallint, fk_statut smallint default 0, amount_ht real default 0, diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index d8076c1c06c..2ecf9e10442 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -30,16 +30,17 @@ create table llx_commande_fournisseur ref_supplier varchar(30), fk_soc integer NOT NULL, - fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande + fk_projet integer DEFAULT 0, -- project id tms timestamp, date_creation datetime, -- date de creation date_valid datetime, -- date de validation date_approve datetime, -- date de approve date_commande date, -- date de la commande - fk_user_author integer, -- createur de la commande - fk_user_valid integer, -- valideur de la commande - fk_user_approve integer, -- auteur approve + fk_user_author integer, -- user making creation + fk_user_modif integer, -- user making last change + fk_user_valid integer, -- user validating + fk_user_approve integer, -- user approving source smallint NOT NULL, fk_statut smallint default 0, amount_ht real default 0, diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 2522ee7a73e..433bef887f1 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -56,8 +56,9 @@ create table llx_facture fk_statut smallint DEFAULT 0 NOT NULL, - fk_user_author integer, -- createur de la facture - fk_user_valid integer, -- valideur de la facture + fk_user_author integer, -- user making creation + fk_user_modif integer, -- user making last change + fk_user_valid integer, -- user validating fk_facture_source integer, -- facture origine si facture avoir fk_projet integer DEFAULT NULL, -- projet auquel est associee la facture diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 2bb85f8400e..3a71c2455aa 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -52,8 +52,9 @@ create table llx_facture_fourn fk_statut smallint DEFAULT 0 NOT NULL, - fk_user_author integer, -- createur de la facture - fk_user_valid integer, -- valideur de la facture + fk_user_author integer, -- user making creation + fk_user_modif integer, -- user making last change + fk_user_valid integer, -- user validating fk_facture_source integer, -- facture origine si facture avoir fk_projet integer, -- projet auquel est associee la facture diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 242710a0993..58f953c7196 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -29,9 +29,10 @@ create table llx_fichinter tms timestamp, datec datetime, -- date de creation date_valid datetime, -- date de validation - datei date, -- date de livraison du bon d'intervention - fk_user_author integer, -- createur de la fiche - fk_user_valid integer, -- valideur de la fiche + datei date, -- date de livraison du bon d'intervention + fk_user_author integer, -- user making creation + fk_user_modif integer, -- user making last change + fk_user_valid integer, -- valideur de la fiche fk_statut smallint DEFAULT 0, duree real, -- duree totale de l'intervention description text, diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 0ab9a24785c..e9703fc90cf 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -48,8 +48,9 @@ create table llx_product recuperableonly integer NOT NULL DEFAULT '0', -- French NPR VAT localtax1_tx double(6,3) DEFAULT 0, -- Spanish local VAT 1 localtax2_tx double(6,3) DEFAULT 0, -- Spanish local VAT 2 - fk_user_author integer DEFAULT NULL, - tosell tinyint DEFAULT 1, -- Product you sell + fk_user_author integer DEFAULT NULL, -- user making creation + fk_user_modif integer, -- user making last change + tosell tinyint DEFAULT 1, -- Product you sell tobuy tinyint DEFAULT 1, -- Product you buy tobatch tinyint DEFAULT 0 NOT NULL, -- Is it a product that need a batch or eat-by management fk_product_type integer DEFAULT 0, -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module) diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index c9ab3ecd138..90996073021 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -38,9 +38,10 @@ create table llx_propal fin_validite datetime, -- date de fin de validite date_valid datetime, -- date de validation date_cloture datetime, -- date de cloture - fk_user_author integer, -- createur de la propale - fk_user_valid integer, -- valideur de la propale - fk_user_cloture integer, -- cloture de la propale signee ou non signee + fk_user_author integer, -- user making creation + fk_user_modif integer, -- user making last change + fk_user_valid integer, -- user validating + fk_user_cloture integer, -- user closing (signed or not) fk_statut smallint DEFAULT 0 NOT NULL, price real DEFAULT 0, -- (obsolete) remise_percent real DEFAULT 0, -- remise globale relative en pourcent (obsolete) From 7e491c479c89bb99b4ccd410d37a82ee3875bd76 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Sep 2014 11:24:47 +0200 Subject: [PATCH 0029/1190] Add accountancy language file --- .tx/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.tx/config b/.tx/config index fcd276390ee..a89b56c1013 100644 --- a/.tx/config +++ b/.tx/config @@ -2,6 +2,12 @@ host = https://www.transifex.com lang_map = uz: uz_UZ +[dolibarr.accountancy] +file_filter = htdocs/langs//accountancy.lang +source_file = htdocs/langs/en_US/accountancy.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.admin] file_filter = htdocs/langs//admin.lang source_file = htdocs/langs/en_US/admin.lang From ca3c5d951319be22d5a10b5714358d535867f9c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Sep 2014 14:36:55 +0200 Subject: [PATCH 0030/1190] Fix: invalid list of params Fix: loading of sql menu --- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/admin/menus/index.php | 4 ++-- htdocs/compta/bank/rappro.php | 6 ++++-- htdocs/core/lib/functions.lib.php | 18 ++++++++++-------- htdocs/core/menus/init_menu_auguria.sql | 20 ++++++++++---------- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index c3fdd1176a1..6ddae4e4a33 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -276,7 +276,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ $db->begin(); // Create subscription - $crowid=$object->cotisation($datecotisation, $cotisation, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend, $option); + $crowid=$object->cotisation($datecotisation, $cotisation, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend); if ($crowid <= 0) { $error++; diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index a866ecd9a70..215f2eae069 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -324,8 +324,8 @@ if ($conf->use_javascript_ajax) '   '.$titre.''. '		'. ''.img_edit('default',0,'class="menuEdit" id="edit'.$menu['rowid'].'"').' '. - ''.img_edit_add('default',0,'class="menuNew" id="new'.$menu['rowid'].'"').' '. - ''.img_delete('default',0,'class="menuDel" id="del'.$menu['rowid'].'"').' '. + ''.img_edit_add('default').' '. + ''.img_delete('default').' '. ''.img_picto("Monter","1uparrow").''.img_picto("Descendre","1downarrow").''. '
' ); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 37c27afc0b6..293c12df422 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -263,11 +263,13 @@ if ($resql) { print '		'; print ''.dol_print_date($db->jdate($objp->dv),"day").""; - print '   '; + print '  '; + print ''; print ''; print img_edit_remove() . " "; print ''; - print img_edit_add() .""; + print img_edit_add() .""; + print ''; print '
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php index 2da54e77712..712f60f25cd 100644 --- a/htdocs/categories/admin/categorie_extrafields.php +++ b/htdocs/categories/admin/categorie_extrafields.php @@ -65,7 +65,7 @@ llxHeader('',$langs->trans("Categories"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'setup'); -$head = categoriesadmin_prepare_head(null); +$head = categoriesadmin_prepare_head(); dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), 0, 'category'); diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 7f8ceac853e..e68d2e416f8 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -396,7 +396,7 @@ else if ($id || $ref) llxHeader("","",$langs->trans("Member")); - $head=member_prepare_head($member, $user); + $head=member_prepare_head($member); $titre=$langs->trans("Member"); $picto='user'; dol_fiche_head($head, 'category', $titre,0,$picto); @@ -471,7 +471,7 @@ else if ($id || $ref) llxHeader("","",$langs->trans("Contact")); - $head=contact_prepare_head($object, $user); + $head=contact_prepare_head($object); $titre=$langs->trans("ContactsAddresses"); $picto='contact'; dol_fiche_head($head, 'category', $titre,0,$picto); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 393082f3427..434cc92dcb6 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -258,9 +258,10 @@ class ActionComm extends CommonObject * Load object from database * * @param int $id Id of action to get + * @param string $ref Ref of action to get * @return int <0 if KO, >0 if OK */ - function fetch($id) + function fetch($id, $ref='') { global $langs; @@ -286,7 +287,9 @@ class ActionComm extends CommonObject $sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a)"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc"; - $sql.= " WHERE a.id=".$id." AND a.fk_action=c.id"; + $sql.= " WHERE a.fk_action=c.id"; + if ($ref) $sql.= " AND a.id=".$ref; // No field ref, we use id + else $sql.= " AND a.id=".$id; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql=$this->db->query($sql); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 76176930da3..524901336a7 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -327,11 +327,11 @@ if ($id > 0) print '"; print ''; diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 4ca6175d785..40bfbe6490d 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -338,9 +338,10 @@ class Account extends CommonObject /** * Create bank account into database * + * @param User $user Object user making creation * @return int < 0 if KO, > 0 if OK */ - function create() + function create($user='') { global $langs,$conf; @@ -665,10 +666,9 @@ class Account extends CommonObject return 1; } else - { + { return 0; } - $this->db->free($result); } else { diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index c118186df27..770f2afd2ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -102,7 +102,7 @@ if ($_POST["action"] == 'add') if (! $error) { - $id = $account->create($user->id); + $id = $account->create($user); if ($id > 0) { $_GET["id"]=$id; // Force chargement page en mode visu @@ -306,7 +306,7 @@ if ($action == 'create') $doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70); $doleditor->Create(); print ''; - + print '
'; if ($action == 'editconditions') { - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_id,'cond_reglement_id',-1,1); + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id',1); } else { - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_id,'none'); + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none'); } print "
'; print '
'; @@ -510,7 +510,7 @@ else $account->fetch(GETPOST('id','int')); print_fiche_titre($langs->trans("EditFinancialAccount")); - + if ($conf->use_javascript_ajax) { print "\n".''; - + /* * Show result array */ print '

'; - + $i = 0; print ""; print ""; @@ -397,21 +397,21 @@ if ($action == 'export_csv') { print ""; print ""; print "\n"; - + $var = true; $r = ''; - + $invoicestatic = new FactureFournisseur($db); $companystatic = new Fournisseur($db); - + foreach ( $tabfac as $key => $val ) { $invoicestatic->id = $key; $invoicestatic->ref = $val["ref"]; $invoicestatic->type = $val["type"]; $invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32)); - + $date = dol_print_date($db->jdate($val["date"]), 'day'); - + // Product / Service foreach ( $tabht[$key] as $k => $mt ) { if ($mt) { @@ -441,16 +441,16 @@ if ($action == 'export_csv') { } } print ""; - + // Third party // print ""; print ""; print ""; - + foreach ( $tabttc[$key] as $k => $mt ) { $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; - + print ""; } print ""; - + $var = ! $var; } - + print "
" . $langs->trans("Account") . "" . $langs->trans("Type") . "" . $langs->trans("Debit") . "" . $langs->trans("Credit") . "
".$conf->global->COMPTA_JOURNAL_BUY."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accounta($k); print "" . $langs->trans("ThirdParty"); print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')'; @@ -459,12 +459,12 @@ if ($action == 'export_csv') { print '' . ($mt >= 0 ? price($mt) : '') . "
"; - + // End of page llxFooter(); } diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 587a0d387a4..79444fbca60 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -90,11 +90,11 @@ $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tot $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,"; $sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte, "; $sql .= " ct.accountancy_code_sell as account_tva"; -$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet fd"; -$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product p ON p.rowid = fd.fk_product"; -$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount aa ON aa.rowid = fd.fk_code_ventilation"; -$sql .= " JOIN " . MAIN_DB_PREFIX . "facture f ON f.rowid = fd.fk_facture"; -$sql .= " JOIN " . MAIN_DB_PREFIX . "societe s ON s.rowid = f.fk_soc"; +$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd"; +$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product"; +$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON aa.rowid = fd.fk_code_ventilation"; +$sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture"; +$sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'"; $sql .= " WHERE fd.fk_code_ventilation > 0 "; if (! empty($conf->multicompany->enabled)) { diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 434cc92dcb6..4fe49999111 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -57,12 +57,14 @@ class ActionComm extends CommonObject var $punctual = 1; // Milestone var $percentage; // Percentage var $location; // Location + var $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events) var $priority; // Small int (0 By default) var $note; // Description - var $usertodo; // Object user that must do action - var $userdone; // Object user that did action + var $userassigned; // Array of user ids + var $usertodo; // Object user of owner + var $userdone; // Object user that did action (deprecated) var $societe; // Company linked to action (optional) var $contact; // Contact linked to action (optional) @@ -89,10 +91,10 @@ class ActionComm extends CommonObject { $this->db = $db; - $this->author = new stdClass(); - $this->usermod = new stdClass(); - $this->usertodo = new stdClass(); - $this->userdone = new stdClass(); + //$this->author = new stdClass(); + //$this->usermod = new stdClass(); + //$this->usertodo = new stdClass(); + //$this->userdone = new stdClass(); $this->societe = new stdClass(); $this->contact = new stdClass(); } diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 27be46bd9e1..929600512c7 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2013 Juanjo Menent @@ -87,20 +87,37 @@ $hookmanager->initHooks(array('actioncard')); * Actions */ -if (GETPOST('addassignedtouser')) +// Remove user to assigned list +if (! empty($_POST['removedassigned'])) +{ + $idtoremove=$_POST['removedassigned']; + if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1); + else $tmpassigneduserids=array(); + unset($tmpassigneduserids[$idtoremove]); + //var_dump($_POST['removedassigned']);exit; + $_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids); + $donotclearsession=1; + if ($action == 'add') $action = 'create'; + if ($action == 'update') $action = 'edit'; +} + +// Add user to assigned list +if (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser')) { // Add a new user if (GETPOST('affectedto') > 0) { $assignedtouser=array(); - if (!empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); + if (! empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); $assignedtouser[GETPOST('affectedto')]=array('transparency'=>GETPOST('transparency'),'mandatory'=>1); $_SESSION['assignedtouser']=dol_json_encode($assignedtouser); } $donotclearsession=1; - $action='create'; + if ($action == 'add') $action = 'create'; + if ($action == 'update') $action = 'edit'; } -// Add action + +// Add event if ($action == 'add') { $error=0; @@ -131,22 +148,22 @@ if ($action == 'add') // Check parameters if (! $datef && $percentage == 100) { - $error++; + $error++; $donotclearsession=1; $action = 'create'; setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")), 'errors'); } if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! GETPOST('label')) { - $error++; + $error++; $donotclearsession=1; $action = 'create'; setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Title")), 'errors'); } // Initialisation objet cactioncomm - if (! GETPOST('actioncode')) + if (! GETPOST('actioncode') > 0) { - $error++; + $error++; $donotclearsession=1; $action = 'create'; setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors'); } @@ -161,7 +178,6 @@ if ($action == 'add') $object->priority = GETPOST("priority")?GETPOST("priority"):0; $object->fulldayevent = (! empty($fulldayevent)?1:0); $object->location = GETPOST("location"); - $object->transparency = (GETPOST("transparency")=='on'?1:0); $object->label = trim(GETPOST('label')); $object->fk_element = GETPOST("fk_element"); $object->elementtype = GETPOST("elementtype"); @@ -186,18 +202,35 @@ if ($action == 'add') $object->percentage = $percentage; $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60; - $usertodo=new User($db); - if ($_POST["affectedto"] > 0) + $listofuserid=dol_json_decode($_SESSION['assignedtouser']); + $i=0; + foreach($listofuserid as $key => $value) { - $usertodo->fetch($_POST["affectedto"]); + if ($i == 0) // First entry + { + $usertodo=new User($db); + if ($key > 0) + { + $usertodo->fetch($key); + } + $object->usertodo = $usertodo; + $object->transparency = (GETPOST("transparency")=='on'?1:0); + } + + $object->userassigned[$key]=array('id'=>$key, 'transparency'=>(GETPOST("transparency")=='on'?1:0)); + + $i++; } - $object->usertodo = $usertodo; - $userdone=new User($db); - if ($_POST["doneby"] > 0) + + if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) { - $userdone->fetch($_POST["doneby"]); + $userdone=new User($db); + if ($_POST["doneby"] > 0) + { + $userdone->fetch($_POST["doneby"]); + } + $object->userdone = $userdone; } - $object->userdone = $userdone; $object->note = trim($_POST["note"]); if (isset($_POST["contactid"])) $object->contact = $contact; @@ -214,16 +247,22 @@ if ($action == 'add') if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $object->use_phenix=1; // Check parameters + if (empty($object->usertodo)) + { + $error++; $donotclearsession=1; + $action = 'create'; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionAffectedTo")), 'errors'); + } if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent)))) { - $error++; + $error++; $donotclearsession=1; $action = 'create'; setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")), 'errors'); } if (! GETPOST('apyear') && ! GETPOST('adyear')) { - $error++; + $error++; $donotclearsession=1; $action = 'create'; setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors'); } @@ -265,42 +304,14 @@ if ($action == 'add') $langs->load("errors"); $error=$langs->trans($object->error); setEventMessage($error,'errors'); - $action = 'create'; + $action = 'create'; $donotclearsession=1; } } else { $db->rollback(); - $langs->load("errors"); - - if (! empty($object->error)) setEventMessage($langs->trans($object->error), 'errors'); - if (count($object->errors)) setEventMessage($object->errors, 'errors'); - - $action = 'create'; - } - } -} - -/* - * Action suppression de l'action - */ -if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes') -{ - $object->fetch($id); - - if ($user->rights->agenda->myactions->delete - || $user->rights->agenda->allactions->delete) - { - $result=$object->delete(); - - if ($result >= 0) - { - header("Location: index.php"); - exit; - } - else - { - setEventMessage($object->error,'errors'); + setEventMessages($object->error, $object->errors, 'errors'); + $action = 'create'; $donotclearsession=1; } } } @@ -348,25 +359,59 @@ if ($action == 'update') if (! $datef && $percentage == 100) { - $error=$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd")); + $error++; $donotclearsession=1; + setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")),$object->errors,'errors'); $action = 'edit'; } // Users - $usertodo=new User($db); - if ($_POST["affectedto"]) + $listofuserid=dol_json_decode($_SESSION['assignedtouser']); + $i=0; + foreach($listofuserid as $key => $value) { - $usertodo->fetch($_POST["affectedto"]); - } - $object->usertodo = $usertodo; - $object->transparency=(GETPOST("transparency")=='on'?1:0); + if ($i == 0) // First entry + { + $usertodo=new User($db); + if ($key > 0) + { + $usertodo->fetch($key); + } + $object->usertodo = $usertodo; + $object->transparency=(GETPOST("transparency")=='on'?1:0); + } - $userdone=new User($db); - if ($_POST["doneby"]) - { - $userdone->fetch($_POST["doneby"]); + $object->userassigned[$key]=array('id'=>$key, 'transparency'=>(GETPOST("transparency")=='on'?1:0)); + + $i++; + } + + if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) + { + $userdone=new User($db); + if ($_POST["doneby"]) + { + $userdone->fetch($_POST["doneby"]); + } + $object->userdone = $userdone; + } + + // Check parameters + if (! GETPOST('actioncode') > 0) + { + $error++; $donotclearsession=1; + $action = 'edit'; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors'); + } + else + { + $result=$cactioncomm->fetch(GETPOST('actioncode')); + } + if (empty($object->usertodo)) + { + $error++; $donotclearsession=1; + $action = 'edit'; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionAffectedTo")), 'errors'); } - $object->userdone = $userdone; // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$object); @@ -383,17 +428,13 @@ if ($action == 'update') } else { + setEventMessages($object->error,$object->errors,'errors'); $db->rollback(); } } } - if ($result < 0) - { - setEventMessage($object->error,'errors'); - setEventMessage($object->errors,'errors'); - } - else + if (! $error) { if (! empty($backtopage)) { @@ -403,6 +444,30 @@ if ($action == 'update') } } +/* + * delete event + */ +if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes') +{ + $object->fetch($id); + + if ($user->rights->agenda->myactions->delete + || $user->rights->agenda->allactions->delete) + { + $result=$object->delete(); + + if ($result >= 0) + { + header("Location: index.php"); + exit; + } + else + { + setEventMessages($object->error,$object->errors,'errors'); + } + } +} + /* * Action move update, used when user move an event in calendar by drag'n drop */ @@ -576,15 +641,14 @@ if ($action == 'create') print '
'.$langs->trans("Location").'
'.$langs->trans("ActionAffectedTo").''; if (empty($donotclearsession)) { $assignedtouser=GETPOST("affectedtouser")?GETPOST("affectedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id); $_SESSION['assignedtouser']=dol_json_encode(array($assignedtouser=>array('transparency'=>1,'mandatory'=>1))); } - //print $form->select_dolusers_forevent('affectedto',1); - print $form->select_dolusers(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1); + print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'affectedto',1); + //print $form->select_dolusers(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1); print '
'; @@ -599,7 +663,7 @@ if ($action == 'create') print '
'.$langs->trans("ActionDoneBy").''; print $form->select_dolusers(GETPOST("doneby")?GETPOST("doneby"):(! empty($object->userdone->id) && $percent==100?$object->userdone->id:0),'doneby',1); @@ -704,11 +768,6 @@ if ($action == 'create') // View or edit if ($id > 0) { - if ($error) - { - dol_htmloutput_errors($error); - } - $result=$object->fetch($id); $object->fetch_optionals($id,$extralabels); @@ -833,7 +892,14 @@ if ($id > 0) // Assigned to print '
'.$langs->trans("ActionAffectedTo").''; - print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'affectedto',1); + $listofuserid=array(); + if (empty($donotclearsession)) + { + if (is_object($object->usertodo)) $listofuserid[$object->usertodo->id]=array('id'=>$object->usertodo->id,'transparency'=>$object->transparency); + $_SESSION['assignedtouser']=dol_json_encode($listofuserid); + } + print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'affectedto',1); + //print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'affectedto',1); print '


'; @@ -844,7 +910,7 @@ if ($id > 0) print ''; // Realised by - if ($conf->global->AGENDA_ENABLE_DONEBY) + if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) { print ''; print ''; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 259dc5aab39..2b24e4a4b09 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -114,7 +114,9 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f"; $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn_det as l ON f.rowid = l.fk_facture_fourn"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON p.accountancy_code_buy = aa.account_number"; +$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version"; $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation = 0"; +$sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL)"; if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity = '" . $conf->entity . "'"; @@ -199,7 +201,7 @@ if ($result) { print ''; // Colonne choix ligne a ventiler print ''; print ""; From 565de5258f4d9e1a3ee9d22bb0a12ef0d436475d Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sat, 20 Sep 2014 09:19:26 +0200 Subject: [PATCH 0039/1190] Re-Add subtotal line on compta report (accidentaly remove before) --- htdocs/compta/resultat/clientfourn.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index d55930ef80f..e400a9efd8f 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -601,6 +601,11 @@ else { dol_print_error($db); } +print ''; +if ($modecompta == 'CREANCES-DETTES') + print ''; +print ''; +print ''; /* * Dunning @@ -633,8 +638,8 @@ if ($result) $total_ht += $obj->amount; $total_ttc += $obj->amount; - $subtotal_ht -= $obj->amount; - $subtotal_ttc -= $obj->amount; + $subtotal_ht += $obj->amount; + $subtotal_ttc += $obj->amount; $var = !$var; print ""; @@ -661,8 +666,8 @@ else } print ''; if ($modecompta == 'CREANCES-DETTES') - print ''; -print ''; + print ''; +print ''; print ''; /* From 119be5da421e26da258eaa5c9633a79663476f9a Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sat, 20 Sep 2014 10:14:26 +0200 Subject: [PATCH 0040/1190] Better ressource management on project and task --- htdocs/langs/en_US/projects.lang | 2 ++ htdocs/langs/fr_FR/projects.lang | 4 ++- htdocs/projet/class/project.class.php | 46 +++++++++++++++++++++++---- htdocs/projet/element.php | 17 ++++++++-- htdocs/projet/tasks.php | 3 +- htdocs/projet/tasks/contact.php | 10 +++--- htdocs/projet/tasks/task.php | 4 +-- htdocs/projet/tasks/time.php | 29 +++++++++++------ 8 files changed, 87 insertions(+), 28 deletions(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 55970f0b35c..75bc4a29f5a 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time \ No newline at end of file diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index e76a2777161..52fd913ee29 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -119,7 +119,8 @@ TypeContact_project_task_external_TASKEXECUTIVE=Responsable TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur SelectElement=Séléctionnez l'élément -AddElement=Link to element +AddElement=Associer l'élément +UnlinkElement=Délier l'element # Documents models DocumentModelBaleine=Modèle de rapport de projet complet (logo...) PlannedWorkload = Charge de travail prévue @@ -128,3 +129,4 @@ ProjectReferers=Objets associés SearchAProject=Rechercher un projet ProjectMustBeValidatedFirst=Le projet doit être validé d'abord ProjectDraft=Projets brouillons +FirstAddRessourceToAllocateTime=Associer une ressource pour allouer du temps consomée \ No newline at end of file diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 8cbaea46c39..40ef5248a7b 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -322,6 +322,7 @@ class Project extends CommonObject $this->note_private = $obj->note_private; $this->note_public = $obj->note_public; $this->socid = $obj->fk_soc; + $this->societe=(object)array();// To avoid warning on next line $this->societe->id = $obj->fk_soc; // TODO For backward compatibility $this->user_author_id = $obj->fk_user_creat; $this->public = $obj->public; @@ -1276,23 +1277,23 @@ class Project extends CommonObject /** * Associate element to a project * - * @param string $TableName Table of the element to update - * @param int $ElementSelectId Key-rowid of the line of the element to update + * @param string $tableName Table of the element to update + * @param int $elementSelectId Key-rowid of the line of the element to update * @return int 1 if OK or < 0 if KO */ - function update_element($TableName, $ElementSelectId) + function update_element($tableName, $elementSelectId) { - $sql="UPDATE ".MAIN_DB_PREFIX.$TableName; + $sql="UPDATE ".MAIN_DB_PREFIX.$tableName; if ($TableName=="actioncomm") { $sql.= " SET fk_project=".$this->id; - $sql.= " WHERE id=".$ElementSelectId; + $sql.= " WHERE id=".$elementSelectId; } else { $sql.= " SET fk_projet=".$this->id; - $sql.= " WHERE rowid=".$ElementSelectId; + $sql.= " WHERE rowid=".$elementSelectId; } dol_syslog(get_class($this)."::update_element", LOG_DEBUG); @@ -1305,5 +1306,38 @@ class Project extends CommonObject } } + + /** + * Associate element to a project + * + * @param string $tableName Table of the element to update + * @param int $elementSelectId Key-rowid of the line of the element to update + * @return int 1 if OK or < 0 if KO + */ + function remove_element($tableName, $elementSelectId) + { + $sql="UPDATE ".MAIN_DB_PREFIX.$tableName; + + if ($TableName=="actioncomm") + { + $sql.= " SET fk_project=NULL"; + $sql.= " WHERE id=".$elementSelectId; + } + else + { + $sql.= " SET fk_projet=NULL"; + $sql.= " WHERE rowid=".$elementSelectId; + } + + dol_syslog(get_class($this)."::remove_element", LOG_DEBUG); + $resql=$this->db->query($sql); + if (!$resql) { + $this->error=$this->db->lasterror(); + return -1; + }else { + return 1; + } + + } } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index b5a1d089c96..da4de04b8bc 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -215,6 +215,15 @@ if ($action=="addelement") if ($result<0) { setEventMessage($mailchimp->error,'errors'); } +}elseif ($action == "unlink") { + + $tablename = GETPOST("tablename"); + $elementselectid = GETPOST("elementselect"); + + $result = $project->remove_element($tablename, $elementselectid); + if ($result < 0) { + setEventMessage($project->error, 'errors'); + } } foreach ($listofreferent as $key => $value) @@ -247,7 +256,7 @@ foreach ($listofreferent as $key => $value) print '
'.$langs->trans("ActionDoneBy").''; print $form->select_dolusers($object->userdone->id> 0?$object->userdone->id:-1,'doneby',1); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index c46f48ed1c6..c4b548c7e81 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -484,7 +484,7 @@ class Facture extends CommonInvoice // Call trigger $result=$this->call_trigger('BILL_CREATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers if (! $error) @@ -593,8 +593,8 @@ class Facture extends CommonInvoice // Load source object $objFrom = dol_clone($this); - - + + // Change socid if needed if (! empty($socid) && $socid != $this->socid) @@ -637,7 +637,7 @@ class Facture extends CommonInvoice unset($this->products[$i]); // Tant que products encore utilise } } - + // Create clone $result=$this->create($user); if ($result < 0) $error++; @@ -645,7 +645,7 @@ class Facture extends CommonInvoice // copy internal contacts if ($this->copy_linked_contact($objFrom, 'internal') < 0) $error++; - + // copy external contacts if same company elseif ($objFrom->socid == $this->socid) { @@ -667,7 +667,7 @@ class Facture extends CommonInvoice // Call trigger $result=$this->call_trigger('BILL_CLONE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } @@ -1108,7 +1108,7 @@ class Facture extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_MODIFY',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } } @@ -1266,7 +1266,7 @@ class Facture extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_DELETE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } @@ -1438,7 +1438,7 @@ class Facture extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_PAYED',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } else @@ -1490,7 +1490,7 @@ class Facture extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_UNPAYED',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } else @@ -1554,7 +1554,7 @@ class Facture extends CommonInvoice // Call trigger $result=$this->call_trigger('BILL_CANCEL',$user); if ($result < 0) - { + { $this->db->rollback(); return -1; } @@ -1768,11 +1768,11 @@ class Facture extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_VALIDATE',$user); - if ($result < 0) $error++; - //TODO: Restoring ref, facnumber, statut, brouillon to previous value if trigger fail + if ($result < 0) $error++; + //TODO: Restoring ref, facnumber, statut, brouillon to previous value if trigger fail // End call triggers } - + // Set new ref and define current statut if (! $error) { @@ -1856,7 +1856,7 @@ class Facture extends CommonInvoice $this->statut = 0; // Call trigger $result=$this->call_trigger('BILL_UNVALIDATE',$user); - if ($result < 0) + if ($result < 0) { $error++; $this->statut=$old_statut; @@ -3164,7 +3164,7 @@ class Facture extends CommonInvoice $sql.= ' p.ref as product_ref, p.fk_product_type, p.label as product_label,'; $sql.= ' p.description as product_desc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l'; - $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON l.fk_product=p.rowid'; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid'; $sql.= ' WHERE l.fk_facture = '.$this->id; $sql.= ' ORDER BY l.rang ASC, l.rowid'; @@ -3550,7 +3550,7 @@ class FactureLigne extends CommonInvoiceLine // Call trigger $result=$this->call_trigger('LINEBILL_INSERT',$user); if ($result < 0) - { + { $this->db->rollback(); return -2; } @@ -3661,7 +3661,7 @@ class FactureLigne extends CommonInvoiceLine { // Call trigger $result=$this->call_trigger('LINEBILL_UPDATE',$user); - if ($result < 0) + if ($result < 0) { $this->db->rollback(); return -2; @@ -3691,7 +3691,7 @@ class FactureLigne extends CommonInvoiceLine $error=0; $this->db->begin(); - + // Call trigger $result=$this->call_trigger('LINEBILL_DELETE',$user); if ($result < 0) @@ -3700,7 +3700,7 @@ class FactureLigne extends CommonInvoiceLine return -1; } // End call triggers - + $sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid; dol_syslog(get_class($this)."::delete", LOG_DEBUG); diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 81ceeb6f39d..169fb32010a 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -104,11 +104,11 @@ $sql.= " fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_t $sql.= " s.rowid as socid, s.nom as name, s.code_compta_fournisseur,"; $sql.= " p.rowid as pid, p.ref as ref, p.accountancy_code_buy,"; $sql.= " ct.accountancy_code_buy as account_tva, ct.recuperableonly"; -$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det fd"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = fd.fk_product"; -$sql.= " JOIN ".MAIN_DB_PREFIX."facture_fourn f ON f.rowid = fd.fk_facture_fourn"; -$sql.= " JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid = f.fk_soc" ; +$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva as ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product"; +$sql.= " JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = fd.fk_facture_fourn"; +$sql.= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc" ; $sql.= " WHERE f.fk_statut > 0 AND f.entity = ".$conf->entity; if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)"; else $sql.= " AND f.type IN (0,1,2,3)"; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 6e65446bdda..f90add66b54 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -105,10 +105,10 @@ $sql.= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd $sql.= " s.rowid as socid, s.nom as name, s.code_compta, s.client,"; $sql.= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell,"; $sql.= " ct.accountancy_code_sell as account_tva, ct.recuperableonly"; -$sql.= " FROM ".MAIN_DB_PREFIX."facturedet fd"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = fd.fk_product"; -$sql.= " JOIN ".MAIN_DB_PREFIX."facture f ON f.rowid = fd.fk_facture"; -$sql.= " JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid = f.fk_soc"; +$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product"; +$sql.= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture"; +$sql.= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'"; $sql.= " WHERE f.entity = ".$conf->entity; $sql.= " AND f.fk_statut > 0"; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 153ff769eb6..331705f0b3f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1289,7 +1289,7 @@ class Form * @return string HTML select string * @see select_dolgroups */ - function select_dolusers_forevent($htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='') + function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='') { global $conf,$user,$langs; @@ -1297,18 +1297,24 @@ class Form // Method with no ajax //$out.='
'; - $out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter); - $out.=''; + $out.=''; + $out.=''; + $out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter); + $out.=''; $assignedtouser=array(); if (!empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); if (count($assignedtouser)) $out.='
'; + $i=0; foreach($assignedtouser as $key => $value) { $userstatic->fetch($key); $out.=$userstatic->getNomUrl(1); + if ($i == 0) $out.=' ('.$langs->trans("Owner").')'; + $out.=' '; //$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional")); //$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy")); $out.='
'; + $i++; } //$out.='
'; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 78d4cc55a4e..9d1c138bc5f 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -186,12 +186,12 @@ class Entrepot extends CommonObject $sql = "DELETE FROM ".MAIN_DB_PREFIX."stock_mouvement"; $sql.= " WHERE fk_entrepot = " . $this->id; - dol_syslog("Entrepot::delete", LOG_DEBUG); + dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql1=$this->db->query($sql); $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock"; $sql.= " WHERE fk_entrepot = " . $this->id; - dol_syslog("Entrepot::delete", LOG_DEBUG); + dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql2=$this->db->query($sql); if ($resql1 && $resql2) @@ -202,8 +202,8 @@ class Entrepot extends CommonObject dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql1=$this->db->query($sql); - // Update denormalized fields because we change content of produt_stock - $sql = "UPDATE ".MAIN_DB_PREFIX."product p SET p.stock= (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock ps WHERE ps.fk_product = p.rowid)"; + // Update denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql + $sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET stock = (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)"; dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql2=$this->db->query($sql); @@ -217,7 +217,7 @@ class Entrepot extends CommonObject { $this->db->rollback(); $this->error=$this->db->lasterror(); - return -1; + return -2; } } else @@ -540,7 +540,7 @@ class Entrepot extends CommonObject $this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now,'dayhourlog'); $this->statut=1; $this->specimen=1; - + $this->lieu='Location test'; $this->address='21 jump street'; $this->zip='99999'; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 86e930d8cf1..1155ef6cb40 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -261,7 +261,7 @@ else // Country print '
'.$langs->trans('Country').''; - if (! empty($object->country_code)) + if (! empty($object->country_code)) { $img=picto_from_langcode($object->country_code); print ($img?$img.' ':''); @@ -339,14 +339,14 @@ else print "id."\">".$langs->trans("Modify").""; else print "".$langs->trans("Modify").""; - + if ($user->rights->stock->supprimer) print "id."\">".$langs->trans("Delete").""; else print "".$langs->trans("Delete").""; } } - + print ""; @@ -375,7 +375,7 @@ else $sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc,"; $sql.= " ps.pmp, ps.reel as value"; - $sql.= " FROM ".MAIN_DB_PREFIX."product_stock ps, ".MAIN_DB_PREFIX."product p"; + $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE ps.fk_product = p.rowid"; $sql.= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse) $sql.= " AND ps.fk_entrepot = ".$object->id; diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index d8dda85f2fc..a8a554ca25d 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -123,14 +123,21 @@ class AllTests require_once dirname(__FILE__).'/DiscountTest.php'; $suite->addTestSuite('DiscountTest'); + require_once dirname(__FILE__).'/ContratTest.php'; + $suite->addTestSuite('ContratTest'); + + require_once dirname(__FILE__).'/FichinterTest.php'; + $suite->addTestSuite('FichinterTest'); + + require_once dirname(__FILE__).'/PropalTest.php'; + $suite->addTestSuite('PropalTest'); + require_once dirname(__FILE__).'/CommandeTest.php'; $suite->addTestSuite('CommandeTest'); require_once dirname(__FILE__).'/CommandeFournisseurTest.php'; $suite->addTestSuite('CommandeFournisseurTest'); - require_once dirname(__FILE__).'/ContratTest.php'; - $suite->addTestSuite('ContratTest'); require_once dirname(__FILE__).'/FactureTest.php'; $suite->addTestSuite('FactureTest'); require_once dirname(__FILE__).'/FactureRecTest.php'; @@ -139,8 +146,7 @@ class AllTests $suite->addTestSuite('FactureTestRounding'); require_once dirname(__FILE__).'/FactureFournisseurTest.php'; $suite->addTestSuite('FactureFournisseurTest'); - require_once dirname(__FILE__).'/PropalTest.php'; - $suite->addTestSuite('PropalTest'); + require_once dirname(__FILE__).'/UserTest.php'; $suite->addTestSuite('UserTest'); require_once dirname(__FILE__).'/UserGroupTest.php'; From b252680346ff09bde6b8e6d8443f0b76d1ce23e9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 20 Sep 2014 01:10:55 +0200 Subject: [PATCH 0036/1190] Add phpunit for interventions --- test/phpunit/FichInterTest.php | 244 +++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 test/phpunit/FichInterTest.php diff --git a/test/phpunit/FichInterTest.php b/test/phpunit/FichInterTest.php new file mode 100644 index 00000000000..96366af85a9 --- /dev/null +++ b/test/phpunit/FichInterTest.php @@ -0,0 +1,244 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file test/phpunit/FichinterTest.php + * \ingroup test + * \brief PHPUnit test + * \remarks To run this script as CLI: phpunit filename.php + */ + +global $conf,$user,$langs,$db; +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +//require_once 'PHPUnit/Autoload.php'; +require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; +require_once dirname(__FILE__).'/../../htdocs/fichinter/class/fichinter.class.php'; + +if (empty($user->id)) +{ + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); +} +$conf->global->MAIN_DISABLE_ALL_MAILS=1; + + +/** + * Class for PHPUnit tests + * + * @backupGlobals disabled + * @backupStaticAttributes enabled + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + */ +class FichinterTest extends PHPUnit_Framework_TestCase +{ + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; + + /** + * Constructor + * We save global variables into local variables + * + * @return ContratTest + */ + function __construct() + { + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + public static function tearDownAfterClass() + { + global $conf,$user,$langs,$db; + $db->rollback(); + + print __METHOD__."\n"; + } + + /** + * Init phpunit tests + * + * @return void + */ + protected function setUp() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + print __METHOD__."\n"; + } + /** + * End phpunit tests + * + * @return void + */ + protected function tearDown() + { + print __METHOD__."\n"; + } + + /** + * testFichinterCreate + * + * @return int + */ + public function testFichinterCreate() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $localobject=new Fichinter($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user); + + print __METHOD__." result=".$result."\n"; + $this->assertLessThan($result, 0); + + return $result; + } + + /** + * testFichinterFetch + * + * @param int $id Id of intervention + * @return int + * + * @depends testFichinterCreate + * The depends says test is run only if previous is ok + */ + public function testFichinterFetch($id) + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $localobject=new Fichinter($this->savdb); + $result=$localobject->fetch($id); + + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); + + return $localobject; + } + + /** + * testFichinterValid + * + * @param Fichinter $localobject Intervention + * @return int + * + * @depends testFichinterFetch + * The depends says test is run only if previous is ok + */ + public function testFichinterValid($localobject) + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $result=$localobject->setValid($user); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + + $this->assertLessThan($result, 0); + return $localobject; + } + + /** + * testFichinterValid + * + * @param Object $localobject Object intervention + * @return int + * + * @depends testFichinterValid + * The depends says test is run only if previous is ok + */ + public function testFichinterOther($localobject) + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + /*$result=$localobject->setstatus(0); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + */ + + $localobject->info($localobject->id); + print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n"; + $this->assertNotEquals($localobject->date_creation, ''); + + return $localobject->id; + } + + /** + * testFichinterDelete + * + * @param int $id Id of intervention + * @return int + * + * @depends testFichinterOther + * The depends says test is run only if previous is ok + */ + public function testFichinterDelete($id) + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $localobject=new Fichinter($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($user); + + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $result; + } + +} From cf7973d0fa418d1ec92870d7150e91e857214a25 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 20 Sep 2014 01:26:53 +0200 Subject: [PATCH 0037/1190] Doxygen --- htdocs/core/class/html.form.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 331705f0b3f..0b870775d69 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1276,6 +1276,7 @@ class Form /** * Return select list of users. Selected users are stored into session. * + * @param string $action Value for $action * @param string $htmlname Field name in form * @param int $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue * @param array $exclude Array list of users id to exclude From 7aecce526a640ca25561ac9a448714cbf3a852a4 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sat, 20 Sep 2014 09:11:50 +0200 Subject: [PATCH 0038/1190] Better accountancy auto find accountacty code feature (work with several accountacy plan) --- htdocs/accountancy/customer/list.php | 5 +++-- htdocs/accountancy/supplier/list.php | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index fefed420621..fa7fc5de6e8 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -112,8 +112,9 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f"; $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as l ON f.rowid = l.fk_facture"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON p.accountancy_code_sell = aa.account_number"; +$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version"; $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation = 0"; - +$sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL)"; if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity = '" . $conf->entity . "'"; } @@ -219,7 +220,7 @@ if ($result) { // Colonne choix ligne a ventiler print ''; - print 'code_sell ? "checked" : "") . '/>'; + print 'aarowid ? "checked" : "") . '/>'; print '
'; - print 'code_buy ? "checked" : "") . '/>'; + print 'aarowid ? "checked" : "") . '/>'; print '
'.price(-$subtotal_ht).''.price(-$subtotal_ttc).'
 
'.price(-$subtotal_ht).''.price(-$subtotal_ttc).''.price($subtotal_ht).''.price($subtotal_ttc).'
'; print ''; - print ''; + print ''; print ''; print ''; if (empty($value['disableamount'])) print ''; @@ -276,7 +285,9 @@ foreach ($listofreferent as $key => $value) $var=!$var; print ""; - + print '\n"; // Ref print ''; + print ''; if (empty($value['disableamount'])) print ''; if (empty($value['disableamount'])) print ''; print ''; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 994779fcac9..e037a7ea9ec 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -300,7 +300,8 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third print ''; print ''; // Date start diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 3cc8b51ca1a..da002ef72d2 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref)) if ($object->fetch($id) > 0) { $result=$projectstatic->fetch($object->fk_project); - if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); + if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); $object->project = dol_clone($projectstatic); @@ -179,7 +179,7 @@ if ($id > 0 || ! empty($ref)) // Define a complementary filter for search of next/prev ref. if (! $user->rights->projet->all->lire) { - $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0); + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0); $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1'); @@ -188,7 +188,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; @@ -239,7 +239,7 @@ if ($id > 0 || ! empty($ref)) print '"; print ''; } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 7337c152f4e..0ec0ab2cbe2 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -202,7 +202,7 @@ if ($id > 0 || ! empty($ref)) $res=$object->fetch_optionals($object->id,$extralabels); $result=$projectstatic->fetch($object->fk_project); - if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); + if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); $object->project = dol_clone($projectstatic); @@ -235,7 +235,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 56048ad1cf2..5c790df32f0 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -195,7 +195,7 @@ if ($id > 0 || ! empty($ref)) if ($object->fetch($id) >= 0) { $result=$projectstatic->fetch($object->fk_project); - if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); + if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); $object->project = dol_clone($projectstatic); @@ -230,7 +230,7 @@ if ($id > 0 || ! empty($ref)) // Thirdparty print ''; print ''; @@ -302,7 +302,7 @@ if ($id > 0 || ! empty($ref)) // Third party print ''; } @@ -345,13 +345,14 @@ if ($id > 0 || ! empty($ref)) // Contributor print ''; // Note @@ -440,7 +441,15 @@ if ($id > 0 || ! empty($ref)) print '\n"; + + // Other attributes + $parameters=array('object' => $object, 'colspan' => ' colspan="2"'); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields,'edit'); + } + print "
'.$langs->trans("Ref").''.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("ThirdParty").''.$langs->trans("AmountHT").'
'; + print '' . img_picto($langs->trans('Unlink'), 'editdelete') . ''; + print "'; print $element->getNomUrl(1); @@ -326,7 +337,7 @@ foreach ($listofreferent as $key => $value) } } - print '
'.$langs->trans("Number").': '.$i.'
'.$langs->trans("Number").': '.$i.''.$langs->trans("TotalHT").' : '.price($total_ht).''.$langs->trans("TotalTTC").' : '.price($total_ttc).' 
'.$langs->trans("AffectedTo").''; - print $form->select_dolusers($user->id,'userid',1); + $contactsofproject=$object->getListContactId('internal'); + $form->select_users($user->id,'userid',0,'',0,'',$contactsofproject); print '
'.$langs->trans("Label").''.$projectstatic->title.'
'.$langs->trans("ThirdParty").''; - if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); + if (! empty($projectstatic->thridparty->id)) print $projectstatic->thridparty->getNomUrl(1); else print ' '; print '
'.$langs->trans('Ref').''; if (! GETPOST('withproject') || empty($projectstatic->id)) { - $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1); $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; @@ -259,7 +259,7 @@ if ($id > 0 || ! empty($ref)) // Customer print "
".$langs->trans("ThirdParty")."'; - if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1); + if ($projectstatic->thridparty->id > 0) print $projectstatic->thridparty->getNomUrl(1); else print ' '; print '
'.$langs->trans("Label").''.$projectstatic->title.'
'.$langs->trans("ThirdParty").''; - if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); + if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print '
'.$langs->trans("ThirdParty").''; - if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); + if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print '
'.$langs->trans("ThirdParty").''; - if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1); + if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print '
'; - $restrictaddtimetocontactoftask=0; - if (empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS)) - { - $restrictaddtimetocontactoftask=$object->getListContactId('internal'); - } print img_object('','user'); - print $form->select_dolusers($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$restrictaddtimetocontactoftask); // Note: If user is not allowed it will be disabled into combo list and userid not posted + $contactsoftask=$object->getListContactId('internal'); + if (count($contactsoftask)>0) { + $userid=$contactsoftask[0]; + $form->select_users($userid,'userid',0,'',0,'',$contactsoftask); + }else { + print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime'); + } print ''; if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid) { - print $form->select_dolusers($task_time->fk_user,'userid_line'); + $contactsoftask=$object->getListContactId('internal'); + if (!in_array($task_time->fk_user,$contactsoftask)) { + $contactsoftask[]=$task_time->fk_user; + } + if (count($contactsoftask)>0) { + $form->select_users($task_time->fk_user,'userid_line',0,'',0,'',$contactsoftask); + }else { + print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime'); + } } else { From 3602155c5e334f8d8247e57ade3754d136bda8f8 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sat, 20 Sep 2014 10:28:59 +0200 Subject: [PATCH 0041/1190] Fix FicheInterTest Call --- test/phpunit/AllTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index a8a554ca25d..eb3c1a56abb 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -126,7 +126,7 @@ class AllTests require_once dirname(__FILE__).'/ContratTest.php'; $suite->addTestSuite('ContratTest'); - require_once dirname(__FILE__).'/FichinterTest.php'; + require_once dirname(__FILE__).'/FichInterTest.php'; $suite->addTestSuite('FichinterTest'); require_once dirname(__FILE__).'/PropalTest.php'; From bf7f4c1cabc32018278e37f6bfae373070b208bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 21 Sep 2014 18:16:14 +0200 Subject: [PATCH 0042/1190] Refactored generateDocument functions --- htdocs/comm/propal/class/propal.class.php | 72 +---------------- htdocs/commande/class/commande.class.php | 72 +---------------- htdocs/compta/facture/class/facture.class.php | 77 +----------------- htdocs/contrat/class/contrat.class.php | 70 +--------------- htdocs/core/class/commonobject.class.php | 81 +++++++++++++++++++ htdocs/expedition/class/expedition.class.php | 77 +----------------- htdocs/livraison/class/livraison.class.php | 70 +--------------- htdocs/projet/class/project.class.php | 70 +--------------- htdocs/projet/class/task.class.php | 71 +--------------- 9 files changed, 98 insertions(+), 562 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index cb1046f86ee..7140dd9d361 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2690,10 +2690,6 @@ class Propal extends CommonObject $langs->load("propale"); - $error=0; - - $srctemplatepath=''; - // Positionne le modele sur le nom du modele a utiliser if (! dol_strlen($modele)) { @@ -2707,73 +2703,9 @@ class Propal extends CommonObject } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/propale/doc/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/propale/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - //$obj->message = $message; - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - // Success in building document. We build meta file. - dol_meta_create($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($this->db,"propal_pdf_create Error: ".$obj->error); - return -1; - } - - } - else - { - dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); - return -1; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index dd4505ecc95..4b1cf9e32e6 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3028,10 +3028,6 @@ class Commande extends CommonOrder $langs->load("orders"); - $error=0; - - $srctemplatepath=''; - // Positionne le modele sur le nom du modele a utiliser if (! dol_strlen($modele)) { @@ -3045,73 +3041,9 @@ class Commande extends CommonOrder } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/commande/doc/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/commande/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - //$obj->message = $message; - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - // Success in building document. We build meta file. - dol_meta_create($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($this->db,"order_pdf_create Error: ".$obj->error); - return -1; - } - - } - else - { - dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); - return -1; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 2752f3d1e0d..f5d20936052 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3238,16 +3238,6 @@ class Facture extends CommonInvoice $langs->load("bills"); - $error=0; - - // Increase limit for PDF build - $err=error_reporting(); - error_reporting(0); - @set_time_limit(120); - error_reporting($err); - - $srctemplatepath=''; - // Positionne le modele sur le nom du modele a utiliser if (! dol_strlen($modele)) { @@ -3261,72 +3251,9 @@ class Facture extends CommonInvoice } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/facture/doc/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/facture/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - // Success in building document. We build meta file. - dol_meta_create($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($this->db,"facture_pdf_create Error: ".$obj->error); - return -1; - } - - } - else - { - dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); - return -1; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 7861846c4a4..da92f68065b 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -2356,10 +2356,6 @@ class ContratLigne extends CommonObject $langs->load("contracts"); - $error=0; - - $srctemplatepath=''; - // Positionne modele sur le nom du modele de contrat a utiliser if (! dol_strlen($modele)) { @@ -2373,71 +2369,9 @@ class ContratLigne extends CommonObject } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/contract/doc/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/contract/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // We delete old preview - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - // Success in building document. We build meta file. - dol_meta_create($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($this->db,"contract_pdf_create Error: ".$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1059d1af07d..ebd5cb98a76 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3475,4 +3475,85 @@ abstract class CommonObject return $result; } + protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref) + { + global $conf, $langs; + + $srctemplatepath=''; + + // Increase limit for PDF build + $err=error_reporting(); + error_reporting(0); + @set_time_limit(120); + error_reporting($err); + + // If selected modele is a filename template (then $modele="modelname:filename") + $tmp=explode(':',$modele,2); + if (! empty($tmp[1])) + { + $modele=$tmp[0]; + $srctemplatepath=$tmp[1]; + } + + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array('/'); + if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + foreach(array('doc','pdf') as $prefix) + { + $file = $prefix."_".$modele.".modules.php"; + + // On verifie l'emplacement du modele + $file=dol_buildpath($reldir.$modelspath.$file,0); + if (file_exists($file)) + { + $filefound=1; + $classname=$prefix.'_'.$modele; + break; + } + } + if ($filefound) break; + } + + // Charge le modele + if ($filefound) + { + require_once $file; + + $obj = new $classname($this->db); + //$obj->message = $message; + + // We save charset_output to restore it because write_file can change it if needed for + // output format that does not support UTF8. + $sav_charset_output=$outputlangs->charset_output; + if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) + { + $outputlangs->charset_output=$sav_charset_output; + + // We delete old preview + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + dol_delete_preview($this); + + // Success in building document. We build meta file. + dol_meta_create($this); + + return 1; + } + else + { + $outputlangs->charset_output=$sav_charset_output; + dol_print_error($this->db,"Error generating document for ".__CLASS__.". Error: ".$obj->error); + return -1; + } + + } + else + { + dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); + return -1; + } + } + } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index ebadc9d0f4e..9aea7ada0eb 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1546,10 +1546,6 @@ class Expedition extends CommonObject $langs->load("sendings"); - $error=0; - - $srctemplatepath=''; - // Sets the model on the model name to use if (! dol_strlen($modele)) { @@ -1563,78 +1559,9 @@ class Expedition extends CommonObject } } - // If selected model is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/expedition/doc/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // We check the model location - $file=dol_buildpath($reldir."core/modules/expedition/doc/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Load the model - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - - $result=$this->fetch_origin(); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - //require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - //dol_delete_preview($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans expedition_pdf_create"); - dol_print_error($this->db,$obj->error); - return 0; - } - } - else - { - if (! $conf->global->EXPEDITION_ADDON_PDF) - { - print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_PDF_NotDefined"); - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - } - return 0; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0); } } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 3fa7cc3eadc..9fa7c261ac7 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -940,10 +940,6 @@ class Livraison extends CommonObject $langs->load("deliveries"); - $error=0; - - $srctemplatepath=''; - // Positionne modele sur le nom du modele de bon de livraison a utiliser if (! dol_strlen($modele)) { @@ -957,73 +953,11 @@ class Livraison extends CommonObject } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/livraison/pdf/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/livraison/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this,$outputlangs) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans delivery_order_pdf_create"); - dol_print_error($this->db,$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0); } - - } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 4cc130f548b..b1317748493 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1323,10 +1323,6 @@ class Project extends CommonObject $langs->load("projects"); - $error=0; - - $srctemplatepath=''; - // Positionne modele sur le nom du modele de projet a utiliser if (! dol_strlen($modele)) { @@ -1340,71 +1336,9 @@ class Project extends CommonObject } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/project/pdf/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/project/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - // Success in building document. We build meta file. - dol_meta_create($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($this->db,"project_pdf_create Error: ".$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 5bc94d740f7..2f4cc85cf7f 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1327,12 +1327,9 @@ class Task extends CommonObject public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) { global $conf,$langs; + $langs->load("projects"); - $error=0; - - $srctemplatepath=''; - // Positionne modele sur le nom du modele de projet a utiliser if (! dol_strlen($modele)) { @@ -1346,71 +1343,9 @@ class Task extends CommonObject } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/project/task/pdf/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/project/task/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Charge le modele - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db); - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - // Success in building document. We build meta file. - dol_meta_create($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($this->db,"task_pdf_create Error: ".$obj->error); - return 0; - } - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - return 0; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } - } From e97a84102b8c611f6e1fbd1a415d55b30b99644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 21 Sep 2014 18:49:44 +0200 Subject: [PATCH 0043/1190] Fixed syntax error in commande document generation --- htdocs/commande/fiche.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 8e2f1c5595e..da67a55c4e3 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -959,7 +959,7 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) { } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret = $object->fetch($object->id); // Reload to get new records - $object->generateDocument($object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } } @@ -1025,7 +1025,7 @@ else if ($action == 'up' && $user->rights->commande->creer) { } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $object->generateDocument($object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid')); @@ -1047,7 +1047,7 @@ else if ($action == 'down' && $user->rights->commande->creer) { $outputlangs->setDefaultLang($newlang); } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $object->generateDocument($object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid')); From 13f91a645c5343ac40576d3d693ed11f129580a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 21 Sep 2014 19:07:01 +0200 Subject: [PATCH 0044/1190] Fixed syntax error problem --- htdocs/expedition/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index b618ac59a80..073918471db 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -1598,7 +1598,7 @@ else if ($id || $ref) // Build document if it not exists if (! $file || ! is_readable($file)) { - $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref)); + $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result <= 0) { dol_print_error($db,$result); From cec74644106c6d28e39e4122eb2f55791f9923a2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 21 Sep 2014 20:13:38 +0200 Subject: [PATCH 0045/1190] Fix: case into phpunit test case --- test/phpunit/{FichInterTest.php => FichinterTest.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/phpunit/{FichInterTest.php => FichinterTest.php} (100%) diff --git a/test/phpunit/FichInterTest.php b/test/phpunit/FichinterTest.php similarity index 100% rename from test/phpunit/FichInterTest.php rename to test/phpunit/FichinterTest.php From e147259e955edd3d7c1ae29d118b086a7c928b30 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 21 Sep 2014 20:30:55 +0200 Subject: [PATCH 0046/1190] Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 --- htdocs/accountancy/admin/index.php | 20 +++++++-------- htdocs/accountancy/admin/productaccount.php | 8 +++--- htdocs/accountancy/customer/list.php | 8 +++--- htdocs/accountancy/journal/bankjournal.php | 16 ++++++------ htdocs/accountancy/journal/cashjournal.php | 16 ++++++------ .../accountancy/journal/purchasesjournal.php | 15 +++++------ htdocs/accountancy/journal/sellsjournal.php | 15 +++++------ htdocs/admin/compta.php | 24 +++++++++--------- htdocs/admin/salaries.php | 2 +- htdocs/compta/journal/purchasesjournal.php | 9 +++---- htdocs/compta/journal/sellsjournal.php | 9 +++---- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/resultat/index.php | 2 +- htdocs/compta/stats/cabyprodserv.php | 2 +- htdocs/compta/stats/cabyuser.php | 2 +- htdocs/compta/stats/casoc.php | 2 +- htdocs/compta/stats/index.php | 2 +- htdocs/compta/tva/quadri.php | 6 ++--- htdocs/core/class/conf.class.php | 4 +-- .../install/mysql/migration/3.6.0-3.7.0.sql | 25 +++++++++++++++++++ htdocs/langs/ar_SA/compta.lang | 16 ++++++------ htdocs/langs/bg_BG/compta.lang | 16 ++++++------ htdocs/langs/bs_BA/compta.lang | 16 ++++++------ htdocs/langs/ca_ES/compta.lang | 16 ++++++------ htdocs/langs/cs_CZ/compta.lang | 16 ++++++------ htdocs/langs/da_DK/compta.lang | 16 ++++++------ htdocs/langs/de_DE/compta.lang | 16 ++++++------ htdocs/langs/el_GR/compta.lang | 16 ++++++------ htdocs/langs/en_US/accountancy.lang | 8 +++--- htdocs/langs/en_US/compta.lang | 16 ++++++------ htdocs/langs/es_DO/compta.lang | 4 +-- htdocs/langs/es_ES/accountancy.lang | 8 +++--- htdocs/langs/es_ES/compta.lang | 16 ++++++------ htdocs/langs/es_HN/compta.lang | 2 +- htdocs/langs/es_PE/compta.lang | 2 +- htdocs/langs/es_PR/compta.lang | 2 +- htdocs/langs/et_EE/compta.lang | 16 ++++++------ htdocs/langs/eu_ES/compta.lang | 16 ++++++------ htdocs/langs/fa_IR/compta.lang | 16 ++++++------ htdocs/langs/fi_FI/compta.lang | 16 ++++++------ htdocs/langs/fr_FR/accountancy.lang | 8 +++--- htdocs/langs/fr_FR/compta.lang | 16 ++++++------ htdocs/langs/he_IL/compta.lang | 16 ++++++------ htdocs/langs/hr_HR/compta.lang | 16 ++++++------ htdocs/langs/hu_HU/compta.lang | 16 ++++++------ htdocs/langs/id_ID/compta.lang | 16 ++++++------ htdocs/langs/is_IS/compta.lang | 16 ++++++------ htdocs/langs/it_IT/compta.lang | 16 ++++++------ htdocs/langs/ja_JP/compta.lang | 16 ++++++------ htdocs/langs/ko_KR/compta.lang | 16 ++++++------ htdocs/langs/lt_LT/compta.lang | 16 ++++++------ htdocs/langs/lv_LV/compta.lang | 16 ++++++------ htdocs/langs/mk_MK/compta.lang | 16 ++++++------ htdocs/langs/nb_NO/compta.lang | 16 ++++++------ htdocs/langs/nl_NL/compta.lang | 16 ++++++------ htdocs/langs/pl_PL/compta.lang | 16 ++++++------ htdocs/langs/pt_BR/compta.lang | 16 ++++++------ htdocs/langs/pt_PT/compta.lang | 16 ++++++------ htdocs/langs/ro_RO/compta.lang | 16 ++++++------ htdocs/langs/ru_RU/compta.lang | 16 ++++++------ htdocs/langs/sk_SK/compta.lang | 16 ++++++------ htdocs/langs/sl_SI/compta.lang | 16 ++++++------ htdocs/langs/sq_AL/compta.lang | 16 ++++++------ htdocs/langs/sv_SE/compta.lang | 16 ++++++------ htdocs/langs/th_TH/compta.lang | 16 ++++++------ htdocs/langs/tr_TR/compta.lang | 16 ++++++------ htdocs/langs/uk_UA/compta.lang | 16 ++++++------ htdocs/langs/uz_UZ/compta.lang | 16 ++++++------ htdocs/langs/vi_VN/compta.lang | 16 ++++++------ htdocs/langs/zh_CN/compta.lang | 16 ++++++------ htdocs/langs/zh_TW/compta.lang | 16 ++++++------ 71 files changed, 472 insertions(+), 455 deletions(-) diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 02cb262b209..a61eb4852bd 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -44,17 +44,17 @@ if (!$user->admin) $action = GETPOST('action', 'alpha'); -// Other parameters COMPTA_* & ACCOUNTING_* +// Other parameters ACCOUNTING_* $list = array ( 'ACCOUNTING_LIMIT_LIST_VENTILATION', 'ACCOUNTING_LENGTH_GACCOUNT', 'ACCOUNTING_LENGTH_AACCOUNT', - 'COMPTA_ACCOUNT_CUSTOMER', - 'COMPTA_ACCOUNT_SUPPLIER', - 'COMPTA_PRODUCT_BUY_ACCOUNT', - 'COMPTA_PRODUCT_SOLD_ACCOUNT', - 'COMPTA_SERVICE_BUY_ACCOUNT', - 'COMPTA_SERVICE_SOLD_ACCOUNT', + 'ACCOUNTING_ACCOUNT_CUSTOMER', + 'ACCOUNTING_ACCOUNT_SUPPLIER', + 'ACCOUNTING_PRODUCT_BUY_ACCOUNT', + 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT', + 'ACCOUNTING_SERVICE_BUY_ACCOUNT', + 'ACCOUNTING_SERVICE_SOLD_ACCOUNT', 'ACCOUNTING_ACCOUNT_SUSPENSE', 'ACCOUNTING_ACCOUNT_TRANSFER_CASH' ); @@ -63,7 +63,7 @@ $list = array ( * Actions */ -$compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES'; +$compta_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; if ($action == 'update') { @@ -78,7 +78,7 @@ if ($action == 'update') if (in_array($compta_mode,$compta_modes)) { - if (!dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { + if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { $error++; } } else { @@ -160,7 +160,7 @@ print ''; print ''; -// Cas du parametre COMPTA_MODE +// Cas du parametre ACCOUNTING_MODE print ''; print ''; diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 0b06a3d0daa..5c1cba946ee 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -98,17 +98,17 @@ if ($resql) { $compta_prodsell = $obj->accountancy_code_sell; if (empty($compta_prodsell)) { if ($obj->product_type == 0) - $compta_prodsell = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); else - $compta_prodsell = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } $compta_prodbuy = $obj->accountancy_code_buy; if (empty($compta_prodbuy)) { if ($obj->product_type == 0) - $compta_prodbuy = (! empty($conf->global->COMPTA_PRODUCT_BUY_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef")); else - $compta_prodbuy = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT) ? $conf->global->COMPTA_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef")); } $product_static = new Product($db); diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index fefed420621..225bffdfcb8 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -168,17 +168,17 @@ if ($result) { if (! empty($objp->type)) { if ($objp->type == 1) { - $objp->code_sell = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } else { - $objp->code_sell = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } } else { $code_sell_notset = 'color:blue'; if ($objp->type == 1) { - $objp->code_sell = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } else { - $objp->code_sell = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } } } diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 82c3a09e20a..537dc3476fd 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -129,8 +129,8 @@ if ($result) { $num = $db->num_rows($result); // Variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER) ? $conf->global->COMPTA_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER) ? $conf->global->COMPTA_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); $cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef")); $accountancy_account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef")); @@ -349,7 +349,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else if ($tabtype[$key] == 'payment_supplier') { $sqlmid = 'SELECT facf.facnumber'; @@ -364,7 +364,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_SUPPLIER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; } else if ($tabtype[$key] == 'company') { $sqlmid = 'SELECT fac.facnumber'; @@ -379,11 +379,11 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else { $bookkeeping->doc_ref = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } $result = $bookkeeping->create(); @@ -434,9 +434,9 @@ if ($action == 'export_csv') { print $date . $sep; print $conf->global->ACCOUNTING_BANK_JOURNAL . $sep; if ($val["lib"] == '(SupplierInvoicePayment)') { - print length_accountg($conf->global->COMPTA_ACCOUNT_SUPPLIER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep; } else { - print length_accountg($conf->global->COMPTA_ACCOUNT_CUSTOMER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep; } print length_accounta(html_entity_decode($k)) . $sep; print ($mt < 0 ? 'D' : 'C') . $sep; diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php index 33b1e4359c1..52cdbb4f616 100644 --- a/htdocs/accountancy/journal/cashjournal.php +++ b/htdocs/accountancy/journal/cashjournal.php @@ -121,8 +121,8 @@ if ($result) { $num = $db->num_rows($result); // les variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER) ? $conf->global->COMPTA_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER) ? $conf->global->COMPTA_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); $cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef")); $cptsociale = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef")); @@ -318,7 +318,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else if ($tabtype[$key] == 'payment_supplier') { $sqlmid = 'SELECT facf.facnumber'; @@ -333,7 +333,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_SUPPLIER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; } else if ($tabtype[$key] == 'company') { $sqlmid = 'SELECT fac.facnumber'; @@ -348,11 +348,11 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else { $bookkeeping->doc_ref = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } $result = $bookkeeping->create(); @@ -399,9 +399,9 @@ if ($action == 'export_csv') { print $date . $sep; print $conf->global->ACCOUNTING_CASH_JOURNAL . $sep; if ($obj->label == '(SupplierInvoicePayment)') { - print length_accountg($conf->global->COMPTA_ACCOUNT_SUPPLIER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep; } else { - print length_accountg($conf->global->COMPTA_ACCOUNT_CUSTOMER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep; } print length_accounta(html_entity_decode($k)) . $sep; print ($mt < 0 ? 'D' : 'C') . $sep; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index c9d21f5d9be..789aa1111af 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -111,8 +111,8 @@ $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); // les variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER)) ? $conf->global->COMPTA_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"); - $cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)) ? $conf->global->COMPTA_VAT_ACCOUNT : $langs->trans("CodeNotDef"); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef"); $tabfac = array (); $tabht = array (); @@ -128,9 +128,9 @@ if ($result) { $compta_prod = $obj->compte; if (empty($compta_prod)) { if ($obj->product_type == 0) - $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_BUY_ACCOUNT)) ? $conf->global->COMPTA_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"); else - $compta_prod = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT)) ? $conf->global->COMPTA_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"); } $compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva); @@ -174,7 +174,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->fk_docdet = $val["fk_facturefourndet"]; $bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur']; $bookkeeping->label_compte = $tabcompany[$key]['name']; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_SUPPLIER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt >= 0) ? 'C' : 'D'; $bookkeeping->debit = ($mt <= 0) ? $mt : 0; @@ -288,7 +288,7 @@ if ($action == 'export_csv') { } print $date . $sep; print $conf->global->ACCOUNTING_PURCHASE_JOURNAL . $sep; - print length_accountg($conf->global->COMPTA_ACCOUNT_SUPPLIER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep; foreach ( $tabttc[$key] as $k => $mt ) { print length_accounta(html_entity_decode($k)) . $sep; @@ -416,7 +416,6 @@ if ($action == 'export_csv') { foreach ( $tabht[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; @@ -431,7 +430,6 @@ if ($action == 'export_csv') { foreach ( $tabtva[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; @@ -443,7 +441,6 @@ if ($action == 'export_csv') { print ""; // Third party - // print ""; print ""; print ""; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 79444fbca60..a7c0266998f 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -125,17 +125,17 @@ if ($result) { while ( $i < $num ) { $obj = $db->fetch_object($result); // les variables - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER)) ? $conf->global->COMPTA_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"); $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli; $compta_prod = $obj->compte; if (empty($compta_prod)) { if ($obj->product_type == 0) - $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); else - $compta_prod = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT)) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); } - $cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)) ? $conf->global->COMPTA_VAT_ACCOUNT : $langs->trans("CodeNotDef"); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef"); $compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva); // Invoice lines @@ -183,7 +183,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->fk_doc = $key; $bookkeeping->fk_docdet = $val["fk_facturedet"]; $bookkeeping->code_tiers = $tabcompany[$key]['code_client']; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; $bookkeeping->label_compte = $tabcompany[$key]['name']; $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C'; @@ -267,7 +267,7 @@ if ($action == 'export_csv') { print $date . $sep; print $conf->global->ACCOUNTING_SELL_JOURNAL . $sep; - print length_accountg($conf->global->COMPTA_ACCOUNT_CUSTOMER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep; foreach ( $tabttc[$key] as $k => $mt ) { print length_accounta(html_entity_decode($k)) . $sep; print ($mt < 0 ? 'C' : 'D') . $sep; @@ -422,7 +422,6 @@ if ($action == 'export_csv') { print ""; // Third party - // print ""; print ""; print ""; foreach ( $tabttc[$key] as $k => $mt ) { @@ -441,7 +440,6 @@ if ($action == 'export_csv') { foreach ( $tabht[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; @@ -457,7 +455,6 @@ if ($action == 'export_csv') { foreach ( $tabtva[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 5c77149c0f0..0bb83eae3c4 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -37,23 +37,23 @@ accessforbidden(); $action = GETPOST('action','alpha'); -// Other parameters COMPTA_* +// Other parameters ACCOUNTING_* $list = array( - 'COMPTA_PRODUCT_BUY_ACCOUNT', - 'COMPTA_PRODUCT_SOLD_ACCOUNT', - 'COMPTA_SERVICE_BUY_ACCOUNT', - 'COMPTA_SERVICE_SOLD_ACCOUNT', - 'COMPTA_VAT_ACCOUNT', - 'COMPTA_VAT_BUY_ACCOUNT', - 'COMPTA_ACCOUNT_CUSTOMER', - 'COMPTA_ACCOUNT_SUPPLIER' + 'ACCOUNTING_PRODUCT_BUY_ACCOUNT', + 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT', + 'ACCOUNTING_SERVICE_BUY_ACCOUNT', + 'ACCOUNTING_SERVICE_SOLD_ACCOUNT', + 'ACCOUNTING_VAT_ACCOUNT', + 'ACCOUNTING_VAT_BUY_ACCOUNT', + 'ACCOUNTING_ACCOUNT_CUSTOMER', + 'ACCOUNTING_ACCOUNT_SUPPLIER' ); /* * Actions */ -$compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES'; +$compta_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; if ($action == 'update') { @@ -69,7 +69,7 @@ if ($action == 'update') if (in_array($compta_mode,$compta_modes)) { - if (!dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { + if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { $error++; } } else { @@ -113,7 +113,7 @@ print ''; print '
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
".$conf->global->COMPTA_JOURNAL_BUY."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "
".$conf->global->COMPTA_JOURNAL_BUY."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "" . $langs->trans("VAT") . "
".$conf->global->COMPTA_JOURNAL_BUY."" . $date . "" . $invoicestatic->getNomUrl(1) . "
".$conf->global->COMPTA_JOURNAL_SELL."" . $date . "" . $invoicestatic->getNomUrl(1) . "
".$conf->global->COMPTA_JOURNAL_SELL."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "
".$conf->global->COMPTA_JOURNAL_SELL."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "
'; -// Cas du parametre COMPTA_MODE +// Cas du parametre ACCOUNTING_MODE print ''; print ''; diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php index 453db8e4203..d7027d8a1dd 100644 --- a/htdocs/admin/salaries.php +++ b/htdocs/admin/salaries.php @@ -36,7 +36,7 @@ if (!$user->admin) $action = GETPOST('action', 'alpha'); -// Other parameters COMPTA_* & ACCOUNTING_* +// Other parameters SALARIES_* $list = array ( 'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT', 'SALARIES_ACCOUNTING_ACCOUNT_CHARGE' diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 169fb32010a..34cf525104a 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -122,8 +122,8 @@ if ($result) { $num = $db->num_rows($result); // les variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER)?$conf->global->COMPTA_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef")); - $cpttva = (! empty($conf->global->COMPTA_VAT_BUY_ACCOUNT)?$conf->global->COMPTA_VAT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)?$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef")); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)?$conf->global->ACCOUNTING_VAT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); $tabfac = array(); $tabht = array(); @@ -142,8 +142,8 @@ if ($result) $compta_prod = $obj->accountancy_code_buy; if (empty($compta_prod)) { - if($obj->product_type == 0) $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_BUY_ACCOUNT)?$conf->global->COMPTA_PRODUCT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); - else $compta_prod = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT)?$conf->global->COMPTA_SERVICE_BUY_ACCOUNT:$langs->trans("CodeNotDef")); + if($obj->product_type == 0) $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)?$conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); + else $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)?$conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT:$langs->trans("CodeNotDef")); } $compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva); $compta_localtax1 = (! empty($obj->account_localtax1)?$obj->account_localtax1:$langs->trans("CodeNotDef")); @@ -230,7 +230,6 @@ foreach ($tabfac as $key => $val) if (isset($line['nomtcheck']) || $mt) { print ""; - //print ""; print ""; print ""; print ""; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index f90add66b54..e249d3fe554 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -141,15 +141,15 @@ if ($result) { $obj = $db->fetch_object($result); // les variables - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER)?$conf->global->COMPTA_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef")); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)?$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef")); $compta_soc = (! empty($obj->code_compta)?$obj->code_compta:$cptcli); $compta_prod = $obj->accountancy_code_sell; if (empty($compta_prod)) { - if($obj->product_type == 0) $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT)?$conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); - else $compta_prod = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT)?$conf->global->COMPTA_SERVICE_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); + if($obj->product_type == 0) $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); + else $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); } - $cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)?$conf->global->COMPTA_VAT_ACCOUNT:$langs->trans("CodeNotDef")); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)?$conf->global->ACCOUNTING_VAT_ACCOUNT:$langs->trans("CodeNotDef")); $compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva); $account_localtax1=getLocalTaxesFromRate($obj->tva_tx, 1, $obj->thirdparty, $mysoc); @@ -240,7 +240,6 @@ foreach ($tabfac as $key => $val) if (isset($line['nomtcheck']) || $mt) { print ""; - //print ""; print ""; print ""; print ""; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 08ae52a3d51..abad47cf443 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -99,7 +99,7 @@ else } // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->COMPTA_MODE); +$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->ACCOUNTING_MODE); /* diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 05c3a93e011..1fecc0e1c28 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -48,7 +48,7 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accountin // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->COMPTA_MODE); +$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->ACCOUNTING_MODE); /* diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index aa1047934f5..e995ee45d54 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -39,7 +39,7 @@ if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta' if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport'); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta"); $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 04cf00b4388..e88d370a0c6 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -36,7 +36,7 @@ if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta' if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport'); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta"); $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index cea623a144b..1d34f78a181 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -34,7 +34,7 @@ $langs->load("companies"); $langs->load("categories"); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta"); $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 59a7e478f9b..69fdeff849c 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -38,7 +38,7 @@ else { $userid=GETPOST('userid','int'); $socid = GETPOST('socid','int'); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; // Security check diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index d991ac8ac88..f5d0065e7f3 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -60,7 +60,7 @@ function tva_coll($db,$y,$q) { global $conf; - if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") + if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES") { // if vat paid on due invoices $sql = "SELECT d.fk_facture as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.total_tva as amount"; @@ -128,7 +128,7 @@ function tva_paye($db, $y,$q) { global $conf; - if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") + if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES") { // Si on paye la tva sur les factures dues (non brouillon) $sql = "SELECT d.fk_facture_fourn as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.tva as amount"; @@ -212,7 +212,7 @@ print ""; print ""; print "\n"; -if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") +if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES") { $y = $year_current; diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index b6225de2913..8a17273435e 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -370,8 +370,8 @@ class Conf if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR'; $this->currency=$this->global->MAIN_MONNAIE; - // conf->global->COMPTA_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...) - if (empty($this->global->COMPTA_MODE)) $this->global->COMPTA_MODE='RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES' + // conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...) + if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES' // conf->liste_limit = constante de taille maximale des listes if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25; diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 24cb1a6203d..d444b003541 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -77,6 +77,31 @@ ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec; ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label; ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author; +-- Qual +UPDATE llx_const SET name = 'ACCOUNTING_MODE' WHERE name = 'COMPTA_MODE'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_CUSTOMER' WHERE name = 'COMPTA_ACCOUNT_CUSTOMER'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUPPLIER' WHERE name = 'COMPTA_ACCOUNT_SUPPLIER'; +UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_BUY_ACCOUNT' WHERE name = 'COMPTA_PRODUCT_BUY_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT' WHERE name = 'COMPTA_PRODUCT_SOLD_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_BUY_ACCOUNT' WHERE name = 'COMPTA_SERVICE_BUY_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_SOLD_ACCOUNT' WHERE name = 'COMPTA_SERVICE_SOLD_ACCOUNT'; + +-- Compatibility with module Accounting Expert +UPDATE llx_const SET name = 'ACCOUNTING_SEPARATORCSV' WHERE name = 'ACCOUNTINGEX_SEPARATORCSV'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUSPENSE' WHERE name = 'ACCOUNTINGEX_ACCOUNT_SUSPENSE'; +UPDATE llx_const SET name = 'ACCOUNTING_SELL_JOURNAL' WHERE name = 'ACCOUNTINGEX_SELL_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_PURCHASE_JOURNAL' WHERE name = 'ACCOUNTINGEX_PURCHASE_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_SOCIAL_JOURNAL' WHERE name = 'ACCOUNTINGEX_SOCIAL_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_CASH_JOURNAL' WHERE name = 'ACCOUNTINGEX_CASH_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_MISCELLANEOUS_JOURNAL' WHERE name = 'ACCOUNTINGEX_MISCELLANEOUS_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH' WHERE name = 'ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH'; +UPDATE llx_const SET name = 'ACCOUNTING_MODELCSV' WHERE name = 'ACCOUNTINGEX_MODELCSV'; +UPDATE llx_const SET name = 'ACCOUNTING_LENGTH_GACCOUNT' WHERE name = 'ACCOUNTINGEX_LENGTH_GACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_LENGTH_AACCOUNT' WHERE name = 'ACCOUNTINGEX_LENGTH_AACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_LIMIT_LIST_VENTILATION' WHERE name = 'ACCOUNTINGEX_LIMIT_LIST_VENTILATION'; +UPDATE llx_const SET name = 'ACCOUNTING_LIST_SORT_VENTILATION_TODO' WHERE name = 'ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO'; +UPDATE llx_const SET name = 'ACCOUNTING_LIST_SORT_VENTILATION_DONE' WHERE name = 'ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE'; + -- Drop old table DROP TABLE llx_compta; DROP TABLE llx_compta_account; diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang index 2d307a8aefc..f0f62dc224f 100644 --- a/htdocs/langs/ar_SA/compta.lang +++ b/htdocs/langs/ar_SA/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang index 92759e243bb..03427b5e2ae 100644 --- a/htdocs/langs/bg_BG/compta.lang +++ b/htdocs/langs/bg_BG/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang index f63bcd65b3c..2ea31a467d3 100644 --- a/htdocs/langs/bs_BA/compta.lang +++ b/htdocs/langs/bs_BA/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index aee43830170..c70bfcf75da 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang index 83ce6e5305d..2a350c29f16 100644 --- a/htdocs/langs/cs_CZ/compta.lang +++ b/htdocs/langs/cs_CZ/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=podle dodavatele zvolit vhodnou metodu použít stej TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat zpráva za zboží, při použití hotovosti evidence režim není relevantní. Tato zpráva je k dispozici pouze při použití zásnubní evidence režimu (viz nastavení účetního modulu). CalculationMode=Výpočet režim AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Účetnictví standardní kód pro zákaznické thirdparties -COMPTA_ACCOUNT_SUPPLIER=Účetnictví standardní kód pro dodavatele thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Účetnictví standardní kód pro zákaznické thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Účetnictví standardní kód pro dodavatele thirdparties diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang index cd807bc9c4c..7664bec456d 100644 --- a/htdocs/langs/da_DK/compta.lang +++ b/htdocs/langs/da_DK/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Kalkulations mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index 8e9aa735602..53d8dba6d00 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Berechnungsmodus AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen -COMPTA_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen -COMPTA_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen -COMPTA_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen -COMPTA_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen -COMPTA_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen +ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen +ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen +ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang index 89dac1035d2..35c9a2a060b 100644 --- a/htdocs/langs/el_GR/compta.lang +++ b/htdocs/langs/el_GR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε ταμειακής λογιστικής mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε λογιστικής δέσμευσης τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής). CalculationMode=Τρόπο υπολογισμού AccountancyJournal=Λογιστικος Κωδικός περιοδικό -COMPTA_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για να αγοράσουν τα προϊόντα -COMPTA_PRODUCT_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση των προϊόντων -COMPTA_SERVICE_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την αγορά των υπηρεσιών -COMPTA_SERVICE_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση υπηρεσιών -COMPTA_VAT_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ -COMPTA_VAT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ -COMPTA_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτη -COMPTA_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για προμηθευτή +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για να αγοράσουν τα προϊόντα +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση των προϊόντων +ACCOUNTING_SERVICE_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την αγορά των υπηρεσιών +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση υπηρεσιών +ACCOUNTING_VAT_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ +ACCOUNTING_VAT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ +ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτη +ACCOUNTING_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για προμηθευτή diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 3d9681774d8..cfcdec83c2f 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -87,10 +87,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 363f1f17395..5ec9bd62a54 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang index 0d837cbe9f6..4474b523ba5 100644 --- a/htdocs/langs/es_DO/compta.lang +++ b/htdocs/langs/es_DO/compta.lang @@ -24,5 +24,5 @@ RulesVATInServices=- Para los servicios, el informe incluye el ITBIS de los pago RulesVATInProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura. RulesVATDueServices=- Para los servicios, el informe incluye el ITBIS de las facturas debidas, pagadas o no basándose en la fecha de estas facturas. RulesVATDueProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido -COMPTA_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado \ No newline at end of file +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido +ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado \ No newline at end of file diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index 4298ceddbc6..c715587994f 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -87,10 +87,10 @@ ACCOUNTINGEX_SOCIAL_JOURNAL=Diario social ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Cuenta de caja ACCOUNTINGEX_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar -COMPTA_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto) -COMPTA_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto) -COMPTA_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio) -COMPTA_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico) Doctype=Tipo de documento Docdate=Fecha diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index 9fc192ecbb1..da1da3eb951 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo contabilidad de caja no es relevante. Este informe sólo está disponible cuando se utiliza en modo contabilidad de compromiso (consulte la configuración del módulo de contabilidad). CalculationMode=Modo de cálculo AccountancyJournal=Código contable diario -COMPTA_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos -COMPTA_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos -COMPTA_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios -COMPTA_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios -COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido -COMPTA_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado -COMPTA_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes -COMPTA_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos +ACCOUNTING_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido +ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado +ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes +ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang index 29196f1372e..396d234b2df 100644 --- a/htdocs/langs/es_HN/compta.lang +++ b/htdocs/langs/es_HN/compta.lang @@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe %sISV pagado%s para un modo SeeVATReportInDueDebtMode=Ver el informe %sISV debido%s para un modo de cálculo con la opción sobre lo debido RulesVATIn=- Para los servicios, el informe incluye el ISV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura. RulesVATDue=- Para los servicios, el informe incluye el ISV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV") +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV") diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang index 782dfe6ec94..2dbc3cc49b9 100644 --- a/htdocs/langs/es_PE/compta.lang +++ b/htdocs/langs/es_PE/compta.lang @@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe %sIGV pagado%s para un modo SeeVATReportInDueDebtMode=Ver el informe %sIGV debido%s para un modo de cálculo con la opción sobre lo debido RulesVATIn=- Para los servicios, el informe incluye el IGV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura. RulesVATDue=- Para los servicios, el informe incluye el IGV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV") +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV") diff --git a/htdocs/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang index 0ba46f2c682..c9226abe8f1 100644 --- a/htdocs/langs/es_PR/compta.lang +++ b/htdocs/langs/es_PR/compta.lang @@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe %sIVU pagado%s para un modo SeeVATReportInDueDebtMode=Ver el informe %sIVU debido%s para un modo de cálculo con la opción sobre lo debido RulesVATIn=- Para los servicios, el informe incluye el IVU de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura. RulesVATDue=- Para los servicios, el informe incluye el IVU de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU") +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU") diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang index 2dac123a3fe..8c7afa0e642 100644 --- a/htdocs/langs/et_EE/compta.lang +++ b/htdocs/langs/et_EE/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=vastavalt hankijale, vali sobiv meetod sama reegli r TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, kassapõhist raamatupidamist kasutades pole režiim oluline. See aruanne on saadaval vaid tekkepõhist raamatupidamist kasutades (vaata raamatupidamise mooduli seadistust). CalculationMode=Arvutusrežiim AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Vaikimisi kasutatav raamatupidamise kood klientide loomisel -COMPTA_ACCOUNT_SUPPLIER=Vaikimisi kasutatav raamatupidamise kood hankijate loomisel +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Vaikimisi kasutatav raamatupidamise kood klientide loomisel +ACCOUNTING_ACCOUNT_SUPPLIER=Vaikimisi kasutatav raamatupidamise kood hankijate loomisel diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/eu_ES/compta.lang +++ b/htdocs/langs/eu_ES/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang index f6bdd7dca9a..252a2597b7c 100644 --- a/htdocs/langs/fa_IR/compta.lang +++ b/htdocs/langs/fa_IR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت حسابداری نقدی مربوط نیست. این گزارش که با استفاده از تعامل حالت حسابداری (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است. CalculationMode=حالت محاسبه AccountancyJournal=کد حسابداری مجله -COMPTA_PRODUCT_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید محصولات -COMPTA_PRODUCT_SOLD_ACCOUNT=کد پیش فرض حسابداری برای فروش محصولات -COMPTA_SERVICE_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید خدمات -COMPTA_SERVICE_SOLD_ACCOUNT=کد پیش فرض حسابداری به فروش خدمات -COMPTA_VAT_ACCOUNT=پیش فرض کد حسابداری برای جمع آوری مالیات بر ارزش افزوده -COMPTA_VAT_BUY_ACCOUNT=پیش فرض کد حسابداری برای پرداخت مالیات بر ارزش افزوده -COMPTA_ACCOUNT_CUSTOMER=کد حسابداری به طور پیش فرض برای thirdparties مشتری -COMPTA_ACCOUNT_SUPPLIER=کد حسابداری به طور پیش فرض برای thirdparties منبع +ACCOUNTING_PRODUCT_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید محصولات +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=کد پیش فرض حسابداری برای فروش محصولات +ACCOUNTING_SERVICE_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید خدمات +ACCOUNTING_SERVICE_SOLD_ACCOUNT=کد پیش فرض حسابداری به فروش خدمات +ACCOUNTING_VAT_ACCOUNT=پیش فرض کد حسابداری برای جمع آوری مالیات بر ارزش افزوده +ACCOUNTING_VAT_BUY_ACCOUNT=پیش فرض کد حسابداری برای پرداخت مالیات بر ارزش افزوده +ACCOUNTING_ACCOUNT_CUSTOMER=کد حسابداری به طور پیش فرض برای thirdparties مشتری +ACCOUNTING_ACCOUNT_SUPPLIER=کد حسابداری به طور پیش فرض برای thirdparties منبع diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang index 585b9bac3f8..e1d9de0c869 100644 --- a/htdocs/langs/fi_FI/compta.lang +++ b/htdocs/langs/fi_FI/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 8f66eb5319f..352b3902096 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -87,10 +87,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Journal Social ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de transfert espèce ACCOUNTING_ACCOUNT_SUSPENSE=Compte d'attente -COMPTA_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit) -COMPTA_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit) -COMPTA_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service) -COMPTA_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service) Doctype=Type de document Docdate=Date diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index daf273cee3d..7e82771eec1 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode comptabilité de caisse n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit comptabilité d'engagement (voir la configuration du module de comptabilité). CalculationMode=Mode de calcul AccountancyJournal=Code journal comptabilité -COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits -COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits -COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services -COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services -COMPTA_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA -COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA -COMPTA_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients -COMPTA_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits +ACCOUNTING_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services +ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA +ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA +ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients +ACCOUNTING_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang index 22edf9746b3..bac153c241e 100644 --- a/htdocs/langs/he_IL/compta.lang +++ b/htdocs/langs/he_IL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/hr_HR/compta.lang +++ b/htdocs/langs/hr_HR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang index 357d0092b75..1acf7e994fe 100644 --- a/htdocs/langs/hu_HU/compta.lang +++ b/htdocs/langs/hu_HU/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/id_ID/compta.lang +++ b/htdocs/langs/id_ID/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang index f31764f0036..d9148be61f3 100644 --- a/htdocs/langs/is_IS/compta.lang +++ b/htdocs/langs/is_IS/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang index 8c60b656a72..ec2601ed1b2 100644 --- a/htdocs/langs/it_IT/compta.lang +++ b/htdocs/langs/it_IT/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo app TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Metodo di calcolo AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Codice contabile predefinito per acquistare prodotti -COMPTA_PRODUCT_SOLD_ACCOUNT=Codice contabile predefinito per vendere prodotti -COMPTA_SERVICE_BUY_ACCOUNT=Codice contabile predefinito per comprare servizi -COMPTA_SERVICE_SOLD_ACCOUNT=Codice contabile predefinito per vendere servizi -COMPTA_VAT_ACCOUNT=Codice contabile predefinito per IVA a credito -COMPTA_VAT_BUY_ACCOUNT=Codice contabile predefinito per IVA a debito -COMPTA_ACCOUNT_CUSTOMER=Codice contabile predefinito per clienti -COMPTA_ACCOUNT_SUPPLIER=Codice contabile predefinito per fornitori +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codice contabile predefinito per acquistare prodotti +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codice contabile predefinito per vendere prodotti +ACCOUNTING_SERVICE_BUY_ACCOUNT=Codice contabile predefinito per comprare servizi +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codice contabile predefinito per vendere servizi +ACCOUNTING_VAT_ACCOUNT=Codice contabile predefinito per IVA a credito +ACCOUNTING_VAT_BUY_ACCOUNT=Codice contabile predefinito per IVA a debito +ACCOUNTING_ACCOUNT_CUSTOMER=Codice contabile predefinito per clienti +ACCOUNTING_ACCOUNT_SUPPLIER=Codice contabile predefinito per fornitori diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang index 4520b58c2d3..a1d67ea4a1f 100644 --- a/htdocs/langs/ja_JP/compta.lang +++ b/htdocs/langs/ja_JP/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/ko_KR/compta.lang +++ b/htdocs/langs/ko_KR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang index 3ddf4470a93..74afe6bd1e8 100644 --- a/htdocs/langs/lt_LT/compta.lang +++ b/htdocs/langs/lt_LT/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas Pinigų apskaita būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama Įsipareigojimų apskaita režimas (žr. Apskaitos modulio nustatymus). CalculationMode=Skaičiavimo metodas AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pirkimui -COMPTA_PRODUCT_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pardavimui -COMPTA_SERVICE_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pirkimui -COMPTA_SERVICE_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pardavimui -COMPTA_VAT_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą gaunama PVM -COMPTA_VAT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą sumokamam PVM -COMPTA_ACCOUNT_CUSTOMER=Apskaitos taisyklės pagal nutylėjimą klientui trečiajai šaliai -COMPTA_ACCOUNT_SUPPLIER=Apskaitos taisyklės pagal nutylėjimą tiekėjams trečiosioms šalims +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pirkimui +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pardavimui +ACCOUNTING_SERVICE_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pirkimui +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pardavimui +ACCOUNTING_VAT_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą gaunama PVM +ACCOUNTING_VAT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą sumokamam PVM +ACCOUNTING_ACCOUNT_CUSTOMER=Apskaitos taisyklės pagal nutylėjimą klientui trečiajai šaliai +ACCOUNTING_ACCOUNT_SUPPLIER=Apskaitos taisyklės pagal nutylėjimą tiekėjams trečiosioms šalims diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang index fcb2cd6b575..86edd4a2e0e 100644 --- a/htdocs/langs/lv_LV/compta.lang +++ b/htdocs/langs/lv_LV/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=no piegādātāja, izvēlēties piemērotu metodi pi TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot skaidras naudas uzskaites režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto saderināšanās grāmatvedības režīmu (skat. iestatīšanu grāmatvedības moduli). CalculationMode=Aprēķinu režīms AccountancyJournal=Kontu žurnāls -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Grāmatvedība kods pēc noklusējuma klientu thirdparties -COMPTA_ACCOUNT_SUPPLIER=Grāmatvedība kods pēc noklusējuma piegādātāja thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Grāmatvedība kods pēc noklusējuma klientu thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Grāmatvedība kods pēc noklusējuma piegādātāja thirdparties diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/mk_MK/compta.lang +++ b/htdocs/langs/mk_MK/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang index 53d0c060922..3c9ec2a9d79 100644 --- a/htdocs/langs/nb_NO/compta.lang +++ b/htdocs/langs/nb_NO/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang index 0d6f8ac174c..88556ef051e 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een kas boukhoudings-modus is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van betrokkenheid accountancy-modus (zie setup van boukhoud module). CalculationMode=Berekeningswijze AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Standaard boekhoud code om producten te kopen -COMPTA_PRODUCT_SOLD_ACCOUNT=Standaard boekhoud code om producten te verkopen -COMPTA_SERVICE_BUY_ACCOUNT=Standaard boekhoud code om diensten te kopen -COMPTA_SERVICE_SOLD_ACCOUNT=Standaard boekhoud code om diensten te verkopen -COMPTA_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW -COMPTA_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw -COMPTA_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties -COMPTA_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard boekhoud code om producten te kopen +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standaard boekhoud code om producten te verkopen +ACCOUNTING_SERVICE_BUY_ACCOUNT=Standaard boekhoud code om diensten te kopen +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standaard boekhoud code om diensten te verkopen +ACCOUNTING_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW +ACCOUNTING_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw +ACCOUNTING_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties +ACCOUNTING_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang index 6525bb0d511..e4853c56231 100644 --- a/htdocs/langs/pl_PL/compta.lang +++ b/htdocs/langs/pl_PL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang index 8da28ed9638..807892c8955 100644 --- a/htdocs/langs/pt_BR/compta.lang +++ b/htdocs/langs/pt_BR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequ TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de contabilidade de caixa não é relevante. Este relatório está disponível somente quando utilizar o modo de contabilidade engajamento (ver configuração do módulo de contabilidade). CalculationMode=Modo de cálculo AccountancyJournal=Codigo do jornal fiscal -COMPTA_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos -COMPTA_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos -COMPTA_SERVICE_BUY_ACCOUNT=Código de contabilidade padrão para comprar serviços -COMPTA_SERVICE_SOLD_ACCOUNT=Código de contabilidade padrão para vender serviços -COMPTA_VAT_ACCOUNT=Código de contabilidade padrão para cobrança do VAT -COMPTA_VAT_BUY_ACCOUNT=Código de contabilidade padrão para pagar o VAT -COMPTA_ACCOUNT_CUSTOMER=Código Contabilidade por padrão para fornecedores de clientes -COMPTA_ACCOUNT_SUPPLIER=Código da contabilidade por padrão para fornecedor +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos +ACCOUNTING_SERVICE_BUY_ACCOUNT=Código de contabilidade padrão para comprar serviços +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código de contabilidade padrão para vender serviços +ACCOUNTING_VAT_ACCOUNT=Código de contabilidade padrão para cobrança do VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Código de contabilidade padrão para pagar o VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Código Contabilidade por padrão para fornecedores de clientes +ACCOUNTING_ACCOUNT_SUPPLIER=Código da contabilidade por padrão para fornecedor diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang index f05ffdf57c7..fc482644769 100644 --- a/htdocs/langs/pt_PT/compta.lang +++ b/htdocs/langs/pt_PT/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Modo de cálculo AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang index d77a0d6abf8..333fabb0205 100644 --- a/htdocs/langs/ro_RO/compta.lang +++ b/htdocs/langs/ro_RO/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pe TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul contabilitate de casă nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul contabilitate de angajament (a se vedea configurarea modulului de contabilitate). CalculationMode=Mod calcul AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Contul contabil implicit pentru terţii clienţi -COMPTA_ACCOUNT_SUPPLIER=Contul contabil implicit pentru terţii furnizori +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Contul contabil implicit pentru terţii clienţi +ACCOUNTING_ACCOUNT_SUPPLIER=Contul contabil implicit pentru terţii furnizori diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang index 25fc3fdd5dd..4dc595627ee 100644 --- a/htdocs/langs/ru_RU/compta.lang +++ b/htdocs/langs/ru_RU/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Режим вычислений AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang index 361ca593eef..a5164dc8c0f 100644 --- a/htdocs/langs/sk_SK/compta.lang +++ b/htdocs/langs/sk_SK/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=podľa dodávateľa zvoliť vhodnú metódu použiť TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití hotovosti evidencia režim nie je relevantná. Táto správa je k dispozícii len pri použití zásnubný evidencia režimu (pozri nastavenie účtovného modulu). CalculationMode=Výpočet režim AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Účtovníctvo štandardný kód pre zákaznícke thirdparties -COMPTA_ACCOUNT_SUPPLIER=Účtovníctvo štandardný kód pre dodávateľov thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Účtovníctvo štandardný kód pre zákaznícke thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Účtovníctvo štandardný kód pre dodávateľov thirdparties diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang index 88bb0773392..d744d2d588c 100644 --- a/htdocs/langs/sl_SI/compta.lang +++ b/htdocs/langs/sl_SI/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/sq_AL/compta.lang +++ b/htdocs/langs/sq_AL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang index 21e59c35abb..f224a0b49a7 100644 --- a/htdocs/langs/sv_SE/compta.lang +++ b/htdocs/langs/sv_SE/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/th_TH/compta.lang +++ b/htdocs/langs/th_TH/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang index 86bdd1945d3..2cdba02cd1b 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kulla TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, nakit muhasebesimodu için uygun değildir. Bu rapor yalnızca, tahakkuk muhasebesi modu için uygundur (muhasebe modülü ayarlarına bakın). CalculationMode=Hesaplama modu AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu -COMPTA_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu -COMPTA_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu -COMPTA_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu -COMPTA_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu -COMPTA_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu -COMPTA_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu -COMPTA_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu +ACCOUNTING_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu +ACCOUNTING_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu +ACCOUNTING_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu +ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu +ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/uk_UA/compta.lang +++ b/htdocs/langs/uk_UA/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/uz_UZ/compta.lang +++ b/htdocs/langs/uz_UZ/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang index 73c0eb59742..996a4df1d34 100644 --- a/htdocs/langs/vi_VN/compta.lang +++ b/htdocs/langs/vi_VN/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang index 2813b899471..31c7f734728 100644 --- a/htdocs/langs/zh_CN/compta.lang +++ b/htdocs/langs/zh_CN/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=计算模式 AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=买产品的缺省会计模式 -COMPTA_PRODUCT_SOLD_ACCOUNT=卖产品的缺省会计模式 -COMPTA_SERVICE_BUY_ACCOUNT=买服务的缺省会计模式 -COMPTA_SERVICE_SOLD_ACCOUNT=卖服务的缺省会计模式 -COMPTA_VAT_ACCOUNT=征收增值税的缺省会计模式 -COMPTA_VAT_BUY_ACCOUNT=支付增值税的缺省会计模式 -COMPTA_ACCOUNT_CUSTOMER=默认情况下，第三方客户的会计代码 -COMPTA_ACCOUNT_SUPPLIER=默认情况下，第三方供应商的会计代码 +ACCOUNTING_PRODUCT_BUY_ACCOUNT=买产品的缺省会计模式 +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=卖产品的缺省会计模式 +ACCOUNTING_SERVICE_BUY_ACCOUNT=买服务的缺省会计模式 +ACCOUNTING_SERVICE_SOLD_ACCOUNT=卖服务的缺省会计模式 +ACCOUNTING_VAT_ACCOUNT=征收增值税的缺省会计模式 +ACCOUNTING_VAT_BUY_ACCOUNT=支付增值税的缺省会计模式 +ACCOUNTING_ACCOUNT_CUSTOMER=默认情况下，第三方客户的会计代码 +ACCOUNTING_ACCOUNT_SUPPLIER=默认情况下，第三方供应商的会计代码 diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang index 0277516591f..8d5b6d6e4f2 100644 --- a/htdocs/langs/zh_TW/compta.lang +++ b/htdocs/langs/zh_TW/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties From 1bcc2c92a3c4acedaf2200439d62ac66ab7a03df Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 21 Sep 2014 20:42:46 +0200 Subject: [PATCH 0047/1190] compta_mode -> accounting_mode --- htdocs/accountancy/admin/index.php | 14 +++++++------- htdocs/admin/compta.php | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index a61eb4852bd..8e548f8992e 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -63,22 +63,22 @@ $list = array ( * Actions */ -$compta_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; +$accounting_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; if ($action == 'update') { $error = 0; - $compta_modes = array( + $accounting_modes = array( 'RECETTES-DEPENSES', 'CREANCES-DETTES' ); - $compta_mode = GETPOST('compta_mode','alpha'); + $accounting_mode = GETPOST('accounting_mode','alpha'); - if (in_array($compta_mode,$compta_modes)) { + if (in_array($accounting_mode,$accounting_modes)) { - if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { + if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) { $error++; } } else { @@ -165,7 +165,7 @@ print '
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
".$conf->global->COMPTA_JOURNAL_BUY."".dol_print_date($val["date"])."".$invoicestatic->getNomUrl(1)."".$k."".$line['label']."
".$conf->global->COMPTA_JOURNAL_SELL."".dol_print_date($val["date"])."".$invoicestatic->getNomUrl(1)."".$k."".$line['label']."".$langs->trans("Invoices")."".$langs->trans("TotalToPay")."
'; print ''; print ''; print "\n"; -print ''; +print ''; print '\n"; -print ''; +print ''; print '\n"; print ''; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 0bb83eae3c4..610bf371f29 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -53,23 +53,23 @@ $list = array( * Actions */ -$compta_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; +$accounting_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; if ($action == 'update') { $error = 0; - $compta_modes = array( + $accounting_modes = array( 'RECETTES-DEPENSES', 'CREANCES-DETTES' ); - $compta_mode = GETPOST('compta_mode','alpha'); + $accounting_mode = GETPOST('accounting_mode','alpha'); - if (in_array($compta_mode,$compta_modes)) { + if (in_array($accounting_mode,$accounting_modes)) { - if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { + if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) { $error++; } } else { @@ -118,7 +118,7 @@ print '
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
'.$langs->trans('OptionModeTrue').'
'.$langs->trans('OptionModeTrue').''.nl2br($langs->trans('OptionModeTrueDesc')); // Write info on way to count VAT //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) @@ -179,7 +179,7 @@ print ''.nl2br($langs->trans('OptionModeTrueDesc')); // // print nl2br($langs->trans('OptionModeTrueInfoExpert')); //} print "
'.$langs->trans('OptionModeVirtual').'
'.$langs->trans('OptionModeVirtual').''.nl2br($langs->trans('OptionModeVirtualDesc'))."
'; print ''; print ''; print "\n"; -print ''; +print ''; print '\n"; -print ''; +print ''; print '\n"; print ''; From 4b4fe9811f9a4b85d3ad7847d42934f59f02bf8e Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 21 Sep 2014 20:43:06 +0200 Subject: [PATCH 0048/1190] Changelog --- ChangeLog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf0f0b2f922..d2d26bf6fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,9 +111,11 @@ For developers: - New: renamed table llx_c_pays to llx_c_country & libelle field to label. - Qual: Renamed table llx_c_civilite into llx_c_civility, field civilite into label in the same table, - and field civilite into civility in other table -- Qual: Renamed all files & links "liste.php" into "list.php" -- Qual: Renamed all files & links "fiche.php" into "card.php" + and field civilite into civility in other table. +- Qual: Renamed all files & links "liste.php" into "list.php". +- Qual: Renamed all files & links "fiche.php" into "card.php". +- Qual: Replace all constants COMPTA_* by ACCOUNTING_*. +- Qual: Replace all constants ACCOUNTINGEX_* by ACCOUNTING_* to simplify migration of the module WARNING: Following changes may create regression for some external modules, but was necessary to make Dolibarr better: From 8e1f9c8d708abd69e79470703bec8db4147c27f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 22 Sep 2014 00:07:10 +0200 Subject: [PATCH 0049/1190] Added missing function in Expedition::generateDocument --- htdocs/expedition/class/expedition.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 9aea7ada0eb..f7edddc0d47 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1561,6 +1561,8 @@ class Expedition extends CommonObject $modelpath = "core/modules/expedition/doc/"; + $this->fetch_origin(); + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0); } From 9244ef23afbc25475acf1ba61b5b839d22e1b917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 22 Sep 2014 00:08:21 +0200 Subject: [PATCH 0050/1190] Removed 2nd argument of muscadet and canelle model __construct function --- .../supplier_invoice/pdf/pdf_canelle.modules.php | 15 +++++++-------- .../supplier_order/pdf/pdf_muscadet.modules.php | 3 +-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index f61f49cc471..151f2d856aa 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -58,9 +58,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices * Constructor * * @param DoliDB $db Database handler - * @param Object $object Supplier invoice */ - function __construct($db,$object) + function __construct($db) { global $conf,$langs,$mysoc; @@ -91,12 +90,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $this->franchise=!$mysoc->tva_assuj; - // Get source company - if (! is_object($object->thirdparty)) $object->fetch_thirdparty(); - if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc; // If fetch_thirdparty fails, object has no socid (specimen) - $this->emetteur=$object->thirdparty; - if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined - // Defini position des colonnes $this->posxdesc=$this->marge_gauche+1; $this->posxtva=112; @@ -139,6 +132,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices { global $user,$langs,$conf,$mysoc,$hookmanager; + // Get source company + if (! is_object($object->thirdparty)) $object->fetch_thirdparty(); + if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc; // If fetch_thirdparty fails, object has no socid (specimen) + $this->emetteur=$object->thirdparty; + if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined + if (! is_object($outputlangs)) $outputlangs=$langs; // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1'; diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index bb1a4233382..32fdc1bb960 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -61,9 +61,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders * Constructor * * @param DoliDB $db Database handler - * @param Object $object Supplier order */ - function __construct($db,$object) + function __construct($db) { global $conf,$langs,$mysoc; From 016c889aa8562944e1a270553940c8308578261c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 22 Sep 2014 00:15:32 +0200 Subject: [PATCH 0051/1190] Refactored CommandeFournisseur::generateDocument and FactureFournisseur::generateDocument --- .../class/fournisseur.commande.class.php | 82 +------------------ .../fourn/class/fournisseur.facture.class.php | 81 +----------------- 2 files changed, 5 insertions(+), 158 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 279050d0cd4..0961a244c65 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -2019,18 +2019,9 @@ class CommandeFournisseur extends CommonOrder public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { global $conf, $user, $langs; + $langs->load("suppliers"); - $error=0; - - // Increase limit for PDF build - $err=error_reporting(); - error_reporting(0); - @set_time_limit(120); - error_reporting($err); - - $srctemplatepath=''; - // Sets the model on the model name to use if (! dol_strlen($modele)) { @@ -2044,76 +2035,9 @@ class CommandeFournisseur extends CommonOrder } } - // If selected model is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/supplier_order/pdf/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // We check the model location - $file=dol_buildpath($reldir."core/modules/supplier_order/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Load the model - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db,$this); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans supplier_order_pdf_create"); - dol_print_error($this->db,$obj->error); - return 0; - } - } - else - { - if (! $conf->global->COMMANDE_SUPPLIER_ADDON_PDF) - { - print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_SUPPLIER_ADDON_PDF_NotDefined"); - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - } - return 0; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index d4828338432..7a8cf50a335 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1687,16 +1687,6 @@ class FactureFournisseur extends CommonInvoice $langs->load("suppliers"); - $error=0; - - // Increase limit for PDF build - $err=error_reporting(); - error_reporting(0); - @set_time_limit(120); - error_reporting($err); - - $srctemplatepath=''; - // Set the model on the model name to use if (! dol_strlen($modele)) { @@ -1710,76 +1700,9 @@ class FactureFournisseur extends CommonInvoice } } - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } + $modelpath = "core/modules/supplier_invoice/pdf/"; - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array('/'); - if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - foreach(array('doc','pdf') as $prefix) - { - $file = $prefix."_".$modele.".modules.php"; - - // We checked the location of the model - $file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/".$file,0); - if (file_exists($file)) - { - $filefound=1; - $classname=$prefix.'_'.$modele; - break; - } - } - if ($filefound) break; - } - - // Load the model - if ($filefound) - { - require_once $file; - - $obj = new $classname($this->db,$this); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - // we delete preview files - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_delete_preview($this); - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans supplier_invoice_pdf_create"); - dol_print_error($this->db,$obj->error); - return 0; - } - } - else - { - if (! $conf->global->INVOICE_SUPPLIER_ADDON_PDF) - { - print $langs->trans("Error")." ".$langs->trans("Error_INVOICE_SUPPLIER_ADDON_PDF_NotDefined"); - } - else - { - print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); - } - return 0; - } + return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } } From 8f492a6677e6e7abd78ce2c726f1fd98e0619439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 22 Sep 2014 00:18:36 +0200 Subject: [PATCH 0052/1190] Documented commonObject::commonGenerateDocument --- htdocs/core/class/commonobject.class.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index ebd5cb98a76..9503404350c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3475,6 +3475,17 @@ abstract class CommonObject return $result; } + /** + * Common function for all objects extending CommonObject for generating documents + * + * @param string $modelspath Relative folder where models are placed + * @param string $modele Model to use + * @param Translate $outputlangs Language to use + * @param int $hidedetails 1 to hide details. 0 by default + * @param int $hidedesc 1 to hide product description. 0 by default + * @param int $hideref 1 to hide product reference. 0 by default + * @return int 1 if OK -1 if not OK + */ protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref) { global $conf, $langs; From de0d53a2bbcc9b4c4a7e13b4f8534d1379ea6656 Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Mon, 22 Sep 2014 16:31:58 +0200 Subject: [PATCH 0053/1190] ADD extrafields on usergroup --- htdocs/core/lib/usergroups.lib.php | 5 + .../install/mysql/migration/3.6.0-3.7.0.sql | 7 + .../tables/llx_usergroup_extrafields.key.sql | 20 +++ .../tables/llx_usergroup_extrafields.sql | 26 +++ htdocs/user/admin/group_extrafields.php | 155 ++++++++++++++++++ htdocs/user/class/usergroup.class.php | 70 +++++++- htdocs/user/group/fiche.php | 39 +++++ 7 files changed, 316 insertions(+), 6 deletions(-) create mode 100644 htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql create mode 100644 htdocs/install/mysql/tables/llx_usergroup_extrafields.sql create mode 100644 htdocs/user/admin/group_extrafields.php diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 276efe85f02..c76e2de77fc 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -195,6 +195,11 @@ function user_admin_prepare_head() $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); $head[$h][2] = 'attributes'; + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/user/admin/group_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups"); + $head[$h][2] = 'attributes_group'; $h++; // Show more tabs from modules diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 24cb1a6203d..47ecd5efa58 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1046,4 +1046,11 @@ CREATE TABLE llx_fichinterdet_extrafields ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields (fk_object); +CREATE TABLE IF NOT EXISTS llx_usergroup_extrafields ( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=InnoDB ; +ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql new file mode 100644 index 00000000000..378f4514539 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql @@ -0,0 +1,20 @@ +-- =================================================================== +-- Copyright (C) 2013 Alexis Algoud +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql new file mode 100644 index 00000000000..333eb41ad08 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql @@ -0,0 +1,26 @@ +-- =================================================================== +-- Copyright (C) 2014 Alexis Algoud +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +CREATE TABLE IF NOT EXISTS llx_usergroup_extrafields ( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=InnoDB ; + + diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php new file mode 100644 index 00000000000..dbb9e863af4 --- /dev/null +++ b/htdocs/user/admin/group_extrafields.php @@ -0,0 +1,155 @@ + + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2014 Alexis Algoud + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/adherents/admin/adherent_extrafields.php + * \ingroup member + * \brief Page to setup extra fields of members + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + +$langs->load("users"); +$langs->load("admin"); + +$extrafields = new ExtraFields($db); +$form = new Form($db); + +// List of supported format +$tmptype2label=ExtraFields::$type2label; +$type2label=array(''); +foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); + +$action=GETPOST('action', 'alpha'); +$attrname=GETPOST('attrname', 'alpha'); +$elementtype='usergroup'; //Must be the $table_element of the class that manage extrafield + +if (!$user->admin) accessforbidden(); + + +/* + * Actions + */ + +require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; + + + +/* + * View + */ + +$textobject=$langs->transnoentitiesnoconv("Groups"); + +$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:Módulo_Usuarios'; +llxHeader('',$langs->trans("UsersSetup"),$help_url); + + +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans("UsersSetup"),$linkback,'setup'); + + +$head = user_admin_prepare_head(); + +dol_fiche_head($head, 'attributes_group', $langs->trans("Group"), 0, 'user'); + + +print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; +print '
'; + +// Load attribute_label +$extrafields->fetch_name_optionals_label($elementtype); + +print "
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
'.$langs->trans('OptionModeTrue').'
'.$langs->trans('OptionModeTrue').''.nl2br($langs->trans('OptionModeTrueDesc')); // Write info on way to count VAT //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) @@ -132,7 +132,7 @@ print ''.nl2br($langs->trans('OptionModeTrueDesc')); // // print nl2br($langs->trans('OptionModeTrueInfoExpert')); //} print "
'.$langs->trans('OptionModeVirtual').'
'.$langs->trans('OptionModeVirtual').''.nl2br($langs->trans('OptionModeVirtualDesc'))."
"; + +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +$var=True; +foreach($extrafields->attribute_type as $key => $value) +{ + $var=!$var; + print ""; + print "\n"; + print "\n"; + print "\n"; + print '\n"; + print '\n"; + print '\n"; + print '\n"; + print ""; + // $i++; +} + +print "
'.$langs->trans("Label").''.$langs->trans("AttributeCode").''.$langs->trans("Type").''.$langs->trans("Size").''.$langs->trans("Unique").''.$langs->trans("Required").' 
".$extrafields->attribute_label[$key]."".$key."".$type2label[$extrafields->attribute_type[$key]]."'.$extrafields->attribute_size[$key]."'.yn($extrafields->attribute_unique[$key])."'.yn($extrafields->attribute_required[$key])."'.img_edit().''; + print "  ".img_delete()."
"; + +dol_fiche_end(); + + +// Buttons +if ($action != 'create' && $action != 'edit') +{ + print '
'; + print "".$langs->trans("NewAttribute").""; + print "
"; +} + + +/* ************************************************************************** */ +/* */ +/* Creation d'un champ optionnel + /* */ +/* ************************************************************************** */ + +if ($action == 'create') +{ + print "
"; + print_titre($langs->trans('NewAttribute')); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; +} + +/* ************************************************************************** */ +/* */ +/* Edition d'un champ optionnel */ +/* */ +/* ************************************************************************** */ +if ($action == 'edit' && ! empty($attrname)) +{ + print "
"; + print_titre($langs->trans("FieldEdition", $attrname)); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index b801c2660aa..3b6be065879 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -4,7 +4,8 @@ * Copyright (c) 2005-2012 Regis Houssin * Copyright (C) 2012 Florian Henry * Copyright (C) 2014 Juanjo Menent - * + * Copyright (C) 2014 Alexis Algoud + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or @@ -105,6 +106,15 @@ class UserGroup extends CommonObject $this->members=$this->listUsersForGroup(); + + // Retreive all extrafield for group + // fetch optionals attributes and labels + dol_include_once('/core/class/extrafields.class.php'); + $extrafields=new ExtraFields($this->db); + $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); + $this->fetch_optionals($this->id,$extralabels); + + // Sav current LDAP Current DN //$this->ldap_dn = $this->_load_ldap_dn($this->_load_ldap_info(),0); } @@ -539,6 +549,17 @@ class UserGroup extends CommonObject $sql .= " WHERE fk_usergroup = ".$this->id; $this->db->query($sql); + // Remove extrafields + if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used + { + $result=$this->deleteExtraFields(); + if ($result < 0) + { + $error++; + dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); + } + } + $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup"; $sql .= " WHERE rowid = ".$this->id; $result=$this->db->query($sql); @@ -568,7 +589,7 @@ class UserGroup extends CommonObject */ function create($notrigger=0) { - global $user, $conf, $langs; + global $user, $conf, $langs, $hookmanager; $error=0; $now=dol_now(); @@ -605,8 +626,28 @@ class UserGroup extends CommonObject if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers } - - $this->db->commit(); + + + // Actions on extra fields (by external module or standard code) + $hookmanager->initHooks(array('groupdao')); + $parameters=array(); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; + + if ($error > 0) { $error++; $this->db->rollback(); return -1; } + else $this->db->commit(); + return $this->id; } else @@ -625,7 +666,7 @@ class UserGroup extends CommonObject */ function update($notrigger=0) { - global $user, $conf, $langs; + global $user, $conf, $langs, $hookmanager; $error=0; @@ -654,7 +695,24 @@ class UserGroup extends CommonObject if ($result < 0) { $error++; } // End call triggers } - + + // Actions on extra fields (by external module or standard code) + $hookmanager->initHooks(array('groupdao')); + $parameters=array(); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; + if (! $error) { $this->db->commit(); diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index f97ef35ae6e..00dcc4c4cfb 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011 Herve Prot * Copyright (C) 2012 Florian Henry + * Copyright (C) 2014 Alexis Algoud * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; if(! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php'); +dol_include_once('/core/class/extrafields.class.php'); + // Defini si peux lire/modifier utilisateurs et permisssions $canreadperms=($user->admin || $user->rights->user->user->lire); $caneditperms=($user->admin || $user->rights->user->user->creer); @@ -59,6 +62,9 @@ if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->multico $object = new Usergroup($db); +$extrafields = new ExtraFields($db); +// fetch optionals attributes and labels +$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); /** * Action remove group @@ -93,6 +99,9 @@ if ($action == 'add') $object->nom = trim($_POST["nom"]); $object->note = trim($_POST["note"]); + // Fill array 'array_options' with data from add form + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0; else $object->entity = $_POST["entity"]; @@ -171,6 +180,9 @@ if ($action == 'update') $object->nom = trim($_POST["group"]); $object->note = dol_htmlcleanlastbr($_POST["note"]); + // Fill array 'array_options' with data from add form + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0; else $object->entity = $_POST["entity"]; @@ -240,6 +252,15 @@ if ($action == 'create') $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90); $doleditor->Create(); print "
\n"; print '

'; @@ -311,6 +332,16 @@ else print '
'.$langs->trans("Note").''.dol_htmlentitiesbr($object->note).' 
\n"; print ''; @@ -495,6 +526,14 @@ else $doleditor->Create(); print '
\n"; print '

'; From f7f00597676afdd7f60ef05cf6b619082d7a9779 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Sep 2014 20:16:58 +0200 Subject: [PATCH 0054/1190] Missing hook to add button on intervention Prepare to move location into resource Can select which king of contact show into contact tab. --- htdocs/comm/action/class/actioncomm.class.php | 5 +- htdocs/comm/action/fiche.php | 20 ++- htdocs/core/class/commonobject.class.php | 42 +++++- htdocs/core/class/extrafields.class.php | 2 +- htdocs/core/class/interfaces.class.php | 4 +- htdocs/core/tpl/contacts.tpl.php | 22 ++- htdocs/fichinter/contact.php | 3 + htdocs/fichinter/fiche.php | 139 +++++++++--------- 8 files changed, 153 insertions(+), 84 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 4fe49999111..e08f5518c1f 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -534,9 +534,11 @@ class ActionComm extends CommonObject * @param int $fk_element Id of element action is linked to * @param string $elementtype Type of element action is linked to * @param string $filter Other filter + * @param string $sortfield Sort on this field + * @param string $sortorder ASC or DESC * @return array or string Error string if KO, array with actions if OK */ - static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='') + static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='', $sortfield='', $sortorder='') { global $conf, $langs; @@ -552,6 +554,7 @@ class ActionComm extends CommonObject else $sql.= " AND a.fk_element = ".$fk_element." AND a.elementtype = '".$elementtype."'"; } if (! empty($filter)) $sql.= $filter; + if ($sortorder && $sortfield) $sql.=$db->order($sortfield, $sortorder); dol_syslog(get_class()."::getActions", LOG_DEBUG); $resql=$db->query($sql); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 929600512c7..46e420866a2 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -638,7 +638,10 @@ if ($action == 'create') print '
'.$langs->trans("Location").'
'.$langs->trans("Location").'
'.$langs->trans("ActionAffectedTo").''; @@ -888,7 +891,10 @@ if ($id > 0) print '
'.$langs->trans("Location").'
'.$langs->trans("Location").'
'.$langs->trans("ActionAffectedTo").''; @@ -1020,13 +1026,16 @@ if ($id > 0) // Full day event print '
'.$langs->trans("EventOnFullDay").''.yn($object->fulldayevent).'
'.$langs->trans("DateActionStart").''; if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour'); else print dol_print_date($object->datep,'day'); if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late")); print ''."\n"; + print ''."\n"; print '
'; print ''; print ''; @@ -1079,7 +1088,10 @@ if ($id > 0) print '
'.$langs->trans("Location").''.$object->location.'
'.$langs->trans("Location").''.$object->location.'
'.$langs->trans("ActionAffectedTo").''; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1059d1af07d..82d838a30c8 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2035,6 +2035,8 @@ abstract class CommonObject */ function setStatut($status,$elementId='',$elementType='') { + global $user,$langs,$conf; + $elementId = (!empty($elementId)?$elementId:$this->id); $elementTable = (!empty($elementType)?$elementType:$this->table_element); @@ -2050,9 +2052,36 @@ abstract class CommonObject dol_syslog(get_class($this)."::setStatut", LOG_DEBUG); if ($this->db->query($sql)) { - $this->db->commit(); - $this->statut = $status; - return 1; + if (! $error) + { + $trigkey=''; + if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFYBILLED'; + + if ($trigkey) + { + // Appel des triggers + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + $interface=new Interfaces($this->db); + $result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf); + if ($result < 0) { + $error++; $this->errors=$interface->errors; + } + // Fin appel triggers + } + } + + if (! $error) + { + $this->db->commit(); + $this->statut = $status; + return 1; + } + else + { + $this->db->rollback(); + dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR); + return -1; + } } else { @@ -2133,8 +2162,10 @@ abstract class CommonObject * @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label() * @return int <0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded */ - function fetch_optionals($rowid,$optionsArray='') + function fetch_optionals($rowid='',$optionsArray='') { + if (empty($rowid)) $rowid=$this->id; + if (! is_array($optionsArray)) { // optionsArray not already loaded, so we load it @@ -2143,7 +2174,6 @@ abstract class CommonObject $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element); } - // Request to get complementary values if (count($optionsArray) > 0) { @@ -2170,7 +2200,7 @@ abstract class CommonObject if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key)) { // we can add this attribute to adherent object - $this->array_options["options_$key"]=$value; + $this->array_options["options_".$key]=$value; } } } diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index d5d16efc2e9..a25115be878 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -514,7 +514,7 @@ class ExtraFields /** - * Load array this->attribute_label + * Load array this->attribute_xxx like attribute_label, attribute_type, ... * * @param string $elementtype Type of element ('adherent', 'commande', societe', 'facture', 'propal', 'product', ...) * @param boolean $forceload Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 50a9cced421..e441dbe5e96 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -60,7 +60,9 @@ class Interfaces // Check parameters if (! is_object($object) || ! is_object($conf)) // Error { - dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_ERR); + $this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf); + dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR); + $this->errors[]=$this->error; return -1; } if (! is_object($user) || ! is_object($langs)) // Warning diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 35849720e7d..fda7aa00832 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -60,9 +60,13 @@ $userstatic=new User($db);
 
- - +
" /> @@ -77,7 +81,13 @@ $userstatic=new User($db);
">
- +
" /> @@ -109,7 +119,8 @@ $userstatic=new User($db);
- +
trans("Source"); ?>
@@ -123,7 +134,8 @@ $userstatic=new User($db); element == 'shipping' && is_object($objectsrc)) $tmpobject=$objectsrc; diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 8f540dd2ebd..b0f9ada3af7 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -144,6 +144,9 @@ if ($id > 0 || ! empty($ref)) print '
'; + if (! empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_USER)) $hideaddcontactforuser=1; + if (! empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_THIPARTY)) $hideaddcontactforthirdparty=1; + // Contacts lines include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; } diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index edd5372471e..56848fcb0bf 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -513,7 +513,7 @@ else if ($action == 'classifybilled' && $user->rights->ficheinter->creer) } else { - $mesg='
'.$object->error.'
'; + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1611,93 +1611,100 @@ else if ($id > 0 || ! empty($ref)) /* * Actions buttons */ + print '
'; - if ($user->societe_id == 0) + $parameters = array(); + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been + // modified by hook + if (empty($reshook)) { - if ($action != 'editdescription' && ($action != 'presend')) + if ($user->societe_id == 0) { - // Validate - if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) + if ($action != 'editdescription' && ($action != 'presend')) { - print '
'.$langs->trans("Valid").'
'; - } - - // Modify - if ($object->statut == 1 && $user->rights->ficheinter->creer) - { - print '
'; - if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify"); - else print $langs->trans("SetToDraft"); - print '
'; - } - - // Send - if ($object->statut > 0) - { - if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send) + // Validate + if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) { - print '
'.$langs->trans('SendByMail').'
'; + print '
'.$langs->trans("Valid").'
'; } - else print '
'.$langs->trans('SendByMail').'
'; - } - // Event agenda - if (! empty($conf->global->FICHINTER_ADDLINK_TO_EVENT)) - { - if (! empty($conf->agenda->enabled) && $object->statut > 0) + // Modify + if ($object->statut == 1 && $user->rights->ficheinter->creer) { - $langs->load("agenda"); + print '
'; + if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify"); + else print $langs->trans("SetToDraft"); + print '
'; + } + + // Send + if ($object->statut > 0) + { + if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send) + { + print '
'.$langs->trans('SendByMail').'
'; + } + else print '
'.$langs->trans('SendByMail').'
'; + } + + // Event agenda + if (! empty($conf->global->FICHINTER_ADDLINK_TO_EVENT)) + { + if (! empty($conf->agenda->enabled) && $object->statut > 0) + { + $langs->load("agenda"); + if ($object->statut < 2) + { + if ($user->rights->agenda->myactions->create) print '
'.$langs->trans("AddEvent").'
'; + else print '
'.$langs->trans("AddEvent").'
'; + } + } + } + + // Proposal + if (! empty($conf->propal->enabled) && $object->statut > 0) + { + $langs->load("propal"); if ($object->statut < 2) { - if ($user->rights->agenda->myactions->create) print '
'.$langs->trans("AddEvent").'
'; - else print '
'.$langs->trans("AddEvent").'
'; + if ($user->rights->propal->creer) print '
'.$langs->trans("AddProp").'
'; + else print '
'.$langs->trans("AddProp").'
'; } } - } - // Proposal - if (! empty($conf->propal->enabled) && $object->statut > 0) - { - $langs->load("propal"); - if ($object->statut < 2) + // Invoicing + if (! empty($conf->facture->enabled) && $object->statut > 0) { - if ($user->rights->propal->creer) print '
'.$langs->trans("AddProp").'
'; - else print '
'.$langs->trans("AddProp").'
'; - } - } - - // Invoicing - if (! empty($conf->facture->enabled) && $object->statut > 0) - { - $langs->load("bills"); - if ($object->statut < 2) - { - if ($user->rights->facture->creer) print '
'.$langs->trans("CreateBill").'
'; - else print '
'.$langs->trans("CreateBill").'
'; - } - - if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED)) - { - if ($object->statut != 2) + $langs->load("bills"); + if ($object->statut < 2) { - print '
'.$langs->trans("InterventionClassifyBilled").'
'; + if ($user->rights->facture->creer) print '
'.$langs->trans("CreateBill").'
'; + else print '
'.$langs->trans("CreateBill").'
'; } - else + + if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED)) { - print '
'.$langs->trans("InterventionClassifyUnBilled").'
'; + if ($object->statut != 2) + { + print '
'.$langs->trans("InterventionClassifyBilled").'
'; + } + else + { + print '
'.$langs->trans("InterventionClassifyUnBilled").'
'; + } } } - } - // Delete - if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer) - { - print '
'.$langs->trans('Delete').'
'; - } + // Delete + if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer) + { + print '
'.$langs->trans('Delete').'
'; + } + } } } From 469ff4320a547d5160de751c66e416f055fa0ba5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Sep 2014 21:46:46 +0200 Subject: [PATCH 0055/1190] Uniformize export profiles. --- htdocs/core/modules/modCommande.class.php | 10 +++++++--- htdocs/core/modules/modPropale.class.php | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 7a9434ab934..545ae1b03a0 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -173,16 +173,20 @@ class modCommande extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("commande","commande","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them $this->export_sql_start[$r]='SELECT DISTINCT '; - $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'commande as c, '.MAIN_DB_PREFIX.'societe as s'; + $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; - $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commandedet as cd'; + $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande as c'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uc.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_extrafields as extra ON c.rowid = extra.fk_object'; + $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid'; $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande'; $this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity; diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index e97005c37be..2a390118b72 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -169,7 +169,7 @@ class modPropale extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("propale","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); @@ -178,7 +178,11 @@ class modPropale extends DolibarrModules $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s '; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; - $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c, '.MAIN_DB_PREFIX.'propaldet as cd'; + $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uc.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object'; + $this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)'; $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal'; $this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity; From e163b0237fccdbc99a981f2da1dfd27159d17df1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Sep 2014 23:39:26 +0200 Subject: [PATCH 0056/1190] Merge branch 'develop' of github.com:aspangaro/dolibarr into aspangaro-develop Conflicts: htdocs/fichinter/card.php --- htdocs/fichinter/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 91f1d51bf26..a300d11219d 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1626,14 +1626,14 @@ else if ($id > 0 || ! empty($ref)) // Validate if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) { - print '
'.$langs->trans("Valid").'
'; } // Modify if ($object->statut == 1 && $user->rights->ficheinter->creer) { - print '
'; + print '
'; if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify"); else print $langs->trans("SetToDraft"); print '
'; @@ -1657,7 +1657,7 @@ else if ($id > 0 || ! empty($ref)) $langs->load("agenda"); if ($object->statut < 2) { - if ($user->rights->agenda->myactions->create) print '
'.$langs->trans("AddEvent").'
'; + if ($user->rights->agenda->myactions->create) print '
'.$langs->trans("AddEvent").'
'; else print '
'.$langs->trans("AddEvent").'
'; } } From 248ef4fd46f0ae2250230329272581177d96190e Mon Sep 17 00:00:00 2001 From: Eden Date: Fri, 19 Sep 2014 20:36:02 +0200 Subject: [PATCH 0057/1190] Fix: gidNumber ldap attribute was not defined i using posixGroup objectClass --- htdocs/admin/ldap_groups.php | 4 ++++ htdocs/user/group/ldap.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index e043bff88aa..a0bb5c4b605 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -219,6 +219,10 @@ if (function_exists("ldap_connect")) $info=$object->_load_ldap_info(); $dn=$object->_load_ldap_dn($info); + // Get a gid number for objectclass PosixGroup + if(in_array('posixGroup',$info['objectclass'])) + $info['gidNumber'] = $ldap->getNextGroupGid(); + $result1=$ldap->delete($dn); // To be sure to delete existing records $result2=$ldap->add($dn,$info,$user); // Now the test $result3=$ldap->delete($dn); // Clean what we did diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index cde5e764af5..978b1929b98 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -64,6 +64,10 @@ if ($action == 'dolibarr2ldap') $result=$ldap->connect_bind(); $info=$fgroup->_load_ldap_info(); + // Get a gid number for objectclass PosixGroup + if(in_array('posixGroup',$info['objectclass'])) + $info['gidNumber'] = $ldap->getNextGroupGid(); + $dn=$fgroup->_load_ldap_dn($info); $olddn=$dn; // We can say that old dn = dn as we force synchro From aba4c90d2b11eaf7de92d962e98092a3af4ae9a7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Sep 2014 11:23:57 +0200 Subject: [PATCH 0058/1190] Trans --- htdocs/langs/fr_FR/main.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 08cc727600a..4bfd1addf7e 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -645,7 +645,7 @@ OptionalFieldsSetup=Configuration des attributs complémentaires URLPhoto=URL de la photo/logo SetLinkToThirdParty=Lier vers un autre tiers CreateDraft=Créer brouillon -SetToDraft=Back to draft +SetToDraft=Retour en brouillon ClickToEdit=Cliquer ici pour éditer ObjectDeleted=Objet %s supprimé ByCountry=Par pays From 860253759b50bf864d253bb767003c5c17f5fd97 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 23 Sep 2014 11:59:57 +0200 Subject: [PATCH 0059/1190] Add hook for addMorButton into supplier card --- htdocs/fourn/fiche.php | 65 +++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 127dcfdcc8c..2719f9e0a9b 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -48,6 +48,12 @@ $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe'); $object = new Fournisseur($db); +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('suppliercard')); + +$parameters = array('id' => $id); +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks + /* * Action */ @@ -435,34 +441,41 @@ if ($object->fetch($id)) * Barre d'actions */ + print '
'; - - if ($user->rights->fournisseur->commande->creer) - { - $langs->load("orders"); - print ''.$langs->trans("AddOrder").''; + + $parameters = array(); + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been + // modified by hook + if (empty($reshook)) { + + if ($user->rights->fournisseur->commande->creer) + { + $langs->load("orders"); + print ''.$langs->trans("AddOrder").''; + } + + if ($user->rights->fournisseur->facture->creer) + { + $langs->load("bills"); + print ''.$langs->trans("AddBill").''; + } + + // Add action + if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) + { + if ($user->rights->agenda->myactions->create) + { + print ''.$langs->trans("AddAction").''; + } + else + { + print ''.$langs->trans("AddAction").''; + } + } + + print '
'; } - - if ($user->rights->fournisseur->facture->creer) - { - $langs->load("bills"); - print ''.$langs->trans("AddBill").''; - } - - // Add action - if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) - { - if ($user->rights->agenda->myactions->create) - { - print ''.$langs->trans("AddAction").''; - } - else - { - print ''.$langs->trans("AddAction").''; - } - } - - print '
'; print '
'; if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB)) From 640bf7c34b2d49c2d2815a1370f7938bab381d94 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Sep 2014 12:18:42 +0200 Subject: [PATCH 0060/1190] Uniformize field name --- htdocs/comm/action/card.php | 14 +++--- htdocs/comm/action/class/actioncomm.class.php | 49 +++++++++++++------ htdocs/comm/action/peruser.php | 2 +- .../install/mysql/migration/3.6.0-3.7.0.sql | 6 ++- .../mysql/tables/llx_actioncomm_resources.sql | 10 ++-- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 0e6a6c6fd10..237c55e7678 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -105,11 +105,11 @@ if (! empty($_POST['removedassigned'])) if (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser')) { // Add a new user - if (GETPOST('affectedto') > 0) + if (GETPOST('assignedtouser') > 0) { $assignedtouser=array(); if (! empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); - $assignedtouser[GETPOST('affectedto')]=array('transparency'=>GETPOST('transparency'),'mandatory'=>1); + $assignedtouser[GETPOST('assignedtouser')]=array('transparency'=>GETPOST('transparency'),'mandatory'=>1); $_SESSION['assignedtouser']=dol_json_encode($assignedtouser); } $donotclearsession=1; @@ -647,11 +647,11 @@ if ($action == 'create') print '
'.$langs->trans("ActionAffectedTo").''; if (empty($donotclearsession)) { - $assignedtouser=GETPOST("affectedtouser")?GETPOST("affectedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id); + $assignedtouser=GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id); $_SESSION['assignedtouser']=dol_json_encode(array($assignedtouser=>array('transparency'=>1,'mandatory'=>1))); } - print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'affectedto',1); - //print $form->select_dolusers(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1); + print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); + //print $form->select_dolusers(GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1); print '
'; @@ -904,8 +904,8 @@ if ($id > 0) if (is_object($object->usertodo)) $listofuserid[$object->usertodo->id]=array('id'=>$object->usertodo->id,'transparency'=>$object->transparency); $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } - print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'affectedto',1); - //print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'affectedto',1); + print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); + //print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'assignedtouser',1); print '


'; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 731d82dba2f..f1acf8c29b4 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -211,22 +211,43 @@ class ActionComm extends CommonObject { $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm","id"); - // Actions on extra fields (by external module or standard code) - $hookmanager->initHooks(array('actioncommdao')); - $parameters=array('actcomm'=>$this->id); - $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) + // Now insert assignedusers + if (! $error) + { + foreach($this->userassigned as $key => $val) + { + $sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)"; + $sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", 0, ".$val['transparency'].", 0)"; + + $resql = $this->db->query($sql); + if (! $resql) + { + $error++; + $this->errors[]=$this->db->lasterror(); + } + //var_dump($sql);exit; + } + } + + if (! $error) { - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used - { - $result=$this->insertExtraFields(); - if ($result < 0) - { - $error++; - } - } + // Actions on extra fields (by external module or standard code) + $hookmanager->initHooks(array('actioncommdao')); + $parameters=array('actcomm'=>$this->id); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; } - else if ($reshook < 0) $error++; if (! $error && ! $notrigger) { diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index abd8b71a699..22f968e2b4a 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -656,7 +656,7 @@ jQuery(document).ready(function() { if (ids == \'none\') /* No event */ { /* alert(\'no event\'); */ - url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=create&affectedto="+userid+"&datep="+year+month+day+hour+min+"00&backtopage='.urlencode($_SERVER["PHP_SELF"].'?year='.$year.'&month='.$month.'&day='.$day).'" + url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=create&assignedtouser="+userid+"&datep="+year+month+day+hour+min+"00&backtopage='.urlencode($_SERVER["PHP_SELF"].'?year='.$year.'&month='.$month.'&day='.$day).'" window.location.href = url; } else if (ids.indexOf(",") > -1) /* There is several events */ diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index dab26d32934..0ae4ee8bd22 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -131,6 +131,8 @@ ALTER TABLE llx_user ADD COLUMN weeklyhours double(16,8); ALTER TABLE llx_projet_task_time ADD COLUMN task_datehour datetime after task_date; +ALTER TABLE llx_actioncomm_resources CHANGE COLUMN transparent transparency smallint default 1; + -- Localtaxes by thirds ALTER TABLE llx_c_tva MODIFY COLUMN localtax1 varchar(10); @@ -1071,11 +1073,11 @@ CREATE TABLE llx_fichinterdet_extrafields ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields (fk_object); -CREATE TABLE IF NOT EXISTS llx_usergroup_extrafields ( +CREATE TABLE llx_usergroup_extrafields ( rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, fk_object integer NOT NULL, import_key varchar(14) -- import key -) ENGINE=InnoDB ; +) ENGINE=innodb; ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql index bd48ad4f66d..484cd39fb82 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql @@ -23,10 +23,10 @@ create table llx_actioncomm_resources ( rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_actioncomm integer NOT NULL, - element_type varchar(50) NOT NULL, - fk_element integer NOT NULL, + fk_actioncomm integer NOT NULL, -- Id into llx_actioncomm + element_type varchar(50) NOT NULL, -- Type of resource ('user', 'resource') + fk_element integer NOT NULL, -- Id into table llx_user or llx_resource answer_status varchar(50) NULL, - mandatory smallint, - transparent smallint + mandatory smallint, + transparency smallint default 1 -- Used to say if event is 1=OPAQUE=busy or 0=TRANSPARENT ) ENGINE=innodb; From 7224f642240638205a99333d0066b45981e3da86 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Sep 2014 16:15:15 +0200 Subject: [PATCH 0061/1190] Work on multi user for events. Fix: Modules must be reloaded after migration. --- htdocs/comm/action/card.php | 92 +++++++++++++------ htdocs/comm/action/class/actioncomm.class.php | 55 ++++++++++- htdocs/core/class/html.form.class.php | 33 +++++-- htdocs/core/lib/json.lib.php | 2 +- htdocs/install/upgrade2.php | 4 +- 5 files changed, 141 insertions(+), 45 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 237c55e7678..7ca82a2751e 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -93,7 +93,10 @@ if (! empty($_POST['removedassigned'])) $idtoremove=$_POST['removedassigned']; if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1); else $tmpassigneduserids=array(); - unset($tmpassigneduserids[$idtoremove]); + foreach ($tmpassigneduserids as $key => $val) + { + if ($val['id'] == $idtoremove) unset($tmpassigneduserids[$key]); + } //var_dump($_POST['removedassigned']);exit; $_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids); $donotclearsession=1; @@ -108,8 +111,11 @@ if (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser')) if (GETPOST('assignedtouser') > 0) { $assignedtouser=array(); - if (! empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); - $assignedtouser[GETPOST('assignedtouser')]=array('transparency'=>GETPOST('transparency'),'mandatory'=>1); + if (! empty($_SESSION['assignedtouser'])) + { + $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); + } + $assignedtouser[GETPOST('assignedtouser')]=array('id'=>GETPOST('assignedtouser'), 'transparency'=>GETPOST('transparency'),'mandatory'=>1); $_SESSION['assignedtouser']=dol_json_encode($assignedtouser); } $donotclearsession=1; @@ -202,22 +208,23 @@ if ($action == 'add') $object->percentage = $percentage; $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60; - $listofuserid=dol_json_decode($_SESSION['assignedtouser']); + $listofuserid=array(); + if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']); $i=0; foreach($listofuserid as $key => $value) { if ($i == 0) // First entry { $usertodo=new User($db); - if ($key > 0) + if ($value['id'] > 0) { - $usertodo->fetch($key); + $usertodo->fetch($value['id']); } $object->usertodo = $usertodo; $object->transparency = (GETPOST("transparency")=='on'?1:0); } - $object->userassigned[$key]=array('id'=>$key, 'transparency'=>(GETPOST("transparency")=='on'?1:0)); + $object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0)); $i++; } @@ -281,6 +288,8 @@ if ($action == 'add') { if (! $object->error) { + unset($_SESSION['assignedtouser']); + $db->commit(); if (! empty($backtopage)) { @@ -337,6 +346,7 @@ if ($action == 'update') if ($p2min == -1) $p2min='0'; $object->fetch($id); + $object->fetch_userassigned(); $datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]); $datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]); @@ -363,26 +373,26 @@ if ($action == 'update') setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")),$object->errors,'errors'); $action = 'edit'; } - // Users - $listofuserid=dol_json_decode($_SESSION['assignedtouser']); - $i=0; - foreach($listofuserid as $key => $value) + $listofuserid=array(); + //$assignedtouser=(GETPOST("assignedtouser") >0)?GETPOST("assignedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : 0); + $assignedtouser=(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : 0); + if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first + + if (! empty($_SESSION['assignedtouser'])) { - if ($i == 0) // First entry + // Restore array with key with same value than param 'id' + $tmplist1=dol_json_decode($_SESSION['assignedtouser'], true); $tmplist2=array(); + foreach($tmplist1 as $key => $val) { - $usertodo=new User($db); - if ($key > 0) - { - $usertodo->fetch($key); - } - $object->usertodo = $usertodo; - $object->transparency=(GETPOST("transparency")=='on'?1:0); + if ($val['id'] && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val; } + } - $object->userassigned[$key]=array('id'=>$key, 'transparency'=>(GETPOST("transparency")=='on'?1:0)); - - $i++; + $object->userassigned=array(); // Clear old content + foreach($listofuserid as $key => $val) + { + $object->userassigned[$val['id']]=array('id'=>$val['id'], 'mandatory'=>0, 'transparency'=>(GETPOST("transparency")=='on'?1:0)); } if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) @@ -424,6 +434,8 @@ if ($action == 'update') if ($result > 0) { + unset($_SESSION['assignedtouser']); + $db->commit(); } else @@ -438,6 +450,7 @@ if ($action == 'update') { if (! empty($backtopage)) { + unset($_SESSION['assignedtouser']); header("Location: ".$backtopage); exit; } @@ -474,6 +487,8 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes') if ($action == 'mupdate') { $object->fetch($id); + $object->fetch_userassigned(); + $shour = dol_print_date($object->datep,"%H"); $smin = dol_print_date($object->datep, "%M"); @@ -645,11 +660,19 @@ if ($action == 'create') // Assigned to print ''; @@ -771,10 +794,11 @@ if ($action == 'create') // View or edit if ($id > 0) { - $result=$object->fetch($id); - $object->fetch_optionals($id,$extralabels); + $result1=$object->fetch($id); + $result2=$object->fetch_userassigned(); + $result3=$object->fetch_optionals($id,$extralabels); - if ($result < 0) + if ($result1 < 0 || $result2 < 0 || $result3 < 0) { dol_print_error($db,$object->error); exit; @@ -901,7 +925,8 @@ if ($id > 0) $listofuserid=array(); if (empty($donotclearsession)) { - if (is_object($object->usertodo)) $listofuserid[$object->usertodo->id]=array('id'=>$object->usertodo->id,'transparency'=>$object->transparency); + if (is_object($object->usertodo)) $listofuserid[$object->usertodo->id]=array('id'=>$object->usertodo->id,'transparency'=>$object->transparency); // Owner first + $listofuserid=array_merge($listofuserid,$object->userassigned); $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); @@ -1094,8 +1119,17 @@ if ($id > 0) } // Assigned to - print ''; print '
'.$langs->trans("ActionAffectedTo").''; + $listofuserid=array(); if (empty($donotclearsession)) { $assignedtouser=GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id); - $_SESSION['assignedtouser']=dol_json_encode(array($assignedtouser=>array('transparency'=>1,'mandatory'=>1))); + if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser,'mandatory'=>0,'transparency'=>$object->transparency); // Owner first + $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } + /* + if (empty($donotclearsession)) + { + $assignedtouser=GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id); + $_SESSION['assignedtouser']=dol_json_encode(array($assignedtouser=>array('id'=>$assignedtouser,'transparency'=>1,'mandatory'=>1))); + }*/ print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); //print $form->select_dolusers(GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1); print '
'.$langs->trans("ActionAffectedTo").''; - if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1); + //if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1); + print '
'.$langs->trans("ActionAffectedTo").''; + $listofuserid=array(); + if (empty($donotclearsession)) + { + if (is_object($object->usertodo)) $listofuserid[$object->usertodo->id]=array('id'=>$object->usertodo->id,'transparency'=>$object->transparency); // Owner first + $listofuserid=array_merge($listofuserid,$object->userassigned); + $_SESSION['assignedtouser']=dol_json_encode($listofuserid); + //var_dump($_SESSION['assignedtouser']); + } + print $form->select_dolusers_forevent('view','assignedtouser',1); print '


'; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index f1acf8c29b4..b12dc5fb702 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -62,7 +62,7 @@ class ActionComm extends CommonObject var $priority; // Small int (0 By default) var $note; // Description - var $userassigned; // Array of user ids + var $userassigned = array(); // Array of user ids var $usertodo; // Object user of owner var $userdone; // Object user that did action (deprecated) @@ -217,7 +217,7 @@ class ActionComm extends CommonObject foreach($this->userassigned as $key => $val) { $sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)"; - $sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", 0, ".$val['transparency'].", 0)"; + $sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['mandatory']?$val['mandatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")"; $resql = $this->db->query($sql); if (! $resql) @@ -375,6 +375,34 @@ class ActionComm extends CommonObject } } + + /** + * Initialize this->userassigned array + * + * @return int <0 if KO, >0 if OK + */ + function fetch_userassigned() + { + global $langs; + $sql.="SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency"; + $sql.=" FROM ".MAIN_DB_PREFIX."actioncomm_resources"; + $sql.=" WHERE element_type = 'user' AND fk_actioncomm = ".$this->id; + $resql2=$this->db->query($sql); + if ($resql2) + { + while ($obj = $this->db->fetch_object($resql2)) + { + $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency); + } + return 1; + } + else + { + dol_print_error($this->db); + return -1; + } + } + /** * Delete event from database * @@ -519,7 +547,28 @@ class ActionComm extends CommonObject } else if ($reshook < 0) $error++; - if (! $notrigger) + // Now insert assignedusers + if (! $error) + { + $sql ="DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources where fk_actioncomm = ".$this->id." AND element_type = 'user'"; + $resql = $this->db->query($sql); + + foreach($this->userassigned as $key => $val) + { + $sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)"; + $sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['manadatory']?$val['manadatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")"; + + $resql = $this->db->query($sql); + if (! $resql) + { + $error++; + $this->errors[]=$this->db->lasterror(); + } + //var_dump($sql);exit; + } + } + + if (! $error && ! $notrigger) { // Call trigger $result=$this->call_trigger('ACTION_MODIFY',$user); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 357270efb2d..08f384612f7 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1275,6 +1275,7 @@ class Form /** * Return select list of users. Selected users are stored into session. + * List of users are provided into $_SESSION['assignedtouser']. * * @param string $action Value for $action * @param string $htmlname Field name in form @@ -1295,23 +1296,35 @@ class Form global $conf,$user,$langs; $userstatic=new User($this->db); + $out=''; // Method with no ajax //$out.=''; - $out.=''; - $out.=''; - $out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter); - $out.=''; + if ($action == 'view') + { + $out.=''; + } + else + { + $out.=''; + $out.=''; + $out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter); + $out.=''; + } $assignedtouser=array(); - if (!empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); - if (count($assignedtouser)) $out.='
'; - $i=0; + if (!empty($_SESSION['assignedtouser'])) + { + $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); + } + if (count($assignedtouser) && $action != 'view') $out.='
'; + $i=0; $ownerid=0; foreach($assignedtouser as $key => $value) { - $userstatic->fetch($key); + if ($value['id'] == $ownerid) continue; + $userstatic->fetch($value['id']); $out.=$userstatic->getNomUrl(1); - if ($i == 0) $out.=' ('.$langs->trans("Owner").')'; - $out.=' '; + if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; } + if ($i > 0 && $action != 'view') $out.=' '; //$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional")); //$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy")); $out.='
'; diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php index 69dbb4eba1a..ba7f4cd3f90 100644 --- a/htdocs/core/lib/json.lib.php +++ b/htdocs/core/lib/json.lib.php @@ -254,7 +254,7 @@ function dol_json_decode($json, $assoc=false) foreach ($array as $key => $value) { - $object->{$key} = $value; + if ($key) $object->{$key} = $value; } return $object; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index f9fa76541a5..0bf76c7d729 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -343,8 +343,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // No specific scripts // Tasks to do always and only into last targeted version - $afterversionarray=explode('.','3.4.9'); // target is after this - $beforeversionarray=explode('.','3.5.9'); // target is before this + $afterversionarray=explode('.','3.6.9'); // target is after this + $beforeversionarray=explode('.','3.7.9'); // target is before this if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) { // Reload modules (this must be always and only into last targeted version) From 518d23f278a80830ded6bff08843aebf4178c82a Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 23 Sep 2014 16:28:29 +0200 Subject: [PATCH 0062/1190] Add feature to order to invoice on supplier part --- ChangeLog | 1 + htdocs/core/menus/standard/eldy.lib.php | 9 + htdocs/fourn/card.php | 34 ++ htdocs/fourn/commande/list.php | 4 + htdocs/fourn/commande/orderstoinvoice.php | 609 ++++++++++++++++++++++ htdocs/langs/en_US/suppliers.lang | 2 + htdocs/langs/fr_FR/suppliers.lang | 2 + 7 files changed, 661 insertions(+) create mode 100644 htdocs/fourn/commande/orderstoinvoice.php diff --git a/ChangeLog b/ChangeLog index 2b8a3f8da52..2d7d12f1785 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ For users: - New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals. - New: Add more search field in list of cheque deposits. +- New: Add feature to order to invoice on supplier part - Upgrade phpexcel lib to 1.7.8 - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action - Fix: [ bug #1470, #1472, #1473] User trigger problem diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index b45957a984b..35ecf4d2aaf 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -790,6 +790,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); // if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire); } + + // Supplier Orders + if (! empty($conf->fournisseur->enabled)) + { + $langs->load("supplier"); + $newmenu->add("/fourn/commande/list.php?leftmenu=orders&search_status=5", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); + // if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire); + } + // Donations if (! empty($conf->don->enabled)) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 313f82547e7..9df462bbb4e 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -52,6 +52,9 @@ $object = new Fournisseur($db); * Action */ +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('suppliercard')); + $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks @@ -299,6 +302,28 @@ if ($object->fetch($id)) if ($user->rights->fournisseur->commande->lire) { + + + // TODO move to DAO class + // Check if there are supplier orders billable + $sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,'; + $sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut'; + $sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; + $sql2.= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c'; + $sql2.= ' WHERE c.fk_soc = s.rowid'; + $sql2.= ' AND s.rowid = '.$object->id; + // Show orders with status validated, shipping started and delivered (well any order we can bill) + $sql2.= " AND c.fk_statut IN (5)"; + // Find order that are not already invoiced + $sql2 .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')"; + $resql2=$db->query($sql2); + if ($resql2) { + $orders2invoice = $db->num_rows($resql2); + $db->free($resql2); + } else { + setEventMessage($db->lasterror(),'errors'); + } + // TODO move to DAO class $sql = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p "; @@ -427,6 +452,9 @@ if ($object->fetch($id)) */ print '
'; + + $parameters = array(); + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been if ($user->rights->fournisseur->commande->creer) { @@ -439,6 +467,12 @@ if ($object->fetch($id)) $langs->load("bills"); print ''.$langs->trans("AddBill").''; } + + if ($user->rights->fournisseur->facture->creer) + { + if (! empty($orders2invoice) && $orders2invoice > 0) print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; + else print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; + } // Add action if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 37f2384b4b1..44a2dcbf725 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -51,6 +51,8 @@ $socid = GETPOST('socid','int'); $sortorder = GETPOST('sortorder','alpha'); $sortfield = GETPOST('sortfield','alpha'); +$viewstatut=GETPOST('viewstatut'); + // Security check $orderid = GETPOST('orderid'); if ($user->societe_id) $socid=$user->societe_id; @@ -255,6 +257,8 @@ if ($resql) } print "
\n"; print "\n"; + + print '
'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'
'; $db->free($resql); } diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php new file mode 100644 index 00000000000..62d9683470f --- /dev/null +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -0,0 +1,609 @@ + + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2005 Marc Barilley / Ocebo + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2012 Andreu Bisquerra Gaya + * Copyright (C) 2012 David Rodriguez Martinez + * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2014 Florian Henry + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/fourn/commande/orderstoinvoice.php + * \ingroup commande + * \brief Page to invoice multiple supplier orders + */ +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; +} + +$langs->load('orders'); +$langs->load('deliveries'); +$langs->load('companies'); + +if (! $user->rights->facture->creer) + accessforbidden(); + +$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility +$ref = GETPOST('ref', 'alpha'); +$action = GETPOST('action', 'alpha'); +$confirm = GETPOST('confirm', 'alpha'); +$sref = GETPOST('sref'); +$sref_client = GETPOST('sref_client'); +$sall = GETPOST('sall'); +$socid = GETPOST('socid', 'int'); +$selected = GETPOST('orders_to_invoice'); +$sortfield = GETPOST("sortfield", 'alpha'); +$sortorder = GETPOST("sortorder", 'alpha'); +$viewstatut = GETPOST('viewstatut'); + +if (! $sortfield) + $sortfield = 'c.rowid'; +if (! $sortorder) + $sortorder = 'DESC'; + +$now = dol_now(); +$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server +$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]); +$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server +$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]); + +if ($action == 'create') { + if (is_array($selected) == false) { + $mesgs = array ( + '
' . $langs->trans('Error_OrderNotChecked') . '
' + ); + } else { + $origin = GETPOST('origin'); + $originid = GETPOST('originid'); + } +} + +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php'; +$hookmanager = new HookManager($db); +$hookmanager->initHooks(array ( + 'orderstoinvoicesupplier' +)); + +/* + * Actions + */ + +if (($action == 'create' || $action == 'add') && empty($mesgs)) { + + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; + if (! empty($conf->projet->enabled)) + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; + + $langs->load('bills'); + $langs->load('products'); + $langs->load('main'); + if (isset($_GET['orders_to_invoice'])) { + $orders_id = $_GET['orders_to_invoice']; + $n = count($orders_id); + $i = 0; + + $originid = $orders_id[0]; + $_GET['originid'] = $orders_id[0]; + } + if (isset($_POST['orders_to_invoice'])) { + $orders_id = $_POST['orders_to_invoice']; + $nn = count($orders_id); + $ii = 0; + + $originid = $orders_id[0]; + $_POST['originid'] = $orders_id[0]; + } + + $projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0; + $lineid = GETPOST('lineid', 'int'); + $userid = GETPOST('userid', 'int'); + $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref'); + + // Security check + if ($user->societe_id) + $socid = $user->societe_id; + $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); + + $usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE; + $object = new FactureFournisseur($db); + + // Insert new invoice in database + if ($action == 'add' && $user->rights->fournisseur->facture->creer) { + $object->socid = GETPOST('socid'); + $db->begin(); + $error = 0; + + // Standard or deposit or proforma invoice + $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + if (empty($datefacture)) { + $datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y")); + } + if (! $error) { + $object->ref = $_POST['ref']; + $object->ref_supplier = $_POST['ref_supplier']; + $object->socid = $_POST['socid']; + $object->libelle = $_POST['libelle']; + $object->date = $datefacture; + $object->date_echeance = $datedue; + $object->note_public = GETPOST('note_public'); + $object->note_private = GETPOST('note_private'); + $object->cond_reglement_id = GETPOST('cond_reglement_id'); + $object->mode_reglement_id = GETPOST('mode_reglement_id'); + $projectid = GETPOST('projectid'); + if ($projectid > 0) + $object->fk_project = $projectid; + + // Auto calculation of date due if not filled by user + if (empty($object->date_echeance)) + $object->date_echeance = $object->calculate_date_lim_reglement(); + + if ($_POST['origin'] && $_POST['originid']) { + $object->origin = $_POST['origin']; + $object->origin_id = $orders_id[$ii]; + $object->linked_objects = $orders_id; + $id = $object->create($user); + + if ($id > 0) { + foreach ( $orders_id as $origin => $origin_id ) { + $origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id); + $db->begin(); + $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element ("; + $sql .= "fk_source"; + $sql .= ", sourcetype"; + $sql .= ", fk_target"; + $sql .= ", targettype"; + $sql .= ") VALUES ("; + $sql .= $origin_id; + $sql .= ", '" . $object->origin . "'"; + $sql .= ", " . $id; + $sql .= ", '" . $object->element . "'"; + $sql .= ")"; + + if ($db->query($sql)) { + $db->commit(); + } else { + $db->rollback(); + } + } + + while ( $ii < $nn ) { + $objectsrc = new CommandeFournisseur($db); + dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines"); + $result = $objectsrc->fetch($orders_id[$ii]); + if ($result > 0) { + $lines = $objectsrc->lines; + if (empty($lines) && method_exists($objectsrc, 'fetch_lines')) { + $objectsrc->fetch_lines(); + $lines = $objectsrc->lines; + } + $fk_parent_line = 0; + $num = count($lines); + for($i = 0; $i < $num; $i ++) { + $desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle); + + $desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle); + $product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0); + + // Dates + // TODO mutualiser + $date_start = $lines[$i]->date_debut_prevue; + if ($lines[$i]->date_debut_reel) + $date_start = $lines[$i]->date_debut_reel; + if ($lines[$i]->date_start) + $date_start = $lines[$i]->date_start; + $date_end = $lines[$i]->date_fin_prevue; + if ($lines[$i]->date_fin_reel) + $date_end = $lines[$i]->date_fin_reel; + if ($lines[$i]->date_end) + $date_end = $lines[$i]->date_end; + + // Reset fk_parent_line for no child products and special product + if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) { + $fk_parent_line = 0; + } + // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example. + $result = $object->addline($desc, + $lines[$i]->subprice, + $lines[$i]->tva_tx, + $lines[$i]->localtax1_tx, + $lines[$i]->localtax2_tx, + $lines[$i]->qty, + $lines[$i]->fk_product, + $lines[$i]->remise_percent, + $date_start, + $date_end, + 0, + $lines[$i]->info_bits, + 'HT', + $product_type); + + if ($result > 0) { + $lineid = $result; + } else { + $lineid = 0; + $error ++; + break; + } + // Defined the new fk_parent_line + if ($result > 0 && $lines[$i]->product_type == 9) { + $fk_parent_line = $result; + } + } + } else { + $mesgs[] = $objectsrc->error; + $error ++; + } + $ii ++; + } + } else { + $mesgs[] = $object->error; + $error ++; + } + } + } + + // End of object creation, we show it + if ($id > 0 && ! $error) { + $db->commit(); + header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id); + exit(); + } else { + $db->rollback(); + $action = 'create'; + $_GET["origin"] = $_POST["origin"]; + $_GET["originid"] = $_POST["originid"]; + $mesgs[] = '
' . $object->error . '
'; + } + } +} + +/* + * View + */ + +$html = new Form($db); +$htmlother = new FormOther($db); +$formfile = new FormFile($db); +$companystatic = new Societe($db); + +// Mode creation +if ($action == 'create' && empty($mesgs)) { + + llxHeader(); + print_fiche_titre($langs->trans('NewBill')); + + $soc = new Societe($db); + if ($socid) + $res = $soc->fetch($socid); + if ($res) { + $cond_reglement_id = $soc->cond_reglement_id; + $mode_reglement_id = $soc->mode_reglement_id; + } + $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : ''; + + print '
'; + print ''; + print ''; + print '' . "\n"; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + // Ref + print ''; + + // Ref supplier + print ''; + print ''; + + // Third party + print ''; + print '' . "\n"; + + // Date invoice + print ''; + // Payment term + print ''; + // Payment mode + print ''; + // Project + if (! empty($conf->projet->enabled)) { + $formproject = new FormProjets($db); + + $langs->load('projects'); + print ''; + } + + $objectsrc = new CommandeFournisseur($db); + $listoforders = array (); + foreach ( $selected as $sel ) { + $result = $objectsrc->fetch($sel); + if ($result > 0) { + $listoforders[] = $objectsrc->ref; + } + } + + // Other attributes + $parameters = array ( + 'objectsrc' => $objectsrc, + 'idsrc' => $listoforders, + 'colspan' => ' colspan="3"' + ); + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + + // Modele PDF + print ''; + print '"; + + // Public note + print ''; + print ''; + print ''; + // Private note + if (empty($user->societe_id)) { + print ''; + print ''; + print ''; + } + + print '
' . $langs->trans('Ref') . '' . $langs->trans('Draft') . '
' . $langs->trans('RefSupplier') . '
' . $langs->trans('Customer') . ''; + print $soc->getNomUrl(1); + print ''; + print '
' . $langs->trans('Date') . ''; + $html->select_date('', '', '', '', '', "add", 1, 1); + print '
' . $langs->trans('PaymentConditionsShort') . ''; + $html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id'); + print '
' . $langs->trans('PaymentMode') . ''; + $html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id'); + print '
' . $langs->trans('Project') . ''; + $formproject->select_projects($soc->id, $projectid, 'projectid'); + print '
' . $langs->trans('Model') . ''; + $liste = ModelePDFSuppliersInvoices::liste_modeles($db); + print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF); + print "
' . $langs->trans('NotePublic') . ''; + print '
' . $langs->trans('NotePrivate') . ''; + print '
'; + + while ( $i < $n ) { + print ''; + + $i ++; + } + + // Button "Create Draft" + print '
'; + print "
\n"; + + print '
\n"; +} + +// Mode liste +if (($action != 'create' && $action != 'add') || ! empty($mesgs)) { + llxHeader(); + ?> + +rights->societe->client->voir && ! $socid) + $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; + $sql .= ' WHERE c.entity = ' . $conf->entity; + $sql .= ' AND c.fk_soc = s.rowid'; + + // Show orders with status validated, shipping started and delivered (well any order we can bill) + $sql .= " AND c.fk_statut IN (5)"; + + // Find order that are not already invoiced + $sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')"; + + if ($socid) + $sql .= ' AND s.rowid = ' . $socid; + if (! $user->rights->societe->client->voir && ! $socid) + $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id; + if ($sref) { + $sql .= " AND c.ref LIKE '%" . $db->escape($sref) . "%'"; + } + if ($sall) { + $sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')"; + } + + // Date filter + if ($date_start && $date_end) + $sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'"; + if ($date_starty && $date_endy) + $sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'"; + + if (! empty($sref_client)) { + $sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\''; + } + $sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder; + dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql); + $resql = $db->query($sql); + + if ($resql) { + if ($socid) { + $soc = new Societe($db); + $soc->fetch($socid); + } + $title = $langs->trans('ListOfSupplierOrders'); + $title .= ' - ' . $langs->trans('StatusOrderReceivedAllShort'); + $num = $db->num_rows($resql); + print_fiche_titre($title); + $i = 0; + $period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1); + $periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1); + + if (! empty($socid)) { + // Company + $companystatic->id = $socid; + $companystatic->nom = $soc->nom; + print '

' . $companystatic->getNomUrl(1, 'customer') . '

'; + } + + print ''; + print ''; + print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&socid=' . $socid, '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('RefSupplier'), 'orderstoinvoice.php', 'c.ref_supplier', '', '&socid=' . $socid, '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('OrderDate'), 'orderstoinvoice.php', 'c.date_commande', '', '&socid=' . $socid, 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('DeliveryDate'), 'orderstoinvoice.php', 'c.date_livraison', '', '&socid=' . $socid, 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"'); + print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"'); + print ''; + + // Lignes des champs de filtre + print ''; + print ''; + print ''; + print ''; + // print ''; + + // DATE DELIVERY + print ''; + + // SEARCH BUTTON + print ''; + + print ''; + print ''; + + print ''; + $var = True; + $generic_commande = new CommandeFournisseur($db); + + while ( $i < $num ) { + $objp = $db->fetch_object($resql); + $var = ! $var; + print ''; + print ''; + + print ''; + + // Order date + print ''; + + // Delivery date + print ''; + + // Statut + print ''; + + // Checkbox + print ''; + + print ''; + + $total = $total + $objp->price; + $subtotal = $subtotal + $objp->price; + $i ++; + } + print '
'; + // REF + print ''; + print ''; + print ''; + print ''; + + // DATE ORDER + print ''; + print $period; + print ''; + print $periodely; + print ''; + print ''; + + // ALL/NONE + print ''; + if ($conf->use_javascript_ajax) + print '' . $langs->trans("All") . ' / ' . $langs->trans("None") . ''; + print '
'; + + $generic_commande->id = $objp->rowid; + $generic_commande->ref = $objp->ref; + + print ''; + print ''; + + print '
'; + print $generic_commande->getNomUrl(1, $objp->fk_statut); + print ''; + $filename = dol_sanitizeFileName($objp->ref); + $filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref); + $urlsource = $_SERVER['PHP_SELF'] . '?id=' . $objp->rowid; + print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir); + print '
'; + print '		' . $objp->ref_supplier . ''; + print dol_print_date($db->jdate($objp->date_commande), 'day'); + print ''; + print dol_print_date($db->jdate($objp->date_livraison), 'day'); + print '' . $generic_commande->LibStatut($objp->fk_statut, 5) . ''; + print ''; + print '
'; + + /* + * Boutons actions + */ + print '
'; + print '
'; + print ''; + print ''; + print '
'; + // print ''.$langs->trans("GoBack").''; + print ''; + print '
'; + print ''; + $db->free($resql); + } else { + print dol_print_error($db); + } +} + +dol_htmloutput_mesg($mesg, $mesgs); + +llxFooter(); +$db->close(); diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index fdc0787646a..50502c15c7e 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s NoneOrBatchFileNeverRan=None or batch %s not ran recently SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice \ No newline at end of file diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index 8e0f3475db4..f558b0779ea 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Créer facture fournisseur ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs %s NoneOrBatchFileNeverRan=Aucun ou traitement par lot %s non exécuté récemment SentToSuppliers=Envoyés aux fournisseurs +ListOfSupplierOrders=Liste des commandes fournisseur +MenuOrdersSupplierToBill=Commandes fournisseur à facturer \ No newline at end of file From 691658cde37c9bc371a707ca23062786eb71651e Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Tue, 23 Sep 2014 16:52:15 +0200 Subject: [PATCH 0063/1190] add the clone action for a social contribution - With option to clone it to the next month by default --- htdocs/compta/sociales/charges.php | 81 ++++++++++++++++++- .../sociales/class/chargesociales.class.php | 28 +++++-- htdocs/langs/en_US/compta.lang | 3 + 3 files changed, 105 insertions(+), 7 deletions(-) diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 059a3ccf544..0ccd450e0cb 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -149,6 +149,68 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr } } + // Action clone object +if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; } +if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer)) +{ + + $db->begin(); + + $originalId = $id; + + $object = new ChargeSociales($db); + $object->fetch($id); + + if ($object->id > 0) + { + $object->paye = 0; + $object->id = $object->ref = null; + + if(GETPOST('clone_for_next_month') != '') { + + $object->date_ech = strtotime('+1month', $object->date_ech); + $object->periode = strtotime('+1month', $object->periode); + } + + if ($object->check()) + { + $id = $object->create($user); + if ($id > 0) + { + $db->commit(); + $db->close(); + + header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); + exit; + } + else + { + $id=$originalId; + $db->rollback(); + + if (count($object->errors)) + { + setEventMessage($object->errors, 'errors'); + dol_print_error($db,$object->errors); + } + else + { + setEventMessage($langs->trans($object->error), 'errors'); + dol_print_error($db,$object->error); + } + } + } + } + else + { + $db->rollback(); + dol_print_error($db,$object->error); + } + +} + + + /* @@ -239,7 +301,18 @@ if ($id > 0) $head=tax_prepare_head($object); dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill'); - + + // Clone confirmation + if ($action === 'clone') + { + $formclone=array( + array('type' => 'checkbox', 'name' => 'clone_for_next_month','label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1), + + ); + + print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes'); + } + // Confirmation de la suppression de la charge if ($action == 'paid') { @@ -419,6 +492,12 @@ if ($id > 0) { print "id&action=paid\">".$langs->trans("ClassifyPaid").""; } + + // Clone + if ($user->rights->tax->charges->creer) + { + print "id&action=clone\">".$langs->trans("ToClone").""; + } // Delete if ($user->rights->tax->charges->supprimer) diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 09e4ebaef0c..807466ef95f 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -106,7 +106,24 @@ class ChargeSociales extends CommonObject return -1; } } + /* + * Check if a social contribution can be created into database + * + */ + function check() { + + $newamount=price2num($this->amount,'MT'); + // Validation parametres + if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode)) + { + + return false; + } + + + return true; + } /** * Create a social contribution into database @@ -121,12 +138,11 @@ class ChargeSociales extends CommonObject // Nettoyage parametres $newamount=price2num($this->amount,'MT'); - // Validation parametres - if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode)) - { - $this->error="ErrorBadParameter"; - return -2; - } + if(!$this->check()) { + $this->error="ErrorBadParameter"; + return -2; + } + $this->db->begin(); diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 5ec9bd62a54..47e19c78d21 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month \ No newline at end of file From dd864530201d3eb3c2ae9e5dfe3da26276898c8d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Sep 2014 17:54:03 +0200 Subject: [PATCH 0064/1190] Add field color into table of type of events --- htdocs/admin/dict.php | 8 ++++---- htdocs/comm/action/class/actioncomm.class.php | 3 ++- htdocs/comm/action/peruser.php | 16 +++++++++++++++- htdocs/core/class/html.form.class.php | 6 ++++-- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++ htdocs/install/mysql/tables/llx_c_actioncomm.sql | 3 ++- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index d9ebddf2b22..dd8fa456600 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -133,7 +133,7 @@ $tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libe $tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_pays=c.rowid and c.active=1"; $tabsql[4] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_country"; $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c"; -$tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a"; +$tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a"; $tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1"; $tabsql[8] = "SELECT t.id as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid"; $tabsql[9] = "SELECT code_iso as code, label, unicode, active FROM ".MAIN_DB_PREFIX."c_currencies"; @@ -187,7 +187,7 @@ $tabfield[2] = "code,libelle,region_id,region,country"; // "code,libelle,regio $tabfield[3] = "code,libelle,country_id,country"; $tabfield[4] = "code,label"; $tabfield[5] = "code,label"; -$tabfield[6] = "code,libelle,type,position"; +$tabfield[6] = "code,libelle,type,color,position"; $tabfield[7] = "code,libelle,country_id,country,accountancy_code,deductible"; $tabfield[8] = "code,libelle,country_id,country"; $tabfield[9] = "code,label,unicode"; @@ -214,7 +214,7 @@ $tabfieldvalue[2] = "code,libelle,region"; // "code,libelle,region" $tabfieldvalue[3] = "code,libelle,country"; $tabfieldvalue[4] = "code,label"; $tabfieldvalue[5] = "code,label"; -$tabfieldvalue[6] = "code,libelle,type,position"; +$tabfieldvalue[6] = "code,libelle,type,color,position"; $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible"; $tabfieldvalue[8] = "code,libelle,country"; $tabfieldvalue[9] = "code,label,unicode"; @@ -241,7 +241,7 @@ $tabfieldinsert[2] = "code_departement,nom,fk_region"; $tabfieldinsert[3] = "code_region,nom,fk_pays"; $tabfieldinsert[4] = "code,label"; $tabfieldinsert[5] = "code,label"; -$tabfieldinsert[6] = "code,libelle,type,position"; +$tabfieldinsert[6] = "code,libelle,type,color,position"; $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible"; $tabfieldinsert[8] = "code,libelle,fk_country"; $tabfieldinsert[9] = "code_iso,label,unicode"; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index b12dc5fb702..ffe07614b7d 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -66,11 +66,12 @@ class ActionComm extends CommonObject var $usertodo; // Object user of owner var $userdone; // Object user that did action (deprecated) + var $socid; + var $contactid; var $societe; // Company linked to action (optional) var $contact; // Contact linked to action (optional) var $fk_project; // Id of project (optional) - // Properties for links to other objects var $fk_element; // Id of record var $elementtype; // Type of record. This if property ->element of object linked to. diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 22f968e2b4a..f6a616d3496 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -410,6 +410,8 @@ if ($resql) $event->location=$obj->location; $event->transparency=$obj->transparency; + $event->socid=$obj->fk_soc; + $event->contactid=$obj->fk_contact; $event->societe->id=$obj->fk_soc; $event->contact->id=$obj->fk_contact; @@ -779,7 +781,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & } //$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd; - // Show rect of event + // Define all rects with event (cases1 is first half hour, cases2 is second half hour) for ($h = $begin_h; $h < $end_h; $h++) { $color = ''; //init @@ -797,12 +799,22 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $busy=$event->transparency; $cases1[$h][$event->id]['busy']=$busy; $cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour').' - '.dol_print_date($event->date_end_in_calendar,'dayhour').' - '.$event->label; + $cases1[$h][$event->id]['typecode']=$event->type_code; + if ($event->socid) + { + $cases1[$h][$event->id]['string'].='xxx'; + } } if ($event->date_start_in_calendar < $c && $dateendtouse > $b) { $busy=$event->transparency; $cases2[$h][$event->id]['busy']=$busy; $cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour').' - '.dol_print_date($event->date_end_in_calendar,'dayhour').' - '.$event->label; + $cases1[$h][$event->id]['typecode']=$event->type_code; + if ($event->socid) + { + $cases2[$h][$event->id]['string'].='xxx'; + } } } else @@ -812,6 +824,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $cases2[$h][$event->id]['busy']=$busy; $cases1[$h][$event->id]['string']=$event->label; $cases2[$h][$event->id]['string']=$event->label; + $cases1[$h][$event->id]['typecode']=$event->type_code; + $cases2[$h][$event->id]['typecode']=$event->type_code; break; } } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 08f384612f7..0233706928c 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -804,8 +804,10 @@ class Form // Construct $out and $outarray $out.= '
'; // Convert date into timestamp format if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) { $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]); } - if ($action == 'edit_extras' && $user->rights->propal->creer && GETPOST('attribute') == $key) { + if ($action == 'edit_extras' && $user->rights->propal->creer && GETPOST('attribute') == $key) + { print '
'; print ''; print ''; @@ -2041,7 +2051,9 @@ if ($action == 'create') print ''; print '
'; - } else { + } + else + { print $extrafields->showOutputField($key, $value); if ($object->statut == 0 && $user->rights->propal->creer) print '' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . ''; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index f5d20936052..193443dd64d 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -34,9 +34,9 @@ */ include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php'; -require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php'; -require_once DOL_DOCUMENT_ROOT .'/societe/class/client.class.php'; -require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; +require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; /** @@ -3263,11 +3263,10 @@ class Facture extends CommonInvoice /** - * \class FactureLigne - * \brief Classe permettant la gestion des lignes de factures - * Gere des lignes de la table llx_facturedet + * Class to manage invoice lines. + * Saved into database table llx_facturedet */ -class FactureLigne extends CommonInvoiceLine +class FactureLigne extends CommonInvoiceLine { var $db; var $error; diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index f44efafbffa..90ad3e196e3 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -358,10 +358,14 @@ abstract class CommonInvoice extends CommonObject } } + + +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php'; + /** * Parent class of all other business classes for details of elements (invoices, contracts, proposals, orders, ...) */ -abstract class CommonInvoiceLine extends CommonObject +abstract class CommonInvoiceLine extends CommonObjectLine { } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 60e59222c9e..e8dcce57ac4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2153,327 +2153,6 @@ abstract class CommonObject } } - - /** - * Function to get extra fields of a member into $this->array_options - * This method is in most cases called by method fetch of objects but you can call it separately. - * - * @param int $rowid Id of line - * @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label() - * @return int <0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded - */ - function fetch_optionals($rowid='',$optionsArray='') - { - if (empty($rowid)) $rowid=$this->id; - - if (! is_array($optionsArray)) - { - // optionsArray not already loaded, so we load it - require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - $extrafields = new ExtraFields($this->db); - $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element); - } - - // Request to get complementary values - if (count($optionsArray) > 0) - { - $sql = "SELECT rowid"; - foreach ($optionsArray as $name => $label) - { - $sql.= ", ".$name; - } - $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields"; - $sql.= " WHERE fk_object = ".$rowid; - - dol_syslog(get_class($this)."::fetch_optionals", LOG_DEBUG); - $resql=$this->db->query($sql); - if ($resql) - { - $numrows=$this->db->num_rows($resql); - if ($numrows) - { - $tab = $this->db->fetch_array($resql); - - foreach ($tab as $key => $value) - { - // Test fetch_array ! is_int($key) because fetch_array seult is a mix table with Key as alpha and Key as int (depend db engine) - if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key)) - { - // we can add this attribute to adherent object - $this->array_options["options_".$key]=$value; - } - } - } - - $this->db->free($resql); - - if ($numrows) return $numrows; - else return 0; - } - else - { - dol_print_error($this->db); - return -1; - } - } - return 0; - } - - /** - * Delete all extra fields values for the current object. - * - * @return int <0 if KO, >0 if OK - */ - function deleteExtraFields() - { - global $langs; - - $error=0; - - $this->db->begin(); - - $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; - dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG); - $resql=$this->db->query($sql_del); - if (! $resql) - { - $this->error=$this->db->lasterror(); - $this->db->rollback(); - return -1; - } - else - { - $this->db->commit(); - return 1; - } - } - - /** - * Add/Update all extra fields values for the current object. - * All data to describe values to insert are stored into $this->array_options=array('keyextrafield'=>'valueextrafieldtoadd') - * - * @return int -1=error, O=did nothing, 1=OK - */ - function insertExtraFields() - { - global $conf,$langs; - - $error=0; - - if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used - - if (! empty($this->array_options)) - { - // Check parameters - $langs->load('admin'); - require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - $extrafields = new ExtraFields($this->db); - $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element); - - foreach($this->array_options as $key => $value) - { - $attributeKey = substr($key,8); // Remove 'options_' prefix - $attributeType = $extrafields->attribute_type[$attributeKey]; - $attributeSize = $extrafields->attribute_size[$attributeKey]; - $attributeLabel = $extrafields->attribute_label[$attributeKey]; - switch ($attributeType) - { - case 'int': - if (!is_numeric($value) && $value!='') - { - $error++; $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel); - return -1; - } - elseif ($value=='') - { - $this->array_options[$key] = null; - } - break; - case 'price': - $this->array_options[$key] = price2num($this->array_options[$key]); - break; - case 'date': - $this->array_options[$key]=$this->db->idate($this->array_options[$key]); - break; - case 'datetime': - $this->array_options[$key]=$this->db->idate($this->array_options[$key]); - break; - } - } - $this->db->begin(); - - $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; - dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG); - $this->db->query($sql_del); - $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object"; - foreach($this->array_options as $key => $value) - { - $attributeKey = substr($key,8); // Remove 'options_' prefix - // Add field of attribut - if ($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate - $sql.=",".$attributeKey; - } - $sql .= ") VALUES (".$this->id; - foreach($this->array_options as $key => $value) - { - $attributeKey = substr($key,8); // Remove 'options_' prefix - // Add field o fattribut - if($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate) - { - if ($this->array_options[$key] != '') - { - $sql.=",'".$this->db->escape($this->array_options[$key])."'"; - } - else - { - $sql.=",null"; - } - } - } - $sql.=")"; - - dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG); - $resql = $this->db->query($sql); - if (! $resql) - { - $this->error=$this->db->lasterror(); - $this->db->rollback(); - return -1; - } - else - { - $this->db->commit(); - return 1; - } - } - else return 0; - } - - /** - * Function to show lines of extrafields with output datas - * - * @param object $extrafields Extrafield Object - * @param string $mode Show output (view) or input (edit) for extrafield - * @param array $params Optionnal parameters - * @param string $keyprefix Prefix string to add into name and id of field (can be used to avoid duplicate names) - * - * @return string - */ - function showOptionals($extrafields, $mode='view', $params=0, $keyprefix='') - { - global $_POST, $conf; - - $out = ''; - - if (count($extrafields->attribute_label) > 0) - { - $out .= "\n"; - $out .= ' '; - $out .= "\n"; - - $e = 0; - foreach($extrafields->attribute_label as $key=>$label) - { - if (is_array($params) && count($params)>0) { - if (array_key_exists('colspan',$params)) { - $colspan=$params['colspan']; - } - }else { - $colspan='3'; - } - switch($mode) { - case "view": - $value=$this->array_options["options_".$key]; - break; - case "edit": - $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$this->array_options["options_".$key]); - break; - } - if ($extrafields->attribute_type[$key] == 'separate') - { - $out .= $extrafields->showSeparator($key); - } - else - { - $csstyle=''; - if (is_array($params) && count($params)>0) { - if (array_key_exists('style',$params)) { - $csstyle=$params['style']; - } - } - if ( !empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) - { - $out .= '
'.$label.'
'.$label.'
'.join('.',$versionarray).'
'.$langs->trans("PleaseBePatient").'
Check availability of extra field for '.$tableextra."
\n"; - $i=0; - while($obj=$db->fetch_object($resql)) - { - $fieldname=$fieldtype=''; - if (preg_match('/mysql/',$db->type)) - { - $fieldname=$obj->Field; - $fieldtype=$obj->Type; - } - else - { - $fieldname = isset($obj->Key)?$obj->Key:$obj->attname; - $fieldtype = isset($obj->Type)?$obj->Type:'varchar'; - } + // Define $arrayoffieldsfound + $arrayoffieldsfound=array(); + $resql=$db->DDLDescTable($tableextra); + if ($resql) + { + print '
Check availability of extra field for '.$tableextra."
\n"; + $i=0; + while($obj=$db->fetch_object($resql)) + { + $fieldname=$fieldtype=''; + if (preg_match('/mysql/',$db->type)) + { + $fieldname=$obj->Field; + $fieldtype=$obj->Type; + } + else + { + $fieldname = isset($obj->Key)?$obj->Key:$obj->attname; + $fieldtype = isset($obj->Type)?$obj->Type:'varchar'; + } - if (empty($fieldname)) continue; - if (in_array($fieldname,array('rowid','tms','fk_object','import_key'))) continue; - $arrayoffieldsfound[$fieldname]=array('type'=>$fieldtype); - } + if (empty($fieldname)) continue; + if (in_array($fieldname,array('rowid','tms','fk_object','import_key'))) continue; + $arrayoffieldsfound[$fieldname]=array('type'=>$fieldtype); + } - // If it does not match, we create fields - foreach($arrayoffieldsdesc as $code => $label) - { - if (! in_array($code,array_keys($arrayoffieldsfound))) - { - print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> "; - $type=$extrafields->attribute_type[$code]; $value=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null'; - $field_desc=array( - 'type'=>$type, - 'value'=>$value, - 'attribute'=>$attribute, - 'default'=>$default, - 'extra'=>$extra, - 'null'=>$null - ); - //var_dump($field_desc);exit; + // If it does not match, we create fields + foreach($arrayoffieldsdesc as $code => $label) + { + if (! in_array($code,array_keys($arrayoffieldsfound))) + { + print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> "; + $type=$extrafields->attribute_type[$code]; $value=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null'; + $field_desc=array( + 'type'=>$type, + 'value'=>$value, + 'attribute'=>$attribute, + 'default'=>$default, + 'extra'=>$extra, + 'null'=>$null + ); + //var_dump($field_desc);exit; - $result=$db->DDLAddField($tableextra,$code,$field_desc,""); - if ($result < 0) - { - print "KO ".$db->lasterror."
\n"; - } - else - { - print "OK
\n"; - } - } - } + $result=$db->DDLAddField($tableextra,$code,$field_desc,""); + if ($result < 0) + { + print "KO ".$db->lasterror."
\n"; + } + else + { + print "OK
\n"; + } + } + } - print "		 
 
".checkLinkedElements('propal', 'commande')."
'; $events=array(); $events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); - print $form->select_company($object->societe->id,'socid','',1,1,0,$events); + print $form->select_company($object->thirdparty->id,'socid','',1,1,0,$events); print ''.$langs->trans("Contact").''; - $form->select_contacts($object->societe->id, $object->contact->id,'contactid',1); + $form->select_contacts($object->thirdparty->id, $object->contact->id,'contactid',1); print '
'.$langs->trans("Project").''; - $numprojet=$formproject->select_projects($object->societe->id,$object->fk_project,'projectid'); + $numprojet=$formproject->select_projects($object->thirdparty->id,$object->fk_project,'projectid'); if ($numprojet==0) { print '   '.$langs->trans("AddProject").''; @@ -1152,12 +1151,12 @@ if ($id > 0) // Third party - Contact if ($conf->societe->enabled) { - print '
'.$langs->trans("ActionOnCompany").''.($object->societe->id?$object->societe->getNomUrl(1):$langs->trans("None")); - if ($object->societe->id && $object->type_code == 'AC_TEL') + print '
'.$langs->trans("ActionOnCompany").''.($object->thirdparty->id?$object->thirdparty->getNomUrl(1):$langs->trans("None")); + if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL') { - if ($object->societe->fetch($object->societe->id)) + if ($object->thirdparty->fetch($object->thirdparty->id)) { - print "
".dol_print_phone($object->societe->phone); + print "
".dol_print_phone($object->thirdparty->phone); } } print '
'.$langs->trans("ActionAffectedTo").''; if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1); print '


'; // Third party - Contact - print ''; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 7fb6c6e373a..fb7da8636b2 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -323,8 +323,6 @@ class Project extends CommonObject $this->note_private = $obj->note_private; $this->note_public = $obj->note_public; $this->socid = $obj->fk_soc; - $this->societe=(object)array();// To avoid warning on next line - $this->societe->id = $obj->fk_soc; // TODO For backward compatibility $this->user_author_id = $obj->fk_user_creat; $this->public = $obj->public; $this->statut = $obj->fk_statut; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 5177bb3dbed..72db0966699 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -72,8 +72,10 @@ class User extends CommonObject var $datem; //! If this is defined, it is an external user - var $societe_id; - var $contact_id; + var $societe_id; // deprecated + var $contact_id; // deprecated + var $socid; + var $contactid; var $fk_member; var $fk_user; @@ -237,8 +239,10 @@ class User extends CommonObject $this->datelastlogin = $this->db->jdate($obj->datel); $this->datepreviouslogin = $this->db->jdate($obj->datep); - $this->societe_id = $obj->fk_societe; - $this->contact_id = $obj->fk_socpeople; + $this->societe_id = $obj->fk_societe; // deprecated + $this->contact_id = $obj->fk_socpeople; // deprecated + $this->socid = $obj->fk_societe; + $this->contactid = $obj->fk_socpeople; $this->fk_member = $obj->fk_member; $this->fk_user = $obj->fk_user; diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php index d5d9c45fa36..2a41a769314 100644 --- a/htdocs/webservices/server_actioncomm.php +++ b/htdocs/webservices/server_actioncomm.php @@ -433,10 +433,10 @@ function createActionComm($authentication,$actioncomm) $newobject->datep=$actioncomm['datep']; $newobject->datef=$actioncomm['datef']; $newobject->type_code=$actioncomm['type_code']; - $newobject->societe->id=$actioncomm['socid']; + $newobject->socid=$actioncomm['socid']; $newobject->fk_project=$actioncomm['projectid']; $newobject->note=$actioncomm['note']; - $newobject->contact->id=$actioncomm['contactid']; + $newobject->contactid=$actioncomm['contactid']; $newobject->usertodo->id=$actioncomm['usertodo']; $newobject->userdone->id=$actioncomm['userdone']; $newobject->label=$actioncomm['label']; @@ -517,21 +517,21 @@ function updateActionComm($authentication,$actioncomm) if (! $error) { $objectfound=false; - + $object=new ActionComm($db); $result=$object->fetch($actioncomm['id']); - + if (!empty($object->id)) { - + $objectfound=true; $object->datep=$actioncomm['datep']; $object->datef=$actioncomm['datef']; $object->type_code=$actioncomm['type_code']; - $object->societe->id=$actioncomm['socid']; + $object->socid=$actioncomm['socid']; + $object->contactid=$actioncomm['contactid']; $object->fk_project=$actioncomm['projectid']; $object->note=$actioncomm['note']; - $object->contact->id=$actioncomm['contactid']; $object->usertodo->id=$actioncomm['usertodo']; $object->userdone->id=$actioncomm['userdone']; $object->label=$actioncomm['label']; @@ -541,7 +541,7 @@ function updateActionComm($authentication,$actioncomm) $object->location=$actioncomm['location']; $object->fk_element=$actioncomm['fk_element']; $object->elementtype=$actioncomm['elementtype']; - + //Retreive all extrafield for actioncomm // fetch optionals attributes and labels $extrafields=new ExtraFields($db); @@ -551,7 +551,7 @@ function updateActionComm($authentication,$actioncomm) $key='options_'.$key; $object->array_options[$key]=$actioncomm[$key]; } - + $db->begin(); $result=$object->update($fuser); From dad82fa1fa936f9373ca24344349f0633bd4d7b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 01:36:12 +0200 Subject: [PATCH 0070/1190] Fix: bad phpunit test case --- test/phpunit/AllTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index eb3c1a56abb..a8a554ca25d 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -126,7 +126,7 @@ class AllTests require_once dirname(__FILE__).'/ContratTest.php'; $suite->addTestSuite('ContratTest'); - require_once dirname(__FILE__).'/FichInterTest.php'; + require_once dirname(__FILE__).'/FichinterTest.php'; $suite->addTestSuite('FichinterTest'); require_once dirname(__FILE__).'/PropalTest.php'; From cdca651dedf0b209fbd25ee4627883c6ddb940f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 01:40:16 +0200 Subject: [PATCH 0071/1190] Doxygen. Ad field color --- htdocs/comm/action/class/cactioncomm.class.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index 8908b4e2a46..065f01d2091 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,6 +37,7 @@ class CActionComm var $type; var $libelle; var $active; + var $color; var $type_actions=array(); @@ -59,7 +60,7 @@ class CActionComm */ function fetch($id) { - $sql = "SELECT id, code, type, libelle, active"; + $sql = "SELECT id, code, type, libelle, color, active"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm"; if (is_numeric($id)) $sql.= " WHERE id=".$id; else $sql.= " WHERE code='".$id."'"; @@ -77,12 +78,13 @@ class CActionComm $this->type = $obj->type; $this->libelle = $obj->libelle; $this->active = $obj->active; + $this->color = $obj->color; $this->db->free($resql); return 1; } else - { + { $this->db->free($resql); return 0; } @@ -95,7 +97,7 @@ class CActionComm } /** - * Return list of event types + * Return list of event types: array(id=>label) or array(code=>label) * * @param int $active 1 or 0 to filter on event state active or not ('' by default = no filter) * @param string $idorcode 'id' or 'code' @@ -111,7 +113,7 @@ class CActionComm $repid = array(); $repcode = array(); - $sql = "SELECT id, code, libelle, module, type"; + $sql = "SELECT id, code, libelle, module, type, color"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm"; if ($active != '') $sql.=" WHERE active=".$active; if (! empty($excludetype)) $sql.=($active != ''?" AND":" WHERE")." type <> '".$excludetype."'"; From 14ca936cfc6ad09ba11348d295d4fa03d6eb1913 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 24 Sep 2014 10:21:26 +0200 Subject: [PATCH 0072/1190] set ref_supplier for contract field --- ChangeLog | 2 +- htdocs/contrat/card.php | 14 +++++++------- htdocs/contrat/class/contrat.class.php | 14 +++++++------- htdocs/contrat/list.php | 16 ++++++++-------- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 8 ++++---- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d7d12f1785..39c65f5e083 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,7 @@ For users: - New: [ task #1204 ] add Numering contrat module free (like leopard in product module). - New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice. - New: Enable supplier price log table. -- New: [ task #1204 ] add a External reference to contract. +- New: [ task #1204 ] add a supplier reference to contract. - New: [ task #1218 ] Can drag and drop an event from calendar to change its day. - New: Optimize size of image static resources. - New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card. diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 5cb25a5bed4..de814b856cd 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -207,7 +207,7 @@ if ($action == 'add' && $user->rights->contrat->creer) $object->fk_project = GETPOST('projectid','int'); $object->remise_percent = GETPOST('remise_percent','alpha'); $object->ref = GETPOST('ref','alpha'); - $object->ref_customer = GETPOST('ref_customer','alpha'); + $object->ref_supplier = GETPOST('ref_supplier','alpha'); // If creation from another object of another module (Example: origin=propal, originid=1) if ($_POST['origin'] && $_POST['originid']) @@ -733,17 +733,17 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra $action = 'edit_extras'; setEventMessage($object->error,'errors'); } -} elseif ($action=='setref_customer') { +} elseif ($action=='setref_supplier') { $result = $object->fetch($id); if ($result < 0) { setEventMessage($object->errors,'errors'); } - $object->ref_customer=GETPOST('ref_customer','alpha'); + $object->ref_supplier=GETPOST('ref_supplier','alpha'); $result = $object->update($user); if ($result < 0) { setEventMessage($object->errors,'errors'); - $action='editref_customer'; + $action='editref_supplier'; } else { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; @@ -928,7 +928,7 @@ if ($action == 'create') // Ref Int print ''; - print ''; + print ''; // Customer print ''; @@ -1129,9 +1129,9 @@ else print ''; print ''; print ''; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 0a71f9eee2e..f30aa81abc6 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -46,7 +46,7 @@ class Contrat extends CommonObject var $id; var $ref; var $ref_ext; - var $ref_customer; + var $ref_supplier; var $socid; var $societe; // Objet societe var $statut=0; // 0=Draft, @@ -402,7 +402,7 @@ class Contrat extends CommonObject $sql.= " fk_projet,"; $sql.= " fk_commercial_signature, fk_commercial_suivi,"; $sql.= " note_private, note_public, extraparams"; - $sql.= " ,ref_customer"; + $sql.= " ,ref_supplier"; $sql.= " ,ref_ext"; $sql.= " FROM ".MAIN_DB_PREFIX."contrat"; if ($ref) @@ -422,7 +422,7 @@ class Contrat extends CommonObject { $this->id = $result["rowid"]; $this->ref = (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"]; - $this->ref_customer = $result["ref_customer"]; + $this->ref_supplier = $result["ref_supplier"]; $this->ref_ext = $result["ref_ext"]; $this->statut = $result["statut"]; $this->mise_en_service = $this->db->jdate($result["datemise"]); @@ -724,7 +724,7 @@ class Contrat extends CommonObject // Insert contract $sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,"; $sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,"; - $sql.= " ref, entity, note_private, note_public, ref_customer, ref_ext)"; + $sql.= " ref, entity, note_private, note_public, ref_supplier, ref_ext)"; $sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id; $sql.= ", '".$this->db->idate($this->date_contrat)."'"; $sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL"); @@ -734,7 +734,7 @@ class Contrat extends CommonObject $sql.= ", ".$conf->entity; $sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); $sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL"); - $sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL"); + $sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL"); $sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL"); $sql.= ")"; $resql=$this->db->query($sql); @@ -986,7 +986,7 @@ class Contrat extends CommonObject // Clean parameters if (isset($this->ref)) $this->ref=trim($this->ref); - if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer); + if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier); if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext); if (isset($this->entity)) $this->entity=trim($this->entity); if (isset($this->statut)) $this->statut=trim($this->statut); @@ -1010,7 +1010,7 @@ class Contrat extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET"; $sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").","; - $sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").","; + $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").","; $sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").","; $sql.= " entity=".$conf->entity.","; $sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').","; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 7970e80603c..5f9c2099107 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -42,7 +42,7 @@ $offset = $limit * $page ; $search_nom=GETPOST('search_nom'); $search_contract=GETPOST('search_contract'); -$search_ref_customer=GETPOST('search_ref_customer','alpha'); +$search_ref_supplier=GETPOST('search_ref_supplier','alpha'); $sall=GETPOST('sall'); $statut=GETPOST('statut')?GETPOST('statut'):1; $socid=GETPOST('socid'); @@ -75,7 +75,7 @@ $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND $sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; $sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,"; $sql.= " s.nom, s.rowid as socid"; -$sql.= " ,c.ref_customer"; +$sql.= " ,c.ref_supplier"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."contrat as c"; @@ -90,8 +90,8 @@ if ($search_nom) { if ($search_contract) { $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract); } -if (!empty($search_ref_customer)) { - $sql .= natural_search(array('c.ref_customer'), $search_ref_customer); +if (!empty($search_ref_supplier)) { + $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier); } if ($sall) { $sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall); @@ -114,9 +114,9 @@ if ($resql) print ''; $param='&search_contract='.$search_contract; $param.='&search_nom='.$search_nom; - $param.='&search_ref_customer='.$search_ref_customer; + $param.='&search_ref_supplier='.$search_ref_supplier; print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder); //print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder); @@ -134,7 +134,7 @@ if ($resql) print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; //print ''; print ''; diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 9e109cd311f..f1245f2ee72 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -47,9 +47,9 @@ ALTER TABLE llx_user ADD COLUMN fk_user_modif integer AFTER fk_user_creat; -- Add module accounting Expert ALTER TABLE llx_bookkeeping RENAME TO llx_accounting_bookkeeping; -- To update old user of module Accounting Expert - -CREATE TABLE llx_accounting_bookkeeping + +CREATE TABLE llx_accounting_bookkeeping ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, doc_date date NOT NULL, @@ -79,7 +79,7 @@ ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec; ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label; ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author; --- Qual +-- Qual UPDATE llx_const SET name = 'ACCOUNTING_MODE' WHERE name = 'COMPTA_MODE'; UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_CUSTOMER' WHERE name = 'COMPTA_ACCOUNT_CUSTOMER'; UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUPPLIER' WHERE name = 'COMPTA_ACCOUNT_SUPPLIER'; @@ -204,7 +204,7 @@ create table llx_accounting_fiscalyear )ENGINE=innodb; ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref; -ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30) after ref_ext; +ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref_ext; ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison; ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison; From d1868b643ea842200237bb7f9a84e200fe4344ed Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 24 Sep 2014 11:47:34 +0200 Subject: [PATCH 0073/1190] FIX: clone line extrafields value on quote, order and invoice --- htdocs/comm/propal/class/propal.class.php | 11 +++++++++-- htdocs/commande/class/commande.class.php | 9 +++++++-- htdocs/compta/facture/class/facture.class.php | 9 +++++++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 1c2fe54cc71..2c507e3e59d 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -8,7 +8,7 @@ * Copyright (C) 2008 Raphael Bertrand * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2010-2011 Philippe Grand - * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -788,6 +788,9 @@ class Propal extends CommonObject $this->lines[$i]->fk_fournprice, $this->lines[$i]->pa_ht, $this->lines[$i]->label + $this->lines[$i]->date_start, + $this->lines[$i]->date_end, + $this->lines[$i]->array_options ); if ($result < 0) @@ -922,6 +925,10 @@ class Propal extends CommonObject $this->db->begin(); + // get extrafields so they will be clone + foreach($this->lines as $line) + $line->fetch_optionals($line->rowid); + // Load source object $objFrom = dol_clone($this); @@ -1046,7 +1053,7 @@ class Propal extends CommonObject $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid'; $sql.= " WHERE p.fk_statut = c.id"; $sql.= " AND p.entity = ".$conf->entity; - if ($ref) $sql.= " AND p.ref='".$this->db->escape($ref)."'"; + if ($ref) $sql.= " AND p.ref='".$ref."'"; else $sql.= " AND p.rowid=".$rowid; dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 795c2e26526..7a8fd63c8f1 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -5,7 +5,7 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2011 Jean Heimburger - * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -712,7 +712,8 @@ class Commande extends CommonOrder $fk_parent_line, $this->lines[$i]->fk_fournprice, $this->lines[$i]->pa_ht, - $this->lines[$i]->label + $this->lines[$i]->label, + $this->lines[$i]->array_options ); if ($result < 0) { @@ -850,6 +851,10 @@ class Commande extends CommonOrder $this->db->begin(); + // get extrafields so they will be clone + foreach($this->lines as $line) + $line->fetch_optionals($line->rowid); + // Load source object $objFrom = dol_clone($this); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index e9bf109b9e7..93e245746a0 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -8,7 +8,7 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2012 Marcos García * Copyright (C) 2013 Cedric Gross * Copyright (C) 2013 Florian Henry @@ -367,7 +367,8 @@ class Facture extends CommonInvoice $fk_parent_line, $this->lines[$i]->fk_fournprice, $this->lines[$i]->pa_ht, - $this->lines[$i]->label + $this->lines[$i]->label, + $this->lines[$i]->array_options ); if ($result < 0) { @@ -569,6 +570,10 @@ class Facture extends CommonInvoice $this->db->begin(); + // get extrafields so they will be clone + foreach($this->lines as $line) + $line->fetch_optionals($line->rowid); + // Load source object $objFrom = dol_clone($this); From 2c52de3840c520965839d43a8307074255b23304 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 24 Sep 2014 12:12:10 +0200 Subject: [PATCH 0074/1190] fix missing "," --- htdocs/comm/propal/class/propal.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 2c507e3e59d..507a9dce633 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -787,7 +787,7 @@ class Propal extends CommonObject $fk_parent_line, $this->lines[$i]->fk_fournprice, $this->lines[$i]->pa_ht, - $this->lines[$i]->label + $this->lines[$i]->label, $this->lines[$i]->date_start, $this->lines[$i]->date_end, $this->lines[$i]->array_options From 63c6bd5d1735914bbf58cc927232e314a5ef7195 Mon Sep 17 00:00:00 2001 From: fmarcet Date: Wed, 24 Sep 2014 13:28:59 +0200 Subject: [PATCH 0075/1190] New: Added hook "formConfirm" and "doActions" for fichinter card --- ChangeLog | 1 + htdocs/fichinter/card.php | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b8a3f8da52..841e4b39651 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,7 @@ For developers: - New: Added hook "formConfirm" and "doActions" for supplier invoice card. - New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card. - New: renamed table llx_c_pays to llx_c_country & libelle field to label. +- New: Added hook "formConfirm" and "doActions" for fichinter card - Qual: Renamed table llx_c_civilite into llx_c_civility, field civilite into label in the same table, and field civilite into civility in other table. diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index a300d11219d..0908bc15fbe 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,6 +65,7 @@ $mesg = GETPOST('msg','alpha'); $origin=GETPOST('origin','alpha'); $originid=(GETPOST('originid','int')?GETPOST('originid','int'):GETPOST('origin_id','int')); // For backward compatibility $note_public = GETPOST('note_public'); +$lineid = GETPOST('line_id','int'); //PDF $hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); @@ -95,7 +97,8 @@ $permissionnote=$user->rights->ficheinter->creer; // Used by the include of acti /* * Actions */ - +$parameters=array('socid'=>$socid); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer) @@ -538,7 +541,7 @@ else if ($action == 'classifyunbilled' && $user->rights->ficheinter->creer) else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save','alpha') == $langs->trans("Save")) { $objectline = new FichinterLigne($db); - if ($objectline->fetch(GETPOST('line_id','int')) <= 0) + if ($objectline->fetch($lineid) <= 0) { dol_print_error($db); exit; @@ -594,7 +597,7 @@ else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST( else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer) { $objectline = new FichinterLigne($db); - if ($objectline->fetch(GETPOST('line_id','int')) <= 0) + if ($objectline->fetch($lineid) <= 0) { dol_print_error($db); exit; @@ -626,7 +629,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> else if ($action == 'up' && $user->rights->ficheinter->creer) { - $object->line_up(GETPOST('line_id','int')); + $object->line_up($lineid); // Define output language $outputlangs = $langs; @@ -640,13 +643,13 @@ else if ($action == 'up' && $user->rights->ficheinter->creer) } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs); - header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int')); + header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid); exit; } else if ($action == 'down' && $user->rights->ficheinter->creer) { - $object->line_down(GETPOST('line_id','int')); + $object->line_down($lineid); // Define output language $outputlangs = $langs; @@ -660,7 +663,7 @@ else if ($action == 'down' && $user->rights->ficheinter->creer) } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs); - header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int')); + header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid); exit; } @@ -1160,7 +1163,7 @@ else if ($id > 0 || ! empty($ref)) // Confirmation de la suppression de la fiche d'intervention if ($action == 'delete') { - print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1); + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1); } @@ -1184,23 +1187,31 @@ else if ($id > 0 || ! empty($ref)) } $text=$langs->trans('ConfirmValidateIntervention',$numref); - print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1); + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1); } // Confirmation de la validation de la fiche d'intervention if ($action == 'modify') { - print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1); + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1); } // Confirmation de la suppression d'une ligne d'intervention if ($action == 'ask_deleteline') { - print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.GETPOST('line_id','int'), $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1); + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1); } + + if (!$formconfirm) { + $parameters=array('lineid'=>$lineid); + $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + } + + // Print form confirm + print $formconfirm; print '
'; print ''; From c2cbbffd127726d5b10a788ae1b93861a2e256df Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 17:30:49 +0200 Subject: [PATCH 0076/1190] Fix: duplicate field --- htdocs/install/mysql/tables/llx_user.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 3c084640367..28385298125 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -56,7 +56,6 @@ create table llx_user fk_socpeople integer, fk_member integer, fk_user integer, -- Hierarchic parent - thm double(24,8), note text DEFAULT NULL, datelastlogin datetime, datepreviouslogin datetime, From f7aa08f3fdad623277172e4f48c55d1b6181f1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 24 Sep 2014 17:41:05 +0200 Subject: [PATCH 0077/1190] Fixed invoices webservice --- htdocs/webservices/server_invoice.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index 8412ed6ab1b..3e5ec83afc9 100644 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -136,7 +136,9 @@ $server->wsdl->addComplexType( 'minOccurs' => '0', 'maxOccurs' => 'unbounded' ) - ) + ), + null, + 'tns:line' ); @@ -197,7 +199,9 @@ $server->wsdl->addComplexType( 'minOccurs' => '0', 'maxOccurs' => 'unbounded' ) - ) + ), + null, + 'tns:invoice' ); From cff713ad073e718c2a54d895e530851bd44979c7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 17:43:38 +0200 Subject: [PATCH 0078/1190] Fix: var not initialized --- htdocs/fichinter/card.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 0908bc15fbe..1ade8eddf13 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1160,11 +1160,12 @@ else if ($id > 0 || ! empty($ref)) dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), 0, 'intervention'); + $formconfirm=''; + // Confirmation de la suppression de la fiche d'intervention if ($action == 'delete') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1); - } // Confirmation validation @@ -1188,24 +1189,22 @@ else if ($id > 0 || ! empty($ref)) $text=$langs->trans('ConfirmValidateIntervention',$numref); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1); - } // Confirmation de la validation de la fiche d'intervention if ($action == 'modify') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1); - } // Confirmation de la suppression d'une ligne d'intervention if ($action == 'ask_deleteline') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1); - } - - if (!$formconfirm) { + + if (!$formconfirm) + { $parameters=array('lineid'=>$lineid); $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook } From 396bae21d636b64c30b9b430c5b96f512b620dd7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Sep 2014 18:15:20 +0200 Subject: [PATCH 0079/1190] Fix: Missing closing tr --- htdocs/fourn/commande/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 403aa46c657..ba3cb7e9de0 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1435,7 +1435,7 @@ elseif (! empty($object->id)) print ''; // Delivery date planed - print ''; print ''; print ''."\n"; - + // arraytest is an array of test to do $arraytest=array(); if (preg_match('/mysql/i',$db->type)) @@ -91,7 +91,7 @@ else 'collation_database'=>array('var'=>'dolibarr_main_db_collation','valifempty'=>'utf8_general_ci') ); } - + $listtouse=array(); if ($listname == 'listofvars') $listtouse=$listofvars; if ($listname == 'listofstatus') $listtouse=$listofstatus; @@ -124,4 +124,5 @@ else } llxFooter(); -?> \ No newline at end of file + +$db->close(); diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php index fe182c2e73e..0990d89acd0 100644 --- a/htdocs/admin/system/dbtable.php +++ b/htdocs/admin/system/dbtable.php @@ -130,4 +130,3 @@ else llxFooter(); $db->close(); -?> \ No newline at end of file diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 8be469006ff..fe9bde59cec 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -379,4 +379,3 @@ print '
'.$langs->trans("ActionOnCompany").''.($object->societe->id?$object->societe->getNomUrl(1):$langs->trans("None")); - if ($object->societe->id && $object->type_code == 'AC_TEL') + print '
'.$langs->trans("ActionOnCompany").''.($object->thirdparty->id?$object->thirdparty->getNomUrl(1):$langs->trans("None")); + if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL') { - if ($object->societe->fetch($object->societe->id)) + if ($object->thirdparty->fetch($object->thirdparty->id)) { - print "
".dol_print_phone($object->societe->phone); + print "
".dol_print_phone($object->thirdparty->phone); } } print '
'.$langs->trans('RefCustomer').'
'; - print $form->editfieldkey("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer); + print $form->editfieldkey("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer); print ''; - print $form->editfieldval("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer); + print $form->editfieldval("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer); print '
'; - print ''; + print ''; print ''; print ''; @@ -156,7 +156,7 @@ if ($resql) print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .''; if ($obj->nb_late) print img_warning($langs->trans("Late")); print ''.$obj->ref_customer.''.$obj->ref_supplier.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.dol_print_date($obj->datec).''.dol_print_date($db->jdate($obj->date_contrat)).'
'; + print '
'; print ''; @@ -1456,13 +1456,13 @@ elseif (! empty($object->id)) { print $object->date_livraison ? dol_print_date($object->date_livraison,'daytext') : ' '; } - print ''; + print ''; // Project if (! empty($conf->projet->enabled)) { $langs->load('projects'); - print '
'; print $langs->trans('DateDeliveryPlanned'); print '
'; + print '
'; print ''; From 6149994b4308455a9dbfb6daf6657c40eab3230e Mon Sep 17 00:00:00 2001 From: jean Date: Wed, 24 Sep 2014 22:05:53 +0200 Subject: [PATCH 0080/1190] Adding hook 'suppliercard' on supplier cartd --- htdocs/fourn/card.php | 112 +++++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 51 deletions(-) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 313f82547e7..07ede4329b6 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -4,6 +4,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2014 Jean Heimburger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,6 +49,9 @@ $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe'); $object = new Fournisseur($db); +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('suppliercard')); + /* * Action */ @@ -425,60 +429,66 @@ if ($object->fetch($id)) /* * Barre d'actions */ + $parameters = array(); + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been + // modified by hook + if (empty($reshook)) + { - print '
'; + print '
'; - if ($user->rights->fournisseur->commande->creer) - { - $langs->load("orders"); - print ''.$langs->trans("AddOrder").''; + if ($user->rights->fournisseur->commande->creer) + { + $langs->load("orders"); + print ''.$langs->trans("AddOrder").''; + } + + if ($user->rights->fournisseur->facture->creer) + { + $langs->load("bills"); + print ''.$langs->trans("AddBill").''; + } + + // Add action + if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) + { + if ($user->rights->agenda->myactions->create) + { + print ''.$langs->trans("AddAction").''; + } + else + { + print ''.$langs->trans("AddAction").''; + } + } + + print '
'; + print '
'; + + if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB)) + { + print '
'; + // List of contacts + show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); + } + + // Addresses list + if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB)) + { + $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); + } + + if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) + { + print load_fiche_titre($langs->trans("ActionsOnCompany"),'',''); + + // List of todo actions + show_actions_todo($conf,$langs,$db,$object); + + // List of done actions + show_actions_done($conf,$langs,$db,$object); + } } - - if ($user->rights->fournisseur->facture->creer) - { - $langs->load("bills"); - print ''.$langs->trans("AddBill").''; - } - - // Add action - if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) - { - if ($user->rights->agenda->myactions->create) - { - print ''.$langs->trans("AddAction").''; - } - else - { - print ''.$langs->trans("AddAction").''; - } - } - - print '
'; - print '
'; - - if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB)) - { - print '
'; - // List of contacts - show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); - } - - // Addresses list - if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB)) - { - $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); - } - - if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) - { - print load_fiche_titre($langs->trans("ActionsOnCompany"),'',''); - - // List of todo actions - show_actions_todo($conf,$langs,$db,$object); - - // List of done actions - show_actions_done($conf,$langs,$db,$object); - } } else { From e9374e8c08c46b1504d012bf4ffdff5a5995187f Mon Sep 17 00:00:00 2001 From: jean Date: Thu, 25 Sep 2014 09:26:32 +0200 Subject: [PATCH 0081/1190] adding hook for addMoreActionsbuttons --- htdocs/fourn/commande/card.php | 152 +++++++++++++++++---------------- 1 file changed, 79 insertions(+), 73 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index ba3cb7e9de0..d0fa34d87ad 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1814,98 +1814,104 @@ elseif (! empty($object->id)) /** * Boutons actions */ - if ($user->societe_id == 0 && $action != 'edit_line' && $action != 'delete') + $parameters = array(); + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been + // modified by hook + if (empty($reshook)) { - print '
'; - - // Validate - if ($object->statut == 0 && $num > 0) + if ($user->societe_id == 0 && $action != 'edit_line' && $action != 'delete') { - if ($user->rights->fournisseur->commande->valider) + print '
'; + + // Validate + if ($object->statut == 0 && $num > 0) { - print ''.$langs->trans('Validate').''; + if ($user->rights->fournisseur->commande->valider) + { + print ''.$langs->trans('Validate').''; + } } - } - - // Modify - if ($object->statut == 1) - { - if ($user->rights->fournisseur->commande->commander) + + // Modify + if ($object->statut == 1) { - print ''.$langs->trans("Modify").''; + if ($user->rights->fournisseur->commande->commander) + { + print ''.$langs->trans("Modify").''; + } } - } - - // Approve - if ($object->statut == 1) - { - if ($user->rights->fournisseur->commande->approuver) + + // Approve + if ($object->statut == 1) { - print ''.$langs->trans("ApproveOrder").''; - print ''.$langs->trans("RefuseOrder").''; + if ($user->rights->fournisseur->commande->approuver) + { + print ''.$langs->trans("ApproveOrder").''; + print ''.$langs->trans("RefuseOrder").''; + } + else + { + print ''.$langs->trans("ApproveOrder").''; + print ''.$langs->trans("RefuseOrder").''; + } } - else + + // Send + if (in_array($object->statut, array(2, 3, 4, 5))) { - print ''.$langs->trans("ApproveOrder").''; - print ''.$langs->trans("RefuseOrder").''; + if ($user->rights->fournisseur->commande->commander) + { + print ''.$langs->trans('SendByMail').''; + } } - } - - // Send - if (in_array($object->statut, array(2, 3, 4, 5))) - { - if ($user->rights->fournisseur->commande->commander) + + // Reopen + if (in_array($object->statut, array(2, 5, 6, 7, 9))) { - print ''.$langs->trans('SendByMail').''; + if ($user->rights->fournisseur->commande->commander) + { + print ''.$langs->trans("ReOpen").''; + } } - } - - // Reopen - if (in_array($object->statut, array(2, 5, 6, 7, 9))) - { - if ($user->rights->fournisseur->commande->commander) + + // Create bill + if (! empty($conf->fournisseur->enabled) && $object->statut >= 2) // 2 means accepted { - print ''.$langs->trans("ReOpen").''; + if ($user->rights->fournisseur->facture->creer) + { + print ''.$langs->trans("CreateBill").''; + } + + //if ($user->rights->fournisseur->commande->creer && $object->statut > 2) + //{ + // print ''.$langs->trans("ClassifyBilled").''; + //} } - } - - // Create bill - if (! empty($conf->fournisseur->enabled) && $object->statut >= 2) // 2 means accepted - { - if ($user->rights->fournisseur->facture->creer) + + // Cancel + if ($object->statut == 2) { - print ''.$langs->trans("CreateBill").''; + if ($user->rights->fournisseur->commande->commander) + { + print ''.$langs->trans("CancelOrder").''; + } } - - //if ($user->rights->fournisseur->commande->creer && $object->statut > 2) - //{ - // print ''.$langs->trans("ClassifyBilled").''; - //} - } - - // Cancel - if ($object->statut == 2) - { - if ($user->rights->fournisseur->commande->commander) + + // Clone + if ($user->rights->fournisseur->commande->creer) { - print ''.$langs->trans("CancelOrder").''; + print ''.$langs->trans("ToClone").''; } + + // Delete + if ($user->rights->fournisseur->commande->supprimer) + { + print ''.$langs->trans("Delete").''; + } + + print "
"; } - - // Clone - if ($user->rights->fournisseur->commande->creer) - { - print ''.$langs->trans("ToClone").''; - } - - // Delete - if ($user->rights->fournisseur->commande->supprimer) - { - print ''.$langs->trans("Delete").''; - } - - print "
"; } print "
"; From 3bc227b467ec35397bfa33ab0d951bc25ba310fd Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Thu, 25 Sep 2014 10:25:15 +0200 Subject: [PATCH 0082/1190] Fix for travis syntax --- htdocs/fourn/commande/orderstoinvoice.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index 62d9683470f..6c5ce8aa11c 100644 --- a/htdocs/fourn/commande/orderstoinvoice.php +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -84,9 +84,7 @@ if ($action == 'create') { // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php'; $hookmanager = new HookManager($db); -$hookmanager->initHooks(array ( - 'orderstoinvoicesupplier' -)); +$hookmanager->initHooks(array('orderstoinvoicesupplier')); /* * Actions @@ -226,20 +224,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { $fk_parent_line = 0; } // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example. - $result = $object->addline($desc, - $lines[$i]->subprice, - $lines[$i]->tva_tx, - $lines[$i]->localtax1_tx, - $lines[$i]->localtax2_tx, - $lines[$i]->qty, - $lines[$i]->fk_product, - $lines[$i]->remise_percent, - $date_start, - $date_end, - 0, - $lines[$i]->info_bits, - 'HT', - $product_type); + $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type); if ($result > 0) { $lineid = $result; From 3daf06960d52679bd1ed9834ed9961dfda14a1e2 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 25 Sep 2014 12:07:11 +0200 Subject: [PATCH 0083/1190] Fix: add generic doc and uniformize code --- htdocs/admin/fichinter.php | 186 +++++++++++++++++++++++-------------- 1 file changed, 118 insertions(+), 68 deletions(-) diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 37a3b2a5a5c..dad5f484a4d 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2011-2013 Philippe Grand @@ -113,6 +113,35 @@ else if ($action == 'specimen') // For fiche inter } } +// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...) +if ($action == 'setModuleOptions') +{ + $post_size=count($_POST); + + $db->begin(); + + for($i=0;$i < $post_size;$i++) + { + if (array_key_exists('param'.$i,$_POST)) + { + $param=GETPOST("param".$i,'alpha'); + $value=GETPOST("value".$i,'alpha'); + if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); + if (! $res > 0) $error++; + } + } + if (! $error) + { + $db->commit(); + setEventMessage($langs->trans("SetupSaved")); + } + else + { + $db->rollback(); + setEventMessage($langs->trans("Error"),'errors'); + } +} + // Activate a model else if ($action == 'set') { @@ -261,13 +290,13 @@ foreach ($dirmodels as $reldir) require_once $dir.$file.'.php'; $module = new $file; - + if ($module->isEnabled()) { // Show modules according to features level if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - + $var=!$var; print ''; - - // Active - if (in_array($name, $def)) + if (file_exists($dir.'/'.$file)) { - print ""; - } - else - { - print ""; - } + $var=!$var; - // Default - print "'; + $name = substr($file, 4, dol_strlen($file) -16); + $classname = substr($file, 0, dol_strlen($file) -12); - // Info - $htmltooltip = ''.$langs->trans("Name").': '.$module->name; - $htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); - $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; - $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; - $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); - $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); - $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); - $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); - $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); - print ''; - - // Preview - $link=''.img_object($langs->trans("Preview"),'intervention').''; - print ''; + require_once $dir.'/'.$file; + $module = new $classname($db); - print ''; + $modulequalified=1; + if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0; + if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0; + + if ($modulequalified) + { + print ''; + + // Active + if (in_array($name, $def)) + { + print ""; + } + else + { + print ""; + } + + // Default + print "'; + + // Info + $htmltooltip = ''.$langs->trans("Name").': '.$module->name; + $htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); + $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; + $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; + $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); + $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); + $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); + $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); + $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); + print ''; + + // Preview + print ''; + + print ''; + } + } } } - closedir($handle); } } } From 64b757ed81810226d6869ce3b75aecd5863caa9a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 25 Sep 2014 12:44:57 +0200 Subject: [PATCH 0084/1190] Fix: add generic doc and use doc dir instead pdf --- htdocs/admin/livraison.php | 165 ++++++++++++------ .../modules/livraison/{pdf => doc}/index.html | 0 .../{pdf => doc}/pdf_typhon.modules.php | 4 +- htdocs/livraison/class/livraison.class.php | 4 +- 4 files changed, 114 insertions(+), 59 deletions(-) rename htdocs/core/modules/livraison/{pdf => doc}/index.html (100%) rename htdocs/core/modules/livraison/{pdf => doc}/pdf_typhon.modules.php (99%) diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 415bff261de..b591aa79c08 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2011-2013 Philippe Grand * @@ -95,7 +95,7 @@ if ($action == 'specimen') $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); foreach($dirmodels as $reldir) { - $file=dol_buildpath($reldir."core/modules/livraison/pdf/pdf_".$modele.".modules.php",0); + $file=dol_buildpath($reldir."core/modules/livraison/doc/pdf_".$modele.".modules.php",0); if (file_exists($file)) { $filefound=1; @@ -128,6 +128,35 @@ if ($action == 'specimen') } } +// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...) +if ($action == 'setModuleOptions') +{ + $post_size=count($_POST); + + $db->begin(); + + for($i=0;$i < $post_size;$i++) + { + if (array_key_exists('param'.$i,$_POST)) + { + $param=GETPOST("param".$i,'alpha'); + $value=GETPOST("value".$i,'alpha'); + if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); + if (! $res > 0) $error++; + } + } + if (! $error) + { + $db->commit(); + setEventMessage($langs->trans("SetupSaved")); + } + else + { + $db->rollback(); + setEventMessage($langs->trans("Error"),'errors'); + } +} + if ($action == 'set') { $ret = addDocumentModel($value, $type, $label, $scandir); @@ -356,75 +385,101 @@ clearstatcache(); $var=true; foreach ($dirmodels as $reldir) { - $dir = dol_buildpath($reldir."core/modules/livraison/pdf/"); + $dir = dol_buildpath($reldir."core/modules/livraison/doc/"); if (is_dir($dir)) { $handle = opendir($dir); if (is_resource($handle)) { - while (($file = readdir($handle))!==false) - { - if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_') + while (($file = readdir($handle))!==false) + { + $filelist[]=$file; + } + closedir($handle); + arsort($filelist); + + foreach($filelist as $file) + { + if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file)) { - $name = substr($file, 4, dol_strlen($file) - 16); - $classname = substr($file, 0, dol_strlen($file) - 12); + if (file_exists($dir.'/'.$file)) + { + $var=!$var; - $var=!$var; + $name = substr($file, 4, dol_strlen($file) -16); + $classname = substr($file, 0, dol_strlen($file) -12); - print ''; + $modulequalified=1; + if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0; + if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0; - // Activ - if (in_array($name, $def)) - { - print ""; - } - else - { - print ""; - } + if ($modulequalified) + { + print ''; - // Default - print "'; + // Active + if (in_array($name, $def)) + { + print ""; + } + else + { + print ""; + } - // Info - $htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); - $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; - $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; - $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); - print ''; - print ''; + // Default + print "'; - print ''; + // Info + $htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); + $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; + $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; + $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); + print ''; + + // Preview + print ''; + + print ''; + } + } } } - closedir($handle); } } } diff --git a/htdocs/core/modules/livraison/pdf/index.html b/htdocs/core/modules/livraison/doc/index.html similarity index 100% rename from htdocs/core/modules/livraison/pdf/index.html rename to htdocs/core/modules/livraison/doc/index.html diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php similarity index 99% rename from htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php rename to htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index 569cfdff85e..363e7960fe8 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2008 Chiptronik * Copyright (C) 2011-2012 Philippe Grand @@ -21,7 +21,7 @@ */ /** - * \file htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php + * \file htdocs/core/modules/livraison/doc/pdf_typhon.modules.php * \ingroup livraison * \brief File of class to manage receving receipts with template Typhon * \author Laurent Destailleur diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index ad20f319ed2..ebe46c78ac3 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006-2007 Laurent Destailleur * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2011-2012 Philippe Grand @@ -953,7 +953,7 @@ class Livraison extends CommonObject } } - $modelpath = "core/modules/livraison/pdf/"; + $modelpath = "core/modules/livraison/doc/"; return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0); } From 7b9f154c295eb10c02e9d79bd526ff99ef6f04fc Mon Sep 17 00:00:00 2001 From: fmarcet Date: Thu, 25 Sep 2014 12:45:08 +0200 Subject: [PATCH 0085/1190] Fix: Withdrawal total amount is double --- ChangeLog | 1 + htdocs/compta/prelevement/class/bonprelevement.class.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 079219e6c7f..57e1876b760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ For users: - Fix: Extrafield feature select from table should try to translate multiple column when not needed - Fix: cents for indian ruppes are calle paisa and paise. - Fix: Invoices payments may be older than invoices. +- Fix: Withdrawal total amount is double - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line ***** ChangeLog for 3.6 compared to 3.5.* ***** diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 104277f4ed5..4bc91e4a5bc 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -3,6 +3,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2010-2014 Laurent Destailleur + * Copyright (C) 2014 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1411,7 +1412,7 @@ class BonPrelevement extends CommonObject fputs($this->file, ' '.$CrLf); fputs($this->file, ''.$CrLf); - $sql = "SELECT pl.amount"; + /*$sql = "SELECT pl.amount"; $sql.= " FROM"; $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,"; $sql.= " ".MAIN_DB_PREFIX."facture as f,"; @@ -1437,7 +1438,7 @@ class BonPrelevement extends CommonObject else { $result = -2; - } + }*/ } From 179da9a2206fcbe7d7bf98b71a6aa60918222f8b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 25 Sep 2014 13:49:33 +0200 Subject: [PATCH 0086/1190] Fix: uniformize code --- htdocs/admin/expedition.php | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index d89b406280b..2efdfdd56ba 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -138,6 +138,35 @@ else if ($action == 'specimen') } } +// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...) +else if ($action == 'setModuleOptions') +{ + $post_size=count($_POST); + + $db->begin(); + + for($i=0;$i < $post_size;$i++) + { + if (array_key_exists('param'.$i,$_POST)) + { + $param=GETPOST("param".$i,'alpha'); + $value=GETPOST("value".$i,'alpha'); + if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); + if (! $res > 0) $error++; + } + } + if (! $error) + { + $db->commit(); + setEventMessage($langs->trans("SetupSaved")); + } + else + { + $db->rollback(); + setEventMessage($langs->trans("Error"),'errors'); + } +} + // Activate a model else if ($action == 'set') { @@ -175,14 +204,6 @@ else if ($action == 'setmodel') { dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity); } -else if ($action=='setModuleOptions') { - if (dolibarr_set_const($db, "EXPEDITION_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity)) - { - // La constante qui a ete lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage coherent - $conf->global->EXPEDITION_ADDON_PDF_ODT_PATH = GETPOST('value1'); - } -} /* From 82a2bb16904b08bedbac160bba136e19c8d65eea Mon Sep 17 00:00:00 2001 From: jean Date: Thu, 25 Sep 2014 17:00:44 +0200 Subject: [PATCH 0087/1190] list bof orders to process : status validated or in process, or closed but not billed --- htdocs/commande/list.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index d699192acbf..d285a241b46 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -155,8 +155,9 @@ if ($viewstatut <> '') } if ($viewstatut == -3) // To bill { - $sql.= ' AND c.fk_statut in (1,2,3)'; - $sql.= ' AND c.facture = 0'; // invoice not created + //$sql.= ' AND c.fk_statut in (1,2,3)'; + //$sql.= ' AND c.facture = 0'; // invoice not created + $sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed } } if ($ordermonth > 0) From 44cecb8e7d875dc622921aa4f6474456808071b7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 26 Sep 2014 09:17:37 +0200 Subject: [PATCH 0088/1190] Fix: add possibility to use element id --- htdocs/core/ajax/loadinplace.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php index 69a0bbc72c7..de3a4e57d19 100644 --- a/htdocs/core/ajax/loadinplace.php +++ b/htdocs/core/ajax/loadinplace.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2011-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -98,7 +98,7 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($ dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php'); $classname = 'Actions'.ucfirst($subelement); $object = new $classname($db); - $ret = $object->$methodname(); + $ret = $object->$methodname($fk_element); if ($ret > 0) echo json_encode($object->$cachename); } } From 3ab8b6f7d10be433a36aeab685ebe9f3677df4f4 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 26 Sep 2014 09:44:21 +0200 Subject: [PATCH 0089/1190] New: add possibility to define a custom error message --- htdocs/core/class/html.form.class.php | 25 ++++++++++++++++++------- htdocs/core/js/editinplace.js | 17 ++++++++++++----- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 0233706928c..8bbf5ad8337 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2013 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2006 Marc Barilley/Ocebo * Copyright (C) 2007 Franky Van Liedekerke @@ -124,11 +124,11 @@ class Form * @param string $typeofdata Type of data ('string' by default, 'amount', 'email', 'numeric:99', 'text' or 'textarea:rows:cols', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...) * @param string $editvalue When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value * @param object $extObject External object - * @param string $success Success message + * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage') * @param string $moreparam More param to add on a href URL * @return string HTML edit field */ - function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='string', $editvalue='', $extObject=null, $success=null, $moreparam='') + function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='string', $editvalue='', $extObject=null, $custommsg=null, $moreparam='') { global $conf,$langs,$db; @@ -140,7 +140,7 @@ class Form // When option to edit inline is activated if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/',$typeofdata)) // TODO add jquery timepicker { - $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $success); + $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg); } else { @@ -244,10 +244,10 @@ class Form * @param string $inputType Type of input ('numeric', 'datepicker', 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:xxx') * @param string $editvalue When in edit mode, use this value as $value instead of value * @param object $extObject External object - * @param string $success Success message + * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage') * @return string HTML edit in place */ - private function editInPlace($object, $value, $htmlname, $condition, $inputType='textarea', $editvalue=null, $extObject=null, $success=null) + private function editInPlace($object, $value, $htmlname, $condition, $inputType='textarea', $editvalue=null, $extObject=null, $custommsg=null) { global $conf; @@ -334,7 +334,18 @@ class Form $out.= ''."\n"; if (! empty($savemethod)) $out.= ''."\n"; if (! empty($ext_element)) $out.= ''."\n"; - if (! empty($success)) $out.= ''."\n"; + if (! empty($custommsg)) + { + if (is_array($custommsg)) + { + if (!empty($custommsg['success'])) + $out.= ''."\n"; + if (!empty($custommsg['error'])) + $out.= ''."\n"; + } + else + $out.= ''."\n"; + } if ($inputType == 'textarea') { $out.= ''."\n"; $out.= ''."\n"; diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js index 4fe29e4b4fb..17d70220b31 100644 --- a/htdocs/core/js/editinplace.js +++ b/htdocs/core/js/editinplace.js @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2012 Regis Houssin +// Copyright (C) 2011-2014 Regis Houssin // Copyright (C) 2011 Laurent Destailleur // // This program is free software; you can redistribute it and/or modify @@ -358,12 +358,19 @@ $(document).ready(function() { var res = $.parseJSON(result); if (res.error) { $(obj).html(obj.revert); - $.jnotify(res.error, "error", true); + var htmlname = $(obj).attr('id').substr(8); + var errormsg = $( '#errormsg_' + htmlname ).val(); + if (errormsg != undefined) { + $.jnotify(errormsg, "error", true); + } else { + $.jnotify(res.error, "error", true); + } + } else { var htmlname = $(obj).attr('id').substr(8); - var success = $( '#success_' + htmlname ).val(); - if (success != undefined) { - $.jnotify(success, "ok"); + var successmsg = $( '#successmsg_' + htmlname ).val(); + if (successmsg != undefined) { + $.jnotify(successmsg, "ok"); } $(obj).html(res.value); $(obj).hide(); From 16facc81aa16d5130b4c29ffb6601ac02488477d Mon Sep 17 00:00:00 2001 From: jean Date: Fri, 26 Sep 2014 10:11:38 +0200 Subject: [PATCH 0090/1190] Add link with order when invoice made for a shioppoing --- htdocs/compta/facture.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 00c927bad99..168beb73b43 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -865,6 +865,16 @@ else if ($action == 'add' && $user->rights->facture->creer) // Possibility to add external linked objects with hooks $object->linked_objects [$object->origin] = $object->origin_id; + // link with order if it is a shipping invoice + if ($object->origin == 'shipping') + { + require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php'; + $exp = new Expedition($db); + $exp->fetch($object->origin_id); + $exp->fetchObjectLinked(); + if (count ($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0]; + } + if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) { $object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']); } From bf4b99fa641bd4ac00092b2780f3a89aefa09b66 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 26 Sep 2014 12:27:18 +0200 Subject: [PATCH 0091/1190] Assignation of event to several users is on a very good way for 3.7 --- htdocs/comm/action/card.php | 2 + htdocs/comm/action/class/actioncomm.class.php | 31 ++++++++++----- htdocs/comm/action/index.php | 30 +++++++------- htdocs/comm/action/peruser.php | 39 +++++++++++-------- htdocs/core/class/html.form.class.php | 6 ++- 5 files changed, 67 insertions(+), 41 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index aef2d5fad3d..827e2df976a 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -219,6 +219,7 @@ if ($action == 'add') if ($value['id'] > 0) { $usertodo->fetch($value['id']); + $object->userownerid = $usertodo->id; } $object->usertodo = $usertodo; $object->transparency = (GETPOST("transparency")=='on'?1:0); @@ -235,6 +236,7 @@ if ($action == 'add') if ($_POST["doneby"] > 0) { $userdone->fetch($_POST["doneby"]); + $object->userdoneid = $userdone->id; } $object->userdone = $userdone; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 1d7cf0efd68..fa7130ec018 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -47,8 +47,10 @@ class ActionComm extends CommonObject var $datec; // Date creation record (datec) var $datem; // Date modification record (tms) - var $author; // Object user that create action - var $usermod; // Object user that modified action + var $author; // Object user that create action //deprecated + var $usermod; // Object user that modified action // deprecated + var $authorid; // Id user that create action + var $usermodid; // Id user that modified action var $datep; // Date action start (datep) var $datef; // Date action end (datep2) @@ -63,8 +65,9 @@ class ActionComm extends CommonObject var $note; // Description var $userassigned = array(); // Array of user ids - var $usertodo; // Object user of owner - var $userdone; // Object user that did action (deprecated) + var $userownerid; // Id of user owner + var $usertodo; // Object user of owner // deprecated + var $userdone; // Object user that did action // deprecated var $socid; var $contactid; @@ -134,6 +137,9 @@ class ActionComm extends CommonObject if ($this->elementtype=='commande') $this->elementtype='order'; if ($this->elementtype=='contrat') $this->elementtype='contract'; + $userownerid=isset($this->usertodo->id)?$this->usertodo->id:$this->userownerid; // For backward compatibility + $userdoneid=isset($this->userdone->id)?$this->userdone->id:$this->userdoneid; // For backward compatibility + if (! $this->type_id && $this->type_code) { // Get id from code @@ -197,8 +203,8 @@ class ActionComm extends CommonObject $sql.= " '".$this->db->escape($this->note)."',"; $sql.= (isset($this->contactid) && $this->contactid > 0?"'".$this->contactid."'":"null").","; $sql.= (isset($user->id) && $user->id > 0 ? "'".$user->id."'":"null").","; - $sql.= (isset($this->usertodo->id) && $this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").","; - $sql.= (isset($this->userdone->id) && $this->userdone->id > 0?"'".$this->userdone->id."'":"null").","; + $sql.= ($userownerid>0?"'".$userownerid."'":"null").","; + $sql.= ($userdoneid>0?"'".$userdoneid."'":"null").","; $sql.= "'".$this->db->escape($this->label)."','".$this->percentage."','".$this->priority."','".$this->fulldayevent."','".$this->db->escape($this->location)."','".$this->punctual."',"; $sql.= "'".$this->transparency."',"; $sql.= (! empty($this->fk_element)?$this->fk_element:"null").","; @@ -351,8 +357,9 @@ class ActionComm extends CommonObject $this->author->lastname = $obj->lastname; $this->usermod->id = $obj->fk_user_mod; - $this->usertodo->id = $obj->fk_user_action; - $this->userdone->id = $obj->fk_user_done; + $this->userownerid = $obj->fk_user_action; + $this->usertodo->id = $obj->fk_user_action; // deprecated + //$this->userdone->id = $obj->fk_user_done; $this->priority = $obj->priority; $this->fulldayevent = $obj->fulldayevent; $this->location = $obj->location; @@ -380,19 +387,25 @@ class ActionComm extends CommonObject /** - * Initialize this->userassigned array + * Initialize this->userassigned array with list of id of user assigned to event * * @return int <0 if KO, >0 if OK */ function fetch_userassigned() { global $langs; + $sql.="SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency"; $sql.=" FROM ".MAIN_DB_PREFIX."actioncomm_resources"; $sql.=" WHERE element_type = 'user' AND fk_actioncomm = ".$this->id; $resql2=$this->db->query($sql); if ($resql2) { + $this->userassigned=array(); + + // If owner is known, we must but id first into list + if ($this->userownerid > 0) $this->userassigned[$this->userownerid]=array('id'=>$this->userownerid); // Set first so will be first into list. + while ($obj = $this->db->fetch_object($resql2)) { $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 44d1e209694..67d27de66a5 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -484,10 +484,12 @@ if ($resql) $event->type_code=$obj->code; $event->libelle=$obj->label; $event->percentage=$obj->percent; - $event->author->id=$obj->fk_user_author; // user id of creator - $event->usertodo->id=$obj->fk_user_action; // user id of owner - $event->userdone->id=$obj->fk_user_done; // deprecated - // $event->userstodo=... with s after user, in future version, will be an array with all id of user assigned to event + //$event->author->id=$obj->fk_user_author; // user id of creator + $event->authorid=$obj->fk_user_author; // user id of creator + $event->userownerid=$obj->fk_user_action; // user id of owner + $event->fetch_userassigned(); // This load $event->userassigned + //$event->usertodo->id=$obj->fk_user_action; // user id of owner + //$event->userdone->id=$obj->fk_user_done; // deprecated $event->priority=$obj->priority; $event->fulldayevent=$obj->fulldayevent; $event->location=$obj->location; @@ -1132,19 +1134,19 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa { if ($i < $maxprint || $maxprint == 0 || ! empty($conf->global->MAIN_JS_SWITCH_AGENDA)) { - $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar); + $keysofuserassigned=array_keys($event->userassigned); + + $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar); // Define $color and $cssclass of event $color=-1; $cssclass=''; $colorindex=-1; - if ((! empty($event->author->id) && $event->author->id == $user->id) - || (! empty($event->usertodo->id) && $event->usertodo->id == $user->id) - || (! empty($event->userdone->id) && $event->userdone->id == $user->id)) - { - $nummytasks++; $cssclass='family_mytasks'; + if (in_array($user->id, $keysofuserassigned)) + { + $nummytasks++; $cssclass='family_mytasks'; // TODO Set a color using user color // Must defined rule to choose color of who to use. - // event->usertodo->id will still contains user id of owner - // event->userstodo will be an array in future. + // event->ownerid will still contains user id of owner + // event->userassigned will be an array in future. // $color=$user->color; } else if ($event->type_code == 'ICALEVENT') @@ -1164,7 +1166,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa if ($color == -1) // Color was not forced. Set color according to color index. { // Define color index if not yet defined - $idusertouse=($event->usertodo->id?$event->usertodo->id:0); + $idusertouse=($event->userownerid?$event->userownerid:0); if (isset($colorindexused[$idusertouse])) { $colorindex=$colorindexused[$idusertouse]; // Color already assigned to this user @@ -1344,7 +1346,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa } else { - print 'datep=$db->jdate($obj->datep); // datep and datef are GMT date $event->datef=$db->jdate($obj->datep2); $event->type_code=$obj->code; - $event->libelle=$obj->label; // deprecated + //$event->libelle=$obj->label; // deprecated $event->label=$obj->label; $event->percentage=$obj->percent; - $event->author->id=$obj->fk_user_author; // user id of creator - $event->usertodo->id=$obj->fk_user_action; // user id of owner - $event->userdone->id=$obj->fk_user_done; // deprecated - // $event->userstodo=... with s after user, in future version, will be an array with all id of user assigned to event + //$event->author->id=$obj->fk_user_author; // user id of creator + $event->authorid=$obj->fk_user_author; // user id of creator + $event->userownerid=$obj->fk_user_action; // user id of owner + $event->fetch_userassigned(); // This load $event->userassigned + //$event->userdone->id=$obj->fk_user_done; // deprecated $event->priority=$obj->priority; $event->fulldayevent=$obj->fulldayevent; $event->location=$obj->location; @@ -412,8 +413,8 @@ if ($resql) $event->socid=$obj->fk_soc; $event->contactid=$obj->fk_contact; - $event->societe->id=$obj->fk_soc; - $event->contact->id=$obj->fk_contact; + //$event->societe->id=$obj->fk_soc; // deprecated + //$event->contact->id=$obj->fk_contact; // deprecated // Defined date_start_in_calendar and date_end_in_calendar property // They are date start and end of action but modified to not be outside calendar view. @@ -424,7 +425,7 @@ if ($resql) else $event->date_end_in_calendar=$event->datep; } else - { + { $event->date_start_in_calendar=$event->datep; if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar=$event->datef; else $event->date_end_in_calendar=$event->datep; @@ -442,7 +443,7 @@ if ($resql) // This record is out of visible range } else - { + { if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow; if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow; @@ -598,6 +599,9 @@ else $usernames = $tmpgroup->listUsersForGroup(); } +// Load array of colors by type +// TODO +$colorsbytype=array(); // Loop on each user to show calendar $sav = $tmpday; @@ -608,6 +612,7 @@ foreach ($usernames as $username) echo ''; $tmpday = $sav; + // Lopp on each day of week $i = 0; for ($iter_day = 0; $iter_day < 7; $iter_day++) { @@ -631,7 +636,7 @@ foreach ($usernames as $username) if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1; if ($today) $style='cal_today_peruser'; - show_day_events2($username, $tmpday, $month, $year, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader); + show_day_events2($username, $tmpday, $month, $year, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype); $i++; } @@ -721,8 +726,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array(); $ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day); - $nextindextouse=count($colorindexused); // At first run this is 0, so fist user has 0, next 1, ... + $nextindextouse=count($colorindexused); // At first run, this is 0, so fist user has 0, next 1, ... + // We are in a particular day for $username, now we scan all events foreach ($eventarray as $daykey => $notused) { $annee = date('Y',$daykey); @@ -733,17 +739,18 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & //Tout les events à la même date : foreach ($eventarray[$daykey] as $index => $event) { - if ($username->id != $event->usertodo->id) continue; // We discard record if event is from another user than user we want to show + $keysofuserassigned=array_keys($event->userassigned); + if (! in_array($username->id,$keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show + //if ($username->id != $event->userownerid) continue; // We discard record if event is from another user than user we want to show $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar); // Define $color and $cssclass of event $color=-1; $cssclass=''; $colorindex=-1; - if ((! empty($event->author->id) && $event->author->id == $user->id) - || (! empty($event->usertodo->id) && $event->usertodo->id == $user->id) - || (! empty($event->userdone->id) && $event->userdone->id == $user->id)) + if (in_array($user->id, $keysofuserassigned)) { $nummytasks++; $cssclass='family_mytasks'; + // TODO Set color according to event type } else if ($event->type_code == 'ICALEVENT') { @@ -765,7 +772,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & if ($color == -1) // Color was not forced. Set color according to color index. { // Define color index if not yet defined - $idusertouse=($event->usertodo->id?$event->usertodo->id:0); + $idusertouse=($event->userownerid?$event->userownerid:0); if (isset($colorindexused[$idusertouse])) { $colorindex=$colorindexused[$idusertouse]; // Color already assigned to this user diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 0233706928c..5047d493f08 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1318,7 +1318,9 @@ class Form { $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); } - if (count($assignedtouser) && $action != 'view') $out.='
'; + $numassignetouser=count($assignedtouser); + + if ($numassignetouser && $action != 'view') $out.='
'; $i=0; $ownerid=0; foreach($assignedtouser as $key => $value) { @@ -1326,7 +1328,7 @@ class Form $userstatic->fetch($value['id']); $out.=$userstatic->getNomUrl(1); if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; } - if ($i > 0 && $action != 'view') $out.=' '; + if ($numassignetouser > 1 && $action != 'view') $out.=' '; //$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional")); //$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy")); $out.='
'; From c0e93a17da048513ed5d34043e2ea6b4e502004e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 26 Sep 2014 12:42:21 +0200 Subject: [PATCH 0092/1190] Add FIXME --- htdocs/comm/action/index.php | 2 ++ htdocs/comm/action/listactions.php | 2 ++ htdocs/comm/action/peruser.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 67d27de66a5..882e26df432 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -419,6 +419,7 @@ if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'"; if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid); if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")"; if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid; +// FIXME: We must filter on assignement table if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action"; if ($action == 'show_day') { @@ -453,6 +454,7 @@ if ($status == '-1') { $sql.= " AND a.percent = -1"; } // Not applicable if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; } // Running already started if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; } if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; } +// FIXME: We must filter on assignement table if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0) { $sql.= " AND ("; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index a2c75386e56..bc8a15827e0 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -163,6 +163,7 @@ if ($actioncode) $sql.=" AND c.code='".$db->escape($actioncode)."'"; if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid); if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")"; if ($socid > 0) $sql.= " AND s.rowid = ".$socid; +// FIXME: We must filter on assignement table if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action"; if ($type) $sql.= " AND c.id = ".$type; if ($status == '0') { $sql.= " AND a.percent = 0"; } @@ -170,6 +171,7 @@ if ($status == '-1') { $sql.= " AND a.percent = -1"; } // Not applicable if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; } // Running already started if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; } if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; } +// FIXME: We must filter on assignement table if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0) { $sql.= " AND ("; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 212fdddb9ac..b85ac59c9a7 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -335,6 +335,7 @@ if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'"; if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid); if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")"; if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid; +// FIXME: We must filter on assignement table if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action"; if ($action == 'show_day') { @@ -369,6 +370,7 @@ if ($status == '-1') { $sql.= " AND a.percent = -1"; } // Not applicable if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; } // Running already started if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; } if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; } +// FIXME: We must filter on assignement table if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0) { $sql.= " AND ("; From 722e939e197ae30e7561c492608553d3d8a4b3d3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 26 Sep 2014 13:23:54 +0200 Subject: [PATCH 0093/1190] Fix: form must not be into a closing and opening tr tag. --- htdocs/commande/card.php | 110 ++++++++++++++++++--------------- htdocs/fourn/commande/card.php | 44 +++++++------ 2 files changed, 86 insertions(+), 68 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 29b22f8dbd2..3119205fda8 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -371,11 +371,11 @@ else if ($action == 'add' && $user->rights->commande->creer) { // If some invoice's lines already known $NBLINES = 8; for($i = 1; $i <= $NBLINES; $i ++) { - if ($_POST ['idprod' . $i]) { + if ($_POST['idprod' . $i]) { $xid = 'idprod' . $i; $xqty = 'qty' . $i; $xremise = 'remise_percent' . $i; - $object->add_product($_POST [$xid], $_POST [$xqty], $_POST [$xremise]); + $object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]); } } } @@ -546,7 +546,7 @@ else if ($action == 'addline' && $user->rights->commande->creer) { if (is_array($extralabelsline)) { // Get extra fields foreach ($extralabelsline as $key => $value) { - unset($_POST ["options_" . $key]); + unset($_POST["options_" . $key]); } } @@ -725,23 +725,23 @@ else if ($action == 'addline' && $user->rights->commande->creer) { $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } - unset($_POST ['prod_entry_mode']); + unset($_POST['prod_entry_mode']); - unset($_POST ['qty']); - unset($_POST ['type']); - unset($_POST ['remise_percent']); - unset($_POST ['price_ht']); - unset($_POST ['price_ttc']); - unset($_POST ['tva_tx']); - unset($_POST ['product_ref']); - unset($_POST ['product_label']); - unset($_POST ['product_desc']); - unset($_POST ['fournprice']); - unset($_POST ['buying_price']); - unset($_POST ['np_marginRate']); - unset($_POST ['np_markRate']); - unset($_POST ['dp_desc']); - unset($_POST ['idprod']); + unset($_POST['qty']); + unset($_POST['type']); + unset($_POST['remise_percent']); + unset($_POST['price_ht']); + unset($_POST['price_ttc']); + unset($_POST['tva_tx']); + unset($_POST['product_ref']); + unset($_POST['product_label']); + unset($_POST['product_desc']); + unset($_POST['fournprice']); + unset($_POST['buying_price']); + unset($_POST['np_marginRate']); + unset($_POST['np_markRate']); + unset($_POST['dp_desc']); + unset($_POST['idprod']); unset($_POST['date_starthour']); unset($_POST['date_startmin']); @@ -796,7 +796,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST(' // Unset extrafield POST Data if (is_array($extralabelsline)) { foreach ($extralabelsline as $key => $value) { - unset($_POST ["options_" . $key]); + unset($_POST["options_" . $key]); } } @@ -850,18 +850,18 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST(' $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } - unset($_POST ['qty']); - unset($_POST ['type']); - unset($_POST ['productid']); - unset($_POST ['remise_percent']); - unset($_POST ['price_ht']); - unset($_POST ['price_ttc']); - unset($_POST ['tva_tx']); - unset($_POST ['product_ref']); - unset($_POST ['product_label']); - unset($_POST ['product_desc']); - unset($_POST ['fournprice']); - unset($_POST ['buying_price']); + unset($_POST['qty']); + unset($_POST['type']); + unset($_POST['productid']); + unset($_POST['remise_percent']); + unset($_POST['price_ht']); + unset($_POST['price_ttc']); + unset($_POST['tva_tx']); + unset($_POST['product_ref']); + unset($_POST['product_label']); + unset($_POST['product_desc']); + unset($_POST['fournprice']); + unset($_POST['buying_price']); } else { setEventMessage($object->error, 'errors'); } @@ -1699,6 +1699,8 @@ if ($action == 'create' && $user->rights->commande->creer) { $author = new User($db); $author->fetch($object->user_author_id); + $res = $object->fetch_optionals($object->id, $extralabels); + $head = commande_prepare_head($object); dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order'); @@ -2120,30 +2122,38 @@ if ($action == 'create' && $user->rights->commande->creer) { } // Other attributes (TODO Move this into an include) - $res = $object->fetch_optionals($object->id, $extralabels); $parameters = array('colspan' => ' colspan="3"'); - $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by - // hook - if (empty($reshook) && ! empty($extrafields->attribute_label)) { - foreach ($extrafields->attribute_label as $key => $label) { - if ($action == 'edit_extras') { - $value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]); - } else { - $value = $object->array_options ["options_" . $key]; + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + foreach ($extrafields->attribute_label as $key => $label) + { + if ($action == 'edit_extras') + { + $value = (isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); } - if ($extrafields->attribute_type [$key] == 'separate') { + else + { + $value = $object->array_options["options_" . $key]; + } + + if ($extrafields->attribute_type[$key] == 'separate') + { print $extrafields->showSeparator($key); - } else { + } + else + { print 'attribute_required [$key])) - print ' class="fieldrequired"'; + if (! empty($extrafields->attribute_required [$key])) print ' class="fieldrequired"'; print '>' . $label . ''; } - // Other attributes + // Other attributes (TODO Move this into an include) $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook if (empty($reshook) && ! empty($extrafields->attribute_label)) { - if ($action == 'edit_extras') - { - print '
'; - print ''; - print ''; - print ''; - } - foreach($extrafields->attribute_label as $key=>$label) { - if ($action == 'edit_extras') { + if ($action == 'edit_extras') + { $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); - } else { + } + else + { $value=$object->array_options["options_".$key]; } @@ -1518,15 +1514,25 @@ elseif (! empty($object->id)) $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]); } - if ($action == 'edit_extras' && $user->rights->fournisseur->commande->creer) + if ($action == 'edit_extras' && $user->rights->commande->creer && GETPOST('attribute') == $key) { - print $extrafields->showInputField($key,$value); + print ''; + print ''; + print ''; + print ''; + print ''; + + print $extrafields->showInputField($key, $value); + + print ''; + print ''; } else { - print $extrafields->showOutputField($key,$value); + print $extrafields->showOutputField($key, $value); + if ($object->statut == 0 && $user->rights->commande->creer) + print '' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . ''; } - print ''."\n"; } } From 96c5771718ec4ca070d948c5b4161eb361dd1484 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Fri, 26 Sep 2014 16:18:32 +0200 Subject: [PATCH 0094/1190] Fix web service category --- ChangeLog | 1 + htdocs/webservices/server_category.php | 81 +++++++++++--------------- 2 files changed, 34 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 079219e6c7f..d422594ef83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ For users: - Fix: cents for indian ruppes are calle paisa and paise. - Fix: Invoices payments may be older than invoices. - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line +- Fix: Web service categorie WDSL declaration is correct ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php index 1b85c677175..45a8fb76a78 100644 --- a/htdocs/webservices/server_category.php +++ b/htdocs/webservices/server_category.php @@ -106,56 +106,41 @@ $server->wsdl->addComplexType( 'tns:categorie' ); -/* - * Tableau des catégories - -$server->wsdl->addComplexType( - 'categories', - 'complexType', - 'array', - '', - 'SOAP-ENC:Array', - array(), - array( - array('id'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:categorie[]') - ), - 'tns:categories' -); + /* + * Image of product */ - -/* - * Les photos de la catégorie (un tableau indéxé qui contient les images avec leur vignette) + $server->wsdl->addComplexType( + 'PhotosArray', + 'complexType', + 'array', + 'sequence', + '', + array( + 'image' => array( + 'name' => 'image', + 'type' => 'tns:image', + 'minOccurs' => '0', + 'maxOccurs' => 'unbounded' + ) + ) + ); + + /* + * An image */ -$server->wsdl->addComplexType( - 'PhotosArray', - 'complexType', - 'array', - '', - 'SOAP-ENC:Array', - array(), - array( - array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:image[]') - ), - '' -); - -/* - * Une photo ( nom image / nom_vignette ) - */ -$server->wsdl->addComplexType( - 'image', - 'complexType', - 'array', - '', - 'SOAP-ENC:Array', - array(), - array( - 'photo' => array('name'=>'photo','type'=>'xsd:string'), - 'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'), - 'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'), - 'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string') - ) -); + $server->wsdl->addComplexType( + 'image', + 'complexType', + 'struct', + 'all', + '', + array( + 'photo' => array('name'=>'photo','type'=>'xsd:string'), + 'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'), + 'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'), + 'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string') + ) + ); /* * Retour From b8969edcc5e367f840523d9960eb416facbaaf61 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Sep 2014 12:34:45 +0200 Subject: [PATCH 0095/1190] Prepare 3.6.1 --- build/debian/changelog | 7 +++++++ build/exe/doliwamp/doliwamp.iss | 4 ++-- build/rpm/dolibarr_fedora.spec | 3 +++ build/rpm/dolibarr_generic.spec | 3 +++ build/rpm/dolibarr_mandriva.spec | 3 +++ build/rpm/dolibarr_opensuse.spec | 3 +++ htdocs/filefunc.inc.php | 2 +- 7 files changed, 22 insertions(+), 3 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 06d0d2212d5..76e8ae3a2fc 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,10 @@ +dolibarr (3.6.1-3) unstable; urgency=low + + [ Laurent Destailleur (eldy) ] + * New upstream release. + + -- Laurent Destailleur (eldy) Tue, 23 Sep 2014 12:00:00 +0100 + dolibarr (3.6.0-3) unstable; urgency=low [ Laurent Destailleur (eldy) ] diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index da727786896..1657ff1c7e7 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -17,9 +17,9 @@ ; ----- Change this ----- AppName=DoliWamp ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -AppVerName=DoliWamp-3.6.0 +AppVerName=DoliWamp-3.6.1 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -OutputBaseFilename=DoliWamp-3.6.0 +OutputBaseFilename=DoliWamp-3.6.1 ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log ; Define full path from which all relative path are defined diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index d676e59255e..439a09b8266 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -333,6 +333,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 +- Upstream release + * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 - Upstream release diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index ef94435a62a..945e8f4812c 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -569,6 +569,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 +- Upstream release + * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 - Upstream release diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index dfa148570f0..17b46c3c143 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -338,6 +338,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 +- Upstream release + * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 - Upstream release diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index b3b304312f5..f6192c87c9b 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -349,6 +349,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 +- Upstream release + * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 - Upstream release diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index b927b0016e8..8066c2a1a22 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -29,7 +29,7 @@ * \brief File that include conf.php file and commons lib like functions.lib.php */ -if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.0'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.1'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants From 7dcaa6121863d5115adb03666c4653df91894d6a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Sep 2014 13:23:38 +0200 Subject: [PATCH 0096/1190] Prepare 3.6.1 --- build/makepack-howto.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 24e5f809185..40b0e5180bc 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -36,14 +36,13 @@ complete release of Dolibarr, step by step. - Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss - Update version number with x.y.z in build/rpm/*.spec - Commit all changes. -- Add a Tag (x.y.z) - Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl - Check content of built packages. - Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files/stable). - Run makepack-dolibarr.pl again with option to publish files on - sourceforge. + sourceforge. This will also add official tag. - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx" on server to point to new files (used by some web sites). From 05f83dddf09464053e17a5072f5febc8345eb2dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Sep 2014 15:23:40 +0200 Subject: [PATCH 0097/1190] Fix: packager --- build/makepack-dolibarr.pl | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 77f19c1500a..b6fa0dd7122 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -460,8 +460,8 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`; @@ -610,9 +610,6 @@ if ($nboftargetok) { print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; - #print "Create directory $RPMDIR\n"; - #$ret=`mkdir -p "$RPMDIR"`; - print "Remove target ".$FILENAMERPM."...\n"; unlink("$NEWDESTI/".$FILENAMERPM); print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n"; @@ -620,13 +617,13 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$FILENAMETGZ2\n"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; $cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'"; $ret=`$cmd`; - # Set owners - #print "Set owners on files/dir\n"; - #$ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + # Removed files we don't need + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`; print "Set permissions on files/dir\n"; $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; @@ -747,10 +744,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`; # Removed duplicate license files + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`; + # Removed files we don't need + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`; + # Rename upstream changelog to match debian rules $ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`; From e8b7c9c6bdad044e675e05484d29d1f24277f348 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Sep 2014 16:00:11 +0200 Subject: [PATCH 0098/1190] Fix: doxygen --- .../actions_adherentcard_common.class.php | 4 ++-- .../actions_adherentcard_default.class.php | 2 +- htdocs/comm/action/index.php | 2 +- .../class/bonprelevement.class.php | 2 +- .../actions_contactcard_common.class.php | 4 ++-- .../actions_contactcard_default.class.php | 2 +- htdocs/core/class/canvas.class.php | 4 ++-- htdocs/core/class/extrafields.class.php | 2 +- htdocs/core/class/hookmanager.class.php | 4 ++-- htdocs/core/class/html.form.class.php | 8 +++---- htdocs/core/class/html.formother.class.php | 2 +- htdocs/core/class/ldap.class.php | 16 +++++++------- htdocs/core/class/link.class.php | 2 +- htdocs/core/class/menubase.class.php | 6 ++--- htdocs/core/class/rssparser.class.php | 8 +++---- htdocs/core/db/DoliDB.class.php | 4 ++-- htdocs/core/lib/admin.lib.php | 22 +++++++++---------- htdocs/core/lib/files.lib.php | 4 ++-- htdocs/core/lib/functions.lib.php | 8 +++---- htdocs/core/lib/functions2.lib.php | 4 ++-- htdocs/core/lib/pdf.lib.php | 16 +++++++------- htdocs/core/lib/project.lib.php | 22 +++++++++---------- htdocs/core/lib/treeview.lib.php | 2 +- htdocs/core/lib/ws.lib.php | 6 ++--- htdocs/core/menus/standard/auguria.lib.php | 12 +++++----- htdocs/core/menus/standard/eldy.lib.php | 12 +++++----- htdocs/core/modules/action/rapport.pdf.php | 4 ++-- .../barcode/mod_barcode_product_standard.php | 8 +++---- .../modules/cheque/pdf/pdf_blochet.class.php | 6 ++--- .../commande/doc/pdf_einstein.modules.php | 12 +++++----- .../commande/doc/pdf_proforma.modules.php | 12 +++++----- .../contract/doc/pdf_strato.modules.php | 6 ++--- .../expedition/doc/pdf_merou.modules.php | 8 +++---- .../expedition/doc/pdf_rouget.modules.php | 8 +++---- .../modules/facture/doc/pdf_crabe.modules.php | 12 +++++----- .../fichinter/doc/pdf_soleil.modules.php | 6 ++--- .../livraison/pdf/pdf_typhon.modules.php | 8 +++---- .../modules/member/doc/pdf_standard.class.php | 10 ++++----- htdocs/core/modules/modSalaries.class.php | 2 +- .../doc/pdf_standardlabel.class.php | 10 ++++----- .../product/mod_codeproduct_elephant.php | 2 +- .../product/mod_codeproduct_leopard.php | 2 +- .../project/pdf/pdf_baleine.modules.php | 6 ++--- .../modules/propale/doc/pdf_azur.modules.php | 12 +++++----- .../modules/rapport/pdf_paiement.class.php | 10 ++++----- .../societe/mod_codeclient_elephant.php | 2 +- .../societe/mod_codeclient_leopard.php | 2 +- .../modules/societe/mod_codeclient_monkey.php | 4 ++-- .../pdf/pdf_canelle.modules.php | 10 ++++----- .../pdf/pdf_muscadet.modules.php | 12 +++++----- htdocs/imports/import.php | 4 ++-- htdocs/main.inc.php | 2 +- .../product/actions_card_product.class.php | 2 +- .../service/actions_card_service.class.php | 2 +- .../resource/class/actions_resource.class.php | 4 ++-- .../canvas/actions_card_common.class.php | 4 ++-- .../company/actions_card_company.class.php | 4 ++-- .../actions_card_individual.class.php | 4 ++-- htdocs/societe/class/societe.class.php | 6 ++--- htdocs/user/class/user.class.php | 4 ++-- test/phpunit/FactureRecTest.php | 14 ++++++------ test/phpunit/FactureTest.php | 2 +- test/phpunit/UserTest.php | 2 +- 63 files changed, 204 insertions(+), 204 deletions(-) diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php index fc593e826f2..4a8b8d584ab 100644 --- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php +++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php @@ -94,7 +94,7 @@ abstract class ActionsAdherentCardCommon /** * Load data control * - * @param string &$action Type of action + * @param string $action Type of action * @param int $id Id of object * @return void */ @@ -228,7 +228,7 @@ abstract class ActionsAdherentCardCommon /** * Set content of ->tpl array, to use into template * - * @param string &$action Type of action + * @param string $action Type of action * @param int $id Id * @return string HTML output */ diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php index b88e4b2134f..5c40cb22954 100644 --- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php +++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php @@ -76,7 +76,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon /** * Assign custom values for canvas * - * @param string &$action Type of action + * @param string $action Type of action * @param int $id Id * @return void */ diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 92b87d94ad1..41435afc84d 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -966,7 +966,7 @@ llxFooter(); * @param int $year Year * @param int $monthshown Current month shown in calendar view * @param string $style Style to use for this day - * @param array &$eventarray Array of events + * @param array $eventarray Array of events * @param int $maxprint Nb of actions to show each day on month view (0 means no limit) * @param int $maxnbofchar Nb of characters to show for event line * @param string $newparam Parameters on current URL diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 104277f4ed5..70431e0d39b 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -164,7 +164,7 @@ class BonPrelevement extends CommonObject /** * Add line to withdrawal * - * @param int &$line_id id line to add + * @param int $line_id id line to add * @param int $client_id id invoice customer * @param string $client_nom name of cliente * @param int $amount amount of invoice diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index a2612e51e47..50b45918f9c 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -94,7 +94,7 @@ abstract class ActionsContactCardCommon /** * Load data control * - * @param string &$action Type of action + * @param string $action Type of action * @param int $id Id of object * @return void */ @@ -228,7 +228,7 @@ abstract class ActionsContactCardCommon /** * Set content of ->tpl array, to use into template * - * @param string &$action Type of action + * @param string $action Type of action * @param int $id Id * @return string HTML output */ diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index b39114cb3f5..3bfcf347c3f 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -75,7 +75,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon /** * Assign custom values for canvas * - * @param string &$action Type of action + * @param string $action Type of action * @param int $id Id * @return void */ diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index f51056b2551..959decc581c 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -125,7 +125,7 @@ class Canvas /** * Shared method for canvas to assign values for templates * - * @param string &$action Action string + * @param string $action Action string * @param int $id Object id (if ref not provided) * @param string $ref Object ref (if id not provided) * @return void @@ -181,7 +181,7 @@ class Canvas /** * Shared method for canvas to execute actions * - * @param string &$action Action string + * @param string $action Action string * @param int $id Object id * @return mixed Return return code of doActions of canvas * @deprecated This function is called if you add a doActions class inside your canvas. Try to not diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 13757ef947a..7b1f9d59889 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1041,7 +1041,7 @@ class ExtraFields * Fill array_options property of object by extrafields value (using for data sent by forms) * * @param array $extralabels $array of extrafields - * @param object &$object Object + * @param object $object Object * @param string $onlykey Only following key is filled * @return int 1 if array_options set / 0 if no value */ diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 3afcd941ee9..9d8ce90e812 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -114,8 +114,8 @@ class HookManager * * @param string $method Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...) * @param array $parameters Array of parameters - * @param Object &$object Object to use hooks on - * @param string &$action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...) + * @param Object $object Object to use hooks on + * @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...) * @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO. * For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints. * Can also return some values into an array ->results. diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index fdd951293a6..ee28ec6a495 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1492,9 +1492,9 @@ class Form /** * constructProductListOption * - * @param resultset &$objp Resultset of fetch - * @param string &$opt Option - * @param string &$optJson Option + * @param resultset $objp Resultset of fetch + * @param string $opt Option + * @param string $optJson Option * @param int $price_level Price level * @param string $selected Preselected value * @return void @@ -4080,7 +4080,7 @@ class Form /** * Return HTML code to output a barcode * - * @param Object &$object Object containing data to retrieve file name + * @param Object $object Object containing data to retrieve file name * @param int $width Width of photo * @return string HTML code to output barcode */ diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index fe1cd8ddb6b..b5bd99495c9 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -462,7 +462,7 @@ class FormOther /** * Write lines of a project (all lines of a project if parent = 0) * - * @param int &$inc Cursor counter + * @param int $inc Cursor counter * @param int $parent Id of parent task we want to see * @param array $lines Array of task lines * @param int $level Level diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index 30eeca5a486..88abc140104 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -370,7 +370,7 @@ class Ldap * Ldap object connect and bind must have been done * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @param User $user Objet user that create * @return int <0 if KO, >0 if OK */ @@ -423,7 +423,7 @@ class Ldap * Ldap object connect and bind must have been done * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @param string $user Objet user that modify * @return int <0 if KO, >0 if OK */ @@ -475,7 +475,7 @@ class Ldap * Ldap object connect and bind must have been done * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @param User $user Objet user that update * @param string $olddn Old DN entry key (before update) * @return int <0 if KO, >0 if OK @@ -563,7 +563,7 @@ class Ldap * Build a LDAP message * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @return string Content of file */ function dump_content($dn, $info) @@ -605,7 +605,7 @@ class Ldap * Dump a LDAP message to ldapinput.in file * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @return int <0 if KO, >0 if OK */ function dump($dn, $info) @@ -642,7 +642,7 @@ class Ldap * Ldap object connect and bind must have been done * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @param User $user Objet user that create * @return int <0 if KO, >0 if OK */ @@ -694,7 +694,7 @@ class Ldap * Ldap object connect and bind must have been done * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @param User $user Objet user that create * @return int <0 if KO, >0 if OK */ @@ -746,7 +746,7 @@ class Ldap * Ldap object connect and bind must have been done * * @param string $dn DN entry key - * @param string[] $info Attributes array + * @param array $info Attributes array * @param User $user Objet user that create * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index 08d520d519e..02924d86668 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -234,7 +234,7 @@ class Link extends CommonObject /** * Loads all links from database * - * @param array &$links array of Link objects to fill + * @param array $links array of Link objects to fill * @param string $objecttype type of the associated object in dolibarr * @param int $objectid id of the associated object in dolibarr * @param string $sortfield field used to sort diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 966b9ac7f77..c04697acd39 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -380,7 +380,7 @@ class Menubase * @param string $myleftmenu Value for leftmenu to filter menu to load (always '') * @param int $type_user 0=Menu for backoffice, 1=Menu for front office * @param string $menu_handler Filter on name of menu_handler used (auguria, eldy...) - * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) + * @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) * @return array Return array with menu entries for top menu */ function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu) @@ -408,7 +408,7 @@ class Menubase * @param string $myleftmenu Value for leftmenu to filter menu to load (always '') * @param int $type_user 0=Menu for backoffice, 1=Menu for front office * @param string $menu_handler Filter on name of menu_handler used (auguria, eldy...) - * @param array &$tabMenu Array with menu entries already loaded + * @param array $tabMenu Array with menu entries already loaded * @return Menu Menu array for particular mainmenu value or full tabArray */ function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu) @@ -493,7 +493,7 @@ class Menubase * @param string $myleftmenu Value for left that defined leftmenu * @param int $type_user Looks for menu entry for 0=Internal users, 1=External users * @param string $menu_handler Name of menu_handler used ('auguria', 'eldy'...) - * @param array &$tabMenu Array to store new entries found (in most cases, it's empty, but may be alreay filled) + * @param array $tabMenu Array to store new entries found (in most cases, it's empty, but may be alreay filled) * @return int >0 if OK, <0 if KO */ function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu) diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index 80ca1b155b7..d9a7d8348d6 100644 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -258,7 +258,7 @@ class RssParser if (!is_resource($xmlparser)) { $this->error="ErrorFailedToCreateParser"; return -1; } - + xml_set_object($xmlparser, $this); xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element'); xml_set_character_data_handler($xmlparser, 'feed_cdata'); @@ -268,7 +268,7 @@ class RssParser //var_dump($rss->_format);exit; } } - + // If $rss loaded if ($rss) { @@ -452,7 +452,7 @@ class RssParser * * @param string $p Start * @param string $element Tag - * @param array &$attrs Attributes of tags + * @param array $attrs Attributes of tags * @return void */ function feed_start_element($p, $element, &$attrs) @@ -644,7 +644,7 @@ class RssParser /** * To concat 2 string with no warning if an operand is not defined * - * @param string &$str1 Str1 + * @param string $str1 Str1 * @param string $str2 Str2 * @return string String cancatenated */ diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index aa0792c5970..65b136a7a9c 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -17,8 +17,8 @@ */ /** - * \file htdocs/core/db/dolidb.class.php - * \brief Class file to manage Dolibarr database access + * \file htdocs/core/db/DoliDB.class.php + * \brief Class file to manage Dolibarr database access */ require_once DOL_DOCUMENT_ROOT .'/core/db/Database.interface.php'; diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index c389f442830..155415f59c3 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -853,17 +853,17 @@ function unActivateModule($value, $requiredby=1) /** * Add external modules to list of dictionaries * - * @param array &$taborder Taborder - * @param array &$tabname Tabname - * @param array &$tablib Tablib - * @param array &$tabsql Tabsql - * @param array &$tabsqlsort Tabsqlsort - * @param array &$tabfield Tabfield - * @param array &$tabfieldvalue Tabfieldvalue - * @param array &$tabfieldinsert Tabfieldinsert - * @param array &$tabrowid Tabrowid - * @param array &$tabcond Tabcond - * @param array &$tabhelp Tabhelp + * @param array $taborder Taborder + * @param array $tabname Tabname + * @param array $tablib Tablib + * @param array $tabsql Tabsql + * @param array $tabsqlsort Tabsqlsort + * @param array $tabfield Tabfield + * @param array $tabfieldvalue Tabfieldvalue + * @param array $tabfieldinsert Tabfieldinsert + * @param array $tabrowid Tabrowid + * @param array $tabcond Tabcond + * @param array $tabhelp Tabhelp * @return int 1 */ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index c90e58f556c..bcc6c165472 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -43,7 +43,7 @@ function dol_basename($pathfile) * @param string $types Can be "directories", "files", or "all" * @param int $recursive Determines whether subdirectories are searched * @param string $filter Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function - * @param string[] $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')) + * @param array $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')) * @param string $sortcriteria Sort criteria ("","fullname","name","date","size") * @param string $sortorder Sort order (SORT_ASC, SORT_DESC) * @param int $mode 0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only @@ -1289,7 +1289,7 @@ function dol_uncompress($inputfile,$outputdir) * * @param string $dir Directory to scan * @param string $regexfilter Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function - * @param string[] $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function + * @param array $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function * @param int $nohook Disable all hooks * @return string Full path to most recent file */ diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1450e2f100f..e238b1e5834 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3770,7 +3770,7 @@ function make_substitutions($chaine,$substitutionarray) /** * Complete the $substitutionarray with more entries * - * @param array &$substitutionarray Array substitution old value => new value value + * @param array $substitutionarray Array substitution old value => new value value * @param Translate $outputlangs If we want substitution from special constants, we provide a language * @param Object $object If we want substitution from special constants, we provide data in a source object * @param Mixed $parameters Add more parameters (useful to pass product lines) @@ -4109,7 +4109,7 @@ function dol_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0) * or descending output and uses optionally natural case insensitive sorting (which * can be optionally case sensitive as well). * - * @param array &$array Array to sort (array of array('key','otherkey1','otherkey2'...)) + * @param array $array Array to sort (array of array('key','otherkey1','otherkey2'...)) * @param string $index Key in array to use for sorting criteria * @param int $order Sort order * @param int $natsort 1=use "natural" sort (natsort), 0=use "standard" sort (asort) @@ -4330,8 +4330,8 @@ function picto_from_langcode($codelang) * @param Conf $conf Object conf * @param Translate $langs Object langs * @param Object $object Object object - * @param array &$head Object head - * @param int &$h New position to fill + * @param array $head Object head + * @param int $h New position to fill * @param string $type Value for object where objectvalue can be * 'thirdparty' to add a tab in third party view * 'intervention' to add a tab in intervention view diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 1c3953906a2..4127686b459 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1107,7 +1107,7 @@ function numero_semaine($time) * Convertit une masse d'une unite vers une autre unite * * @param float $weight Masse a convertir - * @param int &$from_unit Unite originale en puissance de 10 + * @param int $from_unit Unite originale en puissance de 10 * @param int $to_unit Nouvelle unite en puissance de 10 * @return float Masse convertie */ @@ -1142,7 +1142,7 @@ function weight_convert($weight,&$from_unit,$to_unit) * * @param DoliDB $db Handler database * @param Conf $conf Object conf - * @param User &$user Object user + * @param User $user Object user * @param array $tab Tableau (cle=>valeur) des parametres a sauvegarder * @return int <0 if KO, >0 if OK * diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index bcb1008b622..17c1185e2e0 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -420,7 +420,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target /** * Show header of page for PDF generation * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Translate $outputlangs Object lang for output * @param int $page_height Height of page * @return void @@ -441,7 +441,7 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height) /** * Add a draft watermark on PDF files * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Translate $outputlangs Object lang * @param int $h Height of PDF * @param int $w Width of PDF @@ -481,7 +481,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text) /** * Show bank informations for PDF generation * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Translate $outputlangs Object lang * @param int $curx X * @param int $cury Y @@ -643,7 +643,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default /** * Show footer of page for PDF generation * - * @param PDF &$pdf The PDF factory + * @param PDF $pdf The PDF factory * @param Translate $outputlangs Object lang for output * @param string $paramfreetext Constant name of free text * @param Societe $fromcompany Object company @@ -852,7 +852,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass /** * Show linked objects for PDF generation * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param object $object Object * @param Translate $outputlangs Object lang * @param int $posx X @@ -890,7 +890,7 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al /** * Output line description into PDF * - * @param PDF &$pdf PDF object + * @param PDF $pdf PDF object * @param Object $object Object * @param int $i Current line number * @param Translate $outputlangs Object lang for output @@ -1587,13 +1587,13 @@ function pdf_getLinkedObjects($object,$outputlangs) { $outputlangs->load('orders'); $outputlangs->load('sendings'); - + $num=count($objects); for ($i=0;$i<$num;$i++) { $objects[$i]->fetchObjectLinked(); $order = $objects[$i]->linkedObjects['commande'][0]; - + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending"); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : ''); $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($objects[$i]->ref); diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index bfe782c40f9..a564a312ac2 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -206,13 +206,13 @@ function project_admin_prepare_head() /** * Show task lines with a particular parent * - * @param string &$inc Counter that count number of lines legitimate to show (for return) + * @param string $inc Counter that count number of lines legitimate to show (for return) * @param int $parent Id of parent task to start - * @param array &$lines Array of all tasks - * @param int &$level Level of task + * @param array $lines Array of all tasks + * @param int $level Level of task * @param string $var Color * @param int $showproject Show project columns - * @param int &$taskrole Array of roles of user for each tasks + * @param int $taskrole Array of roles of user for each tasks * @param int $projectsListId List of id of project allowed to user (string separated with comma) * @param int $addordertick Add a tick to move task * @return void @@ -443,12 +443,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t /** * Output a task line * - * @param string &$inc ? + * @param string $inc ? * @param string $parent ? * @param Object $lines ? - * @param int &$level ? - * @param string &$projectsrole ? - * @param string &$tasksrole ? + * @param int $level ? + * @param string $projectsrole ? + * @param string $tasksrole ? * @param string $mine Show only task lines I am assigned to * @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to * @return $inc @@ -589,10 +589,10 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr /** * Search in task lines with a particular parent if there is a task for a particular user (in taskrole) * - * @param string &$inc Counter that count number of lines legitimate to show (for return) + * @param string $inc Counter that count number of lines legitimate to show (for return) * @param int $parent Id of parent task to start - * @param array &$lines Array of all tasks - * @param string &$taskrole Array of task filtered on a particular user + * @param array $lines Array of all tasks + * @param string $taskrole Array of task filtered on a particular user * @return int 1 if there is */ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole) diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php index 1bbf2e55e27..470da211f2e 100644 --- a/htdocs/core/lib/treeview.lib.php +++ b/htdocs/core/lib/treeview.lib.php @@ -28,7 +28,7 @@ /** * Show indent and picto of a tree line. Return array with information of line. * - * @param array &$fulltree Array of entries in correct order + * @param array $fulltree Array of entries in correct order * @param string $key Key of entry into fulltree to show picto * @param int $silent Do not output indent and picto, returns only value * @return array array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub) diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php index 1e7f4b4e522..533a13e1fb6 100644 --- a/htdocs/core/lib/ws.lib.php +++ b/htdocs/core/lib/ws.lib.php @@ -27,9 +27,9 @@ * Check authentication array and set error, errorcode, errorlabel * * @param array $authentication Array with authentication informations ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>) - * @param int &$error Number of errors - * @param string &$errorcode Error string code - * @param string &$errorlabel Error string label + * @param int $error Number of errors + * @param string $errorcode Error string code + * @param string $errorlabel Error string label * @return User Return user object identified by login/pass/entity into authentication array */ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 837403828ee..427a03d9929 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; * @param DoliDB $db Database handler * @param string $atarget Target * @param int $type_user 0=Menu for backoffice, 1=Menu for front office - * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) - * @param array &$menu Object Menu to return back list of menu entries + * @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) + * @param array $menu Object Menu to return back list of menu entries * @param int $noout Disable output (Initialise &$menu only). * @return int 0 */ @@ -203,8 +203,8 @@ function print_end_menu_array_auguria() * @param DoliDB $db Database handler * @param array $menu_array_before Table of menu entries to show before entries of menu handler * @param array $menu_array_after Table of menu entries to show after entries of menu handler - * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) - * @param Menu &$menu Object Menu to return back list of menu entries + * @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) + * @param Menu $menu Object Menu to return back list of menu entries * @param int $noout Disable output (Initialise &$menu only). * @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x' * @param string $forceleftmenu 'all'=Force leftmenu to '' (= all) @@ -402,8 +402,8 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM * Function to test if an entry is enabled or not * * @param string $type_user 0=We need backoffice menu, 1=We need frontoffice menu - * @param array &$menuentry Array for menu entry - * @param array &$listofmodulesforexternal Array with list of modules allowed to external users + * @param array $menuentry Array for menu entry + * @param array $listofmodulesforexternal Array with list of modules allowed to external users * @return int 0=Hide, 1=Show, 2=Show gray */ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexternal) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index ed255b5785f..b42fc258c6d 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; * @param DoliDB $db Database handler * @param string $atarget Target (Example: '' or '_top') * @param int $type_user 0=Menu for backoffice, 1=Menu for front office - * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) - * @param array &$menu Object Menu to return back list of menu entries + * @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) + * @param array $menu Object Menu to return back list of menu entries * @param int $noout Disable output (Initialise &$menu only). * @return int 0 */ @@ -428,8 +428,8 @@ function print_end_menu_array() * @param DoliDB $db Database handler * @param array $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add) * @param array $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add) - * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) - * @param Menu &$menu Object Menu to return back list of menu entries + * @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) + * @param Menu $menu Object Menu to return back list of menu entries * @param int $noout Disable output (Initialise &$menu only). * @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x' * @param string $forceleftmenu 'all'=Force leftmenu to '' (= all) @@ -1364,8 +1364,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu * Function to test if an entry is enabled or not * * @param string $type_user 0=We need backoffice menu, 1=We need frontoffice menu - * @param array &$menuentry Array for menu entry - * @param array &$listofmodulesforexternal Array with list of modules allowed to external users + * @param array $menuentry Array for menu entry + * @param array $listofmodulesforexternal Array with list of modules allowed to external users * @return int 0=Hide, 1=Show, 2=Show gray */ function dol_eldy_showmenu($type_user, &$menuentry, &$listofmodulesforexternal) diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php index b864205f2c9..cc3f2557db9 100644 --- a/htdocs/core/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -159,7 +159,7 @@ class CommActionRapport /** * Write content of pages * - * @param PDF &$pdf Object pdf + * @param PDF $pdf Object pdf * @param Translate $outputlangs Object langs * @return int 1 */ @@ -255,7 +255,7 @@ class CommActionRapport /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Translate $outputlangs Object lang for output * @param int $pagenb Page nb * @return void diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index e03bdc6d2e9..28fa03ee4f3 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/core/modules/product/mod_barcode_product_standard.php + * \file htdocs/core/modules/barcode/mod_barcode_product_standard.php * \ingroup barcode * \brief File of class to manage barcode numbering with standard rule */ @@ -162,7 +162,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode * Check validity of code according to its rules * * @param DoliDB $db Database handler - * @param string &$code Code to check/correct + * @param string $code Code to check/correct * @param Product $product Object product * @param int $thirdparty_type 0 = customer/prospect , 1 = supplier * @param string $type type of barcode (EAN, ISBN, ...) @@ -177,7 +177,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode global $conf; //var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit; - + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; $result=0; @@ -282,7 +282,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode { $newcodefortest=substr($newcodefortest,0,12); } - + $result=check_value($mask,$newcodefortest); return $result; diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php index 96214f08d66..04ba6a57174 100644 --- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php @@ -177,7 +177,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts /** * Generate Header * - * @param PDF &$pdf Pdf object + * @param PDF $pdf Pdf object * @param int $page Current page number * @param int $pages Total number of pages * @param Translate $outputlangs Object language for output @@ -283,7 +283,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts /** * Output array * - * @param PDF &$pdf PDF object + * @param PDF $pdf PDF object * @param int $pagenb Page nb * @param int $pages Pages * @param Translate $outputlangs Object lang @@ -341,7 +341,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 68266f2cef9..b3dd27a8a7a 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -533,7 +533,7 @@ class pdf_einstein extends ModelePDFCommandes /** * Show payments table * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object order * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output @@ -548,7 +548,7 @@ class pdf_einstein extends ModelePDFCommandes /** * Show miscellaneous information (payment mode, payment term, ...) * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object @@ -732,7 +732,7 @@ class pdf_einstein extends ModelePDFCommandes /** * Show total to pay * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Facture $object Object invoice * @param int $deja_regle Montant deja regle * @param int $posy Position depart @@ -989,7 +989,7 @@ class pdf_einstein extends ModelePDFCommandes /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -1084,7 +1084,7 @@ class pdf_einstein extends ModelePDFCommandes /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -1263,7 +1263,7 @@ class pdf_einstein extends ModelePDFCommandes /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php index eb599c2a214..49e3c374752 100644 --- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php @@ -532,7 +532,7 @@ class pdf_proforma extends ModelePDFCommandes /** * Show payments table * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object order * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output @@ -547,7 +547,7 @@ class pdf_proforma extends ModelePDFCommandes /** * Show miscellaneous information (payment mode, payment term, ...) * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object @@ -689,7 +689,7 @@ class pdf_proforma extends ModelePDFCommandes /** * Show total to pay * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Facture $object Object invoice * @param int $deja_regle Montant deja regle * @param int $posy Position depart @@ -946,7 +946,7 @@ class pdf_proforma extends ModelePDFCommandes /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -1041,7 +1041,7 @@ class pdf_proforma extends ModelePDFCommandes /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -1220,7 +1220,7 @@ class pdf_proforma extends ModelePDFCommandes /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index 5fc0eb6dd2a..238f51e78cd 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -357,7 +357,7 @@ class pdf_strato extends ModelePDFContract /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y @@ -423,7 +423,7 @@ class pdf_strato extends ModelePDFContract /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -602,7 +602,7 @@ class pdf_strato extends ModelePDFContract /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 5385d7ad0e6..14bc79bf935 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -73,7 +73,7 @@ class pdf_merou extends ModelePdfExpedition /** * Function to build pdf onto disk * - * @param Object &$object Object expedition to generate (or id if old method) + * @param Object $object Object expedition to generate (or id if old method) * @param Translate $outputlangs Lang output object * @param string $srctemplatepath Full path of source filename for generator using a template file * @param int $hidedetails Do not show line details @@ -353,7 +353,7 @@ class pdf_merou extends ModelePdfExpedition /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y @@ -394,7 +394,7 @@ class pdf_merou extends ModelePdfExpedition /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text @@ -423,7 +423,7 @@ class pdf_merou extends ModelePdfExpedition /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 6d0e44817a7..37e3f8b911f 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -76,7 +76,7 @@ class pdf_rouget extends ModelePdfExpedition /** * Function to build pdf onto disk * - * @param Object &$object Object expedition to generate (or id if old method) + * @param Object $object Object expedition to generate (or id if old method) * @param Translate $outputlangs Lang output object * @param string $srctemplatepath Full path of source filename for generator using a template file * @param int $hidedetails Do not show line details @@ -354,7 +354,7 @@ class pdf_rouget extends ModelePdfExpedition /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y @@ -409,7 +409,7 @@ class pdf_rouget extends ModelePdfExpedition /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -649,7 +649,7 @@ class pdf_rouget extends ModelePdfExpedition /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 9186e51b954..6b66d9d2df3 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -535,7 +535,7 @@ class pdf_crabe extends ModelePDFFactures /** * Show payments table * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object invoice * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output @@ -673,7 +673,7 @@ class pdf_crabe extends ModelePDFFactures /** * Show miscellaneous information (payment mode, payment term, ...) * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object @@ -829,7 +829,7 @@ class pdf_crabe extends ModelePDFFactures /** * Show total to pay * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Facture $object Object invoice * @param int $deja_regle Montant deja regle * @param int $posy Position depart @@ -1124,7 +1124,7 @@ class pdf_crabe extends ModelePDFFactures /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -1218,7 +1218,7 @@ class pdf_crabe extends ModelePDFFactures /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -1449,7 +1449,7 @@ class pdf_crabe extends ModelePDFFactures /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index f2055e8d643..c94cd154251 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -345,7 +345,7 @@ class pdf_soleil extends ModelePDFFicheinter /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y @@ -408,7 +408,7 @@ class pdf_soleil extends ModelePDFFicheinter /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -587,7 +587,7 @@ class pdf_soleil extends ModelePDFFicheinter /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index b13177f9127..3aae0e5a18e 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -540,7 +540,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder /** * Show miscellaneous information (payment mode, payment term, ...) * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object @@ -567,7 +567,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -626,7 +626,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -842,7 +842,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index 043a2e89f5c..cef4155c607 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -99,7 +99,7 @@ class pdf_standard * Methode qui permet de modifier la taille des caracteres * Cela modiera aussi l'espace entre chaque ligne * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param int $pt point * @return void */ @@ -118,7 +118,7 @@ class pdf_standard * - %LOGO% is replace with company logo * - %PHOTO% is replace with photo provided as parameter * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param string $textleft Text left * @param string $header Header * @param string $footer Footer @@ -300,7 +300,7 @@ class pdf_standard /** * Print dot line * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param int $x1 X1 * @param int $y1 Y1 * @param int $x2 X2 @@ -341,7 +341,7 @@ class pdf_standard /** * Fonction realisant une croix aux 4 coins des cartes * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param int $x1 X1 * @param int $y1 Y1 * @param int $x2 X2 @@ -412,7 +412,7 @@ class pdf_standard /** * Set format * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param string $format Format * @return void */ diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php index f8a99b99aab..5ecadcc9792 100644 --- a/htdocs/core/modules/modSalaries.class.php +++ b/htdocs/core/modules/modSalaries.class.php @@ -22,7 +22,7 @@ */ /** - * \defgroup tax Module salaries + * \defgroup salaries Module salaries * \brief Module to include salaries management * \file htdocs/core/modules/modSalaries.class.php * \ingroup salaries diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php index b6e35f95f8e..8ae45bdc681 100644 --- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php +++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php @@ -99,7 +99,7 @@ class pdf_standardlabel * Methode qui permet de modifier la taille des caracteres * Cela modiera aussi l'espace entre chaque ligne * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param int $pt point * @return void */ @@ -117,7 +117,7 @@ class pdf_standardlabel * - %LOGO% is replace with company logo * - %PHOTO% is replace with photo provided as parameter * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param string $textleft Text left * @param string $header Header * @param string $footer Footer @@ -292,7 +292,7 @@ class pdf_standardlabel /** * Print dot line * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param int $x1 X1 * @param int $y1 Y1 * @param int $x2 X2 @@ -333,7 +333,7 @@ class pdf_standardlabel /** * Fonction realisant une croix aux 4 coins des cartes * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param int $x1 X1 * @param int $y1 Y1 * @param int $x2 X2 @@ -404,7 +404,7 @@ class pdf_standardlabel /** * Set format * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param string $format Format * @return void */ diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 3ab5fdb9e09..37383474c2d 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -220,7 +220,7 @@ class mod_codeproduct_elephant extends ModeleProductCode * Check validity of code according to its rules * * @param DoliDB $db Database handler - * @param string &$code Code to check/correct + * @param string $code Code to check/correct * @param Product $product Object product * @param int $type 0 = customer/prospect , 1 = supplier * @return int 0 if OK diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php index df71792ee86..a3df52f682f 100644 --- a/htdocs/core/modules/product/mod_codeproduct_leopard.php +++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php @@ -91,7 +91,7 @@ class mod_codeproduct_leopard extends ModeleProductCode * Check validity of code according to its rules * * @param DoliDB $db Database handler - * @param string &$code Code to check/correct + * @param string $code Code to check/correct * @param Product $product Object product * @param int $type 0 = product , 1 = service * @return int 0 if OK diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php index c8cc0b65fbc..d8f2d744e78 100644 --- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php @@ -315,7 +315,7 @@ class pdf_baleine extends ModelePDFProjects /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y @@ -348,7 +348,7 @@ class pdf_baleine extends ModelePDFProjects /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -434,7 +434,7 @@ class pdf_baleine extends ModelePDFProjects /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index fe952fb9903..29fea0d9c1a 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -589,7 +589,7 @@ class pdf_azur extends ModelePDFPropales /** * Show payments table * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object proposal * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output @@ -604,7 +604,7 @@ class pdf_azur extends ModelePDFPropales /** * Show miscellaneous information (payment mode, payment term, ...) * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object @@ -779,7 +779,7 @@ class pdf_azur extends ModelePDFPropales /** * Show total to pay * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Facture $object Object invoice * @param int $deja_regle Montant deja regle * @param int $posy Position depart @@ -1050,7 +1050,7 @@ class pdf_azur extends ModelePDFPropales /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -1154,7 +1154,7 @@ class pdf_azur extends ModelePDFPropales /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -1354,7 +1354,7 @@ class pdf_azur extends ModelePDFPropales /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php index d0defd260dd..3bfb6f6b60c 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -95,7 +95,7 @@ class pdf_paiement $socid=0; if ($user->societe_id) $socid=$user->societe_id; - + if (! is_object($outputlangs)) $outputlangs=$langs; // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1'; @@ -141,7 +141,7 @@ class pdf_paiement $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."facture as f,"; $sql.= " ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf,"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; - if (! $user->rights->societe->client->voir && ! $socid) + if (! $user->rights->societe->client->voir && ! $socid) { $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; } @@ -149,7 +149,7 @@ class pdf_paiement $sql.= " AND f.entity = ".$conf->entity; $sql.= " AND p.fk_paiement = c.id "; $sql.= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'"; - if (! $user->rights->societe->client->voir && ! $socid) + if (! $user->rights->societe->client->voir && ! $socid) { $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; } @@ -237,7 +237,7 @@ class pdf_paiement /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param int $page Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -296,7 +296,7 @@ class pdf_paiement /** * Output body * - * @param PDF &$pdf PDF object + * @param PDF $pdf PDF object * @param string $page Page * @param array $lines Array of lines * @param Translate $outputlangs Object langs diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 94dd1b814e7..88b6e65bf01 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -239,7 +239,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode * Check validity of code according to its rules * * @param DoliDB $db Database handler - * @param string &$code Code to check/correct + * @param string $code Code to check/correct * @param Societe $soc Object third party * @param int $type 0 = customer/prospect , 1 = supplier * @return int 0 if OK diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 313a14ad246..27155847bf0 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -90,7 +90,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode * Check validity of code according to its rules * * @param DoliDB $db Database handler - * @param string &$code Code to check/correct + * @param string $code Code to check/correct * @param Societe $soc Object third party * @param int $type 0 = customer/prospect , 1 = supplier * @return int 0 if OK diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index 8b31e581e26..2933a09de8e 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -139,7 +139,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode $date = dol_now(); $yymm = strftime("%y%m",$date); - + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is else $num = sprintf("%04s",$max+1); @@ -152,7 +152,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode * Check validity of code according to its rules * * @param DoliDB $db Database handler - * @param string &$code Code to check/correct + * @param string $code Code to check/correct * @param Societe $soc Object third party * @param int $type 0 = customer/prospect , 1 = supplier * @return int 0 if OK diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index ead49d7de98..d3cf60295f6 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -494,7 +494,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices /** * Show total to pay * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Facture $object Object invoice * @param int $deja_regle Montant deja regle * @param int $posy Position depart @@ -689,7 +689,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -785,7 +785,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices /** * Show payments table * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object invoice * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output @@ -870,7 +870,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -1045,7 +1045,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index f15cab9cb6b..78a33f76a29 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -521,7 +521,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders /** * Show payments table * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object order * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output @@ -536,7 +536,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders /** * Show miscellaneous information (payment mode, payment term, ...) * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object @@ -599,7 +599,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders /** * Show total to pay * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Facture $object Object invoice * @param int $deja_regle Montant deja regle * @param int $posy Position depart @@ -802,7 +802,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders /** * Show table for lines * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -897,7 +897,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders /** * Show top header of page. * - * @param PDF &$pdf Object PDF + * @param PDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -1089,7 +1089,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders /** * Show footer of page. Need this->emetteur object * - * @param PDF &$pdf PDF + * @param PDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 41a82de36b1..f40bcd3e061 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1762,8 +1762,8 @@ function show_elem($fieldssource,$pos,$key,$var,$nostyle='') /** * Return not used field number * - * @param array &$fieldssource Array of field source - * @param array &$listofkey Array of keys + * @param array $fieldssource Array of field source + * @param array $listofkey Array of keys * @return void */ function getnewkey(&$fieldssource,&$listofkey) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 30837b590f8..419c737b270 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -110,7 +110,7 @@ function test_sql_and_script_inject($val, $type) /** * Security: Return true if OK, false otherwise. * - * @param string &$var Variable name + * @param string $var Variable name * @param string $type 1=GET, 0=POST, 2=PHP_SELF * @return boolean true if there is an injection */ diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index ddbd3c015ff..44c28f383b5 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -67,7 +67,7 @@ class ActionsCardProduct /** * Assign custom values for canvas (for example into this->tpl to be used by templates) * - * @param string &$action Type of action + * @param string $action Type of action * @param string $id Id of object * @param string $ref Ref of object * @return void diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index cee958be50f..cbb9e10750c 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -66,7 +66,7 @@ class ActionsCardService /** * Assign custom values for canvas (for example into this->tpl to be used by templates) * - * @param string &$action Type of action + * @param string $action Type of action * @param string $id Id of object * @param string $ref Ref of object * @return void diff --git a/htdocs/resource/class/actions_resource.class.php b/htdocs/resource/class/actions_resource.class.php index afcf9eb19b8..f8f0b5412f9 100644 --- a/htdocs/resource/class/actions_resource.class.php +++ b/htdocs/resource/class/actions_resource.class.php @@ -46,8 +46,8 @@ class ActionsResource * doActions for resource module * * @param array $parameters parameters - * @param Object &$object object - * @param string &$action action + * @param Object $object object + * @param string $action action * @return void */ /* Why a hook action ? TODO Remove this class and replace a method into commonobject diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 1ee163038bb..6f6cb067333 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -89,7 +89,7 @@ abstract class ActionsCardCommon /** * Load data control * - * @param int &$action Action code + * @param int $action Action code * @return void */ function doActions(&$action) @@ -354,7 +354,7 @@ abstract class ActionsCardCommon /** * Assign custom values for canvas (for example into this->tpl to be used by templates) * - * @param string &$action Type of action + * @param string $action Type of action * @param string $id Id of object * @param string $ref Ref of object * @return void diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php index a47b6321792..d54af2b8bba 100644 --- a/htdocs/societe/canvas/company/actions_card_company.class.php +++ b/htdocs/societe/canvas/company/actions_card_company.class.php @@ -75,7 +75,7 @@ class ActionsCardCompany extends ActionsCardCommon /** * Execute actions * - * @param string &$action Type of action + * @param string $action Type of action * @param int $id Id of object * @return int <0 if KO, >0 if OK */ @@ -91,7 +91,7 @@ class ActionsCardCompany extends ActionsCardCommon /** * Assign custom values for canvas (for example into this->tpl to be used by templates) * - * @param string &$action Type of action + * @param string $action Type of action * @param string $id Id of object * @param string $ref Ref of object * @return void diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php index b8cb94a820b..2f00cd4bc27 100644 --- a/htdocs/societe/canvas/individual/actions_card_individual.class.php +++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php @@ -75,7 +75,7 @@ class ActionsCardIndividual extends ActionsCardCommon /** * Execute actions * - * @param string &$action Action + * @param string $action Action * @param int $id Id of object (may be empty for creation) * @return int <0 if KO, >0 if OK */ @@ -91,7 +91,7 @@ class ActionsCardIndividual extends ActionsCardCommon /** * Assign custom values for canvas (for example into this->tpl to be used by templates) * - * @param string &$action Type of action + * @param string $action Type of action * @param string $id Id of object * @param string $ref Ref of object * @return void diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 5893fbab021..b97103458c3 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -133,17 +133,17 @@ class Societe extends CommonObject var $barcode_type; /** * code (loaded by fetch_barcode) - * @var + * @var string */ var $barcode_type_code; /** * label (loaded by fetch_barcode) - * @var + * @var string */ var $barcode_type_label; /** * coder (loaded by fetch_barcode) - * @var + * @var string */ var $barcode_type_coder; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index df36812cce8..6f59ac5eadf 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2118,7 +2118,7 @@ class User extends CommonObject /** * Update user using data from the LDAP * - * @param ldapuser &$ldapuser Ladp User + * @param ldapuser $ldapuser Ladp User * * @return int <0 if KO, >0 if OK */ @@ -2237,7 +2237,7 @@ class User extends CommonObject // Init this->parentof that is array(id_son=>id_parent, ...) $this->load_parentof(); - + // Init $this->users array $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.login, u.statut, u.entity"; // Distinct reduce pb with old tables with duplicates $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php index 4adace8ef9a..7b5caffc2df 100644 --- a/test/phpunit/FactureRecTest.php +++ b/test/phpunit/FactureRecTest.php @@ -131,7 +131,7 @@ class FactureRecTest extends PHPUnit_Framework_TestCase $localobjectinv=new Facture($this->savdb); $localobjectinv->initAsSpecimen(); $localobjectinv->create($user); - + $localobject=new FactureRec($this->savdb); $localobject->initAsSpecimen(); $result=$localobject->create($user, $localobjectinv->id); @@ -141,15 +141,15 @@ class FactureRecTest extends PHPUnit_Framework_TestCase return $result; } - - - - - + + + + + /** * Edit an object to test updates * - * @param mixed &$localobject Object Facture + * @param mixed $localobject Object Facture * @return void */ public function changeProperties(&$localobject) diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php index 9551c6ce02e..cc54953875c 100644 --- a/test/phpunit/FactureTest.php +++ b/test/phpunit/FactureTest.php @@ -282,7 +282,7 @@ class FactureTest extends PHPUnit_Framework_TestCase /** * Edit an object to test updates * - * @param mixed &$localobject Object Facture + * @param mixed $localobject Object Facture * @return void */ public function changeProperties(&$localobject) diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php index d161b3ce395..ef103eb1a46 100644 --- a/test/phpunit/UserTest.php +++ b/test/phpunit/UserTest.php @@ -272,7 +272,7 @@ class UserTest extends PHPUnit_Framework_TestCase /** * Edit an object to test updates * - * @param mixed &$localobject Object Facture + * @param mixed $localobject Object Facture * @return void */ public function changeProperties(&$localobject) From 5fdd798e9128e0b0ffdf165b6acf059a71164b7d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Sep 2014 17:13:15 +0200 Subject: [PATCH 0099/1190] Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on parameter). --- htdocs/admin/commande.php | 1 - htdocs/admin/menus/other.php | 1 - htdocs/admin/stock.php | 6 ++--- htdocs/admin/system/database.php | 7 +++--- htdocs/admin/system/dbtable.php | 1 - htdocs/admin/system/dolibarr.php | 1 - htdocs/admin/system/index.php | 2 -- htdocs/admin/tools/eaccelerator.php | 1 - htdocs/admin/tools/purge.php | 1 - htdocs/admin/tools/update.php | 1 - htdocs/admin/translation.php | 1 - htdocs/admin/workflow.php | 1 - htdocs/cashdesk/affIndex.php | 1 - htdocs/cashdesk/facturation.php | 2 -- htdocs/cashdesk/tpl/menu.tpl.php | 1 - htdocs/categories/viewcat.php | 1 - htdocs/comm/action/class/actioncomm.class.php | 1 - htdocs/comm/fiche.php | 7 +++--- htdocs/commande/customer.php | 8 +++---- htdocs/compta/facture/apercu.php | 1 - htdocs/core/actions_sendmails.inc.php | 2 -- htdocs/core/actions_setnotes.inc.php | 2 -- htdocs/core/class/dolprintipp.class.php | 1 - htdocs/core/lib/holiday.lib.php | 1 - htdocs/core/lib/product.lib.php | 2 -- htdocs/core/lib/trip.lib.php | 4 +--- htdocs/core/lib/usergroups.lib.php | 1 - htdocs/core/login/functions_empty.php | 2 -- htdocs/core/login/functions_forceuser.php | 3 --- htdocs/core/login/functions_http.php | 3 --- htdocs/core/login/functions_ldap.php | 2 -- htdocs/core/login/functions_openid.php | 2 -- htdocs/core/menus/standard/auguria.lib.php | 2 -- .../core/modules/propale/modules_propale.php | 1 - htdocs/fichinter/document.php | 2 +- htdocs/holiday/define_holiday.php | 3 ++- htdocs/langs/en_US/compta.lang | 2 +- htdocs/livraison/class/livraison.class.php | 2 -- htdocs/opensurvey/fonctions.php | 23 +++++++++---------- htdocs/opensurvey/results.php | 1 - htdocs/printipp/admin/printipp.php | 8 +++---- htdocs/societe/ajaxcompanies.php | 2 -- .../canvas/actions_card_common.class.php | 1 - test/phpunit/CommandeFournisseurTest.php | 1 - test/phpunit/CommandeTest.php | 1 - test/phpunit/CommonObjectTest.php | 1 - test/phpunit/CompanyBankAccountTest.php | 2 +- test/phpunit/EntrepotTest.php | 1 - test/phpunit/ExportTest.php | 2 +- test/phpunit/FactureRecTest.php | 1 - test/phpunit/FactureTest.php | 2 +- test/phpunit/FunctionsLibTest.php | 2 +- test/phpunit/PropalTest.php | 2 +- test/phpunit/SocieteTest.php | 2 +- test/phpunit/UserTest.php | 1 - test/phpunit/WebservicesInvoicesTest.php | 2 +- test/phpunit/WebservicesThirdpartyTest.php | 2 +- 57 files changed, 42 insertions(+), 98 deletions(-) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 6736f9d2279..1d05efa8e99 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -534,4 +534,3 @@ print '
'; llxFooter(); $db->close(); -?> diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 0ec3119c097..36733add335 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -143,4 +143,3 @@ print '
'; print $langs->trans('Project'); print '
'.$module->nom."\n"; print $module->info(); @@ -372,78 +401,99 @@ foreach ($dirmodels as $reldir) $handle=opendir($dir); if (is_resource($handle)) { - while (($file = readdir($handle))!==false) - { - if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_') + while (($file = readdir($handle))!==false) + { + $filelist[]=$file; + } + closedir($handle); + arsort($filelist); + + foreach($filelist as $file) + { + if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file)) { - $var=!$var; - - $name = substr($file, 4, dol_strlen($file) -16); - $classname = substr($file, 0, dol_strlen($file) -12); - - require_once $dir.'/'.$file; - $module = new $classname($db); - - print '
'; - print (empty($module->name)?$name:$module->name); - print "\n"; - require_once $dir.$file; - $module = new $classname($db); - print $module->description; - print '\n"; - print 'scandir.'&label='.urlencode($module->name).'">'; - print img_picto($langs->trans("Enabled"),'switch_on'); - print ''; - print "\n"; - print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; - print ""; - if ($conf->global->FICHEINTER_ADDON_PDF == "$name") - { - print img_picto($langs->trans("Default"),'on'); - } - else - { - print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; - } - print ''; - print $form->textwithpicto('',$htmltooltip,-1,0); - print ''; - print $link; - print '
'; + print (empty($module->name)?$name:$module->name); + print "\n"; + if (method_exists($module,'info')) print $module->info($langs); + else print $module->description; + print '\n"; + print 'scandir.'&label='.urlencode($module->name).'">'; + print img_picto($langs->trans("Enabled"),'switch_on'); + print ''; + print "\n"; + print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; + print ""; + if ($conf->global->FICHEINTER_ADDON_PDF == "$name") + { + print img_picto($langs->trans("Default"),'on'); + } + else + { + print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; + } + print ''; + print $form->textwithpicto('',$htmltooltip,-1,0); + print ''; + if ($module->type == 'pdf') + { + print ''.img_object($langs->trans("Preview"),'intervention').''; + } + else + { + print img_object($langs->trans("PreviewNotAvailable"),'generic'); + } + print '
'; - print $name; - print "\n"; - require_once $dir.$file; - $module = new $classname($db); + require_once $dir.'/'.$file; + $module = new $classname($db); - print $module->description; - print '\n"; - print 'scandir.'&label='.urlencode($module->name).'">'; - print img_picto($langs->trans("Enabled"),'switch_on'); - print ''; - print "\n"; - print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; - print "
'; + print (empty($module->name)?$name:$module->name); + print "\n"; + if (method_exists($module,'info')) print $module->info($langs); + else print $module->description; + print '"; - if ($conf->global->LIVRAISON_ADDON_PDF == "$name") - { - print img_picto($langs->trans("Default"),'on'); - } - else - { - print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; - } - print '\n"; + print 'scandir.'&label='.urlencode($module->name).'">'; + print img_picto($langs->trans("Enabled"),'switch_on'); + print ''; + print "\n"; + print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; + print "'; - print $form->textwithpicto('',$htmltooltip,1,0); - print ''; - print ''.img_object($langs->trans("Preview"),'sending').''; - print '"; + if ($conf->global->LIVRAISON_ADDON_PDF == "$name") + { + print img_picto($langs->trans("Default"),'on'); + } + else + { + print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; + } + print '
'; + print $form->textwithpicto('',$htmltooltip,1,0); + print ''; + if ($module->type == 'pdf') + { + print ''.img_object($langs->trans("Preview"),'sending').''; + } + else + { + print img_object($langs->trans("PreviewNotAvailable"),'generic'); + } + print '
' . $username->getNomUrl(1). '
'; // Convert date into timestamp format - if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) { - $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]); + if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) + { + $value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]); } - if ($action == 'edit_extras' && $user->rights->commande->creer && GETPOST('attribute') == $key) { + if ($action == 'edit_extras' && $user->rights->commande->creer && GETPOST('attribute') == $key) + { print ''; print ''; print ''; @@ -2154,7 +2164,9 @@ if ($action == 'create' && $user->rights->commande->creer) { print ''; print ''; - } else { + } + else + { print $extrafields->showOutputField($key, $value); if ($object->statut == 0 && $user->rights->commande->creer) print '' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . ''; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index ba3cb7e9de0..72cc500e187 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1188,19 +1188,20 @@ if ($action=="create") } elseif (! empty($object->id)) { - $author = new User($db); - $author->fetch($object->user_author_id); - $societe = new Fournisseur($db); $result=$societe->fetch($object->socid); if ($result < 0) dol_print_error($db); + $author = new User($db); + $author->fetch($object->user_author_id); + + $res=$object->fetch_optionals($object->id,$extralabels); + $head = ordersupplier_prepare_head($object); $title=$langs->trans("SupplierOrder"); dol_fiche_head($head, 'card', $title, 0, 'order'); - $res=$object->fetch_optionals($object->id,$extralabels); /* * Confirmation de la suppression de la commande @@ -1482,24 +1483,19 @@ elseif (! empty($object->id)) print '
'; llxFooter(); $db->close(); -?> \ No newline at end of file diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 9b80662c180..3cc9e70ca31 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -77,7 +77,7 @@ if($action) if($action == 'STOCK_USE_VIRTUAL_STOCK') { $res = dolibarr_set_const($db, "STOCK_USE_VIRTUAL_STOCK", GETPOST('STOCK_USE_VIRTUAL_STOCK','alpha'),'chaine',0,'',$conf->entity); } - + if($action == 'STOCK_MUST_BE_ENOUGH_FOR_INVOICE') { $res = dolibarr_set_const($db, "STOCK_MUST_BE_ENOUGH_FOR_INVOICE", GETPOST('STOCK_MUST_BE_ENOUGH_FOR_INVOICE','alpha'),'chaine',0,'',$conf->entity); } @@ -329,7 +329,7 @@ if ($virtualdiffersfromphysical) print '
'; } -$db->close(); llxFooter(); -?> + +$db->close(); diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index f32122df7b9..d9833a13d01 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -81,7 +81,7 @@ else print '		'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; llxFooter(); $db->close(); -?> diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 640d5138362..1f95dce57cf 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -118,5 +118,3 @@ print info_admin($langs->trans("SystemInfoDesc")).'
'; llxFooter(); $db->close(); - -?> diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index a3f046f4510..8f82f33d039 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -350,4 +350,3 @@ print "

"; llxFooter(); $db->close(); -?> diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index cac0bce888c..30c7ba4dd43 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -166,4 +166,3 @@ if (preg_match('/^confirm/i',$choice)) llxFooter(); $db->close(); -?> \ No newline at end of file diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index e449d265fa3..8b0b105d0f0 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -174,4 +174,3 @@ if (! empty($result['return'])) llxFooter(); $db->close(); -?> \ No newline at end of file diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 8e5370a957e..66bc4fb22ba 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -69,4 +69,3 @@ print $langs->trans("SeeAlso").': '."\n"; -?> \ No newline at end of file diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php index 4d442c0dbd3..32411f627fb 100644 --- a/htdocs/cashdesk/facturation.php +++ b/htdocs/cashdesk/facturation.php @@ -191,5 +191,3 @@ $obj_facturation->paiementLe('RESET'); // Affichage des templates require ('tpl/facturation1.tpl.php'); - -?> diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 59800fb57c1..4ee52ce0da6 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -78,4 +78,3 @@ if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled) } print ''; print ''; -?> \ No newline at end of file diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index bec834e1ff9..010306d1e00 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -520,4 +520,3 @@ if($object->type == 4) llxFooter(); $db->close(); -?> \ No newline at end of file diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index e41e556f3d9..9919dc21e80 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1071,4 +1071,3 @@ class ActionComm extends CommonObject } -?> diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 7a79b658a76..7ba1cc8bc48 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -821,11 +821,11 @@ if ($id > 0) /* * Barre d'actions */ - + $parameters = array(); $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been - - + + print '
'; if (! empty($conf->propal->enabled) && $user->rights->propal->creer) @@ -933,4 +933,3 @@ dol_htmloutput_mesg('',$mesgs); // End of page llxFooter(); $db->close(); -?> diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 373775a0da0..29812903d12 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -156,7 +156,7 @@ if ($resql) print "
'; - + $result=''; $lien=$lienfin=''; $lien = ''; @@ -164,7 +164,7 @@ if ($resql) $name=$obj->nom; $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin); $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin; - + print $result; print ''.$obj->town.' 
'; } -?> diff --git a/htdocs/core/login/functions_empty.php b/htdocs/core/login/functions_empty.php index c96a5023d4d..e4379ee2c3a 100644 --- a/htdocs/core/login/functions_empty.php +++ b/htdocs/core/login/functions_empty.php @@ -39,5 +39,3 @@ function check_user_password_empty($usertotest,$passwordtotest,$entitytotest) return $login; } - -?> \ No newline at end of file diff --git a/htdocs/core/login/functions_forceuser.php b/htdocs/core/login/functions_forceuser.php index e74a253550a..94201c74ad0 100644 --- a/htdocs/core/login/functions_forceuser.php +++ b/htdocs/core/login/functions_forceuser.php @@ -46,6 +46,3 @@ function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest return $login; } - - -?> \ No newline at end of file diff --git a/htdocs/core/login/functions_http.php b/htdocs/core/login/functions_http.php index b224b27f15b..285ebebbabf 100644 --- a/htdocs/core/login/functions_http.php +++ b/htdocs/core/login/functions_http.php @@ -43,6 +43,3 @@ function check_user_password_http($usertotest,$passwordtotest,$entitytotest) return $login; } - - -?> \ No newline at end of file diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index 403530ac80b..88a5f55de19 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -227,5 +227,3 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) return $login; } - -?> diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php index e183bc40795..2470567d596 100644 --- a/htdocs/core/login/functions_openid.php +++ b/htdocs/core/login/functions_openid.php @@ -112,5 +112,3 @@ function check_user_password_openid($usertotest,$passwordtotest,$entitytotest) return $login; } - -?> \ No newline at end of file diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 427a03d9929..e8d71496820 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -430,5 +430,3 @@ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexterna if (! $menuentry['perms']) return 2; // No permissions and user is external return 1; } - -?> diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index 289862c8523..8e45f3b86f2 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -253,4 +253,3 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, } } -?> diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 54728df36d9..fd039efff24 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -131,7 +131,7 @@ else print $langs->trans("ErrorUnknown"); } + llxFooter(); $db->close(); -?> diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 4e1540c99e5..c432d37007b 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -190,7 +190,8 @@ print ''; dol_fiche_end(); + llxFooter(); $db->close(); -?> + diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 281ee374343..e0931bf5812 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -167,7 +167,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index dd5ebf38573..65213cea647 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -968,5 +968,3 @@ class LivraisonLigne } } - -?> diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php index c3c80a59b86..b2077c05bbf 100644 --- a/htdocs/opensurvey/fonctions.php +++ b/htdocs/opensurvey/fonctions.php @@ -25,14 +25,14 @@ /** * Returns an array with the tabs for the "Opensurvey poll" section * It loads tabs from modules looking for the entity Opensurveyso - * + * * @param Opensurveysondage $object Current viewing poll * @return array Tabs for the opensurvey section */ function opensurvey_prepare_head(Opensurveysondage $object) { - + global $langs, $conf; - + $h = 0; $head = array(); @@ -40,7 +40,7 @@ function opensurvey_prepare_head(Opensurveysondage $object) { $head[0][1] = $langs->trans("Card"); $head[0][2] = 'general'; $h++; - + $head[1][0] = 'results.php?id='.$object->id_sondage; $head[1][1] = $langs->trans("SurveyResults"); $head[1][2] = 'preview'; @@ -111,12 +111,12 @@ function showlogo() $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file=thumbs/'.urlencode($mysoc->logo_small); } } - + if (!$urllogo && (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))) { $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; } - + print '
Logo
'; print '
'; } @@ -205,14 +205,14 @@ function dol_survey_random($car) function ajouter_sondage() { global $db, $user; - + require_once DOL_DOCUMENT_ROOT.'/opensurvey/class/opensurveysondage.class.php'; $sondage=dol_survey_random(16); $allow_comments = empty($_SESSION['allow_comments']) ? 0 : 1; $allow_spy = empty($_SESSION['allow_spy']) ? 0 : 1; - + // Insert survey $opensurveysondage = new Opensurveysondage($db); $opensurveysondage->id_sondage = $sondage; @@ -226,9 +226,9 @@ function ajouter_sondage() $opensurveysondage->allow_comments = $allow_comments; $opensurveysondage->allow_spy = $allow_spy; $opensurveysondage->sujet = $_SESSION['toutchoix']; - + $res = $opensurveysondage->create($user); - + if ($res < 0) { dol_print_error($db); } @@ -243,11 +243,10 @@ function ajouter_sondage() unset($_SESSION['toutchoix']); unset($_SESSION['totalchoixjour']); unset($_SESSION['champdatefin']); - + $urlback=dol_buildpath('/opensurvey/card.php',1).'?id='.$sondage; header("Location: ".$urlback); exit(); } -?> diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index 00daab24b27..c5baba61242 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -1083,4 +1083,3 @@ print ''."\n"; llxFooterSurvey(); $db->close(); -?> diff --git a/htdocs/printipp/admin/printipp.php b/htdocs/printipp/admin/printipp.php index 08202b38f8e..6aaf44f8bdd 100644 --- a/htdocs/printipp/admin/printipp.php +++ b/htdocs/printipp/admin/printipp.php @@ -149,7 +149,7 @@ if ($mode == 'config' && $user->admin) print $langs->trans("PRINTIPP_PASSWORD").'
'; print ''; print '
'.$langs->trans("OtherParameter").'MediaSupported
'; - + if (count($list) == 0) print $langs->trans("NoPrinterFound"); } dol_fiche_end(); + llxFooter(); $db->close(); -?> diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php index 32fbe2e2c00..de116453cf2 100644 --- a/htdocs/societe/ajaxcompanies.php +++ b/htdocs/societe/ajaxcompanies.php @@ -110,5 +110,3 @@ else { echo json_encode(array('nom'=>'ErrorBadParameter','label'=>'ErrorBadParameter','key'=>'ErrorBadParameter','value'=>'ErrorBadParameter')); } - -?> \ No newline at end of file diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 6f6cb067333..39f0dc761f8 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -706,4 +706,3 @@ abstract class ActionsCardCommon } -?> diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php index 2c83b4fdfc3..90c0d10e3fb 100644 --- a/test/phpunit/CommandeFournisseurTest.php +++ b/test/phpunit/CommandeFournisseurTest.php @@ -338,4 +338,3 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase } } -?> \ No newline at end of file diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php index 451e886a761..8a2e3f57120 100644 --- a/test/phpunit/CommandeTest.php +++ b/test/phpunit/CommandeTest.php @@ -265,4 +265,3 @@ class CommandeTest extends PHPUnit_Framework_TestCase } } -?> \ No newline at end of file diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php index cbdde31e14d..a22146dfc2a 100644 --- a/test/phpunit/CommonObjectTest.php +++ b/test/phpunit/CommonObjectTest.php @@ -183,4 +183,3 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase return $result; } } -?> \ No newline at end of file diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php index 24d6ad03d80..693282e62c4 100644 --- a/test/phpunit/CompanyBankAccountTest.php +++ b/test/phpunit/CompanyBankAccountTest.php @@ -233,4 +233,4 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase } } -?> + diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php index efd5f54008f..53788d71dab 100755 --- a/test/phpunit/EntrepotTest.php +++ b/test/phpunit/EntrepotTest.php @@ -257,4 +257,3 @@ class EntrepotTest extends PHPUnit_Framework_TestCase return; } } -?> \ No newline at end of file diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index d5938fc4691..641fe3b7f9e 100755 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -265,4 +265,4 @@ class ExportTest extends PHPUnit_Framework_TestCase return true; } } -?> + diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php index 7b5caffc2df..4d4783240fa 100644 --- a/test/phpunit/FactureRecTest.php +++ b/test/phpunit/FactureRecTest.php @@ -196,4 +196,3 @@ class FactureRecTest extends PHPUnit_Framework_TestCase return $retAr; } } -?> \ No newline at end of file diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php index cc54953875c..2227559ffd3 100644 --- a/test/phpunit/FactureTest.php +++ b/test/phpunit/FactureTest.php @@ -329,4 +329,4 @@ class FactureTest extends PHPUnit_Framework_TestCase return $retAr; } } -?> + diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index dbb3f6d8b8d..78c2278ba69 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -799,4 +799,4 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase } } -?> + diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php index 3cac847a01f..089b279f75c 100644 --- a/test/phpunit/PropalTest.php +++ b/test/phpunit/PropalTest.php @@ -265,4 +265,4 @@ class PropalTest extends PHPUnit_Framework_TestCase } } -?> + diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php index 162248f2e98..97aa0f0a954 100755 --- a/test/phpunit/SocieteTest.php +++ b/test/phpunit/SocieteTest.php @@ -456,4 +456,4 @@ class SocieteTest extends PHPUnit_Framework_TestCase } } -?> + diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php index ef103eb1a46..e0eaa03acec 100644 --- a/test/phpunit/UserTest.php +++ b/test/phpunit/UserTest.php @@ -318,4 +318,3 @@ class UserTest extends PHPUnit_Framework_TestCase return $retAr; } } -?> \ No newline at end of file diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php index 12c01eeba70..85c2398c568 100755 --- a/test/phpunit/WebservicesInvoicesTest.php +++ b/test/phpunit/WebservicesInvoicesTest.php @@ -181,4 +181,4 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase } } -?> + diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php index 8ef0c383955..bf7cdc357c0 100755 --- a/test/phpunit/WebservicesThirdpartyTest.php +++ b/test/phpunit/WebservicesThirdpartyTest.php @@ -181,4 +181,4 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase } } -?> + From 4244979f4f55a9d29ac28eb260260c14cb865c37 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Sep 2014 02:46:20 +0200 Subject: [PATCH 0100/1190] Fix: doxygen Fix: td balance --- htdocs/comm/action/peruser.php | 2 +- htdocs/core/lib/admin.lib.php | 9 +++++---- htdocs/core/modules/contract/mod_contract_olive.php | 6 +++--- htdocs/fichinter/card.php | 9 ++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index b85ac59c9a7..d66765b139b 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -702,7 +702,7 @@ $db->close(); * @param int $year Year * @param int $monthshown Current month shown in calendar view * @param string $style Style to use for this day - * @param array &$eventarray Array of events + * @param array $eventarray Array of events * @param int $maxprint Nb of actions to show each day on month view (0 means no limit) * @param int $maxnbofchar Nb of characters to show for event line * @param string $newparam Parameters on current URL diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 370b3ff53eb..a3cf6acca32 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -853,15 +853,16 @@ function unActivateModule($value, $requiredby=1) * * @param array $taborder Taborder * @param array $tabname Tabname - * @param array $tablib Tablib - * @param array $tabsql Tabsql - * @param array $tabsqlsort Tabsqlsort + * @param array $tablib Tablib + * @param array $tabsql Tabsql + * @param array $tabsqlsort Tabsqlsort * @param array $tabfield Tabfield * @param array $tabfieldvalue Tabfieldvalue - * @param array $tabfieldinsert Tabfieldinsert + * @param array $tabfieldinsert Tabfieldinsert * @param array $tabrowid Tabrowid * @param array $tabcond Tabcond * @param array $tabhelp Tabhelp + * @param array $tabfieldcheck Tabfieldcheck * @return int 1 */ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp,&$tabfieldcheck) diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php index 2b10d520b25..6d22aebeb3d 100644 --- a/htdocs/core/modules/contract/mod_contract_olive.php +++ b/htdocs/core/modules/contract/mod_contract_olive.php @@ -43,7 +43,7 @@ class mod_contract_olive extends ModelNumRefContracts var $code_auto = 0; // Numerotation automatique - /** + /** * Return description of module * * @return string Description of module @@ -51,7 +51,7 @@ class mod_contract_olive extends ModelNumRefContracts function info() { global $langs; - + $langs->load("companies"); return $langs->trans("LeopardNumRefModelDesc"); } @@ -74,7 +74,7 @@ class mod_contract_olive extends ModelNumRefContracts * Check validity of code according to its rules * * @param DoliDB $db Database handler - * @param string &$code Code to check/correct + * @param string $code Code to check/correct * @param Product $product Object product * @param int $type 0 = product , 1 = service * @return int 0 if OK diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 1ade8eddf13..e5d4aa96856 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1216,7 +1216,6 @@ else if ($id > 0 || ! empty($ref)) print ''; if ($action == 'edit_extras') print ''; if ($action == 'contrat') print ''; - print ''; print ''; @@ -1224,18 +1223,18 @@ else if ($id > 0 || ! empty($ref)) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; // Third party - print ""; + print ""; if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) { // Duration print ''; - print ''; + print ''; print ''; } @@ -1326,7 +1325,7 @@ else if ($id > 0 || ! empty($ref)) } // Statut - print ''; + print ''; // Other attributes (TODO Move this into an include) $parameters=array('colspan' => ' colspan="3"'); From ec95aacd52f3e310b053a12b2b2a8f6e2c3556ad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Sep 2014 03:41:32 +0200 Subject: [PATCH 0101/1190] Uniformize code for error reporting after a hook. --- dev/skeletons/skeleton_page.php | 18 ++++++++------- htdocs/adherents/card.php | 1 + htdocs/categories/categorie.php | 2 +- htdocs/comm/card.php | 1 + htdocs/comm/list.php | 3 ++- htdocs/comm/mailing/card.php | 1 + htdocs/comm/propal.php | 4 ++-- htdocs/comm/propal/list.php | 1 + htdocs/comm/prospect/list.php | 1 + htdocs/commande/card.php | 1 + htdocs/commande/list.php | 3 ++- htdocs/compta/facture.php | 1 + htdocs/compta/facture/list.php | 1 + htdocs/compta/paiement.php | 3 +++ htdocs/contact/card.php | 14 +++++------ htdocs/expedition/card.php | 1 + htdocs/fichinter/card.php | 5 +++- htdocs/fourn/card.php | 1 + htdocs/fourn/commande/card.php | 1 + htdocs/fourn/facture/card.php | 1 + htdocs/fourn/facture/paiement.php | 3 +++ htdocs/fourn/list.php | 1 + htdocs/product/card.php | 2 +- htdocs/product/document.php | 3 ++- htdocs/product/fournisseurs.php | 8 ++----- htdocs/product/stats/commande.php | 7 +++--- htdocs/product/stats/commande_fournisseur.php | 11 +++++---- htdocs/product/stats/contrat.php | 3 ++- htdocs/product/stats/facture.php | 6 +++-- htdocs/product/stats/facture_fournisseur.php | 8 +++---- htdocs/product/stats/propal.php | 7 +++--- htdocs/projet/card.php | 2 +- htdocs/resource/card.php | 19 +++++++-------- htdocs/resource/element_resource.php | 3 ++- htdocs/resource/list.php | 23 +++++++++++-------- htdocs/societe/agenda.php | 3 +-- htdocs/societe/commerciaux.php | 6 ++--- htdocs/societe/info.php | 2 +- htdocs/societe/soc.php | 2 +- 39 files changed, 108 insertions(+), 75 deletions(-) diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php index 67d6298863a..deaecd95526 100644 --- a/dev/skeletons/skeleton_page.php +++ b/dev/skeletons/skeleton_page.php @@ -114,8 +114,8 @@ if ($action == 'add') } { // Creation KO - if (! empty($object->errors)) setEventMessage($object->errors, 'errors'); - else setEventMessage($object->error, 'errors'); + if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors'); + else setEventMessages($object->error, null, 'errors'); $action='create'; } } @@ -139,7 +139,7 @@ if ($action == 'update' && ! GETPOST('cancel')) if (empty($object->ref)) { $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'errors'); + setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),null,'errors'); } if (! $error) @@ -152,8 +152,8 @@ if ($action == 'update' && ! GETPOST('cancel')) else { // Creation KO - if (! empty($object->errors)) setEventMessage($object->errors, 'errors'); - else setEventMessage($object->error, 'errors'); + if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors'); + else setEventMessages($object->error, null, 'errors'); $action='edit'; } } @@ -170,14 +170,14 @@ if ($action == 'confirm_delete') if ($result > 0) { // Delete OK - setEventMessage($langs->trans("RecordDeleted")); + setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs'); header("Location: ".dol_buildpath('/buildingmanagement/list.php',1)); exit; } else { - if (! empty($object->errors)) setEventMessage($object->errors,'errors'); - else setEventMessage($object->error,'errors'); + if (! empty($object->errors)) setEventMessages(null,$object->errors,'errors'); + else setEventMessages($object->error,null,'errors'); } } @@ -327,6 +327,8 @@ if ($id && (empty($action) || $action == 'view')) print '
'."\n"; $parameters=array(); $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + if (empty($reshook)) { if ($user->rights->mymodule->write) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 3b1f61df5b5..1c9de056acc 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -117,6 +117,7 @@ $hookmanager->initHooks(array('membercard')); $parameters=array('rowid'=>$rowid, 'objcanvas'=>$objcanvas); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) { diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index a21f7a53699..d1fe7848564 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -102,7 +102,7 @@ $hookmanager->initHooks(array('categorycard')); $parameters=array('id'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if (empty($reshook)) { diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 5ad90cd24de..f1d27b791e6 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -78,6 +78,7 @@ $object = new Societe($db); $parameters = array('socid' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($action == 'setcustomeraccountancycode') diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index 18f03f28ca9..ac354d4d08d 100644 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -73,6 +73,7 @@ $hookmanager->initHooks(array('customerlist')); $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Do we click on purge search criteria ? if (GETPOST("button_removefilter_x")) @@ -269,7 +270,7 @@ if ($result) print '
'; print ''; - + $parameters=array('obj' => $obj); $formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 441e51ef293..efff271a08c 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -101,6 +101,7 @@ $object->substitutionarrayfortest=array( $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Action clone object if ($action == 'confirm_clone' && $confirm == 'yes') diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 3eac57a64b4..19be47d5b5f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -105,8 +105,8 @@ $permissionnote = $user->rights->propale->creer; // Used by the include of actio */ $parameters = array('socid' => $socid); -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some - // hooks +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 4b43eadeebf..51c07eaa5b2 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -91,6 +91,7 @@ $hookmanager->initHooks(array('propallist')); $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Do we click on purge search criteria ? if (GETPOST("button_removefilter_x")) diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 6e138c1153c..7dada3e115f 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -161,6 +161,7 @@ $hookmanager->initHooks(array('prospectlist')); $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($action == 'cstc') { diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 3119205fda8..6c8c54791bf 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -100,6 +100,7 @@ $permissionnote = $user->rights->commande->creer; // Used by the include of acti $parameters = array('socid' => $socid); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index d699192acbf..0010195605c 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -78,6 +78,7 @@ $hookmanager->initHooks(array('orderlist')); $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hook +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Do we click on purge search criteria ? if (GETPOST("button_removefilter_x")) @@ -423,7 +424,7 @@ if ($resql) print ''."\n"; print '
'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'
'; - + $db->free($resql); } else diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 00c927bad99..c5d341c0e27 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -111,6 +111,7 @@ $permissionnote = $user->rights->facture->creer; // Used by the include of actio $parameters = array('socid' => $socid); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index f5dbd8186cd..07ebfa5ad7d 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -108,6 +108,7 @@ $now=dol_now(); $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Do we click on purge search criteria ? if (GETPOST("button_removefilter_x")) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index cabaf87e4d0..c7af3458fcb 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -71,10 +71,13 @@ $hookmanager->initHooks(array('paiementcard')); $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + /* * Actions */ + if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes')) { $error = 0; diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index ce607091267..f4d42dbaca0 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -83,7 +83,7 @@ $hookmanager->initHooks(array('contactcard')); $parameters=array('id'=>$id, 'objcanvas'=>$objcanvas); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if (empty($reshook)) { @@ -142,10 +142,10 @@ if (empty($reshook)) { setEventMessage($object->error,'errors'); } - else + else { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); - exit; + exit; } } @@ -157,11 +157,11 @@ if (empty($reshook)) { setEventMessage($object->error,'errors'); } - else + else { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); - exit; - } + exit; + } } // Add contact @@ -380,7 +380,7 @@ else $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")); dol_fiche_head($head, 'card', $title, 0, 'contact'); - + dol_htmloutput_events(); } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index b0c6991dcf3..ade0014708d 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -88,6 +88,7 @@ $hookmanager->initHooks(array('expeditioncard')); */ $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($action == 'add') { diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index e5d4aa96856..bcc50d32aca 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -97,9 +97,12 @@ $permissionnote=$user->rights->ficheinter->creer; // Used by the include of acti /* * Actions */ + $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer) { diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 313f82547e7..c31dc5525f7 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -54,6 +54,7 @@ $object = new Fournisseur($db); $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($action == 'setsupplieraccountancycode') { diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 72cc500e187..2591bba4838 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -110,6 +110,7 @@ $permissionnote=$user->rights->fournisseur->commande->creer; // Used by the incl $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index ff1e713384a..c9926cd59dd 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -88,6 +88,7 @@ $permissionnote=$user->rights->fournisseur->facture->creer; // Used by the inclu $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index adc62ee4cd8..302570330b7 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -68,10 +68,13 @@ $hookmanager->initHooks(array('paymentsupplier')); $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + /* * Actions */ + if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes')) { $error = 0; diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index 571c4a9925c..e3c7effebbf 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -66,6 +66,7 @@ $hookmanager->initHooks(array('supplierlist')); $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); /* diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 1ddc6dac50b..28b0db5efe9 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -101,7 +101,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barc $parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=$hookmanager->errors; +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if (empty($reshook)) { diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 1e8c7b7cd9a..6ca92968e8d 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -75,6 +75,7 @@ $modulepart='produit'; $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); /* @@ -101,7 +102,7 @@ if ($object->id) dol_fiche_head($head, 'documents', $titre, 0, $picto); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Construit liste des fichiers $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 037bb2b1f8b..8720c9cf892 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -64,10 +64,6 @@ $hookmanager->initHooks(array('pricesuppliercard')); $product = new ProductFournisseur($db); $product->fetch($id,$ref); -$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=$hookmanager->errors; - - $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); @@ -80,8 +76,8 @@ if (! $sortorder) $sortorder="ASC"; */ $parameters=array('socid'=>$socid, 'id_prod'=>$id); -$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($action == 'remove_pf') { diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 82483d59805..bf96d63459e 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -67,10 +67,10 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks - $error=$hookmanager->error; $errors=$hookmanager->errors; + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); llxHeader("","",$langs->trans("CardProduct".$product->type)); @@ -83,8 +83,9 @@ if ($id > 0 || ! empty($ref)) $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==1?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); - + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
".$langs->trans("Company")."".$object->client->getNomUrl(1)."
".$langs->trans("Company").''.$object->client->getNomUrl(1)."
'.$langs->trans("TotalDuration").''.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).''.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'
'.$langs->trans("Status").''.$object->getLibStatut(4).'
'.$langs->trans("Status").''.$object->getLibStatut(4).'
'.$thirdpartystatic->getLibStatut(3); print '
'; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index f9056187cec..93c880695d3 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -67,10 +67,10 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks - $error=$hookmanager->error; $errors=$hookmanager->errors; + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); llxHeader("","",$langs->trans("CardProduct".$product->type)); @@ -80,8 +80,9 @@ if ($id > 0 || ! empty($ref)) $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==1?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); - + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); print '
'; @@ -147,7 +148,7 @@ if ($id > 0 || ! empty($ref)) print "\n"; $commandestatic=new CommandeFournisseur($db); - + if ($num > 0) { $var=True; @@ -155,7 +156,7 @@ if ($id > 0 || ! empty($ref)) { $objp = $db->fetch_object($result); $var=!$var; - + $commandestatic->id=$objp->commandeid; $commandestatic->ref=$objp->ref; $commandestatic->statut=$objp->statut; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 60d3b9b50c8..6c73d0183fa 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -73,7 +73,7 @@ if ($id > 0 || ! empty($ref)) $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks - $error=$hookmanager->error; $errors=$hookmanager->errors; + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); llxHeader("","",$langs->trans("CardProduct".$product->type)); @@ -85,6 +85,7 @@ if ($id > 0 || ! empty($ref)) dol_fiche_head($head, 'referers', $titre, 0, $picto); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); print '
'; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 376263e122d..1959d53035e 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -72,9 +72,10 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); llxHeader("","",$langs->trans("CardProduct".$product->type)); @@ -87,8 +88,9 @@ if ($id > 0 || ! empty($ref)) $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==1?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); - + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); print '
'; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 2f1d37602ce..1b07ce3d1ba 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -72,10 +72,10 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks - $error=$hookmanager->error; $errors=$hookmanager->errors; + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); llxHeader("","",$langs->trans("CardProduct".$product->type)); @@ -88,9 +88,9 @@ if ($id > 0 || ! empty($ref)) $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==1?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); - - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); print '
'; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index ad81e93e299..3368efa2b56 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -66,9 +66,10 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); llxHeader("","",$langs->trans("CardProduct".$product->type)); @@ -78,9 +79,9 @@ if ($id > 0 || ! empty($ref)) $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==1?'service':'product'); dol_fiche_head($head, 'referers', $titre,0,$picto); - - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); print '
'; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 6be174a1dd4..273784faf92 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -74,7 +74,7 @@ $date_end=dol_mktime(0,0,0,GETPOST('projectendmonth','int'),GETPOST('projectendd $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if (empty($reshook)) { diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index 38562557e3a..ed48f7e1b04 100755 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -60,6 +60,7 @@ $object = new Resource($db); $hookmanager->initHooks(array('resource_card')); $parameters=array('resource_id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); /******************************************************************* @@ -86,7 +87,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->resource->write $object->ref = $ref; $object->description = $description; $object->fk_code_type_resource = $fk_code_type_resource; - + $result=$object->update($user); if ($result > 0) { @@ -98,9 +99,9 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->resource->write setEventMessage('
'.$object->error.'
'); $action='edit'; } - + } - else + else { setEventMessage($object->error,'errors'); $action='edit'; @@ -149,13 +150,13 @@ if ( $object->fetch($id) > 0 ) // Ref print ''; print ''; - + // Type print ''; print ''; - + // Description print ''; print ''; print ''; - + // Description print ''; print ''; @@ -215,8 +216,8 @@ if ( $object->fetch($id) > 0 ) $parameters = array(); $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been // modified by hook - if (empty($reshook)) - { + if (empty($reshook)) + { if ($action != "edit" ) { // Edit resource diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index c5329edd1f3..02a24735454 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -138,11 +138,12 @@ if ($action == 'confirm_delete_linked_resource' && $user->rights->resource->dele $parameters=array('resource_id'=>resource_id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks - +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); $parameters=array('resource_id'=>$resource_id); $reshook=$hookmanager->executeHooks('getElementResources',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); /*************************************************** diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 3fde7b52999..9a0fca19781 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -53,9 +53,6 @@ $object = new Resource($db); $hookmanager->initHooks(array('resource_list')); -$parameters=array(); -$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks - if (empty($sortorder)) $sortorder="DESC"; if (empty($sortfield)) $sortfield="t.rowid"; if (empty($arch)) $arch = 0; @@ -72,12 +69,20 @@ $pagenext = $page + 1; if( ! $user->rights->resource->read) accessforbidden(); -/*************************************************** - * VIEW -* -* Put here all code to build page -****************************************************/ +/* + * Action + */ + +$parameters=array(); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + + + +/* + * View + */ $pagetitle=$langs->trans('ResourcePageIndex'); llxHeader('',$pagetitle,''); @@ -129,7 +134,7 @@ else print ''; - + print ''; diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index b25129580ff..742039176b8 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -47,8 +47,7 @@ $hookmanager->initHooks(array('agendathirdparty')); $parameters=array('id'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); - +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 14eab2ee038..5436e03274b 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -57,8 +57,7 @@ if($_GET["socid"] && $_GET["commid"]) $parameters=array('id'=>$_GET["commid"]); $reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action); // Note that $action and $object may have been modified by some hooks - $error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); - + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if (empty($reshook)) $soc->add_commercial($user, $_GET["commid"]); @@ -84,8 +83,7 @@ if($_GET["socid"] && $_GET["delcommid"]) $parameters=array('id'=>$_GET["delcommid"]); $reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action); // Note that $action and $object may have been modified by some hooks - $error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); - + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if (empty($reshook)) $soc->del_commercial($user, $_GET["delcommid"]); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index 446a4f415fb..305936e6f56 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -48,7 +48,7 @@ $hookmanager->initHooks(array('infothirdparty')); $parameters=array('id'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index cf801c0b3dd..e45ce6eee7b 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -86,7 +86,7 @@ $hookmanager->initHooks(array('thirdpartycard')); $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if (empty($reshook)) { From 0997a7960de65df903263506e0d944a6c2cf2069 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 28 Sep 2014 12:52:35 +0200 Subject: [PATCH 0102/1190] Fix: uniformize code --- htdocs/admin/commande.php | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 1d05efa8e99..e5b2e5e6b1d 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Andre Cianfarani - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2011-2013 Philippe Grand @@ -117,6 +117,35 @@ else if ($action == 'specimen') } } +// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...) +if ($action == 'setModuleOptions') +{ + $post_size=count($_POST); + + $db->begin(); + + for($i=0;$i < $post_size;$i++) + { + if (array_key_exists('param'.$i,$_POST)) + { + $param=GETPOST("param".$i,'alpha'); + $value=GETPOST("value".$i,'alpha'); + if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); + if (! $res > 0) $error++; + } + } + if (! $error) + { + $db->commit(); + setEventMessage($langs->trans("SetupSaved")); + } + else + { + $db->rollback(); + setEventMessage($langs->trans("Error"),'errors'); + } +} + // Activate a model if ($action == 'set') { @@ -192,14 +221,6 @@ else if ($action == 'set_COMMANDE_FREE_TEXT') setEventMessage($langs->trans("Error"),'errors'); } } -else if ($action=='setModuleOptions') { - if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity)) - { - // La constante qui a ete lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage coherent - $conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1'); - } -} /* From f527602753c1f2b2fd43ae65aee6e9913432359d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 28 Sep 2014 13:12:04 +0200 Subject: [PATCH 0103/1190] Fix: use specific css style instead, this causes a shift problem --- htdocs/core/class/html.form.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 2658f292913..8b6b656417e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2830,8 +2830,8 @@ class Form } else if ($input['type'] == 'select') { - $more.=''."\n"; } From 52340e9176aa011feaf37db5a62816bbd1308c79 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Sep 2014 14:18:04 +0200 Subject: [PATCH 0104/1190] Fix: Missing fields into select --- htdocs/comm/action/class/actioncomm.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index fa7130ec018..773fdb48b0f 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -310,7 +310,7 @@ class ActionComm extends CommonObject $sql.= " a.fk_user_action, a.fk_user_done,"; $sql.= " a.fk_contact, a.percent as percentage,"; $sql.= " a.fk_element, a.elementtype,"; - $sql.= " a.priority, a.fulldayevent, a.location, a.transparency,"; + $sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,"; $sql.= " c.id as type_id, c.code as type_code, c.libelle,"; $sql.= " s.nom as socname,"; $sql.= " u.firstname, u.lastname as lastname"; @@ -961,7 +961,7 @@ class ActionComm extends CommonObject $sql.= " a.fk_user_action, a.fk_user_done,"; $sql.= " a.fk_contact, a.percent as percentage,"; $sql.= " a.fk_element, a.elementtype,"; - $sql.= " a.priority, a.fulldayevent, a.location,"; + $sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,"; $sql.= " u.firstname, u.lastname,"; $sql.= " s.nom as socname,"; $sql.= " c.id as type_id, c.code as type_code, c.libelle"; From 6a570222cc413ffe305f32b08939e63f5e7c814a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Sep 2014 14:18:04 +0200 Subject: [PATCH 0105/1190] Fix: Missing fields into select --- htdocs/comm/action/class/actioncomm.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 9919dc21e80..360f38c3f45 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -284,7 +284,7 @@ class ActionComm extends CommonObject $sql.= " a.fk_user_action, a.fk_user_done,"; $sql.= " a.fk_contact, a.percent as percentage,"; $sql.= " a.fk_element, a.elementtype,"; - $sql.= " a.priority, a.fulldayevent, a.location, a.transparency,"; + $sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,"; $sql.= " c.id as type_id, c.code as type_code, c.libelle,"; $sql.= " s.nom as socname,"; $sql.= " u.firstname, u.lastname as lastname"; @@ -878,7 +878,7 @@ class ActionComm extends CommonObject $sql.= " a.fk_user_action, a.fk_user_done,"; $sql.= " a.fk_contact, a.percent as percentage,"; $sql.= " a.fk_element, a.elementtype,"; - $sql.= " a.priority, a.fulldayevent, a.location,"; + $sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,"; $sql.= " u.firstname, u.lastname,"; $sql.= " s.nom as socname,"; $sql.= " c.id as type_id, c.code as type_code, c.libelle"; From eea034e0e5dce82b20d4a86a6382a7ac1910a5ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Sep 2014 15:33:13 +0200 Subject: [PATCH 0106/1190] Fix: 1 second missing into lastdaytoshow. --- htdocs/comm/action/index.php | 24 ++++++++++++------------ htdocs/comm/action/peruser.php | 21 ++++++++------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 8f3d82f5f9b..24502897ec1 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -218,9 +218,9 @@ if (empty($action) || $action=='show_month') $tmpday = -date("w",dol_mktime(0,0,0,$month,1,$year))+2; $tmpday+=((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)-1); if ($tmpday >= 1) $tmpday -= 7; - // Define firstdaytoshow and lastdaytoshow + // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$max_day_in_prev_month+$tmpday,$prev_year); - $next_day=7-($max_day_in_month+1-$tmpday)%7; + $next_day=7 - ($max_day_in_month+1-$tmpday) % 7; if ($next_day < 6) $next_day+=7; $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year); } @@ -242,9 +242,9 @@ if ($action=='show_week') $next_month = $next['month']; $next_day = $next['day']; - // Define firstdaytoshow and lastdaytoshow + // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) $firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); - $lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 6, 'd'); + $lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd'); $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year)); @@ -261,7 +261,7 @@ if ($action == 'show_day') $next_month = $next['month']; $next_day = $next['day']; - // Define firstdaytoshow and lastdaytoshow + // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$prev_day,$prev_year); $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year); } @@ -522,14 +522,14 @@ if ($resql) // Check values if ($event->date_end_in_calendar < $firstdaytoshow || - $event->date_start_in_calendar > $lastdaytoshow) + $event->date_start_in_calendar >= $lastdaytoshow) { // This record is out of visible range } else { if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow; - if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow; + if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow-1); // Add an entry in actionarray for each day $daycursor=$event->date_start_in_calendar; @@ -659,7 +659,7 @@ if (count($listofextcals)) if (isset($icalevent['RRULE']) && is_array($icalevent['RRULE'])) //repeatable event { //if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow; - //if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow; + //if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow-1); if ($icalevent['DTSTART;VALUE=DATE']) //fullday event { $datecurstart=dol_stringtotime($icalevent['DTSTART;VALUE=DATE'],1); @@ -698,10 +698,10 @@ if (count($listofextcals)) $until=empty($icalevent['RRULE']['UNTIL'])?0:dol_stringtotime($icalevent['RRULE']['UNTIL'],1); $maxrepeat=empty($icalevent['RRULE']['COUNT'])?0:$icalevent['RRULE']['COUNT']; if ($until && ($until+($datecurend-$datecurstart)) < $firstdaytoshow) continue; // We discard repeatable event that end before start date to show - if ($datecurstart > $lastdaytoshow) continue; // We discard repeatable event that start after end date to show + if ($datecurstart >= $lastdaytoshow) continue; // We discard repeatable event that start after end date to show $numofevent=0; - while (($datecurstart <= $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat))) + while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat))) { if ($datecurend >= $firstdaytoshow) // We add event { @@ -833,7 +833,7 @@ if (count($listofextcals)) } // Add event into $eventarray if date range are ok. - if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar > $lastdaytoshow) + if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow) { //print 'x'.$datestart.'-'.$dateend;exit; //print 'x'.$datestart.'-'.$dateend;exit; @@ -843,7 +843,7 @@ if (count($listofextcals)) else { if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow; - if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow; + if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1); // Add an entry in actionarray for each day $daycursor=$event->date_start_in_calendar; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index d66765b139b..a8629f57d68 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -179,17 +179,11 @@ $next_year = $next['year']; $next_month = $next['month']; $next_day = $next['day']; -// Define firstdaytoshow and lastdaytoshow -$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); -$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 6, 'd'); - $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year)); $tmpday = $first_day; //print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day; //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day; -//print dol_print_date($firstdaytoshow,'day'); -//print dol_print_date($lastdaytoshow,'day'); $title=$langs->trans("DoneAndToDoActions"); if ($status == 'done') $title=$langs->trans("DoneActions"); @@ -225,9 +219,11 @@ $next_year = $next['year']; $next_month = $next['month']; $next_day = $next['day']; -// Define firstdaytoshow and lastdaytoshow +// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) $firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); -$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 6, 'd'); +$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd'); +//print dol_print_date($firstdaytoshow,'dayhour'); +//print dol_print_date($lastdaytoshow,'dayhour'); $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year)); @@ -440,14 +436,14 @@ if ($resql) // Check values if ($event->date_end_in_calendar < $firstdaytoshow || - $event->date_start_in_calendar > $lastdaytoshow) + $event->date_start_in_calendar >= $lastdaytoshow) { // This record is out of visible range } else { if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow; - if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow; + if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1); // Add an entry in actionarray for each day $daycursor=$event->date_start_in_calendar; @@ -459,7 +455,7 @@ if ($resql) $loop=true; $j=0; $daykey=dol_mktime(0,0,0,$mois,$jour,$annee); do - { + { //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'
'; $eventarray[$daykey][]=$event; @@ -482,7 +478,6 @@ else dol_print_error($db); } - $maxnbofchar=18; $cachethirdparties=array(); $cachecontacts=array(); @@ -647,7 +642,7 @@ foreach ($usernames as $username) } echo "
'.$langs->trans("ResourceFormLabel_ref").'
'.$langs->trans("ResourceType").''; - $ret = $formresource->select_types_resource($object->fk_code_type_resource,'fk_code_type_resource','',2); + $ret = $formresource->select_types_resource($object->fk_code_type_resource,'fk_code_type_resource','',2); print '
'.$langs->trans("Description").''; @@ -194,7 +195,7 @@ if ( $object->fetch($id) > 0 ) print $object->type_label; print '
' . $langs->trans("ResourceFormLabel_description") . ''; print $resource->ref; print ''; print $resource->type_label; print '
'; - if (! empty($input['label'])) $more.=$input['label'].''; + $more.='
'; + if (! empty($input['label'])) $more.=$input['label'].''; $more.=$this->selectarray($input['name'],$input['values'],$input['default'],1); $more.='
\n"; - +var_dump($eventarray);exit; // Add js code to manage click on a box print ''."\n"; } - // Fiche action en mode edition print '
'; print ''; print ''; @@ -926,30 +906,33 @@ if ($id > 0) $listofuserid=array(); if (empty($donotclearsession)) { - if (is_object($object->usertodo)) $listofuserid[$object->usertodo->id]=array('id'=>$object->usertodo->id,'transparency'=>$object->transparency); // Owner first - $listofuserid=array_merge($listofuserid,$object->userassigned); + if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->userassigned[$user->id]['transparency'],'answer_status'=>$object->userassigned[$user->id]['answer_status'],'mandatory'=>$object->userassigned[$user->id]['mandatory']); // Owner first + if (! empty($object->userassigned)) // Now concat assigned users + { + // Restore array with key with same value than param 'id' + $tmplist1=$object->userassigned; $tmplist2=array(); + foreach($tmplist1 as $key => $val) + { + if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val; + } + } $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); - //print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'assignedtouser',1); - print '


'; - - // Busy - print ''; // Realised by if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) { print ''; } - print '
'.$langs->trans("Busy").''; - print 'transparency?' checked="checked"':'').'">'; + print $langs->trans("MyAvailability").': id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy"); print '
'.$langs->trans("ActionDoneBy").''; - print $form->select_dolusers($object->userdone->id> 0?$object->userdone->id:-1,'doneby',1); + print $form->select_dolusers($object->userdoneid> 0?$object->userdoneid:-1,'doneby',1); print '


'; + print '
'; + + print '

'; print ''; @@ -960,12 +943,12 @@ if ($id > 0) print ''; // Contact print ''; } @@ -979,10 +962,10 @@ if ($id > 0) $langs->load("project"); print ''; } @@ -1056,99 +1039,65 @@ if ($id > 0) if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++; // Date start - print ''; - print ''; print ''; // Date end - print ''; // Status - print ''; // Location if (empty($conf->global->AGENDA_DISABLE_LOCATION)) { - print ''; + print ''; } // Assigned to - //if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1); - print ''; - - print '
'; $events=array(); $events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); - print $form->select_company($object->thirdparty->id,'socid','',1,1,0,$events); + print $form->select_company($object->socid,'socid','',1,1,0,$events); print ''.$langs->trans("Contact").''; - $form->select_contacts($object->thirdparty->id, $object->contact->id,'contactid',1); + $form->select_contacts($object->socid, $object->contactid,'contactid',1); print '
'.$langs->trans("Project").''; - $numprojet=$formproject->select_projects($object->thirdparty->id,$object->fk_project,'projectid'); + $numprojet=$formproject->select_projects($object->socid,$object->fk_project,'projectid'); if ($numprojet==0) { - print '   '.$langs->trans("AddProject").''; + print '   '.$langs->trans("AddProject").''; } print '
'.$langs->trans("DateActionStart").''; + print '
'.$langs->trans("DateActionStart").''; if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour'); else print dol_print_date($object->datep,'day'); if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late")); print ''."\n"; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' '; - print ''."\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' '; - print '
'."\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' '; - print '
'."\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' '; - print '
'."\n"; - print '
'.$langs->trans("DateActionEnd").''; + print '
'.$langs->trans("DateActionEnd").''; if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour'); else print dol_print_date($object->datef,'day'); if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late")); print '
'.$langs->trans("Status").' / '.$langs->trans("Percentage").''; + print '
'.$langs->trans("Status").' / '.$langs->trans("Percentage").''; print $object->getLibStatut(4); print '
'.$langs->trans("Location").''.$object->location.'
'.$langs->trans("Location").''.$object->location.'
'.$langs->trans("ActionAffectedTo").''; + print '
'.$langs->trans("ActionAffectedTo").''; $listofuserid=array(); if (empty($donotclearsession)) { - if (is_object($object->usertodo)) $listofuserid[$object->usertodo->id]=array('id'=>$object->usertodo->id,'transparency'=>$object->transparency); // Owner first - $listofuserid=array_merge($listofuserid,$object->userassigned); + if (is_object($object->usertodo)) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency); // Owner first + if (! empty($object->userassigned)) // Now concat assigned users + { + // Restore array with key with same value than param 'id' + $tmplist1=$object->userassigned; $tmplist2=array(); + foreach($tmplist1 as $key => $val) + { + if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val; + } + } $_SESSION['assignedtouser']=dol_json_encode($listofuserid); - //var_dump($_SESSION['assignedtouser']); } print $form->select_dolusers_forevent('view','assignedtouser',1); - print '


'; - - // Busy - print ''; + print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + print ' '; // Done by if ($conf->global->AGENDA_ENABLE_DONEBY) { print ''; } - print '
'.$langs->trans("Busy").''; - if ($object->usertodo->id > 0) print yn(($object->transparency > 0)?1:0); // We show nothing if event is assigned to nobody - print '
'.$langs->trans("ActionDoneBy").''; - if ($object->userdone->id > 0) print $object->userdone->getNomUrl(1); + if ($object->userdoneid > 0) print $object->userdone->getNomUrl(1); print '


'; + print '
'; + + print '

'; + + print ''; // Third party - Contact if ($conf->societe->enabled) @@ -1164,12 +1113,12 @@ if ($id > 0) print ''; print ''; print '
'.$langs->trans("Contact").''; - if ($object->contact->id > 0) + if ($object->contactid > 0) { print $object->contact->getNomUrl(1); - if ($object->contact->id && $object->type_code == 'AC_TEL') + if ($object->contactid && $object->type_code == 'AC_TEL') { - if ($object->contact->fetch($object->contact->id)) + if ($object->contact->fetch($object->contactid)) { print "
".dol_print_phone($object->contact->phone_pro); } @@ -1250,7 +1199,7 @@ if ($id > 0) if ($action != 'edit') { if ($user->rights->agenda->allactions->create || - (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->create)) + (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) { print '
'.$langs->trans("Modify").'
'; } @@ -1260,7 +1209,7 @@ if ($id > 0) } if ($user->rights->agenda->allactions->delete || - (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->delete)) + (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete)) { print '
'.$langs->trans("Delete").'
'; } @@ -1272,6 +1221,47 @@ if ($id > 0) } print ''; + + + // Link to agenda views + print '
'; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' '; + print '
'."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' '; + print '
'."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' '; + print '
'."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' '; + print '
'."\n"; + print '
'; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 773fdb48b0f..fc75488ee3d 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -39,9 +39,10 @@ class ActionComm extends CommonObject var $id; - var $type_id; // id into parent table llx_c_actioncomm (will be deprecated into future, link should not be required) - var $type_code; // code into parent table llx_c_actioncomm (will be deprecated into future, link should not be required). With defautl setup, should be AC_OTH_AUTO or AC_OTH - var $type; // label into parent table llx_c_actioncomm (will be deprecated into future, link should not be required) + var $type_id; // Id into parent table llx_c_actioncomm (used only if option to use type is set) + var $type_code; // Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH. + var $type; // Label into parent table llx_c_actioncomm (used only if option to use type is set) + var $type_color; // Color into parent table llx_c_actioncomm (used only if option to use type is set) var $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...) var $label; @@ -56,7 +57,7 @@ class ActionComm extends CommonObject var $datef; // Date action end (datep2) var $durationp = -1; // -1=Unkown duration // deprecated var $fulldayevent = 0; // 1=Event on full day - var $punctual = 1; // Milestone + var $punctual = 1; // Milestone // TODO Not sure we need this. Milestone is already event with end date = start date var $percentage; // Percentage var $location; // Location @@ -66,7 +67,8 @@ class ActionComm extends CommonObject var $userassigned = array(); // Array of user ids var $userownerid; // Id of user owner - var $usertodo; // Object user of owner // deprecated + var $userdoneid; // Id of user done + var $usertodo; // Object user of owner // deprecated var $userdone; // Object user that did action // deprecated var $socid; @@ -352,25 +354,29 @@ class ActionComm extends CommonObject $this->note = $obj->note; $this->percentage = $obj->percentage; - $this->author->id = $obj->fk_user_author; - $this->author->firstname = $obj->firstname; - $this->author->lastname = $obj->lastname; - $this->usermod->id = $obj->fk_user_mod; + $this->authorid = $obj->fk_user_author; + $this->usermodid = $obj->fk_user_mod; + $this->author->id = $obj->fk_user_author; // deprecated + $this->author->firstname = $obj->firstname; // deprecated + $this->author->lastname = $obj->lastname; // deprecated + $this->usermod->id = $obj->fk_user_mod; // deprecated $this->userownerid = $obj->fk_user_action; + $this->userdoneid = $obj->fk_user_done; $this->usertodo->id = $obj->fk_user_action; // deprecated - //$this->userdone->id = $obj->fk_user_done; + $this->userdone->id = $obj->fk_user_done; // deprecated $this->priority = $obj->priority; $this->fulldayevent = $obj->fulldayevent; $this->location = $obj->location; $this->transparency = $obj->transparency; + $this->punctual = $obj->punctual; $this->socid = $obj->fk_soc; // To have fetch_thirdparty method working - $this->contactid = $obj->fk_contact; + $this->contactid = $obj->fk_contact; // To have fetch_contact method working $this->fk_project = $obj->fk_project; // To have fetch_project method working - $this->societe->id = $obj->fk_soc; // For backward compatibility - $this->contact->id = $obj->fk_contact; // For backward compatibility + $this->societe->id = $obj->fk_soc; // deprecated + $this->contact->id = $obj->fk_contact; // deprecated $this->fk_element = $obj->fk_element; $this->elementtype = $obj->elementtype; @@ -1041,6 +1047,7 @@ class ActionComm extends CommonObject $event['fulldayevent']=$obj->fulldayevent; $event['location']=$obj->location; $event['transparency']=(($obj->transparency > 0)?'OPAQUE':'TRANSPARENT'); // OPAQUE (busy) or TRANSPARENT (not busy) + $event['punctual']=$obj->punctual; $event['category']=$obj->libelle; // libelle type action // Define $urlwithroot $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); @@ -1146,7 +1153,7 @@ class ActionComm extends CommonObject $this->punctual=0; $this->percentage=0; $this->location='Location'; - $this->transparency=0; + $this->transparency=1; // 1 means opaque $this->priority=1; $this->note = 'Note'; } diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 24502897ec1..a1c03a7f15e 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1140,7 +1140,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar); - // Define $color and $cssclass of event + // Define $color (Hex string like '0088FF') and $cssclass of event $color=-1; $cssclass=''; $colorindex=-1; if (in_array($user->id, $keysofuserassigned)) { @@ -1163,8 +1163,14 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa $color=$event->icalcolor; $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable'); } - else if ($event->type_code == 'BIRTHDAY') { $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); } - else { $numother++; $cssclass='family_other'; } + else if ($event->type_code == 'BIRTHDAY') + { + $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); + } + else + { + $numother++; $cssclass='family_other'; + } if ($color == -1) // Color was not forced. Set color according to color index. { // Define color index if not yet defined diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 54dada1ff52..ad3bfddd2ef 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -108,7 +108,7 @@ $begin_d = GETPOST('begin_d')?GETPOST('begin_d','int'):($tmparray[0] != '' ? $tm $end_d = GETPOST('end_d')?GETPOST('end_d'):($tmparray[1] != '' ? $tmparray[1] : 5); if ($begin_d < 1 || $begin_d > 7) $begin_d = 1; if ($end_d < 1 || $end_d > 7) $end_d = 7; -if ($end_d <= $begin_d) $end_d = $begin_d + 1; +if ($end_d < $begin_d) $end_d = $begin_d + 1; if ($actioncode == '') $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE); if ($status == '' && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS); @@ -321,7 +321,7 @@ $sql.= ' a.percent,'; $sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,'; $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,'; $sql.= ' a.fk_soc, a.fk_contact,'; -$sql.= ' ca.code'; +$sql.= ' ca.code, ca.color'; $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu"; @@ -396,6 +396,7 @@ if ($resql) $event->datep=$db->jdate($obj->datep); // datep and datef are GMT date $event->datef=$db->jdate($obj->datep2); $event->type_code=$obj->code; + $event->type_color=$obj->color; //$event->libelle=$obj->label; // deprecated $event->label=$obj->label; $event->percentage=$obj->percent; @@ -665,7 +666,7 @@ jQuery(document).ready(function() { else if (ids.indexOf(",") > -1) /* There is several events */ { /* alert(\'several events\'); */ - url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?usertodo="+userid + url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?usertodo="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+dateselectday; window.location.href = url; } else /* One event */ @@ -744,12 +745,12 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar); - // Define $color and $cssclass of event + // Define $color (Hex string like '0088FF') and $cssclass of event $color=-1; $cssclass=''; $colorindex=-1; if (in_array($user->id, $keysofuserassigned)) { $nummytasks++; $cssclass='family_mytasks'; - // TODO Set color according to event type + $color=$event->type_color; } else if ($event->type_code == 'ICALEVENT') { @@ -760,15 +761,19 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & } $numicals[dol_string_nospecial($event->icalname)]++; } + $color=$event->icalcolor; $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable'); } - else if ($event->type_code == 'BIRTHDAY') { + else if ($event->type_code == 'BIRTHDAY') + { $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); } - else { $numother++; $cssclass='family_other'; + else + { + $numother++; $cssclass='family_other'; } - if ($color == -1) // Color was not forced. Set color according to color index. + if ($color < 0) // Color was not forced. Set color according to color index. { // Define color index if not yet defined $idusertouse=($event->userownerid?$event->userownerid:0); @@ -791,7 +796,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & for ($h = $begin_h; $h < $end_h; $h++) { //if ($username->id == 1 && $day==1) print 'h='.$h; - $color = ''; //init + $newcolor = ''; //init if (empty($event->fulldayevent)) { $a = dol_mktime((int) $h,0,0,$month,$day,$year,false,false); @@ -801,6 +806,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $dateendtouse=$event->date_end_in_calendar; if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++; + //print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'
'; + if ($event->date_start_in_calendar < $b && $dateendtouse > $a) { $busy=$event->transparency; @@ -817,8 +824,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $cases1[$h][$event->id]['typecode']=$event->type_code; if ($event->socid) { - $cases1[$h][$event->id]['string'].='xxx'; + //$cases1[$h][$event->id]['string'].='xxx'; } + $cases1[$h][$event->id]['color']=$color; } if ($event->date_start_in_calendar < $c && $dateendtouse > $b) { @@ -836,8 +844,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $cases2[$h][$event->id]['typecode']=$event->type_code; if ($event->socid) { - $cases2[$h][$event->id]['string'].='xxx'; + //$cases2[$h][$event->id]['string'].='xxx'; } + $cases2[$h][$event->id]['color']=$color; } } else @@ -849,7 +858,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $cases2[$h][$event->id]['string']=$event->label; $cases1[$h][$event->id]['typecode']=$event->type_code; $cases2[$h][$event->id]['typecode']=$event->type_code; - //break; + $cases1[$h][$event->id]['color']='009900'; + $cases2[$h][$event->id]['color']='009900'; } } $i++; @@ -861,6 +871,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & for ($h = $begin_h; $h < $end_h; $h++) { + $color1='';$color2=''; $style1='';$style2=''; $string1=' ';$string2=' '; $title1='';$title2=''; @@ -893,20 +904,25 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $ids=array_keys($cases1[$h]); $output = array_slice($cases1[$h], 0, 1); if ($output[0]['string']) $title1.=' - '.$output[0]['string']; + if ($output[0]['color']) $color1 = $output[0]['color']; } + else if (count($cases1[$h]) > 1) $color1='222222'; + if (count($cases2[$h]) == 1) // 1 seul evenement { $ids=array_keys($cases2[$h]); $output = array_slice($cases2[$h], 0, 1); if ($output[0]['string']) $title2.=' - '.$output[0]['string']; + if ($output[0]['color']) $color2 = $output[0]['color']; } + else if (count($cases2[$h]) > 1) $color2='222222'; $ids1=join(',',array_keys($cases1[$h])); $ids2=join(',',array_keys($cases2[$h])); //var_dump($cases1[$h]); print ''; - print ''; print '
'; + print '
'; print $string1; - print ''; + print ''; print $string2; print '
'; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index e8dcce57ac4..f65136ec81d 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -577,11 +577,15 @@ abstract class CommonObject /** * Charge le contact d'id $id dans this->contact * - * @param int $contactid Id du contact + * @param int $contactid Id du contact. Use this->contactid if empty. * @return int <0 if KO, >0 if OK */ - function fetch_contact($contactid) + function fetch_contact($contactid='') { + if (empty($contactid)) $contactid=$this->contactid; + + if (empty($contactid)) return 0; + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $contact = new Contact($this->db); $result=$contact->fetch($contactid); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8b6b656417e..33b1d42ca08 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1329,9 +1329,9 @@ class Form { $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true); } - $numassignetouser=count($assignedtouser); + $nbassignetouser=count($assignedtouser); - if ($numassignetouser && $action != 'view') $out.='
'; + if ($nbassignetouser && $action != 'view') $out.='
'; $i=0; $ownerid=0; foreach($assignedtouser as $key => $value) { @@ -1339,7 +1339,7 @@ class Form $userstatic->fetch($value['id']); $out.=$userstatic->getNomUrl(1); if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; } - if ($numassignetouser > 1 && $action != 'view') $out.=' '; + if ($nbassignetouser > 1 && $action != 'view') $out.=' '; //$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional")); //$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy")); $out.='
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 13003ea5cf3..5d67dc0b38e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -219,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index c4c332336d2..dd793c7bfdd 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -88,4 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Create event \ No newline at end of file +AddEvent=Create event +MyAvailability=Ma disponibilité \ No newline at end of file From c5a7dfbabb36c3af7bda87de84ab6c738b860a09 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 29 Sep 2014 14:40:02 +0200 Subject: [PATCH 0116/1190] Fix: Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return; --- htdocs/core/class/hookmanager.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 9d8ce90e812..52dc25dd452 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2010-2014 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -152,7 +152,7 @@ class HookManager $modulealreadyexecuted=array(); $resaction=0; $error=0; $result=''; $this->resPrint=''; $this->resArray=array(); - foreach($this->hooks as $modules) // this->hooks is an array with context as key and value is an array of modules that handle this context + foreach($this->hooks as $context => $modules) // this->hooks is an array with context as key and value is an array of modules that handle this context { if (! empty($modules)) { @@ -166,6 +166,8 @@ class HookManager // test to avoid to run twice a hook, when a module implements several active contexts if (in_array($module,$modulealreadyexecuted)) continue; $modulealreadyexecuted[$module]=$module; + // Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return; + $parameters['currentcontext'] = $context; // Hooks that must return int (hooks with type 'addreplace') if ($hooktype == 'addreplace') { From 3d82f0965ec3747002232d821f7a8e1087126dfd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 29 Sep 2014 15:20:54 +0200 Subject: [PATCH 0117/1190] Fix: Try to filter by context, use the test with $currentcontext in method for avoid to run twice (I have not found any other solution!) --- htdocs/core/class/hookmanager.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 52dc25dd452..c402353e8d7 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -156,6 +156,8 @@ class HookManager { if (! empty($modules)) { + $modulealreadyexecuted[$context]=array(); // Filter by context + foreach($modules as $module => $actionclassinstance) { //print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."
\n"; @@ -164,8 +166,8 @@ class HookManager // jump to next class if method does not exists if (! method_exists($actionclassinstance,$method)) continue; // test to avoid to run twice a hook, when a module implements several active contexts - if (in_array($module,$modulealreadyexecuted)) continue; - $modulealreadyexecuted[$module]=$module; + if (in_array($module,$modulealreadyexecuted[$context])) continue; + $modulealreadyexecuted[$context][$module]=$module; // Use the $currentcontext in method for avoid to run twice // Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return; $parameters['currentcontext'] = $context; // Hooks that must return int (hooks with type 'addreplace') From f01e76f686ba37dac3632d64e2266b4c0fa80bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 29 Sep 2014 15:22:48 +0200 Subject: [PATCH 0118/1190] Removed unmaintaned OScommerce module --- ChangeLog | 1 + build/rpm/dolibarr_fedora.spec | 1 - build/rpm/dolibarr_generic.spec | 1 - build/rpm/dolibarr_mandriva.spec | 1 - build/rpm/dolibarr_opensuse.spec | 1 - htdocs/admin/osc-languages.php | 90 ------- htdocs/boutique/admin/boutique.php | 204 --------------- htdocs/boutique/admin/index.html | 0 htdocs/boutique/client/card.php | 126 --------- .../client/class/boutiqueclient.class.php | 77 ------ htdocs/boutique/client/class/index.html | 0 htdocs/boutique/client/index.php | 91 ------- htdocs/boutique/commande/ca.php | 115 -------- htdocs/boutique/commande/card.php | 155 ----------- .../commande/class/boutiquecommande.class.php | 138 ---------- htdocs/boutique/commande/class/index.html | 0 htdocs/boutique/commande/index.php | 92 ------- htdocs/boutique/critiques/bestproduct.php | 97 ------- htdocs/boutique/critiques/card.php | 82 ------ .../critiques/class/critique.class.php | 84 ------ htdocs/boutique/critiques/class/index.html | 0 htdocs/boutique/critiques/index.php | 92 ------- htdocs/boutique/index.php | 245 ------------------ htdocs/boutique/notification/index.php | 89 ------- htdocs/boutique/notification/produits.php | 95 ------- htdocs/boutique/osc_master.inc.php | 38 --- htdocs/boutique/produits/index.php | 88 ------- htdocs/boutique/produits/osc-list.php | 106 -------- htdocs/boutique/promotion/class/index.html | 0 .../promotion/class/promotion.class.php | 213 --------------- htdocs/boutique/promotion/index.php | 119 --------- htdocs/core/boxes/box_osc_client.php | 112 -------- htdocs/core/menus/init_menu_auguria.sql | 1 - htdocs/core/menus/standard/eldy.lib.php | 20 -- htdocs/core/modules/modBoutique.class.php | 118 --------- .../install/mysql/migration/3.6.0-3.7.0.sql | 5 + htdocs/langs/ar_SA/admin.lang | 4 - htdocs/langs/ar_SA/shop.lang | 11 - htdocs/langs/bg_BG/admin.lang | 4 - htdocs/langs/bg_BG/shop.lang | 11 - htdocs/langs/bs_BA/admin.lang | 4 - htdocs/langs/bs_BA/shop.lang | 11 - htdocs/langs/ca_ES/admin.lang | 4 - htdocs/langs/ca_ES/shop.lang | 11 - htdocs/langs/cs_CZ/admin.lang | 4 - htdocs/langs/cs_CZ/shop.lang | 11 - htdocs/langs/da_DK/admin.lang | 4 - htdocs/langs/da_DK/shop.lang | 11 - htdocs/langs/de_AT/shop.lang | 5 - htdocs/langs/de_DE/admin.lang | 4 - htdocs/langs/de_DE/shop.lang | 11 - htdocs/langs/el_GR/admin.lang | 4 - htdocs/langs/el_GR/shop.lang | 11 - htdocs/langs/en_US/admin.lang | 6 +- htdocs/langs/en_US/shop.lang | 11 - htdocs/langs/es_ES/admin.lang | 4 - htdocs/langs/es_ES/shop.lang | 11 - htdocs/langs/et_EE/admin.lang | 4 - htdocs/langs/et_EE/shop.lang | 11 - htdocs/langs/eu_ES/admin.lang | 4 - htdocs/langs/eu_ES/shop.lang | 11 - htdocs/langs/fa_IR/admin.lang | 4 - htdocs/langs/fa_IR/shop.lang | 11 - htdocs/langs/fi_FI/admin.lang | 4 - htdocs/langs/fi_FI/shop.lang | 11 - htdocs/langs/fr_FR/admin.lang | 4 - htdocs/langs/fr_FR/shop.lang | 11 - htdocs/langs/he_IL/admin.lang | 4 - htdocs/langs/he_IL/shop.lang | 11 - htdocs/langs/hr_HR/admin.lang | 4 - htdocs/langs/hr_HR/shop.lang | 11 - htdocs/langs/hu_HU/admin.lang | 4 - htdocs/langs/hu_HU/shop.lang | 11 - htdocs/langs/id_ID/admin.lang | 4 - htdocs/langs/id_ID/shop.lang | 11 - htdocs/langs/is_IS/admin.lang | 4 - htdocs/langs/is_IS/shop.lang | 11 - htdocs/langs/it_IT/admin.lang | 4 - htdocs/langs/it_IT/shop.lang | 11 - htdocs/langs/ja_JP/admin.lang | 4 - htdocs/langs/ja_JP/shop.lang | 11 - htdocs/langs/ko_KR/admin.lang | 4 - htdocs/langs/ko_KR/shop.lang | 11 - htdocs/langs/lt_LT/admin.lang | 4 - htdocs/langs/lt_LT/shop.lang | 11 - htdocs/langs/lv_LV/admin.lang | 4 - htdocs/langs/lv_LV/shop.lang | 11 - htdocs/langs/mk_MK/admin.lang | 4 - htdocs/langs/mk_MK/shop.lang | 11 - htdocs/langs/nb_NO/admin.lang | 4 - htdocs/langs/nb_NO/shop.lang | 11 - htdocs/langs/nl_BE/shop.lang | 3 - htdocs/langs/nl_NL/admin.lang | 4 - htdocs/langs/nl_NL/shop.lang | 11 - htdocs/langs/pl_PL/admin.lang | 4 - htdocs/langs/pl_PL/shop.lang | 11 - htdocs/langs/pt_BR/admin.lang | 4 - htdocs/langs/pt_BR/shop.lang | 11 - htdocs/langs/pt_PT/admin.lang | 4 - htdocs/langs/pt_PT/shop.lang | 11 - htdocs/langs/ro_RO/admin.lang | 4 - htdocs/langs/ro_RO/shop.lang | 11 - htdocs/langs/ru_RU/admin.lang | 4 - htdocs/langs/ru_RU/shop.lang | 11 - htdocs/langs/ru_UA/shop.lang | 1 - htdocs/langs/sk_SK/admin.lang | 4 - htdocs/langs/sk_SK/shop.lang | 11 - htdocs/langs/sl_SI/admin.lang | 4 - htdocs/langs/sl_SI/shop.lang | 11 - htdocs/langs/sq_AL/admin.lang | 4 - htdocs/langs/sq_AL/shop.lang | 11 - htdocs/langs/sv_SE/admin.lang | 4 - htdocs/langs/sv_SE/shop.lang | 11 - htdocs/langs/th_TH/admin.lang | 4 - htdocs/langs/th_TH/shop.lang | 11 - htdocs/langs/tr_TR/admin.lang | 4 - htdocs/langs/tr_TR/shop.lang | 11 - htdocs/langs/uk_UA/admin.lang | 4 - htdocs/langs/uk_UA/shop.lang | 11 - htdocs/langs/uz_UZ/admin.lang | 4 - htdocs/langs/uz_UZ/shop.lang | 11 - htdocs/langs/vi_VN/admin.lang | 4 - htdocs/langs/vi_VN/shop.lang | 11 - htdocs/langs/zh_CN/admin.lang | 4 - htdocs/langs/zh_CN/shop.lang | 11 - htdocs/langs/zh_TW/admin.lang | 4 - htdocs/langs/zh_TW/shop.lang | 11 - htdocs/public/demo/index.php | 14 +- htdocs/theme/auguria/img/menus/shop.png | Bin 1115 -> 0 bytes htdocs/theme/auguria/style.css.php | 2 +- htdocs/theme/bureau2crea/img/menus/shop.png | Bin 1115 -> 0 bytes htdocs/theme/bureau2crea/style.css.php | 2 +- htdocs/theme/cameleo/img/menus/shop.png | Bin 1115 -> 0 bytes htdocs/theme/cameleo/style.css.php | 6 +- htdocs/theme/eldy/img/menus/shop.png | Bin 1115 -> 0 bytes htdocs/theme/eldy/style.css.php | 6 +- test/phpunit/ModulesTest.php | 2 +- test/phpunit/phpunittest.xml | 3 +- 138 files changed, 20 insertions(+), 3383 deletions(-) delete mode 100644 htdocs/admin/osc-languages.php delete mode 100644 htdocs/boutique/admin/boutique.php delete mode 100644 htdocs/boutique/admin/index.html delete mode 100644 htdocs/boutique/client/card.php delete mode 100644 htdocs/boutique/client/class/boutiqueclient.class.php delete mode 100644 htdocs/boutique/client/class/index.html delete mode 100644 htdocs/boutique/client/index.php delete mode 100644 htdocs/boutique/commande/ca.php delete mode 100644 htdocs/boutique/commande/card.php delete mode 100644 htdocs/boutique/commande/class/boutiquecommande.class.php delete mode 100644 htdocs/boutique/commande/class/index.html delete mode 100644 htdocs/boutique/commande/index.php delete mode 100644 htdocs/boutique/critiques/bestproduct.php delete mode 100644 htdocs/boutique/critiques/card.php delete mode 100644 htdocs/boutique/critiques/class/critique.class.php delete mode 100644 htdocs/boutique/critiques/class/index.html delete mode 100644 htdocs/boutique/critiques/index.php delete mode 100644 htdocs/boutique/index.php delete mode 100644 htdocs/boutique/notification/index.php delete mode 100644 htdocs/boutique/notification/produits.php delete mode 100644 htdocs/boutique/osc_master.inc.php delete mode 100644 htdocs/boutique/produits/index.php delete mode 100644 htdocs/boutique/produits/osc-list.php delete mode 100644 htdocs/boutique/promotion/class/index.html delete mode 100644 htdocs/boutique/promotion/class/promotion.class.php delete mode 100644 htdocs/boutique/promotion/index.php delete mode 100644 htdocs/core/boxes/box_osc_client.php delete mode 100644 htdocs/core/modules/modBoutique.class.php delete mode 100644 htdocs/langs/ar_SA/shop.lang delete mode 100644 htdocs/langs/bg_BG/shop.lang delete mode 100644 htdocs/langs/bs_BA/shop.lang delete mode 100644 htdocs/langs/ca_ES/shop.lang delete mode 100644 htdocs/langs/cs_CZ/shop.lang delete mode 100644 htdocs/langs/da_DK/shop.lang delete mode 100644 htdocs/langs/de_AT/shop.lang delete mode 100644 htdocs/langs/de_DE/shop.lang delete mode 100644 htdocs/langs/el_GR/shop.lang delete mode 100644 htdocs/langs/en_US/shop.lang delete mode 100644 htdocs/langs/es_ES/shop.lang delete mode 100644 htdocs/langs/et_EE/shop.lang delete mode 100644 htdocs/langs/eu_ES/shop.lang delete mode 100644 htdocs/langs/fa_IR/shop.lang delete mode 100644 htdocs/langs/fi_FI/shop.lang delete mode 100644 htdocs/langs/fr_FR/shop.lang delete mode 100644 htdocs/langs/he_IL/shop.lang delete mode 100644 htdocs/langs/hr_HR/shop.lang delete mode 100644 htdocs/langs/hu_HU/shop.lang delete mode 100644 htdocs/langs/id_ID/shop.lang delete mode 100644 htdocs/langs/is_IS/shop.lang delete mode 100644 htdocs/langs/it_IT/shop.lang delete mode 100644 htdocs/langs/ja_JP/shop.lang delete mode 100644 htdocs/langs/ko_KR/shop.lang delete mode 100644 htdocs/langs/lt_LT/shop.lang delete mode 100644 htdocs/langs/lv_LV/shop.lang delete mode 100644 htdocs/langs/mk_MK/shop.lang delete mode 100644 htdocs/langs/nb_NO/shop.lang delete mode 100644 htdocs/langs/nl_BE/shop.lang delete mode 100644 htdocs/langs/nl_NL/shop.lang delete mode 100644 htdocs/langs/pl_PL/shop.lang delete mode 100644 htdocs/langs/pt_BR/shop.lang delete mode 100644 htdocs/langs/pt_PT/shop.lang delete mode 100644 htdocs/langs/ro_RO/shop.lang delete mode 100644 htdocs/langs/ru_RU/shop.lang delete mode 100644 htdocs/langs/ru_UA/shop.lang delete mode 100644 htdocs/langs/sk_SK/shop.lang delete mode 100644 htdocs/langs/sl_SI/shop.lang delete mode 100644 htdocs/langs/sq_AL/shop.lang delete mode 100644 htdocs/langs/sv_SE/shop.lang delete mode 100644 htdocs/langs/th_TH/shop.lang delete mode 100644 htdocs/langs/tr_TR/shop.lang delete mode 100644 htdocs/langs/uk_UA/shop.lang delete mode 100644 htdocs/langs/uz_UZ/shop.lang delete mode 100644 htdocs/langs/vi_VN/shop.lang delete mode 100644 htdocs/langs/zh_CN/shop.lang delete mode 100644 htdocs/langs/zh_TW/shop.lang delete mode 100644 htdocs/theme/auguria/img/menus/shop.png delete mode 100644 htdocs/theme/bureau2crea/img/menus/shop.png delete mode 100644 htdocs/theme/cameleo/img/menus/shop.png delete mode 100644 htdocs/theme/eldy/img/menus/shop.png diff --git a/ChangeLog b/ChangeLog index d93f5199c40..e0b84526493 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ For users, new experimental module: Hydroflex 120 euros Asysteo 120 euros Fournisseur médical 120 euros +- Removed: unmaintained OScommerce module For translators: - Update language files. diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 439a09b8266..156f34bc066 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -162,7 +162,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 945e8f4812c..176cb07975d 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -242,7 +242,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 17b46c3c143..d75c9a84dca 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -159,7 +159,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index f6192c87c9b..41ea838f3fb 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -170,7 +170,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php deleted file mode 100644 index 804c72f2850..00000000000 --- a/htdocs/admin/osc-languages.php +++ /dev/null @@ -1,90 +0,0 @@ - - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/osc-languages.php - * \ingroup boutique - * \brief Page d'administration/configuration du module Boutique - */ - -require '../main.inc.php'; - -$langs->load("admin"); - -if (!$user->admin) -accessforbidden(); - - -llxHeader(); - - -if (! dol_strlen(OSC_DB_NAME)) -{ - print "Non dispo"; - llxFooter(); -} - -if ($sortfield == "") { - $sortfield="lower(p.label),p.price"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - - -print_barre_liste("Liste des langues oscommerce", $page, "osc-languages.php"); - -$sql = "SELECT l.languages_id, l.name, l.code FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."languages as l"; -$sql.= $db->plimit($limit, $offset); - -print "

"; -print ""; -print ""; -print ""; -print ""; -print "\n"; - -$resql=$db->query($sql); -if ($resql) -{ - $num = $db->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) { - $objp = $db->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - $i++; - } - $db->free(); -} - -print "
idNameCode
$objp->languages_id$objp->name$objp->code
"; - - -$db->close(); - -llxFooter(); diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php deleted file mode 100644 index b4430edcbe1..00000000000 --- a/htdocs/boutique/admin/boutique.php +++ /dev/null @@ -1,204 +0,0 @@ - - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2006 Laurent Destailleur - * Copyright (C) 2012 Juanjo Menent - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/admin/boutique.php - * \ingroup boutique - * \brief Page d'administration/configuration du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; - -$langs->load("admin"); -$langs->load("oscommerce"); - -if (!$user->admin) accessforbidden(); - - - -/* - * Actions - */ - -if (GETPOST('save','alpha')) -{ - $db->begin(); - - $i=0; - - $i+=dolibarr_set_const($db,'OSC_DB_HOST',trim(GETPOST('oscommerce_dbhost','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_NAME',trim(GETPOST('oscommerce_dbname','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_USER',trim(GETPOST('oscommerce_dbuser','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_PASS',trim(GETPOST('oscommerce_dbpass','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_TABLE_PREFIX',trim(GETPOST('oscommerce_db_table_prefix','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_LANGUAGE_ID',1,'chaine',0,'',$conf->entity); - - if ($i >= 4) - { - $db->commit(); - setEventMessage($langs->trans("OSCommerceSetupSaved")); - } - else - { - $db->rollback(); - header("Location: ".$_SERVER["PHP_SELF"]); - exit; - } -} -elseif (GETPOST('test','alpha')) -{ - //$resql=$db->query("select count(*) from ".MAIN_DB_PREFIX."const"); - //print "< ".$db." - ".$db->db." - ".$resql." - ".$db->error().">
\n"; - - // Test de la connexion a la database webcalendar - $conf->oscommerce->db->type=$dolibarr_main_db_type; - $conf->oscommerce->db->host=GETPOST('oscommerce_dbhost','alpha'); - $conf->oscommerce->db->port=GETPOST('oscommerce_dbport','alpha'); - $conf->oscommerce->db->name=GETPOST('oscommerce_dbname','alpha'); - $conf->oscommerce->db->user=GETPOST('oscommerce_dbuser','alpha'); - $conf->oscommerce->db->pass=GETPOST('oscommerce_dbpass','alpha'); - - $oscommercedb=getDoliDBInstance($conf->oscommerce->db->type,$conf->oscommerce->db->host,$conf->oscommerce->db->user,$conf->oscommerce->db->pass,$conf->oscommerce->db->name,$conf->oscommerce->db->port); - - if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1) - { - // Verifie si bonne base par requete sur une table OSCommerce - $sql ="SELECT configuration_value"; - $sql.=" FROM ".$_POST["oscommerce_db_table_prefix"]."configuration"; - $sql.=" WHERE configuration_key='STORE_NAME'"; - $resql=$oscommercedb->query($sql); - if ($resql) { - $mesg = $langs->trans("OSCommerceTestOk",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'),GETPOST('oscommerce_dbuser','alpha')); - setEventMessage($mesg); - } - else { - $mesg = $langs->trans("OSCommerceErrorConnectOkButWrongDatabase",'STORE_NAME',GETPOST('oscommerce_db_table_prefix','alpha')."configuration"); - setEventMessage($mesg, 'errors'); - } - - //$oscommercedb->close(); Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique - } - elseif ($oscommercedb->connected == 1 && $oscommercedb->database_selected != 1) - { - $mesg = $langs->trans("OSCommerceTestKo1",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha')); - $mesg.="
".$oscommercedb->error(); - - setEventMessage($mesg, 'errors'); - //$oscommercedb->close(); Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique - } - else - { - $mesg = $langs->trans("OSCommerceTestKo2",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbuser','alpha')); - $mesg.="
".$oscommercedb->error(); - setEventMessage($mesg, 'errors'); - } - - //$resql=$db->query("select count(*) from ".MAIN_DB_PREFIX."const"); - //print "< ".$db." - ".$db->db." - ".$resql." - ".$db->error().">
\n"; -} - - - -/* - * Affichage page - */ - -llxHeader(); - -$linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("OSCommerceSetup"),$linkback,'setup'); - - - -print '
'; - -$var=true; -print '

'; -print ''; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ''; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ''; -print ""; -print "
".$langs->trans("Parameter")."".$langs->trans("Value")."".$langs->trans("Examples")."
".$langs->trans("OSCommerceServer")."global->OSC_DB_HOST) . "\" size=\"30\">localhost"; -//print "
__dolibarr_main_db_host__ (".$dolibarr_main_db_host.")" -print "
".$langs->trans("OSCommerceDatabaseName")."global->OSC_DB_NAME) . "\" size=\"30\">oscommerce"; -//print "
__dolibarr_main_db_name__ (".$dolibarr_main_db_name.")"; -print "
".$langs->trans("OSCommercePrefix")."global->DB_TABLE_PREFIX) . "\" size=\"30\">osc_"; -print "
".$langs->trans("OSCommerceUser")."global->OSC_DB_USER) . "\" size=\"30\">oscommerceuser"; -//print "
__dolibarr_main_db_user__ (".$dolibarr_main_db_user.")"; -print "
".$langs->trans("Password")."global->OSC_DB_PASS) . "\" size=\"30\">'; -//if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ ('.preg_replace('/./i','*',$dolibarr_main_db_pass).')'; -print ' 
".$langs->trans("PasswordRetype")."global->OSC_DB_PASS) ."\" size=\"30\">'; -//if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ ('.preg_replace('/./i','*',$dolibarr_main_db_pass).')'; -print ' 
"; - - -print '
'; -print "trans("TestConnection")."\">"; -print "   "; -print "trans("Save")."\">"; -print "
"; - -print "
\n"; - -$db->close(); - -llxFooter(); diff --git a/htdocs/boutique/admin/index.html b/htdocs/boutique/admin/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/client/card.php b/htdocs/boutique/client/card.php deleted file mode 100644 index 4944911f408..00000000000 --- a/htdocs/boutique/client/card.php +++ /dev/null @@ -1,126 +0,0 @@ - - * Copyright (C) 2003-2005 Eric Seigne - * Copyright (C) 2006-2010 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/client/card.php - * \ingroup boutique - * \brief Page fiche client OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; -include_once DOL_DOCUMENT_ROOT.'/boutique/client/class/boutiqueclient.class.php'; - -$id=GETPOST('id', 'int'); - - -/* - * Actions - */ - -// None - - - -/* - * View - */ - -llxHeader(); - -if ($id > 0) -{ - $client = new BoutiqueClient($dbosc); - $result = $client->fetch($id); - if ( $result ) - { - print '
'.$langs->trans("CustomerCard").': '.$client->name.'

'; - - print ''; - print ""; - print ''; - print "
Nom'.$client->name.'
"; - - - /* - * Commandes - */ - $sql = "SELECT o.orders_id, o.customers_id, date_purchased, t.value as total"; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; - $sql .= " WHERE o.customers_id = " . $client->id; - $sql .= " AND o.orders_id = t.orders_id AND t.class = 'ot_total'"; - //echo $sql; - $resql=$dbosc->query($sql); - if ($resql) - { - $num = $dbosc->num_rows($resql); - $i = 0; - print ''; - print ""; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - - print '\n"; - print "\n"; - $i++; - } - print "
Commandes
Fiche '; - - print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour')."\n"; - print $objp->total . "
"; - $dbosc->free($resql); - } - else - { - print "

ERROR 1

\n"; - dol_print_error($dbosc); - } - - } - else - { - print "

ERROR 1

\n"; - dol_print_error($dbosc); - } -} -else -{ - print "

ERROR 1

\n"; - print "Error"; -} - - -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - -// Pas d'action - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php deleted file mode 100644 index fdf393043b0..00000000000 --- a/htdocs/boutique/client/class/boutiqueclient.class.php +++ /dev/null @@ -1,77 +0,0 @@ - - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/client/class/boutiqueclient.class.php - * \brief Classe permettant de gerer des clients de la boutique online - * \author Rodolphe Quiedeville - */ - -/** - * \class BoutiqueClient - * \brief Classe permettant de gerer des clients de la boutique online - */ -class BoutiqueClient -{ - var $db ; - - var $id ; - var $nom; - - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - - /** - * Fonction permettant de recuperer les informations d'un clients de la boutique - * - * @param int $id Id du client - * @return int <0 if KO, >0 if OK - */ - function fetch($id) - { - global $conf; - - $sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers WHERE customers_id = ".$id; - - $resql = $this->db->query($sql); - if ( $resql ) - { - $result = $this->db->fetch_array($resql); - - $this->id = $result["customers_id"]; - $this->name = $result["customers_firstname"] . " " . $result["customers_lastname"]; - - $this->db->free($resql); - return 1; - } - else - { - print $this->db->error(); - return -1; - } - } - -} diff --git a/htdocs/boutique/client/class/index.html b/htdocs/boutique/client/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php deleted file mode 100644 index dae59eb50cb..00000000000 --- a/htdocs/boutique/client/index.php +++ /dev/null @@ -1,91 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/client/index.php - * \ingroup boutique - * \brief Page gestion client OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$langs->load("companies"); - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(c.customers_lastname)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des clients", $page, $_SERVER["PHP_SELF"]); - -$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c"; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"], "c.customers_firstname"); - print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"], "c.customers_lastname"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print '\n"; - print '\n"; - print "\n"; - print "\n"; - print "\n"; - $i++; - } - print "
'.$langs->trans("EMail").''.$langs->trans("Newsletter").'
'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php deleted file mode 100644 index 5030e5ac559..00000000000 --- a/htdocs/boutique/commande/ca.php +++ /dev/null @@ -1,115 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/commande/ca.php - * \ingroup boutique - * \brief Page ca commandes du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") -{ - $sortfield="date_purchased"; -} -if ($sortorder == "") -{ - $sortorder="DESC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des commandes", $page, "ca.php"); - -print ''; -print ''; -print ''; - -$sql = "SELECT sum(t.value) as value"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$sql .= " WHERE t.class = 'ot_subtotal'"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - - $var=True; - if ($num > 0) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print ''; - print ''; - - print "\n"; - $i++; - } - - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$sql = "SELECT sum(t.value) as value"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$sql .= " WHERE t.class = 'ot_shipping'"; -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - - $var=True; - if ($num > 0) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print ''; - print ''; - $i++; - } - - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - - -print "
'.$langs->trans("Description").''.$langs->trans("Lastname").'
Somme des commandes'.price($objp->value).'
Somme des frais de port'.price($objp->value).'
"; - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/commande/card.php b/htdocs/boutique/commande/card.php deleted file mode 100644 index f6719bb40bb..00000000000 --- a/htdocs/boutique/commande/card.php +++ /dev/null @@ -1,155 +0,0 @@ - - * Copyright (C) 2003-2005 Eric Seigne - * Copyright (C) 2004-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/commande/card.php - * \ingroup boutique - * \brief Page fiche commande OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; -include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'; - -$langs->load("products"); - -$id=GETPOST('id', 'int'); - -/* - * View - */ - -llxHeader(); - - -if ($id > 0) -{ - $commande = new BoutiqueCommande($db); - $result = $commande->fetch($id); - if ($result) - { - print '
'.$langs->trans("OrderCard").': '.$commande->id.'

'; - - print ''; - print ''; - print ''; - - print ''; - - print ""; - - print ""; - print ""; - print ""; - - print "
Date'.$commande->date.'
Client'.$commande->client_name.'
Paiement'.$commande->payment_method.'
".$langs->trans("Address")."".$langs->trans("Delivery")."".$langs->trans("Invoice")."
 ".$commande->delivery_adr->name."
".$commande->delivery_adr->street."
".$commande->delivery_adr->zip."
".$commande->delivery_adr->city."
".$commande->delivery_adr->country."		".$commande->billing_adr->name."
".$commande->billing_adr->street."
".$commande->billing_adr->zip."
".$commande->billing_adr->city."
".$commande->billing_adr->country."
"; - - print "
"; - - /* - * Produits - * - */ - $sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity"; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_products"; - $sql .= " WHERE orders_id = " . $commande->id; - //$commande->id; - // echo $sql; - $resql=$dbosc->query($sql); - if ($resql) - { - $num = $dbosc->num_rows($resql); - $i = 0; - print ''; - print ''; - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print '"; - - print '\n"; - print "\n"; - print "\n"; - - print "\n"; - $i++; - } - print "
'.$langs->trans("Products").''.$langs->trans("Number").''.$langs->trans("Price").'Prix final
'; - print 'Fiche livre'; - - print ''.$objp->products_name.''; - print "$objp->products_quantityrowid\">".price($objp->products_price)."rowid\">".price($objp->final_price)."
"; - $dbosc->free(); - } - else - { - print $dbosc->error(); - } - - /* - * - * - */ - print "
"; - - print ''; - print ""; - print ''; - print ''; - print "
Frais d\'expeditions'.price($commande->total_ot_shipping).' EUR
'.$langs->trans("Lastname").''.price($commande->total_ot_total).' EUR
"; - - - - } - else - { - print "Fetch failed"; - } -} -else -{ - print "Error"; -} - - -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; -print '
-----

'; - - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php deleted file mode 100644 index 0a3383a33a3..00000000000 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ /dev/null @@ -1,138 +0,0 @@ - - * Copyright (C) 2008 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/commande/class/boutiquecommande.class.php - * \ingroup osc - * \brief Fichier de la classe des commandes de la boutique online - */ - -require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php'; -include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'; - - -/** - * Class to manage orders OSC - */ -class BoutiqueCommande -{ - var $db; - - var $id; - var $nom; - - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - - $this->billing_adr = new Address(); - $this->delivry_adr = new Address(); - - $this->total_ot_subtotal = 0; - $this->total_ot_shipping = 0; - } - - /** - * Get object and lines from database - * - * @param int $id id of object to load - * @param string $ref Ref of order - * @return int >0 if OK, <0 if KO - */ - function fetch($id,$ref='') - { - global $conf; - - $sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_zipcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_zipcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value"; - $sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders"; - $sql.= " WHERE orders_id = ".$id; - - $result = $this->db->query($sql); - if ( $result ) - { - $array = $this->db->fetch_array($result); - - $this->id = $array["orders_id"]; - $this->client_id = $array["customers_id"]; - $this->client_name = $array["customers_name"]; - - $this->payment_method = $array["payment_method"]; - - $this->date = $this->db->jdate($array["date_purchased"]); - - $this->delivery_adr->name = $array["delivery_name"]; - $this->delivery_adr->street = $array["delivery_street_address"]; - $this->delivery_adr->zip = $array["delivery_zipcode"]; - $this->delivery_adr->city = $array["delivery_city"]; - $this->delivery_adr->country = $array["delivery_country"]; - - $this->billing_adr->name = $array["billing_name"]; - $this->billing_adr->street = $array["billing_street_address"]; - $this->billing_adr->zip = $array["billing_zipcode"]; - $this->billing_adr->city = $array["billing_city"]; - $this->billing_adr->country = $array["billing_country"]; - - $this->db->free(); - - /* - * Totaux - */ - $sql = "SELECT value, class "; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total WHERE orders_id = $id"; - - $result = $this->db->query($sql); - if ( $result ) - { - $num = $this->db->num_rows($result); - - $i=0; - while ($i < $num) - { - $array = $this->db->fetch_array($result); - if ($array["class"] == 'ot_total') - { - $this->total_ot_total = $array["value"]; - } - if ($array["class"] == 'ot_shipping') - { - $this->total_ot_shipping = $array["value"]; - } - $i++; - } - } - else - { - print $this->db->error(); - } - - } - else - { - print $this->db->error(); - } - - return $result; - } - -} diff --git a/htdocs/boutique/commande/class/index.html b/htdocs/boutique/commande/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php deleted file mode 100644 index 0ce6b7b3655..00000000000 --- a/htdocs/boutique/commande/index.php +++ /dev/null @@ -1,92 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/commande/index.php - * \ingroup boutique - * \brief Page gestion commandes OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - - -llxHeader(); - -if ($sortfield == "") -{ - $sortfield="date_purchased"; -} -if ($sortorder == "") -{ - $sortorder="DESC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des commandes", $page, "commande.php"); - - $sql = "SELECT o.orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value, t.value"; - -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'"; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print ""; - print ""; - print_liste_field_titre("Client","commande.php", "customers_name"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - - print ''; - print '\n"; - print ''; - print "\n"; - $i++; - } - print "
".$langs->trans("Ref")."".$langs->trans("Date")."'.$langs->trans("Total").'
Fiche '; - print $objp->orders_id .""; - print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour').''.$objp->customers_name."'.price($objp->value).'
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php deleted file mode 100644 index dd3cda24d96..00000000000 --- a/htdocs/boutique/critiques/bestproduct.php +++ /dev/null @@ -1,97 +0,0 @@ - - * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/critiques/bestproduct.php - * \ingroup boutique - * \brief Page affichage meilleures critiques OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="rat"; -} -if ($sortorder == "") { - $sortorder="DESC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - - -print_barre_liste("Liste des produits classes par critiques", $page, "bestproduct.php"); - -$sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_id, p.products_model, p.products_quantity, p.products_status"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p "; -$sql .= " WHERE r.products_id = p.products_id"; -$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status"; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -print "

"; -print "'; -print ''; -print "\n"; - - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print ''; - print '\n"; - print '\n"; - print '\n"; - print "\n"; - $i++; - } - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -print "
".$langs->trans("Ref"); -print 'Indice critiquesQuantite'; -print 'Status
'.$objp->products_model.''.$objp->rat."'.$objp->products_quantity."'.$objp->products_status."
"; - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/critiques/card.php b/htdocs/boutique/critiques/card.php deleted file mode 100644 index 1c75faebbee..00000000000 --- a/htdocs/boutique/critiques/card.php +++ /dev/null @@ -1,82 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/critiques/card.php - * \ingroup boutique - * \brief Page fiche critique OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$id=$_GET["id"]; - - - -llxHeader(); - -if ($id) -{ - - $critique = new Critique($dbosc); - $result = $critique->fetch($id); - - if ( $result ) - { - - print '

Fiche Critique

'; - - print ''; - print ""; - print ''; - - print ''; - print "
Produit'.$critique->product_name.'
Texte'.nl2br($critique->text).'
"; - - - - } - else - { - print "Fetch failed"; - } - -} - -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; -print '
-----

'; - - - -$dbosc->close(); - -llxFooter(); - diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php deleted file mode 100644 index cd3a72088ad..00000000000 --- a/htdocs/boutique/critiques/class/critique.class.php +++ /dev/null @@ -1,84 +0,0 @@ - - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/critiques/class/critique.class.php - * \ingroup osc - * \brief Fichier de la classe des critiques OSCommerce - */ - - -/** - * Classe permettant la gestion des critiques OSCommerce - */ -class Critique -{ - var $db; - - var $id; - var $nom; - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - - /** - * Load instance - * - * @param int $id Id to load - * @return int <0 if KO, >0 if OK - */ - function fetch ($id) - { - global $conf; - - $sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name"; - - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews_description as d"; - $sql .= " ,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p"; - - $sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id"; - $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID; - $sql .= " AND r.reviews_id=$id"; - - $result = $this->db->query($sql); - - if ( $result ) - { - $result = $this->db->fetch_array($result); - - $this->id = $result["reviews_id"]; - $this->product_name = stripslashes($result["products_name"]); - $this->text = stripslashes($result["reviews_text"]); - - $this->db->free($result); - } - else - { - print $this->db->lasterror(); - } - - return $result; - } - -} diff --git a/htdocs/boutique/critiques/class/index.html b/htdocs/boutique/critiques/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php deleted file mode 100644 index 35e536ed66e..00000000000 --- a/htdocs/boutique/critiques/index.php +++ /dev/null @@ -1,92 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/critiques/index.php - * \ingroup boutique - * \brief Page gestion critiques OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="date_added"; -} -if ($sortorder == "") { - $sortorder="DESC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Critiques", $page, "index.php"); - -$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews_description as d, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p"; -$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id"; -$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -print "

"; -print ''; -print ""; -print ""; -print ""; -print ""; -print "\n"; - -$resql=$dbosc->query($sql); -if ($resql) { - $num = $dbosc->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print '\n"; - print "\n"; - print "\n"; - $i++; - } - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -print "
ProduitCritiqueNote
".substr($objp->products_name, 0, 30)."'.substr($objp->reviews_text, 0, 40)." ...$objp->reviews_rating
"; - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php deleted file mode 100644 index 28cd6ec397a..00000000000 --- a/htdocs/boutique/index.php +++ /dev/null @@ -1,245 +0,0 @@ - - * Copyright (C) 2004-2007 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/index.php - * \ingroup boutique - * \brief Main page of shop zone - */ - -require '../main.inc.php'; - -$langs->load("shop"); -$langs->load("orders"); - -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -llxHeader("",$langs->trans("OSCommerceShop"),""); - -print_fiche_titre($langs->trans("OSCommerceShop")); - -print ''; - -print ''; -/* - * Last customers who ordered - */ -$sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; -$sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1"; -$sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print '
'; - - -/* - * Turnover - */ - -print_titre($langs->trans('SalesTurnover')); - -print ''; -print ''; -print ''; - -$now=dol_now(); - -$sql = "SELECT SUM(t.value) as value, MONTH(o.date_purchased) as month"; -$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$sql.= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; -//$sql.= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate($now).")"; -$sql.= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR('".$db->idate($now)."')"; -$sql.= " GROUP BY month"; -$sql.= " ORDER BY month"; -//print $sql;exit; - -$result=$dbosc->query($sql); -if ($result) -{ - $num = $dbosc->num_rows($result); - - $var=True; - $i=0; - if ($num > 0) - { - while ($i < $num) - { - $objp = $dbosc->fetch_object($result); - $var=!$var; - print ""; - print ''; - print ''; - - print "\n"; - $i++; - } - } - - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - - -print "
'.$langs->trans("Month").''.$langs->trans("Total").'
'.$objp->mois.''.price($objp->value).'
"; -print '		'; -print_titre($langs->trans("Orders")); - -/* - * Last 5 successful commands - select o.orders_id, o.customers_id, o.customers_name, o.date_purchased, o.payement_method, o.status, t.value - from orders_total as t - join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc - */ -$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; -$sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print ''; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("LastOrders").'
".$obj->orders_id."".$obj->customers_name."".price($obj->value)."".$obj->payment_method."

"; - } -} -else -{ - dol_print_error($dbosc); -} - -/* - * Last 5 orders on hold - */ -$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; -$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print ''; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("En Attente").'
$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method

"; - } -} -else -{ - dol_print_error($dbosc); -} - -/* - * Commands to treat - */ -$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; -$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print ''; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("TreatmentInProgress").'
$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method

"; - } -} -else -{ - dol_print_error($dbosc); -} - - -print '
'; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("Derniers clients").'
$obj->date_purchased$obj->customers_name$obj->delivery_country".price($obj->value)."$obj->payment_method$obj->orders_id$obj->statut

"; - } -} -else -{ - dol_print_error($dbosc); -} -print '

'; - - -llxFooter(); - -$dbosc->close(); diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php deleted file mode 100644 index 6799af10708..00000000000 --- a/htdocs/boutique/notification/index.php +++ /dev/null @@ -1,89 +0,0 @@ - - * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/notification/index.php - * \ingroup boutique - * \brief Page gestion notification OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$langs->load("products"); - - - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(c.customers_lastname)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des notifications", $page, "index.php"); - -$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, p.products_name, p.products_id"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_notifications as n,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p"; -$sql .= ",".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c"; -$sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id"; -$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print_liste_field_titre("Client",$_SERVER["PHP_SELF"], "c.customers_lastname"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print '"; - print "\n"; - $i++; - } - print "
'.$langs->trans("Product").'
rowid\">$objp->customers_firstname $objp->customers_lastname'.$objp->products_name."
"; - $dbosc->free($resql); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php deleted file mode 100644 index ad04d7d61b0..00000000000 --- a/htdocs/boutique/notification/produits.php +++ /dev/null @@ -1,95 +0,0 @@ - - * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/notification/produits.php - * \ingroup boutique - * \brief Page fiche notification produits OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(p.products_name)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des produits suivis", $page, "produits.php"); - -$sql = "SELECT p.products_name, p.products_id, count(p.products_id) as nb"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_notifications as n,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p"; -$sql .= " WHERE p.products_id=n.products_id"; -$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID; -$sql .= " GROUP BY p.products_name, p.products_id"; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print "

"; - print ""; - print ''; - print ""; - print ""; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - - print '"; - print ''; - - print ''; - print ''; - - print "\n"; - $i++; - } - print "
ProduitNb.
'.$objp->products_name."'.$objp->nb.'Voir les clientsEnvoyer une news
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php deleted file mode 100644 index 057c15f30e1..00000000000 --- a/htdocs/boutique/osc_master.inc.php +++ /dev/null @@ -1,38 +0,0 @@ - - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/osc_master.inc.php - * \brief File of preparation of the environment Dolibarr for OSCommerce - */ - - -/* - * Creation objet $dbosc - */ -$dbosc=getDoliDBInstance($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT); - -if (! $dbosc->connected) -{ - dol_syslog($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error,LOG_ERR); - - llxHeader("",$langs->trans("OSCommerceShop"),""); - print '

'.$langs->trans('FailedConnectDBCheckModuleSetup').'
'; - llxFooter(); - exit; -} - diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php deleted file mode 100644 index 2574b7cb7f4..00000000000 --- a/htdocs/boutique/produits/index.php +++ /dev/null @@ -1,88 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/produits/index.php - * \ingroup boutique - * \brief Page gestion produits du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$langs->load("companies"); - - - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(c.customers_lastname)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des clients", $page, $_SERVER["PHP_SELF"]); - -$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; -$sql .= " FROM ".DB_NAME_OSC.".customers as c"; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"], "c.customers_firstname"); - print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"], "c.customers_lastname"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print '\n"; - print '\n"; - print "\n"; - print "\n"; - print "\n"; - $i++; - } - print "
'.$langs->trans("EMail").''.$langs->trans("Newsletter").'
'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter
"; - $dbosc->free($resql); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/produits/osc-list.php b/htdocs/boutique/produits/osc-list.php deleted file mode 100644 index 4edf156dd05..00000000000 --- a/htdocs/boutique/produits/osc-list.php +++ /dev/null @@ -1,106 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/produits/osc-list.php - * \ingroup boutique - * \brief Page gestion produits du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="p.label,p.price"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - - -print_barre_liste("Liste des produits oscommerce", $page, "osc-list.php"); - -$sql = "SELECT p.products_id, p.products_model, p.products_quantity, p.products_status, d.products_name, m.manufacturers_name, m.manufacturers_id"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as d, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."manufacturers as m"; -$sql .= " WHERE p.products_id = d.products_id AND d.language_id =" . $conf->global->OSC_LANGUAGE_ID; -$sql .= " AND p.manufacturers_id=m.manufacturers_id"; -if ($reqstock=='epuise') -{ - $sql .= " AND p.products_quantity <= 0"; -} - -//$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -print "

"; -print ''; -print ""; -print ""; -print ""; -print ""; -print ''; -print ''; -print ''."\n"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print '\n"; - print '\n"; - print "\n"; - $i++; - } - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -print "
idRefTitreGroupeStockStatus
$objp->products_id$objp->products_model$objp->products_name$objp->manufacturers_name'.$objp->products_quantity."'.$objp->products_status."
"; - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/promotion/class/index.html b/htdocs/boutique/promotion/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php deleted file mode 100644 index 6e965ad76d1..00000000000 --- a/htdocs/boutique/promotion/class/promotion.class.php +++ /dev/null @@ -1,213 +0,0 @@ - - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/promotion/class/promotion.class.php - * \brief File of class to manage discounts on online shop - */ - -/** - * \class Promotion - * \brief Class to manage discounts on online shop - */ -class Promotion -{ - var $db; - - var $id; - var $parent_id; - var $oscid; - var $ref; - var $titre; - var $description; - var $price; - var $status; - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - - /** - * Create promotion - * - * @param User $user Object user - * @param int $pid Pid - * @param int $percent Percent - * @return int <0 if KO, >0 if OK - */ - function create($user, $pid, $percent) - { - global $conf; - - $sql = "SELECT products_price "; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p"; - $sql .= " WHERE p.products_id = ".$pid; - - $result = $this->db->query($sql); - if ( $result ) - { - $result = $this->db->fetch_array($result); - $this->price_init = $result["products_price"]; - } - - $newprice = $percent * $this->price_init; - - $date_exp = "2003-05-01"; // TODO ???? - - $now=dol_now(); - - $sql = "INSERT INTO ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials "; - $sql .= " (products_id, specials_new_products_price, specials_date_added, specials_last_modified, expires_date, date_status_change, status) "; - $sql .= " VALUES ($pid, $newprice, '".$this->db->idate($now)."', NULL, '".$this->db->idate($now+3600*24*365)."', NULL, 1)"; - - if ($this->db->query($sql) ) - { - $id = $this->db->last_insert_id(OSC_DB_NAME.".specials"); - - return $id; - } - else - { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Update - * - * @param int $id id - * @param User $user Object user - * @return int <0 if KO, >0 if OK - */ - function update($id, $user) - { - $sql = "UPDATE ".MAIN_DB_PREFIX."album "; - $sql .= " SET title = '" . trim($this->titre) ."'"; - $sql .= ",description = '" . trim($this->description) ."'"; - - $sql .= " WHERE rowid = " . $id; - - if ( $this->db->query($sql) ) { - return 1; - } else { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Set active - * - * @param int $id id - * @return int <0 if KO, >0 if OK - */ - function set_active($id) - { - global $conf; - - $sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials"; - $sql .= " SET status = 1"; - - $sql .= " WHERE products_id = " . $id; - - if ( $this->db->query($sql) ) { - return 1; - } else { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Set inactive - * - * @param int $id id - * @return int <0 if KO, >0 if OK - */ - function set_inactive($id) - { - global $conf; - - $sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials"; - $sql .= " SET status = 0"; - - $sql .= " WHERE products_id = " . $id; - - if ( $this->db->query($sql) ) { - return 1; - } else { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Fetch datas - * - * @param int $id id - * @return int <0 if KO, >0 if OK - */ - function fetch($id) - { - global $conf; - - $sql = "SELECT c.categories_id, cd.categories_name, c.parent_id"; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."categories as c,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."categories_description as cd"; - $sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".$conf->global->OSC_LANGUAGE_ID; - $sql .= " AND c.categories_id = ".$id; - $result = $this->db->query($sql); - - if ( $result ) { - $result = $this->db->fetch_array($result); - - $this->id = $result["categories_id"]; - $this->parent_id = $result["parent_id"]; - $this->name = $result["categories_name"]; - $this->titre = $result["title"]; - $this->description = $result["description"]; - $this->oscid = $result["osc_id"]; - } - $this->db->free($result); - - return $result; - } - - - /** - * Delete object - * - * @param User $user Object user - * @return int <0 if KO, >0 if OK - */ - function delete($user) - { - global $conf; - - $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc "; - - $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc"; - - $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description WHERE products_id = $idosc"; - - } - - -} diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php deleted file mode 100644 index 10dfa09a8c1..00000000000 --- a/htdocs/boutique/promotion/index.php +++ /dev/null @@ -1,119 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/promotion/index.php - * \ingroup boutique - * \brief Page gestion promotions OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -llxHeader(); - -if ($action == "inactive") -{ - $promotion = new Promotion($dbosc); - $promotion->set_inactive($id); -} -if ($action == "active") -{ - $promotion = new Promotion($dbosc); - $promotion->set_active($id); -} - -if ($sortfield == "") -{ - $sortfield="pd.products_name"; -} -if ($sortorder == "") -{ - $sortorder="ASC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des promotions", $page, "index.php", "",$sortfield, $sortorder); - -$urladd = "&sortorder=$sortorder&sortfield=$sortfield"; - -$sql = "SELECT pd.products_name, s.specials_new_products_price, p.products_price, p.products_model, s.status, p.products_id,"; -$sql.= " expires_date as fin"; -$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials as s,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as pd,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p"; -$sql.= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".$conf->global->OSC_LANGUAGE_ID; -$sql.= " ORDER BY $sortfield $sortorder "; -$sql.= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ''; - print ""; - print_liste_field_titre($langs->trans("Ref"),"index.php", "p.products_model"); - print_liste_field_titre("Titre","index.php", "pd.products_name"); - print ""; - print ''; - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($i); - $var=!$var; - - print ""; - print '"; - print '"; - - if ($objp->status == 1) - { - print ''; - print ''; - } - else - { - print ''; - print ''; - } - print ""; - print '"; - print '"; - print ""; - $i++; - } - print "
  FinPrix initialPrix remise
'.$objp->products_model."'.$objp->products_name."actif'; - print ''; - print ''; - print ''; - print 'inactif".dol_print_date($dbosc->jdate($objp->fin),'day')."'.price($objp->products_price)."'.price($objp->specials_new_products_price)."
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} -$dbosc->close(); - -llxFooter(); - diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php deleted file mode 100644 index 956811ea4e3..00000000000 --- a/htdocs/core/boxes/box_osc_client.php +++ /dev/null @@ -1,112 +0,0 @@ - - * Copyright (C) 2005-2008 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/core/boxes/box_osc_client.php - * \ingroup osc - * \brief Module to generate box of shop customers - */ - -include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; - - -/** - * Class to manage the box to show last customers of shop - */ -class box_osc_clients extends ModeleBoxes -{ - var $boxcode="nbofcustomers"; - var $boximg="object_company"; - var $boxlabel="BoxNbOfCustomers"; - var $depends = array("boutique"); - - var $db; - var $param; - - var $info_box_head = array(); - var $info_box_contents = array(); - - - /** - * Load data into info_box_contents array to show array later. - * - * @param int $max Maximum number of records to load - * @return void - */ - function loadBox($max=5) - { - global $conf, $user, $langs, $db; - $langs->load("boxes"); - - $this->max=$max; - - $this->info_box_head = array('text' => $langs->trans("BoxTitleNbOfCustomers",$max)); - - if ($user->rights->boutique->lire) - { - $sql = "SELECT count(*) as cus FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers"; - - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - - $i = 0; - - while ($i < $num) - { - $objp = $db->fetch_object($resql); - - $this->info_box_contents[$i][0] = array('td' => 'align="center" width="16"', - 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/boutique/client/index.php"); - $this->info_box_contents[$i][1] = array('td' => 'align="center"', - 'text' => $objp->cus, - 'url' => DOL_URL_ROOT."/boutique/client/index.php"); - $i++; - } - - $db->free($resql); - } - else { - $this->info_box_contents[0][0] = array( 'td' => 'align="left"', - 'maxlength'=>500, - 'text' => ($db->error().' sql='.$sql)); - } - } - else { - $this->info_box_contents[0][0] = array('td' => 'align="left"', - 'text' => $langs->trans("ReadPermissionNotAllowed")); - } - - } - - /** - * Method to show box - * - * @param array $head Array with properties of box title - * @param array $contents Array with properties of box lines - * @return void - */ - function showBox($head = null, $contents = null) - { - parent::showBox($this->info_box_head, $this->info_box_contents); - } - -} - diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 8455bcaf550..bb4a8161afb 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -16,7 +16,6 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read', '', 2, 90, __ENTITY__); -insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('boutique', '! empty($conf->boutique->enabled)', 11__+MAX_llx_menu__, __HANDLER__, 'top', 'shop', '', 0, '/boutique/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 100, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('hrm', '$conf->holiday->enabled || $conf->deplacement->enabled', 15__+MAX_llx_menu__, __HANDLER__, 'top', 'hrm', '', 0, '/compta/hrm.php?mainmenu=hrm&leftmenu=', 'HRM', -1, 'holiday', '$user->rights->holiday->write || $user->rights->deplacement->lire', '', 0, 80, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index b5273d3f3b0..bc41b3d9a97 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -236,26 +236,6 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) $menu->add('/core/tools.php?mainmenu=tools&leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", ''); } - // OSCommerce 1 - $tmpentry=array('enabled'=>(! empty($conf->boutique->enabled)), - 'perms'=>1, - 'module'=>'boutique'); - $showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal); - if ($showmode) - { - $langs->load("shop"); - - $classname=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } - else $classname = 'class="tmenu"'; - $idsel='shop'; - - if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode); - if (empty($noout)) print_text_menu_entry($langs->trans("OSCommerce"), $showmode, DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&leftmenu=', $id, $idsel, $classname, $atarget); - if (empty($noout)) print_end_menu_entry($showmode); - $menu->add('/boutique/index.php?mainmenu=shop&leftmenu=', $langs->trans("OSCommerce"), 0, $showmode, $atarget, "shop", ''); - } - // Members $tmpentry=array('enabled'=>(! empty($conf->adherent->enabled)), 'perms'=>(! empty($user->rights->adherent->lire)), diff --git a/htdocs/core/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php deleted file mode 100644 index 837dd8c6c24..00000000000 --- a/htdocs/core/modules/modBoutique.class.php +++ /dev/null @@ -1,118 +0,0 @@ - - * Copyright (C) 2004-2008 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \defgroup oscommerce Module oscommerce - * \brief Module pour gerer une boutique et interface avec OSCommerce - * \file htdocs/core/modules/modBoutique.class.php - * \ingroup oscommerce - * \brief Fichier de description et activation du module OSCommerce - */ - -include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; - - -/** - * Classe de description et activation du module OSCommerce - */ -class modBoutique extends DolibarrModules -{ - - /** - * Constructor. Define names, constants, directories, boxes, permissions - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - $this->numero = 800; - - $this->family = "products"; - // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) - $this->name = preg_replace('/^mod/i','',get_class($this)); - $this->description = "Interface de visualisation d'une boutique OSCommerce ou OSCSS"; - $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version - $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - $this->special = 1; - - // Data directories to create when module is enabled - $this->dirs = array(); - - // Config pages -// $this->config_page_url = array("boutique.php","osc-languages.php"); - $this->config_page_url = array("boutique.php@boutique"); - - // Dependancies - $this->depends = array(); - $this->requiredby = array(); - $this->conflictwith = array("modOSCommerceWS"); - $this->langfiles = array("shop"); - - // Constants - $this->const = array(); - $r=0; - - $this->const[$r][0] = "OSC_DB_HOST"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "localhost"; - $this->const[$r][3] = "Host for OSC database for OSCommerce module 1"; - $this->const[$r][4] = 0; - $r++; - - // Boites - $this->boxes = array(); - - // Permissions - $this->rights = array(); - $this->rights_class = 'boutique'; - } - - /** - * Function called when module is enabled. - * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. - * It also creates data directories. - * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO - */ - function init($options='') - { - $sql = array(); - - return $this->_init($sql,$options); - } - - /** - * Function called when module is disabled. - * Remove from database constants, boxes and permissions from Dolibarr database. - * Data directories are not deleted - * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO - */ - function remove($options='') - { - $sql = array(); - - return $this->_remove($sql,$options); - } - -} diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 778b3f2b9ff..8843378eda1 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1085,3 +1085,8 @@ CREATE TABLE llx_usergroup_extrafields ( ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public; + +-- remove OSC module +DELETE FROM llx_const WHERE name = 'MAIN_MODULE_BOUTIQUE'; +DELETE FROM llx_const WHERE name = 'OSC_DB_HOST'; +DELETE FROM llx_menu WHERE module = 'boutique'; diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index d38f47ae047..bbb952a9aed 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -484,10 +484,6 @@ Module600Name=الإخطارات Module600Desc=إرسال الإشعارات عن طريق البريد الإلكتروني على بعض الفعاليات التجارية Dolibarr لطرف ثالث اتصالات Module700Name=التبرعات Module700Desc=التبرعات إدارة -Module800Name=OSCommerce المباشر -Module800Desc=وتظهر على واجهة OSCommerce أو متجر OSCSS مباشرة عن طريق الوصول إلى قواعد البيانات -Module900Name=وكان من قبل OSCommerce -Module900Desc=وتظهر على واجهة المحل OSCommerce الخدمات عبر الإنترنت. \\ nThis حدة requiere لك لتثبيت عناصر من / oscommerce_ws / ws_server الى OSCommerce الخادم الخاص بك. انظر في الملف التمهيدي / oscommerce_ws / ws_server. Module1200Name=فرس النبي Module1200Desc=فرس النبي التكامل Module1400Name=المحاسبة diff --git a/htdocs/langs/ar_SA/shop.lang b/htdocs/langs/ar_SA/shop.lang deleted file mode 100644 index 4127cac2321..00000000000 --- a/htdocs/langs/ar_SA/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=متجر -ShopWeb=تسوق على الإنترنت -LastOrders=أوامر الماضي -OnStandBy=على اهبة الاستعداد -TreatmentInProgress=التقدم في العلاج -LastCustomers=آخر الزبائن -OSCommerceShop=OSCommerce متجر -OSCommerce=OSCommerce -AddProd=بيع على الانترنت diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 9f18e950065..a36e3bb3d83 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -484,10 +484,6 @@ Module600Name=Известия Module600Desc=Изпращане известия по имейл за някои бизнес събития в Dolibarr към трети лица Module700Name=Дарения Module700Desc=Управление на дарения -Module800Name=OSCommerce чрез директен достъп до базата данни -Module800Desc=Интерфейс, за да покаже OSCommerce или OSCSS магазин чрез пряк достъп до базата данни -Module900Name=OSCommerce от WS -Module900Desc=Интерфейс, за да покаже OSCommerce магазин чрез уеб услуги. Този модул ви requiere да инсталирате компоненти от / oscommerce_ws / ws_server във вашия OSCommerce сървър. Вижте README файл в / oscommerce_ws / ws_server. Module1200Name=Богомолка Module1200Desc=Mantis интеграция Module1400Name=Счетоводство diff --git a/htdocs/langs/bg_BG/shop.lang b/htdocs/langs/bg_BG/shop.lang deleted file mode 100644 index 6f793aeca45..00000000000 --- a/htdocs/langs/bg_BG/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Магазин -ShopWeb=Web Shop -LastOrders=Последни поръчки -OnStandBy=В режим на готовност -TreatmentInProgress=Лечението е в ход -LastCustomers=Последни клиенти -OSCommerceShop=OSCommerce магазин -OSCommerce=OSCommerce -AddProd=Продавайте онлайн diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 74afea9adf9..d0a6b1e9b4d 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/bs_BA/shop.lang b/htdocs/langs/bs_BA/shop.lang deleted file mode 100644 index a52f4da4322..00000000000 --- a/htdocs/langs/bs_BA/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Prodavnica -ShopWeb=Web Shop -LastOrders=Zadnje narudžbe -OnStandBy=Na stanju pripravnosti -TreatmentInProgress=Postupak u toku -LastCustomers=Zadnji kupci -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Prodaj online diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index eaebca0fecb..6678779d0b8 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notificacions Module600Desc=Enviament de notificacions (per correu electrònic) sobre els esdeveniments de treball Dolibarr Module700Name=Donacions Module700Desc=Gestió de donacions -Module800Name=OSCommerce 1 -Module800Desc=Interface de visualització d'una botiga OSCommerce mitjançant accés directe a la seva base de dades -Module900Name=OSCommerce 2 -Module900Desc=Interface de visualització d'una botiga OSCommerce mitjançant web services. Aquest mòdul requereix instal lar els fitxers de /oscommerce_ws/ws_server a OSCommerce. Consulteu el fitxer README de la carpeta /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis Module1400Name=Comptabilitat experta diff --git a/htdocs/langs/ca_ES/shop.lang b/htdocs/langs/ca_ES/shop.lang deleted file mode 100644 index 31969b6b2ce..00000000000 --- a/htdocs/langs/ca_ES/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Tenda -ShopWeb=Tenda web -LastOrders=Ultimes comandes -OnStandBy=En espera -TreatmentInProgress=En procés -LastCustomers=Ultims clients -OSCommerceShop=Tenda OS Commerce -OSCommerce=OSCommerce -AddProd=Venda en línia diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index 982001ce693..d20dc41d8d1 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -484,10 +484,6 @@ Module600Name=Upozornění Module600Desc=Zasílat upozornění e-mailem na některých firemních akcí Dolibarr třetích stran kontakty Module700Name=Dary Module700Desc=Darování řízení -Module800Name=OsCommerce přímým přístup k databázi -Module800Desc=Rozhraní ukazovat osCommerce nebo OSCSS obchod prostřednictvím přímého přístupu do databáze -Module900Name=OsCommerce podle WS -Module900Desc=Rozhraní ukazovat osCommerce obchod prostřednictvím webových služeb. Tento modul requiere k instalaci komponenty / oscommerce_ws / ws_server do osCommerce serveru. Viz soubor README v / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integrace Module1400Name=Účetnictví diff --git a/htdocs/langs/cs_CZ/shop.lang b/htdocs/langs/cs_CZ/shop.lang deleted file mode 100644 index 2c7084b4645..00000000000 --- a/htdocs/langs/cs_CZ/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Obchod -ShopWeb=Web Shop -LastOrders=Poslední objednávky -OnStandBy=Na pohotovosti -TreatmentInProgress=Léčba probíhá -LastCustomers=Poslední zákazníky -OSCommerceShop=OsCommerce obchod -OSCommerce=OsCommerce -AddProd=Prodej on-line diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 4e568f96adb..e9a7ab0efba 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -484,10 +484,6 @@ Module600Name=Adviséringer Module600Desc=Send meddelelser (via email) på Dolibarr business-arrangementer Module700Name=Donationer Module700Desc=Gaver 'ledelse -Module800Name=OsCommerce direkte -Module800Desc=Interface til at vise en osCommerce eller OSCSS shop via direkte database adgang -Module900Name=OsCommerce fra WAS -Module900Desc=Interface til at vise en osCommerce shop via Web services. \\ NDette modul requiere dig om at installere komponenter fra / oscommerce_ws / ws_server ind på din osCommerce server. Se README-fil i / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Regnskabsmæssig ekspert diff --git a/htdocs/langs/da_DK/shop.lang b/htdocs/langs/da_DK/shop.lang deleted file mode 100644 index 3d8769d31e3..00000000000 --- a/htdocs/langs/da_DK/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Seneste kendelser -OnStandBy=På standby -TreatmentInProgress=Behandling i gang -LastCustomers=Seneste kunder -OSCommerceShop=OsCommerce shop -OSCommerce=OsCommerce -AddProd=Sælge online diff --git a/htdocs/langs/de_AT/shop.lang b/htdocs/langs/de_AT/shop.lang deleted file mode 100644 index 5e7756c5b2b..00000000000 --- a/htdocs/langs/de_AT/shop.lang +++ /dev/null @@ -1,5 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -ShopWeb=Webshop -OnStandBy=Im Standby-Modus -TreatmentInProgress=Abwicklung in Arbeit -AddProd=Produkt hinzuf� diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 76c256dc01e..a54acab10a2 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -484,10 +484,6 @@ Module600Name=Benachrichtigungen Module600Desc=Senden Sie Benachrichtigungen (per E-Mail) zu dolibarr-Events Module700Name=Spenden Module700Desc=Spendenverwaltung -Module800Name=OSCommerce -Module800Desc=Schnittstelle zur Verwaltung von OSCommerce über direkten Datenbankzugriff -Module900Name=OSCommerce über Webservices -Module900Desc=Schnittstelle zur Verwaltung von OSCommerce über WebServices \nDiese Modul erfordert die Installatio der Komponente /oscommerce_ws/ws_server auf Ihrem OSCommerce-Sercer. Siehe Readme-Datei in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis-Integation Module1400Name=Buchhaltung diff --git a/htdocs/langs/de_DE/shop.lang b/htdocs/langs/de_DE/shop.lang deleted file mode 100644 index d435660b0f1..00000000000 --- a/htdocs/langs/de_DE/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Internetshop -LastOrders=Letzte Bestellungen -OnStandBy=Im Warte-Modus -TreatmentInProgress=In Bearbeitung -LastCustomers=Letzte Kunden -OSCommerceShop=OsCommerce Shop -OSCommerce=OSCommerce -AddProd=Produkt hinzufügen diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index c0006d73d07..63aa5bcfa5e 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Δωρεές Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/el_GR/shop.lang b/htdocs/langs/el_GR/shop.lang deleted file mode 100644 index 1c353b5677a..00000000000 --- a/htdocs/langs/el_GR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Κατάστημα -ShopWeb=Web Shop -LastOrders=Τελευταία παραγγελίες -OnStandBy=Σε κατάσταση αναμονής -TreatmentInProgress=Επεξεργασία σε εξέλιξη -LastCustomers=Τελευταίοι πελάτες -OSCommerceShop=OsCommerce κατάστημα -OSCommerce=OsCommerce -AddProd=Online Πώληση diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 5d67dc0b38e..afea43ef1aa 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting @@ -1544,4 +1540,4 @@ Opened=Opened Closed=Closed Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type \ No newline at end of file +TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/en_US/shop.lang b/htdocs/langs/en_US/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/en_US/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 7e07827309a..61c6fdd0983 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -486,10 +486,6 @@ Module600Name=Notificaciones Module600Desc=Envío de notificaciones (por correo electrónico) sobre los eventos de trabajo Dolibarr Module700Name=Donaciones Module700Desc=Gestión de donaciones -Module800Name=OSCommerce 1 -Module800Desc=Interfaz de visualización de una tienda OSCommerce mediante acceso directo a su base de datos -Module900Name=OSCommerce 2 -Module900Desc=Interfaz de visualización de una tienda OSCommerce mediante Web services. Este módulo requiere instalar los archivos de /oscommerce_ws/ws_server en OSCommerce. Lea el archivo README del directorio /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis Module1400Name=Contabilidad experta diff --git a/htdocs/langs/es_ES/shop.lang b/htdocs/langs/es_ES/shop.lang deleted file mode 100644 index 67bf61fb702..00000000000 --- a/htdocs/langs/es_ES/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=No se pudo conectar con la base de datos oscommerce. Compruebe la configuración del módulo -Shop=Tienda -ShopWeb=Tienda web -LastOrders=Últimos pedidos -OnStandBy=En espera -TreatmentInProgress=En proceso -LastCustomers=Ultimos clientes -OSCommerceShop=Tienda OSCommerce -OSCommerce=OSCommerce -AddProd=Venta en línea diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 8b54a6035fe..69120573b78 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -484,10 +484,6 @@ Module600Name=Teated Module600Desc=Saada mõnede Dolibarri äritegevusega seotud sündmuste puhul teade kolmandate isikute kontaktidele Module700Name=Annetused Module700Desc=Annetuste haldamine -Module800Name=OsCommerce integratsioon otsese andmebaasi ligipääsu abil -Module800Desc=Liides, mis näitab OSCommercei või OSCSSi poodi otsese andmebaasi ligipääsu abil -Module900Name=OSCommercei tegi WS -Module900Desc=Liides, mis näitab OSCommercei poodi veebiteenuste abil. See moodul nõuab /oscommerce_ws/ws_server kaustast pärit komponentide paigaldamist OSCommercei serverisse. Loe README faili /oscommerce_ws/ws_server kaustas. Module1200Name=Mantis Module1200Desc=Mantise integratsioon Module1400Name=Raamatupidamine diff --git a/htdocs/langs/et_EE/shop.lang b/htdocs/langs/et_EE/shop.lang deleted file mode 100644 index 5de29a9d33e..00000000000 --- a/htdocs/langs/et_EE/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Pood -ShopWeb=Veebipood -LastOrders=Viimased tellimused -OnStandBy=Ootel -TreatmentInProgress=Töötlemine pooleli -LastCustomers=Viimased kliendid -OSCommerceShop=OsCommercei pood -OSCommerce=OsCommerce -AddProd=Müü veebis diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index d6df2ee709c..6d3d0715973 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/eu_ES/shop.lang b/htdocs/langs/eu_ES/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/eu_ES/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index a4dec3598a9..a68e5ad2b29 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -484,10 +484,6 @@ Module600Name=اطلاعیه ها Module600Desc=ارسال اطلاعیه ها از طریق ایمیل در برخی از وقایع کسب و کار Dolibarr به تماس با شخص ثالث Module700Name=کمک های مالی Module700Desc=مدیریت کمک مالی -Module800Name=آهنگ تولد با دسترسی به پایگاه داده مستقیم -Module800Desc=رابط برای نشان دادن آهنگ تولد و یا فروشگاه OSCSS از طریق دسترسی به پایگاه داده مستقیم -Module900Name=آهنگ تولد توسط WS -Module900Desc=رابط برای نشان دادن یک فروشگاه آهنگ تولد از طریق خدمات وب است. این ماژول requiere شما به نصب قطعات از / oscommerce_ws / ws_server به سرور آهنگ تولد خود را. فایل README را در / oscommerce_ws / ws_server کنید. Module1200Name=اخوندک Module1200Desc=ادغام آخوندک Module1400Name=حسابداری diff --git a/htdocs/langs/fa_IR/shop.lang b/htdocs/langs/fa_IR/shop.lang deleted file mode 100644 index 72454575e51..00000000000 --- a/htdocs/langs/fa_IR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=برای اتصال به پایگاه داده با همکاری شکست خورد. بررسی کنید راه اندازی ماژول شما -Shop=فروشگاه -ShopWeb=وب سایت فروشگاه -LastOrders=آخرین سفارشات -OnStandBy=آماده به کار -TreatmentInProgress=درمان در حال پیشرفت است -LastCustomers=تاریخ و زمان آخرین مشتریان -OSCommerceShop=فروشگاه آهنگ تولد -OSCommerce=آهنگ تولد -AddProd=فروش آنلاین diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 9e0d48b261b..9472bf72a88 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -484,10 +484,6 @@ Module600Name=Ilmoitukset Module600Desc=Lähetä ilmoitukset (sähköposti) on Dolibarr liiketoiminnan tapahtumat Module700Name=Lahjoitukset Module700Desc=Lahjoitukset hallinto -Module800Name=OSCommerce suoraan -Module800Desc=Liitäntä osoittavat OSCommerce tai OSCSS liikkeen kautta suoraan tietokantaan pääsy -Module900Name=OSCommerce se oli -Module900Desc=Liitäntä osoittavat OSCommerce liikkeen kautta web-palveluja. \\ NTämä moduuli requiere voit asentaa komponentteja / oscommerce_ws / ws_server osaksi OSCommerce palvelimeen. Katso README-tiedosto / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis yhdentyminen Module1400Name=Kirjanpidon asiantuntija diff --git a/htdocs/langs/fi_FI/shop.lang b/htdocs/langs/fi_FI/shop.lang deleted file mode 100644 index cef02012db1..00000000000 --- a/htdocs/langs/fi_FI/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Viimeisin tilaukset -OnStandBy=Valmiustilassa -TreatmentInProgress=Käsittely kehitykseen -LastCustomers=Viimeisin asiakkaille -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 8fa7ed80885..3d12cd5d1d7 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -486,10 +486,6 @@ Module600Name=Notifications Module600Desc=Envoi de notifications (par email) aux contacts de tiers sur certains événements métiers Module700Name=Dons Module700Desc=Gestion des dons -Module800Name=OSCommerce direct -Module800Desc=Interface de visualisation d'une boutique OSCommerce ou OSCSS par accès direct en base -Module900Name=OSCommerce by WS -Module900Desc=Interface de visualisation d'une boutique OSCommerce par accès via des Web services. Ce module requiert d'installer les fichiers de /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface avec le bug tracker Mantis Module1400Name=Comptabilité diff --git a/htdocs/langs/fr_FR/shop.lang b/htdocs/langs/fr_FR/shop.lang deleted file mode 100644 index a04bb133c21..00000000000 --- a/htdocs/langs/fr_FR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Impossible de se connecter à la base de données oscommerce. Vérifiez la configuration du module -Shop=Boutique -ShopWeb=Boutique Web -LastOrders=Dernières commandes -OnStandBy=En attente -TreatmentInProgress=Traitement en cours -LastCustomers=Derniers clients -OSCommerceShop=Boutique OSCommerce -OSCommerce=OSCommerce -AddProd=Vendre en ligne diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index d06a1f0dde4..4336cdbbc2f 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -484,10 +484,6 @@ Module600Name=הודעות Module600Desc=שלח דיווחים בדואר אלקטרוני על כמה אירועים עסקיים Dolibarr לאנשי הקשר הצד השלישי Module700Name=תרומות Module700Desc=התרומה של ההנהלה -Module800Name=OsCommerce על ידי גישה ישירה באתר -Module800Desc=ממשק להראות osCommerce או חנות OSCSS באמצעות גישה ישירה באתר -Module900Name=OsCommerce ידי WS -Module900Desc=ממשק להראות חנות osCommerce באמצעות שירותי אינטרנט. מודול זה requiere לך להתקין רכיבים מ / oscommerce_ws / ws_server אל שרת osCommerce שלך. הצג הקובץ README ב / oscommerce_ws / ws_server. Module1200Name=גמל שלמה Module1200Desc=גמל שלמה אינטגרציה Module1400Name=חשבונאות diff --git a/htdocs/langs/he_IL/shop.lang b/htdocs/langs/he_IL/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/he_IL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 158b2bdd437..63e00f10c35 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/hr_HR/shop.lang b/htdocs/langs/hr_HR/shop.lang deleted file mode 100644 index 595948cc6fb..00000000000 --- a/htdocs/langs/hr_HR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Trgovina -ShopWeb=Web trgovina -LastOrders=Zadnje narudžbe -OnStandBy=Na čekanju -TreatmentInProgress=Tretman je u tijeku -LastCustomers=Zadnji kupci -OSCommerceShop=OScommerce trgovina -OSCommerce=OSCommerce -AddProd=Prodavaj putem web trgovine diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 3a6875cd6c1..2beab209170 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -484,10 +484,6 @@ Module600Name=Értesítések Module600Desc=Küldés e-mailben értesítést néhány Dolibarr üzleti rendezvények, harmadik fél kapcsolatok Module700Name=Adományok Module700Desc=Adomány vezetése -Module800Name=Webáruház közvetlen adatbázis elérés -Module800Desc=Interfész mutatnak OsCommerce vagy OSCSS üzlet Közvetlen adatbázis hozzáférés -Module900Name=OsCommerce WS -Module900Desc=Interfész mutatnak OsCommerce üzlet web-szolgáltatásokat. Ez a modul telepítését requiere komponenseket / oscommerce_ws / ws_server be OsCommerce szerverre. Lásd a README fájl a / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integráció Module1400Name=Számvitel diff --git a/htdocs/langs/hu_HU/shop.lang b/htdocs/langs/hu_HU/shop.lang deleted file mode 100644 index 07c66d77d53..00000000000 --- a/htdocs/langs/hu_HU/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Bolt -ShopWeb=Web Bolt -LastOrders=Utolsó rendelések -OnStandBy=Készenléti állapotban -TreatmentInProgress=Kezelés folyamatban -LastCustomers=Utolsó vásárlók -OSCommerceShop=OSCommerce bolt -OSCommerce=OSCommerce -AddProd=Online eladás diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index c845f70844e..cfd14b6400d 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/id_ID/shop.lang b/htdocs/langs/id_ID/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/id_ID/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index a648d649de8..4fd6f1baf59 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -484,10 +484,6 @@ Module600Name=Tilkynningar Module600Desc=tengiliðir Senda tilkynningar í tölvupósti um sum Dolibarr viðskipti viðburðir til þriðja aðila Module700Name=Fjárframlög Module700Desc=Framlög í stjórnun -Module800Name=OsCommerce með beinni gagnasafn aðgang -Module800Desc=Tengi til að birta osCommerce eða OSCSS versla með beinni gagnasafn aðgang -Module900Name=OsCommerce eftir WS -Module900Desc=Tengi til að birta osCommerce búð um Vefur þjónustu. Þessi eining requiere þér að setja inn hluti frá / oscommerce_ws / ws_server inn osCommerce netþjóninn. Sjá README skrá í / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis sameining Module1400Name=Bókhald diff --git a/htdocs/langs/is_IS/shop.lang b/htdocs/langs/is_IS/shop.lang deleted file mode 100644 index 1647180583a..00000000000 --- a/htdocs/langs/is_IS/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Vefverslun -LastOrders=Síðasta pantanir -OnStandBy=Í biðstöðu -TreatmentInProgress=Meðhöndlun í gangi -LastCustomers=Síðasta viðskiptavina -OSCommerceShop=OsCommerce Vefverslun -OSCommerce=OsCommerce -AddProd=Sala á netinu diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 0d4332fee0d..8b01c1ecfd5 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifiche Module600Desc=Inviare notifiche (via email), per eventi aziendali Dolibarr Module700Name=Donazioni Module700Desc=Gestione donazioni -Module800Name=OsCommerce -Module800Desc=Interfaccia per un negozio online osCommerce tramite l'accesso diretto al database -Module900Name=OsCommerce da WS -Module900Desc=Interfaccia per mostrare un osCommerce tramite webservices.
Il modulo richiede l'installazione sul server di componenti da /oscommerce_ws/ws_server. Vedere file README in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Integrazione Mantis Module1400Name=Contabilità avanzata diff --git a/htdocs/langs/it_IT/shop.lang b/htdocs/langs/it_IT/shop.lang deleted file mode 100644 index edcdd0c7478..00000000000 --- a/htdocs/langs/it_IT/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Connessione al database di oscommerce fallita. Controlla le impostazioni di setup del tuo modulo. -Shop=Negozio -ShopWeb=Negozio online -LastOrders=Ultimi ordini -OnStandBy=In standby -TreatmentInProgress=Trattamento in corso -LastCustomers=Ultimi clienti -OSCommerceShop=Negozio OSCommerce -OSCommerce=OSCommerce -AddProd=Vendita online diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index c5f883d9c31..45915d4423a 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -484,10 +484,6 @@ Module600Name=通知 Module600Desc=サードパーティの連絡先にいくつかのDolibarrのビジネスイベントを電子メールで通知を送信 Module700Name=寄付 Module700Desc=寄付金の管理 -Module800Name=データベースに直接アクセスでosCommerceの -Module800Desc=データベースへの直接アクセスを介してosCommerceのかOSCSS店を表示するためのインタフェース -Module900Name=WSでosCommerceの -Module900Desc=Webサービスを介してosCommerceのショップを表示するためのインターフェース。このモジュールは、/ oscommerce_ws / ws_serverからあなたのosCommerceのサーバーにコンポーネントをインストールすることができrequiere。 / oscommerce_ws / ws_serverのREADMEファイルを参照してください。 Module1200Name=カマキリ Module1200Desc=カマキリの統合 Module1400Name=会計 diff --git a/htdocs/langs/ja_JP/shop.lang b/htdocs/langs/ja_JP/shop.lang deleted file mode 100644 index d6aee12c58e..00000000000 --- a/htdocs/langs/ja_JP/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=ショップ -ShopWeb=ウェブショップ -LastOrders=ラストオーダー -OnStandBy=待機して -TreatmentInProgress=進行中の治療 -LastCustomers=最後のお客さま -OSCommerceShop=osCommerceのショップ -OSCommerce=osCommerceの -AddProd=オンライン販売 diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 2928f5fecd7..7909cf84376 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/ko_KR/shop.lang b/htdocs/langs/ko_KR/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/ko_KR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 18fdd228ff1..096aac43a22 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -484,10 +484,6 @@ Module600Name=Pranešimai Module600Desc=Siųsti pranešimus elektroniniu paštu apie kai kokius Dolibarr verslo įvykius į trečiųjų šalių kontaktus Module700Name=Parama Module700Desc=Paramos valdymas -Module800Name=OSCommerce pagal tiesioginį priėjimą prie duomenų bazės -Module800Desc=Sąsaja rodo OSCommerce ar OSCSS parduotuvę per tiesioginį priėjimą prie duomenų bazės -Module900Name=OSCommerce pagal WS -Module900Desc=Sąsaja rodo OSCommerce parduotuvę per interneto paslaugas. Šis modulis reikalauja įdiegti komponentus iš /oscommerce_ws/ws_server į savo OSCommerce serverį. Žiūrėti README failą į /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mančio integracija Module1400Name=Apskaita diff --git a/htdocs/langs/lt_LT/shop.lang b/htdocs/langs/lt_LT/shop.lang deleted file mode 100644 index 5d214fe63fa..00000000000 --- a/htdocs/langs/lt_LT/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Parduotuvė -ShopWeb=Interneto parduotuvė -LastOrders=Paskutiniai užsakymai -OnStandBy=Budėjimo režimu -TreatmentInProgress=Apdorojimas vyksta -LastCustomers=Naujausi klientai -OSCommerceShop=OSCommerce parduotuvė -OSCommerce=OSCommerce -AddProd=Parduoti internete diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 3ffb466ca1d..cbaed45a4de 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -484,10 +484,6 @@ Module600Name=Paziņojumi Module600Desc=Sūtīt paziņojumus pa e-pastu uz dažiem Dolibarr biznesa notikumiem trešo pušu kontaktiem Module700Name=Ziedojumi Module700Desc=Ziedojumu pārvaldība -Module800Name=OsCommerce tieša datu bāzes piekļuves -Module800Desc=Saskarne uzrāda OsCommerce vai OSCSS veikalu, izmantojot tiešu datu bāzes piekļuvi -Module900Name=OsCommerce ar WS -Module900Desc=Saskarne uzrāda osCommerce veikalu, izmantojot Web pakalpojumus. Šis modulis requiere instalēt komponentus no / oscommerce_ws / ws_server jūsu osCommerce serverī. Skatīt README failu / oscommerce_ws / ws_server. Module1200Name=Dievlūdzējs Module1200Desc=Mantis integrācija Module1400Name=Grāmatvedība diff --git a/htdocs/langs/lv_LV/shop.lang b/htdocs/langs/lv_LV/shop.lang deleted file mode 100644 index 32d11e3bc0b..00000000000 --- a/htdocs/langs/lv_LV/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Kļūda, nevar pieslēgties oscommerce datubāzei. Pārbaudiet moduļa iestatījumus -Shop=Veikals -ShopWeb=Interneta veikals -LastOrders=Pēdējie pasūtījumi -OnStandBy=Gaidīšanas režīmā -TreatmentInProgress=Apstrādāšana procesā -LastCustomers=Pēdējais klients -OSCommerceShop=OsCommerce veikals -OSCommerce=OsCommerce -AddProd=Pārdot internetā diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index 5edacce6285..94f0daa0f81 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/mk_MK/shop.lang b/htdocs/langs/mk_MK/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/mk_MK/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index ab94039a15f..6d4306aa72c 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -484,10 +484,6 @@ Module600Name=Varselmeldinger Module600Desc=Sender beskjeder (med e-post) om Dolibarrhendleser Module700Name=Donasjoner Module700Desc=Behandling av donasjoner -Module800Name=OSCommerce direkte -Module800Desc=Viser nettbutikk (OSCommerce eller OSCSS) via direkte databasetilgang -Module900Name=OSCommerce med WS -Module900Desc=Viser en OSCommerce nettbutikk via Web services.\nDenne modulen krever at du installerer komponenter fra /oscommerce_ws/ws_server i din OSCommerce server. Se filen README i /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantisintegrasjon Module1400Name=Regnskapsekspert diff --git a/htdocs/langs/nb_NO/shop.lang b/htdocs/langs/nb_NO/shop.lang deleted file mode 100644 index 0a89a344017..00000000000 --- a/htdocs/langs/nb_NO/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Butikk -ShopWeb=Nettbutikk -LastOrders=Siste ordre -OnStandBy=På vent -TreatmentInProgress=Under behandling -LastCustomers=Siste kunder -OSCommerceShop=OSCommerce butikk -OSCommerce=OSCommerce -AddProd=Selg i nettbutikk diff --git a/htdocs/langs/nl_BE/shop.lang b/htdocs/langs/nl_BE/shop.lang deleted file mode 100644 index b491fb35e91..00000000000 --- a/htdocs/langs/nl_BE/shop.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -LastCustomers=Laatste klanten -OSCommerceShop=OSCommerce shop diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 5f351a33161..4fb6a6c39ac 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -484,10 +484,6 @@ Module600Name=Kennisgevingen Module600Desc=Stuur kennisgevingen per e-mail van sommige Dolibarr zakelijke gebeurtenisen naar contactpersonen van derde partijen Module700Name=Giften Module700Desc=Donatiebeheer -Module800Name=OSCommerce door directe databasetoegang -Module800Desc=Interface om een OSCommerce of osCSS winkel via directe databasetoegang weer te geven -Module900Name=OSCommerce door WS -Module900Desc=Interface om een OSCommerce winkel via webdiensten weer te geven. Deze module vereist installatie van componenten van /oscommerce_ws/ws_server in uw OSCommerce server. Zie het README bestand in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integratie Module1400Name=Boekhouden diff --git a/htdocs/langs/nl_NL/shop.lang b/htdocs/langs/nl_NL/shop.lang deleted file mode 100644 index 95f3ad3c5ee..00000000000 --- a/htdocs/langs/nl_NL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Winkel -ShopWeb=Webwinkel -LastOrders=Laatste orders -OnStandBy=Op stand-by -TreatmentInProgress=Behandeling in uitvoering -LastCustomers=Laatste afnemers -OSCommerceShop=OSCommerce winkel -OSCommerce=OSCommerce -AddProd=Verkopen online diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index a818d93c182..aeff9bb9242 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -484,10 +484,6 @@ Module600Name=Powiadomienia Module600Desc=Wyślij powiadomienia (przez e-mail) na Dolibarr działalności wydarzenia Module700Name=Darowizny Module700Desc=Darowizny zarządzania -Module800Name=OsCommerce bezpośrednie -Module800Desc=Interfejs do wykazują osCommerce lub OSCSS sklepu za pośrednictwem bezpośredniego dostępu do baz danych -Module900Name=OsCommerce przez WAS -Module900Desc=Interfejs do wykazują osCommerce sklep z web services. \\ NW tym module requiere o zainstalowanie składników z / oscommerce_ws / ws_server osCommerce do swojego serwera. Zobacz plik README w / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integracji Module1400Name=Księgowość ekspertów diff --git a/htdocs/langs/pl_PL/shop.lang b/htdocs/langs/pl_PL/shop.lang deleted file mode 100644 index cebcc7e1a75..00000000000 --- a/htdocs/langs/pl_PL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Sklep -ShopWeb=Shop internetowy -LastOrders=Ostatnie zamówienia -OnStandBy=Oczekuje -TreatmentInProgress=W przygotowaniu -LastCustomers=Ostatni klienci -OSCommerceShop=Sklep osCommerce -OSCommerce=OsCommerce -AddProd=Sprzedaż online diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index d9c7953d06f..7034546a6b2 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -481,10 +481,6 @@ Module600Name=Notificações Module600Desc=Envio de Notificações (por correio eletrônico) sobre os eventos de trabalho Dolibarr Module700Name=Bolsas Module700Desc=Administração de Bolsas -Module800Name=OSCommerce 1 -Module800Desc=Interface de visualização de uma loja OSCommerce mediante acesso direto à sua base de dados -Module900Name=OSCommerce 2 -Module900Desc=Interface de visualização de uma loja OSCommerce mediante Web services.\nEste módulo requer instalar os arquivos de /oscommerce_ws/ws_server em OSCommerce. Leia o Arquivo README da pasta /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidências Mantis Module1400Name=Contabilidade diff --git a/htdocs/langs/pt_BR/shop.lang b/htdocs/langs/pt_BR/shop.lang deleted file mode 100644 index f9084688bf0..00000000000 --- a/htdocs/langs/pt_BR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Falha na conexão com banco de dados do osCommerce. Verifique a configuração do módulo -Shop=Loja -ShopWeb=Loja web -LastOrders=últimos pedidos -OnStandBy=Em espera -TreatmentInProgress=Em progresso -LastCustomers=últimos clientes -OSCommerceShop=Loja OS Commerce -OSCommerce=OSCommerce -AddProd=Venda em linha diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 19fdcf07f24..3162723b6a6 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notificações Module600Desc=Envío de Notificações (por correio electrónico) sobre os eventos de trabalho ERP/CRM Module700Name=Bolsas Module700Desc=Gestão de Bolsas -Module800Name=OSCommerce 1 -Module800Desc=Interface de visualização de uma loja OSCommerce mediante acesso directo à sua base de dados -Module900Name=OSCommerce 2 -Module900Desc=Interface de visualização de uma loja OSCommerce mediante Web services.\nEste módulo requer a instalação os ficheiros de /oscommerce_ws/ws_server em OSCommerce. Leia o Ficheiro README da pasta /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidencias Mantis Module1400Name=Perito de Contabilidade diff --git a/htdocs/langs/pt_PT/shop.lang b/htdocs/langs/pt_PT/shop.lang deleted file mode 100644 index 39b80d52387..00000000000 --- a/htdocs/langs/pt_PT/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Loja -ShopWeb=Loja web -LastOrders=Últimos pedidos -OnStandBy=Em espera -TreatmentInProgress=Em progresso -LastCustomers=Últimos clientes -OSCommerceShop=Loja OS Commerce -OSCommerce=OSCommerce -AddProd=Venda em linha diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index 384cbca7ce1..d74bd809326 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notificări Module600Desc=Trimite notificări (prin e-mail) pe Dolibarr de afaceri evenimente Module700Name=Donatii Module700Desc=MAnagementul Donaţiilor -Module800Name=OSCommerce direct -Module800Desc=Interfata pentru a afişa o OSCommerce OSCSS magazin sau prin intermediul bazei de date de acces direct -Module900Name=OSCommerce de WS -Module900Desc=Interfata pentru a afişa un magazin OSCommerce prin servicii Web. \\ NAcest modul requiere vă pentru a instala componente de la / oscommerce_ws / ws_server în OSCommerce server. Vezi README fişier în / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integrare Module1400Name=Contabilitate diff --git a/htdocs/langs/ro_RO/shop.lang b/htdocs/langs/ro_RO/shop.lang deleted file mode 100644 index cb9e5b921e4..00000000000 --- a/htdocs/langs/ro_RO/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Ultima ordinelor -OnStandBy=Pe de aşteptare -TreatmentInProgress=Tratamentul în curs de desfăşurare -LastCustomers=Ultima clienţi -OSCommerceShop=OSCommerce magazin -OSCommerce=OSCommerce -AddProd=Vanzare online diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 8a13b087e70..66b31155191 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -484,10 +484,6 @@ Module600Name=Уведомления Module600Desc=Отправить уведомления (по электронной почте) о Dolibarr деловых мероприятий Module700Name=Пожертвования Module700Desc=Пожертвования управления -Module800Name=OSCommerce прямой -Module800Desc=Интерфейс показать OSCommerce или OSCSS магазина с помощью прямого доступа к базам данных -Module900Name=OSCommerce по БЫЛО -Module900Desc=Интерфейс показать OSCommerce магазина с помощью веб-служб. \\ NThis модуль requiere устанавливать компоненты из oscommerce_ws / ws_server в вашем OSCommerce сервера. Смотрите README файл в / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis интеграции Module1400Name=Бухгалтерия эксперт diff --git a/htdocs/langs/ru_RU/shop.lang b/htdocs/langs/ru_RU/shop.lang deleted file mode 100644 index b982ab65dd9..00000000000 --- a/htdocs/langs/ru_RU/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Магазин -ShopWeb=Интернет-магазин -LastOrders=Последние заказы -OnStandBy=В ожидании -TreatmentInProgress=В обработке -LastCustomers=Последние Покупатели -OSCommerceShop=Магазин OSCommerce -OSCommerce=OSCommerce -AddProd=Онлайн Продажа diff --git a/htdocs/langs/ru_UA/shop.lang b/htdocs/langs/ru_UA/shop.lang deleted file mode 100644 index be8df87052e..00000000000 --- a/htdocs/langs/ru_UA/shop.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 257aa133bb6..28454394f8f 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -484,10 +484,6 @@ Module600Name=Upozornenie Module600Desc=Zasielať upozornenia e-mailom na niektorých firemných akcií Dolibarr tretích strán kontakty Module700Name=Dary Module700Desc=Darovanie riadenie -Module800Name=Oscommerce priamym prístup k databáze -Module800Desc=Rozhranie ukazovať osCommerce alebo OSCSS obchod prostredníctvom priameho prístupu do databázy -Module900Name=Oscommerce podľa WS -Module900Desc=Rozhranie ukazovať osCommerce obchod prostredníctvom webových služieb. Tento modul requiere k inštalácii komponenty / oscommerce_ws / ws_server do osCommerce servera. Pozri súbor README v / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integrácia Module1400Name=Účtovníctvo diff --git a/htdocs/langs/sk_SK/shop.lang b/htdocs/langs/sk_SK/shop.lang deleted file mode 100644 index db6390a243c..00000000000 --- a/htdocs/langs/sk_SK/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Obchod -ShopWeb=Web Shop -LastOrders=Posledné objednávky -OnStandBy=Na pohotovosti -TreatmentInProgress=Liečba prebieha -LastCustomers=Posledný zákazníkmi -OSCommerceShop=Oscommerce obchod -OSCommerce=Oscommerce -AddProd=Predaj on-line diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index ff646146e9b..baa05b55749 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -484,10 +484,6 @@ Module600Name=Obvestila Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih Module700Name=Donacije Module700Desc=Upravljanje donacij -Module800Name=OSCommerce z direktnim dostopom do baze -Module800Desc=Vmesnik za prikaz OSCommerce ali OSCSS trgovine z direktnim dostopom do baze -Module900Name=OSCommerce z WS -Module900Desc=Vmesnik za prikaz OSCommerce trgovine preko Web storitev. Ta modul zahteva inštalacijo komponent s strežnika /oscommerce_ws/ws_server v vaš OSCommerce strežnik. Glejte datoteko README v /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integracija Module1400Name=Računovodstvo diff --git a/htdocs/langs/sl_SI/shop.lang b/htdocs/langs/sl_SI/shop.lang deleted file mode 100644 index 369edcaa29a..00000000000 --- a/htdocs/langs/sl_SI/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Povezava z bazo podatkov oscommerce ni uspela. Preverite nastavitve modula -Shop=Trgovina -ShopWeb=Spletna trgovina -LastOrders=Zadnja naročila -OnStandBy=Na čakanju -TreatmentInProgress=Obdelava v teku -LastCustomers=Zadnje stranke -OSCommerceShop=OSCommerce trgovina -OSCommerce=OSCommerce -AddProd=Spletna prodaja diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index 5edacce6285..94f0daa0f81 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/sq_AL/shop.lang b/htdocs/langs/sq_AL/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/sq_AL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 2f72442cb8d..21f26676ae4 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -484,10 +484,6 @@ Module600Name=Anmälningar Module600Desc=Skicka meddelanden via e-post på några Dolibarr affärshändelser till annans kontakter Module700Name=Donationer Module700Desc=Donation ledning -Module800Name=OSCommerce genom direkt databasåtkomst -Module800Desc=Gränssnitt för att visa en OSCommerce eller OSCSS butik via direkta databasåtkomst -Module900Name=OSCommerce av WS -Module900Desc=Gränssnitt för att visa en OSCommerce butik via webbtjänster. Denna modul requiere du installera komponenter från / oscommerce_ws / ws_server i din OSCommerce server. Se README-filen i / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Bokföring diff --git a/htdocs/langs/sv_SE/shop.lang b/htdocs/langs/sv_SE/shop.lang deleted file mode 100644 index 94f6e3efb88..00000000000 --- a/htdocs/langs/sv_SE/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Sista beställningen -OnStandBy=I beredskap -TreatmentInProgress=Behandling pågår -LastCustomers=Senaste kunder -OSCommerceShop=OSCommerce butik -OSCommerce=OSCommerce -AddProd=Sälja online diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index 2438be65b08..9acde84db47 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/th_TH/shop.lang b/htdocs/langs/th_TH/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/th_TH/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 7901a4a402c..905f8ba4945 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -484,10 +484,6 @@ Module600Name=Duyurlar Module600Desc=Dolibarr iş etkinleri için üçüncü partilerin ilgililerine eposta ile duyurular gönderin Module700Name=Bağışlar Module700Desc=Bağış yönetimi -Module800Name=Doğrudan veritabanı erişimi yoluyla OSCommerce -Module800Desc=Doğrudan veritabanı erişimi yoluyla OSCommerce ya da OSCSS mağazası -Module900Name=OsCommerce Türkiye WS (web servisi yoluyla) -Module900Desc=OSCommerce mağazasını Web servisi yoluyla gösteren arayüz. Bu modül /oscommerce_ws/ws_server den sizin OSCommerce sunucusuna bileşen kurmanızı gerektirir. /oscommerce_ws/ws_server daki README dosyasına bakın. Module1200Name=Mantis Module1200Desc=Mantis entegrasyonu Module1400Name=Muhasebe diff --git a/htdocs/langs/tr_TR/shop.lang b/htdocs/langs/tr_TR/shop.lang deleted file mode 100644 index 4925111b19a..00000000000 --- a/htdocs/langs/tr_TR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Oscommerce veritabanına bağlantıda hata oluştu. Modül kurulumunu kontrol ediniz. -Shop=Mağaza -ShopWeb=Web Mağazası -LastOrders=Son siparişler -OnStandBy=Beklemede -TreatmentInProgress=İşlemi devam ediyor -LastCustomers=Son müşteriler -OSCommerceShop=OSCommerce mağazası -OSCommerce=OSCommerce -AddProd=Çevrimiçi satış diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index 5edacce6285..94f0daa0f81 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/uk_UA/shop.lang b/htdocs/langs/uk_UA/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/uk_UA/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 5edacce6285..94f0daa0f81 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/uz_UZ/shop.lang b/htdocs/langs/uz_UZ/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/uz_UZ/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index 040fed807a6..44ab1cfa977 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -484,10 +484,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/vi_VN/shop.lang b/htdocs/langs/vi_VN/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/vi_VN/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index b1657754173..54de67c6a2e 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -484,10 +484,6 @@ Module600Name=通知 Module600Desc=当系统中一些商业事件发生时，通过电邮通知第三方联系人。 Module700Name=捐赠 Module700Desc=捐款的管理 -Module800Name=OSCommerce (通过直接数据库访问) -Module800Desc=通过直接访问其数据库，在界面中显示 OSCommerce 或 OSCSS 店铺 -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis 整合 Module1400Name=会计 diff --git a/htdocs/langs/zh_CN/shop.lang b/htdocs/langs/zh_CN/shop.lang deleted file mode 100644 index a51ce042f69..00000000000 --- a/htdocs/langs/zh_CN/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=店 -ShopWeb=网上商店 -LastOrders=最后的订单 -OnStandBy=待命 -TreatmentInProgress=治疗进展 -LastCustomers=最后客户 -OSCommerceShop=oscommerce的店铺 -OSCommerce=oscommerce的 -AddProd=在线销售 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 7a5926d32f9..50253b48d79 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -484,10 +484,6 @@ Module600Name=通知 Module600Desc=由一些商業活動的電子郵件發送Dolibarr通知給第三方的交往 Module700Name=捐贈 Module700Desc=捐款的管理 -Module800Name=直接檔由數據庫訪問 -Module800Desc=通過界面顯示直接數據庫訪問oscommerce的店舖或OSCSS -Module900Name=被檔由 -Module900Desc=界面顯示一個通過Web服務oscommerce的商店。此模組requiere您安裝/ oscommerce_ws / ws_server到您oscommerce的服務器組件。查看自述文件/ oscommerce_ws / ws_server。 Module1200Name=螂 Module1200Desc=螳螂一體化 Module1400Name=會計 diff --git a/htdocs/langs/zh_TW/shop.lang b/htdocs/langs/zh_TW/shop.lang deleted file mode 100644 index df0cf54c4cc..00000000000 --- a/htdocs/langs/zh_TW/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=店 -ShopWeb=網上商店 -LastOrders=最後的訂單 -OnStandBy=待命 -TreatmentInProgress=治療進展 -LastCustomers=最後客戶 -OSCommerceShop=oscommerce的店鋪 -OSCommerce=oscommerce的 -AddProd=在線銷售 diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 8a6bcd62e58..5c2efc4a0ac 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -61,22 +61,22 @@ if (empty($reshook)) { $demoprofiles=array( array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly', - 'disablemodules'=>'adherent,barcode,boutique,cashdesk,categorie,don,expedition,externalsite,mailmanspip,margin,prelevement,product,stock', + 'disablemodules'=>'adherent,barcode,cashdesk,categorie,don,expedition,externalsite,mailmanspip,margin,prelevement,product,stock', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png'), array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk', - 'disablemodules'=>'adherent,boutique,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,product,stock', + 'disablemodules'=>'adherent,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,product,stock', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'), array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks', - 'disablemodules'=>'adherent,boutique,contrat,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,service', + 'disablemodules'=>'adherent,contrat,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,service', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'), array('default'=>'0', 'key'=>'profdemoall','label'=>'DemoCompanyAll', - 'disablemodules'=>'adherent,boutique,don,externalsite,mailmanspip', + 'disablemodules'=>'adherent,don,externalsite,mailmanspip', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'), array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation', - 'disablemodules'=>'banque,barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', + 'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'), array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2', - 'disablemodules'=>'barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', + 'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png') ); @@ -88,7 +88,7 @@ if (empty($reshook)) 'mailmanspip','notification','syslog','user','webservices', // Extended modules 'memcached','numberwords','zipautofillfr'); - $alwayshiddenuncheckedmodules=array('boutique','ftp', + $alwayshiddenuncheckedmodules=array('ftp', // Extended modules 'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap', 'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail'); diff --git a/htdocs/theme/auguria/img/menus/shop.png b/htdocs/theme/auguria/img/menus/shop.png deleted file mode 100644 index efd6859ab607a0d18cee7f09a94ec6695fff7465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1115 zcmX9+3rw0<6lQDFs;jY!x^&gr+AW!D;yUZ1)ihagKATPv6%8mjUkEB7b&y#F`VUdy zXT|u$2O>B!VGdCz5@jmWsdH$>tOA*j)moc4*DY#nW@~q>H}{_Z+;h+Q@}2MeVq9XJ zr^k5@31YjrxE09VORsz6}nprVv&xOR4S+HAJDxj9y8Sw^G&K6r z&Mr`qavSgzAu*c+up)d_M@I+3kO)~4geJX5kl?ZqTCs-4cwGX{Yrl$sYBZV}zEmtg zt9g=|a#ZxC^ca&zkZ849NwriemVyL#JXI1@C0mgb5yglv%nb~px4{m3(5m#ZeAyqT6Ekv*n)fw@#1zcUCyoN}=M$o_sX_DK+UJYBu|B8&dDi-QSg`EJsKAo* zJ#JB6_!bZH$+wed7DmU0`G}>4`|1Q!%@?Ge#r~TU?Q@@w#U>q|Sw-Hgk9 z=f;28T+aT_BjGz7w-BYpp}eRze_f9A4_I6i`)XsFwt}pc`+I8(`th_!frl|aRhe2D zYln;renW98Kd+kIm)bzJ@7jTncg53C%C+AzLq6SR|GvF#D|qy$wR^AQ>5HH)_2%Zl zM!7AlYdl2MucMG3M=~6Zk%EUM)Q`EJP`bBwT*+%EGw0mVu!@ynUG!y6j;-t3%CsUs z&Ax2-`(S&>C5s5W|Ga!pZXc`l2=iwc0eD$ zoa9mljJjVBaY_tL`l!YoOEEv|gBJ|8gA{CWrz(2m)15ZPg)nT&lajyAtXsQik}|XT ztVz8;)5?yOS;H^J_7&g#W2@o@!?F23aaN^2<+Kz17QYGVXvsX79DMw1{S`4S6bZln z-tdMU`Tj~{+RgMlI_}Vx6;Vm{9ICPVMQARoe38O)iInQYU%oT@^m#lmji7ONKAL9k p51i`{cwjH&FsQGVPOtOVy}X?-2cFlio`N}J5@Hgge~8LP{s(sJL|y;@ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 1159e40ff0a..4b1425d6dda 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -400,7 +400,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $mainmenuusedarray=array(); // Disable $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','cashdesk'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','cashdesk'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/htdocs/theme/bureau2crea/img/menus/shop.png b/htdocs/theme/bureau2crea/img/menus/shop.png deleted file mode 100644 index efd6859ab607a0d18cee7f09a94ec6695fff7465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1115 zcmX9+3rw0<6lQDFs;jY!x^&gr+AW!D;yUZ1)ihagKATPv6%8mjUkEB7b&y#F`VUdy zXT|u$2O>B!VGdCz5@jmWsdH$>tOA*j)moc4*DY#nW@~q>H}{_Z+;h+Q@}2MeVq9XJ zr^k5@31YjrxE09VORsz6}nprVv&xOR4S+HAJDxj9y8Sw^G&K6r z&Mr`qavSgzAu*c+up)d_M@I+3kO)~4geJX5kl?ZqTCs-4cwGX{Yrl$sYBZV}zEmtg zt9g=|a#ZxC^ca&zkZ849NwriemVyL#JXI1@C0mgb5yglv%nb~px4{m3(5m#ZeAyqT6Ekv*n)fw@#1zcUCyoN}=M$o_sX_DK+UJYBu|B8&dDi-QSg`EJsKAo* zJ#JB6_!bZH$+wed7DmU0`G}>4`|1Q!%@?Ge#r~TU?Q@@w#U>q|Sw-Hgk9 z=f;28T+aT_BjGz7w-BYpp}eRze_f9A4_I6i`)XsFwt}pc`+I8(`th_!frl|aRhe2D zYln;renW98Kd+kIm)bzJ@7jTncg53C%C+AzLq6SR|GvF#D|qy$wR^AQ>5HH)_2%Zl zM!7AlYdl2MucMG3M=~6Zk%EUM)Q`EJP`bBwT*+%EGw0mVu!@ynUG!y6j;-t3%CsUs z&Ax2-`(S&>C5s5W|Ga!pZXc`l2=iwc0eD$ zoa9mljJjVBaY_tL`l!YoOEEv|gBJ|8gA{CWrz(2m)15ZPg)nT&lajyAtXsQik}|XT ztVz8;)5?yOS;H^J_7&g#W2@o@!?F23aaN^2<+Kz17QYGVXvsX79DMw1{S`4S6bZln z-tdMU`Tj~{+RgMlI_}Vx6;Vm{9ICPVMQARoe38O)iInQYU%oT@^m#lmji7ONKAL9k p51i`{cwjH&FsQGVPOtOVy}X?-2cFlio`N}J5@Hgge~8LP{s(sJL|y;@ diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 950b2ce0001..b36fbcb5cf4 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -432,7 +432,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $mainmenuusedarray=array(); // Disable $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','cashdesk'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','cashdesk'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/htdocs/theme/cameleo/img/menus/shop.png b/htdocs/theme/cameleo/img/menus/shop.png deleted file mode 100644 index efd6859ab607a0d18cee7f09a94ec6695fff7465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1115 zcmX9+3rw0<6lQDFs;jY!x^&gr+AW!D;yUZ1)ihagKATPv6%8mjUkEB7b&y#F`VUdy zXT|u$2O>B!VGdCz5@jmWsdH$>tOA*j)moc4*DY#nW@~q>H}{_Z+;h+Q@}2MeVq9XJ zr^k5@31YjrxE09VORsz6}nprVv&xOR4S+HAJDxj9y8Sw^G&K6r z&Mr`qavSgzAu*c+up)d_M@I+3kO)~4geJX5kl?ZqTCs-4cwGX{Yrl$sYBZV}zEmtg zt9g=|a#ZxC^ca&zkZ849NwriemVyL#JXI1@C0mgb5yglv%nb~px4{m3(5m#ZeAyqT6Ekv*n)fw@#1zcUCyoN}=M$o_sX_DK+UJYBu|B8&dDi-QSg`EJsKAo* zJ#JB6_!bZH$+wed7DmU0`G}>4`|1Q!%@?Ge#r~TU?Q@@w#U>q|Sw-Hgk9 z=f;28T+aT_BjGz7w-BYpp}eRze_f9A4_I6i`)XsFwt}pc`+I8(`th_!frl|aRhe2D zYln;renW98Kd+kIm)bzJ@7jTncg53C%C+AzLq6SR|GvF#D|qy$wR^AQ>5HH)_2%Zl zM!7AlYdl2MucMG3M=~6Zk%EUM)Q`EJP`bBwT*+%EGw0mVu!@ynUG!y6j;-t3%CsUs z&Ax2-`(S&>C5s5W|Ga!pZXc`l2=iwc0eD$ zoa9mljJjVBaY_tL`l!YoOEEv|gBJ|8gA{CWrz(2m)15ZPg)nT&lajyAtXsQik}|XT ztVz8;)5?yOS;H^J_7&g#W2@o@!?F23aaN^2<+Kz17QYGVXvsX79DMw1{S`4S6bZln z-tdMU`Tj~{+RgMlI_}Vx6;Vm{9ICPVMQARoe38O)iInQYU%oT@^m#lmji7ONKAL9k p51i`{cwjH&FsQGVPOtOVy}X?-2cFlio`N}J5@Hgge~8LP{s(sJL|y;@ diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index bfb64ab09a0..9eeabd9a185 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -545,10 +545,6 @@ div.mainmenu.tools { background-image: url(); } -div.mainmenu.shop { - background-image: url(); -} - div.mainmenu.google { background-image: url(); } @@ -572,7 +568,7 @@ foreach($conf->modules as $val) $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','bookmark','cashdesk','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','bookmark','cashdesk','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/htdocs/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png deleted file mode 100644 index efd6859ab607a0d18cee7f09a94ec6695fff7465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1115 zcmX9+3rw0<6lQDFs;jY!x^&gr+AW!D;yUZ1)ihagKATPv6%8mjUkEB7b&y#F`VUdy zXT|u$2O>B!VGdCz5@jmWsdH$>tOA*j)moc4*DY#nW@~q>H}{_Z+;h+Q@}2MeVq9XJ zr^k5@31YjrxE09VORsz6}nprVv&xOR4S+HAJDxj9y8Sw^G&K6r z&Mr`qavSgzAu*c+up)d_M@I+3kO)~4geJX5kl?ZqTCs-4cwGX{Yrl$sYBZV}zEmtg zt9g=|a#ZxC^ca&zkZ849NwriemVyL#JXI1@C0mgb5yglv%nb~px4{m3(5m#ZeAyqT6Ekv*n)fw@#1zcUCyoN}=M$o_sX_DK+UJYBu|B8&dDi-QSg`EJsKAo* zJ#JB6_!bZH$+wed7DmU0`G}>4`|1Q!%@?Ge#r~TU?Q@@w#U>q|Sw-Hgk9 z=f;28T+aT_BjGz7w-BYpp}eRze_f9A4_I6i`)XsFwt}pc`+I8(`th_!frl|aRhe2D zYln;renW98Kd+kIm)bzJ@7jTncg53C%C+AzLq6SR|GvF#D|qy$wR^AQ>5HH)_2%Zl zM!7AlYdl2MucMG3M=~6Zk%EUM)Q`EJP`bBwT*+%EGw0mVu!@ynUG!y6j;-t3%CsUs z&Ax2-`(S&>C5s5W|Ga!pZXc`l2=iwc0eD$ zoa9mljJjVBaY_tL`l!YoOEEv|gBJ|8gA{CWrz(2m)15ZPg)nT&lajyAtXsQik}|XT ztVz8;)5?yOS;H^J_7&g#W2@o@!?F23aaN^2<+Kz17QYGVXvsX79DMw1{S`4S6bZln z-tdMU`Tj~{+RgMlI_}Vx6;Vm{9ICPVMQARoe38O)iInQYU%oT@^m#lmji7ONKAL9k p51i`{cwjH&FsQGVPOtOVy}X?-2cFlio`N}J5@Hgge~8LP{s(sJL|y;@ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3eef3bd840e..77dc5eb76b5 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -731,10 +731,6 @@ div.mainmenu.tools { background-image: url(); } -div.mainmenu.shop { - background-image: url(); -} - div.mainmenu.webservices { } @@ -762,7 +758,7 @@ foreach($conf->modules as $val) $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index 974ce8ea70a..b5529489d00 100755 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -125,7 +125,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase $langs=$this->savlangs; $db=$this->savdb; - $modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','Bookmark','Boutique', + $modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','Bookmark', 'CashDesk','Categorie','ClickToDial','Commande','Comptabilite','Contrat','Cron','Deplacement','Document','Don', 'ECM','Expedition','Export','ExternalRss','ExternalSite','Facture', 'Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','Import','Label','Ldap','Mailing', diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index 8237367ebef..ac4e29df3b5 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -52,9 +52,8 @@ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/ ../../htdocs/includes/ - ../../htdocs/boutique/osc_master.inc.php ../../htdocs/holiday/common.inc.php - \ No newline at end of file + From cb302c16e746197e91a90c12585dcc1f5a081514 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 29 Sep 2014 16:22:00 +0200 Subject: [PATCH 0119/1190] Bad place of code --- htdocs/accountancy/journal/bankjournal.php | 47 +++++++++++++--------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 537dc3476fd..cb308a7e1af 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -137,17 +137,19 @@ if ($result) { $tabpay = array (); $tabbq = array (); $tabtp = array (); - $tabcompany[$obj->rowid] = array ( - 'id' => $obj->socid, - 'name' => $obj->name, - 'code_client' => $obj->code_compta - ); $tabtype = array (); $i = 0; - while ( $i < $num ) { + while ( $i < $num ) + { $obj = $db->fetch_object($result); + $tabcompany[$obj->rowid] = array( + 'id' => $obj->socid, + 'name' => $obj->name, + 'code_client' => $obj->code_compta + ); + // Controls $compta_bank = $obj->account_number; if ($obj->label == '(SupplierInvoicePayment)') @@ -169,15 +171,15 @@ if ($result) { } $links = $object->get_url($obj->rowid); - foreach ( $links as $key => $val ) { - + foreach ( $links as $key => $val ) + { $tabtype[$obj->rowid] = $links[$key]['type']; if ($links[$key]['type'] == 'payment') { $paymentstatic->id = $links[$key]['url_id']; $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2); - } + } else if ($links[$key]['type'] == 'payment_supplier') { $paymentsupplierstatic->id = $links[$key]['url_id']; @@ -232,7 +234,7 @@ if ($result) { $tabtp[$obj->rowid][$cpttva] += $obj->amount; } else if ($links[$key]['type'] == 'payment_salary') - { + { $paymentsalstatic->id = $links[$key]['url_id']; $paymentsalstatic->ref = $links[$key]['url_id']; $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2); @@ -259,14 +261,17 @@ if ($result) { /* * Actions -*/ + */ // Write bookkeeping -if ($action == 'writeBookKeeping') { +if ($action == 'writeBookKeeping') +{ $error = 0; - foreach ( $tabpay as $key => $val ) { + foreach ( $tabpay as $key => $val ) + { // Bank - foreach ( $tabbq[$key] as $k => $mt ) { + foreach ( $tabbq[$key] as $k => $mt ) + { $bookkeeping = new BookKeeping($db); $bookkeeping->doc_date = $val["date"]; $bookkeeping->doc_ref = $val["ref"]; @@ -317,8 +322,8 @@ if ($action == 'writeBookKeeping') { } } // Third party - foreach ( $tabtp[$key] as $k => $mt ) { - + foreach ( $tabtp[$key] as $k => $mt ) + { $bookkeeping = new BookKeeping($db); $bookkeeping->doc_date = $val["date"]; $bookkeeping->doc_ref = $val["ref"]; @@ -399,7 +404,8 @@ if ($action == 'writeBookKeeping') { } } // export csv -if ($action == 'export_csv') { +if ($action == 'export_csv') +{ $sep = $conf->global->ACCOUNTING_SEPARATORCSV; header('Content-Type: text/csv'); @@ -482,7 +488,9 @@ if ($action == 'export_csv') { } } } -} else { +} +else +{ $form = new Form($db); @@ -580,4 +588,5 @@ if ($action == 'export_csv') { // End of page llxFooter(); } -$db->close(); \ No newline at end of file + +$db->close(); From 056e3ec2afa5c1a6fedc7a00eeaeb77e7150aca0 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 29 Sep 2014 16:24:45 +0200 Subject: [PATCH 0120/1190] Fix travis (strange I didn't update this file) --- htdocs/compta/facture.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 83587861f7b..d92ccd9e9f3 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -873,7 +873,7 @@ else if ($action == 'add' && $user->rights->facture->creer) $exp = new Expedition($db); $exp->fetch($object->origin_id); $exp->fetchObjectLinked(); - if (count ($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0]; + if (count($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0]; } if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) { From 8c6ce79d9d0da035f67d0e67a0db34ec7c9cb8a7 Mon Sep 17 00:00:00 2001 From: Drosis Nikos Date: Mon, 29 Sep 2014 18:15:09 +0300 Subject: [PATCH 0121/1190] Fix Lang for Payment Type --- htdocs/compta/sociales/charges.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 48a8f656959..4ea2af2c20f 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -300,7 +300,7 @@ if ($id > 0) * Payments */ $sql = "SELECT p.rowid, p.num_paiement, datep as dp, p.amount,"; - $sql.= "c.libelle as paiement_type"; + $sql.= "c.code as type_code,c.libelle as paiement_type"; $sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as p"; $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c "; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; @@ -333,8 +333,9 @@ if ($id > 0) print "

"; print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."".$labeltype.' '.$objp->num_paiement."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."
'; // Shipment - if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0) + if (($object->origin == 'shipment' || $object->origin == 'expedition') && $object->origin_id > 0) { $linkback = ''.$langs->trans("BackToList").''; @@ -528,7 +515,7 @@ else // Ref print ''; - print ''; + print ''; // Client print ''; @@ -559,12 +546,12 @@ else // Ref client print ''; - print '\n"; + print '\n"; print ''; // Date print ''; - print '\n"; + print '\n"; print ''; // Date delivery real / Received @@ -573,21 +560,21 @@ else print $langs->trans('DateReceived'); print ''; - if ($action != 'editdate_livraison') print ''; + if ($action != 'editdate_livraison') print ''; print '
'.$langs->trans("Ref").''.$delivery->ref.'
'.$object->ref.'
'.$langs->trans("Customer").'
'.$langs->trans("RefCustomer").''.$delivery->ref_customer."'.$object->ref_customer."
'.$langs->trans("DateCreation").''.dol_print_date($delivery->date_creation,'daytext')."'.dol_print_date($object->date_creation,'daytext')."
id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'
'; print ''; if ($action == 'editdate_livraison') { - print ''; + print ''; print ''; print ''; - $form->select_date($delivery->date_delivery?$delivery->date_delivery:-1,'liv_',1,1,'',"setdate_livraison"); + $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison"); print ''; print ''; } else { - print $delivery->date_delivery ? dol_print_date($delivery->date_delivery,'dayhourtext') : ' '; + print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhourtext') : ' '; } print ''; print ''; @@ -595,7 +582,7 @@ else // Note Public print ''.$langs->trans("NotePublic").''; print ''; - print nl2br($delivery->note_public); + print nl2br($object->note_public); /*$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); print $doleditor->Create(1);*/ print ""; @@ -603,7 +590,7 @@ else // Note Private print ''.$langs->trans("NotePrivate").''; print ''; - print nl2br($delivery->note_private); + print nl2br($object->note_private); /*$doleditor = new DolEditor('note_pprivate', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); print $doleditor->Create(1);*/ print ""; @@ -611,14 +598,14 @@ else // Statut print ''.$langs->trans("Status").''; - print ''.$delivery->getLibStatut(4)."\n"; + print ''.$object->getLibStatut(4)."\n"; print ''; if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled)) { // Entrepot $entrepot = new Entrepot($db); - $entrepot->fetch($delivery->entrepot_id); + $entrepot->fetch($object->entrepot_id); print ''.$langs->trans("Warehouse").''; print ''.$entrepot->libelle.''; print ''; @@ -630,7 +617,7 @@ else * Lignes produits */ - $num_prod = count($delivery->lines); + $num_prod = count($object->lines); $i = 0; $total = 0; print ''; @@ -651,66 +638,65 @@ else $var=!$var; print ""; - if ($delivery->lines[$i]->fk_product > 0) + if ($object->lines[$i]->fk_product > 0) { $product = new Product($db); - $product->fetch($delivery->lines[$i]->fk_product); + $product->fetch($object->lines[$i]->fk_product); // Define output language if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { - $delivery->fetch_thirdparty(); $outputlangs = $langs; $newlang=''; if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; - if (empty($newlang)) $newlang=$delivery->client->default_lang; + if (empty($newlang)) $newlang=$object->client->default_lang; if (! empty($newlang)) { $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $delivery->lines[$i]->product_label; + $label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label; } else - $label = ( ! empty($delivery->lines[$i]->label)?$delivery->lines[$i]->label:$delivery->lines[$i]->product_label); + $label = ( ! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label); print '\n"; } - print ''; - print ''; + print ''; + print ''; print ""; @@ -730,20 +716,20 @@ else { print '
'; - if ($delivery->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0) + if ($object->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0) { - print ''.$langs->trans("Validate").''; + print ''.$langs->trans("Validate").''; } if ($user->rights->expedition->livraison->supprimer) { if ($conf->expedition_bon->enabled) { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } } @@ -757,22 +743,22 @@ else * Documents generated */ - $deliveryref = dol_sanitizeFileName($delivery->ref); - $filedir = $conf->expedition->dir_output . "/receipt/" . $deliveryref; - $urlsource = $_SERVER["PHP_SELF"]."?id=".$delivery->id; + $objectref = dol_sanitizeFileName($object->ref); + $filedir = $conf->expedition->dir_output . "/receipt/" . $objectref; + $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; $genallowed=$user->rights->expedition->livraison->creer; $delallowed=$user->rights->expedition->livraison->supprimer; - $somethingshown=$formfile->show_documents('livraison',$deliveryref,$filedir,$urlsource,$genallowed,$delallowed,$delivery->modelpdf,1,0,0,28,0,'','','',$soc->default_lang); + $somethingshown=$formfile->show_documents('livraison',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang); /* * Linked object block (of linked shipment) */ - if ($delivery->origin == 'expedition') + if ($object->origin == 'expedition') { $shipment = new Expedition($db); - $shipment->fetch($delivery->origin_id); + $shipment->fetch($object->origin_id); $somethingshown=$shipment->showLinkedObjectBlock(); } From 11b3b94e6fbc1cc4a3aebb8590f73f3772f62593 Mon Sep 17 00:00:00 2001 From: Xebax Date: Tue, 30 Sep 2014 01:37:36 +0200 Subject: [PATCH 0124/1190] Fix bug #1604: When a member is created, the birthday is not recorded. --- htdocs/adherents/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 1c9de056acc..60b90a9cf31 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -460,7 +460,7 @@ if ($action == 'add' && $user->rights->adherent->creer) $object->email = $email; $object->login = $login; $object->pass = $pass; - $object->naiss = $birthdate; + $object->birth = $birthdate; $object->photo = $photo; $object->typeid = $typeid; //$object->note = $comment; @@ -883,7 +883,7 @@ else // Birthday print "
\n"; // Profil public From f3eec7582ee281fb59a2659e8154854d6651434a Mon Sep 17 00:00:00 2001 From: BadPixxel Date: Tue, 30 Sep 2014 16:00:04 +0200 Subject: [PATCH 0125/1190] Minor BugFix : Wrong variable reference in getNomUrl Display of Category Url was incompete due to reference to "$ref" instead of "$label" --- htdocs/categories/class/categorie.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index f9c4a96dcaa..59d2ff4a766 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1271,7 +1271,7 @@ class Categorie extends CommonObject if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.dol_trunc($this->ref,$maxlength).$lienfin; + if ($withpicto != 2) $result.=$lien.dol_trunc($this->label,$maxlength).$lienfin; return $result; } From 920c9c725104b58ca3375ff7bf436042aa04f976 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 30 Sep 2014 17:36:01 +0200 Subject: [PATCH 0126/1190] Fix : tva not coming from multiprice --- htdocs/comm/propal.php | 2 -- htdocs/commande/fiche.php | 2 -- htdocs/compta/facture.php | 2 -- 3 files changed, 6 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index cece1b3b29e..beaa24be32e 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -738,8 +738,6 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- $pu_ttc = $prod->multiprices_ttc[$object->client->price_level]; $price_min = $prod->multiprices_min[$object->client->price_level]; $price_base_type = $prod->multiprices_base_type[$object->client->price_level]; - $tva_tx=$prod->multiprices_tva_tx[$object->client->price_level]; - $tva_npr=$prod->multiprices_recuperableonly[$object->client->price_level]; } else { diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 99864a59dd2..9af80af21e1 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -686,8 +686,6 @@ else if ($action == 'addline' && $user->rights->commande->creer) $pu_ttc = $prod->multiprices_ttc[$object->client->price_level]; $price_min = $prod->multiprices_min[$object->client->price_level]; $price_base_type = $prod->multiprices_base_type[$object->client->price_level]; - $tva_tx=$prod->multiprices_tva_tx[$object->client->price_level]; - $tva_npr=$prod->multiprices_recuperableonly[$object->client->price_level]; } else { diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index b17b59cf704..11a920877cd 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1262,8 +1262,6 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- $pu_ttc = $prod->multiprices_ttc[$object->client->price_level]; $price_min = $prod->multiprices_min[$object->client->price_level]; $price_base_type = $prod->multiprices_base_type[$object->client->price_level]; - //$tva_tx=$prod->multiprices_tva_tx[$object->client->price_level]; - //$tva_npr=$prod->multiprices_recuperableonly[$object->client->price_level]; } else { From 820e6e5d95fb879776dd51dfa64797401a29fff9 Mon Sep 17 00:00:00 2001 From: BadPixxel Date: Tue, 30 Sep 2014 19:01:43 +0200 Subject: [PATCH 0127/1190] Minor BugFix : Compatibility of function getNomUrl Using Ref & Label for Category Name display is necessary for compatibility --- htdocs/categories/class/categorie.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 59d2ff4a766..51308174112 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1263,7 +1263,7 @@ class Categorie extends CommonObject $result=''; $lien = ''; - $label=$langs->trans("ShowCategory").': '.$this->label; + $label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label); $lienfin=''; $picto='category'; @@ -1271,7 +1271,7 @@ class Categorie extends CommonObject if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.dol_trunc($this->label,$maxlength).$lienfin; + if ($withpicto != 2) $result.=$lien.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$lienfin; return $result; } From 12e6d1bf6c2d253ee3f051cc5577670bd94581fc Mon Sep 17 00:00:00 2001 From: BadPixxel Date: Tue, 30 Sep 2014 19:09:59 +0200 Subject: [PATCH 0128/1190] Missing Key for getNomUrl function --- htdocs/langs/fr_FR/categories.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index 6570eec5638..90e8c086d43 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Attributs supplémentaires CategoriesSetup=Configuration du module catégories CategorieRecursiv=Lier avec les catégories parentes CategorieRecursivHelp=Si activer, quand un élément est ajouté dans une catégorie, ajouter aussi l'élément dans toutes les catégories parentes +ShowCategory=Afficher la catégorie From cf2ba78fc1be4a46a0d443fc8d510d8eca2ad20b Mon Sep 17 00:00:00 2001 From: BadPixxel Date: Tue, 30 Sep 2014 19:11:01 +0200 Subject: [PATCH 0129/1190] Missing Key for getNomUrl function --- htdocs/langs/en_US/categories.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index fb9ad8a3b6d..1cfccd75d5d 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +ShowCategory=Show category From d6c8f65dad43bc0734b0b4b69dd3f9f14318055f Mon Sep 17 00:00:00 2001 From: BadPixxel Date: Tue, 30 Sep 2014 19:37:13 +0200 Subject: [PATCH 0130/1190] Minor BugFix : Missing thumbs folder in Category Images List Sub-folder for thumbs was missing in category image list, url was wrong.... --- htdocs/categories/class/categorie.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 51308174112..af16ca2d28e 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1369,7 +1369,7 @@ class Categorie extends CommonObject // Objet $obj=array(); $obj['photo']=$photo; - if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']=$photo_vignette; + if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']='thumbs/' . $photo_vignette; else $obj['photo_vignette']=""; $tabobj[$nbphoto-1]=$obj; From f178aa65ca86984817dcfb04ff1c4b8765a95af9 Mon Sep 17 00:00:00 2001 From: BadPixxel Date: Tue, 30 Sep 2014 19:43:21 +0200 Subject: [PATCH 0131/1190] removed "thumb\" subdir addition Category Image Thumb sub-folder now directly added by function liste_photos --- htdocs/categories/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 69a8bb97eab..c54d7d889b2 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -241,7 +241,7 @@ if ($object->id) // Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine if ($obj['photo_vignette']) { - $filename='thumbs/'.$obj['photo_vignette']; + $filename=$obj['photo_vignette']; } else { From 769d824e7b043c237bb3ebba4fcd01b508f5f255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 29 Sep 2014 16:25:18 +0200 Subject: [PATCH 0132/1190] Allow reporting progress along with timespent --- htdocs/core/lib/project.lib.php | 10 +++++++--- htdocs/projet/activity/list.php | 1 + htdocs/projet/class/task.class.php | 1 + htdocs/projet/index.php | 2 +- htdocs/projet/tasks/time.php | 10 +++++++++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index e9ceb297680..d8ecc52f6d9 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -445,7 +445,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t * * @param string $inc ? * @param string $parent ? - * @param Object $lines ? + * @param Task[] $lines ? * @param int $level ? * @param string $projectsrole ? * @param string $tasksrole ? @@ -455,9 +455,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t */ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) { - global $user, $bc, $langs; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; + + global $db, $user, $bc, $langs; global $form, $projectstatic, $taskstatic; + $formother = new FormOther($db); + $lastprojectid=0; $var=true; @@ -526,7 +530,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr // Progress declared % print ''; // Time spent diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 9a1142fe5c0..e83fe30e865 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -83,6 +83,7 @@ if ($action == 'addtime' && $user->rights->projet->creer) foreach($timespent_duration as $key => $val) { $task->fetch($key); + $task->progress = GETPOST($key . 'progress', 'int'); $task->timespent_duration = $val; $task->timespent_fk_user = $user->id; $task->timespent_date = dol_mktime(12,0,0,$_POST["{$key}month"],$_POST["{$key}day"],$_POST["{$key}year"]); diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 13360110310..4788188aab3 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -785,6 +785,7 @@ class Task extends CommonObject { $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task"; $sql.= " SET duration_effective = duration_effective + '".price2num($this->timespent_duration)."'"; + $sql.= ", progress = " . $this->progress; $sql.= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG); diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 7e324841af2..766e954e2eb 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -166,7 +166,7 @@ $sql.= " WHERE p.entity = ".$conf->entity; if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; $sql.= " AND p.fk_statut=1"; -$sql.= " GROUP BY p.title, p.rowid, t.label, t.rowid, u.rowid, t.planned_workload, t.dateo, t.datee"; +$sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, u.rowid, t.planned_workload, t.dateo, t.datee"; $sql.= " ORDER BY u.rowid, t.dateo, t.datee"; $userstatic=new User($db); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 5c790df32f0..eff94d532e5 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load('projects'); @@ -83,11 +84,11 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) else { $object->timespent_note = $_POST["timespent_note"]; + $object->progress = GETPOST('progress', 'int'); $object->timespent_duration = $_POST["timespent_durationhour"]*60*60; // We store duration in seconds $object->timespent_duration+= $_POST["timespent_durationmin"]*60; // We store duration in seconds $object->timespent_date = dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]); $object->timespent_fk_user = $_POST["userid"]; - $result=$object->addTimeSpent($user); if ($result >= 0) { @@ -185,6 +186,7 @@ if (! empty($project_ref) && ! empty($withproject)) llxHeader("",$langs->trans("Task")); $form = new Form($db); +$formother = new FormOther($db); $userstatic = new User($db); if ($id > 0 || ! empty($ref)) @@ -331,6 +333,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; + print ''; print ''; print ''; print "\n"; @@ -360,6 +363,11 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; + // Progress + print ''; + // Duration print ''; + $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 28b0db5efe9..856d4a477fb 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1,16 +1,16 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2006 Auguria SARL - * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2013-2014 Marcos García - * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2011-2014 Alexandre Spangaro - * Copyright (C) 2014 Cédric Gross - * Copyright (C) 2014 Ferran Marcet +/* Copyright (C) 2001-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2005 Eric Seigne + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2006 Auguria SARL + * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2013-2014 Marcos García + * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2011-2014 Alexandre Spangaro + * Copyright (C) 2014 Cédric Gross + * Copyright (C) 2014 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ $langs->load("products"); $langs->load("other"); if (! empty($conf->stock->enabled)) $langs->load("stocks"); if (! empty($conf->facture->enabled)) $langs->load("bills"); -if ($conf->productbatch->enabled) $langs->load("productbatch"); +if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); $mesg=''; $error=0; $errors=array(); $_error=0; @@ -863,7 +863,7 @@ else print ''; // Batch number management - if ($conf->productbatch->enabled) + if (! empty($conf->productbatch->enabled)) { print '\n";
'; // Affiche ligne produit - $text = ''; - if ($delivery->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service'); + $text = ''; + if ($object->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service'); else $text.= img_object($langs->trans('ShowProduct'),'product'); - $text.= ' '.$delivery->lines[$i]->product_ref.''; + $text.= ' '.$object->lines[$i]->product_ref.''; $text.= ' - '.$label; - $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($delivery->lines[$i]->description)); + $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->description)); //print $description; print $form->textwithtooltip($text,$description,3,'','',$i); - print_date_range($delivery->lines[$i]->date_start,$delivery->lines[$i]->date_end); + print_date_range($object->lines[$i]->date_start,$object->lines[$i]->date_end); if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) { - print (! empty($delivery->lines[$i]->description) && $delivery->lines[$i]->description!=$delivery->lines[$i]->product_label)?'
'.dol_htmlentitiesbr($delivery->lines[$i]->description):''; + print (! empty($object->lines[$i]->description) && $object->lines[$i]->description!=$object->lines[$i]->product_label)?'
'.dol_htmlentitiesbr($object->lines[$i]->description):''; } } else { print "		"; - if ($delivery->lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service'); + if ($object->lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service'); else $text = img_object($langs->trans('Product'),'product'); - if (! empty($delivery->lines[$i]->label)) { - $text.= ' '.$delivery->lines[$i]->label.''; - print $form->textwithtooltip($text,$delivery->lines[$i]->description,3,'','',$i); + if (! empty($object->lines[$i]->label)) { + $text.= ' '.$object->lines[$i]->label.''; + print $form->textwithtooltip($text,$object->lines[$i]->description,3,'','',$i); } else { - print $text.' '.nl2br($delivery->lines[$i]->description); + print $text.' '.nl2br($object->lines[$i]->description); } print_date_range($objp->date_start,$objp->date_end); print "'.$delivery->lines[$i]->qty_asked.''.$delivery->lines[$i]->qty_shipped.''.$object->lines[$i]->qty_asked.''.$object->lines[$i]->qty_shipped.'
".$langs->trans("Birthday")."\n"; - $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); + $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); print "
'; - print $lines[$i]->progress.' %'; + print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress'); print ''.$langs->trans("Date").''.$langs->trans("By").''.$langs->trans("Note").''.$langs->trans("Progress").''.$langs->trans("Duration").' 
'; + print $formother->select_percent($object->progress,'progress'); + print ''; print $form->select_duration('timespent_duration',($_POST['timespent_duration']?$_POST['timespent_duration']:''),0,'text'); From 47538071d381433f24ad289d61bea0bc08706bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 1 Oct 2014 14:40:38 +0200 Subject: [PATCH 0133/1190] Suggest dependencies needed by PHPExcel --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4463efcfc74..f0de86ce7ea 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,8 @@ "ext-mcrypt": "*", "ext-openssl": "*", "ext-mbstring": "*", - "ext-soap": "*" + "ext-soap": "*", + "ext-zip": "*", + "ext-xml": "*" } } From add55e480e8248e4396e10ba7650d9d419d0922e Mon Sep 17 00:00:00 2001 From: Xebax Date: Wed, 1 Oct 2014 22:00:45 +0200 Subject: [PATCH 0134/1190] Fix bug #1610: Civility is not displayed. --- htdocs/adherents/class/adherent.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index bd43ed134af..a057e7cba93 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1090,7 +1090,7 @@ class Adherent extends CommonObject $this->ref = $obj->rowid; $this->id = $obj->rowid; $this->ref_ext = $obj->ref_ext; - $this->civility_id = $obj->civility; + $this->civility_id = $obj->civility_id; $this->firstname = $obj->firstname; $this->lastname = $obj->lastname; $this->login = $obj->login; From 1541be879039f013748e65e6d34721e80b53ff3c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 2 Oct 2014 08:40:51 +0200 Subject: [PATCH 0135/1190] FIXME $key is not defined (strict mode) --- htdocs/core/modules/modProduct.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 87dbc3e6dde..5a2053f85ff 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -210,7 +210,8 @@ class modProduct extends DolibarrModules { // Exports product multiprice $r++; - $this->export_code[$r]=$this->rights_class.'_'.$key; + //$this->export_code[$r]=$this->rights_class.'_'.$key; // FIXME $key is not defined + $this->export_code[$r]=$this->rights_class; $this->export_label[$r]="ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("produit","export")); $this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref", From 2425fdfadd6bd93dedff94e21d5979c01d81ee98 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 2 Oct 2014 08:44:49 +0200 Subject: [PATCH 0136/1190] FIXME $socid is not defined (strict mode) --- htdocs/compta/hrm.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index cd2d2b60f7e..c0b2afd38c8 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -1,7 +1,7 @@ - * Copyright (C) 2013-2014 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin +/* Copyright (C) 2011 Dimitri Mouillard + * Copyright (C) 2013-2014 Laurent Destailleur + * Copyright (C) 2012-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -117,7 +117,7 @@ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAI $sql.= " WHERE u.rowid = d.fk_user"; $sql.= " AND d.entity = ".$conf->entity; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; -if ($socid) $sql.= " AND d.fk_soc = ".$socid; +if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid; // FIXME $socid is not defined $sql.= $db->order("d.tms","DESC"); $sql.= $db->plimit($max, 0); From 30221ae8cfa4361181f5badcb2c5903063989ff8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 2 Oct 2014 09:00:40 +0200 Subject: [PATCH 0137/1190] Fix: missing fields --- htdocs/fourn/class/fournisseur.product.class.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index bbb6dbdb33a..eff9e7e4275 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -1,9 +1,9 @@ * Copyright (C) 2006-2011 Laurent Destailleur - * Copyright (C) 2009-2012 Regis Houssin + * Copyright (C) 2009-2014 Regis Houssin * Copyright (C) 2011 Juanjo Menent - * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2012 Christophe Battarel * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -205,7 +205,7 @@ class ProductFournisseur extends Product { // Call trigger $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers if (empty($error)) @@ -281,13 +281,13 @@ class ProductFournisseur extends Product $error++; } } - + if (! $error) { // Call trigger $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers if (empty($error)) @@ -468,6 +468,7 @@ class ProductFournisseur extends Product $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,"; $sql.= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,"; $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges"; + $sql.= " pfp.remise, pfp.remise_percent"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; $sql.= " AND pfp.fk_product = ".$prodid; From 4248c7bed26b809bc980789df43b065edcafbc0e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 2 Oct 2014 09:30:31 +0200 Subject: [PATCH 0138/1190] Fix: strict mode paradise --- htdocs/categories/card.php | 15 +++--- htdocs/product/card.php | 28 +++++----- htdocs/product/class/product.class.php | 24 ++++----- htdocs/product/index.php | 11 ++-- htdocs/product/stock/card.php | 65 ++++++++++++------------ htdocs/product/stock/list.php | 8 +-- htdocs/product/stock/massstockmove.php | 7 ++- htdocs/product/stock/mouvement.php | 10 ++-- htdocs/product/stock/replenish.php | 12 +++-- htdocs/product/stock/replenishorders.php | 8 +-- 10 files changed, 99 insertions(+), 89 deletions(-) diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index 3b5fa5d3189..f09a526b327 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -1,9 +1,9 @@ - * Copyright (C) 2006-2011 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2007 Patrick Raguin - * Copyright (C) 2013 Florian Henry +/* Copyright (C) 2005 Matthieu Valleton + * Copyright (C) 2006-2011 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2007 Patrick Raguin + * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -116,7 +116,7 @@ if ($action == 'add' && $user->rights->categorie->creer) } } - + $object->label = $label; $object->description = dol_htmlcleanlastbr($description); @@ -125,7 +125,7 @@ if ($action == 'add' && $user->rights->categorie->creer) $object->type = $type; if ($parent != "-1") $object->fk_parent = $parent; - + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); if (! $object->label) @@ -243,6 +243,7 @@ if ($user->rights->categorie->creer) print $form->select_all_categories($type, $catorigin); print '
'.$langs->trans("Status").' ('.$langs->trans("Batch").')'; $statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch")); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 13a6d1dfa41..e78daeba631 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1,15 +1,15 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005-2013 Regis Houssin - * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2007-2011 Jean Heimburger - * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2013-2014 Cedric GROSS - * Copyright (C) 2013-2014 Marcos García - * Copyright (C) 2011-2014 Alexandre Spangaro - * Copyright (C) 2014 Henry Florian - * Copyright (C) 2014 Philippe Grand +/* Copyright (C) 2001-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2007-2011 Jean Heimburger + * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2013-2014 Cedric GROSS + * Copyright (C) 2013-2014 Marcos García + * Copyright (C) 2011-2014 Alexandre Spangaro + * Copyright (C) 2014 Henry Florian + * Copyright (C) 2014 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2856,7 +2856,7 @@ class Product extends CommonObject { global $langs; $langs->load('products'); - if ($conf->productbatch->enabled) $langs->load("productbatch"); + if (!empty($conf->productbatch->enabled)) $langs->load("productbatch"); if ($type == 2) { diff --git a/htdocs/product/index.php b/htdocs/product/index.php index fb2830e9e57..3e18cc5d042 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2014 Charles-Fr BENKE +/* Copyright (C) 2001-2006 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2014 Charles-Fr BENKE * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -367,7 +367,8 @@ function activitytrim($product_type) $result = $db->query($sql); if ($result) { - $tmpyear=$beginyear; + //$tmpyear=$beginyear; // FIXME $beginyear is not defined + $tmpyear=0; $trim1=0; $trim2=0; $trim3=0; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 01d5516a480..b95fe58d752 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005 Simon Tosser - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003-2006 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005 Simon Tosser + * Copyright (C) 2005-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +36,8 @@ $langs->load("stocks"); $langs->load("companies"); $action=GETPOST('action'); +$cancel=GETPOST('cancel'); +$confirm=GETPOST('confirm'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); @@ -59,17 +61,17 @@ if ($action == 'add' && $user->rights->stock->creer) { $object = new Entrepot($db); - $object->ref = $_POST["ref"]; - $object->libelle = $_POST["libelle"]; - $object->description = $_POST["desc"]; - $object->statut = $_POST["statut"]; - $object->lieu = $_POST["lieu"]; - $object->address = $_POST["address"]; - $object->zip = $_POST["zipcode"]; - $object->town = $_POST["town"]; - $object->country_id = $_POST["country_id"]; + $object->ref = GETPOST("ref"); + $object->libelle = GETPOST("libelle"); + $object->description = GETPOST("desc"); + $object->statut = GETPOST("statut"); + $object->lieu = GETPOST("lieu"); + $object->address = GETPOST("address"); + $object->zip = GETPOST("zipcode"); + $object->town = GETPOST("town"); + $object->country_id = GETPOST("country_id"); - if ($object->libelle) { + if (! empty($object->libelle)) { $id = $object->create($user); if ($id > 0) { @@ -87,7 +89,7 @@ if ($action == 'add' && $user->rights->stock->creer) } // Delete warehouse -if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->stock->supprimer) +if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->stock->supprimer) { $object = new Entrepot($db); $object->fetch($_REQUEST["id"]); @@ -105,19 +107,19 @@ if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->right } // Modification entrepot -if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) +if ($action == 'update' && $cancel <> $langs->trans("Cancel")) { $object = new Entrepot($db); if ($object->fetch($id)) { - $object->libelle = $_POST["libelle"]; - $object->description = $_POST["desc"]; - $object->statut = $_POST["statut"]; - $object->lieu = $_POST["lieu"]; - $object->address = $_POST["address"]; - $object->zip = $_POST["zipcode"]; - $object->town = $_POST["town"]; - $object->country_id = $_POST["country_id"]; + $object->libelle = GETPOST("libelle"); + $object->description = GETPOST("desc"); + $object->statut = GETPOST("statut"); + $object->lieu = GETPOST("lieu"); + $object->address = GETPOST("address"); + $object->zip = GETPOST("zipcode"); + $object->town = GETPOST("town"); + $object->country_id = GETPOST("country_id"); if ( $object->update($id, $user) > 0) { @@ -136,7 +138,7 @@ if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) } } -if ($_POST["cancel"] == $langs->trans("Cancel")) +if ($cancel == $langs->trans("Cancel")) { $action = ''; } @@ -162,37 +164,36 @@ if ($action == 'create') print "
\n"; print ''; print ''; - print ''."\n"; print ''; // Ref print ''; - print ''; + print ''; // Description print ''; print ''; // Zip / Town print ''; // Country print ''; diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 0d7b3c60c23..85fb7c1896d 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2001-2004 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ $sortfield = GETPOST("sortfield"); $sortorder = GETPOST("sortorder"); if (! $sortfield) $sortfield="e.label"; if (! $sortorder) $sortorder="ASC"; -$page = $_GET["page"]; +$page = GETPOST("page"); if ($page < 0) $page = 0; $limit = $conf->liste_limit; $offset = $limit * $page; diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 87fec698274..8a0b7297e2f 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2013 Laurent Destaileur + * Copyright (C) 2014 Regis Houssin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -228,7 +229,7 @@ $warehousestatict = new Entrepot($db); $title = $langs->trans('MassMovement'); -llxHeader('', $title, $helpurl, ''); +llxHeader('', $title); print_fiche_titre($langs->trans("MassStockMovement")).'

'; @@ -249,6 +250,8 @@ print ''; print '
'.$langs->trans("Ref").'
'.$langs->trans("LocationSummary").'
'.$langs->trans("LocationSummary").'
'.$langs->trans("Description").''; // Editeur wysiwyg require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); + $doleditor=new DolEditor('desc',(!empty($object->description)?$object->description:''),'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); $doleditor->Create(); print '
'.$langs->trans('Address').'
'.$langs->trans('Zip').''; - print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6); + print $formcompany->select_ziptown((!empty($object->zip)?$object->zip:''),'zipcode',array('town','selectcountry_id','state_id'),6); print ''.$langs->trans('Town').''; - print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id')); + print $formcompany->select_ziptown((!empty($object->town)?$object->town:''),'town',array('zipcode','selectcountry_id','state_id')); print '
'.$langs->trans('Country').''; - print $form->select_country($object->country_id?$object->country_id:$mysoc->country_code,'country_id'); + print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
'; //print '
'; +$param=''; + print '
'; print getTitleFieldOfList($langs->trans('ProductRef'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); print getTitleFieldOfList($langs->trans('WarehouseSource'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 2feeee7aa2d..50b46c7003f 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2001-2006 Rodolphe Quiedeville + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -406,8 +406,8 @@ if ($resql) if ($search_product_ref) $param.='&search_product_ref='.urlencode($search_product_ref); if ($search_product) $param.='&search_product='.urlencode($search_product); if ($search_warehouse) $param.='&search_warehouse='.urlencode($search_warehouse); - if ($sref) $param.='&sref='.urlencode($sref); - if ($snom) $param.='&snom='.urlencode($snom); + if (!empty($sref)) $param.='&sref='.urlencode($sref); // FIXME $sref is not defined + if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined if ($search_user) $param.='&search_user='.urlencode($search_user); if ($idproduct > 0) $param.='&idproduct='.$idproduct; if ($id) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,0,''); diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 04a1cf32e60..6482413a6a7 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -1,6 +1,7 @@ - * Copyright (C) 2013-2014 Laurent Destaileur +/* Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2013-2014 Laurent Destaileur + * Copyright (C) 2014 Regis Houssin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,6 +51,9 @@ $tobuy = GETPOST('tobuy', 'int'); $salert = GETPOST('salert', 'alpha'); $mode = GETPOST('mode','alpha'); +$fourn_id = GETPOST('mode','int'); // FIXME $fourn_id is not defined +$texte = ''; // FIXME $texte is not defined + $sortfield = GETPOST('sortfield','alpha'); $sortorder = GETPOST('sortorder','alpha'); $page = GETPOST('page','int'); @@ -197,7 +201,7 @@ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global $usevirtualstock=-1; if ($virtualdiffersfromphysical) { - $usevirtualstock=($conf->global->STOCK_USE_VIRTUAL_STOCK?1:0); + $usevirtualstock=(! empty($conf->global->STOCK_USE_VIRTUAL_STOCK)?1:0); if ($mode=='virtual') $usevirtualstock=1; if ($mode=='physical') $usevirtualstock=0; } @@ -426,7 +430,7 @@ print ''. if (!empty($conf->service->enabled) && $type == 1) print ''; print ''. ''. - ''. + ''. ''. ''. ''; @@ -310,7 +315,10 @@ if ($id > 0 || ! empty($ref)) } else { - print price($object->price_min).' '.$langs->trans($object->price_base_type); + print price($object->price_min); + if (!empty($object->price_base_type)) { + print ' '.$langs->trans($object->price_base_type); + } } print ''; } From 4b28ff005ef29c8de594eca9b24c2ab8a54356ea Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Thu, 2 Oct 2014 15:24:40 +0200 Subject: [PATCH 0140/1190] Return error message on category creation failure --- ChangeLog | 1 + htdocs/categories/fiche.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 218d6aada55..fc92cfd43a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ For users: - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line - Fix: Web service categorie WDSL declaration is correct - Fix: ErrorBadValueForParamNotAString was displayed in virtual product if no base price defined +- Fix: Category creation failed and no message output ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index a2f9dc54df2..208cbb38331 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -143,6 +143,8 @@ if ($action == 'add' && $user->rights->categorie->creer) { $action = 'confirmed'; $_POST["addcat"] = ''; + } else { + setEventMessage($object->error,'errors'); } } } From 8bc57e38d140e15dcee6c3ca0b1bd2d8e2b59fdc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 01:48:14 +0200 Subject: [PATCH 0141/1190] Uniformize, support, install and login page with a more neutral background (nearest bootstrap). Remove image background. --- htdocs/core/tpl/login.tpl.php | 7 ++++++- htdocs/core/tpl/passwordforgotten.tpl.php | 11 +++++++---- htdocs/install/default.css | 2 +- htdocs/support/default.css | 2 +- htdocs/support/dolibarr_logo2.png | Bin 2702 -> 0 bytes htdocs/support/headbg.jpg | Bin 7881 -> 0 bytes htdocs/theme/auguria/style.css.php | 4 ++-- htdocs/theme/cameleo/style.css.php | 2 +- htdocs/theme/eldy/style.css.php | 23 +++++++++++----------- 9 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 htdocs/support/dolibarr_logo2.png delete mode 100644 htdocs/support/headbg.jpg diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index dd50e24c8e6..c4f9ff2b206 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -47,6 +47,8 @@ $(document).ready(function () {
+
+ diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 7331a81ead0..61c0bbe6cfc 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -43,7 +43,10 @@ $(document).ready(function () { +
+
-
- diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 7ba1a9b136b..6be69acd912 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -180,7 +180,7 @@ margin-top: 10px; font-size:16px; font-weight: normal; color: #4965B3; -text-shadow: 2px 1px 2px #c0c0c0; +text-shadow: 1px 1px 1px #c0c0c0; } tr.bg1 { diff --git a/htdocs/support/default.css b/htdocs/support/default.css index d535ab0ea70..14454a19245 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -18,7 +18,7 @@ body { font-size:12px; font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; -background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; +background: #f9f9f9; /* background-color: #F4F4F4; */ margin: 5px 10px; } diff --git a/htdocs/support/dolibarr_logo2.png b/htdocs/support/dolibarr_logo2.png deleted file mode 100644 index 7abd0ae84942e7aef5b7872793c1602c0a3d4d6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2702 zcmWkv3piBU7oS_nyM(zYJ%+@DtGTJ@A(3J#G>ICI9)tW%WQ_Mr2~)UE5l2!-DGo}9 zJPx6QqBFVa=w+gAQxQ|jqaj0v`A_Tn)?WMjt+l_s_WJ$4Z>M{@@7C5>szD-=wB1~H zGL$h<=~T7(%GI)V;ZtQ$jdI)PqS~XTqP^b4xZUou5>k(FJ{ z2)>PAH~~N~4*&%qs02_H#c>=#QLeHAf5)zMmlpsVPim^Zh#|Z`|rek6@2n%48j*1*oiq)PcTpsjG$t%gn=ltC=Eau0>~aF>|val1_3Z)b>=1;Mrk0*f-$xLgfW~8 zA!mwF8iWU(&w^o?24Oq^V8XaaBv#Iji(vK;zAH8hLJ%H|&_IkS04Z#M3Lp@QQez>i z0HO0hDuA*fgu;U;T;;nldjR2qFhu~<0ffThQ3ME608n@^mC61)Je84!C~sy1AXflv z4~d5$h{xk`dAvhm@mwyK!Uic^hzCIWCjdh(WXJ{)C6UTLK}fkJ9~J1cvvgPhf*=40 z>M)fq{xq;OlmlGt{ z`LYo#A}&vok)NMGGu5!YW>)ig=cG^Oa$ZTl`uMg%&vj+r8qFWvV8?iFRE=rzj|H?OP6A_2ej}#I zzngxrqPH7#`S{H~Vx-*o;VP(w2>jJ>=gwa7$D3Yo#zUXT&frwsZQe0{imZq_{#xHy zJ@oBK-vx7**PLRPSA>*LG&Ks13Qu~k=&nA*x9%R$xKDqIMy`EEA2iC~%wqRmSGzji z>Y#1dwrxO-N|6gdn^?uBkjAnv)o%M;FO?xCS4U{)RAvdkJj>;a3X=?V8%j9hR>Pm` z4)=fO$X0%GAO4YA@`19G@-QcxYV4h6;Z)(FSM$G$J>!qYPmJ{j3XzO@$Cc&@%OehK z?t7nT8yy+RFq`-FZsq16vI>n9)})_T`K5iUS*r6=b<0O5)CUVk_D2OdD58ZQOy#Z5 zmZf@bS~P3gg4ICe7sT$V)dOqn+{x;-m}GL;vhicQ>N^jiue$%Zes1>BL%Mr!Y5BRR z4QU6&uQ=je>sfwsOcAx^4%>$pDmM+_N{jfGM^7p8v$Z$qD6am+FlF`+XRoFtwK_fI z_q0DYOTLuTC76~ogr(zCW#!wfCqX+o=QDff_vEP#)my@k=0c35$hlIo?=hhmg611m z)=y=W_g_z>E}8gtL;m<#kwjrOb?c@@Vnsr@f6K&mz3{!f-6aK=)D));Ne;(Cg~bKB z%=yFYx{hKJFQQOjpTn4TezQ{}Dk_2{Fput$_*q?Q*Do_tEoh13Ovp#qEmMpomAo3mxqd38b;guB(-ogt{Z?a|oc}BtfX}P3 zrpk3^RUOy7`bQY?=;-5J!5*17%Z}{RrbNS5I=rMvlzW;xRigo| zSUAA#>|N4n)0B?{#;q#()Gx68=`5{V$WPO2-E^E8(4J+ko;}n09r%=F@F~4!`0>T6 z{l9ip(f)QwwZUe@Hl~gD<3mD1;wE$l^LEWty*OUEv2P}&P3Qd8pqEiPCekiP>^~eZG&-92^oAgQs3GOKVI2%k zOingOJJ=VMugs>@^wb)dNN=Rto#m&swZsVrS0)$NGpoa$`=>8)Pxn;VyT#Gk=W3=+ zZNFI%M$e9HmW7d<<|-s-77hhpDQ%9|mnL-rVLA(I4lcF3kg`4RC7be^)Uu$@v+?u8 zo>M_yTT;#+h_YWwygevBKitf?Wpptnw`Snb_}z?}Da8Q`j{-YR--Yn|9qq60zR$Yx zg<9Xd@Mb*qzebfTV`S67_p@nyTUp7T*I$mDFnPHPdhz&OD8;Kxcbe)x%ry)7^1Ul~ zr=P0xDX6b+-n)|OrmCtRsl&^S((C$doZrSh>Uy^2Ugf@l?aaj;FRU)7EGM@rXmzj5 zZj%bkh@65-Cq9y~LKuU*X$zeN(MEgk#Rc47C`%VDQs>AE}i z=MrLA)e6;b0j(8-ry0bVv};M3!DaNx!kf|_={7shcTT<+8fM6_KvTXvwyp1Rpy58n>O=R zwald~_vBp5#nw-3{0GOUW4uqT9XERWDKZt}DC=Cx zN5`bAY`m9F@9~ZriB4Z~Vv)2evYRy(6cp4I{-4)*X&7N6TrM~nKhj(6>Tym*)Ye31 zq%5w|ol3slYCr?Sp86cq)2$zE-IX4#!cR1q*3q7m-J5&FAO7~#@hLab=kB5Wyc@R} z{WMB>b5&$?_{dPHD9|bTc!2hG6pDNP;H4(tq|)-xpttpong&<)wSP1vwk+YA$QMn7QKEo^KT2v zMXe08-t;ZTm;AhaufD6cjcGUO>ZEgB1d6Doj1bbPMD>-NPJ;ZWetcp4?3Cufu~*JNmN?h;@3?tb gQk1L6{AJUc>A1G{pRDc5Uzp_P;=Z%O>1gu*0e3ct=Kufz diff --git a/htdocs/support/headbg.jpg b/htdocs/support/headbg.jpg deleted file mode 100644 index 5491c6e4acbc576eb5397d1091fdd7ea7e03de00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7881 zcmd5>hhGzEw;r-&g`liJXf7ZiAqhQUQBb-BOh8BiYEX(0LkWsh1yMm3ltdQRkc48S zgwT{CRVk|yFi3*1R0Xlnq=^L)7Ztd}e)rzr{S)paTVr#im*1_U&k5Cv|UKzz_MK;VTr;laW z@AP8DyZXKBwGE(hf>A*Mdl)eve#Q1;5_6REzK&|kMcMq=QBlzM=9%o@ z<+;B2FTWhsv=mx~)rMMc0(_>f%A{h{3I|)u{Pc5|(F|8%!~2BNh{#T4oVyro!_Qq` z{$QxNw}B!&o~~l%tGnZ5x&Ip|VVMV7HiGNl|HIPKKyO4b(&8|IUBgc<h9L*F8GhF8r2l>gVhYt+ceXH|$&(C3#YDUBCYA@ifx`w`cLC*oBGAO(08Y zM4Z^QE9kSNty|M1J|^QP>334PvHe|QW@EN$TroV3>#GCgb_qylXtKz5%h@8LBQE?5*}ZHL-fQ``cPrZmyBXDoH68+ z1~!@09WB>z^H;}l4LHf3jP9nbbKBr-75}?LX&4&CzY%`2+33FioJM;Xji+Ix_f^}o z!QALc-HGmH%=&vBiIz^FiQjl&ZJI(kUR8Lc=4#ZEsU53IUvoe49gF}=YJB*sU%Idee#H$&NGqHj7NJ;2H-YNG#oug*KXww||# z!R%1p;|@;7bW2RpkeA905=|Kj>31YZTb(evPxzgJg!d!i!}^L$ef6BfXOM~&<$b8- z`OM?iEzTsHl90lWS$NBDhjKHPoJNsROo~%J;?PY4)*6zFWpeM{OwB;lNT0{*Dxs<9 zrZbh8=BCeLetvlA>4~ep-c$GP)szip@jEGb zp~d7*g&+q6!Q<*C0$V)&;blUkRcxb;ognm$9}t z9Rh_%dDDdaWby#XUZ&gv<{-ot+6u6vHn0!-47*Gwuu$@_Vo zoA26@^nerqSFi`nHt zUgP=DXr(23SUmf~uP4xqnPxH&+^L}a5=;nAhp9aRs(G*HkC=42l5MG_i@AsGrHgfW z^Ic!|6mvb}U7Ix3t{oEX5w7C<)IOMaUrfu;HD)Z#W`_vYXWJ@c#?sN{?bKbq0d#qB zYJ0?Sw?6)CfBf#+@8DAz?VVspU9~$)n?9reS?iZ>+w8b~qGKVe_qIVD-OcD(3_RY& zc4XQ2j!;Crx9Z*A?xJm=EbClBCQIRD&B&x40(fb}qR5$ZjO8|MBAbMFjh3bv);1V- zRw3X~DijpL0jKfEn^vg;MWB*}`LcOI33`8eoWiMhX$D;$5ldav`$~D2Wuoc5o}+T0 zbz-!Lbds$M=gaPd18V)hSsXr07QD5tnm)r?S~(-9?$3F#bk6rW!-9ct&uvGl2L+%6 zC0*!iJ{NA-yqF}HqxF$OXHU(sRsiC9-?@6C&nS#r%sZz3#`~SWe7r?0f7sz1=fQa)y9qRhsek_YVMLyX;BOwy;8>2yrC*I` zwqxnpA?zH+VRA&UcS=rBw#KaLp#`U};RZN-8do1(&S|tq959VpGIsMZS9r5ztSt1{ zIg^bI$lUvvPvbSM0{08eKC2fd_o$UCR+TfO7QRfWKhug{>GCMz#-AO&S>WNK)@AKv zz4qhgtqYM2r8e7JvhI$I@<4o1k?OVPL#1Q!M9GE>0{BU^Es?#0VCtXqN#KeE|m`VkH8J-NgHngiK~3n}|3 z;0K^k_JTWL-pncpYY=XDM6^0pJtE5D;9Hl(ncQmfw~r}Q2gmiMr^1OuZqxD3N@;U! zAGZjhmrA{3ks`_L>iat4$4EhWHs~3u_bGnv({nI;=GywV005v#0Pu@3!k7$qL%^f8 z4&`PVJIA|lGOEGA*VqP>FFJiq%_voD4X{1Rzt~c6p$)LRa8mIJrA2?_|k<=Rndy_Ku-88?yTeXzXE&v&T_4dCzp%D-H8 z!lcwcvt+&dLFPd%o`3vj>|cHlG*NHkS3Y;fUOr~!r*>f#ESZ)ulYE_lAk6h_`7*J{ zvMV=&*K!NL@=8Yzx1OQml1m3HGvjQf6GI@aP24^=QL1Zpx3=GBAEf2*O_gHAUA?MbE8>;Ik$)z&l z6X{iPT&xgTuk;57WA;iDpYi_rjJjsVyyXpB_8M!_Puxw|+qVh0_W#rNVfa?vCNMZ? zksjT7P%^xBzjHC=j0tJ&!eG3QOWA2#YZvUIg2LFYLNBNzTh6HAd7XqcT_-WB6ZX2Y zB;SncCc*&#BC#vXM(~UgG7kqNC%lR&VD6haZPa{%0hz03KHbq+V5g_G9S@?dnxFWM8{UZmA96K*BYkNNqq1Wzk z6vQr=>y2pabKFmhG|d+o)#k5uF+>UYzQ%fn+ubH44CED0C-TSlJ87`Fg?f)Gl}0h% zdHFuez2UVnqHwjojGn3Vp6HoD4a0TQ*bLbmk%`ak3-x_!o50dYuvWe;U+Z-JLhP)M zWmivY%mvGp;0C>}hK3o`k8x#T0g2MF_Q{n8k_J;4i>p~I9FanS|RN){V=YpBJOv+)0Bkg7G zOrY$kG;jZ3RHB=rjaq&jf91ze2(Z5GdX0Qm-zobt`*KyeJs@=w04OzD6_zFVo?mH8 z<$b1MYf;O!!(Vr}9NTTEK4nO<5e!?P1OoIH{UZbg1O};?=j6Y?G4gds=ahBlJ#`Px zB&AOk%@D=KcG>E_VBooDxqPn&_$$cNt5gHFM5FE--7JlHIDSHZjFH+((GTMq#y2m` zSJtKLbh)+E$46$CT@1vCS`R*bwsx^s6ZHaVoBdc~eQ)vbx=qeRh5`vLcmg1}QD6tv zxatIl6SwIWCVI?wcSm_A;?^}Zb`NA6f$#~3$)zf9ca)s_wl|f*P=?7n9cM{kDK&Ma za{M7HyHO{hS5h>s>Iy!lNhKoD-4zEW3KXAd4|*k+L+L$g&Y4RV(ZG-sMH@154#*i3Po|^SLV~@t7N)68pNp3UBAMN*QnmJpE}I=&{63|a91#z zNqMF@Si&WVh>OR%iR`~}c@=hg=MF7I4fndL)GEBJk#WQJlAcz&9*bht@9%nnN$njy zA7=e&ek$Jesrm4l5@q9l;?j%azdK4aTx?$wjpXc&j2g!FbhkO4T{&x;6~Fh%i#?~W zOGcZVM-xoeqZ}j!IM1UUu{oTew+@ITb;8!Uf~4I43XFld_>$|NfJ*{y`7Jz=rBy z!(H0N{x`$mj1f^$_iUeq?)~P=cg+l22i_2@{9H}+Hm)JJLG>%hQLS!9r<#s4%mD3@ zq$^>xKfyMY(pI=F){Y@e;=ze*qK+%xjC7Plt2|YUF<=`&isW|UrB|Iot`$r_ops+< zR$r!^;&??*$;21G?sKKmD*GZ1kP1K(0V#WzE{6DFH`P`UT~GOu-uBtJ>q**&9f?B$ zuj1(Y|M3V7yBL%xR++q5>81$X8Lx+cp)CwRa;kzYI2FwHI9Ghf>@vPUPF*;jV9AOQ zCqAx>l4xPCRwHXIot_TNJ5l$J+%R_0EJUa;e4&=5_ef@9TSmWNb04S{DVdww>ZI56 z!UO#>uRPlXSXA_+zx#m%dlv4*`w=J0o2<%EKaPXui z2njD9J!c>%CYB`0RN(X;LE&UL(YU*AEKT~ite2%UnfGNO_cAN?@g%?9$Ib3sl~Htb zYmSXCvwbu_a4iG@2kNd6Aw%}W-G=^dy>@uD*D*ZZ_0n2%yyb=WdA+~YT6N`~)vAu{ zh+Gar=7ih2+aAwoQkp4Wpn}9lY||KN#*;(i^&DA|I5>3!Os| zuXbY-f>l;xW;G^1+=^{{0~(8;c{(o?#rG#gXwvK+itb@gXYUQ2Wn2`x}T~E zhF*CBH3oTI1PSMWuNfQS@k+#_i8yXavH{!;P9~D@D);mUPJ^7V>+S|f38Up`U_0Z0 z$NTVvOJ=pKPG+hGH$u0}tSJ(KAQu{^BH$dvz{_Ml1F8F*bf}z228d9oR2Z$QCM7f% zPf1QFjRtd{Z}0m8Ez<)ZSDwgPSGsJMT#f#YEnghS(6omP;RIf)V$@E1VC`FdmEI)1 zXJRFcw3LY{yy*Vr|msaVOmN?p@|_&XIzepSjI+0q3#Xpwe>fm&7H^8fH>g)#O3H$ZLk{nPn^Uj??WQzP>vv+c_?O z_ra-)Jr|mt%{%`hgDZc#Q=?Ltx$O9)oE58ts&u3rRs8#wCB5M@VKB6T`w^oz9*vFeGup~h_COMxcz4JJ*8b{f#xhM++0^vJ4s53TSr<{}$jh=8 zh@q0HbstuC^mWPT-vC@^>j)sO5ijz@TO6k8>UWCP&a`mv1TGn+B;F=fjb3x@t+rh*_!~n zcAw3R!7*=q>aYc+sfp4Zj4FWo)6(PdOiqU}wvG11)>M){iIKEEJFmK3(6P@ZFD(`I zhR3(AU(>NO9k`5N$;!t!U6%A-EVx%!x9atsRW|xP!R~D6_XKW@Y0&8ReLd;R{@vLn z8D#?-hy1(c+6bNP5lsj<38$N?t&v*J)WLz|j_igoHESh^5?$3DKY^65J6Q4I-!Ou{ zVoA8G|H62Cup)8Wwiv5b|3!jq3^cMclqeTm$hV)eLm-jd{o(*-y%ErJy%f(g%Ne2xFj4zW}Bvx6Hm!&sNVvq z5(BpShduoT!!cK5W@5N8DbHF$!d6-mf)6#92m6=gvpr4?1cv4c6OdEo&6_|6=IW?Z z!X>S254S*FbYImir_S^7*yem1^RN{XJ~SL_aK^&Bi-l?6g$xywb*Xhj?Mh4GHYQeH z4{ACVM3?sGe_SEEVYs%QIqzHDR+H-r(1JeBkBAlrHOEES+lwo765bzoNm+{pwmTLU zhcEx(dC-%bowE!!gx%`v7V7Qlj-z1#I53XdP$*BsSmy@}jRu=YfP|Is zc!yvBB$gUgJX1s}sI9`IuCH6+_%|Gx1gTIt{zM!M1$gn3P(@Oqfy%iuF!hD021{Dz z56;e&E(IwEJ$?5}?!8_OWGA22Ddio20ob|AR6HvD2~=_`D)lQWZin;=CP8tsw4%at z*T=jpCOr>SDJ}J;g!HUGaJ7~__dc~GF1z(z3x9CrdUsFf=hFkd+eLE4`=6SWK3uaX z&IZGyUzV^Z}_5H8h-(SD#cFKIr}}M($WRI2YPuR^22;E*L=Ie;hYkpPmM zm!_D&Z?}2ug1)}+x{SE9rOUS zJC}@R%Qzi#F)jbhDnv_aV#?&3j@PS#)yYj6Gv?8qk9n7QBa?SLVO0FkQKP;&mkr>;f!PeP}58mxK z$!7(C(hfFxF{5x995_+>w>s_j)+D<1%*U@5&)Ar-JlEvYb1tp z%OOtLM$K$~s>muf6;Nbvg+K}bW3bgrfDHxjFc=7amZw*-*AS1a+e|M;`NowZe~x8E zHU;m(caESzK%W}6DE9O`!n>U17-_M!Vq$cW>WqX7z7$^IEbGGko+0zTuxlTS|CEX&pa4P1bS=Tb9;e`x z3UH~YmazLWm6BUgaKeN}%a)5Et1SVC0w5sK0YkfM3-zTXdcq^7hCerD{ce7x65Mh- z1eA`MA~bj7HdSzhD2m(%W(KbbJ3qd^-k_I{j-%>fnB62Gf4r7z-iIhU9 zb|JzTf`YRRz)b)kol^cg`)fG1oUV@`JCYMH;617x0XvfZ^#LGmVV0Q+p7y`JxJ@U~ z8#q5#&Vh34ZSnx9ebd8Mz`0acsGR_BQiR`Dq=?mdXDsOY)cVMR#xePYtwaAq_(;uu7}A6wOyGcHkv({JB0z)`5)Du? zw9#IsPeKbs-wL7$;pKiDKN)%+WSU3qMB z(*N!SC!)4kFbV)j_E6AS08W$wceDo&A>qJa5P@;E!mi-pL;wXb lFn}ee!L$qi=iK0@3?G~|AX6ywe>eW0|NlRI{bh6XzW{0BliC0P diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 1159e40ff0a..f4832bddac8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global- // Define image path files and other constants $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; $img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); -$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); +$img_head=''; $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); $dol_hide_topmenu=$conf->dol_hide_topmenu; $dol_hide_leftmenu=$conf->dol_hide_leftmenu; @@ -108,7 +108,7 @@ body { background-color: #FFFFFF; - background: #ffffff url() 0 0 no-repeat; + background-color: #FCFCFC; color: #101010; font-size: px; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index bfb64ab09a0..41dc3b57179 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -85,7 +85,7 @@ body { background-color: #FFFFFF; - /*background: #ffffff url() 0 0 no-repeat;*/ + background-color: #FCFCFC; color: #101010; font-size: px; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3eef3bd840e..25ff8cad3e0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global- // Define image path files and other constants $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; -$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); +$img_head=''; $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); $dol_hide_topmenu=$conf->dol_hide_topmenu; $dol_hide_leftmenu=$conf->dol_hide_leftmenu; @@ -812,7 +812,10 @@ foreach($mainmenuusedarray as $val) .bodylogin { - background: #ffffff url() 0 0 no-repeat; + background: #f9f9f9; +} +.login_vertical_align { + padding: 10px; } form#login { margin-top: px; @@ -836,22 +839,18 @@ form#login { padding-top:12px; padding-bottom:12px; max-width: 540px; - border: 1px solid #C0C0C0; - background-color: #E0E0E0; + border: 1px solid #A0A0A0; -moz-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD; border-radius: 8px; - border:solid 1px rgba(168,168,168,.4); - border-top:solid 1px f8f8f8; - background-color: #f8f8f8; - background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + border:solid 1px rgba(90,90,90,.4); + -webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); + box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); + + background-color: #FFFFFF; } div#login_left, div#login_right { display: inline-block; From 5ac63ec53460c16a718a9f212bec081d932812db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 02:00:50 +0200 Subject: [PATCH 0142/1190] Solve fixme. --- htdocs/compta/hrm.php | 4 ++- htdocs/core/modules/modProduct.class.php | 24 +++++++------- htdocs/core/modules/modService.class.php | 40 ++++++++++++++++++------ htdocs/product/stock/replenish.php | 4 +-- 4 files changed, 46 insertions(+), 26 deletions(-) diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index c0b2afd38c8..dae4ce9aa7d 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -38,6 +38,8 @@ $langs->load('users'); $langs->load('holidays'); $langs->load('trips'); +$socid=GETPOST("socid"); + // Protection if external user if ($user->societe_id > 0) accessforbidden(); @@ -117,7 +119,7 @@ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAI $sql.= " WHERE u.rowid = d.fk_user"; $sql.= " AND d.entity = ".$conf->entity; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; -if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid; // FIXME $socid is not defined +if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid; $sql.= $db->order("d.tms","DESC"); $sql.= $db->plimit($max, 0); diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 5a2053f85ff..a23fc59a2d0 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -198,7 +198,7 @@ class modProduct extends DolibarrModules $this->export_entities_array[$r][$fieldname]='product'; } } - // End add axtra fields + // End add extra fields $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p'; @@ -210,15 +210,14 @@ class modProduct extends DolibarrModules { // Exports product multiprice $r++; - //$this->export_code[$r]=$this->rights_class.'_'.$key; // FIXME $key is not defined - $this->export_code[$r]=$this->rights_class; + $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]="ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("produit","export")); $this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref", - 'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel", - 'pr.price'=>"HT",'pr.price_ttc'=>"TTC", - 'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC", - 'pr.tva_tx'=>'VATRate', + 'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel", + 'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC", + 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC", + 'pr.tva_tx'=>'PriceLevelVATRate', 'pr.date_price'=>'DateCreation'); //$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Number",'p.surface'=>"Number",'p.volume'=>"Number",'p.weight'=>"Number",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Number",'p.price_ttc'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date'); $this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product", @@ -305,11 +304,11 @@ class modProduct extends DolibarrModules $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon $this->import_tables_array[$r]=array('pr'=>MAIN_DB_PREFIX.'product_price'); $this->import_tables_creator_array[$r]=array('pr'=>'fk_user_author'); // Fields to store import user id - $this->import_fields_array[$r]=array('pr.fk_product'=>"Id*", - 'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel", - 'pr.price'=>"HT",'pr.price_ttc'=>"TTC", - 'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC", - 'pr.tva_tx'=>'VATRate', + $this->import_fields_array[$r]=array('pr.fk_product'=>"ProductRowid*", + 'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel", + 'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC", + 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC", + 'pr.tva_tx'=>'PriceLevelVATRate', 'pr.date_price'=>'DateCreation*'); $this->import_regex_array[$r]=array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); $this->import_examplevalues_array[$r]=array('pr.fk_product'=>"1", @@ -333,7 +332,6 @@ class modProduct extends DolibarrModules */ function init($options='') { - // Permissions $this->remove($options); $sql = array(); diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php index 363fcaf6467..839d50709c7 100644 --- a/htdocs/core/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -60,7 +60,7 @@ class modService extends DolibarrModules $this->picto='service'; // Data directories to create when module is enabled - $this->dirs = array("/produit/temp"); + $this->dirs = array("/product/temp"); // Dependancies $this->depends = array(); @@ -147,7 +147,7 @@ class modService extends DolibarrModules if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'service')); if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'service')); // Add extra fields - $sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'"; + $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'"; $resql=$this->db->query($sql); if ($resql) // This can fail when class is used on old database (during migration for example) { @@ -155,8 +155,28 @@ class modService extends DolibarrModules { $fieldname='extra.'.$obj->name; $fieldlabel=ucfirst($obj->label); - $this->export_fields_array[$r][$fieldname]=$fieldlabel; - $this->export_entities_array[$r][$fieldname]='product'; + $typeFilter="Text"; + switch($obj->type) + { + case 'int': + case 'double': + case 'price': + $typeFilter="Numeric"; + break; + case 'date': + case 'datetime': + $typeFilter="Date"; + break; + case 'boolean': + $typeFilter="Boolean"; + break; + case 'sellist': + $typeFilter="List:".$obj->param; + break; + } + $this->export_fields_array[$r][$fieldname]=$fieldlabel; + $this->export_TypeFields_array[$r][$fieldname]=$typeFilter; + $this->export_entities_array[$r][$fieldname]='product'; } } // End add extra fields @@ -164,7 +184,8 @@ class modService extends DolibarrModules $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object'; - $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')'; + if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc'; + $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')'; if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries) @@ -186,7 +207,7 @@ class modService extends DolibarrModules $this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product", 'pr.price_base_type'=>"product",'pr.price_level'=>"product",'pr.price'=>"product", 'pr.price_ttc'=>"product", - 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC", + 'pr.price_min'=>"product",'pr.price_min_ttc'=>"product", 'pr.tva_tx'=>'product', 'pr.date_price'=>"product"); $this->export_sql_start[$r]='SELECT DISTINCT '; @@ -208,10 +229,10 @@ class modService extends DolibarrModules $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon $this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields'); $this->import_tables_creator_array[$r]=array('p'=>'fk_user_author'); // Fields to store import user id - $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*'); + $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*'); if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode')); // Add extra fields - $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'"; + $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity = ".$conf->entity; $resql=$this->db->query($sql); if ($resql) // This can fail when class is used on old database (during migration for example) { @@ -225,7 +246,7 @@ class modService extends DolibarrModules // End add extra fields $this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_regex_array[$r]=array('p.ref'=>'[^ ]','p.tosell'=>'^[0|1]$','p.tobuy'=>'^[0|1]$','p.fk_product_type'=>'^[0|1]$','p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); - $this->import_examplevalues_array[$r]=array('p.ref'=>"PR123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31'); + $this->import_examplevalues_array[$r]=array('p.ref'=>"PREF123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31'); if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries) @@ -297,7 +318,6 @@ class modService extends DolibarrModules */ function init($options='') { - // Permissions et valeurs par defaut $this->remove($options); $sql = array(); diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 6482413a6a7..35835709ab8 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -51,8 +51,8 @@ $tobuy = GETPOST('tobuy', 'int'); $salert = GETPOST('salert', 'alpha'); $mode = GETPOST('mode','alpha'); -$fourn_id = GETPOST('mode','int'); // FIXME $fourn_id is not defined -$texte = ''; // FIXME $texte is not defined +$fourn_id = GETPOST('fourn_id','int'); +$texte = ''; $sortfield = GETPOST('sortfield','alpha'); $sortorder = GETPOST('sortorder','alpha'); From b5be8ff62033fc0d15c7601284bc485622feb881 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 02:45:47 +0200 Subject: [PATCH 0143/1190] Fix: Avoid error ErrorBadValueForParamNotAString --- htdocs/product/composition/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index efe03b0b024..8c71f29581b 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -295,7 +295,7 @@ if ($id > 0 || ! empty($ref)) } else { - print price($object->price).' '.$langs->trans($object->price_base_type); + print price($object->price).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT'); } print ''; @@ -307,7 +307,7 @@ if ($id > 0 || ! empty($ref)) } else { - print price($object->price_min).' '.$langs->trans($object->price_base_type); + print price($object->price_min).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT'); } print ''; } From c69565fd69f826f3fc3c846a849f8e088828f4a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 03:12:39 +0200 Subject: [PATCH 0144/1190] Fix: column name should not be an numeric --- htdocs/core/actions_extrafields.inc.php | 18 +++++++++--------- htdocs/core/class/commonobject.class.php | 8 ++++---- htdocs/core/class/extrafields.class.php | 5 ++--- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php index 55a538a2195..89edfcbae8e 100644 --- a/htdocs/core/actions_extrafields.inc.php +++ b/htdocs/core/actions_extrafields.inc.php @@ -28,7 +28,7 @@ $extrasize=GETPOST('size'); if (GETPOST('type')=='double' && strpos($extrasize,',')===false) $extrasize='24,8'; if (GETPOST('type')=='date') $extrasize=''; if (GETPOST('type')=='datetime') $extrasize=''; -if (GETPOST('type')=='select') $extrasize=''; +if (GETPOST('type')=='select') $extrasize=''; // Add attribute @@ -87,7 +87,7 @@ if ($action == 'add') $mesg[]=$langs->trans("ErrorNoValueForRadioType"); $action = 'create'; } - if (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param')) + if (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param')) { // Construct array for parameter (value of select list) $parameters = GETPOST('param'); @@ -95,7 +95,7 @@ if ($action == 'add') foreach($parameters_array as $param_ligne) { if (!empty($param_ligne)) { - if (preg_match_all('/,/',$param_ligne,$matches)) + if (preg_match_all('/,/',$param_ligne,$matches)) { if (count($matches[0])>1) { $error++; @@ -104,7 +104,7 @@ if ($action == 'add') $action = 'create'; } } - else + else { $error++; $langs->load("errors"); @@ -112,12 +112,12 @@ if ($action == 'add') $action = 'create'; } } - } + } } if (! $error) { - // attrname must be alphabetical and lower case only + // attrname must be alphabetical and lower case only if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname'])) { // Construct array for parameter (value of select list) @@ -139,8 +139,8 @@ if ($action == 'add') list($key,$value) = explode(',',$param_ligne); $params['options'][$key] = $value; } - } - + } + $result=$extrafields->addExtraField($_POST['attrname'],$_POST['label'],$_POST['type'],$_POST['pos'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$default_value,$params); if ($result > 0) { @@ -164,7 +164,7 @@ if ($action == 'add') $action = 'create'; } } - else + else { setEventMessage($mesg,'errors'); } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 36b4af841a8..0f41eefddf7 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2120,11 +2120,11 @@ abstract class CommonObject foreach ($tab as $key => $value) { - // Test fetch_array ! is_int($key) because fetch_array seult is a mix table with Key as alpha and Key as int (depend db engine) - if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key)) + // Test fetch_array ! is_int($key) because fetch_array result is a mix table with some key as alpha and some key as int (depend db engine) + if ($key != 'rowid' && $key != 'tms' && ! is_int($key)) { - // we can add this attribute to adherent object - $this->array_options["options_$key"]=$value; + // we can add this attribute to object properties + $this->array_options["options_".$key]=$value; } } } diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 7b1f9d59889..c9e5d937a18 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -154,7 +154,7 @@ class ExtraFields { $table=$elementtype.'_extrafields'; - if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)) + if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname)) { if ($type=='boolean') { $typedb='int'; @@ -226,8 +226,7 @@ class ExtraFields // Clean parameters if (empty($pos)) $pos=0; - - if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)) + if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname)) { if(is_array($param) and count($param) > 0) { From a853aed348f2fcc9c8e0258beec591407f1b4634 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 03:42:11 +0200 Subject: [PATCH 0145/1190] Fix: Some fields not visibles. Wrong value for calculated time. --- htdocs/projet/class/task.class.php | 2 +- htdocs/projet/tasks/task.php | 9 +++++---- htdocs/projet/tasks/time.php | 31 +++++++++++++++++++++++++----- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index ea0cce9e121..c97b51e53a4 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -41,7 +41,7 @@ class Task extends CommonObject var $fk_task_parent; var $label; var $description; - var $duration_effective; + var $duration_effective; // total of time spent on this task var $planned_workload; var $date_c; var $date_start; diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index dd83cf57d8f..908a9513162 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -348,7 +348,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Progress - print ''; @@ -436,14 +436,15 @@ if ($id > 0 || ! empty($ref)) print convertSecondToTime($object->planned_workload,'allhourmin'); print ''; - // Progress + // Declared progress print ''; - // Progress + // Calculated progress print ''; // Description diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index cb8a4dd193a..7136ffc43c5 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -50,7 +50,7 @@ $projectstatic = new Project($db); /* * Actions -*/ + */ if ($action == 'addtimespent' && $user->rights->projet->creer) { @@ -171,7 +171,7 @@ if (! empty($project_ref) && ! empty($withproject)) /* * View -*/ + */ llxHeader("",$langs->trans("Task")); @@ -283,9 +283,6 @@ if ($id > 0 || ! empty($ref)) // Label print ''; - // Planned workload - print ''; - // Project if (empty($withproject)) { @@ -300,6 +297,30 @@ if ($id > 0 || ! empty($ref)) print ''; } + // Date start + print ''; + + // Date end + print ''; + + // Planned workload + print ''; + + // Declared progress + print ''; + + // Calculated progress + print ''; + print '
   ' . $langs->trans('AlertOnly') . ' ' . $langs->trans('AlertOnly') . '   '. diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index d0b0d5d4f53..07aa68a7a98 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -1,6 +1,7 @@ + * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2014 Regis Houssin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,8 +45,7 @@ $result=restrictedArea($user,'produit|service'); * View */ -$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|'; -$helpurl .= 'ES:Módulo_Stocks'; +$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks'; $texte = $langs->trans('ReplenishmentOrders'); llxHeader('', $texte, $helpurl, ''); @@ -132,7 +132,7 @@ if ($sall) { $sql .= ' AND (cf.ref LIKE "%' . $db->escape($sall) . '%" '; $sql .= 'OR cf.note LIKE "%' . $db->escape($sall) . '%")'; } -if ($socid) { +if (!empty($socid)) { $sql .= ' AND s.rowid = ' . $socid; } From 78ec4d595b11c22317c54074d0b61a998b3b18cb Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Thu, 2 Oct 2014 15:21:49 +0200 Subject: [PATCH 0139/1190] Fix trad currency --- ChangeLog | 1 + htdocs/product/composition/fiche.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34448e95543..218d6aada55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ For users: - Fix: Withdrawal total amount is double - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line - Fix: Web service categorie WDSL declaration is correct +- Fix: ErrorBadValueForParamNotAString was displayed in virtual product if no base price defined ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index 26761a2d56b..bf89798e79f 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $langs->load("bills"); $langs->load("products"); +$langs->load("main"); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); @@ -292,13 +293,17 @@ if ($id > 0 || ! empty($ref)) { // Price print '
'.$langs->trans("SellingPrice").''; + if ($object->price_base_type == 'TTC') { print price($object->price_ttc).' '.$langs->trans($object->price_base_type); } else { - print price($object->price).' '.$langs->trans($object->price_base_type); + print price($object->price); + if (!empty($object->price_base_type)) { + print ' '.$langs->trans($object->price_base_type); + } } print '
'.$langs->trans("Progress").''; + print '
'.$langs->trans("ProgressDeclared").''; print $formother->select_percent($object->progress,'progress'); print '
'.$langs->trans("ProgressDeclared").''; print $object->progress.' %'; print '
'.$langs->trans("ProgressCalculated").''; - print $object->progress.' %'; + if ($object->planned_workload) print round(100 * $object->duration_effective / $object->planned_workload,2).' %'; + else print ''; print '
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("PlannedWorkload").''.convertSecondToTime($object->planned_workload,'allhourmin').'
'.$langs->trans("DateStart").''; + print dol_print_date($object->date_start,'dayhour'); + print '
'.$langs->trans("DateEnd").''; + print dol_print_date($object->date_end,'dayhour'); + print '
'.$langs->trans("PlannedWorkload").''.convertSecondToTime($object->planned_workload,'allhourmin').'
'.$langs->trans("ProgressDeclared").''; + print $object->progress.' %'; + print '
'.$langs->trans("ProgressCalculated").''; + if ($object->planned_workload) print round(100 * $object->duration_effective / $object->planned_workload,2).' %'; + else print ''; + print '
'; dol_fiche_end(); From 494e6786b3cc6e6853cd3a5386a73dcfe23156f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 03:52:50 +0200 Subject: [PATCH 0146/1190] Fix: Translation --- htdocs/langs/en_US/projects.lang | 6 +- htdocs/theme/eldy/style.css.php | 95 ++++++++++++++++++++++++++++---- 2 files changed, 87 insertions(+), 14 deletions(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 75bc4a29f5a..3e1ecea0be4 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 25ff8cad3e0..1424fc838e9 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1500,15 +1500,16 @@ span.tabspan { div.divButAction { margin-bottom: 1.4em; } .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { - font-family: ; - font-weight: bold; - background: white; - border: 1px solid #8CACBB; - color: #434956; text-decoration: none; white-space: nowrap; padding: 0.4em em; margin: 0em em; + font-family: ; + + font-weight: bold; + background: white; + border: 1px solid #8CACBB; + color: #434956; -moz-border-radius:0px 5px 0px 5px; -webkit-border-radius:0px 5px 0px 5px; border-radius:0px 5px 0px 5px; @@ -1530,16 +1531,17 @@ div.divButAction { margin-bottom: 1.4em; } } .butActionRefused { - font-family: !important; + text-decoration: none !important; + white-space: nowrap !important; + cursor: not-allowed; + padding: 0.4em em; + margin: 0em em; + font-family: !important; + font-weight: bold !important; background: white !important; border: 1px solid #AAAAAA !important; color: #AAAAAA !important; - text-decoration: none !important; - white-space: nowrap !important; - cursor: not-allowed; - padding: 0.4em 0.7em; - margin: 0em 0.7em; -moz-border-radius:0px 5px 0px 5px; -webkit-border-radius:0px 5px 0px 5px; border-radius:0px 5px 0px 5px; @@ -1558,6 +1560,77 @@ span.butAction, span.butActionDelete { cursor: pointer; } +/* Preapre for bootstrap look +.butAction, .butActionDelete, .butActionRefused { + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + display: inline-block; + padding: 4px 14px; + margin-bottom: 0; + line-height: 20px; + text-align: center; + vertical-align: middle; + cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + border: 1px solid #bbbbbb; + border-bottom-color: #a2a2a2; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} + +.butAction { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} + +.butActionDelete { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #cc6d00; + background-image: -moz-linear-gradient(top, #cc8800, #cc4400); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400)); + background-image: -webkit-linear-gradient(top, #cc8800, #cc4400); + background-image: -o-linear-gradient(top, #cc8800, #cc4400); + background-image: linear-gradient(to bottom, #cc8800, #cc4400); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcc8800', endColorstr='#ffcc4400', GradientType=0); + border-color: #cc4400 #cc4400 #802a00; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active { + color: #FFFFFF; +} +End bootstrap */ + + /* ============================================================================== */ /* Tables */ From bc1279ccfa0933aec5697c981f587678deedf826 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 11:27:12 +0200 Subject: [PATCH 0147/1190] Brighter button. We use CSS and no more image. --- htdocs/cashdesk/css/style.css | 28 -------- htdocs/cashdesk/index.php | 2 +- htdocs/cashdesk/tpl/facturation1.tpl.php | 13 ++-- htdocs/theme/auguria/style.css.php | 8 --- htdocs/theme/bureau2crea/style.css.php | 8 --- htdocs/theme/cameleo/style.css.php | 8 --- htdocs/theme/eldy/style.css.php | 81 +++++++++++++----------- 7 files changed, 50 insertions(+), 98 deletions(-) diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index 578d8fed6a2..c71dd9b78bc 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -215,11 +215,6 @@ p.titre { border: 1px solid #6d3f6d; } -.bouton_login input { - background: #fff; - border: 1px solid #6d3f6d; -} - .principal { float: left; margin: 0 15px; @@ -331,29 +326,6 @@ p.titre { } /* -------------- Boutons --------------------- */ -.bouton_ajout_article,.bouton_mode_reglement,.bouton_validation { - border: 1px solid #999; - background: #f7f7f7; - -background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) ); -} - -.bouton_ajout_article:hover,.bouton_mode_reglement:hover,.bouton_validation:hover -{ - background: #cccccc; -background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%); -background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) ); -} - .bouton_ajout_article { margin-top: 10px; width: 100%; diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index 8ea6063a5e4..a2eb40f2932 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -152,7 +152,7 @@ print "

-
+
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 27c153b3799..1a009fcead0 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -144,7 +144,7 @@ $langs->load("cashdesk"); - " /> + " /> @@ -179,7 +179,7 @@ $langs->load("cashdesk"); $langs->load("errors"); print ''; } - else print ''; + else print ''; print ''; print ''; if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0) @@ -187,7 +187,7 @@ $langs->load("cashdesk"); $langs->load("errors"); print ''; } - else print ''; + else print ''; print ''; print ''; if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0) @@ -195,7 +195,7 @@ $langs->load("cashdesk"); $langs->load("errors"); print ''; } - else print ''; + else print ''; print ''; ?> @@ -203,14 +203,11 @@ $langs->load("cashdesk"); diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f4832bddac8..9a47c431fc7 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -184,14 +184,6 @@ legend { margin-bottom: 8px; } padding: 0px 2px 0px 2px; margin: 0px 0px 0px 0px; } -.buttonajax { - font-family: ; - border: 0px; - background-image: url(); - background-position: bottom; - padding: 0px 0px 0px 0px; - margin: 0px 0px 0px 0px; -} form { padding: 0em 0em 0em 0em; margin: 0em 0em 0em 0em; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 950b2ce0001..0c7fa823f3e 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -209,14 +209,6 @@ legend { margin-bottom: 8px; } padding: 0px 2px 0px 2px; margin: 0px 0px 0px 0px; } -.buttonajax { - font-family: ; - border: 0px; - background-image: url(); - background-position: bottom; - padding: 0px 0px 0px 0px; - margin: 0px 0px 0px 0px; -} form { padding: 0em 0em 0em 0em; margin: 0em 0em 0em 0em; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 41dc3b57179..b39bb7de505 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -185,14 +185,6 @@ legend { margin-bottom: 8px; } padding: 0px 2px 0px 2px; margin: 0px 0px 0px 0px; } -.buttonajax { - font-family: ; - border: 0px; - background-image: url(); - background-position: bottom; - padding: 0px 0px 0px 0px; - margin: 0px 0px 0px 0px; -} form { padding: 0em 0em 0em 0em; margin: 0em 0em 0em 0em; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 1424fc838e9..53169c94755 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -308,46 +308,54 @@ legend { margin-bottom: 8px; } fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; } -.button { +.button, sbmtConnexion { font-family: ; - background-image: url(); - background-position: bottom; - border: 1px solid #C0C0C0; - padding: 0.1em 0.7em; - margin: 0em 0.5em; - -moz-border-radius:0px 5px 0px 5px; - -webkit-border-radius:0px 5px 0px 5px; - border-radius:0px 5px 0px 5px; - -moz-box-shadow: 2px 2px 3px #DDD; - -webkit-box-shadow: 2px 2px 3px #DDD; - box-shadow: 2px 2px 3px #DDD; + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + display: inline-block; + padding: 4px 14px; + margin-bottom: 0; + text-align: center; + cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + border: 1px solid #bbbbbb; + border-bottom-color: #a2a2a2; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .button:focus { - font-family: ; - color: #222244; - background-image: url(); - background-position: bottom; - border: 1px solid #C0C0C0; + -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); } .button:hover { - background: #dee7ec; + -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); } .button:disabled { - background: #ddd; -} -.buttonajax { - font-family: ; - border: 0px; - background-image: url(); - background-position: bottom; - padding: 0.1em 0.7em; - margin: 0em 0.5em; - -moz-border-radius:0px 5px 0px 5px; - -webkit-border-radius:0px 5px 0px 5px; - border-radius:0px 5px 0px 5px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; + opacity: 0.4; + filter: alpha(opacity=40); /* For IE8 and earlier */ + box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + cursor: auto; } form { padding:0px; @@ -841,16 +849,15 @@ form#login { max-width: 540px; border: 1px solid #A0A0A0; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; - border-radius: 8px; border:solid 1px rgba(90,90,90,.4); + -moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); -webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); background-color: #FFFFFF; + background: -webkit-gradient(linear, center top, center bottom, color-stop(0%, #fff), color-stop(100%, #f8f8f8)); + background: -moz-linear-gradient(top, #fff, #f8f8f8); } div#login_left, div#login_right { display: inline-block; From 166853dd56a05e55d33abf6af399070153e1e1b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 12:15:21 +0200 Subject: [PATCH 0148/1190] Fix: miscellaneous bugs --- htdocs/compta/resultat/clientfourn.php | 205 ++++++++++++------------ htdocs/contact/list.php | 25 ++- htdocs/core/lib/security.lib.php | 16 +- htdocs/core/menus/standard/eldy.lib.php | 2 +- htdocs/langs/en_US/companies.lang | 4 +- htdocs/societe/index.php | 31 +++- 6 files changed, 164 insertions(+), 119 deletions(-) diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 12fac084d55..19054bfd7c9 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -547,128 +547,135 @@ if ($mysoc->tva_assuj == 'franchise') // Non assujeti * Salaries */ -print ''; -$sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; -$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p"; -$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user"; -$sql.= " WHERE p.entity = ".$conf->entity; -if (! empty($date_start) && ! empty($date_end)) - $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; - -$sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm"; -$sql.= " ORDER BY u.firstname"; - -dol_syslog("get payment salaries"); -$result=$db->query($sql); -$subtotal_ht = 0; -$subtotal_ttc = 0; -if ($result) +if ($conf->salaries->enabled) { - $num = $db->num_rows($result); - $var=true; - $i = 0; - if ($num) - { - while ($i < $num) - { - $obj = $db->fetch_object($result); + print ''; + $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p"; + $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user"; + $sql.= " WHERE p.entity = ".$conf->entity; + if (! empty($date_start) && ! empty($date_end)) + $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; - $total_ht -= $obj->amount; - $total_ttc -= $obj->amount; - $subtotal_ht += $obj->amount; - $subtotal_ttc += $obj->amount; + $sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm"; + $sql.= " ORDER BY u.firstname"; - $var = !$var; - print ""; + dol_syslog("get payment salaries"); + $result=$db->query($sql); + $subtotal_ht = 0; + $subtotal_ttc = 0; + if ($result) + { + $num = $db->num_rows($result); + $var=true; + $i = 0; + if ($num) + { + while ($i < $num) + { + $obj = $db->fetch_object($result); - print "\n"; + $total_ht -= $obj->amount; + $total_ttc -= $obj->amount; + $subtotal_ht += $obj->amount; + $subtotal_ttc += $obj->amount; - if ($modecompta == 'CREANCES-DETTES') print ''; - print ''; - print ''; - $i++; - } - } - else - { - $var = !$var; - print ""; - print ''; - print ''; - } + $var = !$var; + print ""; + + print "\n"; + + if ($modecompta == 'CREANCES-DETTES') print ''; + print ''; + print ''; + $i++; + } + } + else + { + $var = !$var; + print ""; + print ''; + print ''; + } + } + else + { + dol_print_error($db); + } + print ''; + if ($modecompta == 'CREANCES-DETTES') + print ''; + print ''; + print ''; } -else -{ - dol_print_error($db); -} -print ''; -if ($modecompta == 'CREANCES-DETTES') - print ''; -print ''; -print ''; + /* - * Dunning -*/ + * Donation + */ -print ''; -$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount"; -$sql.= " FROM ".MAIN_DB_PREFIX."don as p"; -$sql.= " WHERE p.entity = ".$conf->entity; -$sql.= " AND fk_statut=2"; -if (! empty($date_start) && ! empty($date_end)) - $sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'"; -$sql.= " GROUP BY p.societe, p.firstname, p.lastname"; -$sql.= " ORDER BY p.societe, p.firstname, p.lastname"; - -dol_syslog("get dunning"); -$result=$db->query($sql); -$subtotal_ht = 0; -$subtotal_ttc = 0; -if ($result) +if ($conf->donation->enabled) { - $num = $db->num_rows($result); - $var=true; - $i = 0; - if ($num) + print ''; + $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount"; + $sql.= " FROM ".MAIN_DB_PREFIX."don as p"; + $sql.= " WHERE p.entity = ".$conf->entity; + $sql.= " AND fk_statut=2"; + if (! empty($date_start) && ! empty($date_end)) + $sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'"; + $sql.= " GROUP BY p.societe, p.firstname, p.lastname, dm"; + $sql.= " ORDER BY p.societe, p.firstname, p.lastname, dm"; + + dol_syslog("get dunning"); + $result=$db->query($sql); + $subtotal_ht = 0; + $subtotal_ttc = 0; + if ($result) { - while ($i < $num) + $num = $db->num_rows($result); + $var=true; + $i = 0; + if ($num) { - $obj = $db->fetch_object($result); + while ($i < $num) + { + $obj = $db->fetch_object($result); - $total_ht += $obj->amount; - $total_ttc += $obj->amount; - $subtotal_ht += $obj->amount; - $subtotal_ttc += $obj->amount; + $total_ht += $obj->amount; + $total_ttc += $obj->amount; + $subtotal_ht += $obj->amount; + $subtotal_ttc += $obj->amount; + $var = !$var; + print ""; + + print "\n"; + + if ($modecompta == 'CREANCES-DETTES') print ''; + print ''; + print ''; + $i++; + } + } + else + { $var = !$var; print ""; - - print "\n"; - - if ($modecompta == 'CREANCES-DETTES') print ''; - print ''; + print ''; print ''; - $i++; } } else { - $var = !$var; - print ""; - print ''; - print ''; + dol_print_error($db); } + print ''; + if ($modecompta == 'CREANCES-DETTES') + print ''; + print ''; + print ''; } -else -{ - dol_print_error($db); -} -print ''; -if ($modecompta == 'CREANCES-DETTES') - print ''; -print ''; -print ''; /* * VAT diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 11eb366e98c..c65e9601e53 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -39,6 +39,7 @@ $contactid = GETPOST('id','int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'contact', $contactid,''); +$search_firstlast_only=GETPOST("search_firstlast_only"); $search_lastname=GETPOST("search_lastname"); $search_firstname=GETPOST("search_firstname"); $search_societe=GETPOST("search_societe"); @@ -51,8 +52,8 @@ $search_fax=GETPOST("search_fax"); $search_email=GETPOST("search_email"); $search_skype=GETPOST("search_skype"); $search_priv=GETPOST("search_priv"); -$search_categ = GETPOST("search_categ",'int'); -$search_status = GETPOST("search_status",'int'); +$search_categ=GETPOST("search_categ",'int'); +$search_statu=GETPOST("search_status",'int'); if ($search_status=='') $search_status=1; // always display activ customer first @@ -74,7 +75,12 @@ $offset = $limit * $page; $langs->load("companies"); $titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); -if ($type == "c" || $type=="p") +if ($type == "p") +{ + $titre.=' ('.$langs->trans("ThirdPartyProspects").')'; + $urlfiche="card.php"; +} +if ($type == "c") { $titre.=' ('.$langs->trans("ThirdPartyCustomers").')'; $urlfiche="card.php"; @@ -92,6 +98,7 @@ else if ($type == "o") if (GETPOST('button_removefilter')) { + $search_firstlast_only=""; $search_lastname=""; $search_firstname=""; $search_societe=""; @@ -154,6 +161,9 @@ else if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ; if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL"; +if ($search_firstlast_only) { + $sql .= natural_search(array('p.lastname','p.firstname'), $search_firstlast_only); +} if ($search_lastname) { // filter on lastname $sql .= natural_search('p.lastname', $search_lastname); } @@ -213,7 +223,7 @@ else if ($type == "p") // filtre sur type } if ($sall) { - $sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email'), $sall); + $sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email', 's.nom'), $sall); } if (! empty($socid)) { @@ -277,9 +287,12 @@ if ($result) if ($sall) { - print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall; + print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("ThirdParty")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall; } - + if ($search_firstlast_only) + { + print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")."): ".$search_firstlast_only; + } print '
- " onclick="javascript: verifClic('DIF');" /> + " onclick="javascript: verifClic('DIF');" /> trans("DateEcheance").' :'; print $form->select_date(-1,'txtDatePaiement'); ?> -
'.$langs->trans("Salaries").'
'.$langs->trans("Salaries").'
 ".$langs->trans("Salaries")." fk_user."\">".$obj->firstname." ".$obj->lastname."'.price(-$obj->amount).''.price(-$obj->amount).'
 '.$langs->trans("None").'
 ".$langs->trans("Salaries")." fk_user."\">".$obj->firstname." ".$obj->lastname."'.price(-$obj->amount).''.price(-$obj->amount).'
 '.$langs->trans("None").'
'.price(-$subtotal_ht).''.price(-$subtotal_ttc).'
'.price(-$subtotal_ht).''.price(-$subtotal_ttc).'
'.$langs->trans("Donation").'
'.$langs->trans("Donation").'
 ".$langs->trans("Donation")." nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."'.price($obj->amount).''.price($obj->amount).'
 ".$langs->trans("Donation")." nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."'.price($obj->amount).''.price($obj->amount).''.$langs->trans("None").'
 '.$langs->trans("None").'
'.price($subtotal_ht).''.price($subtotal_ttc).'
'.price($subtotal_ht).''.price($subtotal_ttc).'
'; // Ligne des titres diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index c8cccefda7f..87dfcf1367b 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -100,7 +100,7 @@ function dol_hash($chain,$type=0) * @param string $features Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...) * @param int $objectid Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional). * @param string $dbtablename 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional) - * @param string $feature2 Feature to check, second level of permission (optional) + * @param string $feature2 Feature to check, second level of permission (optional). Can be or check with 'level1|level2'. * @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional) * @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional) * @param Canvas $objcanvas Object canvas @@ -140,7 +140,7 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature // Check read permission from module $readok=1; $nbko=0; - foreach ($featuresarray as $feature) + foreach ($featuresarray as $feature) // first we check nb of test ko { if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($feature,$listofmodules)) // If limits on modules for external users, module must be into list of modules for external users { @@ -174,11 +174,17 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature } else if (! empty($feature2)) // This should be used for future changes { + $tmpreadok=1; foreach($feature2 as $subfeature) { - if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $readok=0; $nbko++; } - else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $readok=0; $nbko++; } - else { $readok=1; break; } // Break is to bypass second test if the first is ok + if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; } + else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; } + else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok + } + if (! $tmpreadok) // We found a test on feature that is ko + { + $readok=0; // All tests are ko (we manage here the and, the or will be managed later using $nbko). + $nbko++; } } else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) // This is for old permissions diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index c703847128f..b6fde307110 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -624,7 +624,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } // Contacts - $newmenu->add("/contact/list.php?leftmenu=contacts", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts'); + $newmenu->add("/societe/index.php?leftmenu=thirdparties", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ThirdParty") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts'); $newmenu->add("/contact/card.php?leftmenu=contacts&action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer); $newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire); if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire); diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 1b2ea17215b..06c350039a3 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact \ No newline at end of file diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index e6a251a2d78..740a6157809 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2014 Charles-Fr Benke * @@ -64,7 +64,7 @@ print '
'; print ''; print '
'; print ''; -print ''; +print ''; print "'; print ''; @@ -79,9 +79,26 @@ print "'; //print ''; print ''; - print "
'.$langs->trans("Search").'
'.$langs->trans("SearchThirdparty").'
"; print ':
"; print ':

"; +/* + * Search contact + */ +$rowspan=2; +if (! empty($conf->barcode->enabled)) $rowspan++; +print '
'; +print ''; +print ''; +print ''; +print ''; +print "'; +print ''; +print "'; +//print ''; +print ''; +print "
'.$langs->trans("SearchContact").'
"; +print ':
"; +print ':

"; /* * Statistics area @@ -121,7 +138,7 @@ print ''; print ''; if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2)) { - print '"; + $statstring = ""; $statstring.= ''; $statstring.= ""; } if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) { - $statstring.= ""; + $statstring.= ""; $statstring.= ''; $statstring.= ""; } if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) { - $statstring2 = ""; + $statstring2 = ""; $statstring2.= ''; $statstring2.= ""; } From 840a98d8acc5015d4537aabd6c3782abc2d293a3 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Fri, 3 Oct 2014 12:20:02 +0200 Subject: [PATCH 0149/1190] Expedition lines from same orderline merged. When there are more expedition lines from same orderline key, merge them and get source warehouses. Usefull future possibility for creating shippinglines with same products from multiple warehouses. @KreizIT also changed some batch related items. --- htdocs/expedition/card.php | 25 ++++++++++- htdocs/expedition/class/expedition.class.php | 46 ++++++++++++++++---- htdocs/langs/en_US/sendings.lang | 4 ++ 3 files changed, 64 insertions(+), 11 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index ade0014708d..e9083b77e21 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -7,6 +7,7 @@ * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Marcos García * Copyright (C) 2014 Cedric GROSS + * Copyright (C) 2014 Francis Appels * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1433,6 +1434,18 @@ else if ($id || $ref) $entrepot = new Entrepot($db); $entrepot->fetch($lines[$i]->entrepot_id); print $entrepot->getNomUrl(1); + } + else if (count($lines[$i]->details_entrepot) > 1) + { + $detail = ''; + foreach ($lines[$i]->details_entrepot as $detail_entrepot) { + if ($detail_entrepot->entrepot_id > 0) { + $entrepot = new Entrepot($db); + $entrepot->fetch($detail_entrepot->entrepot_id); + $detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'
'; + } + } + print $form->textwithtooltip($langs->trans("DetailWarehouseNumber"),$detail); } print ''; } @@ -1440,6 +1453,7 @@ else if ($id || $ref) // Batch number managment if (! empty($conf->productbatch->enabled)) { if (isset($lines[$i]->detail_batch) ) { + $flagBatch = true; print ''; - + print '' . "\n"; print ''; - + print '
'.$langs->trans("Statistics").'
'; + print '
'; $dataseries=array(); if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect'])); if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer'])); @@ -135,19 +152,19 @@ else { if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) { - $statstring = "
'.$langs->trans("Prospects").''.round($third['prospect']).'
'.$langs->trans("Customers").''.round($third['customer']).'
'.$langs->trans("Suppliers").''.round($third['supplier']).'
'; $detail = ''; foreach ($lines[$i]->detail_batch as $dbatch) { @@ -1526,10 +1540,17 @@ else if ($id || $ref) print ''.$langs->trans($label).''; } } - + if ($user->rights->expedition->supprimer) { - print ''.$langs->trans("Delete").''; + if (empty($conf->productbatch->enabled) || (!empty($conf->productbatch->enabled) && !$conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !isset($flagBatch)) + { + print ''.$langs->trans("Delete").''; + } + else + { + print ''.$langs->trans('Delete').''; + } } print ''; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index d929dd067ef..019ef22f769 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -7,6 +7,7 @@ * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2014 Marcos García + * Copyright (C) 2014 Francis Appels * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1068,7 +1069,7 @@ class Expedition extends CommonObject $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product"; $sql.= " WHERE ed.fk_expedition = ".$this->id; $sql.= " AND ed.fk_origin_line = cd.rowid"; - $sql.= " ORDER BY cd.rang"; + $sql.= " ORDER BY cd.rang, ed.fk_origin_line"; dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG); $resql = $this->db->query($sql); @@ -1078,6 +1079,8 @@ class Expedition extends CommonObject $num = $this->db->num_rows($resql); $i = 0; + $lineindex = 0; + $originline = 0; $this->total_ht = 0; $this->total_tva = 0; @@ -1087,13 +1090,25 @@ class Expedition extends CommonObject while ($i < $num) { - $line = new ExpeditionLigne($this->db); - $obj = $this->db->fetch_object($resql); - + $obj = $this->db->fetch_object($resql); + + if ($originline == $obj->fk_origin_line) { + $line->entrepot_id = 0; // entrepod_id in details_entrepot + $line->qty_shipped += $obj->qty_shipped; + } else { + $line = new ExpeditionLigne($this->db); + $line->entrepot_id = $obj->fk_entrepot; + $line->qty_shipped = $obj->qty_shipped; + } + + $detail_entrepot = new stdClass; + $detail_entrepot->entrepot_id = $obj->fk_entrepot; + $detail_entrepot->qty_shipped = $obj->qty_shipped; + $line->details_entrepot[] = $detail_entrepot; + $line->line_id = $obj->line_id; $line->fk_origin_line = $obj->fk_origin_line; $line->origin_line_id = $obj->fk_origin_line; // TODO deprecated - $line->entrepot_id = $obj->fk_entrepot; $line->fk_product = $obj->fk_product; $line->fk_product_type = $obj->fk_product_type; $line->ref = $obj->product_ref; // TODO deprecated @@ -1103,7 +1118,6 @@ class Expedition extends CommonObject $line->label = $obj->custom_label; $line->description = $obj->description; $line->qty_asked = $obj->qty_asked; - $line->qty_shipped = $obj->qty_shipped; $line->weight = $obj->weight; $line->weight_units = $obj->weight_units; $line->length = $obj->length; @@ -1116,7 +1130,7 @@ class Expedition extends CommonObject // For invoicing $tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type); // We force type to 0 $line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements) - $line->qty = $obj->qty_shipped; + $line->qty = $line->qty_shipped; $line->total_ht = $tabprice[0]; $line->total_localtax1 = $tabprice[9]; $line->total_localtax2 = $tabprice[10]; @@ -1141,11 +1155,25 @@ class Expedition extends CommonObject * May be conf is not well initialized for dark reason */ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php'; - $line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id); + if ($originline != $obj->fk_origin_line) { + $line->detail_batch = ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id); + } else { + $line->detail_batch = array_merge($line->detail_batch,ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id)); + } + } + if ($originline != $obj->fk_origin_line) { + $this->lines[$lineindex] = $line; + $lineindex++; + } else { + $line->total_ht += $tabprice[0]; + $line->total_localtax1 += $tabprice[9]; + $line->total_localtax2 += $tabprice[10]; + $line->total_ttc += $tabprice[2]; + $line->total_tva += $tabprice[1]; } - $this->lines[$i] = $line; $i++; + $originline = $obj->fk_origin_line; } $this->db->free($resql); return 1; diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 170f5984c4d..2ae43f39766 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -72,3 +72,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Sum of product volumes SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) From bcc5bebd77a48762899c028384b24ed100cb5290 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Fri, 3 Oct 2014 12:28:42 +0200 Subject: [PATCH 0150/1190] Fix deliveryorder qty and remainingqty positions --- htdocs/core/modules/livraison/doc/pdf_typhon.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index bb9f1d155ff..76c082fa70d 100644 --- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -100,8 +100,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder $this->posxcomm=112; //$this->posxtva=112; //$this->posxup=126; - $this->posxqty=174; - $this->posxremainingqty=165; + $this->posxqty=165; + $this->posxremainingqty=185; //$this->posxdiscount=162; //$this->postotalht=174; if ($this->page_largeur < 210) // To work with US executive format From cbd48f512987d6af74048a7972d04157f8958468 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 12:48:24 +0200 Subject: [PATCH 0151/1190] Add missing picto --- htdocs/theme/amarok/img/object_resource.png | Bin 0 -> 199 bytes htdocs/theme/auguria/img/object_resource.png | Bin 0 -> 199 bytes htdocs/theme/bureau2crea/img/object_resource.png | Bin 0 -> 199 bytes htdocs/theme/cameleo/img/object_resource.png | Bin 0 -> 199 bytes htdocs/theme/eldy/img/object_resource.png | Bin 0 -> 199 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/theme/amarok/img/object_resource.png create mode 100644 htdocs/theme/auguria/img/object_resource.png create mode 100644 htdocs/theme/bureau2crea/img/object_resource.png create mode 100644 htdocs/theme/cameleo/img/object_resource.png create mode 100644 htdocs/theme/eldy/img/object_resource.png diff --git a/htdocs/theme/amarok/img/object_resource.png b/htdocs/theme/amarok/img/object_resource.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 diff --git a/htdocs/theme/auguria/img/object_resource.png b/htdocs/theme/auguria/img/object_resource.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 diff --git a/htdocs/theme/bureau2crea/img/object_resource.png b/htdocs/theme/bureau2crea/img/object_resource.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 diff --git a/htdocs/theme/cameleo/img/object_resource.png b/htdocs/theme/cameleo/img/object_resource.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/object_resource.png b/htdocs/theme/eldy/img/object_resource.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 From 844b5f30df10ce41de2ac7917e85338d76dbeadc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 12:54:29 +0200 Subject: [PATCH 0152/1190] Minor look enhancement --- htdocs/main.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 98e0a48aa50..b20d94164d6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1821,7 +1821,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"'; else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"'; $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />'; - $ret.=''; + $ret.=''; $ret.="\n"; return $ret; } From 269df77873c183eb6062a603621a77707c67ab37 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Fri, 3 Oct 2014 12:59:33 +0200 Subject: [PATCH 0153/1190] Fix migration sql for inserting accounting records Migration SQL could not insert accounting records because datec was set to NOT NULL --- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 778b3f2b9ff..f8929765956 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -74,7 +74,7 @@ ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT NULL AFTER account_number; ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid; -ALTER TABLE llx_accountingaccount add column datec datetime NOT NULL AFTER entity; +ALTER TABLE llx_accountingaccount add column datec datetime AFTER entity; ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec; ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label; ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author; From e7a9447d940d5de862d5d2fc44a2288b23be9e2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 15:58:08 +0200 Subject: [PATCH 0154/1190] Add hook formatEvent and fix bug into per user view. --- htdocs/comm/action/card.php | 31 ++++++------ htdocs/comm/action/class/actioncomm.class.php | 13 +++-- htdocs/comm/action/peruser.php | 11 ++++- htdocs/core/class/hookmanager.class.php | 7 +-- htdocs/theme/eldy/style.css.php | 49 +++---------------- 5 files changed, 46 insertions(+), 65 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index e92dacc5dc9..772e3e05622 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -68,7 +68,7 @@ $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions| if ($user->societe_id && $socid) $result = restrictedArea($user,'societe',$socid); $error=GETPOST("error"); -$donotclearsession=0; +$donotclearsession=GETPOST('donotclearsession')?GETPOST('donotclearsession'):0; $cactioncomm = new CActionComm($db); $object = new ActionComm($db); @@ -358,22 +358,22 @@ if ($action == 'update') $datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]); $object->fk_action = dol_getIdFromCode($db, $_POST["actioncode"], 'c_actioncomm'); - $object->label = $_POST["label"]; + $object->label = GETPOST("label"); $object->datep = $datep; $object->datef = $datef; $object->percentage = $percentage; - $object->priority = $_POST["priority"]; - $object->fulldayevent= $_POST["fullday"]?1:0; + $object->priority = GETPOST("priority"); + $object->fulldayevent= GETPOST("fullday")?1:0; $object->location = GETPOST('location'); - $object->socid = $_POST["socid"]; - $object->contactid = $_POST["contactid"]; + $object->socid = GETPOST("socid"); + $object->contactid = GETPOST("contactid"); //$object->societe->id = $_POST["socid"]; // deprecated //$object->contact->id = $_POST["contactid"]; // deprecated - $object->fk_project = $_POST["projectid"]; - $object->note = $_POST["note"]; - $object->pnote = $_POST["note"]; - $object->fk_element = $_POST["fk_element"]; - $object->elementtype = $_POST["elementtype"]; + $object->fk_project = GETPOST("projectid"); + $object->note = GETPOST("note"); + $object->pnote = GETPOST("note"); + $object->fk_element = GETPOST("fk_element"); + $object->elementtype = GETPOST("elementtype"); if (! $datef && $percentage == 100) { @@ -603,6 +603,7 @@ if ($action == 'create') print '
'; print ''; print ''; + print ''; if ($backtopage) print ''; if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous")); @@ -1225,7 +1226,7 @@ if ($id > 0) // Link to agenda views print '
'; - print ''; + print ''; print ''; print ''; print ''; @@ -1234,7 +1235,7 @@ if ($id > 0) //print ''; print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' '; print ''."\n"; - print '
'; + print ''; print ''; print ''; print ''; @@ -1243,7 +1244,7 @@ if ($id > 0) //print ''; print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' '; print '
'."\n"; - print '
'; + print ''; print ''; print ''; print ''; @@ -1252,7 +1253,7 @@ if ($id > 0) //print ''; print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' '; print '
'."\n"; - print '
'; + print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index fc75488ee3d..01ebadceb2e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -95,14 +95,16 @@ class ActionComm extends CommonObject */ function __construct($db) { + global $langs; + $this->db = $db; //$this->author = new stdClass(); //$this->usermod = new stdClass(); //$this->usertodo = new stdClass(); //$this->userdone = new stdClass(); - $this->societe = new stdClass(); - $this->contact = new stdClass(); + $this->societe = new stdClass(); // deprecated + $this->contact = new stdClass(); // deprecated } /** @@ -524,6 +526,9 @@ class ActionComm extends CommonObject return -1; } + $socid=($this->socid?$this->socid:((isset($this->societe->id) && $this->societe->id > 0) ? $this->societe->id : 0)); + $contactid=($this->contactid?$this->contactid:((isset($this->contact->id) && $this->contact->id > 0) ? $this->contact->id : 0)); + $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm "; @@ -534,9 +539,9 @@ class ActionComm extends CommonObject $sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null'); $sql.= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null"); // deprecated $sql.= ", note = ".($this->note ? "'".$this->db->escape($this->note)."'":"null"); - $sql.= ", fk_soc =". ($this->societe->id > 0 ? "'".$this->societe->id."'":"null"); + $sql.= ", fk_soc =". ($this->socid > 0 ? "'".$this->socid."'":"null"); $sql.= ", fk_project =". ($this->fk_project > 0 ? "'".$this->fk_project."'":"null"); - $sql.= ", fk_contact =". ($this->contact->id > 0 ? "'".$this->contact->id."'":"null"); + $sql.= ", fk_contact =". ($contactid > 0 ? "'".$this->contactid."'":"null"); $sql.= ", priority = '".$this->priority."'"; $sql.= ", fulldayevent = '".$this->fulldayevent."'"; $sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null"); diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index ad3bfddd2ef..4452351d8c2 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -320,7 +320,7 @@ $sql.= ' a.datea2,'; $sql.= ' a.percent,'; $sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,'; $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,'; -$sql.= ' a.fk_soc, a.fk_contact,'; +$sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype,'; $sql.= ' ca.code, ca.color'; $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; @@ -415,6 +415,9 @@ if ($resql) //$event->societe->id=$obj->fk_soc; // deprecated //$event->contact->id=$obj->fk_contact; // deprecated + $event->fk_element=$obj->fk_element; + $event->elementtype=$obj->elementtype; + // Defined date_start_in_calendar and date_end_in_calendar property // They are date start and end of action but modified to not be outside calendar view. if ($event->percentage <= 0) @@ -709,7 +712,7 @@ $db->close(); function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false) { global $db; - global $user, $conf, $langs; + global $user, $conf, $langs, $hookmanager, $action; global $filter, $filtera, $filtert, $filterd, $status, $actioncode; // Filters used into search form global $theme_datacolor; global $cachethirdparties, $cachecontacts, $colorindexused; @@ -743,6 +746,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & if (! in_array($username->id,$keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show //if ($username->id != $event->userownerid) continue; // We discard record if event is from another user than user we want to show + $parameters=array(); + $reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action); // Note that $action and $object may have been modified by some hooks + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar); // Define $color (Hex string like '0088FF') and $cssclass of event diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index c402353e8d7..babddd9a2fe 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -114,8 +114,8 @@ class HookManager * * @param string $method Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...) * @param array $parameters Array of parameters - * @param Object $object Object to use hooks on - * @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...) + * @param Object $object Object to use hooks on + * @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...) * @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO. * For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints. * Can also return some values into an array ->results. @@ -144,7 +144,8 @@ class HookManager 'moveUploadedFile', 'pdf_writelinedesc', 'paymentsupplierinvoices', - 'printSearchForm' + 'printSearchForm', + 'formatEvent' ) )) $hooktype='addreplace'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 53169c94755..5b0e64525f6 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -989,10 +989,10 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks background-position:top; background-repeat:repeat-x; - border-left: 1px solid #CCCCCC; - border-right: 1px solid #D0D0D0; - border-bottom: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD; + border-left: 1px solid #AAA; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + border-top: 1px solid #CCC; border-radius: 5px; -moz-border-radius: 5px; -moz-box-shadow: 3px 3px 4px #DDD; @@ -1021,10 +1021,10 @@ div.blockvmenusearch background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); - border-left: 1px solid #DDDDDD; - border-right: 1px solid #CCCCCC; - border-bottom: 1px solid #CCCCCC; - border-top: 1px solid #E8E8E8; + border-left: 1px solid #AAA; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + border-top: 1px solid #CCC; border-radius: 5px; -moz-border-radius: 5px; -moz-box-shadow: 3px 3px 4px #DDD; @@ -1032,39 +1032,6 @@ div.blockvmenusearch box-shadow: 3px 3px 4px #DDD; } -div.blockvmenubookmarksold -{ - border-right: 1px solid #555555; - border-bottom: 1px solid #555555; - font-family: ; - color: #000000; - text-align: ; - text-decoration: none; - padding-left: 5px; - padding-right: 1px; - padding-top: 3px; - padding-bottom: 3px; - margin: 6px 0px 8px 2px; - background: #E3E6E8; - - - background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); - - - border-left: 1px solid #CCCCCC; - border-right: 1px solid #BBBBBB; - border-bottom: 1px solid #BBBBBB; - border-radius: 5px; - -moz-border-radius: 5px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; -} - div.blockvmenuhelp { dol_optimize_smallscreen)) { ?> From f9d78c0c5755da5a7fe15b65254d2a06a36cc1e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 18:04:13 +0200 Subject: [PATCH 0155/1190] Fix: edit event New: Can use color of type of event into dictionnary. --- htdocs/comm/action/card.php | 19 +++++++++++-------- htdocs/comm/action/peruser.php | 23 ++++++++++++++++------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 772e3e05622..970eb1d4725 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -89,14 +89,16 @@ $hookmanager->initHooks(array('actioncard')); */ // Remove user to assigned list -if (! empty($_POST['removedassigned'])) +if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0') { - $idtoremove=$_POST['removedassigned']; + $idtoremove=GETPOST('removedassigned'); + if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1); else $tmpassigneduserids=array(); + foreach ($tmpassigneduserids as $key => $val) { - if ($val['id'] == $idtoremove) unset($tmpassigneduserids[$key]); + if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]); } //var_dump($_POST['removedassigned']);exit; $_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids); @@ -357,7 +359,7 @@ if ($action == 'update') $datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]); $datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]); - $object->fk_action = dol_getIdFromCode($db, $_POST["actioncode"], 'c_actioncomm'); + $object->fk_action = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm'); $object->label = GETPOST("label"); $object->datep = $datep; $object->datef = $datef; @@ -366,10 +368,10 @@ if ($action == 'update') $object->fulldayevent= GETPOST("fullday")?1:0; $object->location = GETPOST('location'); $object->socid = GETPOST("socid"); - $object->contactid = GETPOST("contactid"); + $object->contactid = GETPOST("contactid",'int'); //$object->societe->id = $_POST["socid"]; // deprecated //$object->contact->id = $_POST["contactid"]; // deprecated - $object->fk_project = GETPOST("projectid"); + $object->fk_project = GETPOST("projectid",'int'); $object->note = GETPOST("note"); $object->pnote = GETPOST("note"); $object->fk_element = GETPOST("fk_element"); @@ -611,7 +613,7 @@ if ($action == 'create') print ''; - // Type d'action actifs + // Type of event if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) { print ''; - // Type + // Type of event if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) { print ''; } + else print ''; // Title print 'global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").''; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 4452351d8c2..f20fe750d33 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -601,8 +601,13 @@ else } // Load array of colors by type -// TODO $colorsbytype=array(); +$sql="SELECT code, color FROM ".MAIN_DB_PREFIX."c_actioncomm"; +$resql=$db->query($sql); +while ($obj = $db->fetch_object($resql)) +{ + $colorsbytype[$obj->code]=$obj->color; +} // Loop on each user to show calendar $todayarray=dol_getdate($now,'fast'); @@ -707,14 +712,15 @@ $db->close(); * @param int $showinfo Add extended information (used by day view) * @param int $minheight Minimum height for each event. 60px by default. * @param boolean $showheader Show header + * @param array $colorsbytype Array with colors by type * @return void */ -function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false) +function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array()) { global $db; global $user, $conf, $langs, $hookmanager, $action; global $filter, $filtera, $filtert, $filterd, $status, $actioncode; // Filters used into search form - global $theme_datacolor; + global $theme_datacolor; // Array with a list of different we can use (come from theme) global $cachethirdparties, $cachecontacts, $colorindexused; global $begin_h, $end_h; @@ -757,12 +763,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & if (in_array($user->id, $keysofuserassigned)) { $nummytasks++; $cssclass='family_mytasks'; - $color=$event->type_color; + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color; } else if ($event->type_code == 'ICALEVENT') { $numical++; - if (! empty($event->icalname)) { + if (! empty($event->icalname)) + { if (! isset($numicals[dol_string_nospecial($event->icalname)])) { $numicals[dol_string_nospecial($event->icalname)] = 0; } @@ -779,7 +786,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & else { $numother++; $cssclass='family_other'; + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color; } + if ($color < 0) // Color was not forced. Set color according to color index. { // Define color index if not yet defined @@ -865,8 +874,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $cases2[$h][$event->id]['string']=$event->label; $cases1[$h][$event->id]['typecode']=$event->type_code; $cases2[$h][$event->id]['typecode']=$event->type_code; - $cases1[$h][$event->id]['color']='009900'; - $cases2[$h][$event->id]['color']='009900'; + $cases1[$h][$event->id]['color']=$color; + $cases2[$h][$event->id]['color']=$color; } } $i++; From dde3b3ef6523f9d8f26c5fd26821d878638acb37 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 18:25:38 +0200 Subject: [PATCH 0156/1190] Fix: Event update --- htdocs/comm/action/card.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 970eb1d4725..2b59b6cf622 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -396,7 +396,7 @@ if ($action == 'update') $tmplist1=dol_json_decode($_SESSION['assignedtouser'], true); $tmplist2=array(); foreach($tmplist1 as $key => $val) { - if ($val['id'] && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val; + if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val; } } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 01ebadceb2e..692ce2058d3 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -417,7 +417,9 @@ class ActionComm extends CommonObject while ($obj = $this->db->fetch_object($resql2)) { $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency); + if (empty($this->userownerid)) $this->userownerid=$obj->fk_element; // If not defined (should not happened, we fix this) } + return 1; } else @@ -528,6 +530,8 @@ class ActionComm extends CommonObject $socid=($this->socid?$this->socid:((isset($this->societe->id) && $this->societe->id > 0) ? $this->societe->id : 0)); $contactid=($this->contactid?$this->contactid:((isset($this->contact->id) && $this->contact->id > 0) ? $this->contact->id : 0)); + $userownerid=($this->userownerid?$this->userownerid:((isset($this->usertodo->id) && $this->usertodo->id > 0) ? $this->usertodo->id : 0)); + $userdoneid=($this->userdoneid?$this->userdoneid:((isset($this->userdone->id) && $this->userdone->id > 0) ? $this->userdone->id : 0)); $this->db->begin(); @@ -547,8 +551,8 @@ class ActionComm extends CommonObject $sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null"); $sql.= ", transparency = '".$this->transparency."'"; $sql.= ", fk_user_mod = '".$user->id."'"; - $sql.= ", fk_user_action=".($this->usertodo->id > 0 ? "'".$this->usertodo->id."'":"null"); - $sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null"); + $sql.= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'":"null"); + $sql.= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'":"null"); if (! empty($this->fk_element)) $sql.= ", fk_element=".($this->fk_element?$this->fk_element:"null"); if (! empty($this->elementtype)) $sql.= ", elementtype=".($this->elementtype?"'".$this->elementtype."'":"null"); $sql.= " WHERE id=".$this->id; From b85a8359884e90264b92afc7997e828fcce1ff8c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 19:03:58 +0200 Subject: [PATCH 0157/1190] Prepare 3.6.1 --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index fc92cfd43a9..294fc64ff5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ For users: - Fix: Web service categorie WDSL declaration is correct - Fix: ErrorBadValueForParamNotAString was displayed in virtual product if no base price defined - Fix: Category creation failed and no message output +- Fix: Lanf for Payment Type +- Fix: PHPCheckstyle 1.5.5 ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: From 05fe8e45b3ead4dd32b75e2c280b8be4c21356ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 19:07:49 +0200 Subject: [PATCH 0158/1190] Exclude module dire from package --- build/makepack-dolibarr.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 55de5abffb4..a1e08361d36 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -434,6 +434,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`; $ret=`rm -fr $BUILDROOT/$PROJECT/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -f $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; From 02512180e07fcb7f14534976759fcbe0389bdc4b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Oct 2014 19:21:45 +0200 Subject: [PATCH 0159/1190] Sync from transifex --- htdocs/langs/de_DE/banks.lang | 2 +- htdocs/langs/de_DE/bills.lang | 8 +- htdocs/langs/de_DE/companies.lang | 2 +- htdocs/langs/de_DE/compta.lang | 20 +-- htdocs/langs/de_DE/contracts.lang | 6 +- htdocs/langs/de_DE/errors.lang | 16 ++- htdocs/langs/de_DE/help.lang | 2 +- htdocs/langs/de_DE/holiday.lang | 54 ++++---- htdocs/langs/de_DE/interventions.lang | 4 +- htdocs/langs/de_DE/link.lang | 16 +-- htdocs/langs/de_DE/mailmanspip.lang | 40 +++--- htdocs/langs/de_DE/margins.lang | 4 +- htdocs/langs/de_DE/orders.lang | 15 +-- htdocs/langs/de_DE/paypal.lang | 6 +- htdocs/langs/de_DE/products.lang | 98 +++++++------- htdocs/langs/de_DE/projects.lang | 4 +- htdocs/langs/de_DE/propal.lang | 4 +- htdocs/langs/de_DE/salaries.lang | 4 + htdocs/langs/de_DE/stocks.lang | 6 +- htdocs/langs/de_DE/users.lang | 3 +- htdocs/langs/de_DE/withdrawals.lang | 2 +- htdocs/langs/fr_FR/accountancy.lang | 174 ++++++++++++------------- htdocs/langs/fr_FR/admin.lang | 7 +- htdocs/langs/fr_FR/orders.lang | 7 +- htdocs/langs/hr_HR/bills.lang | 12 +- htdocs/langs/hr_HR/boxes.lang | 180 +++++++++++++------------- htdocs/langs/hr_HR/companies.lang | 2 +- htdocs/langs/hr_HR/languages.lang | 6 +- htdocs/langs/lv_LV/admin.lang | 29 +++-- htdocs/langs/lv_LV/bills.lang | 2 +- htdocs/langs/lv_LV/orders.lang | 26 ++-- htdocs/langs/lv_LV/stocks.lang | 6 +- htdocs/langs/ru_RU/orders.lang | 53 ++++---- htdocs/langs/tr_TR/agenda.lang | 29 +++-- htdocs/langs/tr_TR/bills.lang | 12 +- htdocs/langs/tr_TR/boxes.lang | 2 +- htdocs/langs/tr_TR/commercial.lang | 6 +- htdocs/langs/tr_TR/companies.lang | 20 +-- htdocs/langs/tr_TR/compta.lang | 20 +-- htdocs/langs/tr_TR/dict.lang | 12 +- htdocs/langs/tr_TR/errors.lang | 4 +- htdocs/langs/tr_TR/exports.lang | 4 +- htdocs/langs/tr_TR/interventions.lang | 6 +- htdocs/langs/tr_TR/link.lang | 14 +- htdocs/langs/tr_TR/main.lang | 11 +- htdocs/langs/tr_TR/orders.lang | 4 +- htdocs/langs/tr_TR/other.lang | 16 ++- htdocs/langs/tr_TR/products.lang | 10 +- htdocs/langs/tr_TR/propal.lang | 4 +- htdocs/langs/tr_TR/salaries.lang | 4 + htdocs/langs/tr_TR/sendings.lang | 2 +- htdocs/langs/tr_TR/stocks.lang | 4 +- htdocs/langs/tr_TR/trips.lang | 2 +- htdocs/langs/tr_TR/users.lang | 7 +- 54 files changed, 519 insertions(+), 494 deletions(-) diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang index 876edebae30..dc64c7dc846 100644 --- a/htdocs/langs/de_DE/banks.lang +++ b/htdocs/langs/de_DE/banks.lang @@ -133,7 +133,7 @@ CashBudget=Bargeldbestand PlannedTransactions=Geplante Transaktionen Graph=Grafiken ExportDataset_banque_1=Bankbewegungen und Kontoauszug -ExportDataset_banque_2=Deposit slip +ExportDataset_banque_2=Einzahlungsbeleg TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto TransactionWithOtherAccount=Konto Transaktion PaymentNumberUpdateSucceeded=Zahlungsnummer erfolgreich aktualisiert diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index bccbd86b0cd..6f566b36e0f 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -85,7 +85,7 @@ ClassifyPaid=Als 'bezahlt' markieren ClassifyPaidPartially=Als 'teilweise bezahlt' markieren ClassifyCanceled=Als 'storniert' markieren ClassifyClosed=Als 'geschlossen' markieren -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Als "nicht verrechnet" markieren CreateBill=Erstelle Rechnung AddBill=Rechnung/Gutschrift erstellen AddToDraftInvoices=Zu Rechnungsentwurf hinzufügen @@ -198,8 +198,8 @@ Rest=Ausstehend AmountExpected=Höhe der Forderung ExcessReceived=Erhaltener Überschuss EscompteOffered=Rabatt angeboten (Skonto) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=Einreichung der Rechnung %s +SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung) StandingOrders=Daueraufträge StandingOrder=Dauerauftrag NoDraftBills=Keine Rechnungsentwürfe @@ -398,7 +398,7 @@ ToMakePayment=Bezahlen ToMakePaymentBack=Rückzahlung ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind. -RevenueStamp=Revenue stamp +RevenueStamp=Steuermarke YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage) TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang index 13ff957914d..9312970a60c 100644 --- a/htdocs/langs/de_DE/companies.lang +++ b/htdocs/langs/de_DE/companies.lang @@ -93,7 +93,7 @@ LocalTax1ES=RE LocalTax2ES=IRPF TypeLocaltax1ES=RE Type TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeES=Typ ThirdPartyEMail=%s WrongCustomerCode=Kunden-Code ungültig WrongSupplierCode=Lieferanten-Code ungültig diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index 53d8dba6d00..4d19a00c89e 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -19,7 +19,7 @@ AmountToBeCharged=Zu zahlender Gesamtbetrag: AccountsGeneral=Konten Account=Konto Accounts=Konten -Accountparent=Account parent +Accountparent=Kontohalter Accountsparent=Accounts parent BillsForSuppliers=Lieferantenrechnungen Income=Einnahmen @@ -182,7 +182,7 @@ Pcg_version=Pcg version Pcg_type=Pcg type Pcg_subtype=Pcg subtype InvoiceLinesToDispatch=Invoice lines to dispatch -InvoiceDispatched=Dispatched invoices +InvoiceDispatched=Versandte Rechnungen AccountancyDashboard=Accountancy summary ByProductsAndServices=Nach Produkten und Services RefExt=Externe Referenz @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Berechnungsmodus AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen -ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen -ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen -ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen -ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +COMPTA_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen +COMPTA_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen +COMPTA_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen +COMPTA_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen +COMPTA_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen +COMPTA_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen +COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang index 17d09551e73..1e4e9eb8888 100644 --- a/htdocs/langs/de_DE/contracts.lang +++ b/htdocs/langs/de_DE/contracts.lang @@ -88,9 +88,9 @@ NoExpiredServices=Keine abgelaufen aktiven Dienste ListOfServicesToExpireWithDuration=Liste der Leistungen die in %s Tagen ablaufen ListOfServicesToExpireWithDurationNeg=Liste der Services die seit mehr als %s Tagen abgelaufen sind ListOfServicesToExpire=Liste der Services die ablaufen -NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. -StandardContractsTemplate=Standard contracts template -ContactNameAndSignature=For %s, name and signature: +NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind. +StandardContractsTemplate=Standard Vertragsschablone +ContactNameAndSignature=Für %s, Name und Unterschrift ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang index 68595d0d901..60ae84a7a05 100644 --- a/htdocs/langs/de_DE/errors.lang +++ b/htdocs/langs/de_DE/errors.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - errors # No errors -NoErrorCommitIsDone=No error, we commit +NoErrorCommitIsDone=Kein Fehler, wir führen fort # Errors Error=Fehler Errors=Fehler -ErrorButCommitIsDone=Errors found but we validate despite this +ErrorButCommitIsDone=Fehler aufgetreten, Freigabe erfolgt dennoch ErrorBadEMail=E-Mail %s ist nicht korrekt ErrorBadUrl=URL %s ist nicht korrekt ErrorLoginAlreadyExists=Login %s existiert bereits. @@ -63,7 +63,7 @@ ErrorSizeTooLongForVarcharType=Die Größe überschreitet das Maximum für den T ErrorNoValueForSelectType=Bitte Wert für Auswahlliste eingeben ErrorNoValueForCheckBoxType=Bitte Wert für Checkbox-Liste eingeben ErrorNoValueForRadioType=Bitte Wert für Radiobutton-Liste eingeben -ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores +ErrorBadFormatValueList=Die Liste darf nicht mehr als ein %s enthalten, muss aber mindestens eines aus "llave,valores" beinhalten ErrorFieldCanNotContainSpecialCharacters=Das Feld %s darf keine Sonderzeichen enthalten. ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld %s darf weder Sonderzeichen noch Großbuchstaben enthalten. ErrorNoAccountancyModuleLoaded=Kein Buchhaltungsmodul aktiviert @@ -134,8 +134,10 @@ ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein ErrorBadFormat=Falsches Format! ErrorPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) darf nicht vor Rechnungsdatum (%s) liegen für Rechnung %s. -ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen. ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich. +ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden +ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden # Warnings WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert @@ -149,8 +151,8 @@ WarningsOnXLines=Warnhinweise in %s Quellzeilen WarningNoDocumentModelActivated=Für das Erstellen von Dokumenten ist keine Vorlage gewählt. Eine Vorlage wird standardmäßig ausgewählt, bis Sie die Moduleinstellungen angepasst haben. WarningLockFileDoesNotExists=Warnung, wenn Setup abgeschlossen ist, müssen Sie die Installations- und Migration-Tools deaktivieren. Dazu fügen Sie die Datei install.lock dem Verzeichnis %s hinzu. Das fehlend dieser Datei stelle eine Sicherheitslücke dar. WarningUntilDirRemoved=Diese Warnung bleibt so lange bestehen, bis die Sicherheitslücke geschlossen wurde (nur für Administratoren sichtbar). -WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. +WarningCloseAlways=Achtung: es wird auch dann geschlossen, wenn der Betrag zwischen Quelle und Ziel unterschiedlich ist. Aktivieren Sie dieses Feature mit Bedacht. WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtliche Seiten mit dieser Box spürbar. WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte). -WarningNotRelevant=Irrelevant operation for this dataset -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningNotRelevant=Operation für dieses Daten-Set nicht relevant +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist. diff --git a/htdocs/langs/de_DE/help.lang b/htdocs/langs/de_DE/help.lang index b2c338165c3..1ab43a1a734 100644 --- a/htdocs/langs/de_DE/help.lang +++ b/htdocs/langs/de_DE/help.lang @@ -25,4 +25,4 @@ LinkToGoldMember=Sie können einen, vom System für Ihre Sprache (%s) automatisc PossibleLanguages=Unterstützte Sprachen MakeADonation=Unterstützen Sie das Projekt über eine Spende SubscribeToFoundation=Helfen auch Sie dem Dolibarr Projekt und unterstützen uns mit einer Abo-Spende. -# SeeOfficalSupport=For official Dolibarr support in your language:
%s +SeeOfficalSupport=Für offizielle Dolibarr Unterstützung in Ihrer Sprache: br>%s diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang index 820bace2c78..5384a3403ac 100644 --- a/htdocs/langs/de_DE/holiday.lang +++ b/htdocs/langs/de_DE/holiday.lang @@ -1,40 +1,40 @@ # Dolibarr language file - Source file is en_US - holiday HRM=Mitarbeiter -Holidays=Ferien -CPTitreMenu=Ferien +Holidays=Urlaub +CPTitreMenu=Urlaub MenuReportMonth=Monatsauszug -MenuAddCP=Ferienantrag -NotActiveModCP=Sie müssen das Ferien-Modul aktivieren um diese Seite zu sehen. +MenuAddCP=Urlaubsantrag +NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen. NotConfigModCP=Sie müssen das Ferien-Modul konfigurieren um diese Seite zu sehen. Dazu klicken Sie hier . -NoCPforUser=You don't have a demand for holidays. -AddCP=Ferienantrag -Employe=Angestellter -DateDebCP=Ferienbeginn -DateFinCP=Ferienende +NoCPforUser=Sie haben keinen Anspruch auf Urlaub +AddCP=Urlaubsantrag +Employe=Mitarbeiter +DateDebCP=Urlaubsbeginn +DateFinCP=Urlaubsende DateCreateCP=Erstellungsdatum DraftCP=Entwurf ToReviewCP=Wartet auf Genehmigung ApprovedCP=Genehmigt -CancelCP=Storno +CancelCP=Zurückgezogen RefuseCP=Abgelehnt ValidatorCP=genehmigt durch -ListeCP=Ferienliste +ListeCP=Urlaubsliste ReviewedByCP=Wird geprüft von DescCP=Beschreibung -SendRequestCP=Ferienantrag stellen -DelayToRequestCP=Anträge für Ferien müssen mindestens %s Tage im voraus gestellt werden. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Ferien aktualisieren -SoldeCPUser=Feriensaldo ist %s Tage. +SendRequestCP=Urlaubsantrag erstellen +DelayToRequestCP=Urlaubsanträge müssen mindestens %s Tage im voraus gestellt werden. +MenuConfCP=Bearbeiten Sie die Urlaubsliste +UpdateAllCP=Urlaub aktualisieren +SoldeCPUser=Urlaubssaldo ist %s Tage. ErrorEndDateCP=Sie müssen ein End-Datum wählen, dass nach dem Start-Datum liegt. ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Eerstellung von: ErrorIDFicheCP=Ein Fehler trat auf, der Antrag auf Ferien existiert nicht. ReturnCP=Zurück zur vorherigen Seite -ErrorUserViewCP=Sie sind nicht berechtigt diese Ferien-Anträge zu lesen. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=Sie sind nicht berechtigt diese Urlaubsanträge zu lesen. +InfosCP=Information über den Urlaubsantrag InfosWorkflowCP=Information Workflow RequestByCP=Beantragt von -TitreRequestCP=Sheet of holidays +TitreRequestCP=Urlaubstabelle NbUseDaysCP=Anzahl Ferientage bezogen EditCP=Bearbeiten DeleteCP=Lösche Gruppe @@ -47,15 +47,15 @@ TitleDeleteCP=Antrag auf Ferien löschen ConfirmDeleteCP=Löschung dieses Ferienantrags bestätigen? ErrorCantDeleteCP=Fehler, Sie haben nicht die Berechtigung diesen Ferien-Antrag zu löschen. CantCreateCP=Sie haben nicht die Berechtigung Ferien zu beantragen. -InvalidValidatorCP=You must choose an approbator to your holiday request. +InvalidValidatorCP=Sie müssen einen Vorgesetzten haben der Ihre Urlaubsanfrage genehmigt. UpdateButtonCP=Aktualisieren -CantUpdate=You cannot update this request of holidays. +CantUpdate=Sie können diesen Urlaubsantrag nicht aktualisieren NoDateDebut=Sie müssen ein Startdatum wählen. NoDateFin=Sie müssen ein Enddatum wählen. ErrorDureeCP=Ihr Antrag auf Ferien enthält keine Werktage. -TitleValidCP=Approve the request holidays +TitleValidCP=Urlaubsantrag genehmigen ConfirmValidCP=Möchten Sie diesen Ferienantrag wirklich genehmigen? -DateValidCP=Date approved +DateValidCP=Datum genehmigt TitleToValidCP=Ferienantrag senden ConfirmToValidCP=Möchten Sie diesen Ferienantrag wirklich senden? TitleRefuseCP=Ferienantrag ablehnen @@ -65,14 +65,14 @@ TitleCancelCP=Ferienantrag abbrechen ConfirmCancelCP=Möchten Sie diesen Ferienantrag wirklich abbrechen? DetailRefusCP=Ablehnungsgrund DateRefusCP=Datum der Ablehnung -DateCancelCP=Date of cancellation +DateCancelCP=Datum der Absage DefineEventUserCP=Assign an exceptional leave for a user addEventToUserCP=Assign leave MotifCP=Grund UserCP=Benutzer ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays +MenuLogCP=Urlaubsliste ansehen LogCP=Liste von neuen Ferieneinträgen ActionByCP=Ausgeführt von UserUpdateCP=Für den Benutzer @@ -85,7 +85,7 @@ FirstDayOfHoliday=Erster Ferientag LastDayOfHoliday=Letzter Ferientag HolidaysMonthlyUpdate=Monatliches Update ManualUpdate=Manuelles Update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Urlaubsstornierung ## Configuration du Module ## ConfCP=Konfiguration des Ferienmoduls @@ -125,7 +125,7 @@ TitleUpdateEventCP=Edit or delete a exceptional leave DeleteEventOptionCP=Lösche Gruppe UpdateEventOptionCP=Aktualisieren ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten: -NoCPforMonth=No leave this month. +NoCPforMonth=Kein Urlaub diesen Monat nbJours=Anzahl der Tage TitleAdminCP=Konfiguration der Ferien #Messages diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang index 62f5943aea2..a4fbef99236 100644 --- a/htdocs/langs/de_DE/interventions.lang +++ b/htdocs/langs/de_DE/interventions.lang @@ -25,9 +25,11 @@ NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden: DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen ClassifyBilled=Eingegordnet "Angekündigt" +ClassifyUnBilled=als "nicht verrechnet" markieren StatusInterInvoiced=Angekündigt RelatedInterventions=Verbundene Eingriffe ShowIntervention=Zeige Eingriffe +SendInterventionRef=Einreichung von Eingriffen %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Eingriffsnachverfolgung durch Vertreter TypeContact_fichinter_internal_INTERVENING=Eingriff läuft @@ -39,4 +41,4 @@ ArcticNumRefModelError=Fehler beim aktivieren PacificNumRefModelDesc1=Liefere Nummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm das Monat und nnnn eine Zahlensequenz ohne Nullwert oder Leerzeichen ist PacificNumRefModelError=Eine Interventionskarte beginnend mit $syymm existiert bereits und ist nicht mir dieser Numerierungssequenz kompatibel. Bitte löschen oder umbenennen. PrintProductsOnFichinter=Drucke Produkte auf Eingriffskarte -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/de_DE/link.lang b/htdocs/langs/de_DE/link.lang index 8b1efb75ef3..759caca0876 100644 --- a/htdocs/langs/de_DE/link.lang +++ b/htdocs/langs/de_DE/link.lang @@ -1,8 +1,8 @@ -LinkANewFile=Link a new file/document -LinkedFiles=Linked files and documents -NoLinkFound=No registered links -LinkComplete=The file has been linked successfully -ErrorFileNotLinked=The file could not be linked -LinkRemoved=The link %s has been removed -ErrorFailedToDeleteLink= Failed to remove link '%s' -ErrorFailedToUpdateLink= Failed to update link '%s' +LinkANewFile=Verknüpfen Sie ein neues Dokument/Datei +LinkedFiles=Verknüpfte Dateien und Dokumente +NoLinkFound=Keine eingetragenen Verknüpfungen +LinkComplete=Die Datei wurde erfolgreich verknüpft +ErrorFileNotLinked=Die Datei konnte nicht Verknüpft werden +LinkRemoved=Die Verknüpfung %s wurde entfernt +ErrorFailedToDeleteLink= Fehler beim Löschen des Links '%s' +ErrorFailedToUpdateLink= Fehler beim Aktualisieren der Verknüpfung '%s' diff --git a/htdocs/langs/de_DE/mailmanspip.lang b/htdocs/langs/de_DE/mailmanspip.lang index 8d117d47e23..443e785f10a 100644 --- a/htdocs/langs/de_DE/mailmanspip.lang +++ b/htdocs/langs/de_DE/mailmanspip.lang @@ -1,27 +1,27 @@ # Dolibarr language file - Source file is en_US - mailmanspip MailmanSpipSetup=Konfiguration Mailman und SPIP Modul -# MailmanTitle=Mailman mailing list system -# TestSubscribe=To test subscription to Mailman lists -# TestUnSubscribe=To test unsubscribe from Mailman lists -# MailmanCreationSuccess=Subscription test was executed succesfully -# MailmanDeletionSuccess=Unsubscription test was executed succesfully -# SynchroMailManEnabled=A Mailman update will be performed -# SynchroSpipEnabled=A Spip update will be performed -# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password -# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions -# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions -# DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) +MailmanTitle=Mailman mailing list system +TestSubscribe=To test subscription to Mailman lists +TestUnSubscribe=To test unsubscribe from Mailman lists +MailmanCreationSuccess=Subscription test was executed succesfully +MailmanDeletionSuccess=Unsubscription test was executed succesfully +SynchroMailManEnabled=A Mailman update will be performed +SynchroSpipEnabled=A Spip update will be performed +DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password +DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions +DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions +DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) SPIPTitle=SPIP Content Management System DescADHERENT_SPIP_SERVEUR=SPIP-Server DescADHERENT_SPIP_DB=SPIP-Datenbankname DescADHERENT_SPIP_USER=SPIP-Datenbankkennung DescADHERENT_SPIP_PASS=SPIP-Datenbankpasswort -# AddIntoSpip=Add into SPIP -# AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? -# AddIntoSpipError=Failed to add the user in SPIP -# DeleteIntoSpip=Remove from SPIP -# DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? -# DeleteIntoSpipError=Failed to suppress the user from SPIP -# SPIPConnectionFailed=Failed to connect to SPIP -# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done -# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done +AddIntoSpip=Add into SPIP +AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? +AddIntoSpipError=Failed to add the user in SPIP +DeleteIntoSpip=Von SPIP entfernen +DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? +DeleteIntoSpipError=Failed to suppress the user from SPIP +SPIPConnectionFailed=Failed to connect to SPIP +SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done +SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang index 773da6f8764..58dcdc96f80 100644 --- a/htdocs/langs/de_DE/margins.lang +++ b/htdocs/langs/de_DE/margins.lang @@ -5,9 +5,9 @@ Margins=Gewinnspannen TotalMargin=Gesamt-Spanne MarginOnProducts=Gewinnspanne / Produkte MarginOnServices=Gewinnspanne / Services -MarginRate=Margin rate +MarginRate=Gewinnspannen-Rate MarkRate=Mark rate -DisplayMarginRates=Display margin rates +DisplayMarginRates=Zeige Gewinnspannen-Raten an DisplayMarkRates=Display mark rates InputPrice=Eingabe Preis margin=Profit margins management diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang index fda7c03a005..8d4ea51c343 100644 --- a/htdocs/langs/de_DE/orders.lang +++ b/htdocs/langs/de_DE/orders.lang @@ -55,7 +55,7 @@ DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt MenuOrdersToBill=Bestellverrechnung MenuOrdersToBill2=Zu verrechnende Bestellungen SearchOrder=Suche Bestellung -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Kundenauftrag suchen ShipProduct=Produkt versenden Discount=Rabatt CreateOrder=Erzeuge Bestellung @@ -101,7 +101,6 @@ RelatedOrders=Verknüpfte Bestellungen OnProcessOrders=Bestellungen in Bearbeitung RefOrder=Bestell-Nr. RefCustomerOrder=Kunden-Bestellung-Nr. -CustomerOrder=Kundenbestellung RefCustomerOrderShort=Kunden-BestellNr. SendOrderByMail=Bestellung per Post versenden ActionsOnOrder=Maßnahmen zu dieser Bestellung @@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konstante COMMANDE_ADDON nicht definiert Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Fehler beim Laden der Moduldatei '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Fehler beim Laden der Moduldatei '%s' Error_OrderNotChecked=Keine zu verrechnende Bestellungen ausgewählt - - # Sources OrderSource0=Angebot OrderSource1=Internet @@ -144,7 +141,6 @@ OrderSource5=Vertrieb OrderSource6=Andere QtyOrdered=Bestellmenge AddDeliveryCostLine=Fügen Sie eine Versandkostenzeile zur Erfassung des Bestellgewichts ein - # Documents models PDFEinsteinDescription=Eine vollständige Bestellvorlage (Logo, uwm.) PDFEdisonDescription=Eine einfache Bestellungsvorlage @@ -155,14 +151,13 @@ OrderByFax=Fax OrderByEMail=E-Mail OrderByWWW=Online OrderByPhone=Telefon - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=Keine Bestellungen Rechnungsfähig CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als "verarbeitet". MenuOrdersToBill2=Zu verrechnende Bestellungen -# OrderCreation=Order creation +OrderCreation=Erstellen einer Bestellung Ordered=Bestellt OrderCreated=Ihre Bestellungen wurden erstellt OrderFail=Ein Fehler trat beim Erstellen der Bestellungen auf CreateOrders=Erzeuge Bestellungen -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +ToBillSeveralOrderSelectCustomer=Um eine Rechnung für verschiedene Bestellungen zu erstellen, klicken Sie erst auf Kunde und dann wählen Sie "%s". diff --git a/htdocs/langs/de_DE/paypal.lang b/htdocs/langs/de_DE/paypal.lang index 4664f3ea94c..0ee356b52f7 100644 --- a/htdocs/langs/de_DE/paypal.lang +++ b/htdocs/langs/de_DE/paypal.lang @@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Sie befinden sich im "Sandbox"-Modus NewPaypalPaymentReceived=Neue PayPal-Zahlung erhalten NewPaypalPaymentFailed=Neue Paypal-Zahlung probiert, aber fehlgeschlagen PAYPAL_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht) -ReturnURLAfterPayment=Return URL after payment -ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed -PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed +ReturnURLAfterPayment=Rückkehr-URL nach Zahlung +ValidationOfPaypalPaymentFailed=Validierung der Paypal-Zahlung gescheitert +PaypalConfirmPaymentPageWasCalledButFailed=Zahlungsbestätigungsseite für Paypal wurde von Paypal aufgerufen, aber Bestätigung fehlgeschlagen diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang index 1284d010bc2..3d82f643187 100644 --- a/htdocs/langs/de_DE/products.lang +++ b/htdocs/langs/de_DE/products.lang @@ -1,46 +1,46 @@ # Dolibarr language file - Source file is en_US - products ProductRef=Produktreferenz ProductLabel=Produkt-Beschriftung -ProductServiceCard=Produkt-/Services-Karte +ProductServiceCard=Produkt-/Dienstleistungs-Karte Products=Produkte -Services=Services +Services=Dienstleistungen Product=Produkt -Service=Service -ProductId=Produkt/Service ID +Service=Dienstleistung +ProductId=Produkt/Dienstleistungs ID Create=Erstelle Reference=Referenz NewProduct=Neues Produkt -NewService=Neuer Service +NewService=Neue Dienstleistung ProductCode=Produkt-Code -ServiceCode=Service-Code +ServiceCode=Dienstleistungs-Code ProductVatMassChange=MwSt-Massenänderung -ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Services von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank! +ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Dienstleistungen von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank! MassBarcodeInit=Mass barcode init MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind! ProductAccountancyBuyCode=Buchhaltung - Aufwandskonto ProductAccountancySellCode=Buchhaltung - Erlöskonto -ProductOrService=Produkt oder Service -ProductsAndServices=Produkte und Services -ProductsOrServices=Produkte oder Services -ProductsAndServicesOnSell=Verfügbare Produkte und Services -ProductsAndServicesNotOnSell=Aufgelassene Produkte und Services -ProductsAndServicesStatistics=Produkt- und Service-Statistik +ProductOrService=Produkt oder Dienstleistung +ProductsAndServices=Produkte und Dienstleistungen +ProductsOrServices=Produkte oder Dienstleistungen +ProductsAndServicesOnSell=Verfügbare Produkte und Dienstleistungen +ProductsAndServicesNotOnSell=Aufgelassene Produkte und Dienstleistungen +ProductsAndServicesStatistics=Produkt- und Dienstleistungs-Statistik ProductsStatistics=Produktstatistik ProductsOnSell=Verfügbare Produkte ProductsNotOnSell=Aufgelassene Produkte ProductsOnSellAndOnBuy=Produkte weder für Ein- noch Verkauf -ServicesOnSell=Verfügbare Services -ServicesNotOnSell=Aufgelassene Services -ServicesOnSellAndOnBuy=Services weder für Ein- noch Verkauf +ServicesOnSell=Verfügbare Dienstleistungen +ServicesNotOnSell=Aufgelassene Dienstleistungen +ServicesOnSellAndOnBuy=Dienstleistungen weder für Ein- noch Verkauf InternalRef=Interne Referenz -LastRecorded=Zuletzt erfasste, verfügbare Produkte/Services -LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Services -LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Services +LastRecorded=Zuletzt erfasste, verfügbare Produkte/Dienstleistungen +LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Dienstleistungen +LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Dienstleistungen LastRecordedProducts=%s zuletzt erfasste Produkte -LastRecordedServices=%s zuletzt erfasste Services +LastRecordedServices=%s zuletzt erfasste Dienstleistungen LastProducts=Neueste Produkte CardProduct0=Produkt-Karte -CardProduct1=Service-Karte +CardProduct1=Dienstleistungs-Karte CardContract=Auftrags-Karte Warehouse=Warenlager Warehouses=Warenlager @@ -74,25 +74,25 @@ NewPrice=Neuer Preis MinPrice=Mindestverkaufspreis MinPriceHT=Mindest-Verkaufspreis (ohne MwSt.) MinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.) -CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt, wenn Sie einen zu hohen Rabatt geben. +CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben. ContractStatus=Vertragsstatus ContractStatusClosed=Geschlossen ContractStatusRunning=In Arbeit ContractStatusExpired=Abgelaufen ContractStatusOnHold=Nicht in Arbeit -ContractStatusToRun=To get running +ContractStatusToRun=zu bearbeiten ContractNotRunning=Dieser Vertrag wird nicht bearbeitet ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits. ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben. -ErrorProductClone=Beim Duplizieren des Produkts oder Service ist ein Problem aufgetreten -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorProductClone=Beim Duplizieren des Produkts oder der Dienstleistung ist ein Problem aufgetreten +ErrorPriceCantBeLowerThanMinPrice=Fehler - Preis darf nicht unter dem Minimalpreis liegen. Suppliers=Lieferanten SupplierRef=Lieferanten-Artikelnummer ShowProduct=Produkt anzeigen -ShowService=Zeige Service -ProductsAndServicesArea=Produkt-und Services-Übersicht +ShowService=Dienstleistung anzeigen +ProductsAndServicesArea=Produkt-und Dienstleistungs-Übersicht ProductsArea=Produktübersicht -ServicesArea=Services-Übersicht +ServicesArea=Dienstleistungs-Übersicht AddToMyProposals=Zu meinen Angebote hinzufügen AddToOtherProposals=Zu Angeboten Anderer hinzufügen AddToMyBills=Zu meinen Rechnungen hinzufügen @@ -113,9 +113,9 @@ SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ BarcodeValue=Barcode-Wert NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...) CreateCopy=Kopie erstellen -ServiceLimitedDuration=Ist die Leistungserbringung eines Service zeitlich beschränkt: -MultiPricesAbility=Mehrere Preisstufen pro Produkt/Service -MultiPricesNumPrices=Preisnummer +ServiceLimitedDuration=Ist die Erringung einer Dienstleistung zeitlich beschränkt: +MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung +MultiPricesNumPrices=Anzahl Preise MultiPriceLevelsName=Preiskategorien AssociatedProductsAbility=Untergeordnete Produkte aktivieren AssociatedProducts=Unterprodukte @@ -159,14 +159,14 @@ DiscountQtyMin=Standard-Rabatt für die Menge NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert NoSupplierPriceDefinedForThisProduct=Einkaufskonditionen für dieses Produkt noch nicht definiert RecordedProducts=Erfasste Produkte -RecordedServices=Erfasste Services +RecordedServices=Erfasste Dienstleistungen RecordedProductsAndServices=Erfasste Produkte/Leistungen PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte -PredefinedServicesToSell=Vordefinierte Services zum Verkauf -PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Services +PredefinedServicesToSell=Vordefinierte Dienstleistungen zum Verkauf +PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Dienstleistungen PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte -PredefinedServicesToPurchase=Vordefinierte Services zum Einkauf -PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Services +PredefinedServicesToPurchase=Vordefinierte Dienstleistungen zum Einkauf +PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Dienstleistungen GenerateThumb=Erzeuge Vorschaubild ProductCanvasAbility=Verwende spezielle "canvas" Add-Ons ServiceNb=Leistung #%s @@ -176,31 +176,31 @@ ListServiceByPopularity=Liste der Leistungen nach Beliebtheit Finished=Eigenproduktion RowMaterial=Rohmaterial CloneProduct=Produkt/Leistung duplizieren -ConfirmCloneProduct=Möchten Sie %s wirklich duplizieren? +ConfirmCloneProduct=Möchten Sie die Leistung %s wirklich duplizieren? CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren ClonePricesProduct=Allgemeine Informationen und Preise duplizieren -CloneCompositionProduct=Unterprodukt/-Service duplizieren +CloneCompositionProduct=Unterprodukt/-Dienstleistung duplizieren ProductIsUsed=Produkt in Verwendung NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen CustomerPrices=Kundenpreise SuppliersPrices=Lieferantenpreise -SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Services) +SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Dienstleistungen) CustomCode=Interner Code CountryOrigin=Urspungsland HiddenIntoCombo=In ausgewählten Listen nicht anzeigen Nature=Art ProductCodeModel=Vorlage für Produktreferenz -ServiceCodeModel=Vorlage für Service-Referenz +ServiceCodeModel=Vorlage für Dienstleistungs-Referenz AddThisProductCard=Produktkarte erstellen HelpAddThisProductCard=Dies gibt ihnen die Möglichkeit, ein Produkt zu erstellen oder zu duplizieren wenn es noch nicht existiert. -AddThisServiceCard=Service-Karte erstellen -HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, einen Service zu erstellen oder zu duplizieren wenn er noch nicht existiert. +AddThisServiceCard=Dienstleistungs-Karte erstellen +HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, eine Dienstleistung zu erstellen oder zu duplizieren wenn sie noch nicht existiert. CurrentProductPrice=Aktueller Preis -AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Service nutzen +AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Dienstleistung nutzen AlwaysUseFixedPrice=Festen Preis nutzen PriceByQuantity=Preis nach Menge PriceByQuantityRange=Bereich der Menge -ProductsDashboard=Produkt-und Services-Zusammenfassung +ProductsDashboard=Produkt- und Dienstleistungs-Zusammenfassung UpdateOriginalProductLabel=Ursprüngliches Label verändern HelpUpdateOriginalProductLabel=Gibt die Möglichkeit, den Namen des Produkts zu bearbeiten ### composition fabrication @@ -214,7 +214,7 @@ CostPmpHT=Net total VWAP ProductUsedForBuild=Automatisch für Produktion verbraucht ProductBuilded=Produktion fertiggestellt ProductsMultiPrice=Produkt Multi-Preis -ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Services, Multi-Preise) +ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Dienstleistungen, Multi-Preise) ProductSellByQuarterHT=Products turnover quarterly VWAP ServiceSellByQuarterHT=Services turnover quarterly VWAP Quarter1=1. Quartal @@ -234,11 +234,11 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner BarCodeDataForProduct=Barcode-Information von Produkt %s: BarCodeDataForThirdparty=Barcode-Information von Partner %s: ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) -PriceByCustomer=Price by customer -PriceCatalogue=Unique price per product/service +PriceByCustomer=Preis des Kunden +PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung PricingRule=Preisregeln AddCustomerPrice=Add price by customers ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest PriceByCustomerLog=Price by customer log -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein +MinimumRecommendedPrice=Minimaler empfohlener Preis: %s diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index 009c36d1a7c..907b21ce10c 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -124,7 +124,7 @@ AddElement=Mit Element verknüpfen DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.) PlannedWorkload = Geplante Auslastung WorkloadOccupation= Beeinflussung der Auslastung -ProjectReferers=Refering objects -SearchAProject=Search a project +ProjectReferers=Bezugnahmen +SearchAProject=Suchen Sie ein Projekt ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang index 0fbf941d777..dd29ee21783 100644 --- a/htdocs/langs/de_DE/propal.lang +++ b/htdocs/langs/de_DE/propal.lang @@ -98,5 +98,5 @@ TypeContact_propal_external_CUSTOMER=Partnerkontakt für Angebot DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, uwm.) DocModelJauneDescription=Angebotsvorlage DefaultModelPropalCreate=Erstellung Standardvorlage -# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) -# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) +DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) +DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung) diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang index 8748f77ee64..b1477807c4e 100644 --- a/htdocs/langs/de_DE/salaries.lang +++ b/htdocs/langs/de_DE/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Buchhaltungscode für Bezahlung der Gehälter +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Lohn Salaries=Löhne Employee=Angestellter @@ -6,3 +8,5 @@ NewSalaryPayment=Neue Lohnzahlung SalaryPayment=Lohnzahlung SalariesPayments=Lohnzahlungen ShowSalaryPayment=Zeige Lohnzahlung +THM=Durchschnittlicher Stundenpreis +TJM=Durchschnittlicher Tagespreis diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang index 02cdb4098ed..2b7376cb62e 100644 --- a/htdocs/langs/de_DE/stocks.lang +++ b/htdocs/langs/de_DE/stocks.lang @@ -88,7 +88,7 @@ PersonalStock=Persönlicher Warenbestand %s ThisWarehouseIsPersonalStock=Dieses Lager bezeichnet den persönlichen Bestand von %s %s SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang -NoStockAction=No stock action +NoStockAction=Keine Vorratsänderung LastWaitingSupplierOrders=Bestellungen warten auf Wareneingang DesiredStock=gewünschter Lagerbestand StockToBuy=zu bestellen @@ -109,10 +109,10 @@ WarehouseForStockIncrease=Das Lager %s wird für Wareneingang verwendet ForThisWarehouse=Für dieses Lager ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte, deren Lagerbestand unter dem Sollbestand liegt (bzw. unter der Alarmschwelle, wenn die Auswahlbox "Nur Alarm" gewählt ist) , die Ihnen Vorschläge für Lieferantenbestellungen liefert, um die Differenzen auszugleichen. ReplenishmentOrdersDesc=Dies ist die Liste aller offenen Lieferantenbestellungen -Replenishments=Replenishments +Replenishments=Nachschub NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s) NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s) -MassMovement=Mass movement +MassMovement=Massenbewegung MassStockMovement=Massen-Umlagerung SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s". RecordMovement=Record transfert diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang index 221b0f125b6..94507c0c572 100644 --- a/htdocs/langs/de_DE/users.lang +++ b/htdocs/langs/de_DE/users.lang @@ -114,8 +114,9 @@ YourRole=Ihre Rolle YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht NbOfUsers=Anzahl der Benutzer DontDowngradeSuperAdmin=Nur ein SuperAdmin kann einen SuperAdmin downgraden -HierarchicalResponsible=In der Hierarchie verantwortlich +HierarchicalResponsible=Aufseher HierarchicView=Hierarchische Ansicht UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern OpenIDURL=OpenID URL LoginUsingOpenID=Verwende OpenID für Anmeldung +WeeklyHours=Wochenstunden diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang index fef59beb67f..139f35c1085 100644 --- a/htdocs/langs/de_DE/withdrawals.lang +++ b/htdocs/langs/de_DE/withdrawals.lang @@ -56,7 +56,7 @@ StatusCredited=Eingelöst StatusRefused=Abgelehnt StatusMotif0=Nicht spezifiziert StatusMotif1=Unzureichende Deckung -StatusMotif2=Request contested +StatusMotif2=Anfrage bestritten StatusMotif3=Kein Abbuchungsauftrag StatusMotif4=Kundenanfrage StatusMotif5=nicht nutzbare Kontodaten diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 352b3902096..939a3fde7d5 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -1,33 +1,33 @@ -# Dolibarr language file - fr_FR - Accountancy +# Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 Accounting=Comptabilité -Globalparameters=Paramètres globaux +Globalparameters=Paramètres globals Chartofaccounts=Plan comptable -Fiscalyear=Exercices fiscaux +Fiscalyear=Années fiscales Menuaccount=Comptes comptables -Menuthirdpartyaccount=Comptes tiers +Menuthirdpartyaccount=Comptes de tiers MenuTools=Outils ConfigAccountingExpert=Configuration du module comptabilité expert Journaux=Journaux -JournalFinancial=Journaux de trésorerie +JournalFinancial=Journaux financiers Exports=Exports Modelcsv=Modèle d'export -Selectmodelcsv=Sélectionnez un modèle d'export -Modelcsv_normal=Export classique +Selectmodelcsv=Sélectionner un modèle d'export +Modelcsv_normal=Export standard Modelcsv_CEGID=Export vers CEGID Expert -BackToChartofaccounts=Retour plan comptable -Back=Retour +BackToChartofaccounts=Return chart of accounts +Back=Return Definechartofaccounts=Définir un plan comptable -Selectchartofaccounts=Sélectionnez un plan comptable +Selectchartofaccounts=Sélectionner un plan comptable Validate=Valider Addanaccount=Ajouter un compte comptable AccountAccounting=Compte comptable Ventilation=Ventilation -ToDispatch=A effectuer -Dispatched=Effectuée +ToDispatch=A ventiler +Dispatched=Ventilés CustomersVentilation=Ventilation clients SuppliersVentilation=Ventilation fournisseurs @@ -36,123 +36,123 @@ Reports=Rapports ByCustomerInvoice=Par factures clients ByMonth=Par mois NewAccount=Nouveau compte comptable -Update=Mettre à jour +Update=Modifier List=Liste Create=Créer -UpdateAccount=Modification d'un compte -UpdateMvts=Modification d'un mouvement -WriteBookKeeping=Comptabiliser les écritures dans le grand livre -Bookkeeping=Grand livre -AccountBalanceByMonth=Balance mensuelle +UpdateAccount=Modification de compte comptable +UpdateMvts=Modification de mouvements +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Solde par mois AccountingVentilation=Ventilation comptable -AccountingVentilationSupplier=Ventilation comptable fournisseur -AccountingVentilationCustomer=Ventilation comptable client +AccountingVentilationSupplier=Ventilation comptable client +AccountingVentilationCustomer=Ventilation comptable fournisseur Line=Ligne -CAHTF=Total achat fournisseur HT -InvoiceLines=Lignes de facture à ventiler -InvoiceLinesDone=Lignes de facture ventilées -IntoAccount=Dans le compte comptable +CAHTF=Total achats fournisseur HT +InvoiceLines=Lignes de factures à ventiler +InvoiceLinesDone=Lignes de factures ventilées +IntoAccount=In the accounting account -Ventilate=Ventiler -VentilationAuto=Ventilation automatique +Ventilate=Ventilate +VentilationAuto=Automatic ventilation -Processing=Traitement en cours -EndProcessing=Fin de traitement -AnyLineVentilate=Aucune ligne à ventiler +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate SelectedLines=Lignes sélectionnées -Lineofinvoice=Ligne de facture -VentilatedinAccount=Ventilée avec succès dans le compte comptable -NotVentilatedinAccount=Non ventilée dans le compte comptable +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Séparateur CSV +ACCOUNTINGEX_SEPARATORCSV=Séparateur de champ -ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencer le tri des pages de ventilation "Ventilées" par les éléments les plus récents +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements -AccountLength=Longueur des comptes comptables affichés dans Dolibarr -AccountLengthDesc=Fonction permettant de simuler une longueur de compte comptable en remplaçant les espaces par le chiffre zéro. Cette fonction touche uniquement à l'affichage, elle ne modifie pas les comptes comptables enregistrés dans Dolibarr. Pour l'export, cette fonction est nécessaire pour être compatible avec certains logiciels. -ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes généraux -ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTING_SELL_JOURNAL=Journal des Ventes -ACCOUNTING_PURCHASE_JOURNAL=Journal des Achats -ACCOUNTING_BANK_JOURNAL=Journal de Banque -ACCOUNTING_CASH_JOURNAL=Journal de Caisse -ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des Opérations Diverses -ACCOUNTING_SOCIAL_JOURNAL=Journal Social +ACCOUNTINGEX_SELL_JOURNAL=Journal des ventes +ACCOUNTINGEX_PURCHASE_JOURNAL=Journal des achats +ACCOUNTINGEX_BANK_JOURNAL=Journal de banque +ACCOUNTINGEX_CASH_JOURNAL=Journal de compte caisse +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Journal divers +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de transfert espèce -ACCOUNTING_ACCOUNT_SUSPENSE=Compte d'attente +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Compte de transfert +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Compte d'attente -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service) +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) -Doctype=Type de document +Doctype=Type de documents Docdate=Date -Docref=Référence +Docref=Reference Numerocompte=Compte Code_tiers=Tiers -Labelcompte=Libellé compte +Labelcompte=Label account Debit=Débit Credit=Crédit Amount=Montant Sens=Sens Codejournal=Journal -DelBookKeeping=Supprimer les écritures du grand livre +DelBookKeeping=Delete the records of the general ledger SellsJournal=Journal des ventes PurchasesJournal=Journal des achats DescSellsJournal=Journal des ventes DescPurchasesJournal=Journal des achats -BankJournal=Journal de banque -DescBankJournal=Journal de banque comprenant tous les types de règlements autres que espèce -CashJournal=Journal de caisse -DescCashJournal=Journal de caisse comprenant le type de règlement "espèce" +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash -CashPayment=Règlement espèce +CashPayment=Cash Payment -SupplierInvoicePayment=Règlement de facture fournisseur -CustomerInvoicePayment=Règlement de facture client +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer -ThirdPartyAccount=Compte tiers +ThirdPartyAccount=Thirdparty account -NewAccountingMvt=Nouveau mouvement -NumMvts=Numéro de mouvement -ListeMvts=Liste du mouvement -ErrorDebitCredit=Debit et Credit ne peuvent avoir une valeur en même temps +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=Liste des mouvements +ErrorDebitCredit=Debit and Credit cannot have a value at the same time -ReportThirdParty=Liste compte tiers -DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts -ListAccounts=Liste des comptes comptables +ListAccounts=List of the accounting accounts Pcgversion=Version du plan Pcgtype=Classe de compte -Pcgsubtype=Sous classe de compte -Accountparent=Racine du compte -Active=État +Pcgsubtype=Under class of account +Accountparent=Racine des comptes +Active=Relevé -NewFiscalYear=Nouvel exercice fiscal +NewFiscalYear=Nouvelle année fiscale -DescVentilCustomer=Consultez ici la ventilation comptable annuelle de vos factures clients -TotalVente=Total chiffre affaires HT -TotalMarge=Total marge commerciale -DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable -DescVentilTodoCustomer=Ventilez vos lignes de facture client avec un compte comptable -ChangeAccount=Changer le compte comptable pour les lignes sélectionnées par le compte : +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consultez ici la ventilation comptable annuelle de vos factures fournisseurs -DescVentilTodoSupplier=Ventilez vos lignes de facture fournisseur avec un compte comptable -DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account -ValidateHistory=Valider Automatiquement +ValidateHistory=Validate Automatically -ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ce compte comptable car il est utilisé +ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé -FicheVentilation=Fiche ventilation +FicheVentilation=Ventilation card diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 0ea2d9d51f4..9f8cb56896e 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -45,8 +45,8 @@ ErrorModuleRequireDolibarrVersion=Erreur, ce module requiert une version %s ou s ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à %s ne sont pas prises en charge. DictionarySetup=Dictionnaires Dictionary=Dictionnaires -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years +Chartofaccounts=Plan comptable +Fiscalyear=Année fiscale ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0 DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text). @@ -584,6 +584,9 @@ Permission92=Créer/modifier les charges et la TVA Permission93=Supprimer les charges et la TVA Permission94=Exporter les charges Permission95=Consulter CA, bilans et résultats +Permission96=Paramétrer la ventilation +Permission97=Lire les lignes de factures +Permission98=Ventiler les lignes de factures Permission101=Consulter les expéditions Permission102=Créer/modifier les expéditions Permission104=Valider les expéditions diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index 5811bf3d940..a94bd8fff72 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -55,7 +55,7 @@ DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée MenuOrdersToBill=Commandes délivrées MenuOrdersToBill2=Commandes à facturer SearchOrder=Rechercher une commande -SearchACustomerOrder=Rechercher code client +SearchACustomerOrder=Rechercher une commande client ShipProduct=Expédier produit Discount=Remise CreateOrder=Créer Commande @@ -101,7 +101,6 @@ RelatedOrders=Commandes rattachées OnProcessOrders=Commandes en cours de traitement RefOrder=Réf. commande RefCustomerOrder=Réf. commande client -CustomerOrder=Commande client RefCustomerOrderShort=Réf. com. client SendOrderByMail=Envoyer commande par mail ActionsOnOrder=Événements sur la commande @@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON non définie Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Échec chargement du fichier module '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Échec chargement du fichier module '%s' Error_OrderNotChecked=Pas de commandes à facturer sélectionnées - - # Sources OrderSource0=Proposition commerciale OrderSource1=Internet @@ -144,7 +141,6 @@ OrderSource5=Commercial OrderSource6=Magasin QtyOrdered=Qté commandée AddDeliveryCostLine=Ajouter une ligne de frais port indiquant le poids de la commande - # Documents models PDFEinsteinDescription=Modèle de commande complet (logo…) PDFEdisonDescription=Modèle de commande simple @@ -155,7 +151,6 @@ OrderByFax=Fax OrderByEMail=Email OrderByWWW=En ligne OrderByPhone=Téléphone - CreateInvoiceForThisCustomer=Facturer commandes NoOrdersToInvoice=Pas de commandes facturables CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées. diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang index c2ee988b96e..521638dc632 100644 --- a/htdocs/langs/hr_HR/bills.lang +++ b/htdocs/langs/hr_HR/bills.lang @@ -85,7 +85,7 @@ ClassifyPaid=Označi kao plaćeno ClassifyPaidPartially=Označi kao djelomično plaćeno ClassifyCanceled=Označi kao napušteno ClassifyClosed=Označi kao zatvoreno -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Klasificirati 'nefakturirano' CreateBill=Izradi račun AddBill=Dodaj račun ili bonifikaciju AddToDraftInvoices=Dodati u skice računa @@ -163,7 +163,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») -ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim zemljama, taj izbor može biti moguć samo ako vaš račun sadrži ispravne bilješke. ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Loš kupac je kupac koji odbija platit svoj dug. ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen. @@ -198,8 +198,8 @@ Rest=U toku AmountExpected=Utvrđen iznos ExcessReceived=Previše primljeno EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=Podnošenje računa %s +SendReminderBillRef=Podnošenje Računa %s (podsjetnik) StandingOrders=Otvorene narudžbe StandingOrder=Otvorene narudžbe NoDraftBills=Nema skica računa @@ -232,7 +232,7 @@ Repeatables=Predložak ChangeIntoRepeatableInvoice=Pretvori u predložak CreateRepeatableInvoice=Izradi predložak računa CreateFromRepeatableInvoice=Izradi iz predloška računa -CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines +CustomersInvoicesAndInvoiceLines=Računi klijenata i redovi računa CustomersInvoicesAndPayments=Računi i plaćanja kupca ExportDataset_invoice_1=Računi kupca i popis računa ExportDataset_invoice_2=Računi i plaćanja kupca @@ -369,7 +369,7 @@ LawApplicationPart4=njihove cijene. LimitedLiabilityCompanyCapital=SARL with Capital of UseLine=Primjeni UseDiscount=Iskoriti popust -UseCredit=Use credit +UseCredit=Koristite kredit UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit MenuChequeDeposits=Checks deposits MenuCheques=Čekovi diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang index 0596d677c46..d67c219ddc9 100644 --- a/htdocs/langs/hr_HR/boxes.lang +++ b/htdocs/langs/hr_HR/boxes.lang @@ -1,91 +1,91 @@ # Dolibarr language file - Source file is en_US - boxes -# BoxLastRssInfos=Rss information -# BoxLastProducts=Last %s products/services -# BoxProductsAlertStock=Products in stock alert -# BoxLastProductsInContract=Last %s contracted products/services -# BoxLastSupplierBills=Last supplier's invoices -# BoxLastCustomerBills=Last customer's invoices -# BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices -# BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices -# BoxLastProposals=Last commercial proposals -# BoxLastProspects=Last modified prospects -# BoxLastCustomers=Last modified customers -# BoxLastSuppliers=Last modified suppliers -# BoxLastCustomerOrders=Last customer orders -# BoxLastBooks=Last books -# BoxLastActions=Last actions -# BoxLastContracts=Last contracts -# BoxLastContacts=Last contacts/addresses -# BoxLastMembers=Last members -# BoxFicheInter=Last interventions -# BoxCurrentAccounts=Opened accounts balance -# BoxSalesTurnover=Sales turnover -# BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices -# BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices -# BoxTitleLastBooks=Last %s recorded books -# BoxTitleNbOfCustomers=Number of clients -# BoxTitleLastRssInfos=Last %s news from %s -# BoxTitleLastProducts=Last %s modified products/services -# BoxTitleProductsAlertStock=Products in stock alert -# BoxTitleLastCustomerOrders=Last %s modified customer orders -# BoxTitleLastSuppliers=Last %s recorded suppliers -# BoxTitleLastCustomers=Last %s recorded customers -# BoxTitleLastModifiedSuppliers=Last %s modified suppliers -# BoxTitleLastModifiedCustomers=Last %s modified customers -# BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects -# BoxTitleLastPropals=Last %s recorded proposals -# BoxTitleLastCustomerBills=Last %s customer's invoices -# BoxTitleLastSupplierBills=Last %s supplier's invoices -# BoxTitleLastProspects=Last %s recorded prospects -# BoxTitleLastModifiedProspects=Last %s modified prospects -# BoxTitleLastProductsInContract=Last %s products/services in a contract -# BoxTitleLastModifiedMembers=Last %s modified members -# BoxTitleLastFicheInter=Last %s modified intervention -# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices -# BoxTitleCurrentAccounts=Opened account's balances -# BoxTitleSalesTurnover=Sales turnover -# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices -# BoxTitleLastModifiedContacts=Last %s modified contacts/addresses -# BoxMyLastBookmarks=My last %s bookmarks -# BoxOldestExpiredServices=Oldest active expired services -# BoxLastExpiredServices=Last %s oldest contacts with active expired services -# BoxTitleLastActionsToDo=Last %s actions to do -# BoxTitleLastContracts=Last %s contracts -# BoxTitleLastModifiedDonations=Last %s modified donations -# BoxTitleLastModifiedExpenses=Last %s modified expenses -# BoxGlobalActivity=Global activity (invoices, proposals, orders) -# FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s -# LastRefreshDate=Last refresh date -# NoRecordedBookmarks=No bookmarks defined. -# ClickToAdd=Click here to add. -# NoRecordedCustomers=No recorded customers -# NoRecordedContacts=No recorded contacts -# NoActionsToDo=No actions to do -# NoRecordedOrders=No recorded customer's orders -# NoRecordedProposals=No recorded proposals -# NoRecordedInvoices=No recorded customer's invoices -# NoUnpaidCustomerBills=No unpaid customer's invoices -# NoRecordedSupplierInvoices=No recorded supplier's invoices -# NoUnpaidSupplierBills=No unpaid supplier's invoices -# NoModifiedSupplierBills=No recorded supplier's invoices -# NoRecordedProducts=No recorded products/services -# NoRecordedProspects=No recorded prospects -# NoContractedProducts=No products/services contracted -# NoRecordedContracts=No recorded contracts -# NoRecordedInterventions=No recorded interventions -# BoxLatestSupplierOrders=Latest supplier orders -# BoxTitleLatestSupplierOrders=%s latest supplier orders -# NoSupplierOrder=No recorded supplier order -# BoxCustomersInvoicesPerMonth=Customer invoices per month -# BoxSuppliersInvoicesPerMonth=Supplier invoices per month -# BoxCustomersOrdersPerMonth=Customer orders per month -# BoxSuppliersOrdersPerMonth=Supplier orders per month -# BoxProposalsPerMonth=Proposals per month -# NoTooLowStockProducts=No product under the low stock limit -# BoxProductDistribution=Products/Services distribution -# BoxProductDistributionFor=Distribution of %s for %s -# ForCustomersInvoices=Customers invoices -# ForCustomersOrders=Customers orders -# ForProposals=Proposals +BoxLastRssInfos=RSS Informacije +BoxLastProducts=Zadnjih %s proizvoda / usluga +BoxProductsAlertStock=Proizvodi u skaldištu - uzbuna +BoxLastProductsInContract=Zadnjih %s ugovorenih proizvoda / usluga +BoxLastSupplierBills=Posljednji računi od dobavljača +BoxLastCustomerBills=Posljednji računi od kupaca +BoxOldestUnpaidCustomerBills=Najstariji neplaćeni računi kupaca +BoxOldestUnpaidSupplierBills=Najstariji neplaćeni računi dobavljača +BoxLastProposals=Najnovije ponude +BoxLastProspects=Posljednji izmijenjeni potencijalni kupci +BoxLastCustomers=Posljednji izmijenjeni kupci +BoxLastSuppliers=Posljednji izmijenjeni dobavljači +BoxLastCustomerOrders=Najnovije narudžbe kupaca +BoxLastBooks=Najnovije knjige +BoxLastActions=Najnovije aktivnosti +BoxLastContracts=Najnoviji ugovori +BoxLastContacts=Najnoviji kontakti / Adrese +BoxLastMembers=Najnoviji članovi +BoxFicheInter=Najnovije intervencije +BoxCurrentAccounts=Stanje otvorenih računa +BoxSalesTurnover=Promet +BoxTotalUnpaidCustomerBills=Ukupni neplaćeni računi kupaca +BoxTotalUnpaidSuppliersBills=Ukupni neplaćeni računi dobavljača +BoxTitleLastBooks=Posljednjih %s spremljenih knjige +BoxTitleNbOfCustomers=Broj klijenata +BoxTitleLastRssInfos=Posljednjih %s vijesti iz %s +BoxTitleLastProducts=Posljednjih %s izmijenjenih proizvoda / usluga +BoxTitleProductsAlertStock=Proizvodi u skladištu - uzbuna +BoxTitleLastCustomerOrders=Posljdnjih %s izmijenjenih narudžba kupaca +BoxTitleLastSuppliers=Prošlogodišnjih %s spremljenih dobavljača +BoxTitleLastCustomers=Posljednjih %s spremljenih kupaca +BoxTitleLastModifiedSuppliers=Posljednjih %s izmijenjenih dobavljača +BoxTitleLastModifiedCustomers=Posljednjih %s izmijenjenih kupaca +BoxTitleLastCustomersOrProspects=Posljednjih %s izmijenjenih kupaca ili potencijalnih kupaca +BoxTitleLastPropals=Posljednjih %s spremljenih ponuda +BoxTitleLastCustomerBills=Posljednjih %s računi kupaca +BoxTitleLastSupplierBills=Posljednjih %s računi dobavljača +BoxTitleLastProspects=Posljednjih %s spremljenih potencijalnih kupaca +BoxTitleLastModifiedProspects=Posljednjih %s izmijenjenih potencijalnih kupaca +BoxTitleLastProductsInContract=Posljednjih %s proizvoda / usluga u ugovorima +BoxTitleLastModifiedMembers=Prošlogodišnji% s modificirani članovi +BoxTitleLastFicheInter=Prošlogodišnji% s modificirani intervencija +BoxTitleOldestUnpaidCustomerBills=Najstariji% s neplaćene račune kupca +BoxTitleOldestUnpaidSupplierBills=Najstariji% s neplaćene račune dobavljača +BoxTitleCurrentAccounts=Stanja otvorila korisničkog računa +BoxTitleSalesTurnover=Promet +BoxTitleTotalUnpaidCustomerBills=Neplaćeni računi kupca +BoxTitleTotalUnpaidSuppliersBills=Neplaćeni računi dobavljača +BoxTitleLastModifiedContacts=Prošlogodišnji% s modificirani kontakti / Adrese +BoxMyLastBookmarks=Moja posljednja% s oznake +BoxOldestExpiredServices=Najstariji aktivni istekli usluge +BoxLastExpiredServices=Prošlogodišnji% s Najstariji kontakti s aktivnim istekao usluge +BoxTitleLastActionsToDo=Prošlogodišnji% s akcije učiniti +BoxTitleLastContracts=Prošlogodišnji% s ugovorima +BoxTitleLastModifiedDonations=Prošlogodišnji% s modificirani donacije +BoxTitleLastModifiedExpenses=Prošlogodišnji% s modificirani rashodi +BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi) +FailedToRefreshDataInfoNotUpToDate=Nisam uspio osvježiti RSS tok. Zadnja uspješna datum osvježavanja:% s +LastRefreshDate=Posljednji dan osvježavanja +NoRecordedBookmarks=Nema oznaka definirana. +ClickToAdd=Kliknite ovdje za dodavanje. +NoRecordedCustomers=Nema snimljene kupci +NoRecordedContacts=Nema snimljene kontakti +NoActionsToDo=Nema akcije učiniti +NoRecordedOrders=Nema zabilježenih kupca narudžbe +NoRecordedProposals=Nema snimljene prijedlozi +NoRecordedInvoices=Nema zabilježenih kupca račune +NoUnpaidCustomerBills=Ne neplaćene račune kupca +NoRecordedSupplierInvoices=Nema zabilježenih dobavljača računi +NoUnpaidSupplierBills=Ne neplaćene račune dobavljača +NoModifiedSupplierBills=Nema zabilježenih dobavljača računi +NoRecordedProducts=Nema zabilježenih proizvodi / usluge +NoRecordedProspects=Nema snimljene perspektive +NoContractedProducts=Nema proizvoda / usluge ugovorene +NoRecordedContracts=Nema snimljene ugovori +NoRecordedInterventions=Nema zabilježenih intervencija +BoxLatestSupplierOrders=Najnoviji dobavljač narudžbe +BoxTitleLatestSupplierOrders=% s najnovijim narudžbe dobavljačima +NoSupplierOrder=Ne bilježi dobavljač bi +BoxCustomersInvoicesPerMonth=Korisnički računi mjesečno +BoxSuppliersInvoicesPerMonth=Dobavljač računi mjesečno +BoxCustomersOrdersPerMonth=Korisnički nalozi mjesečno +BoxSuppliersOrdersPerMonth=Dobavljač naloga mjesečno +BoxProposalsPerMonth=Prijedlozi mjesečno +NoTooLowStockProducts=Nema proizvoda pod niskim granice dionica +BoxProductDistribution=Proizvodi / usluge distribucije +BoxProductDistributionFor=Raspodjela% s za% s +ForCustomersInvoices=Kupci računi +ForCustomersOrders=Kupci narudžbe +ForProposals=Prijedlozi diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang index ffb3fc0f522..de79a067d15 100644 --- a/htdocs/langs/hr_HR/companies.lang +++ b/htdocs/langs/hr_HR/companies.lang @@ -26,7 +26,7 @@ IdCompany=Id kompanije IdContact=Id kontakta Contacts=Kontakti/Adrese ThirdPartyContacts=Kontakti treće stranke -ThirdPartyContact=Third party contact/address +ThirdPartyContact=Stranka kontakt / adresa StatusContactValidated=Status of contact/address Company=Kompanija CompanyName=Ime kompanije diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang index 685db01debc..7c63d8971c4 100644 --- a/htdocs/langs/hr_HR/languages.lang +++ b/htdocs/langs/hr_HR/languages.lang @@ -10,7 +10,7 @@ Language_da_DA=Danski Language_da_DK=Danski Language_de_DE=Njemački Language_de_AT=Njemački (Austrija) -Language_de_CH=German (Switzerland) +Language_de_CH=Njemački (Švicarska) Language_el_GR=Grčki Language_en_AU=Engleski (Australija) Language_en_GB=Engleski (United Kingdom) @@ -20,7 +20,7 @@ Language_en_SA=Engleski (Saudijska Arabija) Language_en_US=Engleski (United States) Language_en_ZA=Engleski (Južna Afrika) Language_es_ES=Španjolski -Language_es_DO=Spanish (Dominican Republic) +Language_es_DO=Španjolski (Dominikanska Republika) Language_es_AR=Španjolski (Argentina) Language_es_CL=Španjolski (Čile) Language_es_HN=Španjolski (Honduras) @@ -40,7 +40,7 @@ Language_fr_NC=Francuski (Nova Kaledonija) Language_he_IL=Hebrew Language_hr_HR=Hrvatski Language_hu_HU=Mađarski -Language_id_ID=Indonesian +Language_id_ID=Indonezijski Language_is_IS=Islandski Language_it_IT=Talijanski Language_ja_JP=Japanski diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index c839e869079..16c4d2dd35b 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -3,7 +3,7 @@ Foundation=Organizācija Version=Versija VersionProgram=Programmas versija VersionLastInstall=Sākotnējā instalētā versija -VersionLastUpgrade=Jaunākajai jauninājums +VersionLastUpgrade=Pēdējo reizi versija atjaunijnāta VersionExperimental=Eksperimentāls VersionDevelopment=Attīstība VersionUnknown=Nezināms @@ -35,7 +35,7 @@ ExternalUsers=Ārējie lietotāji GlobalSetup=Globālie iestatījumi GUISetup=Attēlojums SetupArea=Iestatījumi -FormToTestFileUploadForm=Veidlapa, lai pārbaudītu failu augšupielādes (pēc uzstādīšanas) +FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem) IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis %s ir iespējots RemoveLock=Dzēst failu %s, ja tāds ir, lai varētu izmantošanu atjaunināšanas rīku. RestoreLock=Atjaunot failu %s ar lasīšanas tiesībām tikai, lai bloķētu atjaunošanas rīka izmantošanu. @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr v ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā %s netiek atbalstīta. DictionarySetup=Vārdnīcas iestatījumi Dictionary=Vārdnīcas +Chartofaccounts=Chart of accounts +Fiscalyear=Fiskālais gads ErrorReservedTypeSystemSystemAuto=Vērtību "sistēma" un "systemauto" veida tiek aizsargātas. Jūs varat izmantot "lietotājs", kā vērtība, lai pievienotu savu ierakstu ErrorCodeCantContainZero=Kods nevar saturēt 0 vērtību DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -354,7 +356,7 @@ HideDetailsOnPDF=Paslēpt produktu līnijas informāciju izveidotajā PDF Library=Bibliotēka UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL -EnterRefToBuildUrl=Ievadiet atsauce objektu %s +EnterRefToBuildUrl=Ievadiet atsauci objektam %s GetSecuredUrl=Saņemt aprēķināto URL ButtonHideUnauthorized=Slēpt pogas, lai neatļautu rīcību, nevis rāda invalīdu pogas OldVATRates=Vecā PVN likme @@ -405,7 +407,7 @@ NoRecordWithoutBarcodeDefined=No record with no barcode value defined. Module0Name=Lietotāji un grupas Module0Desc=Lietotāju un grupu vadība Module1Name=Trešās personas -Module1Desc=Uzņēmumi un kontaktinformācija vadība (klientu, perspektīvas ...) +Module1Desc=Uzņēmumu un kontaktinformācijas vadība (klientu, perspektīvu ...) Module2Name=Tirdzniecība Module2Desc=Komerciālā pārvaldība Module10Name=Grāmatvedība @@ -534,7 +536,7 @@ Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Malas Module59000Desc=Moduli, lai pārvaldītu peļņu Module60000Name=Komisijas -Module60000Desc=Moduli, lai pārvaldītu komisijas +Module60000Desc=Modulis lai pārvaldītu komisijas Module150010Name=Batch number, eat-by date and sell-by date Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Lasīt klientu rēķinus @@ -582,6 +584,9 @@ Permission92=Izveidot/labot sociālās iemaksas un PVN Permission93=Dzēst sociālās iemaksas un PVN Permission94=Eksportēt sociālās iemaksas Permission95=Lasīt atskaites +Permission96=Nosūtīšanas iestatīšana +Permission97=Lasīt rēķina grāmatvedību nosūtīšana +Permission98=Nosūtīšanas rēķinu grāmatvedības līnijas Permission101=Lasīt sūtījumus Permission102=Izveidot/mainīt sūtījumus Permission104=Apstiprināt sūtījumus @@ -672,7 +677,7 @@ Permission300=Lasīt svītrkodus Permission301=Izveidot / mainīt svītrkodus Permission302=Dzēst svītrkodus Permission311=Lasīt pakalpojumus -Permission312=Piešķirt pakalpojumu līgumu +Permission312=Piešķirt pakalpojumu līgumam Permission331=Lasīt grāmatzīmes Permission332=Izveidot/mainīt grāmatzīmes Permission333=Dzēst grāmatzīmes @@ -718,7 +723,7 @@ Permission1185=Apstiprināt piegādātājq pasūtījumus Permission1186=Pasūtīt piegādātāja pasūtījumus Permission1187=Saņemšanu piegādātāju pasūtījumu Permission1188=Dzēst piegādātāju pasūtījumus -Permission1201=Saņemt rezultātu eksportu +Permission1201=Saņemt eksportēšanas rezultātu Permission1202=Izveidot/Modificēt eksportu Permission1231=Lasīt piegādātāja rēķinus Permission1232=Izveidot/mainīt piegādātāja rēķinus @@ -730,11 +735,11 @@ Permission1237=Eksporta piegādātāju pasūtījumus un to detaļas Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde) Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus Permission1421=Eksporta klientu pasūtījumus un atribūti -Permission23001 = Lasīt Plānotais uzdevumu -Permission23002 = Izveidot / atjaunināt Plānotais uzdevumu +Permission23001 = Skatīt plānoto uzdevumu +Permission23002 = Izveidot/atjaunināt plānoto uzdevumu Permission23003 = Dzēst plānoto uzdevumu Permission23004 = Izpildīt plānoto uzdevumu -Permission2401=Lasīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu +Permission2401=SKatīt darbības (pasākumi vai uzdevumi), kas saistīti ar kontu Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu Permission2411=Lasīt darbības (pasākumi vai uzdevumi) par citiem @@ -785,7 +790,7 @@ BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu VATReceivedOnly=Īpaša likme nav jāmaksā VATManagement=PVN Vadība VATIsUsedDesc=PVN likme pēc noklusējuma, veidojot izredzes, rēķini, rīkojumi uc sekot aktīvo standarta noteikums:
Ja pārdevējs nav pakļauta PVN, tad PVN pēc noklusējuma = 0. Beigas varu.
Ja (pārdošanas valstij = pērkot valsti), tad pēc noklusējuma PVN = PVN no produkta pārdošanas valstī. Beigas varu.
Ja pārdevējs un pircējs Eiropas Kopienā, un preces ir transporta līdzekļi (auto, kuģis, lidmašīna), noklusējuma PVN = 0 (PVN būtu jāmaksā pircējam pie customoffice savas valsts, nevis pārdevējs). Beigas varu.
Ja pārdevējs un pircējs Eiropas Kopienas un pircējs nav uzņēmums, tad PVN pēc noklusējuma = PVN no pārdotā produkta. Beigas varu.
Ja pārdevējs un pircējs Eiropas Kopienas un pircējs ir uzņēmums, tad PVN pēc noklusējuma = 0. Beigas varu.
Else ierosinātā noklusējuma PVN = 0. Beigas varu. -VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijām, cilvēki ou mazos uzņēmumus. +VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijās, idnividuālie komersanti. VATIsUsedExampleFR=Francijā, tas nozīmē, uzņēmumiem vai organizācijām, kas reāli fiskālo sistēmu (Vienkāršota reālu vai normāla īsto). Sistēma, kurā PVN ir deklarēta. VATIsNotUsedExampleFR=Francijā, tas ir asociācijas, kas nav PVN deklarētas vai uzņēmumi, organizācijas vai brīvo profesiju, kas ir izvēlējušies mikrouzņēmumu nodokļu sistēmu (PVN ar franšīzes), un tā maksā franšīzes PVN bez PVN deklarācijas. Šī izvēle būs redzams atskaites "Nav piemērojams PVN - art-293B CGI" rēķinā. ##### Local Taxes ##### @@ -1538,4 +1543,4 @@ Opened=Atvērts Closed=Slēgts Format=Formāts -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang index 399ae58ab4a..acb2aba4570 100644 --- a/htdocs/langs/lv_LV/bills.lang +++ b/htdocs/langs/lv_LV/bills.lang @@ -25,7 +25,7 @@ InvoiceReplacement=Nomaiņa rēķins InvoiceReplacementAsk=Nomaiņa rēķins par rēķinu InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. InvoiceAvoir=Kredīta piezīme -InvoiceAvoirAsk=Kredītu piezīmi, lai koriģētu rēķinu +InvoiceAvoirAsk=Kredīta piezīme, lai koriģētu rēķinu InvoiceAvoirDesc=Kredīts piezīme ir negatīvs rēķins izmantot, lai atrisinātu to, ka rēķins ir summa, kas atšķiras par summu, patiesībā maksā (jo klients maksā pārāk daudz kļūdas dēļ, vai arī nav samaksāta pilnībā, jo viņš atgriezās dažus produktus, piemēram). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang index 36f2a166d77..5069f05eab4 100644 --- a/htdocs/langs/lv_LV/orders.lang +++ b/htdocs/langs/lv_LV/orders.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - orders OrdersArea=Klienti pasūtījumu sadaļa SuppliersOrdersArea=Piegādātāji pasūtījumi platība -OrderCard=Lai karte +OrderCard=Pasūtījumu kartiņa OrderId=Pasūtījuma ID Order=Rīkojums Orders=Pasūtījumi @@ -9,25 +9,25 @@ OrderLine=Lai līnija OrderFollow=Sekojiet līdzi OrderDate=Pasūtīt datumu OrderToProcess=Pasūtījums, kas jāapstrādā -NewOrder=Jauns rīkojums +NewOrder=Jauns pasūtījums ToOrder=Veicot pasūtījumu MakeOrder=Veicot pasūtījumu SupplierOrder=Piegādātājs rīkojums SuppliersOrders=Piegādātāji pasūtījumi SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi CustomerOrder=Klienta rīkojums -CustomersOrders=Klienta-u pasūtījumi +CustomersOrders=Klientu pasūtījumi CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas OrdersToValid=Klienta pasūtījumu apstiprināšanai, -OrdersToBill=Klienta rīkojumi piegādāts -OrdersInProcess=Klienta rīkojumus procesā -OrdersToProcess=Klienta rīkojumi apstrādāt +OrdersToBill=Klienta pasūtījumi piegādāti +OrdersInProcess=Klienta pasūtījumi procesā +OrdersToProcess=Klienta pasūtījumi kas jāapstrādā SuppliersOrdersToProcess=Piegādātāja rīkojumi apstrādāt StatusOrderCanceledShort=Atcelts StatusOrderDraftShort=Projekts -StatusOrderValidatedShort=Validēta -StatusOrderSentShort=Šajā procesā +StatusOrderValidatedShort=Apstiprināts +StatusOrderSentShort=Procesā StatusOrderSent=Sūtījuma procesā StatusOrderOnProcessShort=Reģistratūra StatusOrderProcessedShort=Apstrādāti @@ -40,7 +40,7 @@ StatusOrderReceivedPartiallyShort=Daļēji saņemti StatusOrderReceivedAllShort=Viss saņemts StatusOrderCanceled=Atcelts StatusOrderDraft=Projekts (ir jāapstiprina) -StatusOrderValidated=Validēta +StatusOrderValidated=Apstiprināts StatusOrderOnProcess=Gaida, lai saņemtu StatusOrderProcessed=Apstrādāts StatusOrderToBill=Piegādāts @@ -81,9 +81,9 @@ AllOrders=Visi pasūtījumi NbOfOrders=Pasūtījumu skaits OrdersStatistics=Pasūtījuma-u statistika OrdersStatisticsSuppliers=Piegādātāj pasūtījuma/u statistika -NumberOfOrdersByMonth=Pasutījumu skaits pa mēnešiem -AmountOfOrdersByMonthHT=Summa rīkojumus mēnesī (neto pēc nodokļiem) -ListOfOrders=Saraksts pasūtījumu +NumberOfOrdersByMonth=Pasūtījumu skaits pa mēnešiem +AmountOfOrdersByMonthHT=Summa pasūtījumi mēnesī (bez nodokļiem) +ListOfOrders=Pasūtījumu saraksts CloseOrder=Aizvērt kārtība ConfirmCloseOrder=Vai jūs tiešām vēlaties, lai uzstādītu šo rīkojumu deliverd? Pēc tam, kad pasūtījums tiek piegādāts, to var iestatīt, lai jāmaksā. ConfirmCloseOrderIfSending=Vai jūs tiešām vēlaties, lai aizvērtu šo pasūtījumu? Jums jāslēdz rīkojumu tikai tad, kad visi kuģniecības tiek darīts. @@ -95,7 +95,7 @@ ConfirmMakeOrder=Vai jūs tiešām vēlaties, lai apstiprinātu veicāt šo rīk GenerateBill=Izveidot rēķinu ClassifyShipped=Klasificēt piegādāts ClassifyBilled=Klasificēt rēķins -ComptaCard=Grāmatvedība karte +ComptaCard=Grāmatvedības kartiņa DraftOrders=Projekts pasūtījumi RelatedOrders=Saistītie pasūtījumi OnProcessOrders=Pasūtījumi procesā diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang index 511331310fe..b2b6cfc6e25 100644 --- a/htdocs/langs/lv_LV/stocks.lang +++ b/htdocs/langs/lv_LV/stocks.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - stocks -WarehouseCard=Noliktava karte +WarehouseCard=Noliktava kartiņa Warehouse=Noliktava Warehouses=Noliktavas NewWarehouse=Jauns noliktavu / Noliktavas platība @@ -35,7 +35,7 @@ Unit=Vienība StockCorrection=Labot krājumus StockTransfer=Krājumu pārvietošana StockMovement=Pārvietot -StockMovements=Krājumu pārvieošanas +StockMovements=Krājumu pārvietošanas LabelMovement=Kustību nosaukums NumberOfUnit=Vienību skaits UnitPurchaseValue=Vienības iepirkuma cena @@ -73,7 +73,7 @@ MininumStockShort=Krājumu min StockUpShort=Krājumi IdWarehouse=Id noliktava DescWareHouse=Apraksts noliktava -LieuWareHouse=Lokalizācija noliktava +LieuWareHouse=Lokālā noliktava WarehousesAndProducts=Noliktavas un produkti AverageUnitPricePMPShort=Vidējais svērtais ieejas cena AverageUnitPricePMP=Vidējais svērtais ieejas cena diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang index 4ff75fca9fe..c5f655e4781 100644 --- a/htdocs/langs/ru_RU/orders.lang +++ b/htdocs/langs/ru_RU/orders.lang @@ -1,10 +1,10 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Клиенты заказы области -SuppliersOrdersArea=Поставщики заказы области -OrderCard=Заказать карту -# OrderId=Order Id +OrdersArea=Раздел заказов клиентов +SuppliersOrdersArea=Раздел заказов поставщиков +OrderCard=Карточка заказа +OrderId=Идентификатор заказа Order=Заказ -Orders=Приказы +Orders=Заказы OrderLine=Заказ линии OrderFollow=Последующие меры OrderDate=Дата заказа @@ -28,7 +28,7 @@ StatusOrderCanceledShort=Отменен StatusOrderDraftShort=Черновик StatusOrderValidatedShort=Подтвержденные StatusOrderSentShort=В процессе -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=В процессе StatusOrderProcessedShort=Обработано StatusOrderToBillShort=В законопроекте @@ -53,9 +53,9 @@ ShippingExist=Отгрузки существует DraftOrWaitingApproved=Проект или утверждены еще не заказал DraftOrWaitingShipped=Проект или подтверждены не отгружен MenuOrdersToBill=Заказы на законопроект -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Orders to bill SearchOrder=Поиск тем -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Судно продукта Discount=Скидка CreateOrder=Создать заказ @@ -68,11 +68,11 @@ CancelOrder=Отмена порядка AddOrder=Добавить тему AddToMyOrders=Добавить в мои заказы AddToOtherOrders=Добавить в других заказов -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=Показать порядок NoOpenedOrders=Нет открыл заказов NoOtherOpenedOrders=Никакие другие открыли заказов -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=Другие заказы LastOrders=Последнее %s заказов LastModifiedOrders=Последнее% с измененными заказов @@ -82,7 +82,7 @@ NbOfOrders=Количество заказов OrdersStatistics=Приказы Статистика OrdersStatisticsSuppliers=Поставщик заказов статистика NumberOfOrdersByMonth=Количество заказов в месяц -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=Список заказов CloseOrder=Закрыть тему ConfirmCloseOrder=Вы уверены, что хотите, чтобы закрыть эту тему? После того, как заказ является закрытым, он может быть выставлен счет. @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Вы уверены, что хотите, чтобы во ConfirmCancelOrder=Вы уверены, что хотите отменить этот заказ? ConfirmMakeOrder=Вы уверены, что хотите, чтобы подтвердить вы сделали этот заказ на %s? GenerateBill=Создать счет-фактуру -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=Классифицировать "Billed" ComptaCard=Бухгалтерия карту DraftOrders=Проект распоряжения @@ -101,7 +101,6 @@ RelatedOrders=Похожие заказов OnProcessOrders=В процессе заказов RefOrder=Ref. заказ RefCustomerOrder=Ref. Для клиента -CustomerOrder=Для клиентов RefCustomerOrderShort=Ref. CUST. заказ SendOrderByMail=Отправить заказ по почте ActionsOnOrder=Меры по заказу @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_ Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Не удалось загрузить модуль файл ' %s' Error_FailedToLoad_COMMANDE_ADDON_File=Не удалось загрузить модуль файл ' %s' -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=Коммерческое предложение OrderSource1=Интернет @@ -144,25 +141,23 @@ OrderSource5=Коммерческие OrderSource6=Склад QtyOrdered=Количество заказанных AddDeliveryCostLine=Добавить доставки Стоимость линии с указанием веса заказа - # Documents models PDFEinsteinDescription=Для полной модели (logo. ..) PDFEdisonDescription=Простая модель для -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=Почта OrderByFax=Факс OrderByEMail=EMail OrderByWWW=Интернет OrderByPhone=Телефон - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +MenuOrdersToBill2=Orders to bill +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang index f47bdc774cc..d3421d8d336 100644 --- a/htdocs/langs/tr_TR/agenda.lang +++ b/htdocs/langs/tr_TR/agenda.lang @@ -2,14 +2,14 @@ IdAgenda=Kimlik etkinliği Actions=Eylemler ActionsArea=Eylem alanı (Olaylar ve görevler) -Agenda= Gündem -Agendas= Gündemler -Calendar= Takvim -Calendars= Takvimler -LocalAgenda=Yerel takvim +Agenda=Gündem +Agendas=Gündemler +Calendar=Takvim +Calendars=Takvimler +LocalAgenda=İç takvim AffectedTo=Etkilenen DoneBy=Yapan -Event=Event +Event=Etkinlik Events=Etkinlikler EventsNb=Etkinlik sayısı MyEvents=Etkinliklerim @@ -22,7 +22,7 @@ MenuToDoActions=Tüm sonlanmayan eylemler MenuDoneActions=Tüm sonlanan eylemler MenuToDoMyActions=Sonlanmayan eylemlerim MenuDoneMyActions=Sonlanan eylemlerim -ListOfEvents=Dolibarr eylem listesi +ListOfEvents=Etkinlik listesi (iç takvim) ActionsAskedBy=Eylemi bildiren ActionsToDoBy=Eylemden etkilenen ActionsDoneBy=Eylemi yapan @@ -34,7 +34,7 @@ ViewList=Liste görünümü ViewCal=Ay görünümü ViewDay=Gün görünümü ViewWeek=Hafta görünümü -ViewPerUser=Per user view +ViewPerUser=Kullanıcı görünümü başına ViewWithPredefinedFilters= Öntanımlı süzgeçler ile görünüm AutoActions= Gündemin otomatik doldurulması AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz olayları tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen eylemler gündeme dahil edilecektir. @@ -51,7 +51,7 @@ OrderRefusedInDolibarr=Reddedilen teklif %s OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür OrderCanceledInDolibarr=%s Siparişi iptal edildi InterventionValidatedInDolibarr=%s Müdahalesi doğrulandı -ProposalSentByEMail=%s Ticari teklifi Eposta ile gönderildi +ProposalSentByEMail=%s Teklifi Eposta ile gönderildi OrderSentByEMail=%s Müşteri siparişi Eposta ile gönderildi InvoiceSentByEMail=%s Müşteri faturası Eposta ile gönderildi SupplierOrderSentByEMail=%s Tedarikçi siparişi Eposta ile gönderildi @@ -76,15 +76,16 @@ AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle Busy=Meşgul ExportDataset_event1=Gündem etkinlikleri listesi -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +DefaultWorkingDays=Varsayılan haftalık çalışma günleri aralığı (Örnek: 1-5, 1-6) +DefaultWorkingHours=Varsayılan günlük çalışma saatleri (Örnek: 9-18) # External Sites ical ExportCal=Takvim ver ExtSites=Dış takvimleri içeaktar -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Gündemde dış takvimleri (genel ayarlarda tanımlanan) göster. Kullanıcılar tarafından tanımlanan dış takvimleri etkilemez. ExtSitesNbOfAgenda=Takvimlerin sayısı AgendaExtNb=Takvim sayısı %s ExtSiteUrlAgenda=.ical dosyasına erişmek için URL ExtSiteNoLabel=Tanımlama yok -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range +WorkingTimeRange=Çalışma saati aralığı +WorkingDaysRange=Çalışma günleri aralığı +AddEvent=Etkinlik oluştur diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index 49416317dac..27493dd1327 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -85,7 +85,7 @@ ClassifyPaid=‘Ödendi’ olarak sınıflandır ClassifyPaidPartially=‘Kısmen ödendi’ olarak sınıflandır ClassifyCanceled=’Terkedildi’ olarak sınıflandır ClassifyClosed=‘Kapalı’ olarak sınıflandır -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Sınıflandırma 'Faturalanmadı' CreateBill=Fatura oluştur AddBill=Fatura ya da alacak dekontu ekle AddToDraftInvoices=Taslak fatura ekle @@ -198,8 +198,8 @@ Rest=Bekleyen AmountExpected=İstenen tutar ExcessReceived=Fazla alınan EscompteOffered=Teklif edilen indirim (vadeden önce ödemede) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=%s faturasının gönderilmesi +SendReminderBillRef=%s faturasının gönderilmesi (anımsatma) StandingOrders=Ödeme talimatları StandingOrder=Ödeme talimatı NoDraftBills=Hiç taslak fatura yok @@ -224,7 +224,7 @@ DispenseMontantLettres=Mekanografik olarak tasarlanan fatura harf sırasının d NonPercuRecuperable=Kurtarılamaz SetConditions=Ödeme koşullarını ayarla SetMode=Ödeme biçimini ayarla -Billed=Faturalandı +Billed=Faturalanmış RepeatableInvoice=Ön tanımlı fatura RepeatableInvoices=Ön tanımlı faturalar Repeatable=Ön tanımlı @@ -296,8 +296,8 @@ TotalOfTwoDiscountMustEqualsOriginal=İki yeni indirimin toplamı orijinal indir ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz? RelatedBill=İlgili fatura RelatedBills=İlgili faturalar -LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +LatestRelatedBill=Son ilgili fatura +WarningBillExist=Uyarı, bir yada çok fatura zaten var # PaymentConditions PaymentConditionShortRECEP=Derhal diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang index 3407f90d6dc..7a402a41cb9 100644 --- a/htdocs/langs/tr_TR/boxes.lang +++ b/htdocs/langs/tr_TR/boxes.lang @@ -7,7 +7,7 @@ BoxLastSupplierBills=Son tedarikçi faturaları BoxLastCustomerBills=Son müşteri faturaları BoxOldestUnpaidCustomerBills=En eski ödenmemiş müşteri faturaları BoxOldestUnpaidSupplierBills=En eski ödenmemiş tedarikçi faturaları -BoxLastProposals=Son ticari teklifler +BoxLastProposals=Son teklifler BoxLastProspects=Son adaylar BoxLastCustomers=Son değiştirilen müşteriler BoxLastSuppliers=Son değiştirilen tedarikçiler diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang index 144c82d0f29..d17d38c2055 100644 --- a/htdocs/langs/tr_TR/commercial.lang +++ b/htdocs/langs/tr_TR/commercial.lang @@ -44,8 +44,8 @@ DoneActions=Tamamlanan etkinlikler DoneActionsFor=%s için tamamlanan etkinlikler ToDoActions=Tamamlanmamış etkinlikler ToDoActionsFor=%s için tamalanmamış etkinlikler -SendPropalRef=%s teklifini gönder -SendOrderRef=% siparişini gönder +SendPropalRef=%s Teklifinin sunulması +SendOrderRef=%s Teklifinin sunulması StatusNotApplicable=Uygulanamaz StatusActionToDo=Yapılacaklar StatusActionDone=Tamamla @@ -62,7 +62,7 @@ LastProspectContactDone=Görüşme yapıldı DateActionPlanned=Planlanan etkinlik tarihi DateActionDone=Etkinliğin yapıldığı tarih ActionAskedBy=Etkinliği sunan -ActionAffectedTo=Etkinlikten etkilenen +ActionAffectedTo=Etkinlik sahibi ActionDoneBy=Etkinliği yapan ActionUserAsk=Raporlayan ErrorStatusCantBeZeroIfStarted=Eğer Yapıldığı tarih alanı doluysa, etkinlik başlamıştır (veya bitmiştir), bu durumda 'Durum' alanı 0%% olamaz. diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang index 584486a23e7..86ff28e3e8e 100644 --- a/htdocs/langs/tr_TR/companies.lang +++ b/htdocs/langs/tr_TR/companies.lang @@ -76,7 +76,7 @@ PhoneMobile=Mobil No_Email=Toplu e-posta gönderme Fax=Faks Zip=Posta Kodu -Town=Şehir +Town=ilçesi Web=Web Poste= Durumu DefaultLang=Varsayılan dili @@ -91,8 +91,8 @@ LocalTax2IsUsedES= IRPF kullanılır LocalTax2IsNotUsedES= IRPF kullanılmaz LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type +TypeLocaltax1ES=RE Türü +TypeLocaltax2ES=IRPF Türü TypeES=Türü ThirdPartyEMail=%s WrongCustomerCode=Müşteri kodu geçersiz @@ -270,7 +270,7 @@ NoContactDefined=Bu üçüncü parti için kişi tanımlanmamış DefaultContact=Varsayılan kişi AddCompany=Firma ekle AddThirdParty=Üçüncü parti ekle -DeleteACompany=Bir firma sil +DeleteACompany=Firma sil PersonalInformations=Kişisel bilgiler AccountancyCode=Muhasebe kodu CustomerCode=Müşteri kodu @@ -302,7 +302,7 @@ ContactForProposals=Teklif yetkilisi ContactForContracts=Sözleşme yetkilisi ContactForInvoices=Fatura yetkilisi NoContactForAnyOrder=Bu kişi herhangi bir siparişin yetkilisi değildir -NoContactForAnyProposal=Bu kişi herhangi bir ticari teklifin yetkilisi değildir +NoContactForAnyProposal=Bu kişi herhangi bir teklifin yetkilisi değildir NoContactForAnyContract=Bu kişi herhangi bir sözleşmenin yetkilisi değildir NoContactForAnyInvoice=Bu kişi herhangi bir faturanın yetkilisi değildir NewContact=Yeni kişi @@ -311,7 +311,7 @@ LastContacts=Son kişiler MyContacts=Kişilerim Phones=Telefonlar Capital=Sermaye -CapitalOf=%s nin sermayesi +CapitalOf=%s firmasının sermayesi EditCompany=Firma düzenle EditDeliveryAddress=Teslimat adresi düzenle ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir @@ -386,9 +386,9 @@ SupplierCategory=Tedarikçi kategorisi JuridicalStatus200=Bağımsız DeleteFile=Dosya sil ConfirmDeleteFile=Bu dosyayı silmek istediğinizden emin misiniz? -AllocateCommercial=Bir ticari tahsis et -SelectCountry=Bir ülke seçin -SelectCompany=Bir üçüncü parti seçin +AllocateCommercial=Satış temsilcisine atanmış +SelectCountry=Bir ülke seç +SelectCompany=Bir üçüncü parti seç Organization=Kuruluş AutomaticallyGenerated=Otomatikman oluşturulur FiscalYearInformation=Mali yıla ait bilgi @@ -403,7 +403,7 @@ UniqueThirdParties=Toplam eşsiz üçüncü parti InActivity=Açık ActivityCeased=Kapalı ActivityStateFilter=Etkinlik durumu -ProductsIntoElements=Ürünleri %s 'li listele +ProductsIntoElements=Ürünleri %s te listele CurrentOutstandingBill=Geçerli bekleyen fatura OutstandingBill=Ödenmemiş fatura için ençok tutar OutstandingBillReached=En yüksek ödenmemiş fatura tutarına ulaşıldı diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang index 2cdba02cd1b..13c10ed06eb 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -123,7 +123,7 @@ CalcModeVATDebt=Mod %sKDV, taahhüt hesabı%s için. CalcModeVATEngagement=Mod %sKDV, gelirler-giderler%s için. CalcModeDebt=Mod %sAlacaklar-Borçlar, taahhüt hesabı%s için. CalcModeEngagement=Mod %sAlacaklar-Borçlar, kasa hesabı%s için. -CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s +CalcModeLT1= Müşteri faturaları için mod %sRE tedrikçi faturaları için mod %s CalcModeLT1Debt=Mode %sRE on customer invoices%s CalcModeLT1Rec= Mode %sRE on suppliers invoices%s CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s @@ -195,12 +195,12 @@ CalculationRuleDesc=Toplam KDV hesabı için 2 yöntem vardır:
Yöntem 1, he CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kullanmak üzere uygun yöntemi seçin ve tedarikçiyle aynı sonucu alın. TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, nakit muhasebesimodu için uygun değildir. Bu rapor yalnızca, tahakkuk muhasebesi modu için uygundur (muhasebe modülü ayarlarına bakın). CalculationMode=Hesaplama modu -AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu -ACCOUNTING_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu -ACCOUNTING_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu -ACCOUNTING_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu -ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu -ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu +AccountancyJournal=Muhasebe kodu günlüğü +COMPTA_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu +COMPTA_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu +COMPTA_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu +COMPTA_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu +COMPTA_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu +COMPTA_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu +COMPTA_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu +COMPTA_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu diff --git a/htdocs/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang index beb78b2a16a..5ed9a0a2d67 100644 --- a/htdocs/langs/tr_TR/dict.lang +++ b/htdocs/langs/tr_TR/dict.lang @@ -248,11 +248,11 @@ CountryBL=Saint Barthelemy CountryMF=Saint Martin ##### Civilities ##### -CivilityMME=Mrs. -CivilityMR=Mr. -CivilityMLE=Ms. +CivilityMME=Bn. +CivilityMR=Bay +CivilityMLE=Bn. CivilityMTRE=Master -CivilityDR=Doctor +CivilityDR=Doktor ##### Currencies ##### Currencyeuros=Euro CurrencyAUD=AU Doları @@ -290,6 +290,8 @@ CurrencySingXOF=CFA Frangı BCEAO CurrencyXPF=CFP Frangı CurrencySingXPF=CFP Frangı CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=thousandth #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet @@ -297,7 +299,7 @@ DemandReasonTypeSRC_CAMP_MAIL=Posta kampanyası DemandReasonTypeSRC_CAMP_EMAIL=Eposta kampanyası DemandReasonTypeSRC_CAMP_PHO=Telefon kampanyası DemandReasonTypeSRC_CAMP_FAX=Faks kampanyası -DemandReasonTypeSRC_COMM=Ticari görüşme +DemandReasonTypeSRC_COMM=Ticari ilgili DemandReasonTypeSRC_SHOP=İş yerinde görüşme DemandReasonTypeSRC_WOM=Başkasından duyarak DemandReasonTypeSRC_PARTNER=İş Ortağı diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang index c34c5299c29..67077b69d64 100644 --- a/htdocs/langs/tr_TR/errors.lang +++ b/htdocs/langs/tr_TR/errors.lang @@ -136,6 +136,8 @@ ErrorBadFormat=Hatalı biçim! ErrorPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) önce bu faturada %s olamaz. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üçüncü partiye bağlanmamıştır. Üyeyi varolan bir üçüncü partiye bağlayın ya da faturayla abonelik oluşturmadan önce yeni bir üçüncü parti oluşturun. ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi. +ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez +ErrorCantDeletePaymentSharedWithPayedInvoice=Ödendi durumunda olan en az bir faturayla paylaşılan bir ödeme silinemez # Warnings WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış @@ -153,4 +155,4 @@ WarningCloseAlways=Uyarı, kaynak ve hedef öğeleri arasında tutar farklı da WarningUsingThisBoxSlowDown=Uyarı, bu kutuyu kullanmak kutuyu gösteren tüm sayfaları ciddi olarak yavaşlatır. WarningClickToDialUserSetupNotComplete=Kullanıcınızın ClickToDial bilgileri ayarı tamamlanmamış (kullanıcı kartınızdaki ClickToDial tabına bakın) WarningNotRelevant=Bu veri kümesi için alakasız işlem -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Bu özellik, ekran görme engelliler için ya da metin tarayıcılar için ayarlandığında devre dışı kalır. diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang index 420f5082d82..e6c8d770ad0 100644 --- a/htdocs/langs/tr_TR/exports.lang +++ b/htdocs/langs/tr_TR/exports.lang @@ -125,8 +125,8 @@ BankAccountNumber=Hesap numarası BankAccountNumberKey=Anahtar SpecialCode=Özel kod ExportStringFilter=%% metinde bir ya da fazla karakterin değiştirilmesine izin verir -ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days -ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : bir yıılık yıl/ay/gün süzgeçi
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : yıllar arası yıllar/aylar/günler süzgeçi
> YYYY, > YYYYMM, > YYYYMMDD : izleyen tüm yıllar için yıılar/aylar/günler süzgeçi
< YYYY, < YYYYMM, < YYYYMMDD : bütün önceki yıllar/aylar/günler süzgeçi +ExportNumericFilter='NNNNN' bir değere göre süzgeç
'NNNNN+NNNNN' bir değerler aralığı süzgeçi
'>NNNNN' düşük değerlere göre süzgeç
'>NNNNN' yüksek değerlere göre süzgeç ## filters SelectFilterFields=Süzmek istediğiniz değerleri buraya yazın. FilterableFields=Süzülebilir Champs diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang index bbf1322546b..1f05331ba2a 100644 --- a/htdocs/langs/tr_TR/interventions.lang +++ b/htdocs/langs/tr_TR/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Müdahilin adı ve imzası : NameAndSignatureOfExternalContact=Müşterinin adı ve imzası : DocumentModelStandard=Müdahaleler için standart belge modeli InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları -ClassifyBilled="Faturalandırıldı" -StatusInterInvoiced=Faturalandırılmış +ClassifyBilled=Sınıflandırma "Faturalanmış" +ClassifyUnBilled=Sınıflandırma "Faturalanmadı" +StatusInterInvoiced=Faturalanmış RelatedInterventions=İlgili müdahaleler ShowIntervention=Müdahale göster +SendInterventionRef=%s müdahalesinin sunulması ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Müdahale izleme temsilcisi TypeContact_fichinter_internal_INTERVENING=Müdahalede diff --git a/htdocs/langs/tr_TR/link.lang b/htdocs/langs/tr_TR/link.lang index 8b1efb75ef3..fbc4b921387 100644 --- a/htdocs/langs/tr_TR/link.lang +++ b/htdocs/langs/tr_TR/link.lang @@ -1,8 +1,8 @@ -LinkANewFile=Link a new file/document -LinkedFiles=Linked files and documents -NoLinkFound=No registered links -LinkComplete=The file has been linked successfully +LinkANewFile=Yeni bir dosya/belge bağlantıla +LinkedFiles=Bağlantılı dosyalar ve belgeler +NoLinkFound=Kayıtlı bağlantı yok +LinkComplete=Dosya bağlantısı başarılı ErrorFileNotLinked=The file could not be linked -LinkRemoved=The link %s has been removed -ErrorFailedToDeleteLink= Failed to remove link '%s' -ErrorFailedToUpdateLink= Failed to update link '%s' +LinkRemoved=Bağlantı %s kaldırıldı +ErrorFailedToDeleteLink= Bu bağlantı kaldırılamadı '%s' +ErrorFailedToUpdateLink= Bu bağlantı güncellemesi yapılamadı '%s' diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index 5982b0f04da..622075d57f9 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -345,8 +345,8 @@ Ref=Ref. RefSupplier=Ref. tedarikçi RefPayment=Ref. ödeme CommercialProposalsShort=Teklifler -Comment=Yorum -Comments=Yorumlar +Comment=Açıklama +Comments=Açıklamalar ActionsToDo=Yapılacak eylemler ActionsDone=Biten eylemler ActionsToDoShort=Yapılacaklar @@ -645,6 +645,7 @@ OptionalFieldsSetup=Ekstra öznitelik ayarları URLPhoto=Fotoğraf/logo İnternet adresi SetLinkToThirdParty=Başka bir üçüncü parti bağlantısı CreateDraft=Taslak oluştur +SetToDraft=Taslağa geri dön ClickToEdit=Düzenlemek için tıklayın ObjectDeleted=Nesne %s silindi ByCountry=Ülkeye göre @@ -672,12 +673,12 @@ HelpCopyToClipboard=Panoya kopyalamak için Crtl+C SaveUploadedFileWithMask=Dosyayı sunucuya "%s" (aksi durumda "%s") adıyla kaydedin OriginFileName=Özgün dosya adı SetDemandReason=Kaynağı ayarlayın -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Banka Hesabı Tanımla +AccountCurrency=Hesap Para Birimi ViewPrivateNote=Notları izle XMoreLines=%s gizli satır(lar) PublicUrl=Genel URL -AddBox=Add box +AddBox=Kutu ekle # Week day Monday=Pazartesi diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang index a982292a7a8..2085c26d3d1 100644 --- a/htdocs/langs/tr_TR/orders.lang +++ b/htdocs/langs/tr_TR/orders.lang @@ -94,7 +94,7 @@ ConfirmCancelOrder=Bu siparişi iptal etmek istediğinizden emin misiniz? ConfirmMakeOrder=Bu siparişi %s üzerine yaptığınızı onaylamak istediğinizden emin misiniz? GenerateBill=Fatura oluştur ClassifyShipped=Teslim edildi sınıflandır -ClassifyBilled=Faturalandı sınıflandır +ClassifyBilled=Faturalı olarak sınıflandır ComptaCard=Muhasebe kartı DraftOrders=Taslak sipariş RelatedOrders=İlgili siparişler @@ -137,7 +137,7 @@ OrderSource1=Internet OrderSource2=Posta kampanyası OrderSource3=Telefon kampanyası OrderSource4=Faks kampanyası -OrderSource5=Reklam +OrderSource5=Ticari OrderSource6=Mağaza QtyOrdered=Sipariş miktarı AddDeliveryCostLine=Siparişin ağırlığını belirten bir teslimat satırı ekleyin diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang index ac878191a7f..d0d2a5d3b2c 100644 --- a/htdocs/langs/tr_TR/other.lang +++ b/htdocs/langs/tr_TR/other.lang @@ -59,12 +59,12 @@ PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayr PredefinedMailTestHtml=Bu bir deneme postası (deneme sözcüğü koyu olmalı).
İki satır enter tuşu ile ayrılmıştır. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz buradadır __PROPREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ -PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nSevkiyatınız bilgilerinize sunulmuştur __SHIPPINGREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nMüdahale bilgilerinize sunulmuştur __FICHINTERREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n__PERSONALIZED__\n__SIGNATURE__ DemoDesc=Dolibarr birçok fonksiyonel modülden oluşan derlitoplu bir ERP/CRM programıdır. Bu durumda tüm modülleri içeren bir demo asla hiçbir şey demek değildir. Yani, birçok demo profili vardır. ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin... @@ -80,6 +80,16 @@ ModifiedBy=%s tarafından düzenlendi ValidatedBy=%s tarafından onaylandı CanceledBy=%s tarafından iptal edildi ClosedBy=%s tarafından kapatıldı +CreatedById=Oluşturanın kullanıcı kimliği +ModifiedById=Son değişikliği yapan kullanıcı kimliği +ValidatedById=Doğrulayanın kullanıcı kimliği +CanceledById=İptal edenin kullanıcı kimliği +ClosedById=Kapatanın kullanıcı kimliği +CreatedByLogin=Oluşturanın kullanıcı adı +ModifiedByLogin=Son değişikliği yapanın kullanıcı adı +ValidatedByLogin=Doğrulayanın kullanıcı adı +CanceledByLogin=İptal edenin kullanıcı adı +ClosedByLogin=Kapatanın kullanıcı adı FileWasRemoved=%s dosyası kaldırıldı DirWasRemoved=%s dizini kaldırıldı FeatureNotYetAvailableShort=Gelecek sürümde olacaktır diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang index 446eee8aba2..a16fca7fd9e 100644 --- a/htdocs/langs/tr_TR/products.lang +++ b/htdocs/langs/tr_TR/products.lang @@ -80,12 +80,12 @@ ContractStatusClosed=Kapalı ContractStatusRunning=Yürürlükte ContractStatusExpired=süresi doldu ContractStatusOnHold=Yürürlükte değil -ContractStatusToRun=To get running +ContractStatusToRun=Yürülüğe alınacak ContractNotRunning=Bu sözleşme çalışmıyor ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var. ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer. ErrorProductClone=Ürün ya da hizmetin klonlanmasına çalışılırken bir sorun oluştu. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorPriceCantBeLowerThanMinPrice=Hata! Fiyat Enaz Fiyattan düşük olamaz Suppliers=Tedarikçiler SupplierRef=Tedarikçi ürün ref. ShowProduct=Ürün Göster @@ -238,7 +238,7 @@ PriceByCustomer=Müşteri fiyatı PriceCatalogue=Ürün/Servis için birim fiyat PricingRule=Fiyatlandırma yetkileri AddCustomerPrice=Müşteriler için fiyat ekle -ForceUpdateChildPriceSoc=Set same price on customer subsidiaries +ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula PriceByCustomerLog=Müşteri fiyat günlüğü -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s +MinimumRecommendedPrice=Önerilen enaz fiyat: %s diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang index 8682cdc2452..d06f3c3525b 100644 --- a/htdocs/langs/tr_TR/propal.lang +++ b/htdocs/langs/tr_TR/propal.lang @@ -37,7 +37,7 @@ PropalStatusDraft=Taslak (doğrulanması gerekir) PropalStatusValidated=Onaylı (teklif açık) PropalStatusOpened=Onaylı (teklif açık) PropalStatusClosed=Kapalı -PropalStatusSigned=İmzalanmış(faturalanması gerekiyor) +PropalStatusSigned=İmzalı(faturalanacak) PropalStatusNotSigned=İmzalanmamış (kapalı) PropalStatusBilled=Faturalanmış PropalStatusDraftShort=Taslak @@ -48,7 +48,7 @@ PropalStatusSignedShort=İmzalı PropalStatusNotSignedShort=İmzalanmamış PropalStatusBilledShort=Faturalanmış PropalsToClose=Kapatılacak teklifler -PropalsToBill=Faturalandırılacak imzalı teklifler +PropalsToBill=Faturalanacak imzalı teklifler ListOfProposals=Teklif listesi ActionsOnPropal=Tekliler için yapılan eylemler NoOpenedPropals=Açık teklif yok diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang index 848deb6d150..61c1db446e8 100644 --- a/htdocs/langs/tr_TR/salaries.lang +++ b/htdocs/langs/tr_TR/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Ücret ödemeleri muhasebe kodu +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Mali yükümlülük için muhasebe kodu Salary=Ücret Salaries=Ücretler Employee=Çalışan @@ -6,3 +8,5 @@ NewSalaryPayment=Yeni ücret ödemesi SalaryPayment=Ücret ödemesi SalariesPayments=Ücret ödemeleri ShowSalaryPayment=Ücret ödemesi göster +THM=Ortalama saat ücreti +TJM=Ortalama günlük ücret diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang index 4398ed92213..4c883321878 100644 --- a/htdocs/langs/tr_TR/sendings.lang +++ b/htdocs/langs/tr_TR/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=İstatistikler yalnızca doğrulanmış sevkiyatla DateDeliveryPlanned=Planlanan teslim tarihi DateReceived=Teslim alınan tarih SendShippingByEMail=Sevkiyatı EPostayla gönder -SendShippingRef=%s sevkiyatını gönder +SendShippingRef=% Nakliyatının yapılması ActionsOnShipping=Sevkiyat eylemleri LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır. diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang index 85fccc85f84..74cba2a10c6 100644 --- a/htdocs/langs/tr_TR/stocks.lang +++ b/htdocs/langs/tr_TR/stocks.lang @@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Sipariş henüz yoksa veya stok deposundan gönder StockDiffPhysicTeoric=Fiziksel ve teorik stok arasındaki stok farkı NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyok. Yani stoktan sevk gerekli değildir. DispatchVerb=Dağıtım -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=Uyarı sınırı +StockLimit=Stok sınırı uyarısı PhysicalStock=Fiziksel stok RealStock=Gerçek Stok VirtualStock=Sanal stok diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang index 8904b0aa553..bd709af9859 100644 --- a/htdocs/langs/tr_TR/trips.lang +++ b/htdocs/langs/tr_TR/trips.lang @@ -19,4 +19,4 @@ TF_TRIP=Gezi ListTripsAndExpenses=Geziler ve giderler listesi ExpensesArea=Geziler ve giderler alanı SearchATripAndExpense=Bir gezi ve gider ara -ClassifyRefunded=Classify 'Refunded' +ClassifyRefunded=Sınıflandırma 'İade edildi' diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang index 2c38dcba787..50ee7de07b3 100644 --- a/htdocs/langs/tr_TR/users.lang +++ b/htdocs/langs/tr_TR/users.lang @@ -15,7 +15,7 @@ AvailableRights=Varolan izinler OwnedRights=Sahip olunan izinler GroupRights=Grup izinleri UserRights=Kullanıcı izinleri -UserGUISetup=Kullanıcı ekranı kurulumu +UserGUISetup=Kullanıcı ekranı ayarları DisableUser=Engelle DisableAUser=Bir kullanıcıyı engelle DeleteUser=Sil @@ -87,7 +87,7 @@ MyInformations=Verilerim ExportDataset_user_1=Dolibarr kullanıcıları ve özellikleri DomainUser=Etki alanı kullanıcısı %s Reactivate=Yeniden etkinleştir -CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +CreateInternalUserDesc=Bu form firmanız/kurumunuz içinde kullanıcı oluşturmanızı sağlar. Dış kullanıcı (müşteri, tedarikçi,...) oluşturmak için üçüncü parti kişi kartlarından 'Dolibarr Kullanıcısı Oluştur' dğmesini kullan. InternalExternalDesc=Bir iç kullanıcı firmanızın/derneğinizin bir parçasıdır.
Birdış kullanıcı bir müşteri, tedarikçi veya bir başkasıdır.

Her iki durumda da, izinler Dolibarr’daki hakları tanımlar, aynı zamanda dış kullanıcı iç kullanıcıdan farklı bir menü yöeticisine sahiptir (Giriş->Kurulum->Görünüm’e bakın) PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti. Inherited=İntikal eden @@ -114,8 +114,9 @@ YourRole=Sizin rolünüz YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı! NbOfUsers=Kullanıcı sayısı DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir -HierarchicalResponsible=Sorumlu sıradüzeni +HierarchicalResponsible=Yönetici HierarchicView=Sıradüzeni görünümü UseTypeFieldToChange=Değiştirmek için Alan türünü kullan OpenIDURL=OpenID URL LoginUsingOpenID=Giriş için OpenID kullan +WeeklyHours=Haftalık saatler From 69475b7bf8debd1224b918293bb8450078743ff0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Oct 2014 12:49:30 +0200 Subject: [PATCH 0160/1190] Sync from transifex. Fix var not initialized. --- htdocs/comm/action/class/ical.class.php | 19 +-- htdocs/langs/ar_SA/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/bg_BG/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/bs_BA/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ca_ES/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/cs_CZ/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/da_DK/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/de_DE/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/el_GR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/et_EE/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/eu_ES/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/fa_IR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/fi_FI/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/he_IL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/hr_HR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/hu_HU/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/id_ID/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/is_IS/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/it_IT/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ja_JP/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ko_KR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/lt_LT/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/lv_LV/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/mk_MK/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/nb_NO/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/nl_NL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/pl_PL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/pt_PT/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ro_RO/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ru_RU/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sk_SK/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sl_SI/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sq_AL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sv_SE/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/th_TH/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/tr_TR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/uk_UA/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/vi_VN/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/zh_CN/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/zh_TW/accountancy.lang | 158 ++++++++++++++++++++++++ 40 files changed, 6173 insertions(+), 8 deletions(-) create mode 100644 htdocs/langs/ar_SA/accountancy.lang create mode 100644 htdocs/langs/bg_BG/accountancy.lang create mode 100644 htdocs/langs/bs_BA/accountancy.lang create mode 100644 htdocs/langs/ca_ES/accountancy.lang create mode 100644 htdocs/langs/cs_CZ/accountancy.lang create mode 100644 htdocs/langs/da_DK/accountancy.lang create mode 100644 htdocs/langs/de_DE/accountancy.lang create mode 100644 htdocs/langs/el_GR/accountancy.lang create mode 100644 htdocs/langs/et_EE/accountancy.lang create mode 100644 htdocs/langs/eu_ES/accountancy.lang create mode 100644 htdocs/langs/fa_IR/accountancy.lang create mode 100644 htdocs/langs/fi_FI/accountancy.lang create mode 100644 htdocs/langs/he_IL/accountancy.lang create mode 100644 htdocs/langs/hr_HR/accountancy.lang create mode 100644 htdocs/langs/hu_HU/accountancy.lang create mode 100644 htdocs/langs/id_ID/accountancy.lang create mode 100644 htdocs/langs/is_IS/accountancy.lang create mode 100644 htdocs/langs/it_IT/accountancy.lang create mode 100644 htdocs/langs/ja_JP/accountancy.lang create mode 100644 htdocs/langs/ko_KR/accountancy.lang create mode 100644 htdocs/langs/lt_LT/accountancy.lang create mode 100644 htdocs/langs/lv_LV/accountancy.lang create mode 100644 htdocs/langs/mk_MK/accountancy.lang create mode 100644 htdocs/langs/nb_NO/accountancy.lang create mode 100644 htdocs/langs/nl_NL/accountancy.lang create mode 100644 htdocs/langs/pl_PL/accountancy.lang create mode 100644 htdocs/langs/pt_PT/accountancy.lang create mode 100644 htdocs/langs/ro_RO/accountancy.lang create mode 100644 htdocs/langs/ru_RU/accountancy.lang create mode 100644 htdocs/langs/sk_SK/accountancy.lang create mode 100644 htdocs/langs/sl_SI/accountancy.lang create mode 100644 htdocs/langs/sq_AL/accountancy.lang create mode 100644 htdocs/langs/sv_SE/accountancy.lang create mode 100644 htdocs/langs/th_TH/accountancy.lang create mode 100644 htdocs/langs/tr_TR/accountancy.lang create mode 100644 htdocs/langs/uk_UA/accountancy.lang create mode 100644 htdocs/langs/vi_VN/accountancy.lang create mode 100644 htdocs/langs/zh_CN/accountancy.lang create mode 100644 htdocs/langs/zh_TW/accountancy.lang diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 717d7269fa2..2dd6ea2b125 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -1,8 +1,8 @@ - * Copyright (C) 2011 Juanjo Menent - * Copyright (C) 2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin +/* Copyright (C) 2006 Roman Ozana + * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2013-2014 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -261,6 +261,7 @@ class ICal */ function ical_rrule($value) { + $result=aray(); $rrule = explode(';',$value); foreach ($rrule as $line) { @@ -299,6 +300,7 @@ class ICal */ function ical_dt_date($key, $value) { + $return_value=array(); $value = $this->ical_date_to_unix($value); // Analyse TZID @@ -309,8 +311,8 @@ class ICal $value = str_replace('T', '', $value); return array($key,$value); } - // adding $value and $tzid - $key = $temp[0]; + + $key = $temp[0]; $temp = explode("=", $temp[1]); $return_value[$temp[0]] = $temp[1]; $return_value['unixtime'] = $value; @@ -330,8 +332,9 @@ class ICal { usort($temp, array(&$this, "ical_dtstart_compare")); return $temp; - } else - { + } + else + { return false; } } diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ar_SA/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/bg_BG/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/bs_BA/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ca_ES/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/cs_CZ/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/da_DK/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang new file mode 100644 index 00000000000..f7b40ac7301 --- /dev/null +++ b/htdocs/langs/de_DE/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Buchhaltung +Globalparameters=Globale Parameter +Chartofaccounts=Kontenplan +Fiscalyear=Fiskalische Jahre +Menuaccount=Buchhaltung Konten +Menuthirdpartyaccount=Partner Konten +MenuTools=Werkzeuge + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journale +JournalFinancial=Finanz-Journale +Exports=Exports +Modelcsv=Exportmodell +Selectmodelcsv=Wählen Sie ein Exportmodell +Modelcsv_normal=Klassischer Export +Modelcsv_CEGID=Export zu CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Rückkehr + +Definechartofaccounts=Kontenplan definieren +Selectchartofaccounts=Kontenplan wählen +Validate=Freigeben +Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu +AccountAccounting=Buchhaltungs Konto +Ventilation=Erörterung +ToDispatch=Zu versenden +Dispatched=Versendet + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Handelsspanne +Reports=Berichte +ByCustomerInvoice=Nach Kundenrechnungen +ByMonth=Nach Monat +NewAccount=Neues Buchhaltungskonto +Update=Aktualisieren +List=Liste +Create=Erstelle +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=Hauptbuch +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Zeile + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=erörtern +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Gewählte Zeilen +Lineofinvoice=Rechnungszeile +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Verkaufsjournal +ACCOUNTINGEX_PURCHASE_JOURNAL=Einkaufsjournal +ACCOUNTINGEX_BANK_JOURNAL=Bankauszug +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Dokumententyp +Docdate=Datum +Docref=Referenz +Numerocompte=Konto +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Soll +Credit=Haben +Amount=Betrag +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Verkaufsjournal +PurchasesJournal=Einkaufsjournal +DescSellsJournal=Verkaufsjournal +DescPurchasesJournal=Einkaufsjournal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Barzahlung + +SupplierInvoicePayment=Rechnungszahlung (Lieferant) +CustomerInvoicePayment=Rechnungszahlung (Kunde) + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=Neue Änderung +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version des Plans +Pcgtype=Kontenklasse +Pcgsubtype=Unterkontenklasse +Accountparent=Root of the account +Active=Auszug + +NewFiscalYear=Neues fiskalisches Jahr + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Gesamt-Spanne +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Automatisch geltend machen + +ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nicht löschen, da es benutzt wird. + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang new file mode 100644 index 00000000000..9ab9b394682 --- /dev/null +++ b/htdocs/langs/el_GR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Λογιστική +Globalparameters=Global parameters +Chartofaccounts=Διάγραμμα των λογαριασμών +Fiscalyear=Οικονομικά έτη +Menuaccount=Λογαριασμοί Λογιστικής +Menuthirdpartyaccount=Λογαριασμοί Πελ./Προμ. +MenuTools=Εργαλεία + +ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert +Journaux=Ημερολόγια +JournalFinancial=Financial journals +Exports=Εξαγωγές +Modelcsv=Πρότυπο εξαγωγής +Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή +Modelcsv_normal=Κλασική εξαγωγή +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών +Back=Επιστροφή + +Definechartofaccounts=Ορίστε ένα διάγραμμα των λογαριασμών +Selectchartofaccounts=Επιλέξτε ένα διάγραμμα των λογαριασμών +Validate=Επικύρωση +Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό +AccountAccounting=Λογιστική λογαριασμού +Ventilation=Ventilation +ToDispatch=Για την αποστολή +Dispatched=Αποστέλλονται + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Εμπορικό Περιθώριο +Reports=Αναφορές +ByCustomerInvoice=Με τιμολόγια πελατών +ByMonth=Μέχρι το μήνα +NewAccount=Νέος λογιστικός λογαριασμός +Update=Ενημέρωση +List=Λίστα +Create=Δημιουργία +UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=Γενικό Καθολικό +AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Γραμμή + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Επεξεργασία +EndProcessing=Τέλος της επεξεργασίας +AnyLineVentilate=Any lines to ventilate +SelectedLines=Επιλεγμένες γραμμές +Lineofinvoice=Γραμμή τιμολογίου +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Διαχωριστικό CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Λογαριασμός σε αναμονή + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Τύπος εγγράφου +Docdate=Ημερομηνία +Docref=Παραπομπή +Numerocompte=Λογαριασμός +Code_tiers=Πελ./Προμ. +Labelcompte=Ετικέτα λογαριασμού +Debit=Χρέωση +Credit=Πίστωση +Amount=Σύνολο +Sens=Sens +Codejournal=Ημερολόγιο + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/et_EE/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/eu_ES/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/fa_IR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/fi_FI/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/he_IL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/hr_HR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/hu_HU/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/id_ID/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/is_IS/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang new file mode 100644 index 00000000000..3c1337696d8 --- /dev/null +++ b/htdocs/langs/it_IT/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Contabilità avanzata +Globalparameters=Parametri globali +Chartofaccounts=Lista degli account +Fiscalyear=Anni fiscali +Menuaccount=Account contabilità +Menuthirdpartyaccount=Account terze parti +MenuTools=Strumenti + +ConfigAccountingExpert=Configurazione del modulo contabilità esperta +Journaux=Giornali +JournalFinancial=Giornali finanziari +Exports=Esportazioni +Modelcsv=Modello di esportazione +Selectmodelcsv=Seleziona un modello di esportazione +Modelcsv_normal=Esportazione classica +Modelcsv_CEGID=Esporta tramite CEGID Esperto +BackToChartofaccounts=Ritorna alla lista dell'account +Back=Indietro + +Definechartofaccounts=Definisci una lista degli account +Selectchartofaccounts=Seleziona una lista degli account +Validate=Convalida +Addanaccount=Aggiungi un account di contabilità +AccountAccounting=Account di contabilità +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Report +ByCustomerInvoice=Per fatture clienti +ByMonth=Per mese +NewAccount=Nuovo account di contabilità +Update=Aggiorna +List=Elenco +Create=Crea +UpdateAccount=Modifica di un account di contabilità +UpdateMvts=Modifica di un movimento +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Data +Docref=Riferimento +Numerocompte=Account +Code_tiers=Terza parte +Labelcompte=Etichetta account +Debit=Debito +Credit=Credito +Amount=Importo +Sens=Sens +Codejournal=Giornale + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Giornale di vendita +PurchasesJournal=Giornale acquisti +DescSellsJournal=Giornale di vendita +DescPurchasesJournal=Giornale acquisti +BankJournal=Giornale bancario +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ja_JP/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ko_KR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/lt_LT/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang new file mode 100644 index 00000000000..cbe133b742f --- /dev/null +++ b/htdocs/langs/lv_LV/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Globālie iestatījumi +Chartofaccounts=Chart of accounts +Fiscalyear=Fiskālie gadi +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Trešo personu komti +MenuTools=Rīki + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Žurnāli +JournalFinancial=Financial journals +Exports=Eksports +Modelcsv=Eksporta modulis +Selectmodelcsv=Select a model of export +Modelcsv_normal=Klasiskais eksports +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=Jānosūta +Dispatched=Nosūtīts + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Atskaites +ByCustomerInvoice=By invoices customers +ByMonth=Šķirot pēc mēneša +NewAccount=New accounting account +Update=Atjaunot +List=Saraksts +Create=Izveidot +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=Virsgrāmata +AccountBalanceByMonth=Konta bilance pa mēnešiem + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Apstrādā +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Pārdošanas žurnāls +ACCOUNTINGEX_PURCHASE_JOURNAL=Pirkumu žurnāls +ACCOUNTINGEX_BANK_JOURNAL=Bankas žurnāls +ACCOUNTINGEX_CASH_JOURNAL=Skaidras naudas žurnāls +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Dokumenta veids +Docdate=Datums +Docref=Atsauce +Numerocompte=Konts +Code_tiers=Trešās personas +Labelcompte=Konta nosaukums +Debit=Debets +Credit=Kredīts +Amount=Apjoms +Sens=Sens +Codejournal=Žurnāls + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Pārdošanas žurnāls +PurchasesJournal=Iepirkumu žurnāls +DescSellsJournal=Pārdošanas žurnāls +DescPurchasesJournal=Pirkumu žurnāls +BankJournal=Bankas žurnāls +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Skaidras naudas žurnāls +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Trešās personas konts + +NewAccountingMvt=Jauna pārvietošana +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Plāna versija +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=Jaauns fiskālais gads + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/mk_MK/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/nb_NO/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/nl_NL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/pl_PL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/pt_PT/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ro_RO/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ru_RU/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sk_SK/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sl_SI/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sq_AL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sv_SE/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/th_TH/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang new file mode 100644 index 00000000000..5ea1eb67478 --- /dev/null +++ b/htdocs/langs/tr_TR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Muhasebe +Globalparameters=Genel parametreler +Chartofaccounts=Hesap planı +Fiscalyear=Mali yıllar +Menuaccount=Muhasebe hesapları +Menuthirdpartyaccount=Üçüncü parti hesapları +MenuTools=Araçlar + +ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması +Journaux=Günlükler +JournalFinancial=Mali günlükler +Exports=Dışaaktarımlar +Modelcsv=Dışaaktarım modeli +Selectmodelcsv=Bir dışaaktarım modeli seç +Modelcsv_normal=Klasik dışaaktarım +Modelcsv_CEGID=CEGID Uzmanına yönelik dışaaktarım +BackToChartofaccounts=Hesap planı geliri +Back=Gelir + +Definechartofaccounts=Hesap planı tanımla +Selectchartofaccounts=Hesap planı seç +Validate=Doğrula +Addanaccount=Muhasebe hesabı ekle +AccountAccounting=Muhasebe hesabı +Ventilation=Ventilation +ToDispatch=Gönderilecek +Dispatched=Gönderilmiş + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Ticaret marjı +Reports=Raporlar +ByCustomerInvoice=Müşteri faturalarına göre +ByMonth=Aya göre +NewAccount=Yeni muhasebe hesabı +Update=Güncelle +List=Liste +Create=Oluştur +UpdateAccount=Bir muhasebe hesabının değiştirilmesi +UpdateMvts=Bir hareketin değiştirilmesi +WriteBookKeeping=Büyük defter hesap kayıtları +Bookkeeping=Büyük Defter +AccountBalanceByMonth=Aylık hesap bakiyesi + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Satır + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=Muhasebe hesabında + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=İşleme +EndProcessing=İşleme sonu +AnyLineVentilate=Any lines to ventilate +SelectedLines=Seçilen satırlar +Lineofinvoice=Fatura satırı +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=CSV ayırıcısı + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Dolibarr'da gösterilen muhasebe hesapları uzunluğu +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Genel hesapların uzunluğu +ACCOUNTINGEX_LENGTH_AACCOUNT=Üçüncü parti hesapları uzunluğu + +ACCOUNTINGEX_SELL_JOURNAL=Satış günlüğü +ACCOUNTINGEX_PURCHASE_JOURNAL=Satınalma günlüğü +ACCOUNTINGEX_BANK_JOURNAL=Banka günlüğü +ACCOUNTINGEX_CASH_JOURNAL=Kasa günlüğü +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Çeşitli günlük +ACCOUNTINGEX_SOCIAL_JOURNAL=Sosyal günlük + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Aktarım hesabı +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Bekleme hesabı + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Belge türü +Docdate=Tarih +Docref=Referans +Numerocompte=Hesap +Code_tiers=Üçüncü parti +Labelcompte=Hesap etiketi +Debit=Borç +Credit=Alacak +Amount=Tutar +Sens=Sens (borsa haberleri yayınlama günlüğü) +Codejournal=Günlük + +DelBookKeeping=Büyük defter kayıtlarını sil + +SellsJournal=Satış günlüğü +PurchasesJournal=Satınalma günlüğü +DescSellsJournal=Satış günlüğü +DescPurchasesJournal=Satınalma günlüğü +BankJournal=Banka günlüğü +DescBankJournal=Nakitten dışında her türlü ödemeyi içeren banka günlüğü +CashJournal=Kasa günlüğü +DescCashJournal=Nakit ödeme türünü içeren kasa günlüğü + +CashPayment=Nakit ödeme + +SupplierInvoicePayment=Tedarikçi faturası ödemesi +CustomerInvoicePayment=Müşteri faturası ödemesi + +ThirdPartyAccount=Üçüncü parti hesabı + +NewAccountingMvt=Yeni hareket +NumMvts=Hareket sayısı +ListeMvts=Hareket listesi +ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz + +ReportThirdParty=Üçüncü parti hesabını listele +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=Muhasebe hesapları listesi + +Pcgversion=Plan sürümü +Pcgtype=Hesap sınıfı +Pcgsubtype=Hesap sınıfı altında +Accountparent=Hesabın kökü +Active=Hesap özeti + +NewFiscalYear=Yeni mali yıl + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Toplam ciro HT +TotalMarge=Toplam satışlar oranı +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Burada tedarikçi faturaları ve muhasebe hesapları satırları listesine başvurun + +ValidateHistory=Otomatikman doğrula + +ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz + +FicheVentilation=Havalandırma kartı diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/uk_UA/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/vi_VN/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang new file mode 100644 index 00000000000..27a516d5a4f --- /dev/null +++ b/htdocs/langs/zh_CN/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=会计 +Globalparameters=全局参数 +Chartofaccounts=科目表 +Fiscalyear=财年 +Menuaccount=会计账目 +Menuthirdpartyaccount=第三方帐户 +MenuTools=工具 + +ConfigAccountingExpert=配置"会计专家模块" +Journaux=日记帐 +JournalFinancial=财经杂志 +Exports=出口 +Modelcsv=出口型号 +Selectmodelcsv=选择一个“导出模型” +Modelcsv_normal=典型的导出 +Modelcsv_CEGID=出口对Cegid的专家 +BackToChartofaccounts=返回科目表 +Back=返回 + +Definechartofaccounts=定义会计科目表 +Selectchartofaccounts=选择会计科目表 +Validate=验证 +Addanaccount=添加一个会计帐户 +AccountAccounting=会计账户 +Ventilation=通风 +ToDispatch=派遣 +Dispatched=调度 + +CustomersVentilation=通风客户 +SuppliersVentilation=通风系统供应商 +TradeMargin=贸易保证金 +Reports=报告 +ByCustomerInvoice=依据”发票“的客户 +ByMonth=按月份 +NewAccount=”新建“会计账户 +Update=更新 +List=名单 +Create=创建 +UpdateAccount=修改”会计帐户“ +UpdateMvts=对一个”活动“进行修改 +WriteBookKeeping=在”总账“中的”账户记录“ +Bookkeeping=总帐 +AccountBalanceByMonth=”账户余额“按月份 + +AccountingVentilation=会计通风 +AccountingVentilationSupplier=会计通风的供应商 +AccountingVentilationCustomer=会计通风客户 +Line=线 + +CAHTF=总采购供应商HT +InvoiceLines=发票行进行通风 +InvoiceLinesDone=发票通风线 +IntoAccount=在会计帐户 + +Ventilate=通风 +VentilationAuto=自动通风 + +Processing=处理 +EndProcessing=处理的结束 +AnyLineVentilate=任何行通风 +SelectedLines=选系 +Lineofinvoice=发票行 +VentilatedinAccount=在会计账户成功通风 +NotVentilatedinAccount=不通风的会计账户 + +ACCOUNTINGEX_SEPARATORCSV=CSV的”分隔符“ + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=待显示的一个页面的元素个数（最大推荐：50） +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=由最近的元素开始通气“有通风”页面的排序 +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=由最近的元素开始的通风“通风”的页面排序 + +AccountLength=会计长度账户显示在的Dolibarr +AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。 +ACCOUNTINGEX_LENGTH_GACCOUNT=一般账户的长度 +ACCOUNTINGEX_LENGTH_AACCOUNT=第三方账户的长度 + +ACCOUNTINGEX_SELL_JOURNAL=卖杂志 +ACCOUNTINGEX_PURCHASE_JOURNAL=购买杂志 +ACCOUNTINGEX_BANK_JOURNAL=银行的”日记账“ +ACCOUNTINGEX_CASH_JOURNAL=现金的”日记账“ +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=其他的”日记帐“ +ACCOUNTINGEX_SOCIAL_JOURNAL=社交的”日记帐“ + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=转让帐户 +ACCOUNTINGEX_ACCOUNT_SUSPENSE=等待的帐户 + +COMPTA_PRODUCT_BUY_ACCOUNT=会计帐户默认情况下，购买的产品（如果在产品表没有定义） +COMPTA_PRODUCT_SOLD_ACCOUNT=会计帐户默认为销售的产品（如果在产品表没有定义） +COMPTA_SERVICE_BUY_ACCOUNT=会计帐户默认情况下，该买的服务（如果服务表没有定义） +COMPTA_SERVICE_SOLD_ACCOUNT=会计帐户默认为卖服务（如果服务表没有定义） + +Doctype=文件类型 +Docdate=日期 +Docref=参考 +Numerocompte=帐户 +Code_tiers=第三方 +Labelcompte=标签帐户 +Debit=借记卡 +Credit=信用 +Amount=金额 +Sens=SENS +Codejournal=日记帐 + +DelBookKeeping=删除总帐的记录 + +SellsJournal=出售的”日记帐“ +PurchasesJournal=购买的”日记帐“ +DescSellsJournal=出售的”日记帐“ +DescPurchasesJournal=购买的”日记帐“ +BankJournal=银行日记账 +DescBankJournal=银行日记账，包括支付现金以外的所有类型 +CashJournal=现金日记账 +DescCashJournal=现金日记账，包括支付现金的类型 + +CashPayment=现金付款 + +SupplierInvoicePayment=付款发票的供应商 +CustomerInvoicePayment=付款发票的客户 + +ThirdPartyAccount=第三方账户 + +NewAccountingMvt=创建新的活动 +NumMvts=移动号码 +ListeMvts=”活动“的列表 +ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值 + +ReportThirdParty=列出第三方账户 +DescThirdPartyReport=在这里请教第三方客户及供应商，其会计账目清单 + +ListAccounts=会计账目清单 + +Pcgversion=该计划的版本 +Pcgtype=账户类 +Pcgsubtype=在类账户 +Accountparent=该帐户的根 +Active=声明 + +NewFiscalYear=新财年 + +DescVentilCustomer=在这里，请咨询您的发票客户的年度会计通风 +TotalVente=总成交量HT +TotalMarge=总销售利润率 +DescVentilDoneCustomer=这里查阅发票的客户的行和其会计帐户的列表 +DescVentilTodoCustomer=与会计帐户通风客户发票行 +ChangeAccount=变化的账户选择行会计帐户： +Vide=- +DescVentilSupplier=在这里，请咨询您的发票供应商的年度会计通风 +DescVentilTodoSupplier=与会计帐户通风发票的供应商的线路 +DescVentilDoneSupplier=在这里请教发票的供应商的线条和其会计帐户列表 + +ValidateHistory=自动验证 + +ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来 + +FicheVentilation=通风卡 diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/zh_TW/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card From 97eec37f1c21e152b31a275a74a3b96b77cd90f4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Oct 2014 17:20:17 +0200 Subject: [PATCH 0161/1190] Uniformize code: property "nom" for thirdparty is aliased into "name" everywhere. --- htdocs/accountancy/customer/list.php | 54 +++++----- htdocs/accountancy/journal/bankjournal.php | 2 +- htdocs/accountancy/journal/cashjournal.php | 6 +- htdocs/accountancy/supplier/list.php | 52 ++++----- .../adherents/class/adherent_type.class.php | 14 +-- htdocs/admin/barcode.php | 2 +- htdocs/barcode/codeinit.php | 2 +- htdocs/comm/contact.php | 4 +- htdocs/comm/index.php | 4 +- htdocs/comm/propal/index.php | 8 +- htdocs/comm/propal/list.php | 6 +- htdocs/comm/prospect/list.php | 4 +- htdocs/comm/prospect/recap-prospect.php | 4 +- htdocs/comm/recap-client.php | 4 +- htdocs/commande/apercu.php | 2 +- htdocs/commande/customer.php | 4 +- htdocs/commande/index.php | 16 +-- htdocs/commande/list.php | 8 +- htdocs/commande/orderstoinvoice.php | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/search.php | 14 +-- htdocs/compta/bank/treso.php | 8 +- htdocs/compta/clients.php | 12 +-- htdocs/compta/dons/class/don.class.php | 43 ++++---- htdocs/compta/facture/fiche-rec.php | 8 +- htdocs/compta/facture/impayees.php | 6 +- htdocs/compta/facture/list.php | 6 +- htdocs/compta/index.php | 28 ++--- htdocs/compta/localtax/clients.php | 21 ++-- htdocs/compta/paiement/card.php | 4 +- .../compta/paiement/class/paiement.class.php | 10 +- htdocs/compta/paiement/list.php | 4 +- .../class/bonprelevement.class.php | 12 +-- .../class/rejetprelevement.class.php | 2 +- htdocs/compta/prelevement/create.php | 4 +- htdocs/compta/prelevement/demandes.php | 4 +- htdocs/compta/prelevement/factures.php | 20 ++-- htdocs/compta/prelevement/fiche-rejet.php | 20 ++-- htdocs/compta/prelevement/index.php | 4 +- htdocs/compta/prelevement/ligne.php | 6 +- htdocs/compta/prelevement/lignes.php | 6 +- htdocs/compta/prelevement/list.php | 4 +- htdocs/compta/recap-compta.php | 4 +- htdocs/compta/resultat/clientfourn.php | 40 +++---- htdocs/compta/sociales/charges.php | 101 ++++++++---------- .../sociales/class/chargesociales.class.php | 24 +++-- htdocs/compta/tva/clients.php | 14 +-- htdocs/contact/class/contact.class.php | 10 +- htdocs/contact/vcard.php | 2 +- htdocs/contrat/index.php | 20 ++-- htdocs/contrat/list.php | 7 +- htdocs/contrat/services.php | 4 +- htdocs/core/boxes/box_actions.php | 12 +-- htdocs/core/boxes/box_clients.php | 4 +- htdocs/core/boxes/box_commandes.php | 4 +- htdocs/core/boxes/box_contracts.php | 4 +- htdocs/core/boxes/box_factures.php | 4 +- htdocs/core/boxes/box_factures_fourn.php | 4 +- htdocs/core/boxes/box_factures_fourn_imp.php | 4 +- htdocs/core/boxes/box_factures_imp.php | 4 +- htdocs/core/boxes/box_ficheinter.php | 4 +- htdocs/core/boxes/box_fournisseurs.php | 4 +- htdocs/core/boxes/box_propales.php | 4 +- htdocs/core/boxes/box_prospect.php | 4 +- htdocs/core/boxes/box_services_contracts.php | 4 +- htdocs/core/boxes/box_services_expired.php | 4 +- htdocs/core/boxes/box_supplier_orders.php | 4 +- htdocs/core/class/html.form.class.php | 30 +++--- htdocs/core/class/html.formcompany.class.php | 20 ++-- htdocs/core/class/infobox.class.php | 3 +- htdocs/core/lib/files.lib.php | 2 +- htdocs/core/lib/functions2.lib.php | 4 +- htdocs/core/lib/pdf.lib.php | 2 +- htdocs/core/lib/tax.lib.php | 2 +- .../barcode/mod_barcode_product_standard.php | 2 +- .../modules/barcode/modules_barcode.class.php | 16 +-- .../doc/doc_generic_order_odt.modules.php | 4 +- .../commande/doc/pdf_einstein.modules.php | 4 +- .../commande/doc/pdf_proforma.modules.php | 4 +- .../contract/doc/pdf_strato.modules.php | 4 +- .../doc/doc_generic_shipment_odt.modules.php | 4 +- .../expedition/doc/pdf_merou.modules.php | 4 +- .../expedition/doc/pdf_rouget.modules.php | 4 +- .../doc/doc_generic_invoice_odt.modules.php | 4 +- .../modules/facture/doc/pdf_crabe.modules.php | 14 +-- .../fichinter/doc/pdf_soleil.modules.php | 4 +- .../livraison/doc/pdf_typhon.modules.php | 4 +- .../modules/mailings/framboise.modules.php | 6 +- .../modules/mailings/thirdparties.modules.php | 4 - .../thirdparties_services_expired.modules.php | 6 +- .../product/mod_codeproduct_elephant.php | 1 + .../product/mod_codeproduct_leopard.php | 1 + .../modules/product/modules_product.class.php | 4 +- .../doc/doc_generic_project_odt.modules.php | 6 +- .../modules/project/mod_project_simple.php | 19 ++-- .../modules/project/mod_project_universal.php | 11 +- .../task/doc/doc_generic_task_odt.modules.php | 2 +- .../modules/project/task/mod_task_simple.php | 19 ++-- .../project/task/mod_task_universal.php | 11 +- .../doc/doc_generic_proposal_odt.modules.php | 4 +- .../modules/propale/doc/pdf_azur.modules.php | 6 +- .../societe/mod_codeclient_elephant.php | 4 +- .../societe/mod_codeclient_leopard.php | 1 + .../modules/societe/mod_codeclient_monkey.php | 5 +- .../societe/mod_codecompta_aquarium.php | 7 +- .../societe/mod_codecompta_panicum.php | 8 +- .../modules/societe/modules_societe.class.php | 2 +- .../pdf/pdf_canelle.modules.php | 4 +- .../interface_20_all_Logevents.class.php | 12 +-- ...terface_50_modAgenda_ActionsAuto.class.php | 4 +- htdocs/ecm/docother.php | 4 +- htdocs/expedition/index.php | 19 ++-- htdocs/expedition/list.php | 8 +- htdocs/fichinter/apercu.php | 2 +- htdocs/fichinter/list.php | 4 +- htdocs/fourn/ajax/getSupplierPrices.php | 5 +- htdocs/fourn/class/fournisseur.class.php | 12 +-- htdocs/fourn/commande/index.php | 12 +-- htdocs/fourn/commande/list.php | 6 +- htdocs/fourn/facture/impayees.php | 8 +- htdocs/fourn/facture/list.php | 6 +- htdocs/fourn/facture/paiement.php | 10 +- htdocs/fourn/index.php | 14 +-- htdocs/fourn/list.php | 4 +- htdocs/fourn/paiement/card.php | 4 +- htdocs/fourn/product/list.php | 8 +- htdocs/holiday/class/holiday.class.php | 12 +-- htdocs/livraison/card.php | 2 +- htdocs/margin/agentMargins.php | 4 +- htdocs/margin/customerMargins.php | 4 +- htdocs/margin/tabs/productMargins.php | 4 +- .../class/opensurveysondage.class.php | 4 +- htdocs/opensurvey/exportcsv.php | 6 +- htdocs/opensurvey/public/studs.php | 10 +- htdocs/opensurvey/results.php | 10 +- htdocs/paybox/lib/paybox.lib.php | 2 +- htdocs/paypal/lib/paypal.lib.php | 2 +- htdocs/product/admin/product.php | 10 +- htdocs/product/stats/commande.php | 4 +- htdocs/product/stats/commande_fournisseur.php | 4 +- htdocs/product/stats/contrat.php | 4 +- htdocs/product/stats/facture.php | 4 +- htdocs/product/stats/facture_fournisseur.php | 4 +- htdocs/product/stats/propal.php | 4 +- htdocs/product/stock/replenishorders.php | 4 +- htdocs/projet/admin/project.php | 4 +- htdocs/projet/index.php | 4 +- htdocs/projet/list.php | 6 +- htdocs/societe/admin/societe.php | 20 ++-- .../canvas/actions_card_common.class.php | 2 +- htdocs/societe/class/address.class.php | 12 +-- htdocs/societe/class/societe.class.php | 2 +- htdocs/societe/notify/index.php | 7 +- htdocs/user/class/usergroup.class.php | 31 +++--- htdocs/user/group/card.php | 20 ++-- htdocs/user/group/index.php | 4 +- htdocs/user/group/ldap.php | 2 +- htdocs/user/group/perms.php | 2 +- htdocs/user/home.php | 4 +- htdocs/user/index.php | 4 +- scripts/user/sync_groups_ldap2dolibarr.php | 11 +- test/phpunit/AdherentTest.php | 28 ++++- 162 files changed, 710 insertions(+), 699 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 0d00a0a9127..3af059cad94 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -3,7 +3,7 @@ * Copyright (C) 2013-2014 Alexandre Spangaro * Copyright (C) 2014 Ari Elbaz (elarifr) * Copyright (C) 2013-2014 Florian Henry - * Copyright (C) 2014 Juanjo Menent + * Copyright (C) 2014 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ */ require '../../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; @@ -64,22 +64,22 @@ if ($action == 'ventil') { $cpt = 0; foreach ( $mesCasesCochees as $maLigneCochee ) { // print '
id selectionnee : '.$monChoix."
"; - $maLigneCourante = split("_", $maLigneCochee); + $maLigneCourante = explode("_", $maLigneCochee); $monId = $maLigneCourante[0]; $monNumLigne = $maLigneCourante[1]; $monCompte = $mesCodesVentilChoisis[$monNumLigne]; - + $sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet"; $sql .= " SET fk_code_ventilation = " . $monCompte; $sql .= " WHERE rowid = " . $monId; - + dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG); if ($db->query($sql)) { print '
' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '
'; } else { print '
' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '
' . $sql . '
'; } - + $cpt ++; } } else { @@ -130,15 +130,15 @@ $result = $db->query($sql); if ($result) { $num_lines = $db->num_rows($result); $i = 0; - + // TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list... print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines); - + print '
' . $langs->trans("DescVentilTodoCustomer") . '
'; - + print '' . "\n"; print ''; - + print '
'.$langs->trans("Type").''; @@ -863,13 +865,14 @@ if ($id > 0) // Ref print '
'.$langs->trans("Ref").''.$object->id.'
'.$langs->trans("Type").''; $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto"); print '
'; print ''; print ''; @@ -149,24 +149,24 @@ if ($result) { print ''; print ''; print ''; - + $facture_static = new Facture($db); $product_static = new Product($db); $form = new Form($db); - + $var = True; while ( $i < min($num_lines, $limit) ) { $objp = $db->fetch_object($result); $var = ! $var; - + // product_type: 0 = service ? 1 = product // if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service // issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB ! $code_sell_notset = ''; - + if (empty($objp->code_sell)) { $code_sell_notset = 'color:red'; - + if (! empty($objp->type)) { if ($objp->type == 1) { $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); @@ -175,7 +175,7 @@ if ($result) { } } else { $code_sell_notset = 'color:blue'; - + if ($objp->type == 1) { $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } else { @@ -183,14 +183,14 @@ if ($result) { } } } - + print ""; - + // Ref facture $facture_static->ref = $objp->facnumber; $facture_static->id = $objp->facid; print ''; - + // Ref produit $product_static->ref = $objp->product_ref; $product_static->id = $objp->product_id; @@ -201,34 +201,34 @@ if ($result) { else print ' '; print ''; - + print ''; print ''; - + print ''; - + print ''; - + // Colonne choix du compte print ''; - + // Colonne choix ligne a ventiler print ''; - + print ''; $i ++; } - + print ''; - + print '
' . $langs->trans("Invoice") . '' . $langs->trans("Ref") . '' . $langs->trans("IntoAccount") . '' . $langs->trans("Ventilate") . '
' . $facture_static->getNomUrl(1) . '' . dol_trunc($objp->product_label, 24) . '' . nl2br(dol_trunc($objp->description, 32)) . ''; print price($objp->total_ht); print ''; print $objp->code_sell; print ''; print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1); print ''; print 'aarowid ? "checked" : "") . '/>'; print '
 
'; print ''; } else { diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index cb308a7e1af..dcd8fca4d41 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -189,7 +189,7 @@ if ($result) { else if ($links[$key]['type'] == 'company') { $societestatic->id = $links[$key]['url_id']; - $societestatic->nom = $links[$key]['label']; + $societestatic->name = $links[$key]['label']; $tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30); $tabtp[$obj->rowid][$compta_soc] += $obj->amount; } diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php index 52cdbb4f616..8af84a9ed58 100644 --- a/htdocs/accountancy/journal/cashjournal.php +++ b/htdocs/accountancy/journal/cashjournal.php @@ -171,7 +171,7 @@ if ($result) { } else if ($links[$key]['type'] == 'company') { $societestatic->id = $links[$key]['url_id']; - $societestatic->nom = $links[$key]['label']; + $societestatic->name = $links[$key]['label']; $tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30); $tabtp[$obj->rowid][$compta_soc] += $obj->amount; } else if ($links[$key]['type'] == 'sc') { @@ -448,14 +448,14 @@ if ($action == 'export_csv') { llxHeader('', $langs->trans("CashJournal"), ''); - $nom = $langs->trans("CashJournal"); + $name = $langs->trans("CashJournal"); $nomlink = ''; $periodlink = ''; $exportlink = ''; $builddate = time(); $description = $langs->trans("DescCashJournal") . '
'; $period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1); - report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => '')); + report_header($name, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => '')); print ''; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index f066821e035..4bf603236db 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2014 Alexandre Spangaro - * Copyright (C) 2014 Ari Elbaz (elarifr) + * Copyright (C) 2014 Ari Elbaz (elarifr) * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2014 Juanjo Menent s * @@ -26,7 +26,7 @@ */ require '../../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; @@ -63,25 +63,25 @@ if ($action == 'ventil') { print '
' . count($_POST["mesCasesCochees"]) . ' ' . $langs->trans("SelectedLines") . '
'; $mesCodesVentilChoisis = $codeventil; $cpt = 0; - + foreach ( $mesCasesCochees as $maLigneCochee ) { // print '
id selectionnee : '.$monChoix."
"; - $maLigneCourante = split("_", $maLigneCochee); + $maLigneCourante = explode("_", $maLigneCochee); $monId = $maLigneCourante[0]; $monNumLigne = $maLigneCourante[1]; $monCompte = $mesCodesVentilChoisis[$monNumLigne]; - + $sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det"; $sql .= " SET fk_code_ventilation = " . $monCompte; $sql .= " WHERE rowid = " . $monId; - + dol_syslog('accountancy/supplier/list.php:: sql=' . $sql); if ($db->query($sql)) { print '
' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '
'; } else { print '
' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '
' . $sql . '
'; } - + $cpt ++; } } else { @@ -133,15 +133,15 @@ $result = $db->query($sql); if ($result) { $num_lines = $db->num_rows($result); $i = 0; - + // TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list... print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines); - + print '

' . $langs->trans("DescVentilTodoSupplier") . '
'; print ''; print ''; @@ -152,22 +152,22 @@ if ($result) { print ''; print ''; print "\n"; - + $facturefourn_static = new FactureFournisseur($db); $productfourn_static = new ProductFournisseur($db); $form = new Form($db); - + $var = True; while ( $i < min($num_lines, $limit) ) { $objp = $db->fetch_object($result); $var = ! $var; print ""; - + // Ref facture $facturefourn_static->ref = $objp->ref; $facturefourn_static->id = $objp->facid; print ''; - + // Ref facture supplier $productfourn_static->ref = $objp->product_ref; $productfourn_static->id = $objp->product_id; @@ -178,23 +178,23 @@ if ($result) { else print ' '; print ''; - + // print ''; - + // print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + // Colonne choix du compte print ''; - + print ""; $i ++; } - + print ''; - + print "
Facture' . $langs->trans("Ref") . '' . $langs->trans("IntoAccount") . '' . $langs->trans("Ventilate") . '
' . $facturefourn_static->getNomUrl(1) . ''.$objp->ref.''.$objp->ref_supplier.'' . dol_trunc($objp->product_label, 24) . '' . stripslashes(nl2br($objp->description)) . ''; print price($objp->price); print ''; print $objp->code_buy; print ''; print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1); @@ -203,15 +203,15 @@ if ($result) { print ''; print 'aarowid ? "checked" : "") . '/>'; print '
 
"; - + print ''; } else { print $db->error(); diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 43a272cf574..2d5f3d835be 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -119,7 +119,7 @@ class AdherentType extends CommonObject if ($result) { $action='update'; - + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('membertypedao')); $parameters=array('membertype'=>$this->id); @@ -151,21 +151,23 @@ class AdherentType extends CommonObject * Fonction qui permet de supprimer le status de l'adherent * * @param int $rowid Id of member type to delete - * @return int >0 if OK, < 0 if KO + * @return int >0 if OK, 0 if not found, < 0 if KO */ - function delete($rowid) + function delete($rowid='') { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid"; + if (empty($rowid)) $rowid=$this->id; + + $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = ".$rowid; $resql=$this->db->query($sql); if ($resql) { - if ( $this->db->affected_rows($resql) ) + if ($this->db->affected_rows($resql)) { return 1; } else - { + { return 0; } } diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 78c99916910..11341f632a2 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -396,7 +396,7 @@ if ($conf->produit->enabled) $var = !$var; print ''; - print ''.$modBarCode->nom."\n"; + print ''.(isset($modBarCode->name)?$modBarCode->name:$modBarCode->nom)."\n"; print $modBarCode->info($langs); print ''; print ''.$modBarCode->getExample($langs)."\n"; diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php index 1484566dbaf..19fb5c193bb 100644 --- a/htdocs/barcode/codeinit.php +++ b/htdocs/barcode/codeinit.php @@ -287,7 +287,7 @@ if ($conf->product->enabled || $conf->product->service) { print $langs->trans("BarCodeNumberManager").": "; $objproduct=new Product($db); - print ''.$modBarCodeProduct->nom.' - '.$langs->trans("NextValue").': '.$modBarCodeProduct->getNextValue($objproduct).'
'; + print ''.(isset($modBarCodeProduct->name)?$modBarCodeProduct->name:$modBarCodeProduct->nom).' - '.$langs->trans("NextValue").': '.$modBarCodeProduct->getNextValue($objproduct).'
'; $disabled=0; } else diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index d4652b57353..a80796fe574 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -72,7 +72,7 @@ if ($type == "f") * */ -$sql = "SELECT s.rowid, s.nom, st.libelle as stcomm"; +$sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm"; $sql.= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone"; $sql.= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,"; @@ -159,7 +159,7 @@ if ($resql) print "$obj->firstname"; print ''.img_object($langs->trans("ShowCompany"),"company").' '; - print "rowid."\">$obj->nom\n"; + print "rowid."\">$obj->name\n"; print ''.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 22068860076..c5347246719 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -444,7 +444,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) { $langs->load("propal"); - $sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv"; + $sql = "SELECT s.nom as name, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."propal as p"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -497,7 +497,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print ""; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).''."\n"; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,44).''."\n"; print ''; print dol_print_date($db->jdate($obj->dp),'day').''."\n"; print ''.price($obj->total_ttc).''; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 8c7f38ed607..de51cf63104 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -381,7 +381,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) /* if (! empty($conf->propal->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid"; $sql.=" FROM ".MAIN_DB_PREFIX."propal as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -433,7 +433,7 @@ if (! empty($conf->propal->enabled)) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; @@ -453,7 +453,7 @@ if (! empty($conf->propal->enabled)) */ /*if (! empty($conf->propal->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -505,7 +505,7 @@ if (! empty($conf->propal->enabled)) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 51c07eaa5b2..6522a592097 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -142,7 +142,7 @@ if (! $sortorder) $sortorder='DESC'; $limit = $conf->liste_limit; -$sql = 'SELECT s.rowid, s.nom, s.town, s.client, s.code_client,'; +$sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,'; $sql.= ' p.rowid as propalid, p.note_private, p.total_ht, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,'; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,"; $sql.= ' u.login'; @@ -246,7 +246,7 @@ if ($result) if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_author) $param.='&search_author='.$search_author; if ($search_town) $param.='&search_town='.$search_town; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); // Lignes des champs de filtre print '
'; @@ -375,7 +375,7 @@ if ($result) // Company $companystatic->id=$objp->rowid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; $companystatic->code_client=$objp->code_client; print ''; diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 7dada3e115f..94286ee4c53 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -178,7 +178,7 @@ if ($action == 'cstc') $formother=new FormOther($db); $form=new Form($db); -$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,"; +$sql = "SELECT s.rowid, s.nom as name, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,"; $sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,"; $sql.= " d.nom as departement"; if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) @@ -402,7 +402,7 @@ if ($resql) print ''; print ''; $prospectstatic->id=$obj->rowid; - $prospectstatic->nom=$obj->nom; + $prospectstatic->name=$obj->name; $prospectstatic->status=$obj->status; $prospectstatic->code_client=$obj->code_client; $prospectstatic->client=$obj->client; diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 1eb30f02b55..5d7358a806e 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -64,8 +64,8 @@ if ($socid > 0) print ''; - // Nom - print ''; + // Name + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index bb079a34169..ec54e553bdb 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -63,8 +63,8 @@ if ($socid > 0) print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Thirdpary").''.$societe->getNomUrl(1).'
'; - // Nom - print ''; + // Name + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 1257769b954..abb2be95076 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -167,7 +167,7 @@ if ($id > 0 || ! empty($ref)) // Client print ""; print ''; print ''; diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 29812903d12..f40277ea34a 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -67,7 +67,7 @@ $thirdpartystatic=new Societe($db); * Mode List */ -$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea"; +$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea"; $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta "; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c"; @@ -161,7 +161,7 @@ if ($resql) $lien=$lienfin=''; $lien = ''; $lienfin=''; - $name=$obj->nom; + $name=$obj->name; $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin); $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 705354d401b..b7d9be05529 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -166,7 +166,7 @@ else */ if (! empty($conf->commande->enabled)) { - $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -195,7 +195,7 @@ if (! empty($conf->commande->enabled)) print ""; print '"; - print ''; + print ''; $i++; } } @@ -215,7 +215,7 @@ $max=5; */ $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,"; -$sql.= " s.nom, s.rowid as socid"; +$sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c,"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -268,7 +268,7 @@ if ($resql) print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -285,7 +285,7 @@ else dol_print_error($db); */ if (! empty($conf->commande->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid"; $sql.=" FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -337,7 +337,7 @@ if (! empty($conf->commande->enabled)) print ''; - print ''; + print ''; print ''; @@ -356,7 +356,7 @@ if (! empty($conf->commande->enabled)) */ if (! empty($conf->commande->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -408,7 +408,7 @@ if (! empty($conf->commande->enabled)) print ''; - print ''; + print ''; print ''; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index daf73effed3..bd31a438b05 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -112,7 +112,7 @@ $companystatic = new Societe($db); $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes"; llxHeader('',$langs->trans("Orders"),$help_url); -$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,'; +$sql = 'SELECT s.nom as name, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,'; $sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'commande as c'; @@ -221,7 +221,7 @@ if ($resql) { $soc = new Societe($db); $soc->fetch($socid); - $title = $langs->trans('ListOfOrders') . ' - '.$soc->nom; + $title = $langs->trans('ListOfOrders') . ' - '.$soc->name; } else { @@ -367,7 +367,7 @@ if ($resql) // Company $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Thirdparty").''.$societe->getNomUrl(1).'
".$langs->trans("Customer")."'; - print ''.$soc->nom.''; + print ''.$soc->getNomUrl(1).''; print '
'; print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''.dol_print_date($db->jdate($obj->datem),'day').''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print $companystatic->getNomUrl(1,'customer'); @@ -380,7 +380,7 @@ if ($resql) if (($objp->fk_statut > 0 && $objp->fk_statut < 3) || ($objp->fk_statut == 3 && $objp->facturee == 0)) { print ' '; - print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->nom, 'object_bill', 'hideonsmartphone').''; + print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').''; } } } diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index eb29889f115..49824a7f6cb 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -573,7 +573,7 @@ if (($action != 'create' && $action != 'add') || !$error) { // Company $companystatic->id=$socid; - $companystatic->nom=$soc->nom; + $companystatic->name=$soc->name; print '

'.$companystatic->getNomUrl(1,'customer').'

'; } diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 14b586c6d80..87b7d3e62c5 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -680,7 +680,7 @@ if ($id > 0 || ! empty($ref)) if ($links[$key]['type']=='company') { $societestatic->id=$links[$key]['url_id']; - $societestatic->nom=$links[$key]['label']; + $societestatic->name=$links[$key]['label']; print $societestatic->getNomUrl(1,'',16); } else if ($links[$key]['type']=='user') diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index d30c1519f10..25b7d91a3ff 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2012 Vinícius Nogueira * Copyright (C) 2014 Florian Henry - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or @@ -158,7 +158,7 @@ if ($resql) if (GETPOST("bid")) { $result=$bankcateg->fetch(GETPOST("bid")); - print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->nom:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num); } else { @@ -166,18 +166,18 @@ if ($resql) } print ''; - + $moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': '; $moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1); $moreforfilter .= $langs->trans('EndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1); - - + + if ($moreforfilter) { print '
'; print $moreforfilter; print '
'; } - + print ''; print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder); @@ -278,7 +278,7 @@ if ($resql) if ($objp->url_id) { $companystatic->id=$objp->url_id; - $companystatic->nom=$objp->labelurl; + $companystatic->name=$objp->labelurl; print $companystatic->getNomUrl(1); } else diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 909770cf38c..7ac510525be 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -148,7 +148,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // Customer invoices $sql = "SELECT 'invoice' as family, f.rowid as objid, f.facnumber as ref, f.total_ttc, f.type, f.date_lim_reglement as dlr,"; - $sql.= " s.rowid as socid, s.nom, s.fournisseur"; + $sql.= " s.rowid as socid, s.nom as name, s.fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid"; $sql.= " WHERE f.entity = ".$conf->entity; @@ -158,7 +158,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // Supplier invoices $sql2= " SELECT 'invoice_supplier' as family, ff.rowid as objid, ff.ref_supplier as ref, (-1*ff.total_ttc) as total_ttc, ff.type, ff.date_lim_reglement as dlr,"; - $sql2.= " s.rowid as socid, s.nom, s.fournisseur"; + $sql2.= " s.rowid as socid, s.nom as name, s.fournisseur"; $sql2.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ff.fk_soc = s.rowid"; $sql2.= " WHERE ff.entity = ".$conf->entity; @@ -265,7 +265,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $ref = $facturefournstatic->getNomUrl(1,''); $societestatic->id = $obj->socid; - $societestatic->nom = $obj->nom; + $societestatic->name = $obj->name; $refcomp=$societestatic->getNomUrl(1,'',24); $paiement = -1*$facturefournstatic->getSommePaiement(); // Payment already done @@ -279,7 +279,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $ref = $facturestatic->getNomUrl(1,''); $societestatic->id = $obj->socid; - $societestatic->nom = $obj->nom; + $societestatic->name = $obj->name; $refcomp=$societestatic->getNomUrl(1,'',24); $paiement = $facturestatic->getSommePaiement(); // Payment already done diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index dbdc8c72368..528ed14e849 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -73,7 +73,7 @@ if ($action == 'note') if ($mode == 'search') { if ($modesearch == 'soc') { $sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s "; - $sql.= " WHERE lower(s.nom) LIKE '%".$db->escape(strtolower($socname))."%'"; + $sql.= " WHERE s.nom LIKE '%".$db->escape(strtolower($socname))."%'"; $sql.= " AND s.entity IN (".getEntity('societe', 1).")"; } @@ -93,7 +93,7 @@ if ($mode == 'search') { * Mode List */ -$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea"; +$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea"; $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta "; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st"; @@ -107,13 +107,13 @@ if (dol_strlen($stcomm)) } if ($socname) { - $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($socname))."%'"; + $sql.= " AND s.nom LIKE '%".$db->escape($socname)."%'"; $sortfield = "s.nom"; $sortorder = "ASC"; } if ($_GET["search_nom"]) { - $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($_GET["search_nom"]))."%'"; + $sql.= " AND s.nom LIKE '%".$db->escape($_GET["search_nom"])."%'"; } if ($_GET["search_compta"]) { @@ -141,7 +141,7 @@ if ($resql) $i = 0; $langs->load('commercial'); - + print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num); print ''; @@ -188,7 +188,7 @@ if ($resql) print ""; print ''; diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index ab33bdbb43d..61e1b9cd926 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -202,7 +202,8 @@ class Don extends CommonObject /** - * Check params + * Check params and init ->errors array. + * TODO This function seems to not be used by core code. * * @param int $minimum Minimum * @return int 0 if KO, >0 if OK @@ -212,39 +213,40 @@ class Don extends CommonObject global $langs; $langs->load('main'); $langs->load('companies'); - + + $error_string = array(); $err = 0; if (dol_strlen(trim($this->societe)) == 0) { if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname')); $err++; } } if (dol_strlen(trim($this->address)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Address')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Address')); $err++; } if (dol_strlen(trim($this->zip)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip')); $err++; } if (dol_strlen(trim($this->town)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Town')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Town')); $err++; } if (dol_strlen(trim($this->email)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail')); $err++; } @@ -256,7 +258,7 @@ class Don extends CommonObject { if (!isset($map[substr($this->amount, $i, 1)] )) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); $err++; $amount_invalid = 1; break; @@ -267,14 +269,14 @@ class Don extends CommonObject { if ($this->amount == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); $err++; } else { if ($this->amount < $minimum && $minimum > 0) { - $error_string[$err] = $langs->trans('MinimumAmount',$langs->trans('$minimum')); + $error_string[] = $langs->trans('MinimumAmount',$langs->trans('$minimum')); $err++; } } @@ -282,14 +284,13 @@ class Don extends CommonObject if ($err) { - $this->error = $error_string; + $this->errors = $error_string; return 0; } else - { + { return 1; } - } /** @@ -311,7 +312,7 @@ class Don extends CommonObject $this->country=($this->country?$this->country:$this->country); $now=dol_now(); - + $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."don ("; @@ -368,7 +369,7 @@ class Don extends CommonObject // Call trigger $result=$this->call_trigger('DON_CREATE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers $this->db->commit(); @@ -398,7 +399,7 @@ class Don extends CommonObject $this->country=($this->country?$this->country:$this->country); $this->db->begin(); - + $sql = "UPDATE ".MAIN_DB_PREFIX."don SET "; $sql .= "amount = " . price2num($this->amount); $sql .= ",fk_paiement = ".($this->modepaiementid?$this->modepaiementid:"null"); @@ -426,9 +427,9 @@ class Don extends CommonObject { // Call trigger $result=$this->call_trigger('DON_UPDATE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers - + $this->db->commit(); return 1; } @@ -448,7 +449,7 @@ class Don extends CommonObject */ function delete($rowid) { - + $this->db-begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;"; @@ -460,9 +461,9 @@ class Don extends CommonObject { // Call trigger $result=$this->call_trigger('DON_DELETE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers - + $this->db->commit(); return 1; } diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index c7514e96fbb..02674b59745 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -526,7 +526,7 @@ else { echo '
'.$langs->trans("CreateBill").'
'; } - + if ($object->statut == 0 && $user->rights->facture->supprimer) { print '
'.$langs->trans('Delete').'
'; @@ -544,7 +544,7 @@ else /* * List mode */ - $sql = "SELECT s.nom, s.rowid as socid, f.titre, f.total, f.rowid as facid"; + $sql = "SELECT s.nom as name, s.rowid as socid, f.titre, f.total, f.rowid as facid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f"; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.entity = ".$conf->entity; @@ -584,13 +584,13 @@ else print "\n"; $companystatic->id=$objp->socid; - $companystatic->name=$objp->nom; + $companystatic->name=$objp->name; print ''; print ''."\n"; echo ''; print ''; @@ -219,7 +219,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire) { $sql = "SELECT f.ref, f.rowid, f.total_ttc, f.type,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0"; @@ -254,7 +254,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''; print ''; @@ -294,7 +294,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.total_ttc, f.paye, f.tms,"; $sql.= " f.date_lim_reglement as datelimite,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " sum(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture"; @@ -351,7 +351,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; print ''; @@ -392,7 +392,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $facstatic=new FactureFournisseur($db); $sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.tms, ff.paye"; - $sql.= ", s.nom, s.rowid as socid"; + $sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", SUM(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn"; @@ -432,7 +432,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''; print ''; @@ -613,7 +613,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $langs->load("orders"); $sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.total_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -675,7 +675,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us print ''; @@ -717,7 +717,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.datef, f.type, f.total, f.total_ttc, f.paye, f.tms,"; $sql.= " f.date_lim_reglement as datelimite,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " sum(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture"; @@ -774,7 +774,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; print ''; @@ -821,7 +821,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $facstatic=new FactureFournisseur($db); $sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.paye,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " sum(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn"; @@ -863,7 +863,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print $facstatic->getNomUrl(1,''); print ''; $societestatic->id=$obj->socid; - $societestatic->nom=$obj->nom; + $societestatic->name=$obj->name; $societestatic->client=0; print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index b6c0a13f246..7c34cec1ed4 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -149,7 +149,8 @@ $vatcust=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code); $vatsup=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code); // IRPF that the customer has retained me -if($conf->global->$calc ==0 || $conf->global->$calc == 2){ +if($conf->global->$calc ==0 || $conf->global->$calc == 2) +{ print "
'; $thirdpartystatic->id=$obj->rowid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->client=$obj->client; print $thirdpartystatic->getNomUrl(1,'compta'); print ''.$companystatic->getNomUrl(1,'customer').''.price($objp->total).''; - + if ($user->rights->facture->creer) { echo ''; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 4db7935e69c..d3987bcbad8 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -395,7 +395,7 @@ if (! $sortorder) $sortorder="ASC"; $limit = $conf->liste_limit; -$sql = "SELECT s.nom, s.rowid as socid, s.email"; +$sql = "SELECT s.nom as name, s.rowid as socid, s.email"; $sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp"; $sql.= ", f.datef as df, f.date_lim_reglement as datelimite"; $sql.= ", f.paye as paye, f.fk_statut, f.type, f.fk_mode_reglement"; @@ -462,7 +462,7 @@ if ($resql) $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder; $urlsource.=str_replace('&','&',$param); - $titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->nom):$langs->trans("BillsCustomersUnpaid")); + $titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid")); if ($option == 'late') $titre.=' ('.$langs->trans("Late").')'; else $titre.=' ('.$langs->trans("All").')'; @@ -658,7 +658,7 @@ if ($resql) print ''; $thirdparty=new Societe($db); $thirdparty->id=$objp->socid; - $thirdparty->nom=$objp->nom; + $thirdparty->name=$objp->name; $thirdparty->client=$objp->client; $thirdparty->code_client=$objp->code_client; print $thirdparty->getNomUrl(1,'customer'); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 07ebfa5ad7d..39dcc6b6427 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -144,7 +144,7 @@ else $sql = 'SELECT DISTINCT'; $sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc,'; $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,'; $sql.= ' f.paye as paye, f.fk_statut,'; -$sql.= ' s.nom, s.rowid as socid, s.code_client, s.client '; +$sql.= ' s.nom as name, s.rowid as socid, s.code_client, s.client '; if (! $sall) $sql.= ', SUM(pf.amount) as am'; // To be able to sort on status $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'facture as f'; @@ -265,7 +265,7 @@ if ($resql) if ($search_user > 0) $param.='&search_user=' .$search_user; if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_montant_ttc) $param.='&search_montant_ttc='.$search_montant_ttc; - print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->nom:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); $i = 0; print ''."\n"; @@ -400,7 +400,7 @@ if ($resql) print ''; $thirdparty=new Societe($db); $thirdparty->id=$objp->socid; - $thirdparty->nom=$objp->nom; + $thirdparty->name=$objp->name; $thirdparty->client=$objp->client; $thirdparty->code_client=$objp->code_client; print $thirdparty->getNomUrl(1,'customer'); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index eecf5e75746..1908b0670ff 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -145,7 +145,7 @@ if (! empty($conf->don->enabled) && $user->rights->don->lire) if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -185,7 +185,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'',16); print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'',16); print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->client=1; print $thirdpartystatic->getNomUrl(1,'customer',44); print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->fournisseur=1; print $thirdpartystatic->getNomUrl(1,'supplier',44); print ''; $societestatic->id=$obj->socid; - $societestatic->nom=$obj->nom; + $societestatic->name=$obj->name; $societestatic->client=1; print $societestatic->getNomUrl(1,'customer',44); print '' ; $societestatic->id=$obj->socid; - $societestatic->nom=$obj->nom; + $societestatic->name=$obj->name; $societestatic->client=1; print $societestatic->getNomUrl(1,'customer',44); print ''.$societestatic->getNomUrl(1, 'supplier', 44).''.price($obj->total_ht).'
"; print ""; print '"; @@ -160,7 +161,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ print "\n"; $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell'); - + $action = "tvaclient"; $object = &$coll_list; $parameters["mode"] = $modetax; @@ -170,7 +171,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks - + if (is_array($coll_list)) { $var=true; @@ -196,7 +197,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; print ''; $find = array(' ','.'); $replace = array('',''); @@ -210,7 +211,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ } } $x_coll_sum = $total; - + print ''; print ''; print ''; @@ -240,7 +241,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){ print "\n"; $company_static=new Societe($db); - + $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy'); $parameters["direction"] = 'buy'; $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks @@ -269,7 +270,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){ print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; print ''; $find = array(' ','.'); $replace = array('',''); @@ -283,14 +284,14 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){ } } $x_paye_sum = $total; - + print ''; print ''; print ''; print ''; - + print '
'.$langs->trans("Num")."
'.$i."'.$company_static->getNomUrl(1).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
'.$i."'.$company_static->getNomUrl(1).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
'; - + } else { diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 658e1992e9d..d0e15307be5 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -273,7 +273,7 @@ print '
'; */ $disable_delete = 0; -$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom, s.rowid as socid'; +$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom as name, s.rowid as socid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s'; $sql.= ' WHERE pf.fk_facture = f.rowid'; $sql.= ' AND f.fk_soc = s.rowid'; @@ -322,7 +322,7 @@ if ($resql) // Third party print ''; $thirdpartystatic->id=$objp->socid; - $thirdpartystatic->nom=$objp->nom; + $thirdpartystatic->name=$objp->name; print $thirdpartystatic->getNomUrl(1); print ''; diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index cd6ba5c59a2..95503db6ff9 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -221,7 +221,7 @@ class Paiement extends CommonObject if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice. We do nothing more."); else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more."); else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more."); - else + else { $result=$invoice->set_paid($user,'',''); if ($result<0) @@ -360,8 +360,8 @@ class Paiement extends CommonObject { // Appel des triggers $result=$this->call_trigger('PAYMENT_DELETE', $user); - if ($result < 0) - { + if ($result < 0) + { $this->db->rollback(); return -1; } @@ -483,7 +483,7 @@ class Paiement extends CommonObject $bank_line_id, $fac->thirdparty->id, DOL_URL_ROOT.'/comm/card.php?socid=', - $fac->thirdparty->nom, + $fac->thirdparty->name, 'company' ); if ($result <= 0) dol_print_error($this->db); @@ -501,7 +501,7 @@ class Paiement extends CommonObject $bank_line_id, $fac->thirdparty->id, DOL_URL_ROOT.'/fourn/card.php?socid=', - $fac->thirdparty->nom, + $fac->thirdparty->name, 'company' ); if ($result <= 0) dol_print_error($this->db); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index 46fa00df68c..da1f2bd2833 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -85,7 +85,7 @@ else //$sql.= " c.libelle as paiement_type,"; $sql.= " c.code as paiement_code,"; $sql.= " ba.rowid as bid, ba.label,"; - $sql.= " s.rowid as socid, s.nom"; + $sql.= " s.rowid as socid, s.nom as name"; //$sql.= " f.facnumber"; $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement as p)"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid"; @@ -197,7 +197,7 @@ if ($resql) if ($objp->socid) { $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; print $companystatic->getNomUrl(1,'',24); } else print ' '; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 527705e4ab0..ed5b123d923 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -760,7 +760,7 @@ class BonPrelevement extends CommonObject $sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc"; $sql.= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib"; $sql.= ", pfd.amount"; - $sql.= ", s.nom"; + $sql.= ", s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; @@ -829,8 +829,8 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->nom, LOG_ERR); - $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->nom; + dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR); + $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->name; } } else @@ -1262,7 +1262,7 @@ class BonPrelevement extends CommonObject * section Debiteur (sepa Debiteurs bloc lines) */ $sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, c.code as country_code,"; - $sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; + $sql.= " pl.client_nom as name, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; $sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum"; $sql.= " FROM"; $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,"; @@ -1286,7 +1286,7 @@ class BonPrelevement extends CommonObject while ($i < $num) { $obj = $this->db->fetch_object($resql); - $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum); + $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->name, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum); $this->total = $this->total + $obj->somme; $i++; } @@ -1490,7 +1490,7 @@ class BonPrelevement extends CommonObject * Write recipient of request (customer) * * @param string $row_code_client soc.code_client as code, - * @param string $row_nom pl.client_nom AS nom, + * @param string $row_nom pl.client_nom AS name, * @param string $row_address soc.address AS adr, * @param string $row_zip soc.zip * @param string $row_town soc.town diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 51f9a83ed3c..27ae87ca3b4 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -244,7 +244,7 @@ class RejetPrelevement $arr_mime = array(); $arr_name = array(); $facref = $fac->ref; - $socname = $soc->nom; + $socname = $soc->name; $amount = price($fac->total_ttc); $userinfo = $this->user->getFullName($langs); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index a3f7ca2ace8..0326e4922f1 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -156,7 +156,7 @@ print '
'; * Invoices waiting for withdraw */ -$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.rowid as socid,"; +$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,"; $sql.= " pfd.date_demande"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,"; $sql.= " ".MAIN_DB_PREFIX."societe as s,"; @@ -197,7 +197,7 @@ if ($resql) print ''; print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; print $thirdpartystatic->getNomUrl(1,'customer'); print ''; print ''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 4cd3098bfc3..9b58f1e44c0 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="f.facnumber"; */ $sql= "SELECT f.facnumber, f.rowid, f.total_ttc,"; -$sql.= " s.nom, s.rowid as socid,"; +$sql.= " s.nom as name, s.rowid as socid,"; $sql.= " pfd.date_demande as date_demande,"; $sql.= " pfd.fk_user_demande"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,"; @@ -137,7 +137,7 @@ if ($resql) print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; print $thirdpartystatic->getNomUrl(1,'customer'); print ''; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 3833a45215a..bf3e428cd0e 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -63,17 +63,17 @@ if ($prev_id) print ''.$langs->trans("Ref").''.$bon->getNomUrl(1).''; print ''.$langs->trans("Date").''.dol_print_date($bon->datec,'day').''; print ''.$langs->trans("Amount").''.price($bon->amount).''; - + // Status print ''.$langs->trans('Status').''; print ''.$bon->getLibStatut(1).''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); $muser->fetch($bon->user_trans); - + print ''.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; @@ -87,19 +87,19 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print ''; - + print '
'; - + print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; print ''.$relativepath.''; print '
'; - + dol_fiche_end(); - + } else { @@ -114,7 +114,7 @@ $offset = $conf->liste_limit * $page ; */ $sql = "SELECT pf.rowid"; $sql.= ",f.rowid as facid, f.facnumber as ref, f.total_ttc"; -$sql.= ", s.rowid as socid, s.nom, pl.statut"; +$sql.= ", s.rowid as socid, s.nom as name, pl.statut"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture as pf"; @@ -166,7 +166,7 @@ if ($result) print ''.$obj->ref."\n"; print ''; - print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."\n"; + print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."\n"; print ''.price($obj->total_ttc)."\n"; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index e43ea95ae44..161227aa121 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -62,17 +62,17 @@ if ($prev_id) print ''.$langs->trans("Ref").''.$bon->getNomUrl(1).''; print ''.$langs->trans("Date").''.dol_print_date($bon->datec,'day').''; print ''.$langs->trans("Amount").''.price($bon->amount).''; - + // Status print ''.$langs->trans('Status').''; print ''.$bon->getLibStatut(1).''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); $muser->fetch($bon->user_trans); - + print ''.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; @@ -86,19 +86,19 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print ''; - + print '
'; - + print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; print ''.$relativepath.''; print '
'; - + dol_fiche_end(); - + } else { @@ -112,7 +112,7 @@ $rej = new RejetPrelevement($db, $user); * Liste des factures */ $sql = "SELECT pl.rowid, pl.amount, pl.statut"; -$sql.= " , s.rowid as socid, s.nom"; +$sql.= " , s.rowid as socid, s.nom as name"; $sql.= " , pr.motif, pr.afacturer, pr.fk_facture"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; @@ -152,7 +152,7 @@ if ($resql) print img_picto('', 'statut'.$obj->statut).' '; print substr('000000'.$obj->rowid, -6); print ''; - print ''.stripslashes($obj->nom)."\n"; + print ''.$obj->name."\n"; print ''.price($obj->amount)."\n"; print ''.$rej->motifs[$obj->motif].''; diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 911ffde6f99..1abc421cf46 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -96,7 +96,7 @@ print '
'; */ $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,"; $sql.= " pfd.date_demande,"; -$sql.= " s.nom, s.rowid as socid"; +$sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -137,7 +137,7 @@ if ($resql) print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; print $thirdpartystatic->getNomUrl(1,'customer'); print ''; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 45bab4d69dc..b3f9acb3570 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -190,7 +190,7 @@ if ($id) print ''.$langs->trans("WithdrawalRefused").''; //Select yes/no - print ''.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?'; + print ''.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->name.' ?'; print ''; print $form->selectyesno("confirm",1,0); print ''; @@ -257,7 +257,7 @@ if ($id) */ $sql = "SELECT pf.rowid"; $sql.= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc"; - $sql.= " , s.rowid as socid, s.nom"; + $sql.= " , s.rowid as socid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf"; @@ -308,7 +308,7 @@ if ($id) print ''.$obj->ref."\n"; print ''; - print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."\n"; + print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."\n"; print ''.price($obj->total_ttc)."\n"; diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index ef884f50edf..1e96e9276d8 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -106,7 +106,7 @@ if ($prev_id) print ''; dol_fiche_end(); - + } else { @@ -128,7 +128,7 @@ $pagenext = $page + 1; * */ $sql = "SELECT pl.rowid, pl.statut, pl.amount"; -$sql.= ", s.rowid as socid, s.nom"; +$sql.= ", s.rowid as socid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as pb"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -175,7 +175,7 @@ if ($result) print substr('000000'.$obj->rowid, -6); print ''; - print ''.stripslashes($obj->nom)."\n"; + print ''.$obj->name."\n"; print ''.price($obj->amount)."\n"; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 819d879b098..7e0b818279f 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -63,7 +63,7 @@ llxHeader('',$langs->trans("WithdrawalsLines")); $sql = "SELECT p.rowid, p.ref, p.statut, p.datec"; $sql.= " ,f.rowid as facid, f.facnumber, f.total_ttc"; -$sql.= " , s.rowid as socid, s.nom, s.code_client"; +$sql.= " , s.rowid as socid, s.nom as name, s.code_client"; $sql.= " , pl.amount, pl.statut as statut_ligne, pl.rowid as rowid_ligne"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; @@ -162,7 +162,7 @@ if ($result) print ' '.$obj->facnumber."\n"; print ''; - print ''.$obj->nom."\n"; + print ''.$obj->name."\n"; print ''.$obj->code_client."\n"; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index f56652fc4b6..59599e93dc6 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -64,8 +64,8 @@ if ($socid > 0) print ''; - // Nom - print ''; + // Name + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 19054bfd7c9..9122ece2ed9 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -120,7 +120,7 @@ $total_ttc=0; // Affiche en-tete de rapport if ($modecompta=="CREANCES-DETTES") { - $nom=$langs->trans("AnnualByCompaniesDueDebtMode"); + $name=$langs->trans("AnnualByCompaniesDueDebtMode"); $calcmode=$langs->trans("CalcModeDebt"); $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1); @@ -132,7 +132,7 @@ if ($modecompta=="CREANCES-DETTES") //$exportlink=$langs->trans("NotYetAvailable"); } else { - $nom=$langs->trans("AnnualByCompaniesInputOutputMode"); + $name=$langs->trans("AnnualByCompaniesInputOutputMode"); $calcmode=$langs->trans("CalcModeEngagement"); $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; //$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',1,1,0,'',1,0,1); @@ -142,7 +142,7 @@ else { $builddate=time(); //$exportlink=$langs->trans("NotYetAvailable"); } -report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode); +report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode); // Show report array print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Name").''.$societe->name.'
'; @@ -160,7 +160,7 @@ print ''; if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT s.nom, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc"; + $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= " WHERE f.fk_soc = s.rowid"; @@ -178,7 +178,7 @@ else * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin) */ - $sql = "SELECT s.nom as nom, s.rowid as socid, sum(pf.amount) as amount_ttc"; + $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf"; @@ -206,7 +206,7 @@ if ($result) { $var=!$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print "\n"; @@ -225,7 +225,7 @@ if ($result) { // On ajoute les paiements clients anciennes version, non lie par paiement_facture if ($modecompta != 'CREANCES-DETTES') { - $sql = "SELECT 'Autres' as nom, '0' as idp, sum(p.amount) as amount_ttc"; + $sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= ", ".MAIN_DB_PREFIX."paiement as p"; @@ -236,8 +236,8 @@ if ($modecompta != 'CREANCES-DETTES') $sql.= " AND ba.entity = ".$conf->entity; if (! empty($date_start) && ! empty($date_end)) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; - $sql.= " GROUP BY nom, idp"; - $sql.= " ORDER BY nom"; + $sql.= " GROUP BY name, idp"; + $sql.= " ORDER BY name"; dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG); $result = $db->query($sql); @@ -290,7 +290,7 @@ print ''; */ if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT s.nom, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc"; + $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f"; $sql.= " WHERE f.fk_soc = s.rowid"; @@ -338,7 +338,7 @@ if ($result) { $var=!$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print "\n"; @@ -381,7 +381,7 @@ print '"; - print ''; + print ''; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; print ''; @@ -455,7 +455,7 @@ print '"; - print ''; + print ''; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; @@ -550,7 +550,7 @@ if ($mysoc->tva_assuj == 'franchise') // Non assujeti if ($conf->salaries->enabled) { print ''; - $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; + $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as label, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user"; $sql.= " WHERE p.entity = ".$conf->entity; @@ -618,7 +618,7 @@ if ($conf->salaries->enabled) if ($conf->donation->enabled) { print ''; - $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount"; + $sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."don as p"; $sql.= " WHERE p.entity = ".$conf->entity; $sql.= " AND fk_statut=2"; @@ -650,7 +650,7 @@ if ($conf->donation->enabled) $var = !$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 0ccd450e0cb..af070901517 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -153,60 +153,49 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; } if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer)) { - - $db->begin(); + $db->begin(); - $originalId = $id; - - $object = new ChargeSociales($db); - $object->fetch($id); + $originalId = $id; - if ($object->id > 0) - { - $object->paye = 0; - $object->id = $object->ref = null; - - if(GETPOST('clone_for_next_month') != '') { - - $object->date_ech = strtotime('+1month', $object->date_ech); - $object->periode = strtotime('+1month', $object->periode); - } - - if ($object->check()) - { - $id = $object->create($user); - if ($id > 0) - { - $db->commit(); - $db->close(); + $object = new ChargeSociales($db); + $object->fetch($id); - header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); - exit; - } - else - { - $id=$originalId; - $db->rollback(); - - if (count($object->errors)) - { - setEventMessage($object->errors, 'errors'); - dol_print_error($db,$object->errors); - } - else - { - setEventMessage($langs->trans($object->error), 'errors'); - dol_print_error($db,$object->error); - } - } - } - } - else - { - $db->rollback(); - dol_print_error($db,$object->error); - } - + if ($object->id > 0) + { + $object->paye = 0; + $object->id = $object->ref = null; + + if(GETPOST('clone_for_next_month') != '') { + + $object->date_ech = strtotime('+1month', $object->date_ech); + $object->periode = strtotime('+1month', $object->periode); + } + + if ($object->check()) + { + $id = $object->create($user); + if ($id > 0) + { + $db->commit(); + $db->close(); + + header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); + exit; + } + else + { + $id=$originalId; + $db->rollback(); + + setEventMessages($object->error,$object->errors, 'errors'); + } + } + } + else + { + $db->rollback(); + dol_print_error($db,$object->error); + } } @@ -301,18 +290,18 @@ if ($id > 0) $head=tax_prepare_head($object); dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill'); - + // Clone confirmation if ($action === 'clone') { $formclone=array( array('type' => 'checkbox', 'name' => 'clone_for_next_month','label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1), - + ); - + print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes'); } - + // Confirmation de la suppression de la charge if ($action == 'paid') { @@ -492,7 +481,7 @@ if ($id > 0) { print "id&action=paid\">".$langs->trans("ClassifyPaid").""; } - + // Clone if ($user->rights->tax->charges->creer) { diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 807466ef95f..44e62ad0f10 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -106,22 +106,23 @@ class ChargeSociales extends CommonObject return -1; } } - /* - * Check if a social contribution can be created into database - * - */ - function check() { - + + /** + * Check if a social contribution can be created into database + * + * @return boolean True or false + */ + function check() + { $newamount=price2num($this->amount,'MT'); // Validation parametres if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode)) { - return false; } - - + + return true; } @@ -138,7 +139,8 @@ class ChargeSociales extends CommonObject // Nettoyage parametres $newamount=price2num($this->amount,'MT'); - if(!$this->check()) { + if (!$this->check()) + { $this->error="ErrorBadParameter"; return -2; } @@ -357,7 +359,7 @@ class ChargeSociales extends CommonObject global $langs; $langs->load('customers'); $langs->load('bills'); - + if ($mode == 0) { if ($statut == 0) return $langs->trans("Unpaid"); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 422354ee7c3..c2620fd34df 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -110,10 +110,10 @@ $fsearch.=' '; // Affiche en-tete du rapport if ($modetax==1) // Calculate on invoice for goods and services { - $nom=$langs->trans("VATReportByCustomersInDueDebtMode"); + $name=$langs->trans("VATReportByCustomersInDueDebtMode"); $calcmode=$langs->trans("CalcModeVATDebt"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - //$nom.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; + //$name.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=($year_start?"".img_previous()."".img_next()."":""); $description=$langs->trans("RulesVATDueServices"); @@ -138,10 +138,10 @@ if ($modetax==1) // Calculate on invoice for goods and services } if ($modetax==0) // Invoice for goods, payment for services { - $nom=$langs->trans("VATReportByCustomersInInputOutputMode"); + $name=$langs->trans("VATReportByCustomersInInputOutputMode"); $calcmode=$langs->trans("CalcModeVATEngagement"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - //$nom.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; + //$name.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=($year_start?"".img_previous()."".img_next()."":""); $description=$langs->trans("RulesVATInServices"); @@ -165,7 +165,7 @@ if ($modetax==0) // Invoice for goods, payment for services $amountsup=$langs->trans("AmountHT"); if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')'; } -report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode); +report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode); $vatcust=$langs->trans("VATReceived"); $vatsup=$langs->trans("VATPaid"); @@ -223,7 +223,7 @@ if (is_array($coll_list)) print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; $company_static->client=1; print ''; $find = array(' ','.'); @@ -304,7 +304,7 @@ if (is_array($coll_list)) print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; $company_static->fournisseur=1; print ''; $find = array(' ','.'); diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 19ce91f9c82..9e93523a654 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -185,7 +185,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_CREATE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -304,7 +304,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_MODIFY',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -374,7 +374,7 @@ class Contact extends CommonObject $soc = new Societe($this->db); $soc->fetch($this->socid); - $info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->nom; + $info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->name; if ($soc->client == 1) $info["businessCategory"] = "Customers"; if ($soc->client == 2) $info["businessCategory"] = "Prospects"; if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers"; @@ -774,7 +774,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_DELETE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -1060,7 +1060,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index e78c298c541..77abf31ac89 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -75,7 +75,7 @@ if ($company->id) if (! $contact->zip) $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country_code, "WORK;POSTAL"); if ($company->email != $contact->email) $v->setEmail($company->email,'internet'); // Si contact lie a un tiers non de type "particulier" - if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->nom); + if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name); } // Personal informations diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 400899993ae..02a580174c3 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -227,7 +227,7 @@ print "
'.$langs->trans("CustomersInvoices").'
 ".$langs->trans("Bills").' '.$objp->nom."".$langs->trans("Bills").' '.$objp->name."".price($objp->amount_ht)."
 ".$langs->trans("Bills")." socid."\">".$objp->nom."".$langs->trans("Bills")." socid."\">".$objp->name."".price(-$objp->amount_ht)."
'.$langs->trans("SocialContributions").' ('.$langs->t if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= " WHERE cs.fk_type = c.id"; @@ -391,7 +391,7 @@ if ($modecompta == 'CREANCES-DETTES') } else { - $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p"; @@ -424,7 +424,7 @@ if ($result) { $var = !$var; print "
 '.$obj->nom.''.$obj->label.''.price(-$obj->amount).''.price(-$obj->amount).'
'.$langs->trans("SocialContributions").' ('.$langs->t if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= " WHERE cs.fk_type = c.id"; @@ -468,7 +468,7 @@ if ($modecompta == 'CREANCES-DETTES') } else { - $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p"; @@ -501,7 +501,7 @@ if ($result) { $var = !$var; print "
 '.$obj->nom.''.$obj->label.''.price(-$obj->amount).''.price(-$obj->amount).'
'.$langs->trans("Salaries").'
'.$langs->trans("Donation").'
 ".$langs->trans("Donation")." nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."'.price($obj->amount).''.price($obj->amount).'
'.$i."'.$company_static->getNomUrl(1,'customer').'
'.$i."'.$company_static->getNomUrl(1,'supplier').'

"; if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) { $sql = "SELECT c.rowid as ref, c.rowid,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.rowid = c.fk_soc"; @@ -262,7 +262,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) print ''; print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'',16); print ''; @@ -298,7 +298,7 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.d $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')",1,0).') as nb_expired,'; $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,'; $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; -$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid as socid"; +$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,"; $sql.= " ".MAIN_DB_PREFIX."contrat as c"; @@ -342,7 +342,7 @@ if ($result) print ''; print ''; $staticcompany->id=$obj->socid; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''.dol_print_date($obj->tms,'dayhour').''; @@ -369,7 +369,7 @@ print '
'; // Last modified services $sql = "SELECT c.ref, c.fk_soc, "; $sql.= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,"; -$sql.= " s.nom,"; +$sql.= " s.nom as name,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype"; $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -423,7 +423,7 @@ if ($resql) print ''; print ''; $staticcompany->id=$obj->fk_soc; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''; @@ -447,7 +447,7 @@ print '
'; // Not activated services $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,"; -$sql.= " s.nom,"; +$sql.= " s.nom as name,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype"; $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -503,7 +503,7 @@ if ($resql) print ''; print ''; $staticcompany->id=$obj->fk_soc; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''; @@ -526,7 +526,7 @@ print '
'; // Expired services $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,"; -$sql.= " s.nom,"; +$sql.= " s.nom as name,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype"; $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -583,7 +583,7 @@ if ($resql) print ''; print ''; $staticcompany->id=$obj->fk_soc; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 7970e80603c..d8e635dacb0 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -96,9 +96,8 @@ if (!empty($search_ref_customer)) { if ($sall) { $sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall); } -$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut,"; -$sql.= " s.nom, s.rowid"; -$sql.= " ORDER BY $sortfield $sortorder"; +$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut, s.nom, s.rowid"; +$sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit + 1, $offset); $resql=$db->query($sql); @@ -157,7 +156,7 @@ if ($resql) if ($obj->nb_late) print img_warning($langs->trans("Late")); print ''; print ''.$obj->ref_customer.''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; //print ''.dol_print_date($obj->datec).''; print ''.dol_print_date($db->jdate($obj->date_contrat)).''; //print ''.$staticcontrat->LibStatut($obj->statut,3).''; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 4318d81e923..77fc0155430 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -80,7 +80,7 @@ $form=new Form($db); llxHeader(); $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,"; -$sql.= " s.rowid as socid, s.nom,"; +$sql.= " s.rowid as socid, s.nom as name,"; $sql.= " cd.rowid, cd.description, cd.statut,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype,"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,"; @@ -225,7 +225,7 @@ if ($resql) // Third party print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'customer',28); print ''; diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 8b88b6ff557..7d118932ba4 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -64,7 +64,7 @@ class box_actions extends ModeleBoxes { $sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage,"; $sql.= " ta.code,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, "; $sql.= MAIN_DB_PREFIX."actioncomm AS a)"; if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; @@ -112,7 +112,7 @@ class box_actions extends ModeleBoxes 'url' => ($objp->socid?DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid:'')); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,24), + 'text' => dol_trunc($objp->name,24), 'url' => DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left" class="nowrap"', @@ -155,7 +155,7 @@ class box_actions extends ModeleBoxes global $langs, $conf; parent::showBox($this->info_box_head, $this->info_box_contents); if ($conf->global->SHOW_DIALOG_HOMEPAGE) - { + { $actioncejour=false; $contents=$this->info_box_contents; $nblines=count($contents); @@ -170,7 +170,7 @@ class box_actions extends ModeleBoxes if (isset($contents[$i])) { // on affiche que les évènement du jours ou passé - // qui ne sont pas à 100% + // qui ne sont pas à 100% $actioncejour=true; $var=!$var; // TR @@ -193,8 +193,8 @@ class box_actions extends ModeleBoxes print ''; } } - print ''; - + print ''; + } print ''; if ($actioncejour) diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index ae6b6b7ef15..9e1706a5e6b 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -63,7 +63,7 @@ class box_clients extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.client IN (1, 3)"; @@ -93,7 +93,7 @@ class box_clients extends ModeleBoxes 'url' => $url.$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => $url.$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index f88eaa939ac..a89fca4acc0 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -63,7 +63,7 @@ class box_commandes extends ModeleBoxes if ($user->rights->commande->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.ref, c.tms, c.rowid,"; $sql.= " c.fk_statut, c.facture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -101,7 +101,7 @@ class box_commandes extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index 4297d4de46e..dc0ff8e5382 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -60,7 +60,7 @@ class box_contracts extends ModeleBoxes if ($user->rights->contrat->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -108,7 +108,7 @@ class box_contracts extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index 92af03f57ad..ee5326250b3 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -66,7 +66,7 @@ class box_factures extends ModeleBoxes { $sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.datef as df"; $sql.= ", f.paye, f.fk_statut, f.datec, f.tms"; - $sql.= ", s.nom, s.rowid as socid"; + $sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", f.date_lim_reglement as datelimite"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -113,7 +113,7 @@ class box_factures extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'maxlength'=>40, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 20d2a11bf9c..441c9f743fe 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -63,7 +63,7 @@ class box_factures_fourn extends ModeleBoxes if ($user->rights->fournisseur->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.amount,"; $sql.= " f.paye, f.fk_statut,"; $sql.= ' f.datef as df,'; @@ -115,7 +115,7 @@ class box_factures_fourn extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][5] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index dadfe58a27a..aa217f1c436 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -60,7 +60,7 @@ class box_factures_fourn_imp extends ModeleBoxes if ($user->rights->fournisseur->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,"; $sql.= " f.amount, f.datef as df,"; $sql.= " f.paye, f.fk_statut, f.type"; @@ -111,7 +111,7 @@ class box_factures_fourn_imp extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][5] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 8aab8fa9b15..e6df1530f8d 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -63,7 +63,7 @@ class box_factures_imp extends ModeleBoxes if ($user->rights->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " f.facnumber, f.date_lim_reglement as datelimite,"; $sql.= " f.amount, f.datef as df,"; $sql.= " f.paye, f.fk_statut, f.rowid as facid"; @@ -110,7 +110,7 @@ class box_factures_imp extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'maxlength'=>44, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 118a18a007a..fdebad2f38a 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -65,7 +65,7 @@ class box_ficheinter extends ModeleBoxes $sql.= " f.datec,"; $sql.= " f.date_valid as datev,"; $sql.= " f.tms as datem,"; - $sql.= " s.nom, s.rowid as socid, s.client"; + $sql.= " s.nom as name, s.rowid as socid, s.client"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -109,7 +109,7 @@ class box_ficheinter extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index 3423d8bee63..f233221ccaa 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -62,7 +62,7 @@ class box_fournisseurs extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fournisseur = 1"; @@ -89,7 +89,7 @@ class box_fournisseurs extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index 19c007bb287..b548e90671b 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -62,7 +62,7 @@ class box_propales extends ModeleBoxes if ($user->rights->propale->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."propal as p"; @@ -106,7 +106,7 @@ class box_propales extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index 8c1a0afd288..dd8682515c7 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -63,7 +63,7 @@ class box_prospect extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.client IN (2, 3)"; @@ -92,7 +92,7 @@ class box_prospect extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index d6e525e42d4..eb48fc83d2b 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -62,7 +62,7 @@ class box_services_contracts extends ModeleBoxes if ($user->rights->service->lire && $user->rights->contrat->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.rowid,"; $sql.= " cd.rowid as cdid, cd.tms as datem, cd.statut,"; $sql.= " p.rowid as pid, p.label, p.fk_product_type"; @@ -125,7 +125,7 @@ class box_services_contracts extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'maxlength' => 28, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index 8bfe5749215..52f3777e2af 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -63,7 +63,7 @@ class box_services_expired extends ModeleBoxes // Select contracts with at least one expired service $sql = "SELECT "; $sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services"; $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -104,7 +104,7 @@ class box_services_expired extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="center"', diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index 0634b1548a8..876b50c849f 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -62,7 +62,7 @@ class box_supplier_orders extends ModeleBoxes if ($user->rights->fournisseur->commande->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.ref, c.tms, c.rowid,"; $sql.= " c.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -102,7 +102,7 @@ class box_supplier_orders extends ModeleBoxes 'url' => $urls); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => $urls); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 33b1d42ca08..51b9c5eff46 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -769,7 +769,7 @@ class Form $outarray=array(); // On recherche les societes - $sql = "SELECT s.rowid, s.nom, s.client, s.fournisseur, s.code_client, s.code_fournisseur"; + $sql = "SELECT s.rowid, s.nom as name, s.client, s.fournisseur, s.code_client, s.code_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX ."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; @@ -836,11 +836,11 @@ class Form if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) { $label .= $obj->code_fournisseur. ' - '; } - $label.=' '.$obj->nom; + $label.=' '.$obj->name; } else { - $label=$obj->nom; + $label=$obj->name; } if ($showtype) @@ -996,16 +996,12 @@ class Form // On recherche les societes $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste"; - if ($showsoc > 0) { - $sql.= " , s.nom as company"; - } + if ($showsoc > 0) $sql.= " , s.nom as company"; $sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp"; - if ($showsoc > 0) { - $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc "; - } + if ($showsoc > 0) $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc"; $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")"; if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid; - if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0 "; + if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0"; $sql.= " ORDER BY sp.lastname ASC"; dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG); @@ -1839,7 +1835,7 @@ class Form $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,"; - $sql.= " s.nom"; + $sql.= " s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; if ($socid) $sql.= " AND pfp.fk_soc = ".$socid; @@ -1951,8 +1947,8 @@ class Form } if (! $socid) { - $opt .= " - ".dol_trunc($objp->nom,8); - $outval.=" - ".dol_trunc($objp->nom,8); + $opt .= " - ".dol_trunc($objp->name,8); + $outval.=" - ".dol_trunc($objp->name,8); } } else @@ -2007,7 +2003,7 @@ class Form $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,"; - $sql.= " s.nom"; + $sql.= " s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid"; @@ -2044,7 +2040,7 @@ class Form if($num == 1) { $opt .= ' selected="selected"'; } - $opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - '; + $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - '; if ($objp->quantity == 1) { @@ -4433,7 +4429,7 @@ class Form $out=''; // On recherche les groupes - $sql = "SELECT ug.rowid, ug.nom "; + $sql = "SELECT ug.rowid, ug.nom as name"; if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= ", e.label"; @@ -4478,7 +4474,7 @@ class Form } $out.= '>'; - $out.= $obj->nom; + $out.= $obj->name; if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1) { $out.= " (".$obj->label.")"; diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index f158a86f5da..ef58b6c7322 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -222,7 +222,7 @@ class FormCompany $out=''; // On recherche les departements/cantons/province active d'une region et pays actif - $sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, c.label as country, c.code as country_code FROM"; + $sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code FROM"; $sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c"; $sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid"; $sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1"; @@ -270,7 +270,7 @@ class FormCompany $out.= ''; } $i++; @@ -292,7 +292,7 @@ class FormCompany * Retourne la liste deroulante des regions actives dont le pays est actif * La cle de la liste est le code (il peut y avoir plusieurs entree pour * un code donnee mais dans ce cas, le champ pays et lang differe). - * Ainsi les liens avec les regions se font sur une region independemment de son nom. + * Ainsi les liens avec les regions se font sur une region independemment de son name. * * @param string $selected Preselected value * @param string $htmlname Name of HTML select field @@ -529,20 +529,20 @@ class FormCompany global $conf, $langs; // On recherche les societes - $sql = "SELECT s.rowid, s.nom FROM"; + $sql = "SELECT s.rowid, s.nom as name FROM"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; - if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND rowid = ".$selected; + if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND s.rowid = ".$selected; else { // For ajax search we limit here. For combo list, we limit later if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && is_array($limitto) && count($limitto)) { - $sql.= " AND rowid IN (".join(',',$limitto).")"; + $sql.= " AND s.rowid IN (".join(',',$limitto).")"; } } - $sql.= " ORDER BY nom ASC"; + $sql.= " ORDER BY s.nom ASC"; $resql = $this->db->query($sql); if ($resql) @@ -620,7 +620,7 @@ class FormCompany } else { - print ''; + print ''; } print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php','',$minLength); //print ''; @@ -653,14 +653,14 @@ class FormCompany { print ''; + print ' selected="selected">'.dol_trunc($obj->name,24).''; $firstCompany = $obj->rowid; } else { print ''; + print '>'.dol_trunc($obj->name,24).''; } $i ++; } diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index fdc2d6fbe4f..52d27f82523 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -202,7 +202,8 @@ class InfoBox $db->begin(); - // Sauve parametre indiquant que le user a une config dediee + // Save parameters to say user has a dedicated setup + $tab=array(); $confuserzone='MAIN_BOXES_'.$zone; $tab[$confuserzone]=1; if (dol_set_user_param($db, $conf, $user, $tab) < 0) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index d5bd9ae9198..f85d1c8f4af 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -954,7 +954,7 @@ function dol_meta_create($object) if (is_dir($dir)) { $nblignes = count($object->lines); - $client = $object->client->nom . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town; + $client = $object->client->name . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town; $meta = "REFERENCE=\"" . $object->ref . "\" DATE=\"" . dol_print_date($object->date,'') . "\" NB_ITEMS=\"" . $nblignes . "\" diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 38ca67bc9b2..746755b824c 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1143,8 +1143,8 @@ function weight_convert($weight,&$from_unit,$to_unit) * * @param DoliDB $db Handler database * @param Conf $conf Object conf - * @param User $user Object user - * @param array $tab Tableau (cle=>valeur) des parametres a sauvegarder + * @param User $user Object user + * @param array $tab Array (key=>value) with all parameters to save * @return int <0 if KO, >0 if OK * * @see dolibarr_get_const, dolibarr_set_const, dolibarr_del_const diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index ff0587c7612..5000e00b345 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -682,7 +682,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass { // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $fromcompany->nom, + '__FROM_NAME__' => $fromcompany->name, '__FROM_EMAIL__' => $fromcompany->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index 62e46b7b9f7..cc9478f5d61 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -124,7 +124,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction } if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) { - $sql = "SELECT s.rowid as socid, s.nom as nom, s.siren as tva_intra, s.tva_assuj as assuj,"; + $sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,"; $sql.= " sum(fd.total_ht) as amount, sum(fd.".$total_tva.") as tva,"; $sql.= " sum(fd.".$total_localtax1.") as localtax1,"; $sql.= " sum(fd.".$total_localtax2.") as localtax2"; diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 28fa03ee4f3..0bd7a262a9c 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php' */ class mod_barcode_product_standard extends ModeleNumRefBarCode { - var $nom='Standard'; // Model Name + var $name='Standard'; // Model Name var $code_modifiable; // Editable code var $code_modifiable_invalide; // Modified code if it is invalid var $code_modifiable_null; // Modified code if it is null diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php index 0f87306354a..d03302f36b7 100644 --- a/htdocs/core/modules/barcode/modules_barcode.class.php +++ b/htdocs/core/modules/barcode/modules_barcode.class.php @@ -62,7 +62,7 @@ abstract class ModeleNumRefBarCode $langs->load("bills"); return $langs->trans("NoDescription"); } - + /** Return model name * * @param Translate $langs Object langs @@ -70,10 +70,10 @@ abstract class ModeleNumRefBarCode */ function getNom($langs) { - return $this->nom; + return empty($this->name)?$this->nom:$this->name; } - - /** Return a numbering example + + /** Return a numbering example * * @param Translate $langs Object langs * @return string Example @@ -96,7 +96,7 @@ abstract class ModeleNumRefBarCode global $langs; return $langs->trans("Function_getNextValue_InModuleNotWorking"); } - + /** Return version of module * * @return string Version @@ -112,7 +112,7 @@ abstract class ModeleNumRefBarCode if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } - + /** * Return description of module parameters * @@ -128,7 +128,7 @@ abstract class ModeleNumRefBarCode $langs->load("admin"); $s=''; - $s.=$langs->trans("Name").': '.$this->nom.'
'; + $s.=$langs->trans("Name").': '.$this->name.'
'; $s.=$langs->trans("Version").': '.$this->getVersion().'
'; if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; $s.='
'; @@ -171,6 +171,6 @@ abstract class ModeleNumRefBarCode return $s; } - + } diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index 895ad153fc8..e95d40e0908 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -277,7 +277,7 @@ class doc_generic_order_odt extends ModelePDFCommandes // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -483,7 +483,7 @@ class doc_generic_order_odt extends ModelePDFCommandes } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 7c2b7e742a5..3e7803af70a 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1233,12 +1233,12 @@ class pdf_einstein extends ModelePDFCommandes { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php index 05dfadac4a7..0216bd4163a 100644 --- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php @@ -1190,12 +1190,12 @@ class pdf_proforma extends ModelePDFCommandes { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index d522a12eef2..bd4cc333743 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -586,12 +586,12 @@ class pdf_strato extends ModelePDFContract { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $this->recipient->name=$outputlangs->convToOutputCharset($socname); } else { - $this->recipient->name=$outputlangs->convToOutputCharset($object->client->nom); + $this->recipient->name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target'); diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index b4325139878..aaddbc1d748 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -277,7 +277,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -483,7 +483,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 69286c7980d..bdf61e3ea72 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -617,12 +617,12 @@ class pdf_merou extends ModelePdfExpedition { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails'); diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index bf4b738354a..ccb4f93a611 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -631,12 +631,12 @@ class pdf_rouget extends ModelePdfExpedition { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails'); diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 0084df11e72..023978d0999 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -285,7 +285,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -440,7 +440,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 6b337ac4ad3..35a0ff47aa0 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -182,7 +182,7 @@ class pdf_crabe extends ModelePDFFactures } } if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva; - + if ($conf->facture->dir_output) { $object->fetch_thirdparty(); @@ -369,7 +369,7 @@ class pdf_crabe extends ModelePDFFactures // $pdf->Image does not increase value return by getY, so we save it manually $posYAfterImage=$curY+$imglinesize['height']; } - + // Description of product line $curX = $this->posxdesc-1; @@ -407,7 +407,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->commitTransaction(); } $posYAfterDescription=$pdf->GetY(); - + $nexY = $pdf->GetY(); $pageposafter=$pdf->getPage(); $pdf->setPage($pageposbefore); @@ -487,7 +487,7 @@ class pdf_crabe extends ModelePDFFactures $this->tva[$vatrate] += $tvaligne; if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage; - + // Add line if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) { @@ -1241,7 +1241,7 @@ class pdf_crabe extends ModelePDFFactures //$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C'); } } - + if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) { $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height); @@ -1479,12 +1479,12 @@ class pdf_crabe extends ModelePDFFactures { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 7a697817eb3..0d09aa7ce6c 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -565,12 +565,12 @@ class pdf_soleil extends ModelePDFFicheinter { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target'); diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index bb9f1d155ff..7717a43c575 100644 --- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -825,12 +825,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php index d8f88ef766c..c647466e796 100644 --- a/htdocs/core/modules/mailings/framboise.modules.php +++ b/htdocs/core/modules/mailings/framboise.modules.php @@ -59,7 +59,7 @@ class mailing_framboise extends MailingTargets global $conf, $langs; $langs->load("members"); $langs->load("companies"); - + $cibles = array(); // Select the members from category @@ -229,10 +229,6 @@ class mailing_framboise extends MailingTargets */ function url($id) { - //$companystatic=new Societe($this->db); - //$companystatic->id=$id; - //$companystatic->nom=''; - //return $companystatic->getNomUrl(1); // Url too long return ''.img_object('',"user").''; } diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index 9d7fb16aaab..df8ec79f988 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -240,10 +240,6 @@ class mailing_thirdparties extends MailingTargets */ function url($id) { - //$companystatic=new Societe($this->db); - //$companystatic->id=$id; - //$companystatic->nom=''; - //return $companystatic->getNomUrl(1); // Url too long return ''.img_object('',"company").''; } diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index a907ad0ec3f..5837329a476 100644 --- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -40,7 +40,7 @@ class mailing_thirdparties_services_expired extends MailingTargets function __construct($db) { global $conf; - + $this->db=$db; $this->arrayofproducts=array(); @@ -233,10 +233,6 @@ class mailing_thirdparties_services_expired extends MailingTargets */ function url($id) { - //$companystatic=new Societe($this->db); - //$companystatic->id=$id; - //$companystatic->nom=''; - //return $companystatic->getNomUrl(1); // Url too long return ''.img_object('',"company").''; } diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 37383474c2d..5a041fd31ce 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php' class mod_codeproduct_elephant extends ModeleProductCode { var $nom='Elephant'; // Nom du modele + var $name='Elephant'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php index a3df52f682f..3b850e1ba91 100644 --- a/htdocs/core/modules/product/mod_codeproduct_leopard.php +++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php @@ -40,6 +40,7 @@ class mod_codeproduct_leopard extends ModeleProductCode */ var $nom='Leopard'; // Nom du modele + var $name='Leopard'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php index 66affcf256a..0bfd3f8f03e 100644 --- a/htdocs/core/modules/product/modules_product.class.php +++ b/htdocs/core/modules/product/modules_product.class.php @@ -46,7 +46,7 @@ abstract class ModeleProductCode */ function getNom($langs) { - return $this->nom; + return empty($this->name)?$this->nom:$this->name; } @@ -147,7 +147,7 @@ abstract class ModeleProductCode $langs->load("admin"); $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->nom.'
'; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; if ($type == 0) $s.=$langs->trans("ProductCodeDesc").'
'; if ($type == 1) $s.=$langs->trans("ServiceCodeDesc").'
'; diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index fc18f1068ce..97e571c2972 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -339,7 +339,7 @@ class doc_generic_project_odt extends ModelePDFProjects $texte.= '
'; $texte.= ''; $texte.= '
'; - + // Scan directories if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': '.count($listoffiles).''; @@ -452,7 +452,7 @@ class doc_generic_project_odt extends ModelePDFProjects // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, ); complete_substitutions_array($substitutionarray, $langs, $object); @@ -1020,7 +1020,7 @@ class doc_generic_project_odt extends ModelePDFProjects } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 17ae9f29ddf..49e4586d07b 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -35,11 +35,12 @@ class mod_project_simple extends ModeleNumRefProjects var $prefix='PJ'; var $error=''; var $nom = "Simple"; + var $name = "Simple"; - /** + /** * Return description of numbering module - * + * * @return string Text with description */ function info() @@ -49,9 +50,9 @@ class mod_project_simple extends ModeleNumRefProjects } - /** + /** * Return an example of numbering module values - * + * * @return string Example */ function getExample() @@ -62,7 +63,7 @@ class mod_project_simple extends ModeleNumRefProjects /** Test si les numeros deja en vigueur dans la base ne provoquent pas de * de conflits qui empechera cette numerotation de fonctionner. - * + * * @return boolean false si conflit, true si ok */ function canBeActivated() @@ -97,7 +98,7 @@ class mod_project_simple extends ModeleNumRefProjects /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Value if OK, 0 if KO @@ -130,7 +131,7 @@ class mod_project_simple extends ModeleNumRefProjects //$yymm = strftime("%y%m",time()); $yymm = strftime("%y%m",$date); - + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is else $num = sprintf("%04s",$max+1); @@ -139,9 +140,9 @@ class mod_project_simple extends ModeleNumRefProjects } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Next not used reference diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php index 5633a61f8ac..e76ed349b46 100644 --- a/htdocs/core/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -33,11 +33,12 @@ class mod_project_universal extends ModeleNumRefProjects var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $error = ''; var $nom = 'Universal'; + var $name = 'Universal'; /** * Renvoi la description du modele de numerotation - * + * * @return string Texte descripif */ function info() @@ -78,7 +79,7 @@ class mod_project_universal extends ModeleNumRefProjects /** * Renvoi un exemple de numerotation - * + * * @return string Example */ function getExample() @@ -99,7 +100,7 @@ class mod_project_universal extends ModeleNumRefProjects /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Value if OK, 0 if KO @@ -126,9 +127,9 @@ class mod_project_universal extends ModeleNumRefProjects } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Next not used reference diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index dd70a49f3e1..28b458732ab 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -438,7 +438,7 @@ class doc_generic_task_odt extends ModelePDFTask // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, ); complete_substitutions_array($substitutionarray, $langs, $object); diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php index eb8928d3b8f..0e7b416d72e 100644 --- a/htdocs/core/modules/project/task/mod_task_simple.php +++ b/htdocs/core/modules/project/task/mod_task_simple.php @@ -35,11 +35,12 @@ class mod_task_simple extends ModeleNumRefTask var $prefix='TK'; var $error=''; var $nom = "Simple"; + var $name = "Simple"; - /** + /** * Return description of numbering module - * + * * @return string Text with description */ function info() @@ -49,9 +50,9 @@ class mod_task_simple extends ModeleNumRefTask } - /** + /** * Return an example of numbering module values - * + * * @return string Example */ function getExample() @@ -62,7 +63,7 @@ class mod_task_simple extends ModeleNumRefTask /** Test si les numeros deja en vigueur dans la base ne provoquent pas de * de conflits qui empechera cette numerotation de fonctionner. - * + * * @return boolean false si conflit, true si ok */ function canBeActivated() @@ -98,7 +99,7 @@ class mod_task_simple extends ModeleNumRefTask /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Task $task Object Task * @return string Value if OK, 0 if KO @@ -130,7 +131,7 @@ class mod_task_simple extends ModeleNumRefTask //$yymm = strftime("%y%m",time()); $yymm = strftime("%y%m",$date); - + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is else $num = sprintf("%04s",$max+1); @@ -139,9 +140,9 @@ class mod_task_simple extends ModeleNumRefTask } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Task $task Object task * @return string Next not used reference diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php index 1e99f904116..529814079c1 100644 --- a/htdocs/core/modules/project/task/mod_task_universal.php +++ b/htdocs/core/modules/project/task/mod_task_universal.php @@ -33,11 +33,12 @@ class mod_task_universal extends ModeleNumRefTask var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $error = ''; var $nom = 'Universal'; + var $name = 'Universal'; /** * Renvoi la description du modele de numerotation - * + * * @return string Texte descripif */ function info() @@ -78,7 +79,7 @@ class mod_task_universal extends ModeleNumRefTask /** * Renvoi un exemple de numerotation - * + * * @return string Example */ function getExample() @@ -99,7 +100,7 @@ class mod_task_universal extends ModeleNumRefTask /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Value if OK, 0 if KO @@ -126,9 +127,9 @@ class mod_task_universal extends ModeleNumRefTask } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Next not used reference diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index f216d69a0fd..4b662e19564 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -311,7 +311,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -518,7 +518,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 1b042f3a0d6..1cafa394e66 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -730,7 +730,7 @@ class pdf_azur extends ModelePDFPropales if (! empty($conf->global->FACTURE_CHQ_NUMBER)) { $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE); - + if ($conf->global->FACTURE_CHQ_NUMBER > 0) { $account = new Account($this->db); @@ -1328,12 +1328,12 @@ class pdf_azur extends ModelePDFPropales { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 88b6e65bf01..c24070c2e23 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -30,12 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' /** - * \class mod_codeclient_elephant - * \brief Class to manage third party code with elephant rule + * Class to manage third party code with elephant rule */ class mod_codeclient_elephant extends ModeleThirdPartyCode { var $nom='Elephant'; // Nom du modele + var $name='Elephant'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 27155847bf0..94c9c04d2e2 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -39,6 +39,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode */ var $nom='Leopard'; // Nom du modele + var $name='Leopard'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index 4c735930820..88ec1a6e8db 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -28,12 +28,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' /** - * \class mod_codeclient_monkey - * \brief Classe permettant la gestion monkey des codes tiers + * Classe permettant la gestion monkey des codes tiers */ class mod_codeclient_monkey extends ModeleThirdPartyCode { var $nom='Monkey'; // Nom du modele + var $name='Monkey'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null @@ -52,6 +52,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode function __construct() { $this->nom = "Monkey"; + $this->name = "Monkey"; $this->version = "dolibarr"; $this->code_null = 1; $this->code_modifiable = 1; diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 57d8f0c20a6..1efc062ab2c 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -32,7 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' class mod_codecompta_aquarium extends ModeleAccountancyCode { var $nom='Aquarium'; - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' + var $name='Aquarium'; + var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $prefixcustomeraccountancycode; var $prefixsupplieraccountancycode; @@ -73,7 +74,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $texte.= ''; $s1= $form->textwithpicto('',$tooltip,1,1); $s2= $form->textwithpicto('',$tooltip,1,1); - $texte.= ''; $texte.= ''; $texte.= '
'.$langs->trans("ModuleCompanyCode".$this->nom,$s1,$s2)."
\n"; + $texte.= '
'.$langs->trans("ModuleCompanyCode".$this->name,$s1,$s2)."
\n"; $texte.= '		 
'; @@ -109,7 +110,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $i = 0; $this->db = $db; - dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->nom)?$societe->nom:'')); + dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:'')); // Regle gestion compte compta $codetouse=''; diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php index b2240f7a9fc..15099eb0538 100644 --- a/htdocs/core/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php @@ -26,13 +26,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' /** - * \class mod_codecompta_panicum - * \brief Class to manage accountancy code of thirdparties with Panicum rules + * Class to manage accountancy code of thirdparties with Panicum rules */ class mod_codecompta_panicum extends ModeleAccountancyCode { var $nom='Panicum'; - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' + var $name='Panicum'; + var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' /** @@ -51,7 +51,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode */ function info($langs) { - return $langs->trans("ModuleCompanyCode".$this->nom); + return $langs->trans("ModuleCompanyCode".$this->name); } /** diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 9a117ac8435..f1fc05d29db 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -184,7 +184,7 @@ abstract class ModeleThirdPartyCode $langs->load("admin"); $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->nom.'
'; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; if ($type == 0) $s.=$langs->trans("CustomerCodeDesc").'
'; if ($type == 1) $s.=$langs->trans("SupplierCodeDesc").'
'; diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 54ae66186df..5865d431132 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -1015,12 +1015,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $mysoc->nom; + else $socname = $mysoc->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($mysoc->nom); + $carac_client_name=$outputlangs->convToOutputCharset($mysoc->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target'); diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 0770af54520..1b094790195 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -140,24 +140,24 @@ class InterfaceLogevents extends DolibarrTriggers dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); // Initialisation donnees (date,duree,texte,desc) - $text=$langs->transnoentities("NewGroupCreated",$object->nom); - $desc=$langs->transnoentities("NewGroupCreated",$object->nom); + $text=$langs->transnoentities("NewGroupCreated",$object->name); + $desc=$langs->transnoentities("NewGroupCreated",$object->name); } elseif ($action == 'GROUP_MODIFY') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); // Initialisation donnees (date,duree,texte,desc) - $text=$langs->transnoentities("GroupModified",$object->nom); - $desc=$langs->transnoentities("GroupModified",$object->nom); + $text=$langs->transnoentities("GroupModified",$object->name); + $desc=$langs->transnoentities("GroupModified",$object->name); } elseif ($action == 'GROUP_DELETE') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); // Initialisation donnees (date,duree,texte,desc) - $text=$langs->transnoentities("GroupDeleted",$object->nom); - $desc=$langs->transnoentities("GroupDeleted",$object->nom); + $text=$langs->transnoentities("GroupDeleted",$object->name); + $desc=$langs->transnoentities("GroupDeleted",$object->name); } // If not found diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 4d2888d8aff..43ea3357a7d 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -79,8 +79,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("other"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); - $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name); + $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name); if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")"; $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php index f219e352c64..d1fda6b793a 100644 --- a/htdocs/ecm/docother.php +++ b/htdocs/ecm/docother.php @@ -104,8 +104,6 @@ print_fiche_titre($langs->trans("ECMAutoOrg")); //$head = societe_prepare_head($societe); -//dol_fiche_head($head, 'document', $societe->nom); - /* * Confirmation de la suppression d'une ligne produit @@ -113,7 +111,7 @@ print_fiche_titre($langs->trans("ECMAutoOrg")); if ($_GET['action'] == 'delete_file') { print $form->formconfirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile'); - + } // Construit liste des fichiers diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 188127f0304..e3cb8305562 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -44,8 +44,6 @@ llxHeader('',$langs->trans("Shipment"),$helpurl); print_fiche_titre($langs->trans("SendingsArea")); -//print ''; -//print '
'; print '
'; @@ -64,7 +62,7 @@ print "

\n"; $clause = " WHERE "; $sql = "SELECT e.rowid, e.ref"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", c.ref as commande_ref, c.rowid as commande_id"; $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'"; @@ -101,7 +99,7 @@ if ($resql) print $shipment->getNomUrl(1); print ""; print ''; - print ''.$obj->nom.''; + print ''.$obj->name.''; print ''; print ''; if ($obj->commande_id) print ''.$obj->commande_ref.''; @@ -116,7 +114,7 @@ if ($resql) /* * Commandes a traiter */ -$sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; +$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -151,7 +149,7 @@ if ($resql) print $orderstatic->getNomUrl(1); print ''; print ''; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->id=$obj->socid; print $companystatic->getNomUrl(1,'customer',32); print ''; @@ -169,7 +167,7 @@ print '
'; /* * Commandes en traitement */ -$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom, s.rowid as socid"; +$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -202,7 +200,7 @@ if ( $resql ) print $orderstatic->getNomUrl(1); print ''; print ''; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->id=$obj->socid; print $companystatic->getNomUrl(1,'customer'); print ''; @@ -224,7 +222,7 @@ else dol_print_error($db); * Last shipments */ $sql = "SELECT e.rowid, e.ref"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", c.ref as commande_ref, c.rowid as commande_id"; $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')"; @@ -255,7 +253,7 @@ if ($resql) $obj = $db->fetch_object($resql); print ''.img_object($langs->trans("ShowSending"),"sending").' '; print $obj->ref.''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; print ''; if ($obj->commande_id) { @@ -274,7 +272,6 @@ if ($resql) else dol_print_error($db); -//print ''; print '
'; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 4e1adf7221e..4cd62249545 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -125,7 +125,7 @@ if ($resql) } print_liste_field_titre($langs->trans("Status"),"ship2bill.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder); print "\n"; - + // Lignes des champs de filtre print ''; print ''; @@ -151,9 +151,9 @@ if ($resql) print ''; print ''.$langs->trans("All").' / '.$langs->trans("None").''; print ''; - + print "\n"; - + $var=True; while ($i < min($num,$limit)) @@ -171,7 +171,7 @@ if ($resql) print ''; $companystatic->id=$objp->socid; $companystatic->ref=$objp->socname; - $companystatic->nom=$objp->socname; + $companystatic->name=$objp->socname; print $companystatic->getNomUrl(1); print ''; // Date delivery planed diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 70d2745ab4c..4edd52809df 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref)) // Client print "".$langs->trans("Customer").""; print ''; - print ''.$soc->nom.''; + print ''.$soc->name.''; print ''; print ''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 4dfb8489c9c..b3858c5f4aa 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -71,7 +71,7 @@ llxHeader('', $langs->trans("Intervention")); $sql = "SELECT"; $sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description,"; $sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,"; -$sql.= " s.nom, s.rowid as socid, s.client"; +$sql.= " s.nom as name, s.rowid as socid, s.client"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s"; if (! $user->rights->societe->client->voir && empty($socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -160,7 +160,7 @@ if ($result) print $interventionstatic->getNomUrl(1); print "\n"; print ''; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->id=$objp->socid; $companystatic->client=$objp->client; print $companystatic->getNomUrl(1,'',44); diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php index fc891af53a3..a6695dc694d 100644 --- a/htdocs/fourn/ajax/getSupplierPrices.php +++ b/htdocs/fourn/ajax/getSupplierPrices.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ /** @@ -49,7 +48,7 @@ if (! empty($idprod)) $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn,"; $sql.= " pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice, pfp.charges, pfp.unitcharges,"; - $sql.= " s.nom"; + $sql.= " s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = pfp.fk_soc"; @@ -75,7 +74,7 @@ if (! empty($idprod)) $price = $objp->fprice * (1 - $objp->remise_percent / 100); $unitprice = $objp->unitprice * (1 - $objp->remise_percent / 100); - $title = $objp->nom.' - '.$objp->ref_fourn.' - '; + $title = $objp->name.' - '.$objp->ref_fourn.' - '; if ($objp->quantity == 1) { diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 71942a27f97..35620bf91fb 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -184,7 +184,7 @@ class Fournisseur extends Societe $arr = array(); - $sql = "SELECT s.rowid, s.nom"; + $sql = "SELECT s.rowid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fournisseur = 1"; @@ -196,16 +196,14 @@ class Fournisseur extends Societe if ($resql) { while ($obj=$this->db->fetch_object($resql)) - { - $arr[$obj->rowid] = stripslashes($obj->nom); - } - + { + $arr[$obj->rowid] = $obj->name; + } } else { dol_print_error($this->db); - $this->error=$this->db->error(); - + $this->error=$this->db->lasterror(); } return $arr; } diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index fd430ba4508..0f04ee91eaa 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -204,7 +204,7 @@ else if (! empty($conf->fournisseur->enabled)) { - $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -233,7 +233,7 @@ if (! empty($conf->fournisseur->enabled)) print ""; print ''; print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.""; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; $i++; } } @@ -300,7 +300,7 @@ print ''; */ $max=5; -$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom, s.rowid as socid"; +$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -353,7 +353,7 @@ if ($resql) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; print ''.dol_print_date($db->jdate($obj->tms),'day').''; print ''.$commandestatic->LibStatut($obj->fk_statut,5).''; print ''; @@ -369,7 +369,7 @@ else dol_print_error($db); * Orders to process */ /* - $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid"; $sql.=" FROM ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -421,7 +421,7 @@ print ''; print ''; -print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; +print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 37f2384b4b1..a2aa48351b0 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -66,7 +66,7 @@ if ($socid > 0) { $fourn = new Fournisseur($db); $fourn->fetch($socid); - $title .= ' ('.$fourn->nom.')'; + $title .= ' ('.$fourn->name.')'; } llxHeader('',$title); @@ -85,7 +85,7 @@ $offset = $conf->liste_limit * $page ; * Mode Liste */ -$sql = "SELECT s.rowid as socid, s.nom, cf.date_commande as dc,"; +$sql = "SELECT s.rowid as socid, s.nom as name, cf.date_commande as dc,"; $sql.= " cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc, cf.fk_user_author,cf.date_livraison,"; $sql.= " u.login"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,"; @@ -216,7 +216,7 @@ if ($resql) // Company print ''.img_object($langs->trans("ShowCompany"),"company").' '; - print $obj->nom.''."\n"; + print $obj->name.''."\n"; // Author $userstatic->id=$obj->fk_user_author; diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 4b2c61c02a5..a80cb00f2d3 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -88,7 +88,7 @@ if (! $sortorder) $sortorder="ASC"; if ($user->rights->fournisseur->facture->lire) { - $sql = "SELECT s.rowid as socid, s.nom,"; + $sql = "SELECT s.rowid as socid, s.nom as name,"; $sql.= " f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc,"; $sql.= " f.datef as df, f.date_lim_reglement as datelimite, "; $sql.= " f.paye as paye, f.rowid as facid, f.fk_statut"; @@ -144,7 +144,7 @@ if ($user->rights->fournisseur->facture->lire) $sql .= " AND f.ref_supplier LIKE '%".GETPOST('sf_re')."%'"; } - $sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut, s.rowid, s.nom"; + $sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.=$db->order($sortfield,$sortorder); if (! in_array("f.ref_supplier",explode(',',$sortfield))) $sql.= ", f.ref_supplier DESC"; @@ -173,7 +173,7 @@ if ($user->rights->fournisseur->facture->lire) if (! empty($late)) $param.='&late='.urlencode($late); $urlsource=str_replace('&','&',$param); - $titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->nom):$langs->trans("BillsSuppliersUnpaid")); + $titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->name):$langs->trans("BillsSuppliersUnpaid")); if ($option == 'late') $titre.=' ('.$langs->trans("Late").')'; else $titre.=' ('.$langs->trans("All").')'; @@ -250,7 +250,7 @@ if ($user->rights->fournisseur->facture->lire) print ''; $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; print $companystatic->getNomUrl(1,'supplier',32); print ''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 673ac3fea6f..e490c727a30 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -106,7 +106,7 @@ $formfile = new FormFile($db); llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores'); -$sql = "SELECT s.rowid as socid, s.nom, "; +$sql = "SELECT s.rowid as socid, s.nom as name, "; $sql.= " fac.rowid as facid, fac.ref, fac.ref_supplier, fac.datef, fac.date_lim_reglement as date_echeance,"; $sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -202,7 +202,7 @@ if ($resql) if (GETPOST("search_montant_ttc")) $param.='&search_montant_ttc='.urlencode(GETPOST("search_montant_ttc")); if (GETPOST("filtre") && GETPOST('filtre') != -1) $param.='&filtre='.urlencode(GETPOST("filtre")); - print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->nom":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print '
'; print ''; print ''; @@ -279,7 +279,7 @@ if ($resql) print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 302570330b7..831749b1904 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -249,7 +249,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $datefacture=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); $dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datefacture); - $sql = 'SELECT s.nom, s.rowid as socid,'; + $sql = 'SELECT s.nom as name, s.rowid as socid,'; $sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total'; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f'; @@ -274,14 +274,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''; print ''; - print ''; + print ''; print '
'.dol_trunc($obj->libelle,36).''; $supplierstatic->id=$obj->socid; - $supplierstatic->nom=$obj->nom; + $supplierstatic->name=$obj->name; print $supplierstatic->getNomUrl(1,'',12); print ''.price($obj->total_ht).''.price($obj->total_ttc).'
'; print ''; print ''; print '\n"; print ''; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index f0f825d3ff7..9da28281779 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -106,8 +106,8 @@ if (! empty($conf->fournisseur->enabled)) { $langs->load("orders"); - $sql = "SELECT cf.rowid, cf.ref, cf.total_ttc"; - $sql.= ", s.nom, s.rowid as socid"; + $sql = "SELECT cf.rowid, cf.ref, cf.total_ttc,"; + $sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; @@ -141,7 +141,7 @@ if (! empty($conf->fournisseur->enabled)) print ''; print ''; @@ -164,7 +164,7 @@ if (! empty($conf->fournisseur->enabled)) if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire) { $sql = "SELECT ff.ref_supplier, ff.rowid, ff.total_ttc, ff.type"; - $sql.= ", s.nom, s.rowid as socid"; + $sql.= ", s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; @@ -199,7 +199,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''; print ''; @@ -233,7 +233,7 @@ print '
'; * List last modified supliers */ $max=10; -$sql = "SELECT s.rowid as socid, s.nom, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur"; +$sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur"; $sql.= ", st.libelle as stcomm"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st"; @@ -267,7 +267,7 @@ if ($resql) print "
"; print '\n"; + print " socid."\">".$obj->name."\n"; print ''; print ''; print "\n"; diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index e3c7effebbf..d3f7e55c199 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -79,7 +79,7 @@ $thirdpartystatic=new Societe($db); $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('',$langs->trans("ThirdParty"),$help_url); -$sql = "SELECT s.rowid as socid, s.nom, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, "; +$sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, "; $sql.= "code_fournisseur, code_compta_fournisseur"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -199,7 +199,7 @@ if ($resql) $var=!$var; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->status=$obj->status; print ""; diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 684985ed261..824919400a2 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -234,7 +234,7 @@ if ($result > 0) * Liste des factures */ $allow_delete = 1 ; - $sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.rowid as socid'; + $sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom as name, s.rowid as socid'; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s'; $sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid'; $sql .= ' AND pf.fk_paiementfourn = '.$object->id; @@ -274,7 +274,7 @@ if ($result > 0) // Ref supplier print '\n"; // Third party - print ''; + print ''; // Expected to pay print ''; // Status diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 89c3928f134..a7ab0d0576f 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -88,7 +88,7 @@ if ($fourn_id) $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type,"; $sql.= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,"; -$sql.= " s.rowid as socid, s.nom"; +$sql.= " s.rowid as socid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; if ($catid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product"; @@ -108,7 +108,7 @@ if ($sref) } if ($snom) { - $sql .= natural_search('p.label', $snom); + $sql .= natural_search('s.nom', $snom); } if($catid) { @@ -136,7 +136,7 @@ if ($resql) exit; } - if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->nom); + if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->name); else $texte = $langs->trans("List"); llxHeader("","",$texte); @@ -212,7 +212,7 @@ if ($resql) print ''."\n"; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->id=$objp->socid; print '"; if ($agentid > 0) { $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; print "\n"; } diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index c0f7e41b97e..fbc947a7cc9 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -161,7 +161,7 @@ print "
'.$langs->trans('Payment').'
'.$langs->trans('Company').''; $supplierstatic->id=$obj->socid; - $supplierstatic->name=$obj->nom; + $supplierstatic->name=$obj->name; print $supplierstatic->getNomUrl(1,'supplier'); print '
'.$langs->trans('Date').''; @@ -460,7 +460,7 @@ if (empty($action)) $search_company=GETPOST('search_company'); $sql = 'SELECT p.rowid as pid, p.datep as dp, p.amount as pamount, p.num_paiement,'; - $sql.= ' s.rowid as socid, s.nom,'; + $sql.= ' s.rowid as socid, s.nom as name,'; $sql.= ' c.libelle as paiement_type,'; $sql.= ' ba.rowid as bid, ba.label,'; if (!$user->rights->societe->client->voir) $sql .= ' sc.fk_soc, sc.fk_user,'; @@ -565,7 +565,7 @@ if (empty($action)) print ''.dol_print_date($db->jdate($objp->dp),'day')."'; - if ($objp->socid) print ''.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->nom,32).''; + if ($objp->socid) print ''.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->name,32).''; else print ' '; print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=0; print $companystatic->getNomUrl(1,'',16); print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=0; print $companystatic->getNomUrl(1,'',16); print '
'.img_object($langs->trans("ShowSupplier"),"company").''; - print " socid."\">".$obj->nom."'.$obj->code_fournisseur.' '.dol_print_date($db->jdate($obj->tms),'day').'
'.$objp->ref_supplier."'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.''.img_object($langs->trans('ShowCompany'),'company').' '.$objp->name.''.price($objp->total_ttc).''.$objp->label.''; if ($companystatic->id > 0) print $companystatic->getNomUrl(1,'supplier'); diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 119a4980a78..5ff23b45ec0 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -780,7 +780,7 @@ class Holiday extends CommonObject $groupe = $objet->value; // On liste les groupes de Dolibarr - $sql = "SELECT u.rowid, u.nom"; + $sql = "SELECT u.rowid, u.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as u"; $sql.= " ORDER BY u.rowid"; @@ -798,9 +798,9 @@ class Holiday extends CommonObject while ($obj = $this->db->fetch_object($result)) { if($groupe==$obj->rowid) { - $selectGroup.= ''."\n"; + $selectGroup.= ''."\n"; } else { - $selectGroup.= ''."\n"; + $selectGroup.= ''."\n"; } } $selectGroup.= ''."\n"; @@ -820,7 +820,7 @@ class Holiday extends CommonObject /** * Met à jour une option du module Holiday Payés * - * @param string $name nom du paramètre de configuration + * @param string $name name du paramètre de configuration * @param string $value vrai si mise à jour OK sinon faux * @return boolean ok or ko */ @@ -842,7 +842,7 @@ class Holiday extends CommonObject /** * Retourne la valeur d'un paramètre de configuration * - * @param string $name nom du paramètre de configuration + * @param string $name name du paramètre de configuration * @return string retourne la valeur du paramètre */ function getConfCP($name) @@ -955,7 +955,7 @@ class Holiday extends CommonObject /** * Retourne un checked si vrai * - * @param string $name nom du paramètre de configuration + * @param string $name name du paramètre de configuration * @return string retourne checked si > 0 */ function getCheckOption($name) { diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 7f9c4130284..772ab34c291 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -268,7 +268,7 @@ if ($action == 'create') } print ''; print ''; - print ''; + print ''; print '
'.$langs->trans("Customer").''.$soc->nom.''.$soc->name.''; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index df43f39ff2e..3dd0fcd0b49 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -106,7 +106,7 @@ print "
"; print ''; $sql = "SELECT"; -if ($agentid > 0) $sql.= " s.rowid as socid, s.nom, s.code_client, s.client,"; +if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,"; $sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,"; $sql.= " sum(d.total_ht) as selling_price,"; $sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; @@ -201,7 +201,7 @@ if ($result) print "
".$companystatic->getNomUrl(1,'customer')."
"; print ''; $sql = "SELECT"; -$sql.= " s.rowid as socid, s.nom, s.code_client, s.client,"; +$sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,"; if ($client) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,"; $sql.= " sum(d.total_ht) as selling_price,"; $sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; @@ -258,7 +258,7 @@ if ($result) } else { $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; print "".$companystatic->getNomUrl(1,'customer')."\n"; } diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 0e6734c0916..46cf4245b60 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -129,7 +129,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.code_client,"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,"; $sql.= " f.datef, f.paye, f.fk_statut as statut,"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,"; @@ -206,7 +206,7 @@ if ($id > 0 || ! empty($ref)) $invoicestatic->ref=$objp->facnumber; print $invoicestatic->getNomUrl(1); print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->datef),'day').""; diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index c1ceb4faa8e..bcc1146c714 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -392,7 +392,7 @@ class Opensurveysondage extends CommonObject function fetch_lines() { $ret=array(); - $sql = "SELECT id_users, nom, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; + $sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'"; $resql=$this->db->query($sql); @@ -403,7 +403,7 @@ class Opensurveysondage extends CommonObject while ($i < $num) { $obj=$this->db->fetch_object($resql); - $tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->nom, 'reponses'=>$obj->reponses); + $tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses); $ret[]=$tmp; $i++; diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php index fec8174a7ef..7096ae7ad99 100644 --- a/htdocs/opensurvey/exportcsv.php +++ b/htdocs/opensurvey/exportcsv.php @@ -82,7 +82,7 @@ if (strpos($object->sujet,'@') !== false) } -$sql ='SELECT nom, reponses'; +$sql ='SELECT nom as name, reponses'; $sql.=' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage='" . $db->escape($numsondage) . "'"; $sql.=" ORDER BY id_users"; @@ -95,8 +95,8 @@ if ($resql) { $obj=$db->fetch_object($resql); - // Le nom de l'utilisateur - $nombase=str_replace("°","'",$obj->nom); + // Le name de l'utilisateur + $nombase=str_replace("°","'",$obj->name); $input.=$nombase.';'; //affichage des resultats diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php index 9b9f2e9ef8c..1b39391b67c 100644 --- a/htdocs/opensurvey/public/studs.php +++ b/htdocs/opensurvey/public/studs.php @@ -113,7 +113,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout $nom=substr(GETPOST("nom"),0,64); // Check if vote already exists - $sql = 'SELECT id_users, nom FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users"; + $sql = 'SELECT id_users, nom as name'; + $sql.= ' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs'; + $sql.= ' WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users"; $resql = $db->query($sql); $num_rows = $db->num_rows($resql); if ($num_rows > 0) @@ -389,7 +391,7 @@ else $sumfor = array(); $sumagainst = array(); $compteur = 0; -$sql ="SELECT id_users, nom, id_sondage, reponses"; +$sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; $resql=$db->query($sql); @@ -406,7 +408,7 @@ while ($compteur < $num) $ensemblereponses = $obj->reponses; // ligne d'un usager pré-authentifié - $mod_ok = (in_array($obj->nom, $listofvoters)); + $mod_ok = (in_array($obj->name, $listofvoters)); if (!$mod_ok && !$object->allow_spy) { $compteur++; @@ -416,7 +418,7 @@ while ($compteur < $num) print ''."\n"; // Name - print ''.dol_htmlentities($obj->nom).''."\n"; + print ''.dol_htmlentities($obj->name).''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index 3bfd3209343..226bc0c0465 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -83,7 +83,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout $nom=substr(GETPOST("nom"),0,64); // Check if vote already exists - $sql = 'SELECT id_users, nom'; + $sql = 'SELECT id_users, nom as name'; $sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs'; $sql.= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."'"; $sql.= ' ORDER BY id_users'; @@ -283,7 +283,7 @@ for ($i = 0; $i < $nblignes; $i++) // Loop on each answer $compteur = 0; - $sql ="SELECT id_users, nom, id_sondage, reponses"; + $sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; $resql=$db->query($sql); @@ -341,7 +341,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) // Clean current answer to remove deleted columns $compteur = 0; - $sql ="SELECT id_users, nom, id_sondage, reponses"; + $sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; dol_syslog('sql='.$sql); @@ -756,7 +756,7 @@ else $sumfor = array(); $sumagainst = array(); $compteur = 0; -$sql ="SELECT id_users, nom, id_sondage, reponses"; +$sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; dol_syslog('sql='.$sql); @@ -780,7 +780,7 @@ while ($compteur < $num) } // Name - print ''.dol_htmlentities($obj->nom).''."\n"; + print ''.dol_htmlentities($obj->name).''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 09bacc3764f..78c500c7551 100644 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -281,7 +281,7 @@ function html_print_paybox_footer($fromcompany,$langs) print '

'."\n"; print '
'."\n"; - print $fromcompany->nom.'
'; + print $fromcompany->name.'
'; print $line1.'
'; print $line2; print '
'."\n"; diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index cc678fce011..c1440d80245 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -154,7 +154,7 @@ function html_print_paypal_footer($fromcompany,$langs) print '

'."\n"; print '
'."\n"; - print $fromcompany->nom.'
'; + print $fromcompany->name.'
'; print $line1.'
'; print $line2; print '
'."\n"; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index e79ffcf13c6..7ecc390516d 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -48,7 +48,7 @@ $select_pricing_rules=array( 'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'), // Several prices according to a customer level 'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer') // Different price for each customer ); -if ($conf->global->MAIN_FEATURES_LEVEL==2) +if ($conf->global->MAIN_FEATURES_LEVEL==2) { $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity'); $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity'); @@ -125,7 +125,7 @@ if ($action == 'pricingrule') else { $multirule=explode('&',$princingrules); - foreach($multirule as $rulesselected) + foreach($multirule as $rulesselected) { $res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity); } @@ -137,8 +137,8 @@ if ($action == 'pricingrule') $res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity); } } - - } + + } } else if ($action == 'sousproduits') { @@ -262,7 +262,7 @@ foreach ($dirproduct as $dirroot) $var = !$var; print ''."\n"; - print ''.$modCodeProduct->nom.''."\n"; + print ''.$modCodeProduct->name.''."\n"; print ''.$modCodeProduct->info($langs).''."\n"; print ''.$modCodeProduct->getExample($langs).''."\n"; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index bf96d63459e..472b9ce4a45 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -118,7 +118,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,"; $sql.= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -168,7 +168,7 @@ if ($id > 0 || ! empty($ref)) print ''.img_object($langs->trans("ShowOrder"),"order").' '; print $objp->ref; print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->date_commande)).""; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 93c880695d3..73de0374ebe 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -110,7 +110,7 @@ if ($id > 0 || ! empty($ref)) print ""; print ''; - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " c.rowid, c.total_ht as total_ht, c.ref,"; $sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref)) print ""; print ''.$commandestatic->getNomUrl(1)."\n"; print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ''.dol_print_date($db->jdate($objp->date_commande)).""; print "".$objp->qty."\n"; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 6c73d0183fa..189ead2eaa2 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -124,7 +124,7 @@ if ($id > 0 || ! empty($ref)) $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')",1,0).') as nb_late,'; $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; $sql.= " c.rowid as rowid, c.date_contrat, c.statut as statut,"; - $sql.= " s.nom, s.rowid as socid, s.code_client"; + $sql.= " s.nom as name, s.rowid as socid, s.code_client"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."contrat as c"; @@ -174,7 +174,7 @@ if ($id > 0 || ! empty($ref)) print ''.img_object($langs->trans("ShowContract"),"contract").' '; print $objp->rowid; print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->date_contrat)).""; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 1959d53035e..39768262f10 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->facture->lire) { - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " f.facnumber, f.total as total_ht,"; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; @@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref)) $invoicestatic->ref=$objp->facnumber; print $invoicestatic->getNomUrl(1); print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ''; print dol_print_date($db->jdate($objp->datef),'day').""; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 1b07ce3d1ba..d8e30bdae6a 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,"; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -172,7 +172,7 @@ if ($id > 0 || ! empty($ref)) $supplierinvoicestatic->ref=$objp->facnumber; print $supplierinvoicestatic->getNomUrl(1); print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->datef)).""; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 3368efa2b56..566961d9c5f 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $sql = "SELECT DISTINCT s.nom, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,"; + $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,"; $sql.= "p.datep, p.fk_statut as statut, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -161,7 +161,7 @@ if ($id > 0 || ! empty($ref)) print ''.img_object($langs->trans("ShowPropal"),"propal").' '; print $objp->ref; print ''."\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print ''; print dol_print_date($db->jdate($objp->datep)).""; print "".$objp->qty."\n"; diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 07aa68a7a98..71fe1407a2d 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -77,7 +77,7 @@ if (!$sortfield) $sortfield = 'cf.date_creation'; $offset = $conf->liste_limit * $page ; -$sql = 'SELECT s.rowid as socid, s.nom, cf.date_creation as dc,'; +$sql = 'SELECT s.rowid as socid, s.nom as name, cf.date_creation as dc,'; $sql.= ' cf.rowid, cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,'; $sql.= ' u.login'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf'; @@ -273,7 +273,7 @@ if ($resql) print ''. ''. img_object($langs->trans('ShowCompany'), 'company'). ' '. - $obj->nom . ''; + $obj->name . ''; // Author $userstatic->id = $obj->fk_user_author; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index bf9951129ad..915d4ef69ef 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -349,7 +349,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var=!$var; - print ''.$module->nom."\n"; + print ''.$module->name."\n"; print $module->info(); print ''; @@ -450,7 +450,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var=!$var; - print ''.$module->nom."\n"; + print ''.$module->name."\n"; print $module->info(); print ''; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 7e324841af2..d9fb4b4dce9 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -103,7 +103,7 @@ print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right" print "\n"; $sql = "SELECT count(p.rowid) as nb"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; $sql.= " WHERE p.entity = ".$conf->entity; @@ -127,7 +127,7 @@ if ( $resql ) if ($obj->socid) { $socstatic->id=$obj->socid; - $socstatic->nom=$obj->nom; + $socstatic->name=$obj->name; print $socstatic->getNomUrl(1); } else diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 2a427558eb4..b4260e8ea91 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -39,7 +39,7 @@ if ($socid > 0) { $soc = new Societe($db); $soc->fetch($socid); - $title .= ' ('.$soc->nom.')'; + $title .= ' ('.$soc->name.')'; } if (!$user->rights->projet->lire) accessforbidden(); @@ -78,7 +78,7 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$min $sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_statut, p.public, p.fk_user_creat"; $sql.= ", p.datec as date_create, p.dateo as date_start, p.datee as date_end"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; $sql.= " WHERE p.entity = ".$conf->entity; @@ -181,7 +181,7 @@ if ($resql) if ($objp->socid) { $socstatic->id=$objp->socid; - $socstatic->nom=$objp->nom; + $socstatic->name=$objp->name; print $socstatic->getNomUrl(1); } else diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index b1680d2803e..f17a9d9f298 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -84,7 +84,7 @@ if ($action == 'updateoptions') setEventMessage($langs->trans("Error"), 'errors'); } } - + if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT')) { $contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha'); @@ -344,7 +344,7 @@ foreach ($dirsociete as $dirroot) $var = !$var; print ''."\n"; - print ''.$modCodeTiers->nom.''."\n"; + print ''.$modCodeTiers->name.''."\n"; print ''.$modCodeTiers->info($langs).''."\n"; print ''.$modCodeTiers->getExample($langs).''."\n"; @@ -420,7 +420,7 @@ foreach ($dirsociete as $dirroot) $var = !$var; print ''; - print ''.$modCodeCompta->nom."\n"; + print ''.$modCodeCompta->name."\n"; print $modCodeCompta->info($langs); print ''; print ''.$modCodeCompta->getExample($langs)."\n"; @@ -569,7 +569,7 @@ foreach ($dirsociete as $dirroot) } $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1); - + print ''; print $form->textwithpicto('',$htmltooltip,1,0); print ''; @@ -632,19 +632,19 @@ while ($i < $nbofloop) if ($profid[$i][1]!='-') { $var = !$var; - + print ''; print ''.$profid[$i][0]."\n"; print $profid[$i][1]; print ''; - + $idprof_unique ='SOCIETE_IDPROF'.($i+1).'_UNIQUE'; $idprof_mandatory ='SOCIETE_IDPROF'.($i+1).'_MANDATORY'; $idprof_invoice_mandatory ='SOCIETE_IDPROF'.($i+1).'_INVOICE_MANDATORY'; $verif=(empty($conf->global->$idprof_unique)?false:true); $mandatory=(empty($conf->global->$idprof_mandatory)?false:true); $invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true); - + if ($verif) { print ''; @@ -657,7 +657,7 @@ while ($i < $nbofloop) print img_picto($langs->trans("Disabled"),'switch_off'); print ''; } - + if ($mandatory) { print ''; @@ -670,7 +670,7 @@ while ($i < $nbofloop) print img_picto($langs->trans("Disabled"),'switch_off'); print ''; } - + if ($invoice_mandatory) { print ''; @@ -683,7 +683,7 @@ while ($i < $nbofloop) print img_picto($langs->trans("Disabled"),'switch_off'); print ''; } - + print "\n"; } $i++; diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 63f5214b319..b94262bbb52 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -305,7 +305,7 @@ abstract class ActionsCardCommon if ($result >= 0) { - header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->nom.""); + header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->name.""); exit; } else diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index ec16128fb8a..f08a4a2455c 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -112,7 +112,7 @@ class Address if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { - $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->nom); + $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name); } $this->db->rollback(); @@ -176,7 +176,7 @@ class Address $this->fax = preg_replace("/\./","",$this->fax); $this->note = trim($this->note); - $result = $this->verify(); // Verifie que nom et label obligatoire + $result = $this->verify(); // Verifie que name et label obligatoire if ($result >= 0) { @@ -236,7 +236,7 @@ class Address { global $langs, $conf; - $sql = 'SELECT rowid, nom, client, fournisseur'; + $sql = 'SELECT rowid, nom as name, client, fournisseur'; $sql .= ' FROM '.MAIN_DB_PREFIX.'societe'; $sql .= ' WHERE rowid = '.$socid; @@ -247,7 +247,7 @@ class Address { $obj = $this->db->fetch_object($resqlsoc); - $this->socname = $obj->nom; + $this->socname = $obj->name; $this->socid = $obj->rowid; $this->id = $obj->rowid; $this->client = $obj->client; @@ -440,7 +440,7 @@ class Address */ function info($id) { - $sql = "SELECT s.rowid, s.nom, datec as date_creation, tms as date_modification,"; + $sql = "SELECT s.rowid, s.nom as name, datec as date_creation, tms as date_modification,"; $sql.= " fk_user_creat, fk_user_modif"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE s.rowid = ".$id; @@ -465,7 +465,7 @@ class Address $muser->fetch($obj->fk_user_modif); $this->user_modification = $muser; } - $this->ref = $obj->nom; + $this->ref = $obj->name; $this->date_creation = $this->db->jdate($obj->date_creation); $this->date_modification = $this->db->jdate($obj->date_modification); } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index e446d5a9e76..6d80189c7be 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -624,7 +624,7 @@ class Societe extends CommonObject // Clean parameters $this->id = $id; $this->name = $this->name?trim($this->name):trim($this->nom); - $this->nom = trim($this->nom); // TODO obsolete + $this->nom = $this->name; // For backward compatibility $this->ref_ext = trim($this->ref_ext); $this->address = $this->address?trim($this->address):trim($this->address); $this->zip = $this->zip?trim($this->zip):trim($this->zip); diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 1832e7851ea..a1042087faf 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -51,13 +51,12 @@ $pagenext = $page + 1; /* - * Mode Liste - * + * View */ llxHeader(); -$sql = "SELECT s.nom, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid"; +$sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,"; $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,"; $sql.= " ".MAIN_DB_PREFIX."notify_def as n,"; @@ -94,7 +93,7 @@ if ($result) $var=!$var; print ""; - print "socid."\">".$obj->nom."\n"; + print "socid."\">".$obj->name."\n"; print "".dolGetFirstLastname($obj->firstname, $obj->lastname)."\n"; print "".$obj->titre."\n"; print "\n"; diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 3b6be065879..e096f8fc470 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -5,7 +5,7 @@ * Copyright (C) 2012 Florian Henry * Copyright (C) 2014 Juanjo Menent * Copyright (C) 2014 Alexis Algoud - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or @@ -41,6 +41,7 @@ class UserGroup extends CommonObject var $id; // Group id var $entity; // Entity of group var $nom; // Name of group + var $name; // Name of group // deprecated var $globalgroup; // Global group var $note; // Note on group var $datec; // Creation date of group @@ -69,7 +70,7 @@ class UserGroup extends CommonObject * Charge un objet group avec toutes ces caracteristiques (excpet ->members array) * * @param int $id id du groupe a charger - * @param string $groupname nom du groupe a charger + * @param string $groupname name du groupe a charger * @return int <0 if KO, >0 if OK */ function fetch($id='', $groupname='') @@ -99,7 +100,7 @@ class UserGroup extends CommonObject $this->ref = $obj->rowid; $this->entity = $obj->entity; $this->name = $obj->name; - $this->nom = $obj->name; //Deprecated + $this->nom = $obj->name; // Deprecated $this->note = $obj->note; $this->datec = $obj->datec; $this->datem = $obj->datem; @@ -113,8 +114,8 @@ class UserGroup extends CommonObject $extrafields=new ExtraFields($this->db); $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); $this->fetch_optionals($this->id,$extralabels); - - + + // Sav current LDAP Current DN //$this->ldap_dn = $this->_load_ldap_dn($this->_load_ldap_info(),0); } @@ -626,8 +627,8 @@ class UserGroup extends CommonObject if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers } - - + + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('groupdao')); $parameters=array(); @@ -644,10 +645,10 @@ class UserGroup extends CommonObject } } else if ($reshook < 0) $error++; - + if ($error > 0) { $error++; $this->db->rollback(); return -1; } else $this->db->commit(); - + return $this->id; } else @@ -679,7 +680,7 @@ class UserGroup extends CommonObject $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."usergroup SET "; - $sql.= " nom = '" . $this->db->escape($this->nom) . "'"; + $sql.= " nom = '" . $this->db->escape($this->name) . "'"; $sql.= ", entity = " . $this->db->escape($entity); $sql.= ", note = '" . $this->db->escape($this->note) . "'"; $sql.= " WHERE rowid = " . $this->id; @@ -695,7 +696,7 @@ class UserGroup extends CommonObject if ($result < 0) { $error++; } // End call triggers } - + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('groupdao')); $parameters=array(); @@ -712,7 +713,7 @@ class UserGroup extends CommonObject } } else if ($reshook < 0) $error++; - + if (! $error) { $this->db->commit(); @@ -767,8 +768,8 @@ class UserGroup extends CommonObject $info["objectclass"]=explode(',',$conf->global->LDAP_GROUP_OBJECT_CLASS); // Champs - if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->nom; - //if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->nom; + if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->name; + //if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->name; if ($this->note && ! empty($conf->global->LDAP_GROUP_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION] = $this->note; if (! empty($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS)) { @@ -805,7 +806,7 @@ class UserGroup extends CommonObject $this->ref = 'SPECIMEN'; $this->specimen=1; - $this->nom='DOLIBARR GROUP SPECIMEN'; + $this->name='DOLIBARR GROUP SPECIMEN'; $this->note='This is a note'; $this->datec=time(); $this->datem=time(); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 4bf4cb35ad9..a1930f7c027 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -95,12 +95,13 @@ if ($action == 'add') setEventMessage($langs->trans("NameNotDefined"), 'errors'); $action="create"; // Go back to create page } else { - $object->nom = trim($_POST["nom"]); + $object->nom = trim($_POST["nom"]); // For backward compatibility + $object->name = trim($_POST["nom"]); $object->note = trim($_POST["note"]); // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$object); - + if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0; else $object->entity = $_POST["entity"]; @@ -120,7 +121,7 @@ if ($action == 'add') $db->rollback(); $langs->load("errors"); - setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->nom), 'errors'); + setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->name), 'errors'); $action="create"; // Go back to create page } } @@ -176,7 +177,8 @@ if ($action == 'update') $object->oldcopy=dol_clone($object); - $object->nom = trim($_POST["group"]); + $object->name = trim($_POST["group"]); + $object->nom = $this->name; // For backward compatibility $object->note = dol_htmlcleanlastbr($_POST["note"]); // Fill array 'array_options' with data from add form @@ -251,7 +253,7 @@ if ($action == 'create') $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90); $doleditor->Create(); print "\n"; - + // Other attributes $parameters=array('object' => $object, 'colspan' => ' colspan="2"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -259,7 +261,7 @@ if ($action == 'create') { print $object->showOptionals($extrafields,'edit'); } - + print "\n"; print '

'; @@ -331,7 +333,7 @@ else print ''.$langs->trans("Note").''; print ''.dol_htmlentitiesbr($object->note).' '; print "\n"; - + // Other attributes $parameters=array('colspan' => ' colspan="2"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -339,7 +341,7 @@ else { print $object->showOptionals($extrafields); } - + print "\n"; print ''; @@ -531,7 +533,7 @@ else { print $object->showOptionals($extrafields,'edit'); } - + print "\n"; print '

'; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 547a89d3451..00af5b0e6d2 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -57,7 +57,7 @@ llxHeader(); print_fiche_titre($langs->trans("ListOfGroups")); -$sql = "SELECT g.rowid, g.nom, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb"; +$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid"; if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity))) @@ -101,7 +101,7 @@ if ($resql) $var=!$var; print ""; - print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.''; if (! $obj->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index c3e147620c2..eaee979e802 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -104,7 +104,7 @@ print ''; // Name print ''.$langs->trans("Name").''; -print ''.$fgroup->nom; +print ''.$fgroup->name; if (!$fgroup->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 5c52fa80a50..a910753c643 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -199,7 +199,7 @@ if ($id) // Nom print ''.$langs->trans("Name").''; - print ''.$fgroup->nom.''; + print ''.$fgroup->name.''; if (! $fgroup->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index c888dcdf632..c9b3693f1ac 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -200,7 +200,7 @@ if ($canreadperms) { $max=5; - $sql = "SELECT g.rowid, g.nom, g.note, g.entity, g.datec"; + $sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity))) { @@ -230,7 +230,7 @@ if ($canreadperms) $var=!$var; print ""; - print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.''; if (! $obj->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 30b0c9b3a8e..ac1ebc9e1c5 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -73,7 +73,7 @@ $sql.= " u.tms as datem,"; $sql.= " u.datelastlogin,"; $sql.= " u.ldap_sid, u.statut, u.entity,"; $sql.= " u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2,"; -$sql.= " s.nom, s.canvas"; +$sql.= " s.nom as name, s.canvas"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid"; @@ -161,7 +161,7 @@ if ($result) if ($obj->fk_societe) { $companystatic->id=$obj->fk_societe; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1); } diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index c6bed990c14..93406276ead 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -136,19 +136,20 @@ if ($result >= 0) { $group = new UserGroup($db); $group->fetch('', $ldapgroup[$conf->global->LDAP_KEY_GROUPS]); - $group->nom = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME]; + $group->name = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME]; + $group->nom = $group->name; // For backward compatibility $group->note = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION]; $group->entity = $conf->entity; //print_r($ldapgroup); if($group->id > 0) { // Group update - print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->nom; + print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name; $res=$group->update(); if ($res > 0) { - print ' --> Updated group id='.$group->id.' name='.$group->nom; + print ' --> Updated group id='.$group->id.' name='.$group->name; } else { @@ -157,12 +158,12 @@ if ($result >= 0) } print "\n"; } else { // Group creation - print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->nom; + print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name; $res=$group->create(); if ($res > 0) { - print ' --> Created group id='.$group->id.' name='.$group->nom; + print ' --> Created group id='.$group->id.' name='.$group->name; } else { diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php index f9db37ab79e..b43b9d230b3 100644 --- a/test/phpunit/AdherentTest.php +++ b/test/phpunit/AdherentTest.php @@ -530,7 +530,33 @@ class AdherentTest extends PHPUnit_Framework_TestCase print __METHOD__." id=".$localobject->id." result=".$result."\n"; $this->assertLessThan($result, 0); - return $result; + return $localobject; } + + /** + * testAdherentTypeDelete + * + * @param Adherent $localobject Member instance + * @return void + * + * @depends testAdherentDelete + * The depends says test is run only if previous is ok + */ + public function testAdherentTypeDelete($localobject) + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $localobjectat=new AdherentType($this->savdb); + $result=$localobjectat->fetch($localobject->typeid); + $result=$localobjectat->delete(); + print __METHOD__." result=".$result."\n"; + $this->assertLessThan($result, 0); + + return $localobject->id; + } } From 5601c979ab66333c9cfe8e67d53cb63795e6a718 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Oct 2014 17:29:04 +0200 Subject: [PATCH 0162/1190] New: Can search list of thirdparties from web service on part of name. --- ChangeLog | 1 + htdocs/webservices/server_thirdparty.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d93f5199c40..929981d4ae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ For developers: - New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card. - New: renamed table llx_c_pays to llx_c_country & libelle field to label. - New: Added hook "formConfirm" and "doActions" for fichinter card +- New: Can search list of thirdparties from web service on part of name. - Qual: Renamed table llx_c_civilite into llx_c_civility, field civilite into label in the same table, and field civilite into civility in other table. diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index 301511e0115..2d104eb96a1 100644 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -629,7 +629,7 @@ function updateThirdParty($authentication,$thirdparty) * getListOfThirdParties * * @param array $authentication Array of authentication information - * @param array $filterthirdparty Filter fields + * @param array $filterthirdparty Filter fields (key=>value to filer on. For example 'client'=>2, 'supplier'=>1, 'category'=>idcateg, 'name'=>'searchstring', ...) * @return array Array result */ function getListOfThirdParties($authentication,$filterthirdparty) @@ -661,9 +661,10 @@ function getListOfThirdParties($authentication,$filterthirdparty) $sql.=" WHERE entity=".$conf->entity; foreach($filterthirdparty as $key => $val) { - if ($key == 'client' && $val != '') $sql.=" AND s.client = ".$db->escape($val); + if ($key == 'name' && $val != '') $sql.=" AND s.name LIKE '%".$db->escape($val)."%'"; + if ($key == 'client' && $val != '') $sql.=" AND s.client = ".$db->escape($val); if ($key == 'supplier' && $val != '') $sql.=" AND s.fournisseur = ".$db->escape($val); - if ($key == 'category' && $val != '') $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") "; + if ($key == 'category' && $val != '') $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") "; } dol_syslog("Function: getListOfThirdParties", LOG_DEBUG); From 5c5f725a3414ab418882e270a3c3ca248f41e2c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 01:22:17 +0200 Subject: [PATCH 0163/1190] Fix scrutinizer --- htdocs/comm/action/peruser.php | 10 ++-- htdocs/core/class/mobiledetect.class.php | 46 +++++++++---------- htdocs/core/db/DoliDB.class.php | 14 ++++-- htdocs/core/db/mssql.class.php | 8 +++- htdocs/core/db/mysql.class.php | 2 +- htdocs/core/db/mysqli.class.php | 2 +- htdocs/core/db/pgsql.class.php | 6 +-- htdocs/core/db/sqlite.class.php | 4 +- htdocs/core/lib/functions.lib.php | 5 +- .../core/modules/syslog/mod_syslog_file.php | 2 +- .../modules/syslog/mod_syslog_firephp.php | 4 +- .../core/modules/syslog/mod_syslog_syslog.php | 7 +-- 12 files changed, 59 insertions(+), 51 deletions(-) diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index f20fe750d33..b4c0b4edbfa 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -893,7 +893,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $title1='';$title2=''; if (isset($cases1[$h]) && $cases1[$h] != '') { - $title1=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + //$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events")); $string1=' '; $style1='peruser_notbusy'; foreach($cases1[$h] as $id => $ev) @@ -903,7 +904,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & } if (isset($cases2[$h]) && $cases2[$h] != '') { - $title2=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + //$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events")); $string2=' '; $style2='peruser_notbusy'; foreach($cases2[$h] as $id => $ev) @@ -919,7 +921,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & { $ids=array_keys($cases1[$h]); $output = array_slice($cases1[$h], 0, 1); - if ($output[0]['string']) $title1.=' - '.$output[0]['string']; + if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string']; if ($output[0]['color']) $color1 = $output[0]['color']; } else if (count($cases1[$h]) > 1) $color1='222222'; @@ -928,7 +930,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & { $ids=array_keys($cases2[$h]); $output = array_slice($cases2[$h], 0, 1); - if ($output[0]['string']) $title2.=' - '.$output[0]['string']; + if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string']; if ($output[0]['color']) $color2 = $output[0]['color']; } else if (count($cases2[$h]) > 1) $color2='222222'; diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php index 107a13f47e3..c39111d04be 100644 --- a/htdocs/core/class/mobiledetect.class.php +++ b/htdocs/core/class/mobiledetect.class.php @@ -1073,39 +1073,37 @@ class MobileDetect /** * Check the version of the given property in the User-Agent. - * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) + * Will return a string or float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * - * @param string $propertyName The name of the property. See self::getProperties() array - * keys for all possible properties. - * @param string $type Either self::VERSION_TYPE_STRING to get a string value or - * self::VERSION_TYPE_FLOAT indicating a float value. This parameter - * is optional and defaults to self::VERSION_TYPE_STRING. Passing an - * invalid parameter will default to the this type as well. + * @param string $propertyName The name of the property. See self::getProperties() array keys for all possible properties (Ex: 'iPad', 'Android', ...). + * @param string $type Either self::VERSION_TYPE_STRING to get a string value or + * self::VERSION_TYPE_FLOAT indicating a float value. This parameter + * is optional and defaults to self::VERSION_TYPE_STRING. Passing an + * invalid parameter will default to this type as well. * - * @return string|float The version of the property we are trying to extract. + * @return string|float|boolean The version of the property we are trying to extract. */ public function version($propertyName, $type = self::VERSION_TYPE_STRING) { - if (empty($propertyName)) { - return false; - } + if (empty($propertyName)) return false; //set the $type to the default if we don't recognize the type - if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT) { + if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT) + { $type = self::VERSION_TYPE_STRING; } $properties = self::getProperties(); // Check if the property exists in the properties array. - if (array_key_exists($propertyName, $properties)) { - + if (array_key_exists($propertyName, $properties)) + { // Prepare the pattern to be matched. // Make sure we always deal with an array (string is converted). $properties[$propertyName] = (array) $properties[$propertyName]; - foreach ($properties[$propertyName] as $propertyMatchString) { - + foreach ($properties[$propertyName] as $propertyMatchString) + { $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString); // Escape the special character which is the delimiter. @@ -1114,14 +1112,13 @@ class MobileDetect // Identify and extract the version. preg_match('/'.$propertyPattern.'/is', $this->userAgent, $match); - if (!empty($match[1])) { + if (!empty($match[1])) + { $version = ( $type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1] ); return $version; } - } - } return false; @@ -1130,7 +1127,7 @@ class MobileDetect /** * Retrieve the mobile grading, using self::MOBILE_GRADE_* constants. * - * @return string One of the self::MOBILE_GRADE_* constants. + * @return string One of the self::MOBILE_GRADE_* constants. */ public function mobileGrade() { @@ -1210,7 +1207,8 @@ class MobileDetect // @reference: http://my.opera.com/community/openweb/idopera/ $this->version('Opera', self::VERSION_TYPE_FLOAT)>=10 && !$isMobile - ){ + ) + { return self::MOBILE_GRADE_A; } @@ -1231,7 +1229,8 @@ class MobileDetect // @todo: report this (tested on Nokia N71) $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT)>=11 && $this->is('SymbianOS') - ){ + ) + { return self::MOBILE_GRADE_B; } @@ -1241,7 +1240,8 @@ class MobileDetect // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) $this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT)<=5.2 - ){ + ) + { return self::MOBILE_GRADE_C; } diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 59fee975e38..dc4b127ffaa 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -137,8 +137,12 @@ abstract class DoliDB implements Database { $this->transaction_opened=0; dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG); + return 1; + } + else + { + return 0; } - return $ret; } else { @@ -248,7 +252,7 @@ abstract class DoliDB implements Database /** * Return last error label * - * @return string lasterror + * @return string Last error */ function lasterror() { @@ -260,9 +264,9 @@ abstract class DoliDB implements Database * 19700101020000 -> 3600 with TZ+1 and gmt=0 * 19700101020000 -> 7200 whaterver is TZ if gmt=1 * - * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) - * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ - * @return date Date TMS + * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) + * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ + * @return timestamp|string Date TMS */ function jdate($string, $gm=false) { diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index 09885257ef6..c823fdafe49 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -255,8 +255,12 @@ class DoliDBMssql extends DoliDB { $this->transaction_opened=0; dol_syslog("COMMIT Transaction",LOG_DEBUG); + return 1; + } + else + { + return 0; } - return $ret; } else { @@ -672,7 +676,7 @@ class DoliDBMssql extends DoliDB * * @param string $database Name of database * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @return array List of tables in an array */ function DDLListTables($database,$table='') { diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index 5be76d6d5d7..a52283ef32e 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -585,7 +585,7 @@ class DoliDBMysql extends DoliDB * * @param string $database Name of database * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @return array List of tables in an array */ function DDLListTables($database, $table='') { diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 31cad578ce8..4a2ded2d022 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -590,7 +590,7 @@ class DoliDBMysqli extends DoliDB * * @param string $database Name of database * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @return array List of tables in an array */ function DDLListTables($database, $table='') { diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 25263deee46..81b80a9f724 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -846,8 +846,8 @@ class DoliDBPgsql extends DoliDB * List tables into a database * * @param string $database Name of database - * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @param string $table Name of table filter ('xxx%') + * @return array List of tables in an array */ function DDLListTables($database, $table='') { @@ -860,7 +860,7 @@ class DoliDBPgsql extends DoliDB { $listtables[] = $row[0]; } - return $listtables; + return $listtables; } /** diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index dd040a9b199..dc364081e24 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -737,8 +737,8 @@ class DoliDBSqlite extends DoliDB * List tables into a database * * @param string $database Name of database - * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @param string $table Name of table filter ('xxx%') + * @return array List of tables in an array */ function DDLListTables($database, $table='') { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index ad87d0f2644..4dece372561 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1026,7 +1026,7 @@ function dol_getdate($timestamp,$fast=false) * @param int $year Year * @param mixed $gm True or 1 or 'gmt'=Input informations are GMT values, False or 0 or 'server' = local to server TZ, 'user' = local to user TZ * @param int $check 0=No check on parameters (Can use day 32, etc...) - * @return int Date as a timestamp, '' if error + * @return timestamp|string Date as a timestamp, '' if error * @see dol_print_date, dol_stringtotime, dol_getdate */ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) @@ -1075,6 +1075,7 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) $dt->setDate($year,$month,$day); $dt->setTime((int) $hour, (int) $minute, (int) $second); $date=$dt->getTimestamp(); // should include daylight saving time + return $date; } else { @@ -1092,8 +1093,8 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) { $date=mktime($hour,$minute,$second,$month,$day,$year); }*/ + return ''; } - return $date; } diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php index ddb30df4e45..331b7331194 100644 --- a/htdocs/core/modules/syslog/mod_syslog_file.php +++ b/htdocs/core/modules/syslog/mod_syslog_file.php @@ -49,7 +49,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface */ public function isActive() { - return 1; + return true; } /** diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php index 8ff2a52fa05..31a3fb13431 100644 --- a/htdocs/core/modules/syslog/mod_syslog_firephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php @@ -53,7 +53,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface restore_include_path(); if ($res) { - return 1; + return true; } } catch(Exception $e) @@ -61,7 +61,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface print ''."\n"; } - return -1; + return false; } ///** diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php index 9b0d854e2e8..58ac241695c 100644 --- a/htdocs/core/modules/syslog/mod_syslog_syslog.php +++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php @@ -47,12 +47,9 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface public function isActive() { // This function does not exists on some ISP (Ex: Free in France) - if (!function_exists('openlog')) - { - return 0; - } + if (!function_exists('openlog')) return false; - return 1; + return true; } /** From c51b964b1966e1a6aa2b1bd8f3f4592897efb9a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 03:44:20 +0200 Subject: [PATCH 0164/1190] Fix: Pb when showing availability --- htdocs/comm/action/card.php | 27 ++++++++++++++++++++++++--- htdocs/langs/en_US/agenda.lang | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 2b59b6cf622..74762b40c63 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -679,8 +679,15 @@ if ($action == 'create') if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser,'mandatory'=>0,'transparency'=>$object->transparency); // Owner first $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } + else + { + if (!empty($_SESSION['assignedtouser'])) + { + $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); + } + } print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); - print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); + if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); print ''; // Realised by @@ -922,8 +929,15 @@ if ($id > 0) } $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } + else + { + if (!empty($_SESSION['assignedtouser'])) + { + $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); + } + } print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); - print $langs->trans("MyAvailability").': id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy"); + if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy"); print ''; // Realised by @@ -1085,8 +1099,15 @@ if ($id > 0) } $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } + else + { + if (!empty($_SESSION['assignedtouser'])) + { + $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); + } + } print $form->select_dolusers_forevent('view','assignedtouser',1); - print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody print ' '; // Done by diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index dd793c7bfdd..8c4fdabce7d 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -89,4 +89,4 @@ ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range AddEvent=Create event -MyAvailability=Ma disponibilité \ No newline at end of file +MyAvailability=My availability \ No newline at end of file From bb852592e65dda61f53a0c9eb53203453cdfbcee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 04:49:46 +0200 Subject: [PATCH 0165/1190] Fix: Restore broken feature. One hook = One call of function per module. --- htdocs/core/class/hookmanager.class.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index babddd9a2fe..4f7044e3d1f 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -157,8 +157,6 @@ class HookManager { if (! empty($modules)) { - $modulealreadyexecuted[$context]=array(); // Filter by context - foreach($modules as $module => $actionclassinstance) { //print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."
\n"; @@ -167,8 +165,8 @@ class HookManager // jump to next class if method does not exists if (! method_exists($actionclassinstance,$method)) continue; // test to avoid to run twice a hook, when a module implements several active contexts - if (in_array($module,$modulealreadyexecuted[$context])) continue; - $modulealreadyexecuted[$context][$module]=$module; // Use the $currentcontext in method for avoid to run twice + if (in_array($module,$modulealreadyexecuted)) continue; + $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method for avoid to run twice // Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return; $parameters['currentcontext'] = $context; // Hooks that must return int (hooks with type 'addreplace') From 85f0d6c3ea885feed77e856fead69258bf611277 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 04:51:34 +0200 Subject: [PATCH 0166/1190] Fix: Edition of event --- htdocs/comm/action/card.php | 109 +++++++++--------- htdocs/comm/action/class/actioncomm.class.php | 17 +-- 2 files changed, 65 insertions(+), 61 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 74762b40c63..5f663d076ec 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -170,7 +170,7 @@ if ($action == 'add') } // Initialisation objet cactioncomm - if (! GETPOST('actioncode') > 0) + if (! GETPOST('actioncode') > 0) // actioncode is id { $error++; $donotclearsession=1; $action = 'create'; @@ -178,62 +178,63 @@ if ($action == 'add') } else { - $result=$cactioncomm->fetch(GETPOST('actioncode')); + $object->type_code = GETPOST('actioncode'); } - // Initialisation objet actioncomm - $object->type_id = $cactioncomm->id; - $object->type_code = $cactioncomm->code; - $object->priority = GETPOST("priority")?GETPOST("priority"):0; - $object->fulldayevent = (! empty($fulldayevent)?1:0); - $object->location = GETPOST("location"); - $object->label = trim(GETPOST('label')); - $object->fk_element = GETPOST("fk_element"); - $object->elementtype = GETPOST("elementtype"); - if (! GETPOST('label')) + if (! $error) { - if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs)) + // Initialisation objet actioncomm + $object->priority = GETPOST("priority")?GETPOST("priority"):0; + $object->fulldayevent = (! empty($fulldayevent)?1:0); + $object->location = GETPOST("location"); + $object->label = trim(GETPOST('label')); + $object->fk_element = GETPOST("fk_element"); + $object->elementtype = GETPOST("elementtype"); + if (! GETPOST('label')) { - $object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs)); - } - else - { - if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code) + if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs)) { - $object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n"; + $object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs)); } - else $object->label = $cactioncomm->libelle; + else + { + if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code) + { + $object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n"; + } + else $object->label = $cactioncomm->libelle; + } + } + $object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0; + $object->datep = $datep; + $object->datef = $datef; + $object->percentage = $percentage; + $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60; + + $listofuserid=array(); + if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']); + $i=0; + foreach($listofuserid as $key => $value) + { + if ($i == 0) // First entry + { + $usertodo=new User($db); + if ($value['id'] > 0) + { + $usertodo->fetch($value['id']); + $object->userownerid = $usertodo->id; + } + $object->usertodo = $usertodo; + $object->transparency = (GETPOST("transparency")=='on'?1:0); + } + + $object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0)); + + $i++; } } - $object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0; - $object->datep = $datep; - $object->datef = $datef; - $object->percentage = $percentage; - $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60; - $listofuserid=array(); - if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']); - $i=0; - foreach($listofuserid as $key => $value) - { - if ($i == 0) // First entry - { - $usertodo=new User($db); - if ($value['id'] > 0) - { - $usertodo->fetch($value['id']); - $object->userownerid = $usertodo->id; - } - $object->usertodo = $usertodo; - $object->transparency = (GETPOST("transparency")=='on'?1:0); - } - - $object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0)); - - $i++; - } - - if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) + if (! $error && ! empty($conf->global->AGENDA_ENABLE_DONEBY)) { $userdone=new User($db); if ($_POST["doneby"] > 0) @@ -250,10 +251,10 @@ if ($action == 'add') if (GETPOST('socid','int') > 0) { - $societe = new Societe($db); - $societe->fetch(GETPOST('socid','int')); - $object->societe = $societe; // deprecated - $object->thirdparty = $societe; + $object->socid=GETPOST('socid','int'); + $object->fetch_thirdparty(); + + $object->societe = $object->thirdparty; // For backward compatibility } // Special for module webcal and phenix @@ -607,6 +608,7 @@ if ($action == 'create') print ''; print ''; if ($backtopage) print ''; + if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''; if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous")); else print_fiche_titre($langs->trans("AddAnAction")); @@ -620,7 +622,6 @@ if ($action == 'create') $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto"); print ''; } - else print ''; // Title print 'global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").''; @@ -864,6 +865,7 @@ if ($id > 0) print ''; print ''; if ($backtopage) print ''; + if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''; dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action'); @@ -879,7 +881,6 @@ if ($id > 0) $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto"); print ''; } - else print ''; // Title print 'global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").''; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 692ce2058d3..1d99a8eec34 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -108,7 +108,8 @@ class ActionComm extends CommonObject } /** - * Add an action/event into database + * Add an action/event into database. + * $this->type_id OR $this->type_code must be set. * * @param User $user Object user making action * @param int $notrigger 1 = disable triggers, 0 = enable triggers @@ -144,24 +145,26 @@ class ActionComm extends CommonObject $userownerid=isset($this->usertodo->id)?$this->usertodo->id:$this->userownerid; // For backward compatibility $userdoneid=isset($this->userdone->id)?$this->userdone->id:$this->userdoneid; // For backward compatibility - if (! $this->type_id && $this->type_code) + if (! $this->type_id || ! $this->type_code) { + $key=empty($this->type_id)?$this->type_code:$this->type_id; + // Get id from code $cactioncomm=new CActionComm($this->db); - $result=$cactioncomm->fetch($this->type_code); + $result=$cactioncomm->fetch($key); if ($result > 0) { $this->type_id=$cactioncomm->id; - $this->code=$cactioncomm->code; + $this->type_code=$cactioncomm->code; } else if ($result == 0) { - $this->error='Failed to get record with code '.$this->type_code.' from dictionary "type of events"'; + $this->error='Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"'; return -1; } else - { + { $this->error=$cactioncomm->error; return -1; } @@ -201,7 +204,7 @@ class ActionComm extends CommonObject $sql.= (strval($this->datef)!=''?"'".$this->db->idate($this->datef)."'":"null").","; $sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").","; // deprecated $sql.= (isset($this->type_id)?$this->type_id:"null").","; - $sql.= (isset($this->code)?" '".$this->code."'":"null").","; + $sql.= (isset($this->type_code)?" '".$this->type_code."'":"null").","; $sql.= (isset($this->socid) && $this->socid > 0?" '".$this->socid."'":"null").","; $sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").","; $sql.= " '".$this->db->escape($this->note)."',"; From 81c28f528ded96a684ab3ad2475a1981bddf1871 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 05:13:09 +0200 Subject: [PATCH 0167/1190] Fix translation --- htdocs/langs/en_US/agenda.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 8c4fdabce7d..cb19170dab3 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -88,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Create event +AddEvent=Add event MyAvailability=My availability \ No newline at end of file From 3b6c533b859427a4f8c5b33ee49d371fe861109b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 05:13:46 +0200 Subject: [PATCH 0168/1190] Fix translation --- htdocs/fichinter/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index bcc50d32aca..1cf9ce563ed 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry @@ -1692,8 +1692,8 @@ else if ($id > 0 || ! empty($ref)) $langs->load("bills"); if ($object->statut < 2) { - if ($user->rights->facture->creer) print '
'.$langs->trans("CreateBill").'
'; - else print '
'.$langs->trans("CreateBill").'
'; + if ($user->rights->facture->creer) print '
'.$langs->trans("AddBill").'
'; + else print '
'.$langs->trans("AddBill").'
'; } if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED)) From 968b021985b262aef7f2d9b9e76dc473759c69c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 05:37:01 +0200 Subject: [PATCH 0169/1190] Fix trad and sql error --- .../deplacement/class/deplacement.class.php | 2 +- htdocs/langs/en_US/holiday.lang | 126 +++++++++--------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 48d8c05ff0c..4eab354577a 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -231,7 +231,7 @@ class Deplacement extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."deplacement"; $sql.= " WHERE entity IN (".getEntity('deplacement').")"; if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'"; - else $sql.= " AND id = ".$id; + else $sql.= " AND rowid = ".$id; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $result = $this->db->query($sql); diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report From 742d0e37eeadf40c7b01475f5a90b2986777b2d0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 12:54:51 +0200 Subject: [PATCH 0170/1190] Fix: Bad month return by function --- htdocs/core/lib/date.lib.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 78551dac105..39d3e6ffa7b 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -518,8 +518,8 @@ function dol_get_last_day($year,$month=12,$gm=false) * @param int $day Day * @param int $month Month * @param int $year Year - * @param int $gm False = Return date to compare with server TZ, True to compare with GM date. - * @return array year,month, week,first_day,prev_year,prev_month,prev_day + * @param int $gm False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date. + * @return array year,month,week,first_day,prev_year,prev_month,prev_day */ function dol_get_first_day_week($day,$month,$year,$gm=false) { @@ -542,7 +542,7 @@ function dol_get_first_day_week($day,$month,$year,$gm=false) $tmpday = date($tmparray[0])-$seconds; $tmpday = date("d",$tmpday); - //Check first day of week is form this month or not + //Check first day of week is in same month than current day or not if ($tmpday>$day) { $prev_month = $month-1; @@ -559,15 +559,17 @@ function dol_get_first_day_week($day,$month,$year,$gm=false) $prev_month = $month; $prev_year = $year; } + $tmpmonth = $prev_month; + $tmpyear = $prev_year; - //Get first day of next week + //Get first day of next week $tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0); $tmptime-=24*60*60*7; $tmparray=dol_getdate($tmptime,true); $prev_day = $tmparray['mday']; - //Check first day of week is form this month or not - if ($prev_day>$tmpday) + //Check prev day of week is in same month than first day or not + if ($prev_day > $tmpday) { $prev_month = $month-1; $prev_year = $year; @@ -579,9 +581,9 @@ function dol_get_first_day_week($day,$month,$year,$gm=false) } } - $week = date("W",dol_mktime(0,0,0,$month,$tmpday,$year,$gm)); + $week = date("W",dol_mktime(0,0,0,$tmpmonth,$tmpday,$tmpyear,$gm)); - return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day); + return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day); } /** From c73f4a14ee9d62e8f6a9d4ab8ef502932ae4f36d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 16:17:09 +0200 Subject: [PATCH 0171/1190] Fix: Bad days returned by function --- htdocs/comm/action/index.php | 51 ++++++++++++++---------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index efe47defd92..e518b05ded6 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -184,18 +184,19 @@ if ($action=='show_week') $prev_month = $prev['prev_month']; $prev_day = $prev['prev_day']; $first_day = $prev['first_day']; - + $first_month= $prev['first_month']; + $first_year = $prev['first_year']; $week = $prev['week']; $day = (int) $day; - $next = dol_get_next_week($day, $week, $month, $year); + $next = dol_get_next_week($first_day, $week, $first_month, $first_year); $next_year = $next['year']; $next_month = $next['month']; $next_day = $next['day']; // Define firstdaytoshow and lastdaytoshow - $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$first_day,$prev_year); - $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year); + $firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); + $lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd'); $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year)); @@ -870,39 +871,27 @@ elseif ($action == 'show_week') // View by week } echo " \n"; - // In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month) - //var_dump($eventarray); - //print $tmpday; - echo " \n"; for($iter_day = 0; $iter_day < 7; $iter_day++) { - if(($tmpday <= $max_day_in_month)) - { - // Show days of the current week - $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year); + // Show days of the current week + $curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd'); + $tmparray = dol_getdate($curtime,'fast'); + $tmpday = $tmparray['mday']; + $tmpmonth = $tmparray['mon']; + $tmpyear = $tmparray['year']; - $style='cal_current_month'; - if ($iter_day == 6) $style.=' cal_other_month_right'; - $today=0; - $todayarray=dol_getdate($now,'fast'); - if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1; - if ($today) $style='cal_today'; + $style='cal_current_month'; + if ($iter_day == 6) $style.=' cal_other_month_right'; + $today=0; + $todayarray=dol_getdate($now,'fast'); + if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1; + if ($today) $style='cal_today'; - echo ' '; - show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300); - echo " \n"; - } - else - { - $style='cal_current_month'; - if ($iter_day == 6) $style.=' cal_other_month_right'; - echo ' '; - show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300); - echo "\n"; - } - $tmpday++; + echo ' '; + show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300); + echo " \n"; } echo " \n"; From 60f643cf1a07959e29650e168a1f7c8e60488770 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 20:26:35 +0200 Subject: [PATCH 0172/1190] Change comented log to help debug --- htdocs/core/lib/admin.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index a3cf6acca32..39813b9e191 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -70,7 +70,7 @@ function versioncompare($versionarray1,$versionarray2) if ($operande1 < $operande2) { $ret = -$level; break; } if ($operande1 > $operande2) { $ret = $level; break; } } - //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret; + //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'
'."\n"; return $ret; } @@ -712,7 +712,7 @@ function activateModule($value,$withdeps=1) // Test if Dolibarr version ok $verdol=versiondolibarrarray(); $vermin=isset($objMod->need_dolibarr_version)?$objMod->need_dolibarr_version:0; - //print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit; + //print 'eee '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit; if (is_array($vermin) && versioncompare($verdol,$vermin) < 0) { return $langs->trans("ErrorModuleRequireDolibarrVersion",versiontostring($vermin)); From a2fed6f2141bba3c1a4ae2c55cc57bbaceaff3f2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 23:26:42 +0200 Subject: [PATCH 0173/1190] Fix: miss dol_fiche_end --- htdocs/admin/agenda_xcal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index dc7c4cb3d79..d5b296b4932 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -142,7 +142,7 @@ print ""; print "\n"; -print ''; +dol_fiche_end(); clearstatcache(); From a2446e51dbde79ff97966b57d40235adbf8e9894 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 6 Oct 2014 07:20:58 +0200 Subject: [PATCH 0174/1190] New: add context "globalcard" for declaring only once all cards --- htdocs/adherents/card.php | 2 +- htdocs/adherents/type.php | 2 +- htdocs/categories/categorie.php | 2 +- htdocs/comm/action/card.php | 2 +- htdocs/comm/card.php | 2 +- htdocs/comm/mailing/card.php | 2 +- htdocs/comm/propal.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/compta/deplacement/card.php | 2 +- htdocs/compta/dons/card.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/paiement.php | 2 +- htdocs/compta/salaries/card.php | 2 +- htdocs/compta/tva/card.php | 2 +- htdocs/contact/card.php | 2 +- htdocs/contrat/card.php | 2 +- htdocs/expedition/card.php | 2 +- htdocs/fichinter/card.php | 2 +- htdocs/fourn/card.php | 2 +- htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/facture/card.php | 2 +- htdocs/livraison/card.php | 2 +- htdocs/product/card.php | 2 +- htdocs/product/fournisseurs.php | 2 +- htdocs/product/stock/card.php | 2 +- htdocs/projet/card.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/task.php | 2 +- htdocs/resource/card.php | 2 +- htdocs/societe/commerciaux.php | 2 +- htdocs/societe/soc.php | 2 +- htdocs/user/card.php | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 60b90a9cf31..ca7706989e0 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -108,7 +108,7 @@ if ($rowid) } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('membercard')); +$hookmanager->initHooks(array('membercard','globalcard')); /* diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index d9b04e3c506..0ffdc8b7e7f 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -70,7 +70,7 @@ if (GETPOST('button_removefilter')) // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('membertypecard')); +$hookmanager->initHooks(array('membertypecard','globalcard')); /* * Actions diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index d1fe7848564..52e352779ba 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -93,7 +93,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user,$objecttype,$objectid,$dbtablename,'','',$fieldid); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('categorycard')); +$hookmanager->initHooks(array('categorycard','globalcard')); /* diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 5f663d076ec..e4c0fe78aa9 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -81,7 +81,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); //var_dump($_POST); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('actioncard')); +$hookmanager->initHooks(array('actioncard','globalcard')); /* diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index f1d27b791e6..d0dd842cd7c 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -68,7 +68,7 @@ if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="nom"; // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('commcard')); +$hookmanager->initHooks(array('commcard','globalcard')); $object = new Societe($db); diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index efff271a08c..678ea8f622d 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -52,7 +52,7 @@ $extrafields = new ExtraFields($db); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('mailingcard')); +$hookmanager->initHooks(array('mailingcard','globalcard')); // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions) $object->substitutionarray=array( diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 19be47d5b5f..34adf5d5f68 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) { } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('propalcard')); +$hookmanager->initHooks(array('propalcard','globalcard')); $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 6c8c54791bf..92fed596819 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref)) { } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('ordercard')); +$hookmanager->initHooks(array('ordercard','globalcard')); $permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 80d1858d167..20433118bbf 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -47,7 +47,7 @@ $confirm = GETPOST('confirm','alpha'); $object = new Deplacement($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('tripsandexpensescard')); +$hookmanager->initHooks(array('tripsandexpensescard','globalcard')); $permissionnote=$user->rights->deplacement->creer; // Used by the include of actions_setnotes.inc.php diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php index a9c8a42448b..e453ef623c3 100644 --- a/htdocs/compta/dons/card.php +++ b/htdocs/compta/dons/card.php @@ -50,7 +50,7 @@ $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOS $result = restrictedArea($user, 'don', $id); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('doncard')); +$hookmanager->initHooks(array('doncard','globalcard')); /* diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index f41ac9ef4e5..a358598264e 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref)) { } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('invoicecard')); +$hookmanager->initHooks(array('invoicecard','globalcard')); $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index c7af3458fcb..21b2eb9e154 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -67,7 +67,7 @@ if ($facid > 0) } // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('paiementcard')); +$hookmanager->initHooks(array('paiementcard','globalcard')); $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 2cef32b136e..3ee796c6134 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -44,7 +44,7 @@ $result = restrictedArea($user, 'salaries', '', '', ''); $sal = new PaymentSalary($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('salarycard')); +$hookmanager->initHooks(array('salarycard','globalcard')); diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index c87530e6511..268a1af8e66 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -42,7 +42,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges'); $tva = new Tva($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('taxvatcard')); +$hookmanager->initHooks(array('taxvatcard','globalcard')); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 2df9986dba0..f3abf9e2bfe 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -74,7 +74,7 @@ if (! empty($canvas)) $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('contactcard')); +$hookmanager->initHooks(array('contactcard','globalcard')); /* diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 8dbf4d35fa4..1b47912fa41 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -66,7 +66,7 @@ $result=restrictedArea($user,'contrat',$id); $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('contractcard')); +$hookmanager->initHooks(array('contractcard','globalcard')); $object = new Contrat($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index e9083b77e21..c2649e5f8df 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref)) } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('expeditioncard')); +$hookmanager->initHooks(array('expeditioncard','globalcard')); /* * Actions diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 1cf9ce563ed..70d425d04a1 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -77,7 +77,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('interventioncard')); +$hookmanager->initHooks(array('interventioncard','globalcard')); $object = new Fichinter($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 840151b6001..9bbc27ca51c 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -50,7 +50,7 @@ $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe'); $object = new Fournisseur($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('suppliercard')); +$hookmanager->initHooks(array('suppliercard','globalcard')); /* * Action diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 1c699b21711..d6be5491f54 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -72,7 +72,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'fournisseur', $id, '', 'commande'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('ordersuppliercard')); +$hookmanager->initHooks(array('ordersuppliercard','globalcard')); $object = new CommandeFournisseur($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index c9926cd59dd..b58c17dcf62 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -69,7 +69,7 @@ if (! empty($user->societe_id)) $socid=$user->societe_id; $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('invoicesuppliercard')); +$hookmanager->initHooks(array('invoicesuppliercard','globalcard')); $object=new FactureFournisseur($db); diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 772ab34c291..98f08803af4 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -65,7 +65,7 @@ if ($id > 0 || ! empty($ref)) { } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('deliverycard')); +$hookmanager->initHooks(array('deliverycard','globalcard')); /* * Actions diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 856d4a477fb..a9f533ba40b 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -88,7 +88,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid'); $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('productcard')); +$hookmanager->initHooks(array('productcard','globalcard')); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 8720c9cf892..9832e57eb6d 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -60,7 +60,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('pricesuppliercard')); +$hookmanager->initHooks(array('pricesuppliercard','globalcard')); $product = new ProductFournisseur($db); $product->fetch($id,$ref); diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index b95fe58d752..051a0575aaa 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -49,7 +49,7 @@ if (! $sortorder) $sortorder="DESC"; $result=restrictedArea($user,'stock'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('warehousecard')); +$hookmanager->initHooks(array('warehousecard','globalcard')); /* diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 273784faf92..df67d9d8fa1 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -45,7 +45,7 @@ $mine = GETPOST('mode')=='mine' ? 1 : 0; //if (! $user->rights->projet->all->lire) $mine=1; // Special for projects // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('projectcard')); +$hookmanager->initHooks(array('projectcard','globalcard')); $object = new Project($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 6b5cc453cbf..d1d5092628e 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -64,7 +64,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id; $result = restrictedArea($user, 'projet', $id); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('projecttaskcard')); +$hookmanager->initHooks(array('projecttaskcard','globalcard')); $progress=GETPOST('progress', 'int'); $label=GETPOST('label', 'alpha'); diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index c8f60cde7a1..8e5b664759e 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -50,7 +50,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id; if (! $user->rights->projet->lire) accessforbidden(); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('projecttaskcard')); +$hookmanager->initHooks(array('projecttaskcard','globalcard')); $object = new Task($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index ed48f7e1b04..b2ee3ae1814 100755 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -57,7 +57,7 @@ if( ! $user->rights->resource->read) $object = new Resource($db); -$hookmanager->initHooks(array('resource_card')); +$hookmanager->initHooks(array('resource_card','globalcard')); $parameters=array('resource_id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 5436e03274b..498257ea496 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -37,7 +37,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:''; if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'societe','',''); -$hookmanager->initHooks(array('salesrepresentativescard')); +$hookmanager->initHooks(array('salesrepresentativescard','globalcard')); /* * Actions diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index e45ce6eee7b..c6909aa7cae 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -77,7 +77,7 @@ if (! empty($canvas)) $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('thirdpartycard')); +$hookmanager->initHooks(array('thirdpartycard','globalcard')); /* diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 996d7e7440d..01b6ec32f52 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -89,7 +89,7 @@ $extrafields = new ExtraFields($db); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('usercard')); +$hookmanager->initHooks(array('usercard','globalcard')); From 692881bf5998e06b6fd9adf1ecc830c39b1220c7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 6 Oct 2014 09:06:25 +0200 Subject: [PATCH 0175/1190] Fix: missing $ismultientitymanaged --- htdocs/contrat/class/contrat.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 073ef7bd0f5..6cf04c10522 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1,12 +1,12 @@ * Copyright (C) 2004-2012 Destailleur Laurent - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2008 Raphael Bertrand * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2013 Christophe Battarel - * Copyright (C) 2013 Florian Henry + * Copyright (C) 2013 Christophe Battarel + * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,6 +41,7 @@ class Contrat extends CommonObject public $table_element='contrat'; public $table_element_line='contratdet'; public $fk_element='fk_contrat'; + protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $id; var $ref; From 3ddcac5ced69bef3723cea0a647b34d4f59f8ea9 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 6 Oct 2014 09:06:25 +0200 Subject: [PATCH 0176/1190] Fix: missing $ismultientitymanaged --- htdocs/contrat/class/contrat.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 20f325658f6..998ffada993 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -5,9 +5,9 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2008 Raphael Bertrand * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2013 Christophe Battarel - * Copyright (C) 2013 Florian Henry - * Copyright (C) 2014 Marcos García + * Copyright (C) 2013 Christophe Battarel + * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,9 +29,9 @@ * \brief File of class to manage contracts */ -require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; -require_once(DOL_DOCUMENT_ROOT ."/margin/lib/margins.lib.php"); +require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php'; /** * Class to manage contracts @@ -42,6 +42,7 @@ class Contrat extends CommonObject public $table_element='contrat'; public $table_element_line='contratdet'; public $fk_element='fk_contrat'; + protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $id; var $ref; From 48072c58d796789edbdfca6091c00d0eb7e8b913 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 6 Oct 2014 10:05:27 +0200 Subject: [PATCH 0177/1190] Fix bug 1588 : relative discount not working anymore --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 68613492df8..a51a6505416 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -203,7 +203,7 @@ else { "> - remise_client); ?>" name="remise_percent">% + remise_percent); ?>" name="remise_percent">% Date: Mon, 6 Oct 2014 13:28:07 +0200 Subject: [PATCH 0178/1190] Missing reprogramming task into GUI for cron module. Without this, a new task is never executed (because without datenextrun defined) --- htdocs/cron/card.php | 15 ++++++++++++--- htdocs/cron/list.php | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 4857523aaf5..dd30e67afab 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -95,9 +95,18 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex } else { - if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings'); - else setEventMessage($langs->trans("JobFinished"),'mesgs'); - $action=''; + $res = $object->reprogram_jobs($user->login); + if ($res > 0) + { + if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings'); + else setEventMessage($langs->trans("JobFinished"),'mesgs'); + $action=''; + } + else + { + setEventMessage($object->error,'errors'); + $action=''; + } } } diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 19a0d5cc3b1..28f16c1ad55 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -100,6 +100,21 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex if ($result < 0) { setEventMessage($object->error,'errors'); } + else + { + $res = $object->reprogram_jobs($user->login); + if ($res > 0) + { + if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings'); + else setEventMessage($langs->trans("JobFinished"),'mesgs'); + $action=''; + } + else + { + setEventMessage($object->error,'errors'); + $action=''; + } + } header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-1'); // Make a call to avoid to run twice job when using back exit; From 87fc27c7e649566ebb467dc32af7b65ee623f292 Mon Sep 17 00:00:00 2001 From: jfefe Date: Mon, 6 Oct 2014 13:31:01 +0200 Subject: [PATCH 0179/1190] Avoid missing class error for fetch_thirdparty method --- htdocs/core/class/commonobject.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 6439e3e003e..7c803a0b8a9 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -576,6 +576,9 @@ abstract class CommonObject if (empty($this->socid)) return 0; + if (!class_exists('Societe')) + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; + $thirdparty = new Societe($this->db); $result=$thirdparty->fetch($this->socid); $this->client = $thirdparty; // deprecated From 1e6240953e9cb0f0ffedf3883965305c361f3027 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Mon, 6 Oct 2014 14:10:27 +0200 Subject: [PATCH 0180/1190] Fix increase stock on shipment validation $obj not set. Re-enabled delete button for shipment with batches, was increase issue, not decrease issue. --- htdocs/expedition/card.php | 10 +--------- htdocs/expedition/class/expedition.class.php | 5 ++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index c2649e5f8df..14ef8738b73 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1453,7 +1453,6 @@ else if ($id || $ref) // Batch number managment if (! empty($conf->productbatch->enabled)) { if (isset($lines[$i]->detail_batch) ) { - $flagBatch = true; print ''; $detail = ''; foreach ($lines[$i]->detail_batch as $dbatch) { @@ -1543,14 +1542,7 @@ else if ($id || $ref) if ($user->rights->expedition->supprimer) { - if (empty($conf->productbatch->enabled) || (!empty($conf->productbatch->enabled) && !$conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !isset($flagBatch)) - { - print ''.$langs->trans("Delete").''; - } - else - { - print ''.$langs->trans('Delete').''; - } + print ''.$langs->trans("Delete").''; } print ''; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 019ef22f769..898a65a05b8 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -588,10 +588,9 @@ class Expedition extends CommonObject $cpt = $this->db->num_rows($resql); for ($i = 0; $i < $cpt; $i++) { - if($obj->qty <= 0) continue; - - dol_syslog(get_class($this)."::valid movement index ".$i); $obj = $this->db->fetch_object($resql); + if($obj->qty <= 0) continue; + dol_syslog(get_class($this)."::valid movement index ".$i); //var_dump($this->lines[$i]); $mouvS = new MouvementStock($this->db); From 6a4468d94ea397695033249d40e73095970fd247 Mon Sep 17 00:00:00 2001 From: jfefe Date: Mon, 6 Oct 2014 14:18:28 +0200 Subject: [PATCH 0181/1190] Not need to test if class exists with require_once --- htdocs/core/class/commonobject.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 7c803a0b8a9..3ef8241f83f 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -576,8 +576,7 @@ abstract class CommonObject if (empty($this->socid)) return 0; - if (!class_exists('Societe')) - require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $thirdparty = new Societe($this->db); $result=$thirdparty->fetch($this->socid); From 0c7cabbf373650f410dfb6203de7284554484f08 Mon Sep 17 00:00:00 2001 From: Drosis Nikos Date: Mon, 6 Oct 2014 16:15:11 +0300 Subject: [PATCH 0182/1190] Fix Error when trying to clone an Order --- htdocs/commande/class/commande.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index a6659ee8bb3..f6d5677af16 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -898,6 +898,13 @@ class Commande extends CommonOrder $this->date_validation = ''; $this->ref_client = ''; + // Set ref + require_once DOL_DOCUMENT_ROOT ."/core/modules/commande/".$conf->global->COMMANDE_ADDON.'.php'; + $obj = $conf->global->COMMANDE_ADDON; + $modCommande = new $obj; + $this->ref = $modCommande->getNextValue($objsoc,$this); + + // Create clone $result=$this->create($user); if ($result < 0) $error++; From 75eb61702e2049fcfe0561db862b7a4beea1d32f Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Oct 2014 12:46:05 +0200 Subject: [PATCH 0183/1190] Fix: Showing accounting account fails --- htdocs/accountancy/class/accountingaccount.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index e6ada14a7db..c442eacc23c 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2013-2014 Olivier Geffroy * Copyright (C) 2013-2014 Alexandre Spangaro * Copyright (C) 2013-2014 Florian Henry + * Copyright (C) 2014 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,7 +68,7 @@ class AccountingAccount { if ($rowid || $account_number) { - $sql = "SELECT rowid, datec, tms, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, labe, fk_user_author, fk_user_modifn active"; + $sql = "SELECT rowid, datec, tms, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, fk_user_author, fk_user_modif, active"; $sql.= " FROM " . MAIN_DB_PREFIX . "accountingaccount WHERE"; if ($rowid) { $sql .= " rowid = '" . $rowid . "'"; From e8ac6567b714f155b0628fe43fb7c2068dfbcf36 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 7 Oct 2014 20:50:57 +0200 Subject: [PATCH 0184/1190] Fix :: Button on/off for account in chart of accounts --- htdocs/accountancy/admin/account.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 0c929ef5de5..317cd12885d 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -65,8 +65,7 @@ if ($action == 'delete') { $accounting = new AccountingAccount($db); if ($action == 'disable') { - $accounting = $accounting->fetch($id); - if (! empty($accounting->id)) { + if ($accounting->fetch($id)) { $result = $accounting->account_desactivate($id); } @@ -75,10 +74,7 @@ if ($action == 'disable') { setEventMessage($accounting->error, 'errors'); } } else if ($action == 'enable') { - - $accounting = $accounting->fetch($id); - - if (! empty($accounting->id)) { + if ($accounting->fetch($id)) { $result = $accounting->account_activate($id); } $action = 'update'; From 0a4d040e9d38f866f01632bd1ae26105d42f4476 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Oct 2014 21:15:14 +0200 Subject: [PATCH 0185/1190] Fix: Warning sur traduction --- build.xml | 2 +- htdocs/product/price.php | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/build.xml b/build.xml index fc267bf196e..570821a7c7b 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ - +fdfds diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 6971a5bb125..801573a316f 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -341,21 +341,23 @@ if ($isphoto) { print ''; // MultiPrix -if (! empty($conf->global->PRODUIT_MULTIPRICES)) { - if (! empty($socid)) { +if (! empty($conf->global->PRODUIT_MULTIPRICES)) +{ + if (! empty($socid)) + { $soc = new Societe($db); $soc->id = $socid; $soc->fetch($socid); print '' . $langs->trans("SellingPrice") . ''; - if ($object->multiprices_base_type ["$soc->price_level"] == 'TTC') { + if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') { print '' . price($object->multiprices_ttc ["$soc->price_level"]); } else { print '' . price($object->multiprices ["$soc->price_level"]); } - if ($object->multiprices_base_type ["$soc->price_level"]) { + if ($object->multiprices_base_type["$soc->price_level"]) { print ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]); } else { print ' ' . $langs->trans($object->price_base_type); @@ -364,15 +366,16 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) { // Prix mini print '' . $langs->trans("MinPrice") . ''; - if ($object->multiprices_base_type ["$soc->price_level"] == 'TTC') { - print price($object->multiprices_min_ttc ["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]); + if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') + { + print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]); } else { - print price($object->multiprices_min ["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]); + print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]); } print ''; // TVA - print '' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx ["$soc->price_level"], true) . ''; + print '' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . ''; } else { @@ -393,12 +396,12 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) { print ''; if ($object->multiprices_base_type ["$i"] == 'TTC') { - print '' . price($object->multiprices_ttc ["$i"]); + print '' . price($object->multiprices_ttc["$i"]); } else { - print '' . price($object->multiprices ["$i"]); + print '' . price($object->multiprices["$i"]); } - if ($object->multiprices_base_type ["$i"]) { + if ($object->multiprices_base_type["$i"]) { print ' ' . $langs->trans($object->multiprices_base_type ["$i"]); } else { print ' ' . $langs->trans($object->price_base_type); @@ -408,9 +411,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) { // Prix mini print '' . $langs->trans("MinPrice") . ' ' . $i . ''; if ($object->multiprices_base_type ["$i"] == 'TTC') { - print price($object->multiprices_min_ttc ["$i"]) . ' ' . $langs->trans($object->multiprices_base_type ["$i"]); + print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); } else { - print price($object->multiprices_min ["$i"]) . ' ' . $langs->trans($object->multiprices_base_type ["$i"]); + print price($object->multiprices_min["$i"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$i"])?'HT':$object->multiprices_base_type["$i"]); } print ''; From 2bbede64650ea85e82e5c93c8f69b5dde9b10484 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Oct 2014 21:39:10 +0200 Subject: [PATCH 0186/1190] New: Can add product into category from category card. --- ChangeLog | 1 + htdocs/categories/categorie.php | 5 ++- htdocs/categories/viewcat.php | 55 ++++++++++++++++++++++++++++-- htdocs/langs/en_US/categories.lang | 1 + 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d93f5199c40..032112429ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Can add product into category from category card. - New: PDF event report show project and status of event. - New: Can filter on status on interventions. - New: Add help info of field type into dictionary of payment types. diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index d1fe7848564..89e15b9ecdd 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -207,8 +207,7 @@ if (empty($reshook)) } else { - setEventMessage($cat->error,'errors'); - setEventMessage($cat->errors,'errors'); + setEventMessages($cat->error,$this->errors,'errors'); } } } @@ -628,7 +627,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) // Form to add record into a category if ($showclassifyform) { - print '
'; + print ''; print ''; print ''; print ''; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 29ed8a5d6b8..14a63ffc837 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -38,6 +38,7 @@ $type=GETPOST('type'); $action=GETPOST('action'); $confirm=GETPOST('confirm'); $removeelem = GETPOST('removeelem','int'); +$elemid=GETPOST('elemid'); if ($id == "") { @@ -120,6 +121,33 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi } } +if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer)) +{ + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + $newobject = new Product($db); + $result = $newobject->fetch($elemid); + $elementtype = 'product'; + + // TODO Add into categ + $result=$object->add_type($newobject,$elementtype); + if ($result >= 0) + { + setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref)); + } + else + { + if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') + { + setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings'); + } + else + { + setEventMessages($object->error,$object->errors,'errors'); + } + } + +} + /* @@ -144,6 +172,7 @@ dol_fiche_head($head, 'card', $title, 0, 'category'); /* * Confirmation suppression */ + if ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type,$langs->trans('DeleteCategory'),$langs->trans('ConfirmDeleteCategory'),'confirm_delete'); @@ -251,10 +280,9 @@ else print "\n"; } -// List of products +// List of products or services (type is type of category) if ($object->type == 0) { - $prods = $object->getObjectsInCateg("product"); if ($prods < 0) { @@ -262,6 +290,29 @@ if ($object->type == 0) } else { + $showclassifyform=1; $typeid=0; + + // Form to add record into a category + if ($showclassifyform) + { + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'; + print $langs->trans("AddProductServiceIntoCategory").'  '; + print $form->select_produits('','elemid','',0,0,-1,2,'',1); + print ''; + print '
'; + print '
'; + } + print "
"; print "\n"; print '\n"; diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index fb9ad8a3b6d..3ee731f0824 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service \ No newline at end of file From b8a40a1b327c737cf35b674bc7b1460398afa221 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 8 Oct 2014 06:24:46 +0200 Subject: [PATCH 0187/1190] Presentation --- htdocs/accountancy/customer/list.php | 3 +-- htdocs/accountancy/supplier/list.php | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 3af059cad94..3b68bd6b69e 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -227,9 +227,8 @@ if ($result) { $i ++; } - print ''; - print '
'.$langs->trans("ProductsAndServices")."
 
'; + print '
'; print ''; } else { print $db->error(); diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 4bf603236db..f932fbfc8af 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -208,10 +208,8 @@ if ($result) { $i ++; } - print ' '; - - print ""; - + print ''; + print '
'; print ''; } else { print $db->error(); From cc553514af411d0206b81271270e029116fa1057 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 8 Oct 2014 14:51:16 +0200 Subject: [PATCH 0188/1190] Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have the same name as the module --- htdocs/core/lib/functions.lib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4dece372561..4e81591bcb4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1814,8 +1814,10 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $ $theme = $conf->theme; $path = 'theme/'.$theme; - if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; - //if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path; // TODO What if there is both FORCETHEMDIR and OVERWRITE_THEM_RES + if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module + else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // TODO helpful ? + else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module + // If we ask an image into $url/$mymodule/img (instead of default path) if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs)) { From 168b0db0941dd963c61a784ad9a393796c8625d6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Oct 2014 15:09:07 +0200 Subject: [PATCH 0189/1190] Fix: button must be align to right --- htdocs/core/tpl/contacts.tpl.php | 6 +++--- htdocs/projet/contact.php | 4 ++-- htdocs/theme/eldy/style.css.php | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index fda7aa00832..acc0cd6b502 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -1,6 +1,6 @@ - * Copyright (C) 2013 Laurent Destailleur +/* Copyright (C) 2012 Regis Houssin + * Copyright (C) 2013-2014 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -209,7 +209,7 @@ $userstatic=new User($db); ?> statut >= 0) echo ''; ?> -
+
 "> diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index b570d5720d9..bc8f5b3098c 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -1,6 +1,6 @@ - * Copyright (C) 2012 Laurent Destailleur +/* Copyright (C) 2010 Regis Houssin + * Copyright (C) 2012-2014 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 5b0e64525f6..a7e60a6cdcd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -105,7 +105,7 @@ $colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+roun $colorbacklinepair1='255,255,255'; // line pair $colorbacklinepair2='255,255,255'; // line pair $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); -$colorbackbody='#fcfcfc'; +$colorbackbody='#f9f9f9'; $colortext='40,40,40'; $fontsize='12'; $fontsizesmaller='11'; @@ -123,8 +123,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; - //$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;'; - $conf->global->THEME_ELDY_BACKBODY='#fcfcfc;'; + $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;'; $conf->global->THEME_ELDY_LINEPAIR1='242,242,242'; $conf->global->THEME_ELDY_LINEPAIR2='248,248,248'; $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; @@ -820,7 +819,7 @@ foreach($mainmenuusedarray as $val) .bodylogin { - background: #f9f9f9; + background: #f0f0f0; } .login_vertical_align { padding: 10px; From 4c4485d0eebcc8bbd8ecd9c6c1a44f67e778a97f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Oct 2014 15:24:35 +0200 Subject: [PATCH 0190/1190] More comment to explain and remove a todo. --- htdocs/core/lib/functions.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4e81591bcb4..cab71ac6685 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1809,13 +1809,13 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $ } else { - // By default, we search $url/theme/$theme/img/$picto + // We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto $url = DOL_URL_ROOT; $theme = $conf->theme; $path = 'theme/'.$theme; if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module - else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // TODO helpful ? + else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module // If we ask an image into $url/$mymodule/img (instead of default path) @@ -1827,10 +1827,10 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $ // Clean parameters if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png'; // If alt path are defined, define url where img file is, according to physical path - foreach ($conf->file->dol_document_root as $type => $dirroot) // ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir/htdocs", ...) + foreach ($conf->file->dol_document_root as $type => $dirroot) // ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...) { if ($type == 'main') continue; - if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) + if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) // This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded { $url=DOL_URL_ROOT.$conf->file->dol_url_root[$type]; break; From de5005ca5446e9c06dfcfa8d9eec9bf583855aa9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Oct 2014 15:35:39 +0200 Subject: [PATCH 0191/1190] Fix: Avoid duplicate error message Fix: pgsql syntax error --- htdocs/core/lib/functions.lib.php | 6 +++++- htdocs/projet/class/task.class.php | 4 ++-- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/task.php | 12 ++++++------ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cab71ac6685..e088f764040 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4147,7 +4147,11 @@ function setEventMessages($mesg, $mesgs, $style='mesgs') { if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('','Bad parameter for setEventMessage'); if (empty($mesgs)) setEventMessage($mesg, $style); - else setEventMessage($mesgs, $style); + else + { + if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array + setEventMessage($mesgs, $style); + } } /** diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 13360110310..62052ebaa29 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -285,8 +285,8 @@ class Task extends CommonObject $sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").","; $sql.= " duration_effective=".(isset($this->duration_effective)?$this->duration_effective:"null").","; $sql.= " planned_workload=".(isset($this->planned_workload)?$this->planned_workload:"0").","; - $sql.= " dateo=".($this->date_start!=''?$this->db->idate($this->date_start):'null').","; - $sql.= " datee=".($this->date_end!=''?$this->db->idate($this->date_end):'null').","; + $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').","; + $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').","; $sql.= " progress=".$this->progress.","; $sql.= " rang=".((!empty($this->rang))?$this->rang:"0"); $sql.= " WHERE rowid=".$this->id; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index d1d5092628e..7aea9314e5a 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 8e5b664759e..da200d565b6 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -58,9 +58,11 @@ $projectstatic = new Project($db); // fetch optionals attributes and labels $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); + + /* * Actions -*/ + */ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer) { @@ -91,11 +93,10 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer) $ret = $extrafields->setOptionalsFromPost($extralabels,$object); $result=$object->update($user); - + if ($result < 0) { - setEventMessage($object->error,'errors'); - setEventMessage($object->errors,'errors'); + setEventMessages($object->error,$object->errors,'errors'); } } else @@ -121,8 +122,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s } else { - $langs->load("errors"); - setEventMessage($langs->trans($object->error), 'errors'); + setEventMessages($object->error,$object->errors,'errors'); $action=''; } } From 0390085f5401b7de1463986704287cc213aafad8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Oct 2014 13:47:40 +0200 Subject: [PATCH 0192/1190] Style for install match css of login. --- htdocs/install/default.css | 59 ++++++++++++++++++++++++++++++++------ htdocs/install/etape1.php | 4 +++ 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 6be69acd912..c3feead7a8f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -19,7 +19,7 @@ body { font-size:13px; font-family: Verdana, Arial, Helvetica, Tahoma, sans-serif; -background: #f6f6f6; +background: #f0f0f0; margin: 15px 30px 10px; } @@ -35,7 +35,7 @@ background: #FFFFFF; color: #444; border: 1px solid #999; padding: 5px 5px 5px 5px; -margin: 0 0 0 0; +margin: 0 0 0 20px; } div.soustitre { @@ -57,6 +57,39 @@ padding: 0 0 0 0; margin: 0 0 0 0; } +input[type=submit] { + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + display: inline-block; + padding: 4px 14px; + margin-bottom: 0; + text-align: center; + cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + border: 1px solid #bbbbbb; + border-bottom-color: #a2a2a2; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} +input:focus, textarea:focus, button:focus, select:focus { + box-shadow: 0 0 4px #8091BF; +} input[type=text], input[type=password] { border: 1px solid #ACBCBB; } @@ -70,13 +103,21 @@ input:-webkit-autofill { } table.main { -background: #FfFfFf; -text-align: left; -border: 1px solid #999; -color: #000000; --webkit-box-shadow: 3px 3px 4px #DDD !important; --moz-box-shadow: 3px 3px 4px #DDD !important; -box-shadow: 3px 3px 4px #DDD !important; +margin-left: 10px; +margin-right: 10px; +padding-left: 6px; +padding-right: 6px; +padding-top: 12px; +padding-bottom: 12px; +border: 1px solid #A0A0A0; +border-radius: 8px; +border: solid 1px rgba(90,90,90,.4); +-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); +-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); +box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); +background-color: #FFFFFF; +background: -webkit-gradient(linear, center top, center bottom, color-stop(0%, #fff), color-stop(100%, #f8f8f8)); +background: -moz-linear-gradient(top, #fff, #f8f8f8); } table.main-inside { diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 831283c6a46..20450760127 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -214,7 +214,9 @@ if (! $error) { print '
'.$db->error.'
'; if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; + //print ''; print $langs->trans("ErrorGoBackAndCorrectParameters"); + //print ''; $error++; } } @@ -223,7 +225,9 @@ if (! $error) { print "
\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")
\n"; print '
'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'
'; + //print ''; print $langs->trans("ErrorGoBackAndCorrectParameters"); + //print ''; $error++; } } From bc669f1702cf9b6efb3a04cdd3e37520f2d0900c Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 9 Oct 2014 13:54:52 +0200 Subject: [PATCH 0193/1190] Merge --- htdocs/categories/viewcat.php | 82 +++++++++++++++++------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 14a63ffc837..c55f324ab06 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -38,7 +38,7 @@ $type=GETPOST('type'); $action=GETPOST('action'); $confirm=GETPOST('confirm'); $removeelem = GETPOST('removeelem','int'); -$elemid=GETPOST('elemid'); +$elemid=GETPOST('elemid'); if ($id == "") { @@ -121,32 +121,32 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi } } -if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer)) +if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer)) { - require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; - $newobject = new Product($db); - $result = $newobject->fetch($elemid); + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + $newobject = new Product($db); + $result = $newobject->fetch($elemid); $elementtype = 'product'; // TODO Add into categ - $result=$object->add_type($newobject,$elementtype); - if ($result >= 0) - { - setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref)); - } - else - { - if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') - { - setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings'); - } - else - { - setEventMessages($object->error,$object->errors,'errors'); - } - } - -} + $result=$object->add_type($newobject,$elementtype); + if ($result >= 0) + { + setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref)); + } + else + { + if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') + { + setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings'); + } + else + { + setEventMessages($object->error,$object->errors,'errors'); + } + } + +} @@ -292,26 +292,26 @@ if ($object->type == 0) { $showclassifyform=1; $typeid=0; - // Form to add record into a category - if ($showclassifyform) - { + // Form to add record into a category + if ($showclassifyform) + { print '
'; - print '
'; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; - print ''; - print ''; - print ''; - print '
'; - print $langs->trans("AddProductServiceIntoCategory").'  '; - print $form->select_produits('','elemid','',0,0,-1,2,'',1); - print ''; - print '
'; - print '
'; - } + print ''; + print ''; + print ''; + print '
'; + print $langs->trans("AddProductServiceIntoCategory").'  '; + print $form->select_produits('','elemid','',0,0,-1,2,'',1); + print ''; + print '
'; + print ''; + } print "
"; print "\n"; From 4fd67d725ab2d634dc0a1f66f3a508a158eabbbf Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 6 Oct 2014 10:05:27 +0200 Subject: [PATCH 0194/1190] Fix bug 1588 : relative discount not working anymore --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 68613492df8..a51a6505416 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -203,7 +203,7 @@ else { - + Date: Thu, 9 Oct 2014 17:05:57 +0200 Subject: [PATCH 0195/1190] Some fix on per user view. --- htdocs/comm/action/card.php | 82 ++++++++++--------- htdocs/comm/action/class/actioncomm.class.php | 2 +- htdocs/comm/action/index.php | 5 ++ htdocs/comm/action/listactions.php | 13 ++- htdocs/comm/action/peruser.php | 49 ++++++----- htdocs/core/lib/agenda.lib.php | 2 +- htdocs/langs/en_US/agenda.lang | 1 + htdocs/theme/eldy/style.css.php | 2 +- 8 files changed, 89 insertions(+), 67 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index e4c0fe78aa9..a306ff202b4 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1248,46 +1248,48 @@ if ($id > 0) print ''; - - // Link to agenda views - print '
'; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' '; - print ''."\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' '; - print ''."\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' '; - print ''."\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' '; - print ''."\n"; - print '
'; + if ($action != 'edit') + { + // Link to agenda views + print '
'; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' '; + print ''."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' '; + print ''."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' '; + print ''."\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' '; + print ''."\n"; + print '
'; + } } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 1d99a8eec34..62acfb963b1 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -419,7 +419,7 @@ class ActionComm extends CommonObject while ($obj = $this->db->fetch_object($resql2)) { - $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency); + if ($obj->fk_element > 0) $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency); if (empty($this->userownerid)) $this->userownerid=$obj->fk_element; // If not defined (should not happened, we fix this) } diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index a1c03a7f15e..6c2173b1b40 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -46,6 +46,11 @@ $filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filt $usergroup = GETPOST("usergroup","int",3); $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1; +// If not choice done on calendar owner, we filter on user. +if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) +{ + $filtert=$user->id; +} $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index bc8a15827e0..8a5c698724f 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -56,6 +56,12 @@ $filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filt $usergroup = GETPOST("usergroup","int",3); $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1; +// If not choice done on calendar owner, we filter on user. +if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) +{ + $filtert=$user->id; +} + $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -98,6 +104,7 @@ $hookmanager->initHooks(array('agendalist')); /* * Actions */ + if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday")) { $param=''; @@ -144,7 +151,7 @@ $sql.= " a.fk_contact, a.note, a.label, a.percent as percent,"; $sql.= " c.code as acode, c.libelle,"; $sql.= " ua.login as loginauthor, ua.rowid as useridauthor,"; $sql.= " ut.login as logintodo, ut.rowid as useridtodo,"; -$sql.= " ud.login as logindone, ud.rowid as useriddone,"; +//$sql.= " ud.login as logindone, ud.rowid as useriddone,"; $sql.= " sp.lastname, sp.firstname"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c,"; $sql.= " ".MAIN_DB_PREFIX.'user as u,'; @@ -154,7 +161,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON a.fk_user_author = ua.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ut ON a.fk_user_action = ut.rowid"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ud ON a.fk_user_done = ud.rowid"; +//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ud ON a.fk_user_done = ud.rowid"; if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu"; $sql.= " WHERE c.id = a.fk_action"; $sql.= ' AND a.fk_user_author = u.rowid'; @@ -244,7 +251,7 @@ if ($resql) print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("ActionUserAsk"),$_SERVER["PHP_SELF"],"ua.login",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("AffectedTo"),$_SERVER["PHP_SELF"],"ut.login",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("ActionsOwnedBy"),$_SERVER["PHP_SELF"],"ut.login",$param,"","",$sortfield,$sortorder); //print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index b4c0b4edbfa..1ca9af2b251 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -47,6 +47,11 @@ $usergroup = GETPOST("usergroup","int",3); //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1; $showbirthday = 0; +// If not choice done on calendar owner, we filter on user. +if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) +{ + $filtert=$user->id; +} $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); @@ -557,30 +562,32 @@ while ($i < 7) } echo "\n"; + // Define $usernames $usernames = array(); //init -/* Use this to have list of users only if users have events +$usernamesid = array(); +/* Use this to have list of users only if users have events */ foreach ($eventarray as $daykey => $notused) { - $annee = date('Y',$daykey); - $mois = date('m',$daykey); - $jour = date('d',$daykey); - //if ($day==$jour && $month==$mois && $year==$annee) - //{ - //Tout les events à la même date : - foreach ($eventarray[$daykey] as $index => $event) - { - $myuser = new User($db); - $user_id = $event->usertodo->id; - $myuser->fetch($user_id); - $username = $myuser->getFullName($langs); - if (! in_array($username, $usernames)) - { - $usernames[] = $username; - } - } - //} -}*/ + // Get all assigned users for each event + foreach ($eventarray[$daykey] as $index => $event) + { + $event->fetch_userassigned(); + $listofuserid=$event->userassigned; + foreach($listofuserid as $userid => $tmp) + { + if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid; + } + } +} +foreach($usernamesid as $id) +{ + $tmpuser=new User($db); + $result=$tmpuser->fetch($id); + $usernames[]=$tmpuser; +} + +/* if ($filtert > 0) { $tmpuser = new User($db); @@ -598,7 +605,7 @@ else $tmpgroup = new UserGroup($db); //$tmpgroup->fetch($usergroup); No fetch, we want all users for all groups $usernames = $tmpgroup->listUsersForGroup(); -} +}*/ // Load array of colors by type $colorsbytype=array(); diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index ddfcd239a41..3d9a5e8299c 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -74,7 +74,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh //print '  '; - + $product_static->status_buy = $objp->tobuy; + $product_static->status = $objp->tosell; // Status (to sell) - print ''; + print ''; + + // Status (to buy) + print ''; print ''; From a7941805861434e9af68889c175d70e621693164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20DAVID?= Date: Sat, 18 Oct 2014 16:41:47 +0200 Subject: [PATCH 0299/1190] Document the ability to export agenda calendar restricted to project ID --- htdocs/admin/agenda_xcal.php | 3 ++- htdocs/langs/en_US/agenda.lang | 1 + htdocs/langs/fr_FR/agenda.lang | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 135429e15d3..4e9005a27de 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -174,7 +174,8 @@ $message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'
'; $message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'
'; $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'
'; $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'
'; -$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login); +$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login).'
'; +$message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login); print info_admin($message); if (! empty($conf->use_javascript_ajax)) diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 187f818210e..b777ed2838a 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -65,6 +65,7 @@ AgendaUrlOptions2=login=%s to restrict output to actions created by, assi AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 190c08ad2ac..766b5aca829 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -65,6 +65,7 @@ AgendaUrlOptions2=login=%s pour limiter l'export aux actions créées, af AgendaUrlOptions3=logina=%s pour limiter l'export aux actions créées par l'utilisateur %s. AgendaUrlOptions4=logint=%s pour limiter l'export aux actions affectées à l'utilisateur %s. AgendaUrlOptions5=logind=%s pour limiter l'export aux actions réalisées par l'utilisateur %s. +AgendaUrlOptionsProject=project=PROJECT_ID pour limiter l'export aux actions associées au projet dont l'identifiant est PROJECT_ID. AgendaShowBirthdayEvents=Afficher l'anniversaire des contacts AgendaHideBirthdayEvents=Cacher l'anniversaire des contacts Busy=Occupé From dd5ea670e2e5bdb30dd0b7bab7df181ef8620abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 17:11:02 +0200 Subject: [PATCH 0300/1190] Update ajax.lib.php --- htdocs/core/lib/ajax.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 46442460feb..0057f976a75 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -469,7 +469,6 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, */ function ajax_object_onoff($object, $code, $input=array()) { - require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; global $conf, $langs, $db; $out= ''; - if ($code=='status') { - $out.= ''.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').''; - $out.= ''.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').''; - } - if ($code=='status_buy') { - $out.= ''.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').''; - $out.= ''.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').''; - } + $out.= ''.img_picto($langs->trans($text_off),'switch_off').''; + $out.= ''.img_picto($langs->trans($text_on),'switch_on').''; + return $out; } From 446e73d8b80e5b977d484d2a70c5ebda5f9ff600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 18:49:47 +0200 Subject: [PATCH 0304/1190] Update card.php --- htdocs/product/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index cd75ab3e2bb..eadb701e4a8 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1421,7 +1421,7 @@ else // Status (to sell) print ''; print ''; print $htmllogobar; $htmllogobar=''; print ''; From 9b24cccd0bf61bd3306a40d4f360eaf8f7f8af01 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Oct 2014 12:24:36 +0200 Subject: [PATCH 0313/1190] Fix: Better layout detection --- htdocs/categories/categorie.php | 2 +- htdocs/core/class/html.formfile.class.php | 6 +++--- htdocs/core/class/mobiledetect.class.php | 15 ++++++++++----- htdocs/core/lib/functions.lib.php | 1 + htdocs/theme/eldy/style.css.php | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index c74eefdc430..3200513d11d 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -634,7 +634,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) print ''; print '
"> remise_client); ?>" name="remise_percent">%remise_percent); ?>" name="remise_percent">%
'; //print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit); //print '   '.$langs->trans("or") . ' '; - print $langs->trans("ActionAffectedTo").'   '; + print $langs->trans("ActionsOwnedBy").'   '; print ''; //print $langs->trans("User"); print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit); diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index cb19170dab3..227f7a61118 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -7,6 +7,7 @@ Agendas=Agendas Calendar=Calendar Calendars=Calendars LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a7e60a6cdcd..43aee0161af 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2375,7 +2375,7 @@ table.cal_month { border-spacing: 0px; } .cal_past { } .cal_peruser { padding: 0px; } .peruser_busy { background: #CC8888; } -.peruser_notbusy { background: #EEDDDD; } +.peruser_notbusy { background: #EEDDDD; opacity: 0.5; } table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25); moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25); From a19e8aa89dacbe156de42ce0b3fbef00730bea77 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Oct 2014 17:15:15 +0200 Subject: [PATCH 0196/1190] Sync transifex --- htdocs/langs/fr_FR/accountancy.lang | 42 ++++----- htdocs/langs/fr_FR/admin.lang | 4 +- htdocs/langs/fr_FR/agenda.lang | 2 + htdocs/langs/fr_FR/categories.lang | 3 +- htdocs/langs/fr_FR/companies.lang | 4 +- htdocs/langs/fr_FR/compta.lang | 24 +++-- htdocs/langs/fr_FR/donations.lang | 16 +--- htdocs/langs/fr_FR/errors.lang | 5 +- htdocs/langs/fr_FR/holiday.lang | 126 +++++++++++++------------- htdocs/langs/fr_FR/interventions.lang | 4 +- htdocs/langs/fr_FR/projects.lang | 12 +-- htdocs/langs/fr_FR/sendings.lang | 8 +- htdocs/langs/fr_FR/suppliers.lang | 4 +- 13 files changed, 130 insertions(+), 124 deletions(-) diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 939a3fde7d5..f538e713b81 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -2,7 +2,7 @@ CHARSET=UTF-8 Accounting=Comptabilité -Globalparameters=Paramètres globals +Globalparameters=Paramètres globaux Chartofaccounts=Plan comptable Fiscalyear=Années fiscales Menuaccount=Comptes comptables @@ -17,8 +17,8 @@ Modelcsv=Modèle d'export Selectmodelcsv=Sélectionner un modèle d'export Modelcsv_normal=Export standard Modelcsv_CEGID=Export vers CEGID Expert -BackToChartofaccounts=Return chart of accounts -Back=Return +BackToChartofaccounts=Retour au plan comptable +Back=Retour Definechartofaccounts=Définir un plan comptable Selectchartofaccounts=Sélectionner un plan comptable @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Séparateur de champ +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Journal des ventes -ACCOUNTINGEX_PURCHASE_JOURNAL=Journal des achats -ACCOUNTINGEX_BANK_JOURNAL=Journal de banque -ACCOUNTINGEX_CASH_JOURNAL=Journal de compte caisse -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Journal divers -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Compte de transfert -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Compte d'attente +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type de documents Docdate=Date diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 9f8cb56896e..33615e0661d 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -219,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatique si Javascript est désactivé AvailableOnlyIfJavascriptNotDisabled=Disponible uniquement si Javascript activé AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible uniquement si Javascript activé Required=Requis +UsedOnlyWithTypeOption=Used by some agenda option only Security=Sécurité Passwords=Mots de passe DoNotStoreClearPassword=Ne pas stocker de mots de passe en clair dans la base (Activation recommandée) @@ -584,9 +585,6 @@ Permission92=Créer/modifier les charges et la TVA Permission93=Supprimer les charges et la TVA Permission94=Exporter les charges Permission95=Consulter CA, bilans et résultats -Permission96=Paramétrer la ventilation -Permission97=Lire les lignes de factures -Permission98=Ventiler les lignes de factures Permission101=Consulter les expéditions Permission102=Créer/modifier les expéditions Permission104=Valider les expéditions diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 43a7a2faf11..bf7386a448c 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -7,6 +7,7 @@ Agendas=Agendas Calendar=Calendrier Calendars=Calendriers LocalAgenda=Calendrier interne +ActionsOwnedBy=Propriétaire de l'événement AffectedTo=Affecté à DoneBy=Réalisé par Event=Evénement @@ -89,3 +90,4 @@ ExtSiteNoLabel=Aucune description WorkingTimeRange=Plage d'heures travaillées WorkingDaysRange=Plage de jours travaillés AddEvent=Créer événement +MyAvailability=Ma disponibilité diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index 6570eec5638..d4778cc47ca 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -110,4 +110,5 @@ ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ? ExtraFieldsCategories=Attributs supplémentaires CategoriesSetup=Configuration du module catégories CategorieRecursiv=Lier avec les catégories parentes -CategorieRecursivHelp=Si activer, quand un élément est ajouté dans une catégorie, ajouter aussi l'élément dans toutes les catégories parentes +CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une catégorie, l'ajouter aussi dans toutes les catégories parentes +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index e0f33d6ec27..e44cb0caa9f 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Vous devez créer des contacts avec emails sur le tier ListSuppliersShort=Liste fournisseurs ListProspectsShort=Liste prospects ListCustomersShort=Liste clients -ThirdPartiesArea=Espace Tiers +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Les %s derniers tiers modifiés UniqueThirdParties=Total de tiers uniques InActivity=En activité @@ -410,3 +410,5 @@ OutstandingBillReached=Montant max. endetté MonkeyNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn pour les codes clients et %syymm-nnnn pour les codes fournisseurs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0. LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment. ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 077f6c6b595..086d075d3f4 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -164,6 +164,9 @@ NotUsedForGoods=Non utilisé pour les biens ProposalStats=Statistiques sur les propales OrderStats=Statistiques sur les commandes InvoiceStats=Statistiques sur les factures +Dispatch=Ventilation +Dispatched=Ventilés +ToDispatch=A ventiler ThirdPartyMustBeEditAsCustomer=Le tiers doit être défini comme client SellsJournal=Journal des ventes PurchasesJournal=Journal des achats @@ -184,7 +187,7 @@ AccountancyDashboard=Synthèse compta/tréso ByProductsAndServices=Par produits et services RefExt=Référence externe ToCreateAPredefinedInvoice=Pour créer une facture prédéfinie, créer une facture standard puis sans la valider, cliquer sur le bouton "Convertir en facture prédéfine". -LinkedOrder=Lier à une commande +LinkedOrder=Link to order ReCalculate=Recalculer Mode1=Mode 1 Mode2=Mode 2 @@ -193,11 +196,14 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode comptabilité de caisse n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit comptabilité d'engagement (voir la configuration du module de comptabilité). CalculationMode=Mode de calcul AccountancyJournal=Code journal comptabilité -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits -ACCOUNTING_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services -ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA -ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA -ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients -ACCOUNTING_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index 2da59454571..4ba948aab30 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - donations Donation=Don Donations=Dons -DonationRef=Numéro d'ordre du reçu +DonationRef=Réf. donation Donor=Donateur Donors=Donateurs AddDonation=Ajouter don @@ -22,20 +22,12 @@ DonationStatusPromiseNotValidatedShort=Non validée DonationStatusPromiseValidatedShort=Validée DonationStatusPaidShort=Payé ValidPromess=Valider promesse -DonationTitle=Reçu au titre des dons -DonationReceipt=Reçu au titre des dons
à certains organismes d'intéret général -DonationDatePayment=Date de versement ou du don +DonationReceipt=Reçu de dons BuildDonationReceipt=Créer reçu DonationsModels=Modèles de documents de bon de réception de dons LastModifiedDonations=Les %s derniers dons modifiés SearchADonation=Rechercher un don DonationRecipient=Bénéficiaire des versements ThankYou=Merci -FreeTextOnDonations=Message affiché sur le récépissé de versements ou dons -IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des dons et versements ouvrant droit à réduction d'impôt, la somme de -# French Options -FrenchOptions=Options éligibles en France -DONATION_ART200=Les dons ou versements reçus sont éligibles à l'article 200 du CGI -DONATION_ART238=Les dons ou versements reçus sont éligibles à l'article 238bis du CGI -DONATION_ART885=Les dons ou versements reçus sont éligibles à l'article 885-0 V bis A du CGI -MinimumAmount=Le montant minimum du don est de %s \ No newline at end of file +IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 954a83375b9..8185e2f617b 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -135,6 +135,8 @@ ErrorWarehouseMustDiffers=Les entrepôts source et destination doivent être dif ErrorBadFormat=Mauvais format ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'est lié à aucun tiers. Lier l'adhérent à un tiers existant ou créer un nouveau tiers pour le lier avant de créer l'adhésion avec facture. ErrorThereIsSomeDeliveries=Erreur, il y a des bordereaux de réception liées à ces expéditions. La suppression est refusée. +ErrorCantDeletePaymentReconciliated=Impossible d'effacer un paiement qui a généré une écriture bancaire qui a été rapprochée +ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible d'effacer un paiement qui porte sur au moins une facture qui est à l'état payée. # Warnings WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées @@ -153,4 +155,5 @@ WarningUsingThisBoxSlowDown=Attention, l'utilisation de cette boite provoque de WarningClickToDialUserSetupNotComplete=La configuration ClickToDial pour votre compte utilisateur n'est pas complète (voir l'onglet ClickToDial sur votre fiche utilisateur) WarningNotRelevant=Opération non pertinente pour cet ensemble de données WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivé quand l'affichage est en mode optimisé pour les personnes aveugles ou les navigateurs textes. -WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturaction (%s) de la facture %s. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index e4c997cb859..c2041e71345 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=GRH -Holidays=Congés -CPTitreMenu=Congés +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Etat mensuel -MenuAddCP=Nouvelle demande -NotActiveModCP=Vous devez activer le module Congés pour afficher cette page. -NotConfigModCP=Vous devez configurer le module Congés pour afficher cette page. Pour effectuer cette opération, cliquer ici. -NoCPforUser=Vous n'avez pas encore de demande de congés. -AddCP=Créer demande de congés +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employé DateDebCP=Date Début DateFinCP=Date Fin @@ -18,24 +18,24 @@ ApprovedCP=Approuvé CancelCP=Annulée RefuseCP=Refusée ValidatorCP=Approbateur -ListeCP=Liste des congés +ListeCP=List of leaves ReviewedByCP=Sera approuvé par DescCP=Description -SendRequestCP=Envoyer la demande de congés -DelayToRequestCP=Les demandes de congés doivent être faites au moins %s jours avant la date de ceux-ci. -MenuConfCP=Mettre à jour solde -UpdateAllCP=Mettre à jour les congés -SoldeCPUser=Solde de congés: %s jours. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début. ErrorSQLCreateCP=Une erreur SQL est survenue durant la création : -ErrorIDFicheCP=Une erreur est survenue, cette demande de congés n'existe pas. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Retour à la page précédente -ErrorUserViewCP=Vous n'êtes pas autorisé à lire cette demande de congés. -InfosCP=Informations de la demande de congés +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Informations du workflow RequestByCP=Demandée par -TitreRequestCP=Fiche Congés -NbUseDaysCP=Nombre de jours de congés consommés +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Modifier DeleteCP=Supprimer ActionValidCP=Valider @@ -43,26 +43,26 @@ ActionRefuseCP=Refuser ActionCancelCP=Annuler StatutCP=Statut SendToValidationCP=Envoyer en validation -TitleDeleteCP=Supprimer la demande de Congés -ConfirmDeleteCP=Confirmer la suppression de cette demande de congés ? -ErrorCantDeleteCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés. -CantCreateCP=Vous n'avez pas le droit de faire des demandes de congés. -InvalidValidatorCP=Vous devez choisir un approbateur pour votre demande de congés. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Mettre à jour -CantUpdate=Vous ne pouvez pas mettre à jour cette demande de congés. +CantUpdate=You cannot update this leave request. NoDateDebut=Vous devez choisir une date de début. NoDateFin=Vous devez choisir une date de fin. ErrorDureeCP=Votre demande de congés payés ne contient aucun jour ouvré. TitleValidCP=Valider la demande de Congés Payés -ConfirmValidCP=Êtes-vous sûr de vouloir valider la demande de congés ? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date d'approbation -TitleToValidCP=Envoyer la demande de Congés Payés -ConfirmToValidCP=Êtes-vous sûr de vouloir envoyer la demande de congés ? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuser la demande de Congés Payés -ConfirmRefuseCP=Êtes-vous sûr de vouloir refuser la demande de congés ? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Vous devez choisir un motif pour refuser cette demande. TitleCancelCP=Annuler la demande de Congés Payés -ConfirmCancelCP=Êtes-vous sûr de vouloir annuler la demande de congés ? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motif du refus DateRefusCP=Date du refus DateCancelCP=Date de l'annulation @@ -72,8 +72,8 @@ MotifCP=Motif UserCP=Utilisateur ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel. AddEventToUserOkCP=L'ajout du congé exceptionnel à bien été effectué. -MenuLogCP=Voir les logs des congés -LogCP=Logs des mises à jours des congés +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Réalisée par UserUpdateCP=Pour l'utilisateur PrevSoldeCP=Précédent Solde @@ -81,33 +81,33 @@ NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période. UserName=Nom Prénom Employee=Salarié -FirstDayOfHoliday=Premier jour de congés -LastDayOfHoliday=Dernier jour de congés +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Mise à jour mensuelle ManualUpdate=Mise à jour manuelle -HolidaysCancelation=Annulation de congès +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration du module Congés DescOptionCP=Description de l'option ValueOptionCP=Valeur -GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Valider la configuration -LastUpdateCP=Dernière mise à jour automatique des congés +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Mise à jour effectuée avec succès. ErrorUpdateConfCP=Une erreur à eu lieu durant la mise à jour, merci de réessayer. AddCPforUsers=Veuillez ajouter le solde des congés des utilisateurs en cliquant ici. DelayForSubmitCP=Délai pour faire une demande de congés avant ceux-ci AlertapprobatortorDelayCP=Prévenir le validateur si la demande de congés ne correspond pas à la date limite -AlertValidatorDelayCP=Prévenir le valideur si la demande de congés ne respecte le délai prévu -AlertValidorSoldeCP=Prévenir le valideur si l'utilisateur demande des congés dépassant son solde -nbUserCP=Nombre d'utilisateur pris en charge dans le module congés -nbHolidayDeductedCP=Nombre de congés payés à déduire par jour de congé pris -nbHolidayEveryMonthCP=Nombre de congés payés ajoutés chaque mois -Module27130Name= Gestion des congés -Module27130Desc= Gestion des congés -TitleOptionMainCP=Réglages principaux des congés -TitleOptionEventCP=Réglages des congés liés à des évènements +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Valider UpdateEventCP=Mettre à jour les évènements CreateEventCP=Créer @@ -127,23 +127,23 @@ UpdateEventOptionCP=Mettre à jour ErrorMailNotSend=Une erreur est survenue lors de l'envoi du mail : NoCPforMonth=Aucun congé ce mois-ci. nbJours=Nombre jours -TitleAdminCP=Configuration des Congés +TitleAdminCP=Configuration of Leaves #Messages Hello=Bonjour -HolidaysToValidate=Congés payés à valider -HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés payés à valider. -HolidaysToValidateDelay=Cette demande de congés payés à été effectué dans un délai de moins de %s jours avant ceux-ci. -HolidaysToValidateAlertSolde=L'utilisateur ayant fait cette demande de congés payés n'a pas le solde requis. -HolidaysValidated=Congés payés validée -HolidaysValidatedBody=Votre demande de congés payés du %s au %s vient d'être validée! -HolidaysRefused=Congés payés refusée -HolidaysRefusedBody=Votre demande de congés payés %s à %s vient d'être refusée pour le motif suivant : -HolidaysCanceled=Congés payés annulée -HolidaysCanceledBody=Votre demande de congés %s à %s va été annulée. -Permission20000=Lire ses propres congès -Permission20001=Créer/modifier ses propres congès -Permission20002=Créer/modifier les congès pour tout le monde -Permission20003=Supprimer les demandes de congés -Permission20004=Définir les congés des utilisateurs -Permission20005=Voir les logs de modification des congés payés -Permission20006=Accéder au rapport mensuel des congés +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang index 74e8f52c062..5933e2f4bd0 100644 --- a/htdocs/langs/fr_FR/interventions.lang +++ b/htdocs/langs/fr_FR/interventions.lang @@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Nom et signature de l'intervenant : NameAndSignatureOfExternalContact=Nom et signature du client : DocumentModelStandard=Modèle de fiche d'intervention standard InterventionCardsAndInterventionLines=Fiches interventions et lignes d'interventions -ClassifyBilled=Classer "Facturée" -ClassifyUnBilled=Classer "Non facturée" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Facturée RelatedInterventions=Interventions rattachées ShowIntervention=Afficher intervention diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 52fd913ee29..56242728012 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Événements sur le projet YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé DeleteATimeSpent=Suppression du temps consommé ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ? -DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées -ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Affectation ressources ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers NoTasks=Aucune tâche pour ce projet LinkedToAnotherCompany=Liés à autre société -TaskIsNotAffectedToYou=Tâche qui ne vous est pas affectée +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (%s tâches actuellement) et le suivi des consommés. IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers. @@ -119,8 +119,8 @@ TypeContact_project_task_external_TASKEXECUTIVE=Responsable TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur SelectElement=Séléctionnez l'élément -AddElement=Associer l'élément -UnlinkElement=Délier l'element +AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Modèle de rapport de projet complet (logo...) PlannedWorkload = Charge de travail prévue @@ -129,4 +129,4 @@ ProjectReferers=Objets associés SearchAProject=Rechercher un projet ProjectMustBeValidatedFirst=Le projet doit être validé d'abord ProjectDraft=Projets brouillons -FirstAddRessourceToAllocateTime=Associer une ressource pour allouer du temps consomée \ No newline at end of file +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index c7994bbba36..32ba068a942 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions vali DateDeliveryPlanned=Date de livraison prévue DateReceived=Date de réception réelle SendShippingByEMail=Envoyer bon d'expédition par email -SendShippingRef=Envoi bon d'expédition %s +SendShippingRef=Envoi du bordereau d'expédition %s ActionsOnShipping=Événements sur l'expédition LinkToTrackYourPackage=Lien pour le suivi de votre colis ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle expédition se fait depuis la fiche commande. @@ -66,11 +66,13 @@ CarrierList=Liste des transporteurs SendingMethodCATCH=Enlèvement par le client SendingMethodTRANS=Transporteur SendingMethodCOLSUI=Colissimo Suivi - # ModelDocument DocumentModelSirocco=Modèle de bon de réception/livraison simple DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie SumOfProductVolumes=Somme des volumes des produits SumOfProductWeights=Somme des poids des produits + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index f558b0779ea..4bfe3f9684b 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -40,5 +40,5 @@ AddSupplierInvoice=Créer facture fournisseur ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs %s NoneOrBatchFileNeverRan=Aucun ou traitement par lot %s non exécuté récemment SentToSuppliers=Envoyés aux fournisseurs -ListOfSupplierOrders=Liste des commandes fournisseur -MenuOrdersSupplierToBill=Commandes fournisseur à facturer \ No newline at end of file +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice From 31a96aa4c6cbb9b0b2d834bf5c0bd5aa4d25512f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Oct 2014 17:18:14 +0200 Subject: [PATCH 0197/1190] Fix: CRLF --- htdocs/categories/viewcat.php | 82 +++++++++++++++++------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 14a63ffc837..c55f324ab06 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -38,7 +38,7 @@ $type=GETPOST('type'); $action=GETPOST('action'); $confirm=GETPOST('confirm'); $removeelem = GETPOST('removeelem','int'); -$elemid=GETPOST('elemid'); +$elemid=GETPOST('elemid'); if ($id == "") { @@ -121,32 +121,32 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi } } -if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer)) +if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer)) { - require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; - $newobject = new Product($db); - $result = $newobject->fetch($elemid); + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + $newobject = new Product($db); + $result = $newobject->fetch($elemid); $elementtype = 'product'; // TODO Add into categ - $result=$object->add_type($newobject,$elementtype); - if ($result >= 0) - { - setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref)); - } - else - { - if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') - { - setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings'); - } - else - { - setEventMessages($object->error,$object->errors,'errors'); - } - } - -} + $result=$object->add_type($newobject,$elementtype); + if ($result >= 0) + { + setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref)); + } + else + { + if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') + { + setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings'); + } + else + { + setEventMessages($object->error,$object->errors,'errors'); + } + } + +} @@ -292,26 +292,26 @@ if ($object->type == 0) { $showclassifyform=1; $typeid=0; - // Form to add record into a category - if ($showclassifyform) - { + // Form to add record into a category + if ($showclassifyform) + { print '
'; - print '
'; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; - print ''; - print ''; - print ''; - print '
'; - print $langs->trans("AddProductServiceIntoCategory").'  '; - print $form->select_produits('','elemid','',0,0,-1,2,'',1); - print ''; - print '
'; - print '
'; - } + print ''; + print ''; + print ''; + print '
'; + print $langs->trans("AddProductServiceIntoCategory").'  '; + print $form->select_produits('','elemid','',0,0,-1,2,'',1); + print ''; + print '
'; + print ''; + } print "
"; print "\n"; From e76b5a370dfb92ee1b633ccb766d94f9107e1c70 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Oct 2014 17:27:14 +0200 Subject: [PATCH 0198/1190] Fix: bad parameter --- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/listactions.php | 2 +- htdocs/comm/action/peruser.php | 2 +- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 1 + htdocs/install/mysql/tables/llx_c_email_template.sql | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 6c2173b1b40..f94ca7cf30a 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -47,7 +47,7 @@ $usergroup = GETPOST("usergroup","int",3); $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1; // If not choice done on calendar owner, we filter on user. -if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) +if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) { $filtert=$user->id; } diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 8a5c698724f..fbd63e4006b 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -57,7 +57,7 @@ $usergroup = GETPOST("usergroup","int",3); $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1; // If not choice done on calendar owner, we filter on user. -if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) +if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) { $filtert=$user->id; } diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 1ca9af2b251..a6a11d04a99 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -48,7 +48,7 @@ $usergroup = GETPOST("usergroup","int",3); $showbirthday = 0; // If not choice done on calendar owner, we filter on user. -if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) +if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) { $filtert=$user->id; } diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 487ebfce7f8..be0469d34d3 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1011,6 +1011,7 @@ create table llx_c_email_templates entity integer DEFAULT 1 NOT NULL, -- multi company id module varchar(32), -- Nom du module en rapport avec le modele type_template varchar(32), -- template for which type of email (send invoice by email, send order, ...) + lang varchar(32), private smallint DEFAULT 0 NOT NULL, -- Template public or private fk_user integer, -- Id utilisateur si modele prive, sinon null datec datetime, diff --git a/htdocs/install/mysql/tables/llx_c_email_template.sql b/htdocs/install/mysql/tables/llx_c_email_template.sql index 532ecd995eb..ac424f31208 100644 --- a/htdocs/install/mysql/tables/llx_c_email_template.sql +++ b/htdocs/install/mysql/tables/llx_c_email_template.sql @@ -23,6 +23,7 @@ create table llx_c_email_template entity integer DEFAULT 1 NOT NULL, -- multi company id module varchar(32), -- Nom du module en rapport avec le modele type_template varchar(32), -- template for which type of email (send invoice by email, send order, ...) + lang varchar(6), private smallint DEFAULT 0 NOT NULL, -- Template public or private fk_user integer, -- Id utilisateur si modele prive, sinon null datec datetime, From 00fd9acf3148df27ca97bb44868176430faff6f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Oct 2014 18:32:23 +0200 Subject: [PATCH 0199/1190] Fix: Bad length of field Transifex sync --- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index be0469d34d3..9f4291cd05f 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1011,7 +1011,7 @@ create table llx_c_email_templates entity integer DEFAULT 1 NOT NULL, -- multi company id module varchar(32), -- Nom du module en rapport avec le modele type_template varchar(32), -- template for which type of email (send invoice by email, send order, ...) - lang varchar(32), + lang varchar(6), private smallint DEFAULT 0 NOT NULL, -- Template public or private fk_user integer, -- Id utilisateur si modele prive, sinon null datec datetime, From 00c5c940c9c9d83e4c4214ea3f95859645e003c1 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Thu, 9 Oct 2014 21:31:35 +0200 Subject: [PATCH 0200/1190] Update product.class.php Label of product on tooltip is more usefull than the ref who's already on the link --- htdocs/product/class/product.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index e78daeba631..b9521d6594b 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2814,8 +2814,8 @@ class Product extends CommonObject if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle'); if ($withpicto) { - if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->ref,'product').$lienfin.' '); - if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->ref,'service').$lienfin.' '); + if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label,'product').$lienfin.' '); + if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label,'service').$lienfin.' '); } $result.=$lien.$newref.$lienfin; return $result; From 7978b4503dc6f0cd49be59d9b802f7f816c49cfa Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Fri, 10 Oct 2014 14:57:07 +0200 Subject: [PATCH 0201/1190] Add function hideMail and use --- htdocs/core/lib/functions.lib.php | 36 +++++++++++++++++++++++++++++++ htdocs/user/passwordforgotten.php | 3 ++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7097bd2abae..931c0b95fdd 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1224,6 +1224,42 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid= return $newemail; } +/** + * Returns a hidden email. + * Hide part of email. + * + * @param string $mail Email + * @param string $replace Replacement caractaire ( defaul : *) + * @param int $nbreplace Number of replacement caractaire (default : 8) + * @param int $nbdisplaymail Number of caractaire unchanged (default: 4) + * @param int $nbdisplaydomain Number of caractaire unchanged of domain (default: 3) + * @param bool $displaytld Display tld (default: true) + * @return string Return hiden email or ''; + */ +function dol_hideMail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true){ + if(!isValidEmail($mail))return ' '; + $tab = explode('@', $mail); + $tab2 = explode('.',$tab[1]); + $string_replace = ''; + $mail_name = $tab[0]; + $mail_domaine = $tab2[0]; + $mail_tld = $displaytld ? ".".$tab2[1] : " "; + + for($i=0; $i < $nbreplace; $i++){ + $string_replace .= $replace; + } + + if(strlen($mail_name) > $nbdisplaymail){ + $mail_name = substr($mail_name, 0, $nbdisplaymail); + } + + if(strlen($mail_domaine) > $nbdisplaydomain){ + $mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain); + } + + return $mail_name . $string_replace . $mail_domaine . $mail_tld; +} + /** * Show Skype link * diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 4f1a36c6e04..c3c4fccb888 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -130,7 +130,8 @@ if ($action == 'buildnewpassword' && $username) // Success if ($edituser->send_password($user,$newpassword,1) > 0) { - $message = '
'.$langs->trans("PasswordChangeRequestSent",$edituser->login,$edituser->email).'
'; + + $message = '
'.$langs->trans("PasswordChangeRequestSent",$edituser->login,dol_hideMail($edituser->email)).'
'; //$message.=$newpassword; $username=''; } From f4f1f45d5a0da2124662a517666054183b43e242 Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Fri, 10 Oct 2014 15:01:10 +0200 Subject: [PATCH 0202/1190] copyright and annotation --- htdocs/core/lib/functions.lib.php | 13 +++++++------ htdocs/user/passwordforgotten.php | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 931c0b95fdd..28695fa41f4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -11,6 +11,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Alexandre Spangaro * Copyright (C) 2014 Marcos García + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1229,15 +1230,15 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid= * Hide part of email. * * @param string $mail Email - * @param string $replace Replacement caractaire ( defaul : *) - * @param int $nbreplace Number of replacement caractaire (default : 8) - * @param int $nbdisplaymail Number of caractaire unchanged (default: 4) - * @param int $nbdisplaydomain Number of caractaire unchanged of domain (default: 3) + * @param string $replace Replacement character ( defaul : *) + * @param int $nbreplace Number of replacement character (default : 8) + * @param int $nbdisplaymail Number of character unchanged (default: 4) + * @param int $nbdisplaydomain Number of character unchanged of domain (default: 3) * @param bool $displaytld Display tld (default: true) - * @return string Return hiden email or ''; + * @return string Return hidden email or ''; */ function dol_hideMail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true){ - if(!isValidEmail($mail))return ' '; + if(!isValidEmail($mail))return ''; $tab = explode('@', $mail); $tab2 = explode('.',$tab[1]); $string_replace = ''; diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index c3c4fccb888..eccd3d0cda3 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -2,6 +2,7 @@ /* Copyright (C) 2007-2011 Laurent Destailleur * Copyright (C) 2008-2012 Regis Houssin * Copyright (C) 2008-2011 Juanjo Menent + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 269b960d9a6127380677c27e1f618d369e49f8a9 Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Fri, 10 Oct 2014 15:18:24 +0200 Subject: [PATCH 0203/1190] Add support tld with dots --- htdocs/core/lib/functions.lib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 28695fa41f4..9dd4bb4da6b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1244,7 +1244,11 @@ function dol_hideMail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdi $string_replace = ''; $mail_name = $tab[0]; $mail_domaine = $tab2[0]; - $mail_tld = $displaytld ? ".".$tab2[1] : " "; + $mail_tld = ''; + + for($i=1; $i < count($tab2) && $displaytld ;$i++){ + $mail_tld .= '.'.$tab2[$i]; + } for($i=0; $i < $nbreplace; $i++){ $string_replace .= $replace; From c01edd76f611bedfd5f40089b7f3480765f9e5c3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Oct 2014 16:53:21 +0200 Subject: [PATCH 0204/1190] Fix: avoid warning --- htdocs/comm/action/class/actioncomm.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 62acfb963b1..14cacf60f6f 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -361,14 +361,19 @@ class ActionComm extends CommonObject $this->authorid = $obj->fk_user_author; $this->usermodid = $obj->fk_user_mod; + + if (!is_object($this->author)) $this->author = new stdClass(); // For avoid warning $this->author->id = $obj->fk_user_author; // deprecated $this->author->firstname = $obj->firstname; // deprecated $this->author->lastname = $obj->lastname; // deprecated + if (!is_object($this->usermod)) $this->usermod = new stdClass(); // For avoid warning $this->usermod->id = $obj->fk_user_mod; // deprecated $this->userownerid = $obj->fk_user_action; $this->userdoneid = $obj->fk_user_done; + if (!is_object($this->usertodo)) $this->usertodo = new stdClass(); // For avoid warning $this->usertodo->id = $obj->fk_user_action; // deprecated + if (!is_object($this->userdone)) $this->userdone = new stdClass(); // For avoid warning $this->userdone->id = $obj->fk_user_done; // deprecated $this->priority = $obj->priority; $this->fulldayevent = $obj->fulldayevent; From 2f3abd3774bb4912cf560c51b3bdcf037c2c68e8 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 10 Oct 2014 21:50:05 +0200 Subject: [PATCH 0205/1190] Trad: Syncro es_ES from transifex --- htdocs/langs/es_ES/accountancy.lang | 30 +++++++++++++-------------- htdocs/langs/es_ES/admin.lang | 1 + htdocs/langs/es_ES/agenda.lang | 4 +++- htdocs/langs/es_ES/categories.lang | 1 + htdocs/langs/es_ES/companies.lang | 4 +++- htdocs/langs/es_ES/compta.lang | 3 +++ htdocs/langs/es_ES/donations.lang | 1 + htdocs/langs/es_ES/errors.lang | 1 + htdocs/langs/es_ES/holiday.lang | 14 ++++++------- htdocs/langs/es_ES/interventions.lang | 4 ++-- htdocs/langs/es_ES/projects.lang | 8 ++++--- htdocs/langs/es_ES/sendings.lang | 4 ++++ htdocs/langs/es_ES/suppliers.lang | 2 ++ 13 files changed, 48 insertions(+), 29 deletions(-) diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index c715587994f..20ebb652882 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Línea de la factura VentilatedinAccount=Contabilizada con éxito en la cuenta contable NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad -ACCOUNTINGEX_SEPARATORCSV=separador CSV +ACCOUNTING_SEPARATORCSV=Separador CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes +ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes AccountLength=Longitud de las cuentas contables mostradas en Dolibarr AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas. -ACCOUNTINGEX_LENGTH_GACCOUNT=Longitud de las cuentas generales -ACCOUNTINGEX_LENGTH_AACCOUNT=Longitud de las subcuentas +ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas generales +ACCOUNTING_LENGTH_AACCOUNT=Longitud de las subcuentas -ACCOUNTINGEX_SELL_JOURNAL=Diario de ventas -ACCOUNTINGEX_PURCHASE_JOURNAL=Diario de compras -ACCOUNTINGEX_BANK_JOURNAL=Diario bancario -ACCOUNTINGEX_CASH_JOURNAL=Diario de caja -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Diario de operaciones diversas -ACCOUNTINGEX_SOCIAL_JOURNAL=Diario social +ACCOUNTING_SELL_JOURNAL=Diario de ventas +ACCOUNTING_PURCHASE_JOURNAL=Diario de compras +ACCOUNTING_BANK_JOURNAL=Diario bancario +ACCOUNTING_CASH_JOURNAL=Diario de caja +ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de operaciones diversas +ACCOUNTING_SOCIAL_JOURNAL=Diario social -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Cuenta de caja -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta de caja +ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto) ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto) ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servicio) Doctype=Tipo de documento Docdate=Fecha diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index e57a4a6cec6..704b30761e3 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -219,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automático si Javascript está desactivado AvailableOnlyIfJavascriptNotDisabled=Disponible solamente si Javascript esta activado AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solamente si Javascript y Ajax están activados Required=Requerido +UsedOnlyWithTypeOption=Usado solamente por alguna opción de la agenda Security=Seguridad Passwords=Contraseñas DoNotStoreClearPassword=No almacenar la contraseña sin cifrar en la base diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index b3aa4a58375..839bbbdceba 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -7,6 +7,7 @@ Agendas=Agendas Calendar=Calendario Calendars=Calendarios LocalAgenda=Calendario interno +ActionsOwnedBy=Evento asignado a AffectedTo=Asignada a DoneBy=Realizado por Event=Evento @@ -88,4 +89,5 @@ ExtSiteUrlAgenda=Url de acceso al archivo .ical ExtSiteNoLabel=Sin descripción WorkingTimeRange=Rango temporal WorkingDaysRange=Rango diario -AddEvent=Crear evento +AddEvent=Añadir evento +MyAvailability=Mi disponibilidad diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang index 42c24bbae94..289c20e07dc 100644 --- a/htdocs/langs/es_ES/categories.lang +++ b/htdocs/langs/es_ES/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Atributos complementarios CategoriesSetup=Configuración de categorías CategorieRecursiv=Enlazar con la categoría padre automáticamente CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría +AddProductServiceIntoCategory=Añadir el siguiente producto/servicio diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 2f123f1a0b1..9fa3e27be18 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Debe establecer contactos con e-mail en los terceros p ListSuppliersShort=Listado de proveedores ListProspectsShort=Listado de clientes potenciales ListCustomersShort=Listado de clientes -ThirdPartiesArea=Área Terceros +ThirdPartiesArea=Área terceros y contactos LastModifiedThirdParties=Los %s últimos terceros modificados UniqueThirdParties=Total de terceros únicos InActivity=Activo @@ -410,3 +410,5 @@ OutstandingBillReached=Importe máximo alcanzado MonkeyNumRefModelDesc=Devuelve un número bajo el formato %syymm-nnnn para los códigos de clientes y %syymm-nnnn para los códigos de los proveedores, donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0. LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Puede ser modificado en cualquier momento. ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.) +SearchThirdparty=Buscar tercero +SearchContact=Buscar contacto diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index da1da3eb951..0cf91f9e3dd 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores +CloneTax=Clonar una carga social +ConfirmCloneTax=Confirme la clonación de la carga social +CloneTaxForNextMonth=Clonarla para el próximo mes diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang index dd5e5d3d200..31c89f77209 100644 --- a/htdocs/langs/es_ES/donations.lang +++ b/htdocs/langs/es_ES/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Buscar una donación DonationRecipient=Beneficiario ThankYou=Muchas gracias IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad +MinimumAmount=El importe mínimo es %s diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 926a356db32..bccee64bcfc 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -156,3 +156,4 @@ WarningClickToDialUserSetupNotComplete=La configuración de ClickToDial para su WarningNotRelevant=Operación irrelevante para este conjunto de datos WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalidad desactivada cuando la configuración de visualización es optimizada para personas ciegas o navegadores de texto. WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha (%s) de la factura %s. +WarningTooManyDataPleaseUseMoreFilters=Demasiados datos. Utilice más filtros diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 8c34109bf13..60e8fc0327f 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -3,11 +3,11 @@ HRM=RRHH Holidays=Vacaciones CPTitreMenu=Vacaciones MenuReportMonth=Estado mensual -MenuAddCP=Nueva petición -NotActiveModCP=Debe activar el módulo Vacaciones para ver esta página. +MenuAddCP=Realizar una petición de vacaciones +NotActiveModCP=Debe activar el módulo Vacaciones para ver esta página NotConfigModCP=Debe configurar el módulo Vacaciones para ver esta página. Para configurarlo, haga clic aquí. NoCPforUser=No tiene peticiones de vacaciones. -AddCP=Crear petición de vacaciones +AddCP=Realizar una petición de vacaciones Employe=Empleado DateDebCP=Fecha inicio DateFinCP=Fecha fin @@ -18,7 +18,7 @@ ApprovedCP=Aprobada CancelCP=Anulada RefuseCP=Rechazada ValidatorCP=Validador -ListeCP=Lista de vacaciones +ListeCP=Listado de vacaciones ReviewedByCP=Será revisada por DescCP=Descripción SendRequestCP=Enviar la petición de vacaciones @@ -45,8 +45,8 @@ StatutCP=Estado SendToValidationCP=Enviar validación TitleDeleteCP=Eliminar la petición de vacaciones ConfirmDeleteCP=¿Está seguro de querer eliminar esta petición de vacaciones? -ErrorCantDeleteCP=Error, no tiene vacaciones para eliminar esta petición de vacaciones. -CantCreateCP=No tiene vacaciones para realizar peticiones de vacaciones. +ErrorCantDeleteCP=Error, no tiene permisos para eliminar esta petición de vacaciones. +CantCreateCP=No tiene permisos para realizar peticiones de vacaciones. InvalidValidatorCP=Debe indicar un validador para su petición de vacaciones. UpdateButtonCP=Actualizar CantUpdate=No puede actualizar esta petición de vacaciones. @@ -103,7 +103,7 @@ AlertValidatorDelayCP=Advertir al usuario validador si la petición no respeta e AlertValidorSoldeCP=Advertir al usuario validador si el usuario pide vacaciones superiores a su saldo nbUserCP=Número de usuarios tomados en cuenta en el módulo vacaciones nbHolidayDeductedCP=Número de días retribuídos a deducir por día de vacaciones -nbHolidayEveryMonthCP=Número de vacaciones añadidas por mes +nbHolidayEveryMonthCP=Número de días de vacaciones añadidos por mes Module27130Name= Gestion de las vacaciones Module27130Desc= Gestión de días libres TitleOptionMainCP=Ajustes principales de vacaciones diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang index e985245d7a4..4f838816de2 100644 --- a/htdocs/langs/es_ES/interventions.lang +++ b/htdocs/langs/es_ES/interventions.lang @@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Nombre y firma del participante: NameAndSignatureOfExternalContact=Nombre y firma del cliente: DocumentModelStandard=Documento modelo estándar para intervenciones InterventionCardsAndInterventionLines=Fichas y líneas de intervención -ClassifyBilled=Clasificar "Facturado" -ClassifyUnBilled=Clasificar "No facturado" +InterventionClassifyBilled=Clasificar "Facturada" +InterventionClassifyUnBilled=Clasificar "No facturada" StatusInterInvoiced=Facturado RelatedInterventions=Intervenciones adjuntas ShowIntervention=Mostrar intervención diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 988b3e545c8..6a1cf66ddd0 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Eventos del proyecto YouAreNotContactOfProject=Usted no es contacto de este proyecto privado DeleteATimeSpent=Eliminación de tiempo dedicado ConfirmDeleteATimeSpent=¿Está seguro de querer eliminar este tiempo dedicado? -DoNotShowMyTasksOnly=Ver también las tareas que no me afectan -ShowMyTasksOnly=Solamente ver las tareas que me afectan +DoNotShowMyTasksOnly=Ver también tareas no asignadas a mí +ShowMyTasksOnly=Ver solamente tareas asignadas a mí TaskRessourceLinks=Recursos afectados ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero NoTasks=Ninguna tarea para este proyecto LinkedToAnotherCompany=Enlazado a otra empresa -TaskIsNotAffectedToYou=Tarea que no le afecta +TaskIsNotAffectedToYou=Tarea no asignada a usted ErrorTimeSpentIsEmpty=No se ha establecido el tiempo consumido ThisWillAlsoRemoveTasks=Esta operación también destruirá las tareas del proyecto (%s tareas) y sus tiempos dedicados. IfNeedToUseOhterObjectKeepEmpty=Si los elementos (factura, pedido, ...) pertenecen a un tercero que no és el seleccionado, debiendo estos estar ligados al proyecto a crear, déjelo vacío para permitir el proyecto a multi-terceros. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante TypeContact_project_task_external_TASKCONTRIBUTOR=Participante SelectElement=Seleccione elemento AddElement=Vincular a elmento +UnlinkElement=Desvincular elemento # Documents models DocumentModelBaleine=Modelo de informe de proyecto completo (logo...) PlannedWorkload = Carga de trabajo prevista @@ -128,3 +129,4 @@ ProjectReferers=Objetos vinculados SearchAProject=Buscar un proyecto ProjectMustBeValidatedFirst=El proyecto debe validarse primero ProjectDraft=Proyectos borrador +FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang index e1bb0dbe5b3..928dcdf2f8c 100644 --- a/htdocs/langs/es_ES/sendings.lang +++ b/htdocs/langs/es_ES/sendings.lang @@ -72,3 +72,7 @@ DocumentModelTyphon=Modelo completo de nota de entrega / recepción (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definida SumOfProductVolumes=Suma del volumen de los productos SumOfProductWeights=Suma del peso de los productos + +# warehouse details +DetailWarehouseNumber= Detalles del almacén +DetailWarehouseFormat= Alm.:%s (Cant. : %d) diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang index 52458b713de..1998f61ac0c 100644 --- a/htdocs/langs/es_ES/suppliers.lang +++ b/htdocs/langs/es_ES/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Crear factura de proveedor ListOfSupplierProductForSupplier=Listado de productos y precios del proveedor %s NoneOrBatchFileNeverRan=Ninguno o lote %s no se ha ejecutado recientemente SentToSuppliers=Enviado a proveedores +ListOfSupplierOrders=Listado de pedidos a proveedor +MenuOrdersSupplierToBill=Pedidos a proveedor a facturar From f1104275b4cc75f69ea1e498d4e66cdd79361e51 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 10 Oct 2014 22:11:00 +0200 Subject: [PATCH 0206/1190] Trad: Syncro es_ES/compta.lang from transifex --- htdocs/langs/es_ES/compta.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index 0cf91f9e3dd..fb9abbabdd9 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -165,8 +165,8 @@ ProposalStats=Estadísticas de presupuestos OrderStats=Estadísticas de pedidos InvoiceStats=Estadísticas de facturas Dispatch=Desglose -Dispatched=Desglosados -ToDispatch=A desglosar +Dispatched=Contabilizadas +ToDispatch=A contabilizar ThirdPartyMustBeEditAsCustomer=El tercero debe de estar definido como cliente SellsJournal=Diario de ventas PurchasesJournal=Diario de compras @@ -181,7 +181,7 @@ DatePaymentTermCantBeLowerThanObjectDate=La fecha límite de pago no puede ser i Pcg_version=Versión del plan Pcg_type=Tipo de cuenta Pcg_subtype=Subtipo de cuenta -InvoiceLinesToDispatch=Líneas de facturas a desglosar +InvoiceLinesToDispatch=Líneas de facturas a contabilizar InvoiceDispatched=Facturas desglosadas AccountancyDashboard=Resumen financiero ByProductsAndServices=Por productos y servicios From eb06c8a33edec61ed7bfa9c5470465c2d3945e56 Mon Sep 17 00:00:00 2001 From: jfefe Date: Sat, 11 Oct 2014 04:25:32 +0200 Subject: [PATCH 0207/1190] Allow to make PUT request with getURLContent() function --- htdocs/core/lib/geturl.lib.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php index 8a9ac1385be..50c02125fb7 100644 --- a/htdocs/core/lib/geturl.lib.php +++ b/htdocs/core/lib/geturl.lib.php @@ -72,6 +72,13 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea curl_setopt($ch, CURLOPT_POST, 1); // POST curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields } + else if ($postorget == 'PUT') + { + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT' + if ( ! is_array($param) ) + parse_str($param, $array_param); + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields + } else if ($postorget == 'HEAD') { curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD' From 8a98f8461d6df2db45f3bd5bb8fe91845cc031fc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Oct 2014 14:33:22 +0200 Subject: [PATCH 0208/1190] Sync transifex --- htdocs/langs/ar_SA/accountancy.lang | 36 +- htdocs/langs/ar_SA/admin.lang | 3 + htdocs/langs/ar_SA/agenda.lang | 15 +- htdocs/langs/ar_SA/categories.lang | 1 + htdocs/langs/ar_SA/companies.lang | 4 +- htdocs/langs/ar_SA/compta.lang | 5 +- htdocs/langs/ar_SA/donations.lang | 1 + htdocs/langs/ar_SA/errors.lang | 5 +- htdocs/langs/ar_SA/holiday.lang | 126 +- htdocs/langs/ar_SA/interventions.lang | 10 +- htdocs/langs/ar_SA/projects.lang | 8 +- htdocs/langs/ar_SA/sendings.lang | 22 +- htdocs/langs/ar_SA/suppliers.lang | 10 +- htdocs/langs/bg_BG/accountancy.lang | 36 +- htdocs/langs/bg_BG/admin.lang | 3 + htdocs/langs/bg_BG/agenda.lang | 15 +- htdocs/langs/bg_BG/categories.lang | 1 + htdocs/langs/bg_BG/companies.lang | 4 +- htdocs/langs/bg_BG/compta.lang | 5 +- htdocs/langs/bg_BG/donations.lang | 1 + htdocs/langs/bg_BG/errors.lang | 5 +- htdocs/langs/bg_BG/holiday.lang | 126 +- htdocs/langs/bg_BG/interventions.lang | 4 +- htdocs/langs/bg_BG/projects.lang | 8 +- htdocs/langs/bg_BG/sendings.lang | 20 +- htdocs/langs/bg_BG/suppliers.lang | 10 +- htdocs/langs/bs_BA/accountancy.lang | 36 +- htdocs/langs/bs_BA/admin.lang | 3 + htdocs/langs/bs_BA/agenda.lang | 15 +- htdocs/langs/bs_BA/categories.lang | 1 + htdocs/langs/bs_BA/companies.lang | 4 +- htdocs/langs/bs_BA/compta.lang | 5 +- htdocs/langs/bs_BA/donations.lang | 1 + htdocs/langs/bs_BA/errors.lang | 5 +- htdocs/langs/bs_BA/holiday.lang | 126 +- htdocs/langs/bs_BA/interventions.lang | 4 +- htdocs/langs/bs_BA/projects.lang | 8 +- htdocs/langs/bs_BA/sendings.lang | 22 +- htdocs/langs/bs_BA/suppliers.lang | 2 + htdocs/langs/ca_ES/accountancy.lang | 36 +- htdocs/langs/ca_ES/admin.lang | 3 + htdocs/langs/ca_ES/agenda.lang | 15 +- htdocs/langs/ca_ES/categories.lang | 1 + htdocs/langs/ca_ES/companies.lang | 4 +- htdocs/langs/ca_ES/compta.lang | 49 +- htdocs/langs/ca_ES/donations.lang | 1 + htdocs/langs/ca_ES/errors.lang | 5 +- htdocs/langs/ca_ES/holiday.lang | 126 +- htdocs/langs/ca_ES/interventions.lang | 4 +- htdocs/langs/ca_ES/projects.lang | 8 +- htdocs/langs/ca_ES/sendings.lang | 8 +- htdocs/langs/ca_ES/suppliers.lang | 6 +- htdocs/langs/cs_CZ/accountancy.lang | 36 +- htdocs/langs/cs_CZ/admin.lang | 3 + htdocs/langs/cs_CZ/agenda.lang | 15 +- htdocs/langs/cs_CZ/categories.lang | 15 +- htdocs/langs/cs_CZ/companies.lang | 4 +- htdocs/langs/cs_CZ/compta.lang | 9 +- htdocs/langs/cs_CZ/donations.lang | 1 + htdocs/langs/cs_CZ/errors.lang | 5 +- htdocs/langs/cs_CZ/holiday.lang | 126 +- htdocs/langs/cs_CZ/interventions.lang | 4 +- htdocs/langs/cs_CZ/projects.lang | 8 +- htdocs/langs/cs_CZ/sendings.lang | 8 +- htdocs/langs/cs_CZ/suppliers.lang | 6 +- htdocs/langs/da_DK/accountancy.lang | 82 +- htdocs/langs/da_DK/admin.lang | 3 + htdocs/langs/da_DK/agenda.lang | 15 +- htdocs/langs/da_DK/categories.lang | 45 +- htdocs/langs/da_DK/companies.lang | 4 +- htdocs/langs/da_DK/compta.lang | 5 +- htdocs/langs/da_DK/donations.lang | 13 +- htdocs/langs/da_DK/errors.lang | 5 +- htdocs/langs/da_DK/holiday.lang | 126 +- htdocs/langs/da_DK/interventions.lang | 10 +- htdocs/langs/da_DK/projects.lang | 8 +- htdocs/langs/da_DK/sendings.lang | 22 +- htdocs/langs/da_DK/suppliers.lang | 10 +- htdocs/langs/de_DE/accountancy.lang | 42 +- htdocs/langs/de_DE/admin.lang | 39 +- htdocs/langs/de_DE/agenda.lang | 59 +- htdocs/langs/de_DE/bills.lang | 6 +- htdocs/langs/de_DE/categories.lang | 1 + htdocs/langs/de_DE/commercial.lang | 8 +- htdocs/langs/de_DE/companies.lang | 8 +- htdocs/langs/de_DE/compta.lang | 25 +- htdocs/langs/de_DE/donations.lang | 3 +- htdocs/langs/de_DE/errors.lang | 3 +- htdocs/langs/de_DE/holiday.lang | 126 +- htdocs/langs/de_DE/interventions.lang | 4 +- htdocs/langs/de_DE/margins.lang | 2 +- htdocs/langs/de_DE/projects.lang | 8 +- htdocs/langs/de_DE/sendings.lang | 10 +- htdocs/langs/de_DE/suppliers.lang | 2 + htdocs/langs/el_GR/accountancy.lang | 36 +- htdocs/langs/el_GR/admin.lang | 5 +- htdocs/langs/el_GR/agenda.lang | 25 +- htdocs/langs/el_GR/categories.lang | 15 +- htdocs/langs/el_GR/companies.lang | 4 +- htdocs/langs/el_GR/compta.lang | 21 +- htdocs/langs/el_GR/dict.lang | 6 +- htdocs/langs/el_GR/donations.lang | 1 + htdocs/langs/el_GR/errors.lang | 5 +- htdocs/langs/el_GR/holiday.lang | 126 +- htdocs/langs/el_GR/interventions.lang | 4 +- htdocs/langs/el_GR/projects.lang | 8 +- htdocs/langs/el_GR/sendings.lang | 8 +- htdocs/langs/el_GR/suppliers.lang | 2 + htdocs/langs/es_ES/accountancy.lang | 36 +- htdocs/langs/es_ES/admin.lang | 1 + htdocs/langs/es_ES/agenda.lang | 4 +- htdocs/langs/es_ES/categories.lang | 1 + htdocs/langs/es_ES/companies.lang | 4 +- htdocs/langs/es_ES/compta.lang | 21 +- htdocs/langs/es_ES/donations.lang | 1 + htdocs/langs/es_ES/errors.lang | 3 +- htdocs/langs/es_ES/holiday.lang | 126 +- htdocs/langs/es_ES/interventions.lang | 4 +- htdocs/langs/es_ES/projects.lang | 8 +- htdocs/langs/es_ES/sendings.lang | 4 + htdocs/langs/es_ES/suppliers.lang | 2 + htdocs/langs/et_EE/accountancy.lang | 36 +- htdocs/langs/et_EE/admin.lang | 3 + htdocs/langs/et_EE/agenda.lang | 15 +- htdocs/langs/et_EE/categories.lang | 15 +- htdocs/langs/et_EE/companies.lang | 24 +- htdocs/langs/et_EE/compta.lang | 9 +- htdocs/langs/et_EE/donations.lang | 1 + htdocs/langs/et_EE/errors.lang | 5 +- htdocs/langs/et_EE/holiday.lang | 126 +- htdocs/langs/et_EE/interventions.lang | 4 +- htdocs/langs/et_EE/projects.lang | 8 +- htdocs/langs/et_EE/sendings.lang | 8 +- htdocs/langs/et_EE/suppliers.lang | 2 + htdocs/langs/eu_ES/accountancy.lang | 36 +- htdocs/langs/eu_ES/admin.lang | 3 + htdocs/langs/eu_ES/agenda.lang | 15 +- htdocs/langs/eu_ES/categories.lang | 225 +-- htdocs/langs/eu_ES/companies.lang | 4 +- htdocs/langs/eu_ES/compta.lang | 5 +- htdocs/langs/eu_ES/donations.lang | 63 +- htdocs/langs/eu_ES/errors.lang | 5 +- htdocs/langs/eu_ES/holiday.lang | 126 +- htdocs/langs/eu_ES/interventions.lang | 80 +- htdocs/langs/eu_ES/projects.lang | 8 +- htdocs/langs/eu_ES/sendings.lang | 144 +- htdocs/langs/eu_ES/suppliers.lang | 84 +- htdocs/langs/fa_IR/accountancy.lang | 36 +- htdocs/langs/fa_IR/admin.lang | 3 + htdocs/langs/fa_IR/agenda.lang | 15 +- htdocs/langs/fa_IR/categories.lang | 5 +- htdocs/langs/fa_IR/companies.lang | 4 +- htdocs/langs/fa_IR/compta.lang | 21 +- htdocs/langs/fa_IR/donations.lang | 1 + htdocs/langs/fa_IR/errors.lang | 5 +- htdocs/langs/fa_IR/holiday.lang | 126 +- htdocs/langs/fa_IR/interventions.lang | 8 +- htdocs/langs/fa_IR/projects.lang | 8 +- htdocs/langs/fa_IR/sendings.lang | 8 +- htdocs/langs/fa_IR/suppliers.lang | 14 +- htdocs/langs/fi_FI/accountancy.lang | 36 +- htdocs/langs/fi_FI/admin.lang | 3 + htdocs/langs/fi_FI/agenda.lang | 15 +- htdocs/langs/fi_FI/categories.lang | 45 +- htdocs/langs/fi_FI/companies.lang | 4 +- htdocs/langs/fi_FI/compta.lang | 5 +- htdocs/langs/fi_FI/cron.lang | 157 +- htdocs/langs/fi_FI/donations.lang | 13 +- htdocs/langs/fi_FI/errors.lang | 5 +- htdocs/langs/fi_FI/externalsite.lang | 6 +- htdocs/langs/fi_FI/holiday.lang | 126 +- htdocs/langs/fi_FI/install.lang | 22 +- htdocs/langs/fi_FI/interventions.lang | 10 +- htdocs/langs/fi_FI/projects.lang | 8 +- htdocs/langs/fi_FI/sendings.lang | 22 +- htdocs/langs/fi_FI/suppliers.lang | 2 + htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/langs/fr_FR/categories.lang | 2 +- htdocs/langs/fr_FR/companies.lang | 6 +- htdocs/langs/fr_FR/compta.lang | 24 +- htdocs/langs/fr_FR/donations.lang | 2 +- htdocs/langs/fr_FR/errors.lang | 4 +- htdocs/langs/fr_FR/holiday.lang | 124 +- htdocs/langs/fr_FR/interventions.lang | 4 +- htdocs/langs/fr_FR/projects.lang | 10 +- htdocs/langs/fr_FR/sendings.lang | 4 +- htdocs/langs/fr_FR/suppliers.lang | 4 +- htdocs/langs/he_IL/accountancy.lang | 36 +- htdocs/langs/he_IL/admin.lang | 3 + htdocs/langs/he_IL/agenda.lang | 15 +- htdocs/langs/he_IL/categories.lang | 219 +- htdocs/langs/he_IL/companies.lang | 4 +- htdocs/langs/he_IL/compta.lang | 5 +- htdocs/langs/he_IL/donations.lang | 61 +- htdocs/langs/he_IL/errors.lang | 5 +- htdocs/langs/he_IL/holiday.lang | 126 +- htdocs/langs/he_IL/interventions.lang | 78 +- htdocs/langs/he_IL/projects.lang | 8 +- htdocs/langs/he_IL/sendings.lang | 140 +- htdocs/langs/he_IL/suppliers.lang | 82 +- htdocs/langs/hr_HR/accountancy.lang | 36 +- htdocs/langs/hr_HR/admin.lang | 3 + htdocs/langs/hr_HR/agenda.lang | 15 +- htdocs/langs/hr_HR/categories.lang | 225 +-- htdocs/langs/hr_HR/companies.lang | 4 +- htdocs/langs/hr_HR/compta.lang | 5 +- htdocs/langs/hr_HR/donations.lang | 63 +- htdocs/langs/hr_HR/errors.lang | 5 +- htdocs/langs/hr_HR/holiday.lang | 126 +- htdocs/langs/hr_HR/interventions.lang | 80 +- htdocs/langs/hr_HR/projects.lang | 8 +- htdocs/langs/hr_HR/sendings.lang | 68 +- htdocs/langs/hr_HR/suppliers.lang | 84 +- htdocs/langs/hu_HU/accountancy.lang | 36 +- htdocs/langs/hu_HU/admin.lang | 3 + htdocs/langs/hu_HU/agenda.lang | 15 +- htdocs/langs/hu_HU/categories.lang | 45 +- htdocs/langs/hu_HU/companies.lang | 4 +- htdocs/langs/hu_HU/compta.lang | 5 +- htdocs/langs/hu_HU/donations.lang | 13 +- htdocs/langs/hu_HU/errors.lang | 5 +- htdocs/langs/hu_HU/holiday.lang | 126 +- htdocs/langs/hu_HU/interventions.lang | 10 +- htdocs/langs/hu_HU/projects.lang | 8 +- htdocs/langs/hu_HU/sendings.lang | 22 +- htdocs/langs/hu_HU/suppliers.lang | 10 +- htdocs/langs/id_ID/accountancy.lang | 36 +- htdocs/langs/id_ID/admin.lang | 3 + htdocs/langs/id_ID/agenda.lang | 15 +- htdocs/langs/id_ID/categories.lang | 225 +-- htdocs/langs/id_ID/companies.lang | 4 +- htdocs/langs/id_ID/compta.lang | 5 +- htdocs/langs/id_ID/donations.lang | 63 +- htdocs/langs/id_ID/errors.lang | 5 +- htdocs/langs/id_ID/holiday.lang | 126 +- htdocs/langs/id_ID/interventions.lang | 80 +- htdocs/langs/id_ID/projects.lang | 8 +- htdocs/langs/id_ID/sendings.lang | 144 +- htdocs/langs/id_ID/suppliers.lang | 84 +- htdocs/langs/is_IS/accountancy.lang | 36 +- htdocs/langs/is_IS/admin.lang | 3 + htdocs/langs/is_IS/agenda.lang | 15 +- htdocs/langs/is_IS/categories.lang | 45 +- htdocs/langs/is_IS/companies.lang | 4 +- htdocs/langs/is_IS/compta.lang | 5 +- htdocs/langs/is_IS/donations.lang | 13 +- htdocs/langs/is_IS/errors.lang | 5 +- htdocs/langs/is_IS/holiday.lang | 126 +- htdocs/langs/is_IS/interventions.lang | 10 +- htdocs/langs/is_IS/projects.lang | 8 +- htdocs/langs/is_IS/sendings.lang | 22 +- htdocs/langs/is_IS/suppliers.lang | 10 +- htdocs/langs/it_IT/accountancy.lang | 36 +- htdocs/langs/it_IT/admin.lang | 123 +- htdocs/langs/it_IT/agenda.lang | 29 +- htdocs/langs/it_IT/categories.lang | 1 + htdocs/langs/it_IT/companies.lang | 4 +- htdocs/langs/it_IT/compta.lang | 39 +- htdocs/langs/it_IT/donations.lang | 1 + htdocs/langs/it_IT/errors.lang | 47 +- htdocs/langs/it_IT/holiday.lang | 126 +- htdocs/langs/it_IT/interventions.lang | 6 +- htdocs/langs/it_IT/projects.lang | 44 +- htdocs/langs/it_IT/sendings.lang | 8 +- htdocs/langs/it_IT/suppliers.lang | 2 + htdocs/langs/ja_JP/accountancy.lang | 36 +- htdocs/langs/ja_JP/admin.lang | 3 + htdocs/langs/ja_JP/agenda.lang | 15 +- htdocs/langs/ja_JP/categories.lang | 1 + htdocs/langs/ja_JP/companies.lang | 4 +- htdocs/langs/ja_JP/compta.lang | 5 +- htdocs/langs/ja_JP/donations.lang | 13 +- htdocs/langs/ja_JP/errors.lang | 5 +- htdocs/langs/ja_JP/holiday.lang | 126 +- htdocs/langs/ja_JP/interventions.lang | 10 +- htdocs/langs/ja_JP/projects.lang | 8 +- htdocs/langs/ja_JP/sendings.lang | 22 +- htdocs/langs/ja_JP/suppliers.lang | 10 +- htdocs/langs/ko_KR/accountancy.lang | 36 +- htdocs/langs/ko_KR/admin.lang | 3 + htdocs/langs/ko_KR/agenda.lang | 15 +- htdocs/langs/ko_KR/categories.lang | 225 +-- htdocs/langs/ko_KR/companies.lang | 4 +- htdocs/langs/ko_KR/compta.lang | 5 +- htdocs/langs/ko_KR/donations.lang | 63 +- htdocs/langs/ko_KR/errors.lang | 5 +- htdocs/langs/ko_KR/holiday.lang | 126 +- htdocs/langs/ko_KR/interventions.lang | 80 +- htdocs/langs/ko_KR/projects.lang | 8 +- htdocs/langs/ko_KR/sendings.lang | 144 +- htdocs/langs/ko_KR/suppliers.lang | 84 +- htdocs/langs/lt_LT/accountancy.lang | 36 +- htdocs/langs/lt_LT/admin.lang | 3 + htdocs/langs/lt_LT/agenda.lang | 15 +- htdocs/langs/lt_LT/categories.lang | 225 +-- htdocs/langs/lt_LT/companies.lang | 4 +- htdocs/langs/lt_LT/compta.lang | 21 +- htdocs/langs/lt_LT/donations.lang | 63 +- htdocs/langs/lt_LT/errors.lang | 5 +- htdocs/langs/lt_LT/holiday.lang | 126 +- htdocs/langs/lt_LT/interventions.lang | 80 +- htdocs/langs/lt_LT/projects.lang | 8 +- htdocs/langs/lt_LT/sendings.lang | 6 +- htdocs/langs/lt_LT/suppliers.lang | 2 + htdocs/langs/lv_LV/accountancy.lang | 40 +- htdocs/langs/lv_LV/admin.lang | 32 +- htdocs/langs/lv_LV/agenda.lang | 21 +- htdocs/langs/lv_LV/banks.lang | 14 +- htdocs/langs/lv_LV/bills.lang | 6 +- htdocs/langs/lv_LV/boxes.lang | 8 +- htdocs/langs/lv_LV/categories.lang | 33 +- htdocs/langs/lv_LV/companies.lang | 14 +- htdocs/langs/lv_LV/compta.lang | 15 +- htdocs/langs/lv_LV/contracts.lang | 14 +- htdocs/langs/lv_LV/cron.lang | 8 +- htdocs/langs/lv_LV/dict.lang | 10 +- htdocs/langs/lv_LV/donations.lang | 11 +- htdocs/langs/lv_LV/ecm.lang | 2 +- htdocs/langs/lv_LV/errors.lang | 21 +- htdocs/langs/lv_LV/exports.lang | 10 +- htdocs/langs/lv_LV/holiday.lang | 128 +- htdocs/langs/lv_LV/install.lang | 18 +- htdocs/langs/lv_LV/interventions.lang | 18 +- htdocs/langs/lv_LV/mails.lang | 8 +- htdocs/langs/lv_LV/members.lang | 16 +- htdocs/langs/lv_LV/other.lang | 44 +- htdocs/langs/lv_LV/products.lang | 26 +- htdocs/langs/lv_LV/projects.lang | 24 +- htdocs/langs/lv_LV/propal.lang | 8 +- htdocs/langs/lv_LV/sendings.lang | 20 +- htdocs/langs/lv_LV/sms.lang | 2 +- htdocs/langs/lv_LV/suppliers.lang | 8 +- htdocs/langs/mk_MK/accountancy.lang | 36 +- htdocs/langs/mk_MK/admin.lang | 3 + htdocs/langs/mk_MK/agenda.lang | 15 +- htdocs/langs/mk_MK/categories.lang | 225 +-- htdocs/langs/mk_MK/companies.lang | 4 +- htdocs/langs/mk_MK/compta.lang | 5 +- htdocs/langs/mk_MK/donations.lang | 63 +- htdocs/langs/mk_MK/errors.lang | 5 +- htdocs/langs/mk_MK/holiday.lang | 126 +- htdocs/langs/mk_MK/interventions.lang | 80 +- htdocs/langs/mk_MK/projects.lang | 8 +- htdocs/langs/mk_MK/sendings.lang | 144 +- htdocs/langs/mk_MK/suppliers.lang | 84 +- htdocs/langs/nb_NO/accountancy.lang | 36 +- htdocs/langs/nb_NO/admin.lang | 3 + htdocs/langs/nb_NO/agenda.lang | 15 +- htdocs/langs/nb_NO/categories.lang | 1 + htdocs/langs/nb_NO/companies.lang | 4 +- htdocs/langs/nb_NO/compta.lang | 5 +- htdocs/langs/nb_NO/donations.lang | 13 +- htdocs/langs/nb_NO/errors.lang | 5 +- htdocs/langs/nb_NO/holiday.lang | 126 +- htdocs/langs/nb_NO/interventions.lang | 10 +- htdocs/langs/nb_NO/projects.lang | 8 +- htdocs/langs/nb_NO/sendings.lang | 22 +- htdocs/langs/nb_NO/suppliers.lang | 2 + htdocs/langs/nl_NL/accountancy.lang | 36 +- htdocs/langs/nl_NL/admin.lang | 3 + htdocs/langs/nl_NL/agenda.lang | 15 +- htdocs/langs/nl_NL/categories.lang | 1 + htdocs/langs/nl_NL/companies.lang | 4 +- htdocs/langs/nl_NL/compta.lang | 21 +- htdocs/langs/nl_NL/donations.lang | 1 + htdocs/langs/nl_NL/errors.lang | 5 +- htdocs/langs/nl_NL/holiday.lang | 126 +- htdocs/langs/nl_NL/interventions.lang | 4 +- htdocs/langs/nl_NL/projects.lang | 8 +- htdocs/langs/nl_NL/sendings.lang | 8 +- htdocs/langs/nl_NL/suppliers.lang | 2 + htdocs/langs/pl_PL/accountancy.lang | 36 +- htdocs/langs/pl_PL/admin.lang | 3 + htdocs/langs/pl_PL/agenda.lang | 15 +- htdocs/langs/pl_PL/categories.lang | 45 +- htdocs/langs/pl_PL/companies.lang | 4 +- htdocs/langs/pl_PL/compta.lang | 5 +- htdocs/langs/pl_PL/donations.lang | 13 +- htdocs/langs/pl_PL/errors.lang | 5 +- htdocs/langs/pl_PL/holiday.lang | 126 +- htdocs/langs/pl_PL/interventions.lang | 10 +- htdocs/langs/pl_PL/projects.lang | 8 +- htdocs/langs/pl_PL/sendings.lang | 22 +- htdocs/langs/pl_PL/suppliers.lang | 2 + htdocs/langs/pt_PT/accountancy.lang | 36 +- htdocs/langs/pt_PT/admin.lang | 3 + htdocs/langs/pt_PT/agenda.lang | 15 +- htdocs/langs/pt_PT/categories.lang | 1 + htdocs/langs/pt_PT/companies.lang | 4 +- htdocs/langs/pt_PT/compta.lang | 5 +- htdocs/langs/pt_PT/donations.lang | 1 + htdocs/langs/pt_PT/errors.lang | 5 +- htdocs/langs/pt_PT/holiday.lang | 126 +- htdocs/langs/pt_PT/interventions.lang | 4 +- htdocs/langs/pt_PT/members.lang | 16 +- htdocs/langs/pt_PT/projects.lang | 8 +- htdocs/langs/pt_PT/sendings.lang | 12 +- htdocs/langs/pt_PT/suppliers.lang | 2 + htdocs/langs/ro_RO/accountancy.lang | 36 +- htdocs/langs/ro_RO/admin.lang | 101 +- htdocs/langs/ro_RO/agenda.lang | 15 +- htdocs/langs/ro_RO/banks.lang | 2 +- htdocs/langs/ro_RO/categories.lang | 15 +- htdocs/langs/ro_RO/companies.lang | 4 +- htdocs/langs/ro_RO/compta.lang | 9 +- htdocs/langs/ro_RO/dict.lang | 6 +- htdocs/langs/ro_RO/donations.lang | 1 + htdocs/langs/ro_RO/errors.lang | 15 +- htdocs/langs/ro_RO/holiday.lang | 126 +- htdocs/langs/ro_RO/interventions.lang | 4 +- htdocs/langs/ro_RO/main.lang | 11 +- htdocs/langs/ro_RO/projects.lang | 36 +- htdocs/langs/ro_RO/salaries.lang | 8 +- htdocs/langs/ro_RO/sendings.lang | 8 +- htdocs/langs/ro_RO/stocks.lang | 16 +- htdocs/langs/ro_RO/suppliers.lang | 2 + htdocs/langs/ru_RU/accountancy.lang | 36 +- htdocs/langs/ru_RU/admin.lang | 3 + htdocs/langs/ru_RU/agenda.lang | 15 +- htdocs/langs/ru_RU/categories.lang | 1 + htdocs/langs/ru_RU/companies.lang | 4 +- htdocs/langs/ru_RU/compta.lang | 5 +- htdocs/langs/ru_RU/donations.lang | 13 +- htdocs/langs/ru_RU/errors.lang | 5 +- htdocs/langs/ru_RU/holiday.lang | 126 +- htdocs/langs/ru_RU/interventions.lang | 10 +- htdocs/langs/ru_RU/projects.lang | 8 +- htdocs/langs/ru_RU/sendings.lang | 24 +- htdocs/langs/ru_RU/suppliers.lang | 2 + htdocs/langs/sk_SK/accountancy.lang | 36 +- htdocs/langs/sk_SK/admin.lang | 3 + htdocs/langs/sk_SK/agenda.lang | 15 +- htdocs/langs/sk_SK/categories.lang | 15 +- htdocs/langs/sk_SK/companies.lang | 4 +- htdocs/langs/sk_SK/compta.lang | 9 +- htdocs/langs/sk_SK/donations.lang | 1 + htdocs/langs/sk_SK/errors.lang | 5 +- htdocs/langs/sk_SK/holiday.lang | 126 +- htdocs/langs/sk_SK/interventions.lang | 4 +- htdocs/langs/sk_SK/projects.lang | 8 +- htdocs/langs/sk_SK/sendings.lang | 8 +- htdocs/langs/sk_SK/suppliers.lang | 6 +- htdocs/langs/sl_SI/accountancy.lang | 36 +- htdocs/langs/sl_SI/admin.lang | 17 +- htdocs/langs/sl_SI/agenda.lang | 25 +- htdocs/langs/sl_SI/categories.lang | 45 +- htdocs/langs/sl_SI/companies.lang | 4 +- htdocs/langs/sl_SI/compta.lang | 5 +- htdocs/langs/sl_SI/donations.lang | 13 +- htdocs/langs/sl_SI/errors.lang | 5 +- htdocs/langs/sl_SI/holiday.lang | 246 +-- htdocs/langs/sl_SI/interventions.lang | 4 +- htdocs/langs/sl_SI/projects.lang | 36 +- htdocs/langs/sl_SI/sendings.lang | 6 +- htdocs/langs/sl_SI/suppliers.lang | 2 + htdocs/langs/sq_AL/accountancy.lang | 36 +- htdocs/langs/sq_AL/admin.lang | 3 + htdocs/langs/sq_AL/agenda.lang | 15 +- htdocs/langs/sq_AL/categories.lang | 1 + htdocs/langs/sq_AL/companies.lang | 4 +- htdocs/langs/sq_AL/compta.lang | 5 +- htdocs/langs/sq_AL/donations.lang | 1 + htdocs/langs/sq_AL/errors.lang | 5 +- htdocs/langs/sq_AL/holiday.lang | 126 +- htdocs/langs/sq_AL/interventions.lang | 4 +- htdocs/langs/sq_AL/projects.lang | 8 +- htdocs/langs/sq_AL/sendings.lang | 6 +- htdocs/langs/sq_AL/suppliers.lang | 2 + htdocs/langs/sv_SE/accountancy.lang | 36 +- htdocs/langs/sv_SE/admin.lang | 3 + htdocs/langs/sv_SE/agenda.lang | 15 +- htdocs/langs/sv_SE/bills.lang | 10 +- htdocs/langs/sv_SE/categories.lang | 1 + htdocs/langs/sv_SE/companies.lang | 4 +- htdocs/langs/sv_SE/compta.lang | 5 +- htdocs/langs/sv_SE/donations.lang | 13 +- htdocs/langs/sv_SE/errors.lang | 5 +- htdocs/langs/sv_SE/holiday.lang | 126 +- htdocs/langs/sv_SE/install.lang | 4 +- htdocs/langs/sv_SE/interventions.lang | 10 +- htdocs/langs/sv_SE/projects.lang | 8 +- htdocs/langs/sv_SE/sendings.lang | 22 +- htdocs/langs/sv_SE/suppliers.lang | 10 +- htdocs/langs/th_TH/accountancy.lang | 36 +- htdocs/langs/th_TH/admin.lang | 3 + htdocs/langs/th_TH/agenda.lang | 15 +- htdocs/langs/th_TH/categories.lang | 1 + htdocs/langs/th_TH/companies.lang | 4 +- htdocs/langs/th_TH/compta.lang | 5 +- htdocs/langs/th_TH/donations.lang | 1 + htdocs/langs/th_TH/errors.lang | 5 +- htdocs/langs/th_TH/holiday.lang | 126 +- htdocs/langs/th_TH/interventions.lang | 4 +- htdocs/langs/th_TH/projects.lang | 8 +- htdocs/langs/th_TH/sendings.lang | 6 +- htdocs/langs/th_TH/suppliers.lang | 2 + htdocs/langs/tr_TR/accountancy.lang | 36 +- htdocs/langs/tr_TR/admin.lang | 33 +- htdocs/langs/tr_TR/agenda.lang | 4 +- htdocs/langs/tr_TR/categories.lang | 1 + htdocs/langs/tr_TR/companies.lang | 4 +- htdocs/langs/tr_TR/compta.lang | 21 +- htdocs/langs/tr_TR/donations.lang | 1 + htdocs/langs/tr_TR/errors.lang | 3 +- htdocs/langs/tr_TR/holiday.lang | 126 +- htdocs/langs/tr_TR/interventions.lang | 4 +- htdocs/langs/tr_TR/projects.lang | 8 +- htdocs/langs/tr_TR/sendings.lang | 4 + htdocs/langs/tr_TR/suppliers.lang | 2 + htdocs/langs/uk_UA/accountancy.lang | 36 +- htdocs/langs/uk_UA/admin.lang | 27 +- htdocs/langs/uk_UA/agenda.lang | 41 +- htdocs/langs/uk_UA/categories.lang | 1 + htdocs/langs/uk_UA/companies.lang | 4 +- htdocs/langs/uk_UA/compta.lang | 5 +- htdocs/langs/uk_UA/donations.lang | 1 + htdocs/langs/uk_UA/errors.lang | 5 +- htdocs/langs/uk_UA/holiday.lang | 126 +- htdocs/langs/uk_UA/interventions.lang | 4 +- htdocs/langs/uk_UA/projects.lang | 8 +- htdocs/langs/uk_UA/sendings.lang | 144 +- htdocs/langs/uk_UA/suppliers.lang | 84 +- htdocs/langs/uz_UZ/admin.lang | 3 + htdocs/langs/uz_UZ/agenda.lang | 15 +- htdocs/langs/uz_UZ/categories.lang | 1 + htdocs/langs/uz_UZ/companies.lang | 4 +- htdocs/langs/uz_UZ/compta.lang | 5 +- htdocs/langs/uz_UZ/donations.lang | 1 + htdocs/langs/uz_UZ/errors.lang | 5 +- htdocs/langs/uz_UZ/holiday.lang | 126 +- htdocs/langs/uz_UZ/interventions.lang | 4 +- htdocs/langs/uz_UZ/projects.lang | 8 +- htdocs/langs/uz_UZ/sendings.lang | 6 +- htdocs/langs/uz_UZ/suppliers.lang | 2 + htdocs/langs/vi_VN/accountancy.lang | 250 +-- htdocs/langs/vi_VN/admin.lang | 2649 +++++++++++++------------ htdocs/langs/vi_VN/agenda.lang | 179 +- htdocs/langs/vi_VN/banks.lang | 312 +-- htdocs/langs/vi_VN/bills.lang | 800 ++++---- htdocs/langs/vi_VN/bookmarks.lang | 32 +- htdocs/langs/vi_VN/boxes.lang | 180 +- htdocs/langs/vi_VN/cashdesk.lang | 78 +- htdocs/langs/vi_VN/categories.lang | 223 +-- htdocs/langs/vi_VN/commercial.lang | 188 +- htdocs/langs/vi_VN/companies.lang | 650 +++--- htdocs/langs/vi_VN/compta.lang | 397 ++-- htdocs/langs/vi_VN/contracts.lang | 196 +- htdocs/langs/vi_VN/cron.lang | 150 +- htdocs/langs/vi_VN/deliveries.lang | 48 +- htdocs/langs/vi_VN/dict.lang | 294 +-- htdocs/langs/vi_VN/donations.lang | 63 +- htdocs/langs/vi_VN/ecm.lang | 106 +- htdocs/langs/vi_VN/errors.lang | 301 +-- htdocs/langs/vi_VN/exports.lang | 254 +-- htdocs/langs/vi_VN/ftp.lang | 22 +- htdocs/langs/vi_VN/help.lang | 54 +- htdocs/langs/vi_VN/holiday.lang | 284 +-- htdocs/langs/vi_VN/install.lang | 410 ++-- htdocs/langs/vi_VN/interventions.lang | 80 +- htdocs/langs/vi_VN/languages.lang | 44 +- htdocs/langs/vi_VN/ldap.lang | 56 +- htdocs/langs/vi_VN/mailmanspip.lang | 52 +- htdocs/langs/vi_VN/mails.lang | 262 +-- htdocs/langs/vi_VN/main.lang | 1301 ++++++------ htdocs/langs/vi_VN/margins.lang | 76 +- htdocs/langs/vi_VN/members.lang | 404 ++-- htdocs/langs/vi_VN/opensurvey.lang | 130 +- htdocs/langs/vi_VN/orders.lang | 308 +-- htdocs/langs/vi_VN/oscommerce.lang | 14 +- htdocs/langs/vi_VN/other.lang | 396 ++-- htdocs/langs/vi_VN/products.lang | 484 ++--- htdocs/langs/vi_VN/projects.lang | 58 +- htdocs/langs/vi_VN/propal.lang | 196 +- htdocs/langs/vi_VN/salaries.lang | 18 +- htdocs/langs/vi_VN/sendings.lang | 138 +- htdocs/langs/vi_VN/shop.lang | 20 +- htdocs/langs/vi_VN/sms.lang | 98 +- htdocs/langs/vi_VN/stocks.lang | 242 +-- htdocs/langs/vi_VN/suppliers.lang | 84 +- htdocs/langs/vi_VN/trips.lang | 42 +- htdocs/langs/vi_VN/users.lang | 235 +-- htdocs/langs/vi_VN/withdrawals.lang | 186 +- htdocs/langs/vi_VN/workflow.lang | 20 +- htdocs/langs/zh_CN/accountancy.lang | 36 +- htdocs/langs/zh_CN/admin.lang | 3 + htdocs/langs/zh_CN/agenda.lang | 15 +- htdocs/langs/zh_CN/categories.lang | 15 +- htdocs/langs/zh_CN/companies.lang | 4 +- htdocs/langs/zh_CN/compta.lang | 21 +- htdocs/langs/zh_CN/donations.lang | 1 + htdocs/langs/zh_CN/errors.lang | 5 +- htdocs/langs/zh_CN/holiday.lang | 126 +- htdocs/langs/zh_CN/interventions.lang | 4 +- htdocs/langs/zh_CN/projects.lang | 8 +- htdocs/langs/zh_CN/sendings.lang | 8 +- htdocs/langs/zh_CN/suppliers.lang | 6 +- htdocs/langs/zh_TW/accountancy.lang | 36 +- htdocs/langs/zh_TW/admin.lang | 3 + htdocs/langs/zh_TW/agenda.lang | 15 +- htdocs/langs/zh_TW/categories.lang | 45 +- htdocs/langs/zh_TW/companies.lang | 4 +- htdocs/langs/zh_TW/compta.lang | 5 +- htdocs/langs/zh_TW/donations.lang | 13 +- htdocs/langs/zh_TW/errors.lang | 5 +- htdocs/langs/zh_TW/holiday.lang | 126 +- htdocs/langs/zh_TW/interventions.lang | 10 +- htdocs/langs/zh_TW/projects.lang | 8 +- htdocs/langs/zh_TW/sendings.lang | 20 +- htdocs/langs/zh_TW/suppliers.lang | 10 +- 609 files changed, 14677 insertions(+), 13692 deletions(-) diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/ar_SA/accountancy.lang +++ b/htdocs/langs/ar_SA/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 0abd2969be1..c09d69c2da4 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=خطأ ، هذا النموذج يتطلب ن ErrorDecimalLargerThanAreForbidden=خطأ, برنامج دوليبار %s الحالي لا يدعم دقة أعلى من الحالية DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا النوع محفوظ. يمكنك إستخدام 'user' كقيمة لإضافة السجل الخاص بك ErrorCodeCantContainZero=لا يمكن إستخدام القيمة 0 لهذا الكود DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=تلقائيا إذا تم تعطيل جافاسك AvailableOnlyIfJavascriptNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين AvailableOnlyIfJavascriptAndAjaxNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين Required=مطلوب +UsedOnlyWithTypeOption=Used by some agenda option only Security=الأمن Passwords=كلمة السر DoNotStoreClearPassword=لا تخزن كلمات السر في قاعدة بيانات واضحة في diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang index d0b00836504..33367cff796 100644 --- a/htdocs/langs/ar_SA/agenda.lang +++ b/htdocs/langs/ar_SA/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=رمز الحدث Actions=الأحداث ActionsArea=منطقة الأحداث (الأنشطة و المهام) -Agenda= جدول الأعمال -Agendas= جداول الأعمال -Calendar= التقويم -Calendars= التقاويم -LocalAgenda=تقويم محلي +Agenda=جدول الأعمال +Agendas=جداول الأعمال +Calendar=التقويم +Calendars=التقاويم +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=مناط لـ DoneBy=أنهي بواسطة Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=جميع الأحداث الغير مكتملة MenuDoneActions=جميع الأحداث الملغية MenuToDoMyActions=أحداثي الغير مكتملة MenuDoneMyActions=أحداثي الملغاة -ListOfEvents=قائمة أحداث دوليبار +ListOfEvents=List of events (internal calendar) ActionsAskedBy=أحداث تم رعايتها بواسطة ActionsToDoBy=أحداث عينت لـ ActionsDoneBy=أحداث انهيت بواسطة @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical ExtSiteNoLabel=لا يوجد وصف WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang index c6ab978cf3f..acdb64f3317 100644 --- a/htdocs/langs/ar_SA/categories.lang +++ b/htdocs/langs/ar_SA/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang index fdc2a6d6f3c..0646bcd465e 100644 --- a/htdocs/langs/ar_SA/companies.lang +++ b/htdocs/langs/ar_SA/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=يجب إنشاء رسائل البريد الإلكت ListSuppliersShort=قائمة الموردين ListProspectsShort=قائمة التوقعات ListCustomersShort=قائمة العملاء -ThirdPartiesArea=أطراف ثالثة منطقة +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=%s آخر تعديل لأطراف ثالثة UniqueThirdParties=مجموع الأطراف الثالثة فريدة من نوعها InActivity=فتح @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=عودة número مع الشكل nnnn - ٪ syymm الزبون ورمز وnnnn - ٪ syymm مورد للقانون حيث السنة هو السنة ، هو شهر ملم وnnnn هو تسلسل بلا كسر وعدم العودة إلى 0. LeopardNumRefModelDesc=العميل / المورد مدونة مجانية. هذا القانون يمكن تعديلها في أي وقت. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang index f0f62dc224f..8b753c5849c 100644 --- a/htdocs/langs/ar_SA/compta.lang +++ b/htdocs/langs/ar_SA/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang index ff07f971de5..987a8142059 100644 --- a/htdocs/langs/ar_SA/donations.lang +++ b/htdocs/langs/ar_SA/donations.lang @@ -30,3 +30,4 @@ SearchADonation=البحث تبرع DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang index 72a5ebe58ba..d25c2f5d8d0 100644 --- a/htdocs/langs/ar_SA/errors.lang +++ b/htdocs/langs/ar_SA/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang index 92137c9150a..2c37582091f 100644 --- a/htdocs/langs/ar_SA/holiday.lang +++ b/htdocs/langs/ar_SA/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=تاريخ البدء DateFinCP=نهاية التاريخ @@ -18,24 +18,24 @@ ApprovedCP=وافق CancelCP=ألغيت RefuseCP=رفض ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=وصف -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=تحرير DeleteCP=حذف ActionValidCP=صحة @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=الغاء StatutCP=حالة SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=تحديث -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=سبب UserCP=مستخدم ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=اسم Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=القيمة -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=صحة UpdateEventCP=Update events CreateEventCP=خلق @@ -127,23 +127,23 @@ UpdateEventOptionCP=تحديث ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang index 2706a96f71d..cf6fe19175f 100644 --- a/htdocs/langs/ar_SA/interventions.lang +++ b/htdocs/langs/ar_SA/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=هل أنت متأكد من أنك تريد حذف NameAndSignatureOfInternalContact=الاسم والتوقيع على التدخل : NameAndSignatureOfExternalContact=اسم وتوقيع العميل : DocumentModelStandard=نموذج وثيقة موحدة للتدخلات -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=تصنيف "وصفت" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=فواتير RelatedInterventions=التدخلات المتعلقة ShowIntervention=عرض التدخل +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=ممثل متابعة التدخل TypeContact_fichinter_internal_INTERVENING=التدخل @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=عدد نموذج عامة ArcticNumRefModelError=فشل لتفعيل PacificNumRefModelDesc1=عودة número مع الشكل nnnn - ٪ syymm فيها السنة هي السنة ، هو شهر ملم وnnnn هو كسر التسلسل وليس هناك عودة لل0 PacificNumRefModelError=تدخل البطاقة ابتداء من دولار ويوجد بالفعل syymm لا تتفق مع هذا النموذج من التسلسل. إزالة أو تغيير تسميتها لتصبح لتفعيل هذه الوحدة. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang index 00deba271f8..954c1f371f6 100644 --- a/htdocs/langs/ar_SA/projects.lang +++ b/htdocs/langs/ar_SA/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=الإجراءات على المشروع YouAreNotContactOfProject=كنت لا اتصال لهذا المشروع الخاص DeleteATimeSpent=قضى الوقت حذف ConfirmDeleteATimeSpent=هل أنت متأكد أنك تريد حذف هذا الوقت الذي يقضيه؟ -DoNotShowMyTasksOnly=أنا لم تتأثر وانظر أيضا إلى المهام ط -ShowMyTasksOnly=أنا تأثرت المهام عرض فقط الأول +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=ملتقيات ProjectsDedicatedToThisThirdParty=مشاريع مخصصة لهذا الطرف الثالث NoTasks=أية مهام لهذا المشروع LinkedToAnotherCompany=ربط طرف ثالث آخر -TaskIsNotAffectedToYou=مهمة لم تخصص لك +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=الوقت الذي يقضيه فارغة ThisWillAlsoRemoveTasks=وهذا العمل أيضا حذف كافة مهام المشروع (%s المهام في الوقت الحاضر) وجميع المدخلات من الوقت الذي تستغرقه. IfNeedToUseOhterObjectKeepEmpty=إذا كانت بعض الكائنات (فاتورة، والنظام، ...)، الذين ينتمون إلى طرف ثالث آخر، يجب أن تكون مرتبطة بمشروع لإنشاء، والحفاظ على هذا فارغة لديها مشروع كونها متعددة الأطراف الثالثة. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=وهناك مشروع كامل لنموذج التقرير (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang index 01d5a37350a..82b1e7a1126 100644 --- a/htdocs/langs/ar_SA/sendings.lang +++ b/htdocs/langs/ar_SA/sendings.lang @@ -13,7 +13,7 @@ LastSendings=ق الماضي ٪ الإرسال SearchASending=البحث المرسلة StatisticsOfSendings=إحصاءات الإرسال NbOfSendings=عدد الإرسال -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=إرسال بطاقة NewSending=ارسال جديدة CreateASending=خلق إرسال @@ -50,27 +50,29 @@ Enlevement=حصلت من قبل العميل DocumentModelSimple=وثيقة نموذج بسيط DocumentModelMerou=Mérou A5 نموذج WarningNoQtyLeftToSend=تحذير ، لا تنتظر أن المنتجات المشحونة. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=مسطح تاريخ التسليم DateReceived=تلقى تاريخ التسليم SendShippingByEMail=ارسال شحنة عن طريق البريد الالكتروني -SendShippingRef=ارسال شحنة %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=الأحداث على شحنة LinkToTrackYourPackage=رابط لتتبع الحزمة الخاصة بك ShipmentCreationIsDoneFromOrder=لحظة، ويتم إنشاء لشحنة جديدة من أجل بطاقة. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=القبض على العملاء SendingMethodTRANS=نقل SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=نموذج بسيط لتسليم وثيقة من وثائق وإيصالات DocumentModelTyphon=أكمل نموذج لتسليم وثيقة من وثائق الإيصالات (logo...) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت لم تحدد -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang index a8ace63c1b1..716337242f6 100644 --- a/htdocs/langs/ar_SA/suppliers.lang +++ b/htdocs/langs/ar_SA/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=من أجل التاريخ BuyingPrice=سعر الشراء BuyingPriceMin=الحد الأدنى من سعر الشراء BuyingPriceMinShort=يوجد سعر الشراء -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=إضافة مورد الأسعار ChangeSupplierPrice=تغيير سعر المورد ErrorQtyTooLowForThisSupplier=كمية منخفضة جدا لهذا المورد أو لا يعرف سعر هذا المنتج لهذا المورد @@ -27,7 +27,7 @@ RefSupplierShort=المرجع. المورد Availability=توفر ExportDataset_fournisseur_1=قائمة فواتير الموردين والفواتير 'خطوط ExportDataset_fournisseur_2=فواتير الموردين والمدفوعات -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=الموافقة على هذا النظام ConfirmApproveThisOrder=هل أنت متأكد من أن يوافق على هذا الأمر؟ DenyingThisOrder=ونفى هذا الأمر @@ -39,4 +39,6 @@ AddSupplierOrder=من أجل خلق مورد AddSupplierInvoice=خلق مورد فاتورة ListOfSupplierProductForSupplier=قائمة المنتجات والأسعار لمورد ق ٪ NoneOrBatchFileNeverRan=أو لا شيء دفعة ٪ ق لا يتعارض مؤخرا -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/bg_BG/accountancy.lang +++ b/htdocs/langs/bg_BG/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index b28cc902eb4..9c3879b02f8 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Грешка, този модул изискв ErrorDecimalLargerThanAreForbidden=Грешка, с точност по-висока от %s не се поддържа. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Автоматично Ако Javascript е деа AvailableOnlyIfJavascriptNotDisabled=Предлага се само ако JavaScript не е забранен AvailableOnlyIfJavascriptAndAjaxNotDisabled=Предлага се само ако JavaScript не е забранен Required=Задължително +UsedOnlyWithTypeOption=Used by some agenda option only Security=Сигурност Passwords=Пароли DoNotStoreClearPassword=Да не се магазин ясни пароли в базата данни, но се съхранява само криптирана стойност (Активира се препоръчва) diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang index c8c1173c9c4..33d388b055f 100644 --- a/htdocs/langs/bg_BG/agenda.lang +++ b/htdocs/langs/bg_BG/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID на събитие Actions=Събития ActionsArea=Събития (дейности и задачи) -Agenda= Дневен ред -Agendas= Дневен ред -Calendar= Календар -Calendars= Календари -LocalAgenda=Локален календар +Agenda=Дневен ред +Agendas=Дневен ред +Calendar=Календар +Calendars=Календари +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Възложено на DoneBy=Извършено от Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Всички незавършени събития MenuDoneActions=Всички прекратени събития MenuToDoMyActions=Моите незавършени събития MenuDoneMyActions=Моите прекратени събития -ListOfEvents=Списък на Dolibarr събитията +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Събития създадени от ActionsToDoBy=Събития възложени на ActionsDoneBy=Събития извършени от @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL адрес за достъп до файла .Ical ExtSiteNoLabel=Няма описание WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang index efb25de5f9c..3fab48d0857 100644 --- a/htdocs/langs/bg_BG/categories.lang +++ b/htdocs/langs/bg_BG/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang index 6ae8506a43d..e41800f668c 100644 --- a/htdocs/langs/bg_BG/companies.lang +++ b/htdocs/langs/bg_BG/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Трябва да създадете контакти ListSuppliersShort=Списък на доставчиците ListProspectsShort=Списък на перспективите ListCustomersShort=Списък на клиенти -ThirdPartiesArea=Трети страни област +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Последните %s променени трети страни UniqueThirdParties=Общо уникални трети страни InActivity=Отворен @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Връщане Numero с формат %syymm-NNNN за клиента код и %syymm-NNNN за доставчика код, където YY е годината, mm е месец и NNNN е последователност, без почивка и няма връщане назад до 0. LeopardNumRefModelDesc=Кодът е безплатно. Този код може да бъде променен по всяко време. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang index 03427b5e2ae..b4930ceba6d 100644 --- a/htdocs/langs/bg_BG/compta.lang +++ b/htdocs/langs/bg_BG/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang index 941497a2fe7..b080f9ba743 100644 --- a/htdocs/langs/bg_BG/donations.lang +++ b/htdocs/langs/bg_BG/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Търсене на дарение DonationRecipient=Получател на дарението ThankYou=Благодарим Ви! IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang index 7c6113c9cb5..494b1ede1e0 100644 --- a/htdocs/langs/bg_BG/errors.lang +++ b/htdocs/langs/bg_BG/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang index 09d044b54ee..9bf06f7c047 100644 --- a/htdocs/langs/bg_BG/holiday.lang +++ b/htdocs/langs/bg_BG/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=ЧР -Holidays=Отпуски -CPTitreMenu=Отпуски +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Месечно извлечение -MenuAddCP=Кандидатстване за отпуск -NotActiveModCP=Трябва да вкючите модула за отпуски, за да видите тази страница. -NotConfigModCP=Необходимо е да конфигурирате модула за отпуски за да видите тази страница. За да направите това, щтракнете тук . -NoCPforUser=You don't have a demand for holidays. -AddCP=Кандидатстване за отпуск +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Служител DateDebCP=Начална дата DateFinCP=Крайна дата @@ -18,24 +18,24 @@ ApprovedCP=Утвърден CancelCP=Отменен RefuseCP=Отказ ValidatorCP=Утвърждаващ -ListeCP=Списък на отпуски +ListeCP=List of leaves ReviewedByCP=Ще бъде утвърден от DescCP=Описание -SendRequestCP=Създаване на заявление за отпуск -DelayToRequestCP=Заявлението за отпуск трябва да бъде подадено най-малко %s ден(а), преди началната му дата. -MenuConfCP=Редактиране на баланса на отпуските -UpdateAllCP=Актуализиране на отпуските -SoldeCPUser=Баланса на отпуска е %s дни. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Трябва да изберете крайната дата, по-голяма от началната дата. ErrorSQLCreateCP=Възникна SQL грешка по време на създаването: -ErrorIDFicheCP=Възникна грешка, искането за почивка не съществува. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Назад към предишната страница -ErrorUserViewCP=Вие нямате право да чете това искане за отпуск. -InfosCP=Информация на търсенето на празници +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Информация Workflow RequestByCP=По искане на -TitreRequestCP=Лист с отпуски -NbUseDaysCP=Брой на дните на използваните отпуски +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Редактиране DeleteCP=Изтриване ActionValidCP=Утвърждаване @@ -43,26 +43,26 @@ ActionRefuseCP=Отказване ActionCancelCP=Отказ StatutCP=Състояние SendToValidationCP=Изпращане за утвърждаване -TitleDeleteCP=Изтриване на искането за отпуск -ConfirmDeleteCP=Потвърждавате ли изтриването на това искане за отпуск? -ErrorCantDeleteCP=Грешка: нямате необходимите права за да изтриете това искане за отпуск. -CantCreateCP=Вие нямате право да кандидатствате за отпуск. -InvalidValidatorCP=Вие трябва да изберете утвърждаващ на искането на отпуск. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Актуализация -CantUpdate=Не можете да актуализирате това искане за отпуск. +CantUpdate=You cannot update this leave request. NoDateDebut=Трябва да изберете началната дата. NoDateFin=Трябва да изберете крайна дата. ErrorDureeCP=Вашето искане за почивка не съдържа работен ден. TitleValidCP=Утвърждава искането за отпуск -ConfirmValidCP=Сигурни ли сте, че желаете да утвърдите искането за отпуск? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Дата на утвърждаване -TitleToValidCP=Изпращане на заявление за отпуск -ConfirmToValidCP=Сигурни ли сте, че желаете да изпратите заявлението за отпуск? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Отхвърляне на заявлението за отпуск -ConfirmRefuseCP=Сигурни ли сте, че желаете да откажите искането на отпуск? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Вие трябва да изберете причина за отказ на искането. TitleCancelCP=Анулира заявката празници -ConfirmCancelCP=Сигурен ли сте, че искате да отмените искане на празници? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Причина за отказа DateRefusCP=Дата на отказ DateCancelCP=Дата на анулирането @@ -72,8 +72,8 @@ MotifCP=Причина UserCP=Потребител ErrorAddEventToUserCP=Възникна грешка при добавяне на изключително отпуск. AddEventToUserOkCP=Добавянето на извънредния отпуск е завършена. -MenuLogCP=Преглед на извършените административни действия на празници -LogCP=Вход на актуализации на празниците +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=В изпълнение на UserUpdateCP=За потребителя PrevSoldeCP=Предишен баланс @@ -81,33 +81,33 @@ NewSoldeCP=Нов баланс alreadyCPexist=Вече е направено искане за отпуск за този период. UserName=Име Employee=Служители -FirstDayOfHoliday=Първи ден от отпуска -LastDayOfHoliday=Последен ден на отпуска +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Настройки на модула за отпуски DescOptionCP=Описание на опцията ValueOptionCP=Стойност -GroupToValidateCP=Група с възможност за валидиране на празниците +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Потвърждаване на конфигурацията -LastUpdateCP=Последна автоматична актуализация на отпуските +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Актуализира се успешно. ErrorUpdateConfCP=Възникна грешка по време на актуализацията, моля опитайте отново. AddCPforUsers=Моля, добавете баланса на празниците на потребителите, като кликнете тук . DelayForSubmitCP=Краен срок за кандидатстване за отпуск AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Отказване, ако не е спазен срока за заявяване на отпуска -AlertValidorSoldeCP=Отказване, ако желаните дни са над баланса -nbUserCP=Брой на потребителите, подкрепена в модула празници -nbHolidayDeductedCP=Колко отпуск да се приспада за всеки ден от отпуска -nbHolidayEveryMonthCP=Колко отпуск да се добавя всеки месец -Module27130Name= Управление на празници -Module27130Desc= Управление на празници -TitleOptionMainCP=Основни настройки на отпуските -TitleOptionEventCP=Настройки на празниците, свързана със събития +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Проверка на UpdateEventCP=Актуализиране на събития CreateEventCP=Създаване на @@ -127,23 +127,23 @@ UpdateEventOptionCP=Актуализация ErrorMailNotSend=Възникна грешка при изпращане на имейл: NoCPforMonth=Не оставяйте този месец. nbJours=Брой дни -TitleAdminCP=Конфигурация на празници +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang index d5ffcbc941b..583d7a4ea02 100644 --- a/htdocs/langs/bg_BG/interventions.lang +++ b/htdocs/langs/bg_BG/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Име и подпис на намеса: NameAndSignatureOfExternalContact=Име и подпис на клиента: DocumentModelStandard=Стандартен документ модел за интервенции InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Класифициране 'Таксувана' +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Таксува RelatedInterventions=Подобни интервенции ShowIntervention=Покажи намеса +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Представител проследяване намеса TypeContact_fichinter_internal_INTERVENING=Намеса diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang index 87f88a3f33e..95d094a6934 100644 --- a/htdocs/langs/bg_BG/projects.lang +++ b/htdocs/langs/bg_BG/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Събития по проекта YouAreNotContactOfProject=Вие не сте контакт на този частен проект DeleteATimeSpent=Изтриване на времето, прекарано ConfirmDeleteATimeSpent=Сигурен ли сте, че искате да изтриете това време, прекарано? -DoNotShowMyTasksOnly=Вижте също задачи, които не са разпределени за мен -ShowMyTasksOnly=Виж само задачи, възложени за мен +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Проекти, насочени към тази трета страна NoTasks=Няма задачи за този проект LinkedToAnotherCompany=Свързано с друга трета страна -TaskIsNotAffectedToYou=Задачи, които не са разпределени за вас +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Изразходваното време е празна ThisWillAlsoRemoveTasks=Това действие ще изтрие всички задачи на проекта (%s задачи в момента) и всички входове на времето, прекарано. IfNeedToUseOhterObjectKeepEmpty=Ако някои обекти (фактура, поръчка, ...), принадлежащи към друга трета страна, трябва да бъдат свързани с проекта за създаване, запазете тази празна да има проект е мулти трети страни. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang index 66a89f57a80..be5354d1310 100644 --- a/htdocs/langs/bg_BG/sendings.lang +++ b/htdocs/langs/bg_BG/sendings.lang @@ -13,7 +13,7 @@ LastSendings=Последен превоз %s SearchASending=Търсене за превоз StatisticsOfSendings=Статистика за превози NbOfSendings=Брой на пратките -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Доставка карта NewSending=Нова пратка CreateASending=Създаване на пратка @@ -50,27 +50,29 @@ Enlevement=Набият по желание на клиента DocumentModelSimple=Обикновено документ модел DocumentModelMerou=Merou A5 модел WarningNoQtyLeftToSend=Внимание, няма продукти, които чакат да бъдат изпратени. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Нарязани датата на доставка DateReceived=Дата на доставка SendShippingByEMail=Изпращане на пратка по имейл -SendShippingRef=Изпрати спедиция %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Събития на пратка LinkToTrackYourPackage=Линк за проследяване на вашия пакет ShipmentCreationIsDoneFromOrder=За момента се извършва от картата с цел създаване на нова пратка. RelatedShippings=Свързани shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Улов от клиента SendingMethodTRANS=Транспортьор SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Simple образеца на документа за доставка постъпления DocumentModelTyphon=Повече целия документ модел за доставка постъпления (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянно EXPEDITION_ADDON_NUMBER не е определен -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang index bc575f04d98..93810c22e1e 100644 --- a/htdocs/langs/bg_BG/suppliers.lang +++ b/htdocs/langs/bg_BG/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Дата на поръчката BuyingPrice=Изкупната цена BuyingPriceMin=Минимална покупната цена BuyingPriceMinShort=Покупка мин. Цена -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Добави награда доставчик ChangeSupplierPrice=Промяна доставчик цена ErrorQtyTooLowForThisSupplier=Количество твърде ниска за този доставчик или няма цена, определена за този продукт на този доставчик @@ -27,7 +27,7 @@ RefSupplierShort=Не. снабдител Availability=Наличност ExportDataset_fournisseur_1=Фактури и фактура линии ExportDataset_fournisseur_2=Фактури и наредби -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Одобряване на поръчката ConfirmApproveThisOrder=Сигурен ли сте, че искате да одобри %s Поръчката? DenyingThisOrder=Да откаже поръчката @@ -39,4 +39,6 @@ AddSupplierOrder=Създаване на поръчка за покупка AddSupplierInvoice=Създаване на фактура ListOfSupplierProductForSupplier=Списък на доставчици на стоки и цени %s NoneOrBatchFileNeverRan=Няма или не се изпълнява партида %s наскоро -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/bs_BA/accountancy.lang +++ b/htdocs/langs/bs_BA/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 8d527fff116..52b182414b1 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang index 7cde27df7ce..131f21d749c 100644 --- a/htdocs/langs/bs_BA/agenda.lang +++ b/htdocs/langs/bs_BA/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID događaja Actions=Događaji ActionsArea=Područje za događaje (akcije i zadaci) -Agenda= Agenda -Agendas= Agende -Calendar= Kalendar -Calendars= Kalendari -LocalAgenda=Lokalni kalendar +Agenda=Agenda +Agendas=Agende +Calendar=Kalendar +Calendars=Kalendari +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Dodijeljeno korisniku DoneBy=Učinio/la Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Svi nepotpuni događaji MenuDoneActions=Sve završeni događaji MenuToDoMyActions=Moji nepotpuni događaji MenuDoneMyActions=Moji završeni događaji -ListOfEvents=Lista Dolibarr događaja +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Događaje izvijestio/la ActionsToDoBy=Događaji dodijeljeni korisniku ActionsDoneBy=Događaji završeni od strane korisnika @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL za pristup .ical fajla ExtSiteNoLabel=Nema opisa WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang index 90c115aa548..85e1c9cdccb 100644 --- a/htdocs/langs/bs_BA/categories.lang +++ b/htdocs/langs/bs_BA/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang index 9b7abd934cf..94c67f22f85 100644 --- a/htdocs/langs/bs_BA/companies.lang +++ b/htdocs/langs/bs_BA/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Morate prvo kreirati emailove kontakata za subjekte da ListSuppliersShort=Lista dobavljača ListProspectsShort=Lista mogućih klijenata ListCustomersShort=Lista kupaca -ThirdPartiesArea=Područje za subjekte +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Zadnjih %s izmijenjenih subjekata UniqueThirdParties=Ukupno unikatnih subjekata InActivity=Otvori @@ -410,3 +410,5 @@ OutstandingBillReached=Dostugnut je max. za neplaćeni račun MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0. LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang index 2ea31a467d3..9f17662db0c 100644 --- a/htdocs/langs/bs_BA/compta.lang +++ b/htdocs/langs/bs_BA/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang index 612bf1d5850..6700369f388 100644 --- a/htdocs/langs/bs_BA/donations.lang +++ b/htdocs/langs/bs_BA/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Traži donaciju DonationRecipient=Primalac donacije ThankYou=Hvala Vam IConfirmDonationReception=Primalac potvrđuje prijem, kao donacija, slijedeći iznos +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/bs_BA/errors.lang +++ b/htdocs/langs/bs_BA/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang index 54c94293460..ab2993195de 100644 --- a/htdocs/langs/bs_BA/holiday.lang +++ b/htdocs/langs/bs_BA/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=Kadrovska služba -Holidays=Godišnji odmori -CPTitreMenu=Godišnji odmori +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Mjesečni izvještaj -MenuAddCP=Prijavi se za godišnji odmor -NotActiveModCP=Morate omogućiti modul godišnji odmori da bi vidjeli ovu stranicu. -NotConfigModCP=Morate konfigurisati modul godišnji odmori da bi vidjeli ovu stranicu. Da bi ste uradili ovo, kliknite ovdje. -NoCPforUser=Nema te zahtjeva za godišnje odmore. -AddCP=Prijavi se za godišnji odmor +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Zaposlenik DateDebCP=Datum početka DateFinCP=Datum završetka @@ -18,24 +18,24 @@ ApprovedCP=Odobren CancelCP=Otkazan RefuseCP=Odbijen ValidatorCP=Osoba koja odobrava -ListeCP=Lista godišnjih odmora +ListeCP=List of leaves ReviewedByCP=Bit će pregledano od strane DescCP=Opis -SendRequestCP=Kreiranje zahtjeva za godišnji odmor -DelayToRequestCP=Aplikacija za godišnji odmor mora biti napravljena bar %s dan(a) prije samog odmora. -MenuConfCP=Izmjena stanja za godišnje odmore. -UpdateAllCP=Ažuriranje godišnjih odmora -SoldeCPUser=Stanje godišnjih odmora je %s dana. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Datum završetka mora biti poslije datuma početka. ErrorSQLCreateCP=Desila se SQL greška prilikom kreiranja: -ErrorIDFicheCP=Desila se greška, zahtjev za odmor ne postoji. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Vrati se na prethodnu stranicu -ErrorUserViewCP=Niste autorizovani da čitate ovaj zahtjev za godišnji odmor. -InfosCP=Informacije o zahtjevu za odmor +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Workflow informacija RequestByCP=Zahtjev poslao -TitreRequestCP=Lista godišnjih odmora -NbUseDaysCP=Broj iskorištenih dana godišnjeg odmora +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Izmjena DeleteCP=Obrisati ActionValidCP=Potvrdi @@ -43,26 +43,26 @@ ActionRefuseCP=Odbij ActionCancelCP=Poništi StatutCP=Status SendToValidationCP=Posalji na potvrđivanje -TitleDeleteCP=Obrisati zahtjev za godišnji odmor -ConfirmDeleteCP=Potvrda brisanja ovog zahtjeva za godišnji odmor? -ErrorCantDeleteCP=Greška nemate pravo da obriše ovaj zahtjev za godišnji odmor. -CantCreateCP=Nemaš prava da se prijave za godišnji odmor. -InvalidValidatorCP=Morate odabrati osobu za odobravanja vašeg godišnjeg odmora. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Ažuriranje -CantUpdate=Ne možete ažurirati ovaj zahtjev za godišnji odmor. +CantUpdate=You cannot update this leave request. NoDateDebut=Morate odabrati datum početka. NoDateFin=Morate odabrati datum završetka. ErrorDureeCP=Vaš zahtjev za godišnji odmor ne sadrži radni dan. TitleValidCP=Odobri zahtjev za godišnji odmor -ConfirmValidCP=Jeste li sigurni da želite da odobrite zahtjev za godišnji odmor? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Datum odobrenja -TitleToValidCP=Pošalji zahtjev za godišnji odmor -ConfirmToValidCP=Jeste li sigurni da želite poslati zahtjev za godišnji odmor? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Odbiti zahtjev za godišnji odmor -ConfirmRefuseCP=Jeste li sigurni da želite odbiti zahtjev za godišnji odmor? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Morate odabrati razlog za odbijanje zahtjeva. TitleCancelCP=Poništi zahtjev za godišnji odmor -ConfirmCancelCP=Jeste li sigurni da želite otkazati zahtjev za godišnji odmor? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Razlog za odbijanje DateRefusCP=Datum odbijanja DateCancelCP=Datum poništavanja @@ -72,8 +72,8 @@ MotifCP=Razlog UserCP=Korisnik ErrorAddEventToUserCP=Došlo je do greške prilikom dodavanja izuzetnog odsustva. AddEventToUserOkCP=Dodavanje izuzetno odsustva je kopmletirano. -MenuLogCP=Pogledaj izvjestaje za godišnje odmore -LogCP=Izvještaji ažuriranja godišnjih odmora +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Izvršeno od strane UserUpdateCP=Za korisnika PrevSoldeCP=Prethodno stanje @@ -81,33 +81,33 @@ NewSoldeCP=Novo stanje alreadyCPexist=Zahtjev za godišnji odmor je vec završen za ovaj period. UserName=Naziv Employee=Zaposlenik -FirstDayOfHoliday=Prvi dan godišnjeg odmora -LastDayOfHoliday=Zadnji dan godišnjeg odmora +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Mjesečno ažuriranje ManualUpdate=Ručno ažuriranje -HolidaysCancelation=Poništavanje godišnjih odmora +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Konfiguracija modula za godišnje odmore DescOptionCP=Opis opcije ValueOptionCP=Vrijednost -GroupToValidateCP=Grupa sa mogućnosti da odobrava godišnje odmore +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Potvrdite konfiguraciju -LastUpdateCP=Zadnje ažuriranje automatskih godišnjih odmora +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Uspješno ažuriranje. ErrorUpdateConfCP=Došlo je do greške prilikom ažuriranja, molimo pokušajte ponovo. AddCPforUsers=Molimo dodajte stanje godišnjih odmora za korisnika klikom ovdje. DelayForSubmitCP=Rok za prijavu za godišnji odmor AlertapprobatortorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da se ne poklapa sa rokovima -AlertValidatorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da odmor prelazi odgađanje -AlertValidorSoldeCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da odmor prelazi trenutno stanje -nbUserCP=Broj podržanih korisnika u modulu za godišnje odmore -nbHolidayDeductedCP=Broj godišnjih odmora za odbijanje po danu uzetog odmora -nbHolidayEveryMonthCP=Broj dana godišnjeg odmora za dodati svaki mjesec -Module27130Name= Upravljanje godišnjim odmorima -Module27130Desc= Upravljanje godišnjim odmorima -TitleOptionMainCP=Glavne postavke godišnjih odmora -TitleOptionEventCP=Postavke za godišnje odmore povezane sa događajima +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Potvrdi UpdateEventCP=Ažuriraj događaje CreateEventCP=Kreiraj @@ -127,23 +127,23 @@ UpdateEventOptionCP=Ažuriraj ErrorMailNotSend=Desila se greška prilikom slanja emaila: NoCPforMonth=Nema odsustva za ovaj mjesec. nbJours=Broj dana -TitleAdminCP=Konfiguracija godišnjih odmora +TitleAdminCP=Configuration of Leaves #Messages Hello=Zdravo -HolidaysToValidate=Potvrdi godišnje odmore -HolidaysToValidateBody=Ispod su zahtjevi godišnjih odmora za potvrđivanje. -HolidaysToValidateDelay=Ovaj zahtjev za godišji odmor će se desiti u periodu od manje od %s dana. -HolidaysToValidateAlertSolde=Korisnici koji su postavili ovaj zahtjev nemaju dovoljan broj dostupnih dana. -HolidaysValidated=Potvrđeni godišnji odmori -HolidaysValidatedBody=Vaš zahtjev za godišnji odmor od %s do %s je potvrđen. -HolidaysRefused=Odbijeni godišnji odmori -HolidaysRefusedBody=Vaš zahtjev za godišnji odmor od %s do %s je odbijen zbog: -HolidaysCanceled=Poništeni godišnji odmori -HolidaysCanceledBody=Vaš zahtjev za godišnji odmor od %s fo %s je poništen. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Pregledaj izvještaj o izmijenjenim godišnjim odmorima -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang index dc08dc466d0..06f4edc8354 100644 --- a/htdocs/langs/bs_BA/interventions.lang +++ b/htdocs/langs/bs_BA/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Ime i potpis servisera: NameAndSignatureOfExternalContact=Ime i potpis kupca: DocumentModelStandard=Standardni dokument za intervencije InterventionCardsAndInterventionLines=Intervencije i tekstovi intervencija -ClassifyBilled=Klasifikuj "Fakturisane" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Fakturisano RelatedInterventions=Povezane intervencije ShowIntervention=Prikaži intervenciju +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Predstavnik koji kontroliše intervenciju TypeContact_fichinter_internal_INTERVENING=Serviser diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang index ce474404ca4..95c53abeecf 100644 --- a/htdocs/langs/bs_BA/projects.lang +++ b/htdocs/langs/bs_BA/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Događaji na projektu YouAreNotContactOfProject=Vi niste kontakt ovog privatnog projekta DeleteATimeSpent=Brisanje provedenog vremena ConfirmDeleteATimeSpent=Jeste li sigurni da želite obrisati ovo provedeno vrijeme? -DoNotShowMyTasksOnly=Vidi i zadatke koji nisu dodijeljeni meni -ShowMyTasksOnly=Pogledaj samo zadake dodijeljene meni +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Izvori ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu NoTasks=Nema zadataka za ovaj projekat LinkedToAnotherCompany=U vezi sa drugim subjektom -TaskIsNotAffectedToYou=Zadaci koji nisu dodjeljeni meni +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Vrijeme provedeno je prazno ThisWillAlsoRemoveTasks=Ova akcija će također izbrisati sve zadatke projekta (%s zadataka u ovom trenutku) i sve unose provedenog vremena. IfNeedToUseOhterObjectKeepEmpty=Ako neki objekti (faktura, narudžbe, ...), pripadaju drugom subjektu, mora biti u vezi sa projektom za kreiranje, ostavite ovo prazno da bi imali projekat što više subjekata. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang index 08d9542b1c8..9bdc4e0100c 100644 --- a/htdocs/langs/bs_BA/sendings.lang +++ b/htdocs/langs/bs_BA/sendings.lang @@ -50,11 +50,11 @@ Enlevement=Preuzeto od strane kupca DocumentModelSimple=Jednostavni model dokumenta DocumentModelMerou=Model dokumenta Merou A5 WarningNoQtyLeftToSend=Upozorenje, nema proizvoda na čekanju za slanje -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Planirani datum isporuke DateReceived=Datum prijema isporuke SendShippingByEMail=Pošalji pošiljku na e-mail -SendShippingRef=Pošalji pošiljku %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Događaji na pošiljki LinkToTrackYourPackage=Link za praćenje paketa ShipmentCreationIsDoneFromOrder=U ovom trenutku, nova pošiljka se kreira sa kartice narudžbe @@ -63,14 +63,16 @@ ShipmentLine=Tekst pošiljke CarrierList=Lista transportera # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) - -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Suma količina proizvoda SumOfProductWeights=Suma težina proizvoda + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang index 64874a271e3..c9dd370a476 100644 --- a/htdocs/langs/bs_BA/suppliers.lang +++ b/htdocs/langs/bs_BA/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Kreiraj fakturu za dobavljača ListOfSupplierProductForSupplier=Lista proizvoda i cijena za dobavljača %s NoneOrBatchFileNeverRan=Nijedan ili gomila %s nije pokrenuto nedavno SentToSuppliers=Poslano prema dobavljačima +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/ca_ES/accountancy.lang +++ b/htdocs/langs/ca_ES/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index a9dc6ca7622..42563c409f8 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a %s no estan suportades. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està reservat. Podeu utilitzar 'user' com a valor per afegir el seu propi registre ErrorCodeCantContainZero=El codi no pot contenir el valor 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automàtic si el JavaScript està desactivat AvailableOnlyIfJavascriptNotDisabled=Disponible només si Javascript està activat AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible només si Javascript i Ajax estan activats Required=Requerit +UsedOnlyWithTypeOption=Used by some agenda option only Security=Seguretat Passwords=Contrasenyes DoNotStoreClearPassword=No emmagatzemar la contrasenya sense xifrar a la base diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index 26dfabddaa1..6a2347b2cf8 100644 --- a/htdocs/langs/ca_ES/agenda.lang +++ b/htdocs/langs/ca_ES/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Esdeveniments ActionsArea=Àrea d'esdeveniments (accions i tasques) -Agenda= Agenda -Agendas= Agendes -Calendar= Calendari -Calendars= Calendaris -LocalAgenda=Calendari local +Agenda=Agenda +Agendas=Agendes +Calendar=Calendari +Calendars=Calendaris +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assignada a DoneBy=Realitzat per Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Esdeveniments incomplets MenuDoneActions=Esdeveniments acabats MenuToDoMyActions=Els meus esdeveniments incomplets MenuDoneMyActions=Els meus esdeveniments acabats -ListOfEvents=Llistat d'esdeveniments Dolibarr +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Esdeveniments registrats per ActionsToDoBy=Esdeveniments assignats a ActionsDoneBy=Esdeveniments realitzats per @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical ExtSiteNoLabel=Sense descripció WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang index fca6650c6c7..84f2b0eef27 100644 --- a/htdocs/langs/ca_ES/categories.lang +++ b/htdocs/langs/ca_ES/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang index 4679a935de9..a4f4f32f6d3 100644 --- a/htdocs/langs/ca_ES/companies.lang +++ b/htdocs/langs/ca_ES/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Ha d'establir contactes amb e-mail en els tercers per ListSuppliersShort=Llistat de proveïdors ListProspectsShort=Llistat de clients potencials ListCustomersShort=Llistat de clients -ThirdPartiesArea=Àrea Tercers +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Els %s últims tercers modificats UniqueThirdParties=Total de tercers únics InActivity=Actiu @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Retorna un número sota el format %syymm-nnnn per als codis de clients i %syymm-nnnn per als codis dels proveïdors, on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0. LeopardNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index c70bfcf75da..0fd90f71cf4 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -3,7 +3,7 @@ Accountancy=Comptabilitat AccountancyCard=Fitxa comptable Treasury=Tresoreria MenuFinancial=Financera -TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation +TaxModuleSetupToModifyRules=Anar a configuració mòdul impostos per modificar les regles de càlcul TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation OptionMode=Opció de gestió comptable OptionModeTrue=Opció Ingressos-Despeses @@ -32,7 +32,7 @@ Profit=Benefici Balance=Saldo Debit=Dèbit Credit=Crèdit -Piece=Accounting Doc. +Piece=Doc. Comptabilitat Withdrawal=Reintegrament Withdrawals=Reintegraments AmountHTVATRealReceived=Total repercutit @@ -119,42 +119,42 @@ ConfirmPaySocialContribution=Esteu segur de voler classificar aquesta càrrega s DeleteSocialContribution=Eliminar càrrega social ConfirmDeleteSocialContribution=Esteu segur de voler eliminar aquesta càrrega social? ExportDataset_tax_1=Càrregues socials i pagaments -CalcModeVATDebt=Mode %sVAT on commitment accounting%s. -CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. -CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. -CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting +CalcModeVATDebt=Mode d'%sIVA sobre comptabilitat de compromís%s . +CalcModeVATEngagement=Mode d'%sIVA sobre ingressos-despeses%s. +CalcModeDebt=Mode %sReclamacions-Deutes%s anomenada Comptabilitad de compromís. +CalcModeEngagement=Mode %sIngressos-Despeses%s anomenada Comptabilitad de caixa. CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s CalcModeLT1Debt=Mode %sRE on customer invoices%s CalcModeLT1Rec= Mode %sRE on suppliers invoices%s CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s CalcModeLT2Debt=Mode %sIRPF on customer invoices%s CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s -AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary -AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary +AnnualSummaryDueDebtMode=Saldo d'ingressos i despeses, resum anual +AnnualSummaryInputOutputMode=Saldo d'ingressos i despeses, resum anual AnnualByCompaniesDueDebtMode=Balanç d'ingressos i despeses, desglossat per tercers, en mode %sCrèdits-Deutes%s anomenada comptabilitat de compromís. AnnualByCompaniesInputOutputMode=Balanç d'ingressos i despeses, desglossat per tercers, en mode %sIngressos-Despeses%s anomenada comptabilitat de caixa . SeeReportInInputOutputMode=Veure l'informe %sIngressos-Despeses%s anomenat comptabilitat de caixa per a un càlcul sobre les factures pagades SeeReportInDueDebtMode=Veure l'informe %sCrèdits-Deutes% anomenada comptabilitat de compromís per a un càlcul de les factures pendents de pagament RulesAmountWithTaxIncluded=- Els imports mostrats són amb tots els impostos inclosos. RulesResultDue=- Els imports mostrats són imports totals
- Inclou les factures, càrregues i IVA deguts, que estiguin pagades o no.
- Es basa en la data de validació per a les factures i l'IVA i en la data de venciment per les càrregues.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. +RulesResultInOut=- Inclou els pagaments reals efectuats en factures, les despeses i l'IVA.
- Es basa en les dates de pagament de les factures, les despeses i l'IVA. RulesCADue=- Inclou les factures a clients (excloent les de bestreta), estiguin pagades o no.
- Es base en la data de validació de les mateixes.
RulesCAIn=- Inclou els pagaments efectuats de les factures a clients.
- Es basa en la data de pagament de les mateixes
DepositsAreNotIncluded=- Les factures de bestreta no estan incloses DepositsAreIncluded=- Les factures de bestreta estan incloses LT2ReportByCustomersInInputOutputModeES=Informe per tercer del IRPF LT1ReportByCustomersInInputOutputModeES=Report by third party RE -VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid -VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid -VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid +VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat +VATReportByCustomersInDueDebtMode=Informe per clients d'IVA cobrat i pagat +VATReportByQuartersInInputOutputMode=Informe per tipus d'IVA cobrat i pagat LT1ReportByQuartersInInputOutputMode=Report by RE rate LT2ReportByQuartersInInputOutputMode=Report by IRPF rate -VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid +VATReportByQuartersInDueDebtMode=Informe per tipus d'IVA cobrat i pagat LT1ReportByQuartersInDueDebtMode=Report by RE rate LT2ReportByQuartersInDueDebtMode=Report by IRPF rate SeeVATReportInInputOutputMode=Veure l'informe %sIVA pagat%s per a un mode de càlcul estàndard SeeVATReportInDueDebtMode=Veure l'informe %s IVA degut%s per a un mode de càlcul amb l'opció sobre el degut -RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment. +RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA rebuts o emesos en base a la data de pagament. RulesVATInProducts=- Per als béns materials, inclou l'IVA de les factures en base a la data de la factura. RulesVATDueServices=- Per als serveis, l'informe inclou l'IVA de les factures degudes, pagades o no basant-se en la data d'aquestes factures. RulesVATDueProducts=- Per als béns materials, inclou l'IVA de les factures en base a la data de la factura. @@ -186,15 +186,15 @@ InvoiceDispatched=Factures desglossades AccountancyDashboard=Resum financer ByProductsAndServices=Per productes i serveis RefExt=Ref. externa -ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order -ReCalculate=Recalculate -Mode1=Method 1 -Mode2=Method 2 -CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. -CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. -TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). -CalculationMode=Calculation mode +ToCreateAPredefinedInvoice=Per crear una factura predefinida, creu una factura estàndard llavors, sense validar, feu clic al botó "Convertir la factura predefinida". +LinkedOrder=Link to order +ReCalculate=Recalcular +Mode1=Mètode 1 +Mode2=Mètode 2 +CalculationRuleDesc=Per calcular la totalitat de l'IVA, hi ha dos mètodes:
Mètode 1 és l'arrodoniment de l'IVA en cada línia, llavors es sumen-
Mètode 2 és la suma de tot l'IVA en cada línia, a continuació, arrodonint el resultat.
.El resultat final pot difereix uns pocs centaus. El mètode per defecte és % s. +CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per aplicar la mateixa regla de càlcul per obtenir el resultat esperat pel seu proveïdor. +TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode comptabilitat de caixa no és rellevant. Aquest informe només està disponible quan s'utilitza el mode compromís comptable(consulteu la configuració del mòdul de comptabilitat). +CalculationMode=Mode de càlcul AccountancyJournal=Accountancy code journal ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang index f9a5311a697..acb0fb19fe9 100644 --- a/htdocs/langs/ca_ES/donations.lang +++ b/htdocs/langs/ca_ES/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Cercar una donació DonationRecipient=Beneficiari ThankYou=Moltes gràcies IConfirmDonationReception=El beneficiari confirma la recepció, com a donació, de la següent quantitat +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang index 4e739c5e053..61148a83890 100644 --- a/htdocs/langs/ca_ES/errors.lang +++ b/htdocs/langs/ca_ES/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Atenció, l'ús d'aquest panell provoca serioses ale WarningClickToDialUserSetupNotComplete=La configuració de ClickToDial per al compte d'usuari no està completa (vegeu la pestanya ClickToDial en la seva fitxa d'usuari) WarningNotRelevant=Operació irrellevant per a aquest conjunt de dades WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index e4877b093e9..ecb44efd043 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=RRHH -Holidays=Vacacions -CPTitreMenu=Vacacions +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Estat mensual -MenuAddCP=Nova petició -NotActiveModCP=Heu d'activar el mòdul Vacacions per veure aquesta pàgina. -NotConfigModCP=Heu de configurar el mòdul Vacacions per veure aquesta pàgina. per configurar, feu clic aquí. -NoCPforUser=No té peticions de vacances. -AddCP=Crear petició de vacances +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Empleat DateDebCP=Data inici DateFinCP=Data fi @@ -18,24 +18,24 @@ ApprovedCP=Aprovada CancelCP=Anul·lada RefuseCP=Rebutjada ValidatorCP=Validador -ListeCP=Llista de vacances +ListeCP=List of leaves ReviewedByCP=Serà revisada per DescCP=Descripció -SendRequestCP=Enviar la petició de vacances -DelayToRequestCP=Les peticions de vacances s'han de fer almenys %s dies abans. -MenuConfCP=Definir les vacances -UpdateAllCP=Actualitzar les vacances -SoldeCPUser=El seu saldo de vacances és de %s dies. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Ha d'indicar una data de fi superior a la data d'inici. ErrorSQLCreateCP=S'ha produït un error de SQL durant la creació: -ErrorIDFicheCP=S'ha produït un error, aquesta sol·licitud de vacances no existeix. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Tornar a la pàgina anterior -ErrorUserViewCP=No està autoritzat a llegir aquesta petició de vacances. -InfosCP=Informació de la petició de vacances +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Informació del workflow RequestByCP=Comandada per -TitreRequestCP=Fitxa vacances -NbUseDaysCP=Nombre de dies de vacances consumits +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Modificar DeleteCP=Eliminar ActionValidCP=Validar @@ -43,26 +43,26 @@ ActionRefuseCP=Rebutjar ActionCancelCP=Anul·lar StatutCP=Estat SendToValidationCP=Enviar validació -TitleDeleteCP=Eliminar la petició de vacances -ConfirmDeleteCP=Està segur de voler eliminar aquesta petició de vacances? -ErrorCantDeleteCP=Error, no té vacances per eliminar aquesta petició de vacances. -CantCreateCP=No té vacances per realitzar peticions de vacances. -InvalidValidatorCP=Ha d'indicar un validador per a la seva petició de vacances. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Actualitzar -CantUpdate=No pot actualitzar aquesta petició de vacances. +CantUpdate=You cannot update this leave request. NoDateDebut=Ha d'indicar una data d'inici. NoDateFin=Ha d'indicar una data de fi. ErrorDureeCP=La seva petició de vacances no conté cap dia hàbil. TitleValidCP=Validar la petició de vacances -ConfirmValidCP=Esteu segur de voler validar aquesta petició de vacances? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data de validació -TitleToValidCP=Enviar la petició de vacances -ConfirmToValidCP=Esteu segur de voler enviar la petició de vacances? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Rebutjar la petició de vacances -ConfirmRefuseCP=Esteu segur de voler rebutjar la petició de vacances? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Ha de seleccionar un motiu per rebutjar aquesta petició. TitleCancelCP=Anul·lar la petició de vacances -ConfirmCancelCP=Esteu segur de voler anul·lar la petició de vacances? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motiu del rebuig DateRefusCP=Data del rebuig DateCancelCP=Data de l'anul·lació @@ -72,8 +72,8 @@ MotifCP=Motiu UserCP=Usuari ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional. AddEventToUserOkCP=S'ha afegit el permís excepcional. -MenuLogCP=Veure els logs de vacances -LogCP=Logs d'actualitzacions de vacances +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Realitzat per UserUpdateCP=Per a l'usuari PrevSoldeCP=Saldo anterior @@ -81,33 +81,33 @@ NewSoldeCP=Nou saldo alreadyCPexist=Ja s'ha efectuat una petició de vacances per a aquest període. UserName=Nom Cognoms Employee=Empleat -FirstDayOfHoliday=Primer dia lliure -LastDayOfHoliday=Últim dí lliure +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Actualització mensual ManualUpdate=Actualització manual -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuració del mòdul Vacacions DescOptionCP=Descripció de l'opció ValueOptionCP=Valor -GroupToValidateCP=Grup amb possibilitat d'aprovar les vacances +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validar la configuració -LastUpdateCP=Darrera actualització automàtica de vacances +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Actualització efectuada correctament. ErrorUpdateConfCP=S'ha produït un error durant l'actualització, torne a provar. AddCPforUsers=Afegiu els saldos de vacances dels usuaris fent clic aquí. DelayForSubmitCP=Antelació mínima per sol·licitar vacances AlertapprobatortorDelayCP=Advertir al validador si la petició no correspon a la data límit -AlertValidatorDelayCP=Advertir a l'usuari validador si la petició no respecta el límit previst -AlertValidorSoldeCP=Advertir a l'usuari validador si l'usuari demana vacances superiors al seu saldo -nbUserCP=Nombre d'usuaris presos en compte en el mòdul vacances -nbHolidayDeductedCP=Nombre de dies retribuïts a deduir per dia de vacances -nbHolidayEveryMonthCP=Nombre de vacances afegides per mes -Module27130Name= Gestió de les vacances -Module27130Desc= Gestió de dies lliures -TitleOptionMainCP=Ajustaments principals de vacances -TitleOptionEventCP=Ajustaments de vacances enllaçats a esdeveniments +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validar UpdateEventCP=Actualitzar els esdeveniments CreateEventCP=Crear @@ -127,23 +127,23 @@ UpdateEventOptionCP=Actualitzar ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic: NoCPforMonth=Sense vacances aquest mes. nbJours=Número de dies -TitleAdminCP=Configuració de les vacances +TitleAdminCP=Configuration of Leaves #Messages Hello=Hola -HolidaysToValidate=Dies retribuïts a validar -HolidaysToValidateBody=A continuació trobareu una sol·licitud de dies retribuïts per validar -HolidaysToValidateDelay=Aquesta sol·licitud de dies retribuïts tindrà lloc en un termini de menys de %s dies. -HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies retribuïts no disposa de suficients dies disponibles. -HolidaysValidated=Dies retribuïts validats -HolidaysValidatedBody=La seva sol·licitud de dies retribuïts des de %s al %s ha estat validada. -HolidaysRefused=Dies retribuïts denegats -HolidaysRefusedBody=La seva sol·licitud de dies retribuïts des de %s al %s ha estat denegada pel següent motiu: -HolidaysCanceled=Dies retribuïts cancel·lats -HolidaysCanceledBody=La seva sol·licitud de dies retribuïts des de %s al %s ha estat cancel·lada. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Consultar l'historial de modificacions de permisos retribuïts -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang index 1a3046552be..2e5093731d3 100644 --- a/htdocs/langs/ca_ES/interventions.lang +++ b/htdocs/langs/ca_ES/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Nom i signatura del participant: NameAndSignatureOfExternalContact=Nom i signatura del client: DocumentModelStandard=Document model estàndard per a intervencions InterventionCardsAndInterventionLines=Fitxes i línies d'intervenció -ClassifyBilled=Classificar "Facturado" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Facturado RelatedInterventions=Intervencions adjuntes ShowIntervention=Mostrar intervenció +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguiment de la intervenció TypeContact_fichinter_internal_INTERVENING=Interventor diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index 8f2250a7b9e..8caccc50f04 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Esdeveniments del projecte YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat DeleteATimeSpent=Eliminació de temps dedicat ConfirmDeleteATimeSpent=Esteu segur de voler eliminar aquest temps dedicat? -DoNotShowMyTasksOnly=Veure també les tasques que no m'afecten -ShowMyTasksOnly=Només veure les tasques que m'afecten +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Recursos afectats ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer NoTasks=Cap tasca per a aquest projecte LinkedToAnotherCompany=Enllaçat a una altra empresa -TaskIsNotAffectedToYou=Tasca que no l'afecta +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=No s'ha establert el temps consumit ThisWillAlsoRemoveTasks=Aquesta operació també destruirà les tasques del projecte (%s tasques) i els seus temps dedicats. IfNeedToUseOhterObjectKeepEmpty=Si els elements (factura, comanda, ...) pertanyen a un tercer que no és el seleccionat, havent aquests estar lligats al projecte a crear, deixeu buit per permetre el projecte a multi-tercers. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Model d'informe de projecte complet (logo...) PlannedWorkload = Càrrega de treball prevista @@ -128,3 +129,4 @@ ProjectReferers=Objectes vinculats SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang index fd2af377b9a..ea18a7d79ba 100644 --- a/htdocs/langs/ca_ES/sendings.lang +++ b/htdocs/langs/ca_ES/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Estadístiques realitzades únicament sobre les ex DateDeliveryPlanned=Data prevista de lliurament DateReceived=Data real de recepció SendShippingByEMail=Enviament d'expedició per e-mail -SendShippingRef=Enviament d'expedició %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Events sobre l'expedició LinkToTrackYourPackage=Enllaç per al seguiment del seu paquet ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es realitza des de la fitxa de comanda. @@ -66,11 +66,13 @@ CarrierList=Llistat de transportistes SendingMethodCATCH=Recollit pel client SendingMethodTRANS=Transportista SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Model simple nota de lliurament DocumentModelTyphon=Model complet de nota de lliurament (logo...) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER no definida SumOfProductVolumes=Suma del volum dels productes SumOfProductWeights=Suma del pes dels productes + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang index e9eab88efbc..6dbf65d95c1 100644 --- a/htdocs/langs/ca_ES/suppliers.lang +++ b/htdocs/langs/ca_ES/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Data comanda BuyingPrice=Preu de compra BuyingPriceMin=Preu mínim de compra BuyingPriceMinShort=Preu mín compra -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Afegir preu de proveïdor ChangeSupplierPrice=Canviar preu de proveïdor ErrorQtyTooLowForThisSupplier=Quantitat insuficient per aquest proveïdor @@ -40,3 +40,5 @@ AddSupplierInvoice=Crear factura de proveïdor ListOfSupplierProductForSupplier=Llistat de productes i preus del proveïdor %s NoneOrBatchFileNeverRan=Cap o lot %s no s'ha executat recentment SentToSuppliers=Enviat a proveïdors +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/cs_CZ/accountancy.lang +++ b/htdocs/langs/cs_CZ/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index 1f0e2230599..01023c4e186 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verze %s ErrorDecimalLargerThanAreForbidden=Chyba, přesnost vyšší než %s není podporována. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Hodnota "system" a "systemauto" je vyhrazena. Můžete použít "user" k pŕidání vlastního záznamu ErrorCodeCantContainZero=Kód nemůže obsahovat hodnotu 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatická, pokud je zakázána Javascript AvailableOnlyIfJavascriptNotDisabled=Dostupné pouze v případě, že není zakázán JavaScript AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupné pouze v případě, že není zakázán JavaScript Required=Potřebný +UsedOnlyWithTypeOption=Used by some agenda option only Security=Zabezpečení Passwords=Hesla DoNotStoreClearPassword=Ukládat hesla v databázi pouze šifrovaně (Doporučeno) diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang index 38de0993a9d..7aa4baf3384 100644 --- a/htdocs/langs/cs_CZ/agenda.lang +++ b/htdocs/langs/cs_CZ/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID události Actions=Události ActionsArea=Akce plocha (Akce a úkoly) -Agenda= Pořad jednání -Agendas= Pořad -Calendar= Kalendář -Calendars= Kalendáře -LocalAgenda=Místní kalendář +Agenda=Pořad jednání +Agendas=Pořad +Calendar=Kalendář +Calendars=Kalendáře +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Přiřazeno DoneBy=Provedl Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Všechny neúplné události MenuDoneActions=Všechny ukončené akce MenuToDoMyActions=Moje neúplné události MenuDoneMyActions=Moje ukončených akcí -ListOfEvents=Seznam událostí Dolibarr +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Akce hlášeny ActionsToDoBy=Akce přiřazené ActionsDoneBy=Akce provedené @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL pro přístup. Soubor iCal ExtSiteNoLabel=Ne Popis WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang index 5f5d76b3f7a..4155db3b1be 100644 --- a/htdocs/langs/cs_CZ/categories.lang +++ b/htdocs/langs/cs_CZ/categories.lang @@ -66,7 +66,7 @@ ReturnInCompany=Zpět na zákazníka / Vyhlídka karty ContentsVisibleByAll=Obsah bude vidět všichni ContentsVisibleByAllShort=Obsah viditelné všemi ContentsNotVisibleByAllShort=Obsah není vidět všichni -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Odstranit kategorii ConfirmDeleteCategory=Jste si jisti, že chcete smazat tuto kategorii? RemoveFromCategory=Odstraňte spojení s kategoriích @@ -105,9 +105,10 @@ CatProdLinks=Vazby mezi produktů / služeb a kategorií CatCusLinks=Vazby mezi zákazníky / vyhlídky a kategorií CatSupLinks=Vazby mezi dodavateli a kategorií DeleteFromCat=Odebrat z kategorie -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Nastavení kategorií +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang index a67bf6c78c7..4508bdde30d 100644 --- a/htdocs/langs/cs_CZ/companies.lang +++ b/htdocs/langs/cs_CZ/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Pro přidání e-mailových notifikací musíte přida ListSuppliersShort=Seznam dodavatelů ListProspectsShort=Seznam cílů ListCustomersShort=Seznam zákazníků -ThirdPartiesArea=Oblast třetích stran +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Posledních %s editovaných třetích stran UniqueThirdParties=Celkem unikátních třetích stran InActivity=Otevřeno @@ -410,3 +410,5 @@ OutstandingBillReached=Dosaženo max. pro nezaplacený účet MonkeyNumRefModelDesc=Vrátí číslo ve formátu %syymm-nnnn pro kód zákazníka a %syymm-nnnn pro ód dodavatele kde yy je rok, mm měsíc a nnnn je číselná řada bez přerušení a bez návratu k 0. LeopardNumRefModelDesc=Kód je zdarma. Tento kód lze kdykoli změnit. ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang index 2a350c29f16..f2852d94d5c 100644 --- a/htdocs/langs/cs_CZ/compta.lang +++ b/htdocs/langs/cs_CZ/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Účetnictví shrnutí ByProductsAndServices=Výrobky a službami RefExt=Externí ref ToCreateAPredefinedInvoice=Chcete-li vytvořit předem definovaný fakturu, vytvořte standardní fakturu a pak, aniž by ji potvrdíte, klikněte na tlačítko "Převést do předem faktura". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Přepočítat Mode1=Method 1 Mode2=Metoda 2 @@ -202,5 +202,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Účetnictví standardní kód pro zákaznické thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Účetnictví standardní kód pro dodavatele thirdparties +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang index 9bbc6d9b503..98d0c964310 100644 --- a/htdocs/langs/cs_CZ/donations.lang +++ b/htdocs/langs/cs_CZ/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Hledat daru DonationRecipient=Darování příjemce ThankYou=Děkuji IConfirmDonationReception=Příjemce deklarovat příjem, jako dar, následující částky +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang index 34e8162ae2a..54a9f2bcc25 100644 --- a/htdocs/langs/cs_CZ/errors.lang +++ b/htdocs/langs/cs_CZ/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Chyba, musí mít PHP modul %s nainstalovat tuto funkc ErrorOpenIDSetupNotComplete=Můžete nastavení Dolibarr konfigurační soubor, aby OpenID ověřování, ale URL OpenID služby není definován do stálých %s ErrorWarehouseMustDiffers=Zdrojové a cílové sklady musí se liší ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Upozornění Při použití tohoto políčka zpomali WarningClickToDialUserSetupNotComplete=Nastavení ClickToDial informací pro uživatele si nejsou kompletní (viz tab ClickToDial na vaše uživatelské karty). WarningNotRelevant=Nerozhoduje provoz v našem souboru WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang index d7436e783d7..7653b95e044 100644 --- a/htdocs/langs/cs_CZ/holiday.lang +++ b/htdocs/langs/cs_CZ/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Prázdniny -CPTitreMenu=Prázdniny +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Měsíční výkaz -MenuAddCP=Použít pro dovolenou -NotActiveModCP=Musíte umožnit modul svátky zobrazení této stránky. -NotConfigModCP=Musíte nakonfigurovat modul dovolenou k zobrazení této stránky. Chcete-li to provést, klikněte sem . -NoCPforUser=Nemáte poptávku na dovolenou. -AddCP=Použít pro dovolenou +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Zaměstnanec DateDebCP=Datum zahájení DateFinCP=Datum ukončení @@ -18,24 +18,24 @@ ApprovedCP=Schválený CancelCP=Zrušený RefuseCP=Odmítl ValidatorCP=Approbator -ListeCP=Seznam svátků +ListeCP=List of leaves ReviewedByCP=Bude přezkoumána DescCP=Popis -SendRequestCP=Vytvoření poptávky po prázdninách -DelayToRequestCP=Žádosti o dovolenou musí být podána alespoň den %s (y) před nimi. -MenuConfCP=Upravit rovnováhu dovolenou -UpdateAllCP=Aktualizujte dovolenou -SoldeCPUser=Dovolená rovnováha je %s dní. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Musíte vybrat koncové datum je větší než datum zahájení. ErrorSQLCreateCP=SQL chyba při tvorbě: -ErrorIDFicheCP=Došlo k chybě, žádost o dovolenou neexistuje. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Zpět na předchozí stránku -ErrorUserViewCP=Nejste oprávněn číst toto žádosti o dovolenou. -InfosCP=Informace o poptávce po prázdninách +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Informace Workflow RequestByCP=Žádost -TitreRequestCP=List dovolenou -NbUseDaysCP=Počet dní dovolené spotřebovaných +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Upravit DeleteCP=Vymazat ActionValidCP=Potvrdit @@ -43,26 +43,26 @@ ActionRefuseCP=Odmítnout ActionCancelCP=Zrušit StatutCP=Postavení SendToValidationCP=Poslat na potvrzení -TitleDeleteCP=Odstranit žádost dovolenou -ConfirmDeleteCP=Potvrďte odstranění této žádosti o dovolenou? -ErrorCantDeleteCP=Chyba nemáte právo smazat tuto dovolenou žádosti. -CantCreateCP=Nemáte právo požádat o dovolenou. -InvalidValidatorCP=Musíte vybrat approbator na dovolenou vyžádání. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Aktualizovat -CantUpdate=Nelze aktualizovat tento požadavek svátků. +CantUpdate=You cannot update this leave request. NoDateDebut=Musíte vybrat počáteční datum. NoDateFin=Musíte vybrat datum ukončení. ErrorDureeCP=Vaše žádost o dovolenou neobsahuje pracovní den. TitleValidCP=Žádost odsouhlasí dovolenou -ConfirmValidCP=Jste si jisti, že chcete schválit žádost o dovolenou? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Datum schválení -TitleToValidCP=Odeslat žádost o dovolenou -ConfirmToValidCP=Jste si jisti, že chcete odeslat požadavek na dovolenou? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Žádost odmítnout dovolenou -ConfirmRefuseCP=Jste si jisti, že chcete odmítnout žádost o prázdninách? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Musíte si vybrat důvod pro odmítnutí žádosti. TitleCancelCP=Zrušit požadavek dovolenou -ConfirmCancelCP=Jste si jisti, že chcete zrušit požadavek na dovolenou? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Důvod odmítnutí DateRefusCP=Datum odmítnutí DateCancelCP=Datum zrušení @@ -72,8 +72,8 @@ MotifCP=Důvod UserCP=Uživatel ErrorAddEventToUserCP=Došlo k chybě při přidávání výjimečnou dovolenou. AddEventToUserOkCP=Přidání mimořádné dovolené byla dokončena. -MenuLogCP=Zobrazit protokoly dovolenou -LogCP=Přihlaste o změnách dovolených +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Účinkují UserUpdateCP=Pro uživatele PrevSoldeCP=Předchozí Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=Žádost o dovolenou již bylo provedeno na toto období. UserName=Název Employee=Zaměstnanec -FirstDayOfHoliday=První den dovolené -LastDayOfHoliday=Poslední den dovolené +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Měsíční aktualizace ManualUpdate=Ruční aktualizace -HolidaysCancelation=Dovolená storno +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Konfigurace modulu dovolenou DescOptionCP=Popis možnosti ValueOptionCP=Hodnota -GroupToValidateCP=Skupina s možností schválit dovolenou +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Ověření konfigurace -LastUpdateCP=Poslední aktualizace automaticky prázdnin +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Aktualizováno úspěšně. ErrorUpdateConfCP=Došlo k chybě při aktualizaci, zkuste to prosím znovu. AddCPforUsers=Prosím, přidejte rovnováhu prázdnin uživatelům kliknutím zde . DelayForSubmitCP=Uzávěrka žádat o dovolenou AlertapprobatortorDelayCP=Zabraňte approbator pokud svátek žádost neodpovídá lhůtu -AlertValidatorDelayCP=Préevent na approbator Pokud požadavek přesahuje dovolenou zpoždění -AlertValidorSoldeCP=Zabraňte approbator pokud svátek požadavek přesahuje zůstatek -nbUserCP=Počet uživatelů podporovány v modulu dovolenou -nbHolidayDeductedCP=Počet svátků se odečtou za každý den dovolené přijatých -nbHolidayEveryMonthCP=Počet dovolenou přidávány každý měsíc -Module27130Name= Řízení dovolenou -Module27130Desc= Řízení dovolenou -TitleOptionMainCP=Základní nastavení dovolenou -TitleOptionEventCP=Nastavení dovolené týkající se událostí +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Potvrdit UpdateEventCP=Aktualizace akce CreateEventCP=Vytvořit @@ -127,23 +127,23 @@ UpdateEventOptionCP=Aktualizovat ErrorMailNotSend=Došlo k chybě při odesílání e-mail: NoCPforMonth=Ne opustit tento měsíc. nbJours=Počet dní -TitleAdminCP=Konfigurace svátky +TitleAdminCP=Configuration of Leaves #Messages Hello=Ahoj -HolidaysToValidate=Ověřit dovolenou -HolidaysToValidateBody=Níže je žádost o dovolenou pro potvrzování -HolidaysToValidateDelay=Tato žádost o prázdninách se uskuteční ve lhůtě kratší než %s dní. -HolidaysToValidateAlertSolde=Uživatel, který z tohoto požadavku pro dovolenou nemají k dispozici dostatek dny. -HolidaysValidated=Ověřené prázdniny -HolidaysValidatedBody=Vaše žádost o dovolenou pro %s na %s byl ověřen. -HolidaysRefused=Odepření prázdniny -HolidaysRefusedBody=Vaše žádost o dovolenou pro %s na %s byl zamítnut z těchto důvodů: -HolidaysCanceled=Zrušené svátky -HolidaysCanceledBody=Vaše žádost o dovolenou pro %s na %s byla zrušena. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Recenze protokol modifikovaných dovolenou -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang index b0f456f41a2..46be1b48283 100644 --- a/htdocs/langs/cs_CZ/interventions.lang +++ b/htdocs/langs/cs_CZ/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Jméno a podpis intervence: NameAndSignatureOfExternalContact=Jméno a podpis objednavatele: DocumentModelStandard=Standardní dokument model pro zásahy InterventionCardsAndInterventionLines=Intervence a linky intervencí -ClassifyBilled=Klasifikovat "účtovaný" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Účtováno RelatedInterventions=Související zákroky ShowIntervention=Zobrazit zásah +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Zástupce následující-up zásah TypeContact_fichinter_internal_INTERVENING=Zásah diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang index f6e259da1b3..52d88d6a4dd 100644 --- a/htdocs/langs/cs_CZ/projects.lang +++ b/htdocs/langs/cs_CZ/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Události na projektu YouAreNotContactOfProject=Nejste kontakt tohoto privátního projektu DeleteATimeSpent=Odstranit strávený čas ConfirmDeleteATimeSpent=Jste si jisti, že chcete smazat tento strávený čas? -DoNotShowMyTasksOnly=Viz také úkoly nepřidělené mně -ShowMyTasksOnly=Zobrazit pouze úkoly přidělené mně +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Zdroje ProjectsDedicatedToThisThirdParty=Projekty této třetí strany NoTasks=Žádné úkoly na tomto projektu LinkedToAnotherCompany=Připojené k jiné třetí straně -TaskIsNotAffectedToYou=Úkol není přidělený Vám +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Čas strávený je prázdný ThisWillAlsoRemoveTasks=Tato akce rovněž odstraní všechny úkoly projektu (%s úkolů v tuto chvíli) a všechny strávené časy vstupující do projektu. IfNeedToUseOhterObjectKeepEmpty=Pokud je k projektu třeba připojit některé objekty jiných třetích stran (faktury, objednávky, ...), ponechte toto prázdné (projekt bude moci obsahovat více třetích stran) @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Přispěvatel TypeContact_project_task_external_TASKCONTRIBUTOR=Přispěvatel SelectElement=Vyberte prvek AddElement=Odkaz na prvek +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Kompletní projektový report (logo. ..) PlannedWorkload = Plánované vytížení @@ -128,3 +129,4 @@ ProjectReferers=Odkazující objekty SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang index 1b2234fa761..b6ce531c846 100644 --- a/htdocs/langs/cs_CZ/sendings.lang +++ b/htdocs/langs/cs_CZ/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistiky provedena na zásilky pouze ověřenýc DateDeliveryPlanned=Čelní termín dodání DateReceived=Datum doručení obdržel SendShippingByEMail=Poslat zásilku EMail -SendShippingRef=Poslat zásilek %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Události na zásilky LinkToTrackYourPackage=Odkaz pro sledování balíku ShipmentCreationIsDoneFromOrder=Pro tuto chvíli, je vytvoření nové zásilky provést z objednávky karty. @@ -66,11 +66,13 @@ CarrierList=Seznam dopravců SendingMethodCATCH=Chytit zákazníka SendingMethodTRANS=Přepravce SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Jednoduchý model pro dokument o doručení DocumentModelTyphon=Více Celý dokument model pro potvrzení o doručení (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstantní EXPEDITION_ADDON_NUMBER není definováno SumOfProductVolumes=Součet objemů produktů SumOfProductWeights=Součet hmotností produktů + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang index e55a755ea91..1035bf97a0c 100644 --- a/htdocs/langs/cs_CZ/suppliers.lang +++ b/htdocs/langs/cs_CZ/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Objednat Datum BuyingPrice=Nákup cenu BuyingPriceMin=Minimální kupní cena BuyingPriceMinShort=Minimální kupní cena -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Přidat cena dodavatele zboží ChangeSupplierPrice=Změna dodavatele cenu ErrorQtyTooLowForThisSupplier=Nedostatečné množství tohoto podniku, nebo není definována cena k tomuto produktu tohoto podniku @@ -40,3 +40,5 @@ AddSupplierInvoice=Vytvořte dodavatelské faktury ListOfSupplierProductForSupplier=Seznam výrobků a cen dodavatelských %s NoneOrBatchFileNeverRan=Žádný nebo dávkový %s ne běžel nedávno SentToSuppliers=Odeslané dodavatelům +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang index f103efef589..337a0eb1773 100644 --- a/htdocs/langs/da_DK/accountancy.lang +++ b/htdocs/langs/da_DK/accountancy.lang @@ -1,32 +1,32 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting -Globalparameters=Global parameters -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years -Menuaccount=Accounting accounts -Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +Accounting=Regnskab +Globalparameters=Globale parametre +Chartofaccounts=Kontoplan +Fiscalyear=Finansår +Menuaccount=Regnskabskonti +Menuthirdpartyaccount=Trediepartskonti +MenuTools=Værktøjer -ConfigAccountingExpert=Configuration of the module accounting expert -Journaux=Journals -JournalFinancial=Financial journals -Exports=Exports -Modelcsv=Model of export -Selectmodelcsv=Select a model of export -Modelcsv_normal=Classic export -Modelcsv_CEGID=Export towards CEGID Expert -BackToChartofaccounts=Return chart of accounts -Back=Return +ConfigAccountingExpert=Konfiguration af ekspert Regnskabsmodulet +Journaux=Journaler +JournalFinancial=Finans journal +Exports=Eksporter +Modelcsv=Eksportmodul +Selectmodelcsv=Vælg en eksportmodel +Modelcsv_normal=Klassisk eksport +Modelcsv_CEGID=Eksporter med CEGID ekspert +BackToChartofaccounts=Returner kontoplan +Back=Returner -Definechartofaccounts=Define a chart of accounts -Selectchartofaccounts=Select a chart of accounts -Validate=Validate -Addanaccount=Add an accounting account -AccountAccounting=Accounting account +Definechartofaccounts=Definer en kontoplan +Selectchartofaccounts=Vælg en kontoplan +Validate=Godkend +Addanaccount=Tilføj en regnskabsmæssig konto +AccountAccounting=Regnskabsmæssig konto Ventilation=Ventilation -ToDispatch=To dispatch +ToDispatch=Afsend Dispatched=Dispatched CustomersVentilation=Ventilation customers @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 6480df62616..be8cb25b8bc 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Fejl, dette modul kræver Dolibarr version %s ErrorDecimalLargerThanAreForbidden=Fejl, en præcision højere end %s er ikke understøttet. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Kode kan ikke indeholde værdien 0 DisableJavascript=Deaktiver JavaScript og Ajax-funktioner (Anbefales til blinde personer eller tekstbrowsere) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatisk hvis Javascript er deaktiveret AvailableOnlyIfJavascriptNotDisabled=Kun tilgængelig, hvis JavaScript ikke er slået AvailableOnlyIfJavascriptAndAjaxNotDisabled=Kun tilgængelig, hvis JavaScript ikke er slået Required=Påkrævet +UsedOnlyWithTypeOption=Used by some agenda option only Security=Sikkerhed Passwords=Passwords DoNotStoreClearPassword=Må ikke gemme adgangskoder i klar i databasen diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang index 1106c1dc1dd..b6fda1fb5ee 100644 --- a/htdocs/langs/da_DK/agenda.lang +++ b/htdocs/langs/da_DK/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Aktioner ActionsArea=Aktioner område (Events og opgaver) -Agenda= Agenda -Agendas= Dagsordener -Calendar= Kalender -Calendars= Kalendere -LocalAgenda=Lokal kalender +Agenda=Agenda +Agendas=Dagsordener +Calendar=Kalender +Calendars=Kalendere +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Påvirkes i DoneBy=Gøres ved at Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Alle ufuldstændige tiltag MenuDoneActions=Alle henlagt aktioner MenuToDoMyActions=Min ufuldstændige aktioner MenuDoneMyActions=Min henlagt aktioner -ListOfEvents=Liste over Dolibarr begivenheder +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Handlinger registreres af ActionsToDoBy=Aktioner påvirkes i ActionsDoneBy=Aktioner udført af @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL for at få adgang. ICal fil ExtSiteNoLabel=Ingen beskrivelse WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang index ca9b5b710f9..2fc58208e0b 100644 --- a/htdocs/langs/da_DK/categories.lang +++ b/htdocs/langs/da_DK/categories.lang @@ -16,7 +16,7 @@ SuppliersCategoriesArea=Suppliers' kategorier område CustomersCategoriesArea=Kundernes kategorier område ThirdPartyCategoriesArea=Tredjeparters kategorier område MembersCategoriesArea=Medlemmer kategorier område -# ContactsCategoriesArea=Contacts categories area +ContactsCategoriesArea=Contacts categories area MainCats=Hovedkategorier SubCats=Underkategorier CatStatistics=Statistik @@ -50,15 +50,15 @@ SupplierIsInCategories=Tredjemand ejer til følgende leverandører kategorier CompanyIsInCustomersCategories=Denne tredjepart ejer til følgende kunder / udsigter kategorier CompanyIsInSuppliersCategories=Denne tredjepart ejer til følgende leverandører kategorier MemberIsInCategories=Dette medlem ejer til følgende medlemmer kategorier -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=This contact owns to following contacts categories ProductHasNoCategory=Dette produkt / service er ikke i alle kategorier SupplierHasNoCategory=Denne leverandør er ikke i alle kategorier CompanyHasNoCategory=Dette selskab er ikke i alle kategorier MemberHasNoCategory=Dette medlem er ikke på nogen kategorier -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=This contact is not in any categories ClassifyInCategory=Klassificering i kategori NoneCategory=Ingen -# NotCategorized=Without category +NotCategorized=Without category CategoryExistsAtSameLevel=Denne kategori allerede findes på samme sted ReturnInProduct=Tilbage til produkt / service kortet ReturnInSupplier=Tilbage til leverandøren kortet @@ -66,7 +66,7 @@ ReturnInCompany=Tilbage til kunde / udsigt kortet ContentsVisibleByAll=Indholdet vil være synlige fra alle ContentsVisibleByAllShort=Indhold synlige fra alle ContentsNotVisibleByAllShort=Indholdet ikke er synligt fra alle -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Slet kategori ConfirmDeleteCategory=Er du sikker på du vil slette denne kategori? RemoveFromCategory=Fjern link med Categorie @@ -81,12 +81,12 @@ CustomersCategoriesShort=Kunder kategorier CustomersProspectsCategoriesShort=Custo. / prosp. kategorier ProductsCategoriesShort=Produkter kategorier MembersCategoriesShort=Medlemmer kategorier -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contacts categories ThisCategoryHasNoProduct=Denne kategori indeholder ingen produkt. ThisCategoryHasNoSupplier=Denne kategori indeholder ingen leverandør. ThisCategoryHasNoCustomer=Denne kategori indeholder ingen kunde. ThisCategoryHasNoMember=Denne kategori indeholder ikke et medlem. -# ThisCategoryHasNoContact=This category does not contain any contact. +ThisCategoryHasNoContact=This category does not contain any contact. AssignedToCustomer=Henføres til en kunde AssignedToTheCustomer=Henføres til kundens InternalCategory=Inernal kategori @@ -96,18 +96,19 @@ CatSupList=Liste over leverandør kategorier CatCusList=Liste over kunde / udsigt kategorier CatProdList=Liste over produkter kategorier CatMemberList=Liste over medlemmer kategorier -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang index 91de76f8a6d..dcf77ba4f56 100644 --- a/htdocs/langs/da_DK/companies.lang +++ b/htdocs/langs/da_DK/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Du skal oprette e-mails kontakter til tredjepart fø d ListSuppliersShort=Liste over leverandører ListProspectsShort=Liste over emner ListCustomersShort=Liste over kunder -ThirdPartiesArea=Tredjeparter område +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Sidste %s ændret tredjeparter UniqueThirdParties=Samlet unikke tredjeparter InActivity=Åbent @@ -410,3 +410,5 @@ OutstandingBillReached=Maks. for udstående fakturaer er nået MonkeyNumRefModelDesc=Retur værdi med format %syymm-nnnn for kunde-kode og %syymm-nnnn for leverandøren kode hvor yy er årstal, MM er måneden og nnnn er en sekvens uden mellemrum og ikke vende tilbage til 0. LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til enhver tid ændres. ManagingDirectors=Leder(e) navne (CEO, direktør, chef...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang index 7664bec456d..6f13a305bb5 100644 --- a/htdocs/langs/da_DK/compta.lang +++ b/htdocs/langs/da_DK/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linket til ordre +LinkedOrder=Link to order ReCalculate=Genberegn Mode1=Metode 1 Mode2=Metode 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang index 29acfb9a95a..c56faabf697 100644 --- a/htdocs/langs/da_DK/donations.lang +++ b/htdocs/langs/da_DK/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Donation Donations=Donationer -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Donor Donors=Donorer AddDonation=Tilføj en donation NewDonation=Ny donation -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Gave løfte PromisesNotValid=Ikke valideret løfter PromisesValid=Valideret løfter @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Udkast DonationStatusPromiseValidatedShort=Valideret DonationStatusPaidShort=Modtaget ValidPromess=Validér løfte -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Build modtagelse DonationsModels=Dokumenter modeller for donation kvitteringer LastModifiedDonations=Sidste %s ændret donationer SearchADonation=Søg en donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang index 37617620953..ca87688e893 100644 --- a/htdocs/langs/da_DK/errors.lang +++ b/htdocs/langs/da_DK/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang index 8f49c732719..c0e60a8f9fa 100644 --- a/htdocs/langs/da_DK/holiday.lang +++ b/htdocs/langs/da_DK/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Startdato DateFinCP=Slutdato @@ -18,24 +18,24 @@ ApprovedCP=Godkendt CancelCP=Aflyst RefuseCP=Afviste ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Beskrivelse -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Redigér DeleteCP=Slet ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Annuller StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Opdatering -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Årsag UserCP=Bruger ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Navn Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Værdi -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Opret @@ -127,23 +127,23 @@ UpdateEventOptionCP=Opdatering ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang index 214ec2c4965..7c45fec1cd1 100644 --- a/htdocs/langs/da_DK/interventions.lang +++ b/htdocs/langs/da_DK/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Er du sikker på du vil slette denne intervention NameAndSignatureOfInternalContact=Navn og underskrift for at gribe ind: NameAndSignatureOfExternalContact=Navn og underskrift af kunde: DocumentModelStandard=Standard dokument model for indgreb -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Klassificere "Billed" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed RelatedInterventions=Relaterede interventioner ShowIntervention=Vis indgreb +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Repræsentant opfølgning intervention TypeContact_fichinter_internal_INTERVENING=Mellemliggende @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Generic antal model ArcticNumRefModelError=Det lykkedes ikke at aktivere PacificNumRefModelDesc1=Retur numero med format %syymm-nnnn hvor ÅÅ er årstal, MM er måneden og nnnn er en sekvens uden pause, og ikke vende tilbage til 0 PacificNumRefModelError=En intervention kortet begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang index b1f670c8196..1ce1b5f81bd 100644 --- a/htdocs/langs/da_DK/projects.lang +++ b/htdocs/langs/da_DK/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Initiativer på projektet YouAreNotContactOfProject=Du er ikke en kontakt af denne private projekt DeleteATimeSpent=Slet tid ConfirmDeleteATimeSpent=Er du sikker på du vil slette denne tid? -DoNotShowMyTasksOnly=Se også opgaver jeg er ikke påvirket -ShowMyTasksOnly=Vis kun opgaver jeg er påvirket +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projekter dedikeret til denne tredjepart NoTasks=Ingen opgaver for dette projekt LinkedToAnotherCompany=Knyttet til tredjemand -TaskIsNotAffectedToYou=Opgave ikke er allokeret til dig +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Tilbragte Tiden er tom ThisWillAlsoRemoveTasks=Denne handling vil også slette alle opgaver i projektet (%s opgaver i øjeblikket), og alle indgange af tid. IfNeedToUseOhterObjectKeepEmpty=Hvis nogle objekter (faktura, ordre, ...), der tilhører en anden tredjepart, skal knyttet til projektet for at skabe, holde denne tomme for at få projektet er flere tredjeparter. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=En komplet projekt rapport model (logo. ..) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang index 4d768428ab5..70c765930a2 100644 --- a/htdocs/langs/da_DK/sendings.lang +++ b/htdocs/langs/da_DK/sendings.lang @@ -13,7 +13,7 @@ LastSendings=Seneste %s sendings SearchASending=Søg en sendeorganisation StatisticsOfSendings=Statistik over sendings NbOfSendings=Antal sendings -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Afsendelse kortet NewSending=Ny afsendelse CreateASending=Opret en sendeorganisation @@ -50,27 +50,29 @@ Enlevement=Fået efter kunde DocumentModelSimple=Simpelt dokument model DocumentModelMerou=Merou A5 model WarningNoQtyLeftToSend=Advarsel, ikke produkter som venter på at blive afsendt. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Høvlet leveringsdato DateReceived=Dato levering modtaget SendShippingByEMail=Send forsendelse via e-mail -SendShippingRef=Send forsendelse %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Arrangementer på forsendelse LinkToTrackYourPackage=Link til at spore din pakke ShipmentCreationIsDoneFromOrder=For øjeblikket er skabelsen af ​​en ny forsendelse udført af ordrekortet. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Fangst af kunden SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Simpelt dokument model for levering kvitteringer DocumentModelTyphon=Mere komplet dokument model for levering kvitteringer (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke defineret -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang index 602e012124d..4bb65dd313c 100644 --- a/htdocs/langs/da_DK/suppliers.lang +++ b/htdocs/langs/da_DK/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Bestil dato BuyingPrice=Koebspris BuyingPriceMin=Min købskurs BuyingPriceMinShort=Min købskurs -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Tilføj leverandør pris ChangeSupplierPrice=Skifte leverandør pris ErrorQtyTooLowForThisSupplier=Mængde for lav for denne leverandør eller ingen pris defineret om dette produkt for denne leverandør @@ -27,7 +27,7 @@ RefSupplierShort=Ref. leverandør Availability=Tilgængelighed ExportDataset_fournisseur_1=Leverandør fakturaer listen og fakturaer 'linjer ExportDataset_fournisseur_2=Leverandør fakturaer og betalinger -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Godkende denne ordre ConfirmApproveThisOrder=Er du sikker på at du vil godkende denne ordre? DenyingThisOrder=Benægte denne ordre @@ -39,4 +39,6 @@ AddSupplierOrder=Opret leverandør for AddSupplierInvoice=Opret leverandørens faktura ListOfSupplierProductForSupplier=Liste over produkter og priser for leverandørens %s NoneOrBatchFileNeverRan=Ingen eller parti %s ikke kørte for nylig -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang index f7b40ac7301..5bd833c2273 100644 --- a/htdocs/langs/de_DE/accountancy.lang +++ b/htdocs/langs/de_DE/accountancy.lang @@ -6,7 +6,7 @@ Globalparameters=Globale Parameter Chartofaccounts=Kontenplan Fiscalyear=Fiskalische Jahre Menuaccount=Buchhaltung Konten -Menuthirdpartyaccount=Partner Konten +Menuthirdpartyaccount=Partnerkonten MenuTools=Werkzeuge ConfigAccountingExpert=Configuration of the module accounting expert @@ -27,7 +27,7 @@ Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu AccountAccounting=Buchhaltungs Konto Ventilation=Erörterung ToDispatch=Zu versenden -Dispatched=Versendet +Dispatched=Versandt CustomersVentilation=Ventilation customers SuppliersVentilation=Ventilation suppliers @@ -43,7 +43,7 @@ UpdateAccount=Modification of an accounting account UpdateMvts=Modification of a movement WriteBookKeeping=Record accounts in general ledger Bookkeeping=Hauptbuch -AccountBalanceByMonth=Account balance by month +AccountBalanceByMonth=Kontostand pro Monat AccountingVentilation=Accounting ventilation AccountingVentilationSupplier=Accounting ventilation supplier @@ -66,31 +66,31 @@ Lineofinvoice=Rechnungszeile VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Verkaufsjournal -ACCOUNTINGEX_PURCHASE_JOURNAL=Einkaufsjournal -ACCOUNTINGEX_BANK_JOURNAL=Bankauszug -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Dokumententyp Docdate=Datum diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 5ff8d011e79..d911c266502 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls erfordert Dolibarr Versi ErrorDecimalLargerThanAreForbidden=Fehler: Eine höhere Genauigkeit als %s wird nicht unterstützt. DictionarySetup=Wörterbucheinstellungen Dictionary=Wörterbücher +Chartofaccounts=Kontenplan +Fiscalyear=Fiskalische Jahre ErrorReservedTypeSystemSystemAuto=Die Werte 'system' und 'systemauto' für Typ sind reserviert. Sie können 'user' als Wert verwenden, um Ihren eigenen Datensatz hinzuzufügen ErrorCodeCantContainZero=Code darf keinen Wert 0 enthalten DisableJavascript=JavaScript- und Ajax-Funktionen deaktivieren (empfohlen für Blinde und Text-Browser) @@ -76,7 +78,7 @@ NextValue=Nächster Wert NextValueForInvoices=Nächster Wert (Rechnungen) NextValueForCreditNotes=Nächster Wert (Gutschriften) NextValueForDeposit=Nächster Wert (Scheck) -NextValueForReplacements=Next value (replacements) +NextValueForReplacements=Nächster Wert (Ersatz) MustBeLowerThanPHPLimit=Hinweis: Ihre PHP-Einstellungen beschränken die Größe für Dateiuploads auf %s%s NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Größenbeschränkungen hinterlegt MaxSizeForUploadedFiles=Maximale Größe für Dateiuploads (0 verbietet jegliche Uploads) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Bei deaktiviertem JavaScript automatisch AvailableOnlyIfJavascriptNotDisabled=Nur bei aktiviertem JavaScript verfügbar AvailableOnlyIfJavascriptAndAjaxNotDisabled=Nur bei aktiviertem JavaScript und AJAX verfügbar Required=Erforderlich +UsedOnlyWithTypeOption=Used by some agenda option only Security=Sicherheit Passwords=Passwörter DoNotStoreClearPassword=Passwörter in der Datenbank nicht im Klartext speichern (Empfohlene Einstellung) @@ -257,9 +260,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-Host (nicht in PHP definiert MAIN_MAIL_EMAIL_FROM=E-Mail-Absender für automatisch erzeugte Mails (standardmäßig in php.ini: %s) MAIN_MAIL_ERRORS_TO=E-Mail-Absender für rückkehrende fehlerhafte E-Mails MAIN_MAIL_AUTOCOPY_TO= Senden Sie automatisch eine Blindkopie aller gesendeten Mails an -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to -MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Senden Sie automatisch eine Blindkopie der verschickten Angebote an +MAIN_MAIL_AUTOCOPY_ORDER_TO= Senden Sie automatisch eine Blindkopie der verschickten Bestellungen an +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Senden Sie automatisch eine Blindkopie der gesendeten Rechnungen an MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen abschalten (für Test- oder Demozwecke) MAIN_MAIL_SENDMODE=Methode zum Senden von E-Mails MAIN_MAIL_SMTPS_ID=SMTP ID, wenn Authentifizierung erforderlich @@ -516,8 +519,8 @@ Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen Module6000Name=Workflow Module6000Desc=Workflow management Module20000Name=Ferien -Module20000Desc=Declare and follow employees holidays -Module39000Name=Product batch +Module20000Desc=Melden und beobachten sie den Urlaub Ihrer Angestellten. +Module39000Name=Produktstapel Module39000Desc=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten Module50000Name=PayBox Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen @@ -525,12 +528,12 @@ Module50100Name=Kasse Module50100Desc=Kassenmodul Module50200Name= Paypal Module50200Desc= Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlungen entgegennehmen -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50400Name=Buchhaltung (erweitert) +Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung) Module54000Name=PrintIPP Module54000Desc=Mit Cups IPP Drucker ausdrucken. Module55000Name=Open Poll -Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) +Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...) Module59000Name=Gewinnspannen Module59000Desc=Modul zur Verwaltung von Gewinnspannen Module60000Name=Kommissionen @@ -644,7 +647,7 @@ Permission223=E-Mail-Kampagnen freigeben (erlaubt das Senden) Permission229=E-Mail-Kampagnen löschen Permission237=Zeige Empfänger und Info Permission238=Mails manuell senden -Permission239=Delete mailings after validation or sent +Permission239=Postausgang löschen nachdem die Gültigkeit ausgelaufen ist oder die Nachricht gesendet wurde. Permission241=Kategorien einsehen Permission242=Kategorien erstellen/bearbeiten Permission243=Kategorien löschen @@ -792,15 +795,15 @@ VATIsNotUsedExampleFR=- LTRate=Rate LocalTax1IsUsed=Zweite Steuer nutzen LocalTax1IsNotUsed=Zweite Steuer nicht nutzen -LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) -LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax1IsUsedDesc=Benutzen sie eine zweite Art von Steuer (andere als Mehrwertsteuer) +LocalTax1IsNotUsedDesc=Benutzen sie keine andere Art von Steuer (anders als Mehrwertsteuer) LocalTax1Management=Zweite Steuer-Art LocalTax1IsUsedExample= LocalTax1IsNotUsedExample= LocalTax2IsUsed=Dritte Steuer nutzen LocalTax2IsNotUsed=Dritte Steuer nicht nutzen -LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) -LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax2IsUsedDesc=Benutzen Sie eine dritte Art von Steuer (anders als Mehrwertsteuer) +LocalTax2IsNotUsedDesc=Benutzen sie keine andere Art von Steuer (anders als Mehrwertsteuer) LocalTax2Management=Dritte Steuer-Art LocalTax2IsUsedExample= LocalTax2IsNotUsedExample= @@ -938,7 +941,7 @@ InfoWebServer=Infos Webserver InfoDatabase=Infos Datenbank InfoPHP=Infos PHP InfoPerf=Leistungs-Informationen -BrowserName=Browser name +BrowserName=Browser Name BrowserOS=Browser OS ListEvents=Liste aller protokollierten Ereignisse ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse @@ -1053,7 +1056,7 @@ AddRefInList=Display customer/supplier ref into list (select list or combobox) a FieldEdition=Edition of field %s FixTZ=Zeitzonen-Korrektur FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben) -GetBarCode=Get barcode +GetBarCode=Erhalten Sie einen Barcode EmptyNumRefModelDesc=Der Code ist frei. Dieser Code kann jederzeit geändert werden. ##### Module password generation PasswordGenerationStandard=Generiere ein Passwort nach dem internen Systemalgorithmus: 8 Zeichen, Zahlen und Kleinbuchstaben. @@ -1464,8 +1467,8 @@ Sell=Verkaufen InvoiceDateUsed=Rechnungsdatum verwendet YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine MwSt.-Verwendung definiert (Übersicht-Einstellungen-Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine MwSt.-Optionen zur Verfügung. AccountancyCode=Rechnungswesen-Code -AccountancyCodeSell=Sale account. code -AccountancyCodeBuy=Purchase account. code +AccountancyCodeSell=Verkaufskonto-Code +AccountancyCodeBuy=Einkaufskonto-Code ##### Agenda ##### AgendaSetup=Agenda-Moduleinstellungen PasswordTogetVCalExport=Passwort für den VCal-Export diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang index b26c8bac29f..e0a35fc2f40 100644 --- a/htdocs/langs/de_DE/agenda.lang +++ b/htdocs/langs/de_DE/agenda.lang @@ -1,43 +1,44 @@ # Dolibarr language file - Source file is en_US - agenda IdAgenda=ID Veranstaltung -Actions=Aktionen -ActionsArea=Bereich Maßnahmen (Veranstaltungen und Aufgaben) -Agenda= Agenda -Agendas= Tagesordnungen -Calendar= Kalender -Calendars= Kalender -LocalAgenda=Lokaler Kalender +Actions=Termine +ActionsArea=Bereich Termine (Veranstaltungen und Aufgaben) +Agenda=Terminplanung +Agendas=Tagesordnungen +Calendar=Kalender +Calendars=Kalender +LocalAgenda=Internetkalender +ActionsOwnedBy=Event owned by AffectedTo=Zugewiesen an DoneBy=Erldedigt von -Event=Event -Events=Veranstaltungen -EventsNb=Anzahl Veranstaltungen -MyEvents=Meine Veranstaltungen -OtherEvents=Weitere Veranstaltungen -ListOfActions=Veranstaltungsliste +Event=Aktion +Events=Termine +EventsNb=Anzahl der Termine +MyEvents=Meine Termine +OtherEvents=Weitere Termine +ListOfActions=Terminliste Location=Ort EventOnFullDay=Ganztägig SearchAnAction= Suche Maßnahme / Aufgabe -MenuToDoActions=Alle unvollständigen Maßnahmen -MenuDoneActions=Alle abgeschlossenen Maßnahmen -MenuToDoMyActions=Meine offenen Maßnahmen -MenuDoneMyActions=Meine abgeschlossenen Maßnahmen -ListOfEvents=Veranstaltungsliste -ActionsAskedBy=Maßnahmen erbeten von -ActionsToDoBy=Maßnahmen zugewiesen an -ActionsDoneBy=Maßnahmen erledigt von +MenuToDoActions=Alle unvollständigen Termine +MenuDoneActions=Alle abgeschlossenen Termine +MenuToDoMyActions=Meine offenen Termine +MenuDoneMyActions=Meine abgeschlossenen Termine +ListOfEvents=Liste der Termine (Internetkalender) +ActionsAskedBy=Termine eingetragen von +ActionsToDoBy=Termine zugewiesen an +ActionsDoneBy=Termine erledigt von ActionsForUser=Maßnahmen für Benutzer ActionsForUsersGroup=Maßnahmen für alle Benutzer der Gruppe -AllMyActions= Alle meine Maßnahmen / Aufgaben -AllActions= Alle Maßnahmen / Aufgaben +AllMyActions= Alle meine Termine/Aufgaben +AllActions= Alle Termine / Aufgaben ViewList=Listenansicht ViewCal=Kalenderansicht ViewDay=Tagesansicht ViewWeek=Wochenansicht -ViewPerUser=Per user view +ViewPerUser=Ansicht nach Benutzer ViewWithPredefinedFilters= Ansicht mit vordefinierten Filtern AutoActions= Automatische Befüllung der Tagesordnung -AgendaAutoActionDesc= Definieren Sie hier Maßnahmen zur automatischen Übernahme in die Agenda. Ist nichts aktviert (Standard), umfasst die Agenda nur manuell eingetragene Maßnahmen. +AgendaAutoActionDesc= Definieren Sie hier Termine zur automatischen Übernahme in den Terminkalender. Ist nichts aktviert (Standardmäßig), umfasst der Terminkalender nur manuell eingetragene Termine. AgendaSetupOtherDesc= Diese Seite ermöglicht die Konfiguration anderer Parameter des Tagesordnungsmoduls. AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren. ActionsEvents= Veranstaltungen zur automatischen Übernahme in die Agenda @@ -81,10 +82,12 @@ DefaultWorkingHours=Reguläre Arbeitszeit pro Tag (z.B. 9-18) # External Sites ical ExportCal=Export Kalender ExtSites=Importieren von externen Kalendern -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Zeige externe Kalender (im globalen Setup definiert) in der Agenda. Betrifft nicht benutzerdefinierte externe Kalender. ExtSitesNbOfAgenda=Anzahl der Kalender AgendaExtNb=Kalender Anzahl %s ExtSiteUrlAgenda=URL Adresse um .ical Datei zu erreichen ExtSiteNoLabel=Keine Beschreibung -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range +WorkingTimeRange=Arbeitszeit-Bereich +WorkingDaysRange=Arbeitstag-Bereich +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index 6f566b36e0f..9d3ce721124 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -290,10 +290,10 @@ DisabledBecauseReplacedInvoice=Aktion unzulässig, da die betreffende Rechnung e DescTaxAndDividendsArea=Dieser Bereich stellt eine Übersicht aller Zahlungen für sonstige Ausgaben dar. Nur Datensätze mit Zahlung im festgelegten Jahr sind enthalten. NbOfPayments=Zahl der Zahlungen SplitDiscount=Split Rabatt in zwei -ConfirmSplitDiscount=Sind Sie sicher, dass Sie teilen wollen diesen Rabatt von %s %s in 2 niedrigere Rabatte? +ConfirmSplitDiscount=Sind Sie sicher, dass Sie diesen Rabatt in Höhe von %s%s in 2 kleinere Rabatte teilen wollen? TypeAmountOfEachNewDiscount=Input für jeden der zwei Teile: TotalOfTwoDiscountMustEqualsOriginal=Insgesamt zwei neue Rabatt muss gleich zu den ursprünglichen Betrag Rabatt. -ConfirmRemoveDiscount=Sind Sie sicher, dass Sie möchten, entfernen Sie diesen Rabatt? +ConfirmRemoveDiscount=Sind Sie sicher, dass Sie diesen Rabatt entfernen möchten? RelatedBill=Ähnliche Rechnung RelatedBills=Ähnliche Rechnungen LatestRelatedBill=Letzte ähnliche Rechnung @@ -368,7 +368,7 @@ LawApplicationPart3=des Verkäufers bis zur vollständigen Bezahlung LawApplicationPart4=des Preises. LimitedLiabilityCompanyCapital=SARL mit einem Kapital von UseLine=Übernehmen -UseDiscount=Verwenden +UseDiscount=Rabatt verwenden UseCredit=Verwenden Sie diese Gutschrift UseCreditNoteInInvoicePayment=Reduzieren Sie die Zahlung mit dieser Gutschrift MenuChequeDeposits=Scheckeinlagen diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang index 4e57b242874..a42f68d2cc6 100644 --- a/htdocs/langs/de_DE/categories.lang +++ b/htdocs/langs/de_DE/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Ergänzende Attribute CategoriesSetup=Kategorien Setup CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang index 751e4dd4a0b..955f35f8118 100644 --- a/htdocs/langs/de_DE/commercial.lang +++ b/htdocs/langs/de_DE/commercial.lang @@ -23,7 +23,7 @@ TaskRDVWith=Treffen mit %s ShowTask=Zeige Aufgabe ShowAction=Zeige Maßnahme ActionsReport=Maßnahmenbericht -ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative +ThirdPartiesOfSaleRepresentative=Partner mit Vertriebsmitarbeiter SalesRepresentative=Vertriebsmitarbeiter SalesRepresentatives=Vertreter SalesRepresentativeFollowUp=Vertriebsmitarbeiter (Follow-up) @@ -44,8 +44,8 @@ DoneActions=Abgeschlossene Maßnahmen DoneActionsFor=Abgeschlossene Maßnahmen für %s ToDoActions=Unvollständige Maßnahmen ToDoActionsFor=Unvollständige Maßnahmen für %s -SendPropalRef=Unser Angebot %s -SendOrderRef=Sende Bestellung %s +SendPropalRef=Einreichung der Angebote %s +SendOrderRef=Einreichung der Bestellung %s StatusNotApplicable=Nicht anwendbar StatusActionToDo=Zu erledigen StatusActionDone=Abgeschlossen @@ -62,7 +62,7 @@ LastProspectContactDone=Kontaktaufnahme erledigt DateActionPlanned=Geplantes Erledigungsdatum DateActionDone=Echtes Erledigungsdatum ActionAskedBy=Maßnahme erbeten von -ActionAffectedTo=Maßnahme zugewiesen an +ActionAffectedTo=Maßnahme gehört ActionDoneBy=Maßnahme erledigt von ActionUserAsk=Aufgenommen durch ErrorStatusCantBeZeroIfStarted=Ist das Feld 'Echtes Erledigungsdatum' ausgefüllt, so wurde die Aktion bereits gestartet (oder beendet) und der 'Status' kann nicht 0%% sein. diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang index 9312970a60c..740a928cb51 100644 --- a/htdocs/langs/de_DE/companies.lang +++ b/htdocs/langs/de_DE/companies.lang @@ -91,8 +91,8 @@ LocalTax2IsUsedES= IRPF wird verwendet LocalTax2IsNotUsedES= IRPF wird nicht verwendet LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type +TypeLocaltax1ES=RE Typ +TypeLocaltax2ES=EKSt. Typ TypeES=Typ ThirdPartyEMail=%s WrongCustomerCode=Kunden-Code ungültig @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte für einen Partner an ListSuppliersShort=Liste der Lieferanten ListProspectsShort=Liste der Leads ListCustomersShort=Liste der Kunden -ThirdPartiesArea=Partnerübersicht +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Letzten 15 bearbeiteten Partner UniqueThirdParties=Gesamte Anzahl der Kontakte InActivity=Aktiv @@ -410,3 +410,5 @@ OutstandingBillReached=Maximum für ausstehende Rechnung erreicht MonkeyNumRefModelDesc=Zurück NUMERO mit Format %syymm-nnnn für den Kunden-Code und syymm%-nnnn für die Lieferanten-Code ist, wenn JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und kein Zurück mehr gibt, auf 0 gesetzt. LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden. ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index 4d19a00c89e..8ec57d4d0d9 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -20,7 +20,7 @@ AccountsGeneral=Konten Account=Konto Accounts=Konten Accountparent=Kontohalter -Accountsparent=Accounts parent +Accountsparent=Kontohalter BillsForSuppliers=Lieferantenrechnungen Income=Einnahmen Outcome=Ausgaben @@ -183,11 +183,11 @@ Pcg_type=Pcg type Pcg_subtype=Pcg subtype InvoiceLinesToDispatch=Invoice lines to dispatch InvoiceDispatched=Versandte Rechnungen -AccountancyDashboard=Accountancy summary +AccountancyDashboard=Rechnungswesen Zusammenfassung ByProductsAndServices=Nach Produkten und Services RefExt=Externe Referenz ToCreateAPredefinedInvoice=Um eine vordefinierte Rechnung zu erzeugen, erstellen Sie eine Standard-Rechnung und klicken dann ohne Freigabe auf "In vordefinierte Rechnung umwandeln". -LinkedOrder=verknüpft mit Bestellung +LinkedOrder=Link to order ReCalculate=Neuberechnung Mode1=Methode 1 Mode2=Methode 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Berechnungsmodus AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen -COMPTA_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen -COMPTA_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen -COMPTA_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen -COMPTA_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen -COMPTA_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang index 45670426545..bf615dfa70f 100644 --- a/htdocs/langs/de_DE/donations.lang +++ b/htdocs/langs/de_DE/donations.lang @@ -29,4 +29,5 @@ LastModifiedDonations=Letzten %s geänderten Spenden SearchADonation=Spende suchen DonationRecipient=Spenden Empfänger ThankYou=Danke -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang index 60ae84a7a05..c509a7ce090 100644 --- a/htdocs/langs/de_DE/errors.lang +++ b/htdocs/langs/de_DE/errors.lang @@ -133,7 +133,6 @@ ErrorPHPNeedModule=Fehler, Ihr PHP muss das Modul %s installiert haben um ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt, dass die Anmeldung mit OpenID möglich ist, aber die URL zum OpenID Service ist noch nicht in %s definiert. ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein ErrorBadFormat=Falsches Format! -ErrorPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) darf nicht vor Rechnungsdatum (%s) liegen für Rechnung %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen. ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich. ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden @@ -156,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtlic WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte). WarningNotRelevant=Operation für dieses Daten-Set nicht relevant WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang index 5384a3403ac..9253560a2af 100644 --- a/htdocs/langs/de_DE/holiday.lang +++ b/htdocs/langs/de_DE/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=Mitarbeiter -Holidays=Urlaub -CPTitreMenu=Urlaub +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monatsauszug -MenuAddCP=Urlaubsantrag -NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen. -NotConfigModCP=Sie müssen das Ferien-Modul konfigurieren um diese Seite zu sehen. Dazu klicken Sie hier . -NoCPforUser=Sie haben keinen Anspruch auf Urlaub -AddCP=Urlaubsantrag +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Mitarbeiter DateDebCP=Urlaubsbeginn DateFinCP=Urlaubsende @@ -18,24 +18,24 @@ ApprovedCP=Genehmigt CancelCP=Zurückgezogen RefuseCP=Abgelehnt ValidatorCP=genehmigt durch -ListeCP=Urlaubsliste +ListeCP=List of leaves ReviewedByCP=Wird geprüft von DescCP=Beschreibung -SendRequestCP=Urlaubsantrag erstellen -DelayToRequestCP=Urlaubsanträge müssen mindestens %s Tage im voraus gestellt werden. -MenuConfCP=Bearbeiten Sie die Urlaubsliste -UpdateAllCP=Urlaub aktualisieren -SoldeCPUser=Urlaubssaldo ist %s Tage. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Sie müssen ein End-Datum wählen, dass nach dem Start-Datum liegt. ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Eerstellung von: -ErrorIDFicheCP=Ein Fehler trat auf, der Antrag auf Ferien existiert nicht. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Zurück zur vorherigen Seite -ErrorUserViewCP=Sie sind nicht berechtigt diese Urlaubsanträge zu lesen. -InfosCP=Information über den Urlaubsantrag +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Beantragt von -TitreRequestCP=Urlaubstabelle -NbUseDaysCP=Anzahl Ferientage bezogen +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Bearbeiten DeleteCP=Lösche Gruppe ActionValidCP=Freigeben @@ -43,26 +43,26 @@ ActionRefuseCP=Ablehnen ActionCancelCP=Abbrechen StatutCP=Status SendToValidationCP=Zur Überprüfung senden -TitleDeleteCP=Antrag auf Ferien löschen -ConfirmDeleteCP=Löschung dieses Ferienantrags bestätigen? -ErrorCantDeleteCP=Fehler, Sie haben nicht die Berechtigung diesen Ferien-Antrag zu löschen. -CantCreateCP=Sie haben nicht die Berechtigung Ferien zu beantragen. -InvalidValidatorCP=Sie müssen einen Vorgesetzten haben der Ihre Urlaubsanfrage genehmigt. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Aktualisieren -CantUpdate=Sie können diesen Urlaubsantrag nicht aktualisieren +CantUpdate=You cannot update this leave request. NoDateDebut=Sie müssen ein Startdatum wählen. NoDateFin=Sie müssen ein Enddatum wählen. ErrorDureeCP=Ihr Antrag auf Ferien enthält keine Werktage. TitleValidCP=Urlaubsantrag genehmigen -ConfirmValidCP=Möchten Sie diesen Ferienantrag wirklich genehmigen? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Datum genehmigt -TitleToValidCP=Ferienantrag senden -ConfirmToValidCP=Möchten Sie diesen Ferienantrag wirklich senden? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Ferienantrag ablehnen -ConfirmRefuseCP=Möchten Sie diesen Ferienantrag wirklich ablehnen? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Sie müssen einen Grund für die Ablehnung angeben. TitleCancelCP=Ferienantrag abbrechen -ConfirmCancelCP=Möchten Sie diesen Ferienantrag wirklich abbrechen? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Ablehnungsgrund DateRefusCP=Datum der Ablehnung DateCancelCP=Datum der Absage @@ -72,8 +72,8 @@ MotifCP=Grund UserCP=Benutzer ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=Urlaubsliste ansehen -LogCP=Liste von neuen Ferieneinträgen +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Ausgeführt von UserUpdateCP=Für den Benutzer PrevSoldeCP=Vorherige Übersicht @@ -81,33 +81,33 @@ NewSoldeCP=Neue Übersicht alreadyCPexist=Ein Ferienantrag wurde für diese Periode bereits erstellt. UserName=Nachname Employee=Angestellter -FirstDayOfHoliday=Erster Ferientag -LastDayOfHoliday=Letzter Ferientag +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monatliches Update ManualUpdate=Manuelles Update -HolidaysCancelation=Urlaubsstornierung +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Konfiguration des Ferienmoduls DescOptionCP=Beschreibung der Wahlmöglichkeit ValueOptionCP=Warenwert -GroupToValidateCP=Gruppe mit der Fähigkeit Ferien zu bewilligen +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Konfiguration bestätigen -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Erfolgreich bearbeitet. ErrorUpdateConfCP=Ein Fehler trat beim Bearbeiten auf, bitte nochmals versuchen. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Letzter Termin für Ferienanträge AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Anzahl unterstützte Benutzer im Ferienmodul -nbHolidayDeductedCP=Anzahl Urlaubstage, die für jeden genommenem Ferientag abgezogen werden -nbHolidayEveryMonthCP=Anzahl hinzugefügter Ferientage pro Monat -Module27130Name= Verwaltung der Ferien -Module27130Desc= Verwaltung der Ferien -TitleOptionMainCP=Wichtigste Ferien-Einstellungen -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Freigeben UpdateEventCP=Maßnahmen aktualisieren CreateEventCP=Erstelle @@ -127,23 +127,23 @@ UpdateEventOptionCP=Aktualisieren ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten: NoCPforMonth=Kein Urlaub diesen Monat nbJours=Anzahl der Tage -TitleAdminCP=Konfiguration der Ferien +TitleAdminCP=Configuration of Leaves #Messages Hello=Hallo -HolidaysToValidate=Ferien freigeben -HolidaysToValidateBody=Es folgt ein Ferienantrag zur Freigabe -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=Der Benutzer dieses Ferienantrags besitzt nicht mehr genügend verfügbare Tage. -HolidaysValidated=Freigegebene Ferien -HolidaysValidatedBody=Ihr Antrag auf Ferien von %s bis %s wurde bewilligt. -HolidaysRefused=Abgelehnte Ferien -HolidaysRefusedBody=Ihr Antrag auf Ferien von %s bis %s wurde aus folgendem Grund abgelehnt: -HolidaysCanceled=Stornierte Ferien -HolidaysCanceledBody=Ihr Antrag auf Ferien von %s bis %s wurde storniert. -Permission20000=Eigene Ferien lesen -Permission20001=Anlegen/Ändern Ihrer Ferien -Permission20002=Anlegen/Ändern der Ferien für alle -Permission20003=Urlaubsanträge löschen -Permission20004=Benutzer-Ferien definieren -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang index a4fbef99236..7229a18531c 100644 --- a/htdocs/langs/de_DE/interventions.lang +++ b/htdocs/langs/de_DE/interventions.lang @@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Name und Unterschrift des internen Kontakts: NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden: DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen -ClassifyBilled=Eingegordnet "Angekündigt" -ClassifyUnBilled=als "nicht verrechnet" markieren +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Angekündigt RelatedInterventions=Verbundene Eingriffe ShowIntervention=Zeige Eingriffe diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang index 58dcdc96f80..919b9f5202a 100644 --- a/htdocs/langs/de_DE/margins.lang +++ b/htdocs/langs/de_DE/margins.lang @@ -38,4 +38,4 @@ BuyingCost=Kosten UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Setzen Sie fest welcher Kontakt-Typ (auf Rechnungen verknüpft) für Gewinnspannenbericht bei Handelsvertretern verwendet wird. diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index 907b21ce10c..f20fbf915e9 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Projektaktionen YouAreNotContactOfProject=Sie sind diesem privaten Projekt nicht als Kontakt zugeordnet. DeleteATimeSpent=Lösche einen Zeitaufwand ConfirmDeleteATimeSpent=Möchten Sie diesen Zeitaufwand wirklich löschen? -DoNotShowMyTasksOnly=Zeige auch die Aufgaben der Anderen -ShowMyTasksOnly=Zeige nur meine Aufgaben +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressourcen ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte NoTasks=Keine Aufgaben für dieses Projekt LinkedToAnotherCompany=Mit Partner verknüpft -TaskIsNotAffectedToYou=Der Aufgabe sind sie nicht zugeordnet +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Zeitaufwand ist leer ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (%s akutelle Aufgaben) und alle Zeitaufwände. IfNeedToUseOhterObjectKeepEmpty=Wenn einige Zuordnungen (Rechnung, Bestellung, ...), einem Dritten gehören, müssen Sie erst alle mit dem Projekt verbinden, damit das Projekt auch Dritten zugänglich ist . @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Mitwirkender TypeContact_project_task_external_TASKCONTRIBUTOR=Mitwirkender SelectElement=Element wählen AddElement=Mit Element verknüpfen +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.) PlannedWorkload = Geplante Auslastung @@ -128,3 +129,4 @@ ProjectReferers=Bezugnahmen SearchAProject=Suchen Sie ein Projekt ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang index cfe8e713759..fea929ad123 100644 --- a/htdocs/langs/de_DE/sendings.lang +++ b/htdocs/langs/de_DE/sendings.lang @@ -50,11 +50,11 @@ Enlevement=Vom Kunden erhalten DocumentModelSimple=Einfache Dokumentvorlage DocumentModelMerou=Merou A5-Modell WarningNoQtyLeftToSend=Achtung, keine Produkte für den Versand -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Versandstatistik (nur Freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt). DateDeliveryPlanned=Geplantes Zustellungsdatum DateReceived=Datum der Zustellung SendShippingByEMail=Verand per E-Mail -SendShippingRef=Senden Lieferung %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Anmerkungen zur Sendung LinkToTrackYourPackage=Link zur Sendungsnachverfolgung ShipmentCreationIsDoneFromOrder=Aktuell ist die Erstellung der neuen Sendung über die Bestellkarte erfolgt. @@ -66,11 +66,13 @@ CarrierList=Liste der Transporter SendingMethodCATCH=Abholung durch Kunden SendingMethodTRANS=Spedition SendingMethodCOLSUI=Expressversand - # ModelDocument DocumentModelSirocco=Einfache Dokumentvorlage für die Lieferungscheine DocumentModelTyphon=Vollständig Dokumentvorlage für die Lieferungscheine (Logo, ...) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstante EXPEDITION_ADDON_NUMBER nicht definiert SumOfProductVolumes=Summe der Produktevolumen SumOfProductWeights=Summe der Produktegewichte + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang index 697448686a6..4db654bb0ac 100644 --- a/htdocs/langs/de_DE/suppliers.lang +++ b/htdocs/langs/de_DE/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Lieferantenrechnung erstellen ListOfSupplierProductForSupplier=Produkt- und Preisliste für Anbieter %s NoneOrBatchFileNeverRan=Keiner oder Batch-Job %s wurde nie ausgeführt SentToSuppliers=An Lieferanten geschickt +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang index 9ab9b394682..7716a2e9393 100644 --- a/htdocs/langs/el_GR/accountancy.lang +++ b/htdocs/langs/el_GR/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Γραμμή τιμολογίου VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Διαχωριστικό CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Λογαριασμός σε αναμονή +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Τύπος εγγράφου Docdate=Ημερομηνία diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index d3482b561ab..d7b7b640870 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Λάθος, αυτό το module απαιτε ErrorDecimalLargerThanAreForbidden=Λάθος, μια διευκρίνιση μεγαλύτερη από %s δεν υποστηρίζεται. DictionarySetup=Ρύθμισης λεξικού Dictionary=Λεξικά +Chartofaccounts=Διάγραμμα λογαριασμών +Fiscalyear=Οικονομικά έτη ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» για τον τύπο είναι κατοχυρωμένα. Μπορείτε να χρησιμοποιήσετε το «χρήστη» ως αξία για να προσθέσετε το δικό σας μητρώο ErrorCodeCantContainZero=Ο κώδικας δεν μπορεί να περιέχει την τιμή 0 DisableJavascript=Απενεργοποίηση της Java ακολουθίας και των Ajax λειτουργιών (Προτείνεται για χρήση από άτομα με προβλήματα όρασης ή φυλλομετρητές κειμένου) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Υποχρεωτικό +UsedOnlyWithTypeOption=Used by some agenda option only Security=Ασφάλεια Passwords=Συνθηματικά DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) @@ -1538,4 +1541,4 @@ Opened=Ανοίξτε Closed=Κλείστε Format=Μορφή -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang index e07079d895e..446b0613cb9 100644 --- a/htdocs/langs/el_GR/agenda.lang +++ b/htdocs/langs/el_GR/agenda.lang @@ -2,14 +2,15 @@ IdAgenda=Αναγνωριστικού συμβάντος Actions=Ενέργειες ActionsArea=Περιοχή Ενεργειών (γεγονότα και εργασίες) -Agenda= Ημερολόγιο -Agendas= Ημερολόγια -Calendar= Ημερολόγιο -Calendars= Ημερολόγια -LocalAgenda=Τοπικό ημερολόγιο +Agenda=Ημερολόγιο +Agendas=Ημερολόγια +Calendar=Ημερολόγιο +Calendars=Ημερολόγια +LocalAgenda=Εσωτερικό ημερολόγιο +ActionsOwnedBy=Το γεγονός ανήκει AffectedTo=Ανάθεση σε DoneBy=Έγινε από -Event=Event +Event=Εκδήλωση Events=Ενέργειες EventsNb=Αριθμός γεγονότων MyEvents=Τα γεγονότα μου @@ -22,7 +23,7 @@ MenuToDoActions=Όλες οι ημιτελής ενέργειες MenuDoneActions=Όλες οι ολοκληρ. ενέργειες MenuToDoMyActions=Ημιτελής ενέργειες MenuDoneMyActions=Ολοκληρωμένες ενέργειες -ListOfEvents=Λίστα γεγονότων του Dolibarr +ListOfEvents=Κατάλογος των συμβάντων (εσωτερικό ημερολόγιο) ActionsAskedBy=Ενέργειες που καταχωρήθηκαν από ActionsToDoBy=Ενέργειες που ανατέθηκαν σε ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από @@ -34,7 +35,7 @@ ViewList=Εμφάνιση Λίστας ViewCal=Μηνιαία προβολή ViewDay=Προβολή ημέρας ViewWeek=Προβολή εβδομάδας -ViewPerUser=Per user view +ViewPerUser=Προβολή ανά χρήστη ViewWithPredefinedFilters= Εμφάνιση με προκαθορισμένα φίλτρα AutoActions= Αυτόματη συμπλήρωση ημερολογίου AgendaAutoActionDesc= Εδώ ορίζετε γεγονότα για το οποία θέλετε το Dolibarr να δημιουργεί αυτόματα μια ενέργεια στην ατζέντα. Αν τίποτα δεν είναι τσεκαρισμένο (προεπιλογή), τότε, μόνο χειροκίνητες ενέργειες θα συμπεριληφθούν στην ατζέντα. @@ -81,10 +82,12 @@ DefaultWorkingHours=Προεπιλογή ώρες εργασίας ανά ημέ # External Sites ical ExportCal=Εξαγωγή ημερολογίου ExtSites=Εισαγωγή εξωτερικών ημερολογίων -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Εμφάνιση εξωτερικών ημερολογίων (ορίζεται από τις γενικές ρυθμίσεις) στην ημερήσια διάταξη. Δεν επηρεάζει τα εξωτερικά ημερολόγια που ορίζονται από τους χρήστες. ExtSitesNbOfAgenda=Αριθμός ημερολογίων AgendaExtNb=Ημερολόγιο nb %s ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .ical αρχείο ExtSiteNoLabel=Χωρίς Περιγραφή -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range +WorkingTimeRange=Εύρος χρόνου εργασίας +WorkingDaysRange=Εύρος ημερών εργασίας +AddEvent=Προσθήκη ενέργειας +MyAvailability=Η διαθεσιμότητα μου diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang index d432192c352..d622e8657bf 100644 --- a/htdocs/langs/el_GR/categories.lang +++ b/htdocs/langs/el_GR/categories.lang @@ -66,7 +66,7 @@ ReturnInCompany=Πίσω στην καρτέλα πελάτη/προοπτική ContentsVisibleByAll=Τα περιεχόμενα θα είναι ορατά από όλους ContentsVisibleByAllShort=Περιεχόμενα ορατά από όλους ContentsNotVisibleByAllShort=Περιεχόμενα μη ορατά από όλους -# CategoriesTree=Categories tree +CategoriesTree=Δέντρο κατηγοριών DeleteCategory=Διαγραφή Κατηγορίας ConfirmDeleteCategory=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την κατηγορία; RemoveFromCategory=Αφαιρέστε το σύνδεσμο από την κατηγορία @@ -105,9 +105,10 @@ CatProdLinks=Προϊόντα CatCusLinks=Πελάτες/Προοπτικές CatSupLinks=Προμηθευτές DeleteFromCat=Κατάργηση από την κατηγορία -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Διαγραφή εικόνας +ConfirmDeletePicture=Επιβεβαιώστε τη διαγραφή εικόνας +ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά +CategoriesSetup=Ρύθμισης κατηγοριών +CategorieRecursiv=Συνδέουν με το γονέα της κατηγορίας αυτόματα +CategorieRecursivHelp=Εάν είναι ενεργοποιημένο, το προϊόν θα συνδέεται επίσης με γονική κατηγορία κατά την προσθήκη σε μια υποκατηγορία +AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang index 532bbaf1d40..420b797c36c 100644 --- a/htdocs/langs/el_GR/companies.lang +++ b/htdocs/langs/el_GR/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Πρέπει να δημιουργήσετε αντι ListSuppliersShort=Λίστα Προμηθευτών ListProspectsShort=Λίστα Προοπτικών ListCustomersShort=Λίστα Πελατών -ThirdPartiesArea=Περιοχή Στοιχείων +ThirdPartiesArea=Περιοχή Πελ./Προμ. και επαφών LastModifiedThirdParties=%s τελευταίοι τροποποιημένοι Πελ./Προμ. UniqueThirdParties=Σύνολο μοναδικών Πελ./Προμ. InActivity=Ανοιχτό @@ -410,3 +410,5 @@ OutstandingBillReached=Έφτασε στο όριο. για των εκκρεμ MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time. ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...) +SearchThirdparty=Αναζήτηση Πελ./Προμ. +SearchContact=Αναζήτηση επαφής diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang index 35c9a2a060b..a22a8a1d638 100644 --- a/htdocs/langs/el_GR/compta.lang +++ b/htdocs/langs/el_GR/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=Εξωτερικές αναφορές ToCreateAPredefinedInvoice=Για να δημιουργήσει ένα προκαθορισμένο τιμολόγιο, δημιουργήσετε ένα πρότυπο τιμολόγιο στη συνέχεια, χωρίς επικύρωση, κάντε κλικ στο κουμπί "Μετατροπή σε προκαθορισμένο τιμολόγιο". -LinkedOrder=που συνδέονται με την παραγγελία +LinkedOrder=Σύνδεση με παραγγελία ReCalculate=Επανυπολογισμός Mode1=Μέθοδος 1 Mode2=Τρόπος 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε ταμειακής λογιστικής mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε λογιστικής δέσμευσης τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής). CalculationMode=Τρόπο υπολογισμού AccountancyJournal=Λογιστικος Κωδικός περιοδικό -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για να αγοράσουν τα προϊόντα -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση των προϊόντων -ACCOUNTING_SERVICE_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την αγορά των υπηρεσιών -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση υπηρεσιών -ACCOUNTING_VAT_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ -ACCOUNTING_VAT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ -ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτη -ACCOUNTING_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για προμηθευτή +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/el_GR/dict.lang b/htdocs/langs/el_GR/dict.lang index d711c0c5c2a..cf78416afc0 100644 --- a/htdocs/langs/el_GR/dict.lang +++ b/htdocs/langs/el_GR/dict.lang @@ -253,7 +253,6 @@ CivilityMR=Κύριος CivilityMLE=Κυρία CivilityMTRE=Master CivilityDR=Doctor - ##### Currencies ##### Currencyeuros=€ CurrencyAUD=AU Dollars @@ -290,10 +289,10 @@ CurrencyXOF=CFA Francs BCEAO CurrencySingXOF=CFA Franc BCEAO CurrencyXPF=CFP Francs CurrencySingXPF=CFP Franc - CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=thousandth - #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Εκστρατεία για τις Ταχυδρομικές @@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Word of mouth DemandReasonTypeSRC_PARTNER=Partner DemandReasonTypeSRC_EMPLOYEE=Employee DemandReasonTypeSRC_SPONSORING=Sponsorship - #### Paper formats #### PaperFormatEU4A0=Format 4A0 PaperFormatEU2A0=Format 2A0 diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang index 0ca29f1560b..112367eb07e 100644 --- a/htdocs/langs/el_GR/donations.lang +++ b/htdocs/langs/el_GR/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Αναζήτηση μια δωρεά DonationRecipient=Δικαιούχος δωρεάς ThankYou=Σας ευχαριστούμε IConfirmDonationReception=Ο δικαιούχος δηλώνει αποδοχή, ως δωρεά, το ακόλουθο ποσό +MinimumAmount=Το ελάχιστο ποσό είναι %s diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang index 4614ceff6ba..885dc185b8e 100644 --- a/htdocs/langs/el_GR/errors.lang +++ b/htdocs/langs/el_GR/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Σφάλμα, η PHP σας πρέπει να έχει το m ErrorOpenIDSetupNotComplete=Μπορείτε να ρυθμίσετε το Dolibarr αρχείο config να επιτρέψει OpenID ταυτότητα, αλλά το URL OpenID υπηρεσίας δεν ορίζεται σε συνεχή %s ErrorWarehouseMustDiffers=Η πηγή και ο στόχος των αποθηκών πρέπει να είναι διαφορετικός. ErrorBadFormat=Κακή μορφή! -ErrorPaymentDateLowerThanInvoiceDate=Ημερομηνία πληρωμής (%s) δεν μπορεί να είναι πριν από την ημερομηνία έκδοσης του τιμολογίου (%s) για το τιμολόγιο %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Σφάλμα, το μέλος αυτό δεν έχει ακόμη συνδεθεί με οποιουσδήποτε άλλους κατασκευαστές. Μέλος του συνδέσμου σε έναν υπάρχοντα Πελ./Προμ. ή να δημιουργήσετε ένα νέο κατασκευαστή πριν από τη δημιουργία τιμολογίου με συνδρομή. ErrorThereIsSomeDeliveries=Σφάλμα υπάρχουν κάποιες παραδόσεις που συνδέονται με την εν λόγω αποστολή. Η διαγραφή απορρίφθηκε. +ErrorCantDeletePaymentReconciliated=Δεν μπορείτε να διαγράψετε μια πληρωμή με τραπεζική συναλλαγή που είχε φτάσει σε συμβιβασμό +ErrorCantDeletePaymentSharedWithPayedInvoice=Δεν μπορείτε να διαγράψετε μια πληρωμή που σχετίζεται με ένα τουλάχιστον τιμολόγιο με καθεστώς πληρωμένο # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Απενεργοποιημένη λειτουργία όταν οι ρυθμίσεις της οθόνης έχουν προσαρμοστεί για χρήση από άτομα με προβλήματα όρασης ή φυλλομετρητές κειμένου. +WarningPaymentDateLowerThanInvoiceDate=Η ημερομηνία πληρωμής (%s) είναι νωρίτερα από την ημερομηνία του τιμολογίου (%s) για το τιμολόγιο %s. +WarningTooManyDataPleaseUseMoreFilters=Πάρα πολλά στοιχεία. Παρακαλούμε χρησιμοποιήστε περισσότερα φίλτρα diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang index 838f62eb8de..924863ff589 100644 --- a/htdocs/langs/el_GR/holiday.lang +++ b/htdocs/langs/el_GR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Άδειες -CPTitreMenu=Άδειες +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Μηνιαία αναφορά -MenuAddCP=Εφαρμογή για άδεια -NotActiveModCP=Πρέπει να ενεργοποιήσετε τις άδειες στα module για να δείτε αυτή τη σελίδα. -NotConfigModCP=Πρέπει να ρυθμίσετε τις άδειες στο module για να δείτε αυτή τη σελίδα. Για να το κάνετε αυτό, πατήστε εδώ . -NoCPforUser=Δεν υπάρχει ζήτηση για άδεια. -AddCP=Εφαρμογή για άδεια +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Εργαζόμενος DateDebCP=Ημερ. έναρξης DateFinCP=Ημερ. τέλους @@ -18,24 +18,24 @@ ApprovedCP=Εγκεκριμένο CancelCP=Ακυρώθηκε RefuseCP=Απόρριψη ValidatorCP=Έγκριση -ListeCP=Λίστα αδειών +ListeCP=List of leaves ReviewedByCP=Θα πρέπει να επανεξεταστεί από DescCP=Περιγραφή -SendRequestCP=Δημιουργία ζήτησης για άδεια -DelayToRequestCP=Οι αιτήσεις για τις άδειες πρέπει να γίνουν τουλάχιστον %s Ημέρα (ες) πριν. -MenuConfCP=Επεξεργασία υπόλοιπο των αδειών -UpdateAllCP=Ενημερώστε τις άδειες -SoldeCPUser=Ισορροπία αδειών είναι %s ημέρες. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης. ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας: -ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, το αίτημα για τις άδειες δεν υπάρχει. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Επιστροφή στην προηγούμενη σελίδα -ErrorUserViewCP=Δεν έχετε δικαίωμα να διαβάσετε αυτό το αίτημα για τις άδειες. -InfosCP=Πληροφορίες για τη ζήτηση των αδειών +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Πληροφορίες για την ροή εργασιών RequestByCP=Ζητήθηκε από -TitreRequestCP=Φύλλο αδειών -NbUseDaysCP=Αριθμός ημερών αδειών που καταναλώνονται +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Επεξεργασία DeleteCP=Διαγραφή ActionValidCP=Επικύρωση @@ -43,26 +43,26 @@ ActionRefuseCP=Απορρίφθηκε ActionCancelCP=Άκυρο StatutCP=Κατάσταση SendToValidationCP=Στάλθηκε για επικύρωση -TitleDeleteCP=Διαγράψτε το αίτημα των αδειών -ConfirmDeleteCP=Επιβεβαιώστε τη διαγραφή του αιτήματος για τις άδειες -ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψετε αυτό το αίτημα αδειών. -CantCreateCP=Δεν έχετε το δικαίωμα να υποβάλετε αίτηση για τις άδειες. -InvalidValidatorCP=Μπορείτε να επιλέξετε μια έγκριση στο αίτημα των αδειών σας. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Ανανέωση -CantUpdate=Δεν μπορείτε να ενημερώσετε το αίτημα των αδειών. +CantUpdate=You cannot update this leave request. NoDateDebut=Πρέπει να επιλέξετε μια ημερομηνία έναρξης. NoDateFin=Πρέπει να επιλέξετε μια ημερομηνία λήξης. ErrorDureeCP=Το αίτημά σας για την άδεια δεν περιέχει εργάσιμη ημέρα. TitleValidCP=Εγκρίνετε το αίτημα για την άδεια -ConfirmValidCP=Είστε σίγουροι ότι θέλετε να εγκρίνει το αίτημα των αδειών; +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Ημερομηνία έγκρισης -TitleToValidCP=Αποστολή αιτήματος για άδεια -ConfirmToValidCP=Είστε σίγουροι ότι θέλετε να στείλετε το αίτημα των αδειών; +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Απόρριψη αιτήματος αδειών -ConfirmRefuseCP=Είστε σίγουροι ότι θέλετε να απορρίψετε την αίτηση των αδειών; +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Πρέπει να επιλέξετε ένα λόγο απόρριψης της αίτησης. TitleCancelCP=Ακύρωση του αιτήματος τις άδειας -ConfirmCancelCP=Είστε σίγουροι ότι θέλετε να ακυρώσετε το αίτημα τις άδειας; +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Λόγος για την απόρριψη DateRefusCP=Ημερομηνία της άρνησης DateCancelCP=Ημερομηνία της ακύρωσης @@ -72,8 +72,8 @@ MotifCP=Λόγος UserCP=Χρήστης ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας. AddEventToUserOkCP=Η προσθήκη της έκτακτης άδειας έχει ολοκληρωθεί. -MenuLogCP=Δείτε τα αρχεία καταγραφών των αδειών -LogCP=Αρχεία καταγραφών των ενημερώσεων των αδειών +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Διενεργείται από UserUpdateCP=Για το χρήστη PrevSoldeCP=Προηγούμενο Υπόλοιπο @@ -81,33 +81,33 @@ NewSoldeCP=Νέο υπόλοιπο alreadyCPexist=Η αίτηση για την άδεια έχει ήδη γίνει για αυτή την περίοδο. UserName=Όνομα Employee=Υπάλληλος -FirstDayOfHoliday=Πρώτη μέρα άδειας -LastDayOfHoliday=Τελευταία μέρα άδειας +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Μηνιαία ενημέρωση ManualUpdate=Χειροκίνητη ενημέρωση -HolidaysCancelation=Ακύρωση αδειών +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Διαμόρφωση του module αδειών DescOptionCP=Περιγραφή της επιλογής ValueOptionCP=Αξία -GroupToValidateCP=Ομάδα με τη δυνατότητα να εγκρίνει τις άδειες +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Επικύρωση της διαμόρφωσης -LastUpdateCP=Τελευταία αυτόματη ενημέρωση των αδειών +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Ενημερώθηκε με επιτυχία. ErrorUpdateConfCP=Παρουσιάστηκε σφάλμα κατά την ενημέρωση, παρακαλώ προσπαθήστε ξανά. AddCPforUsers=Παρακαλώ προσθέστε το υπόλοιπο αδειών των χρηστών από κάνοντας κλικ εδώ . DelayForSubmitCP=Προθεσμία υποβολής αιτήσεων για άδειες AlertapprobatortorDelayCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας δεν ταιριάζει με την προθεσμία -AlertValidatorDelayCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας υπερβαίνει καθυστέρηση -AlertValidorSoldeCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας υπερβαίνει το υπόλοιπο -nbUserCP=Αριθμός χρηστών που υποστηρίζονται στο module για τις άδειες -nbHolidayDeductedCP=Αριθμός των αδειών πρέπει να αφαιρεθούν ανά ημέρα ληφθέντων αδειών -nbHolidayEveryMonthCP=Αριθμός των αδειών που προστίθενται κάθε μήνα -Module27130Name= Διαχείριση των αδειών -Module27130Desc= Διαχείριση των αδειών -TitleOptionMainCP=Κύριες ρυθμίσεις των αδειών -TitleOptionEventCP=Ρυθμίσεις των αδειών που σχετίζονται με τα γεγονότα +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Επικύρωση UpdateEventCP=Ενημέρωση εκδηλώσεων CreateEventCP=Δημιουργία @@ -127,23 +127,23 @@ UpdateEventOptionCP=Ανανέωση ErrorMailNotSend=Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail: NoCPforMonth=Όχι αυτό το μήνα. nbJours=Αριθμός ημερών -TitleAdminCP=Διαμόρφωση αδειών +TitleAdminCP=Configuration of Leaves #Messages Hello=Γεια σας -HolidaysToValidate=Επικύρωση άδειας -HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδειας για επικύρωση -HolidaysToValidateDelay=Αυτό το αίτημα άδειας θα λάβει χώρα εντός περιόδου μικρότερης των ημερών %s . -HolidaysToValidateAlertSolde=Ο χρήστης που έκανε την αίτηση για την άδεια δεν έχει αρκετό υπόλοιπο. -HolidaysValidated=Επικυρώθηκε η άδεια -HolidaysValidatedBody=Το αίτημα σας για άδεια από %s έως %s έχει επικυρωθεί. -HolidaysRefused=Άρνηση άδειας -HolidaysRefusedBody=Το αίτημα σας για την άδεια από %s έως %s έχει απορριφθεί για τους ακόλουθους λόγους: -HolidaysCanceled=Ακύρωση άδειας -HolidaysCanceledBody=Το αίτημά σας για άδεια από %s έως %s έχει ακυρωθεί. -Permission20000=Δείτε τις δικές σας άδειες -Permission20001=Δημιουργία/τροποποίηση της άδειάς σας -Permission20002=Δημιουργία/τροποποίηση των αδειών για όλους -Permission20003=Αιτήματα διαγραφής αδειών -Permission20004=Ρύθμιση χρηστών για της άδειες -Permission20005=Επανεξέταση καταγραφής των τροποποιημένων αδειών -Permission20006=Δείτε την μηνιαία αναφορά αδειών +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang index b0b234fdd41..e546e25d855 100644 --- a/htdocs/langs/el_GR/interventions.lang +++ b/htdocs/langs/el_GR/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Όνομα και υπογραφή του πα NameAndSignatureOfExternalContact=Όνομα και υπογραφή του πελάτη: DocumentModelStandard=Τυπικό είδος εγγράφου παρέμβασης InterventionCardsAndInterventionLines=Παρεμβάσεις και τις γραμμές των παρεμβάσεων -ClassifyBilled=Ταξινόμηση "Τιμολογημένων" +InterventionClassifyBilled=Ταξινομήστε τα "Τιμολογημένα" +InterventionClassifyUnBilled=Ταξινομήστε τα μη "Τιμολογημένα" StatusInterInvoiced=Τιμολογείται RelatedInterventions=Οι παρεμβάσεις που σχετίζονται ShowIntervention=Εμφάνιση παρέμβασης +SendInterventionRef=Υποβολή παρέμβασης %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Αντιπρόσωπος που παρακολουθεί την παρέμβαση TypeContact_fichinter_internal_INTERVENING=Παρεμβαίνων diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang index 0a8a86d666b..77b4de1917c 100644 --- a/htdocs/langs/el_GR/projects.lang +++ b/htdocs/langs/el_GR/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Δράσεις για το έργο YouAreNotContactOfProject=Δεν έχετε μια επαφή του ιδιωτικού έργου, DeleteATimeSpent=Διαγράψτε το χρόνο που δαπανάται ConfirmDeleteATimeSpent=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το χρόνο; -DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν διατίθενται για μένα -ShowMyTasksOnly=Προβολή μόνο καθήκοντα που θα μου +DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν ανατέθηκαν σε μένα +ShowMyTasksOnly=Δείτε τα καθήκοντα που σας έχουν ανατεθεί TaskRessourceLinks=Πόροι ProjectsDedicatedToThisThirdParty=Έργα που αφορούν αυτό το στοιχείο NoTasks=Δεν υπάρχουν εργασίες για αυτό το έργο LinkedToAnotherCompany=Συνδέεται με άλλο τρίτο μέρος -TaskIsNotAffectedToYou=Καθήκον που δεν έχει διατεθεί για σας +TaskIsNotAffectedToYou=Εργασία που δεν έχει ανατεθεί σε εσάς ErrorTimeSpentIsEmpty=Χρόνος που δαπανάται είναι άδειο ThisWillAlsoRemoveTasks=Αυτή η ενέργεια θα διαγράψει επίσης όλα τα καθήκοντα του έργου (%s καθηκόντων προς το παρόν) και όλες οι είσοδοι του χρόνου. IfNeedToUseOhterObjectKeepEmpty=Εάν ορισμένα αντικείμενα (τιμολόγιο, προκειμένου, ...), που ανήκουν σε άλλο τρίτο μέρος, πρέπει να συνδέεται με το έργο να δημιουργήσει, διατηρήσει αυτό το κενό να έχει το έργο να είναι πολλαπλών τρίτους. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Συνεισφέρων TypeContact_project_task_external_TASKCONTRIBUTOR=Συνεισφέρων SelectElement=Επιλέξτε το στοιχείο AddElement=Σύνδεση με το στοιχείο +UnlinkElement=Αποσύνδεση στοιχείου # Documents models DocumentModelBaleine=Μοντέλο έκθεση Μια πλήρης έργου (logo. ..) PlannedWorkload = Σχέδιο φόρτου εργασίας @@ -128,3 +129,4 @@ ProjectReferers=Αναφορές από αντικείμενα SearchAProject=Αναζήτηση ένα έργο ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα ProjectDraft=Πρόχειρα έργα +FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang index ee950679af5..fffc1e4a735 100644 --- a/htdocs/langs/el_GR/sendings.lang +++ b/htdocs/langs/el_GR/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Στατιστικά στοιχεία σχετικ DateDeliveryPlanned=Προγραμματισμένη ημερομηνία παράδοσης DateReceived=Παράδοση Ημερομηνία παραλαβής SendShippingByEMail=Στείλτε αποστολή με e-mail -SendShippingRef=Στείλτε αποστολή %s +SendShippingRef=Υποβολή της αποστολής %s ActionsOnShipping=Εκδηλώσεις για την αποστολή LinkToTrackYourPackage=Σύνδεσμος για να παρακολουθείτε το πακέτο σας ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργία μιας νέας αποστολής γίνεται από την κάρτα παραγγελίας. @@ -66,11 +66,13 @@ CarrierList=Κατάλογος των μεταφορέων SendingMethodCATCH=Πιάσε τον πελάτη SendingMethodTRANS=Μεταφορέας SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Απλό μοντέλο έγγραφο για αποδεικτικά παράδοσης DocumentModelTyphon=Πληρέστερο πρότυπο έγγραφο για αποδεικτικά παράδοσης (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Σταθερή EXPEDITION_ADDON_NUMBER δεν ορίζεται SumOfProductVolumes=Άθροισμα όγκου του προϊόντος SumOfProductWeights=Άθροισμα το βάρος των προϊόντων + +# warehouse details +DetailWarehouseNumber= Λεπτομέρειες Αποθήκης +DetailWarehouseFormat= W:%s (Ποσότητα : %d) diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang index 0b2f2428515..743d0787740 100644 --- a/htdocs/langs/el_GR/suppliers.lang +++ b/htdocs/langs/el_GR/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Δημιουργία τιμολογίου προμηθευτ ListOfSupplierProductForSupplier=Λίστα προϊόντων και τιμών του προμηθευτή %s NoneOrBatchFileNeverRan=Κανένας ή παρτίδα %s έχει τρέξει πρόσφατα SentToSuppliers=Αποστολή σε προμηθευτές +ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτών +MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index c715587994f..8fe13e77d13 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Línea de la factura VentilatedinAccount=Contabilizada con éxito en la cuenta contable NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad -ACCOUNTINGEX_SEPARATORCSV=separador CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Longitud de las cuentas contables mostradas en Dolibarr AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas. -ACCOUNTINGEX_LENGTH_GACCOUNT=Longitud de las cuentas generales -ACCOUNTINGEX_LENGTH_AACCOUNT=Longitud de las subcuentas +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Diario de ventas -ACCOUNTINGEX_PURCHASE_JOURNAL=Diario de compras -ACCOUNTINGEX_BANK_JOURNAL=Diario bancario -ACCOUNTINGEX_CASH_JOURNAL=Diario de caja -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Diario de operaciones diversas -ACCOUNTINGEX_SOCIAL_JOURNAL=Diario social +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Cuenta de caja -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Tipo de documento Docdate=Fecha diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index e57a4a6cec6..2917146d1b4 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -219,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automático si Javascript está desactivado AvailableOnlyIfJavascriptNotDisabled=Disponible solamente si Javascript esta activado AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solamente si Javascript y Ajax están activados Required=Requerido +UsedOnlyWithTypeOption=Used by some agenda option only Security=Seguridad Passwords=Contraseñas DoNotStoreClearPassword=No almacenar la contraseña sin cifrar en la base diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index b3aa4a58375..72131f05f09 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -7,6 +7,7 @@ Agendas=Agendas Calendar=Calendario Calendars=Calendarios LocalAgenda=Calendario interno +ActionsOwnedBy=Event owned by AffectedTo=Asignada a DoneBy=Realizado por Event=Evento @@ -88,4 +89,5 @@ ExtSiteUrlAgenda=Url de acceso al archivo .ical ExtSiteNoLabel=Sin descripción WorkingTimeRange=Rango temporal WorkingDaysRange=Rango diario -AddEvent=Crear evento +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang index 42c24bbae94..44706c7e272 100644 --- a/htdocs/langs/es_ES/categories.lang +++ b/htdocs/langs/es_ES/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Atributos complementarios CategoriesSetup=Configuración de categorías CategorieRecursiv=Enlazar con la categoría padre automáticamente CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 2f123f1a0b1..eda8dcc70b4 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Debe establecer contactos con e-mail en los terceros p ListSuppliersShort=Listado de proveedores ListProspectsShort=Listado de clientes potenciales ListCustomersShort=Listado de clientes -ThirdPartiesArea=Área Terceros +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Los %s últimos terceros modificados UniqueThirdParties=Total de terceros únicos InActivity=Activo @@ -410,3 +410,5 @@ OutstandingBillReached=Importe máximo alcanzado MonkeyNumRefModelDesc=Devuelve un número bajo el formato %syymm-nnnn para los códigos de clientes y %syymm-nnnn para los códigos de los proveedores, donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0. LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Puede ser modificado en cualquier momento. ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index da1da3eb951..7d07fdba2ea 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Resumen financiero ByProductsAndServices=Por productos y servicios RefExt=Ref. externa ToCreateAPredefinedInvoice=Para crear una factura predefinida, cree una factura y luego, sin haberla validado, haga click en el botón "Convertir a factura predefinida". -LinkedOrder=Enlazar a un pedido +LinkedOrder=Link to order ReCalculate=Recalcular Mode1=Método 1 Mode2=Método 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo contabilidad de caja no es relevante. Este informe sólo está disponible cuando se utiliza en modo contabilidad de compromiso (consulte la configuración del módulo de contabilidad). CalculationMode=Modo de cálculo AccountancyJournal=Código contable diario -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos -ACCOUNTING_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios -ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido -ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado -ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes -ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang index dd5e5d3d200..ae7060c9d3a 100644 --- a/htdocs/langs/es_ES/donations.lang +++ b/htdocs/langs/es_ES/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Buscar una donación DonationRecipient=Beneficiario ThankYou=Muchas gracias IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 926a356db32..97b357fd7ea 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -155,4 +155,5 @@ WarningUsingThisBoxSlowDown=Atención, el uso de este panel provoca serias ralen WarningClickToDialUserSetupNotComplete=La configuración de ClickToDial para su cuenta de usuario no está completa (vea la pestaña ClickToDial en su ficha de usuario) WarningNotRelevant=Operación irrelevante para este conjunto de datos WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalidad desactivada cuando la configuración de visualización es optimizada para personas ciegas o navegadores de texto. -WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha (%s) de la factura %s. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 8c34109bf13..e1d58f3e41e 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=RRHH -Holidays=Vacaciones -CPTitreMenu=Vacaciones +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Estado mensual -MenuAddCP=Nueva petición -NotActiveModCP=Debe activar el módulo Vacaciones para ver esta página. -NotConfigModCP=Debe configurar el módulo Vacaciones para ver esta página. Para configurarlo, haga clic aquí. -NoCPforUser=No tiene peticiones de vacaciones. -AddCP=Crear petición de vacaciones +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Empleado DateDebCP=Fecha inicio DateFinCP=Fecha fin @@ -18,24 +18,24 @@ ApprovedCP=Aprobada CancelCP=Anulada RefuseCP=Rechazada ValidatorCP=Validador -ListeCP=Lista de vacaciones +ListeCP=List of leaves ReviewedByCP=Será revisada por DescCP=Descripción -SendRequestCP=Enviar la petición de vacaciones -DelayToRequestCP=Las peticiones de vacaciones deben realizarse al menos %s días antes. -MenuConfCP=Definir las vacaciones -UpdateAllCP=Actualizar las vacaciones -SoldeCPUser=Su saldo de vacaciones es de %s días. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Debe indicar una fecha de fin superior a la fecha de inicio. ErrorSQLCreateCP=Se ha producido un error de SQL durante la creación : -ErrorIDFicheCP=Se produjo un error, esta solicitud de vacaciones no existe. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Volver a la página anterior -ErrorUserViewCP=No está autorizado a leer esta petición de vacaciones. -InfosCP=Información de la petición de vacaciones +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Información del workflow RequestByCP=Pedido por -TitreRequestCP=Ficha vacaciones -NbUseDaysCP=Número de días de vacaciones consumidos +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Modificar DeleteCP=Eliminar ActionValidCP=Validar @@ -43,26 +43,26 @@ ActionRefuseCP=Rechazar ActionCancelCP=Anular StatutCP=Estado SendToValidationCP=Enviar validación -TitleDeleteCP=Eliminar la petición de vacaciones -ConfirmDeleteCP=¿Está seguro de querer eliminar esta petición de vacaciones? -ErrorCantDeleteCP=Error, no tiene vacaciones para eliminar esta petición de vacaciones. -CantCreateCP=No tiene vacaciones para realizar peticiones de vacaciones. -InvalidValidatorCP=Debe indicar un validador para su petición de vacaciones. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Actualizar -CantUpdate=No puede actualizar esta petición de vacaciones. +CantUpdate=You cannot update this leave request. NoDateDebut=Debe indicar una fecha de inicio. NoDateFin=Debe indicar una fecha de fin. ErrorDureeCP=Su petición de vacaciones no contiene ningún día hábil. TitleValidCP=Validar la petición de vacaciones -ConfirmValidCP=¿Está seguro de querer validar esta petición de vacaciones? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Fecha de validación -TitleToValidCP=Enviar la petición de vacaciones -ConfirmToValidCP=¿Está seguro de querer enviar la petición de vacaciones? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Rechazar la petición de vacaciones -ConfirmRefuseCP=¿Está seguro de querer rechazar la petición de vacaciones? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Debe seleccionar un motivo para rechazar esta petición. TitleCancelCP=Anular la petición de vacaciones -ConfirmCancelCP=¿Está seguro de querer anular la petición de vacaciones? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motivo del rechazo DateRefusCP=Fecha del rechazo DateCancelCP=Fecha de la anulación @@ -72,8 +72,8 @@ MotifCP=Motivo UserCP=Usuario ErrorAddEventToUserCP=Se ha producido un error en la asignación del permiso excepcional. AddEventToUserOkCP=Se ha añadido el permiso excepcional. -MenuLogCP=Ver los logs de vacaciones -LogCP=Logs de actualizaciones de vacaciones +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Realizado por UserUpdateCP=Para el usuario PrevSoldeCP=Saldo anterior @@ -81,33 +81,33 @@ NewSoldeCP=Nuevo saldo alreadyCPexist=Ya se ha efectuado una petición de vacaciones para este periodo. UserName=Nombre Apellidos Employee=Empleado -FirstDayOfHoliday=Primer día libre -LastDayOfHoliday=Último día libre +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Actualización mensual ManualUpdate=Actualización manual -HolidaysCancelation=Anulación vacaciones +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuración del módulo Vacaciones DescOptionCP=Descripción de la opción ValueOptionCP=Valor -GroupToValidateCP=Grupo con posibilidad de aprobar las vacaciones +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validar la configuración -LastUpdateCP=Última actualización automática de vacaciones +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Actualización efectuada correctamente. ErrorUpdateConfCP=Se ha producido un error durante la actualización, vuélvalo a intentar. AddCPforUsers=Añada los saldos de vacaciones de los usuarios haciendo clic aquí. DelayForSubmitCP=Antelación mínima para solicitar vacaciones AlertapprobatortorDelayCP=Advertir al validador si la petición no corresponde a la fecha límite -AlertValidatorDelayCP=Advertir al usuario validador si la petición no respeta el límite previsto -AlertValidorSoldeCP=Advertir al usuario validador si el usuario pide vacaciones superiores a su saldo -nbUserCP=Número de usuarios tomados en cuenta en el módulo vacaciones -nbHolidayDeductedCP=Número de días retribuídos a deducir por día de vacaciones -nbHolidayEveryMonthCP=Número de vacaciones añadidas por mes -Module27130Name= Gestion de las vacaciones -Module27130Desc= Gestión de días libres -TitleOptionMainCP=Ajustes principales de vacaciones -TitleOptionEventCP=Ajustes de vacaciones enlazados a eventos +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validar UpdateEventCP=Actualizar los eventos CreateEventCP=Crear @@ -127,23 +127,23 @@ UpdateEventOptionCP=Actualizar ErrorMailNotSend=Se ha producido un error en el envío del e-mail : NoCPforMonth=Sin vacaciones este mes. nbJours=Número de días -TitleAdminCP=Configuración de las vacaciones +TitleAdminCP=Configuration of Leaves #Messages Hello=Hola -HolidaysToValidate=Días retribuidos a validar -HolidaysToValidateBody=A continuación encontrará una solicitud de días retribuidos para validar -HolidaysToValidateDelay=Esta solicitud de días retribuidos tendrá lugar en un plazo de menos de %s días. -HolidaysToValidateAlertSolde=El usuario que ha realizado la solicitud de días retribuidos no dispone de suficientes días disponibles. -HolidaysValidated=Días retribuidos validados -HolidaysValidatedBody=Su solicitud de días retribuidos desde el %s al %s ha sido validada. -HolidaysRefused=Días retribuidos denegados -HolidaysRefusedBody=Su solicitud de días retribuidos desde el %s al %s ha sido denegada por el siguiente motivo : -HolidaysCanceled=Días retribuidos cancelados -HolidaysCanceledBody=Su solicitud de días retribuidos desde el %s al %s ha sido cancelada. -Permission20000=Leer sus propios días retribuidos -Permission20001=Crear/modificar sus días retribuidos -Permission20002=Crear/modificar días retribuidos para todos -Permission20003=Eliminar peticiones de días retribuidos -Permission20004=Configurar días retribuidos de usuarios -Permission20005=Consultar el historial de modificaciones de permisos retribuídos -Permission20006=Leer informe mensual de días retribuidos +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang index e985245d7a4..2fc510442fd 100644 --- a/htdocs/langs/es_ES/interventions.lang +++ b/htdocs/langs/es_ES/interventions.lang @@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Nombre y firma del participante: NameAndSignatureOfExternalContact=Nombre y firma del cliente: DocumentModelStandard=Documento modelo estándar para intervenciones InterventionCardsAndInterventionLines=Fichas y líneas de intervención -ClassifyBilled=Clasificar "Facturado" -ClassifyUnBilled=Clasificar "No facturado" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Facturado RelatedInterventions=Intervenciones adjuntas ShowIntervention=Mostrar intervención diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 988b3e545c8..fbae4d2497d 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Eventos del proyecto YouAreNotContactOfProject=Usted no es contacto de este proyecto privado DeleteATimeSpent=Eliminación de tiempo dedicado ConfirmDeleteATimeSpent=¿Está seguro de querer eliminar este tiempo dedicado? -DoNotShowMyTasksOnly=Ver también las tareas que no me afectan -ShowMyTasksOnly=Solamente ver las tareas que me afectan +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Recursos afectados ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero NoTasks=Ninguna tarea para este proyecto LinkedToAnotherCompany=Enlazado a otra empresa -TaskIsNotAffectedToYou=Tarea que no le afecta +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=No se ha establecido el tiempo consumido ThisWillAlsoRemoveTasks=Esta operación también destruirá las tareas del proyecto (%s tareas) y sus tiempos dedicados. IfNeedToUseOhterObjectKeepEmpty=Si los elementos (factura, pedido, ...) pertenecen a un tercero que no és el seleccionado, debiendo estos estar ligados al proyecto a crear, déjelo vacío para permitir el proyecto a multi-terceros. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante TypeContact_project_task_external_TASKCONTRIBUTOR=Participante SelectElement=Seleccione elemento AddElement=Vincular a elmento +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Modelo de informe de proyecto completo (logo...) PlannedWorkload = Carga de trabajo prevista @@ -128,3 +129,4 @@ ProjectReferers=Objetos vinculados SearchAProject=Buscar un proyecto ProjectMustBeValidatedFirst=El proyecto debe validarse primero ProjectDraft=Proyectos borrador +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang index e1bb0dbe5b3..8008201e056 100644 --- a/htdocs/langs/es_ES/sendings.lang +++ b/htdocs/langs/es_ES/sendings.lang @@ -72,3 +72,7 @@ DocumentModelTyphon=Modelo completo de nota de entrega / recepción (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definida SumOfProductVolumes=Suma del volumen de los productos SumOfProductWeights=Suma del peso de los productos + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang index 52458b713de..63c624d204c 100644 --- a/htdocs/langs/es_ES/suppliers.lang +++ b/htdocs/langs/es_ES/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Crear factura de proveedor ListOfSupplierProductForSupplier=Listado de productos y precios del proveedor %s NoneOrBatchFileNeverRan=Ninguno o lote %s no se ha ejecutado recientemente SentToSuppliers=Enviado a proveedores +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/et_EE/accountancy.lang +++ b/htdocs/langs/et_EE/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 3eddc28456e..38c75eb486a 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Viga: see moodul nõuab Dolibarri versiooni %s ErrorDecimalLargerThanAreForbidden=Viga, suurem täpsus kui %s ei ole toetatud. DictionarySetup=Sõnaraamatu seadistamine Dictionary=Sõnaraamatud +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Tüübi väärtused 'system' ja 'systemauto' on reserveeritud. Omaloodud kirje väärtuseks võib kasutada väärtust 'user'. ErrorCodeCantContainZero=Kood ei või sisaldada väärtust 0 DisableJavascript=Lülita JavaScripti ja Ajaxi funktsioonid välja (soovitatav vaegnägijate või tekstibrauserite jaoks) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automaatne, kui Javascript on keelatud AvailableOnlyIfJavascriptNotDisabled=Saadaval ainult siis, kui JavaScript pole keelatud AvailableOnlyIfJavascriptAndAjaxNotDisabled=Saadaval ainult siis, kui JavaScript pole keelatud Required=Nõutud +UsedOnlyWithTypeOption=Used by some agenda option only Security=Turvalisus Passwords=Paroolid DoNotStoreClearPassword=Ära säilita paroole andmebaasis avatud tekstis, vaid ainult krüpteeritud väärtusi (soovitatav aktiveeritud). diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang index ba48eabd616..1c20d11fe65 100644 --- a/htdocs/langs/et_EE/agenda.lang +++ b/htdocs/langs/et_EE/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=Sündmuse ID Actions=Tegevused ActionsArea=Tegevuste ala (sündmused ja ülesanded) -Agenda= Päevakava -Agendas= Päevakavad -Calendar= Kalender -Calendars= Kalendrid -LocalAgenda=Kohalik kalender +Agenda=Päevakava +Agendas=Päevakavad +Calendar=Kalender +Calendars=Kalendrid +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Mõjutatud isik DoneBy=Teinud isik Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Kõik lõpetamata tegevused MenuDoneActions=Kõik lõpetatud tegevused MenuToDoMyActions=Minu lõpetamata tegevused MenuDoneMyActions=Minu lõpetatud tegevused -ListOfEvents=Dolibarri tegevused +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Tegevused, mille sisestas ActionsToDoBy=Tegevused, mis on seotud ActionsDoneBy=Tegevused, mille tegi @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL .ical failile ligi pääsemiseks ExtSiteNoLabel=Kirjeldus puudub WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang index 417088dfb25..27a785e02d2 100644 --- a/htdocs/langs/et_EE/categories.lang +++ b/htdocs/langs/et_EE/categories.lang @@ -66,7 +66,7 @@ ReturnInCompany=Tagasi kliendi/huvilise kaardile ContentsVisibleByAll=Antud sisu on kõigile nähtav ContentsVisibleByAllShort=Sisu on kõigile nähtav ContentsNotVisibleByAllShort=Sisu ei ole kõigile nähtav -# CategoriesTree=Categories tree +CategoriesTree=Kategooriate puu DeleteCategory=Kustuta kategooria ConfirmDeleteCategory=Kas oled kindel, et soovid antud kategooria kustutada? RemoveFromCategory=Eemalda seos kategooriaga @@ -105,9 +105,10 @@ CatProdLinks=Toodete/teenuste ja kategooriate vahelised seosed CatCusLinks=Klientide/huviliste ja kategooriate vahelised sosed CatSupLinks=Hankijate ja kategooriate vahelised seosed DeleteFromCat=Eemalda kategooriast -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Pildi kustutamine +ConfirmDeletePicture=Kinnitada pildi kustutamine? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Kategooriate seadistamine +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang index 6f332fe05ef..4b94f2e23e3 100644 --- a/htdocs/langs/et_EE/companies.lang +++ b/htdocs/langs/et_EE/companies.lang @@ -18,7 +18,7 @@ NewCompany=Uus ettevõte (pot klient, klient, hankija) NewThirdParty=Uus kolmas isik (pot klient, klient, hankija) NewSocGroup=Uus ettevõtete grupp NewPrivateIndividual=Uus eraisik (pot klient, klient, hankija) -CreateDolibarrThirdPartySupplier=Create a third party (supplier) +CreateDolibarrThirdPartySupplier=Loo kolmas isik (hankija) ProspectionArea=Huviliste ala SocGroup=Ettevõtete grupp IdThirdParty=Kolmanda osapoole ID @@ -83,7 +83,7 @@ DefaultLang=Vaikimisi keel VATIsUsed=Käibemaksuga VATIsNotUsed=Käibemaksuta CopyAddressFromSoc=Kasuta aadressivälja täitmiseks kolmanda isiku aadressi -NoEmailDefined=There is no email defined +NoEmailDefined=Ühtki e-posti aadressi pole määratletud ##### Local Taxes ##### LocalTax1IsUsedES= RE on kasutuses LocalTax1IsNotUsedES= RE pole kasutuses @@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF on kasutuses LocalTax2IsNotUsedES= IRPF pole kasutuses LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeLocaltax1ES=RE liik +TypeLocaltax2ES=IRPF liik +TypeES=Liik ThirdPartyEMail=%s WrongCustomerCode=Vigane kliendi kood WrongSupplierCode=Vigane hankija kood @@ -367,10 +367,10 @@ ExportCardToFormat=Ekspordi kaart formaati ContactNotLinkedToCompany=Kontakt ole seotud ühegi kolmanda isikuga DolibarrLogin=Dolibarri kasutaja NoDolibarrAccess=Dolibarri ligipääs puudub -ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_1=Kolmandad isikud (äriühingud/sihtasutused/füüsilised isikud) ja nende omadused ExportDataset_company_2=Kontaktid ja omadused -ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties -ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes +ImportDataset_company_1=Kolmandad isikud (äriühingud/sihtasutused/füüsilised isikud) ja nende omadused +ImportDataset_company_2=Kontaktid/aadressid (k.a kolmandad isikud) ja nende atribuudid ImportDataset_company_3=Pangarekvisiidid PriceLevel=Hinnatase DeliveriesAddress=Tarneaadressid @@ -397,16 +397,18 @@ YouMustCreateContactFirst=Pead looma kolmanda isikuga seotud e-posti kontaktid e ListSuppliersShort=Hankijate nimekiri ListProspectsShort=Huviliste nimekiri ListCustomersShort=Klientide nimekiri -ThirdPartiesArea=Kolmandate isikute ala +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Viimased %s muudetud kolmandat isikut UniqueThirdParties=Kokku unikaalseid kolmandaid isikuid InActivity=Avatud ActivityCeased=Suletud ActivityStateFilter=Aktiivsuse staatus -ProductsIntoElements=List of products into %s +ProductsIntoElements=Toodete nimekiri kohta %s CurrentOutstandingBill=Hetkel maksmata summa OutstandingBill=Suurim võimalik maksmata arve OutstandingBillReached=Jõudis maksmata summa maksimumini MonkeyNumRefModelDesc=Tagasta arv formaadiga %syymm-nnnn kliendikoodi jaoks ja %syymm-nnnn hankija koodi jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestuseta jada, mille väärtus pole kunagi 0. LeopardNumRefModelDesc=Kood on vaba, seda saab igal ajal muuta. -ManagingDirectors=Manager(s) name (CEO, director, president...) +ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang index 8c7afa0e642..9bf7a32486f 100644 --- a/htdocs/langs/et_EE/compta.lang +++ b/htdocs/langs/et_EE/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Raamatupidamise kokkuvõte ByProductsAndServices=Toodete ja teenuste kaupa RefExt=Väline viide ToCreateAPredefinedInvoice=Ettemääratud arve loomiseks loo tavaline arve ja vahepeal arvet kinnitamata klõpsa nupul "Teisenda ettemääratud arveks" -LinkedOrder=seotud tellimusega +LinkedOrder=Link to order ReCalculate=Arvuta uuesti Mode1=Meetod 1 Mode2=Meetod 2 @@ -202,5 +202,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Vaikimisi kasutatav raamatupidamise kood klientide loomisel -ACCOUNTING_ACCOUNT_SUPPLIER=Vaikimisi kasutatav raamatupidamise kood hankijate loomisel +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang index 4d7ec8e3813..c48ea815122 100644 --- a/htdocs/langs/et_EE/donations.lang +++ b/htdocs/langs/et_EE/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Otsi annetust DonationRecipient=Annetuse saaja ThankYou=Täname Teid IConfirmDonationReception=Saaja kinnitab saadava summa vastu võtmist annetusena summas +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang index 242eb3613e0..745184c4a4a 100644 --- a/htdocs/langs/et_EE/errors.lang +++ b/htdocs/langs/et_EE/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Viga: selle võimaluse kasutamiseks peab PHPs olema võimalda ErrorOpenIDSetupNotComplete=Dolibarri seadistusfail lubab OpenIDga autentimist, ent konstandis %s ei ole OpenID teenuse URL määratletud ErrorWarehouseMustDiffers=Lähteladu ja sihtladu peavad olema erinevad ErrorBadFormat=Vigane vorming! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Hoiatus: selle kasti kasutamine muudab kõik seda ka WarningClickToDialUserSetupNotComplete=Sinu kasutaja ClickToDial info seadistamine ei ole lõpetatud (vaata oma kasutaja kaardi ClickToDial sakki). WarningNotRelevant=Selle andmehulga juures ei ole see tegevus otstarbekas WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang index 372a684ee5e..f553c68d103 100644 --- a/htdocs/langs/et_EE/holiday.lang +++ b/htdocs/langs/et_EE/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=Personalihaldus -Holidays=Puhkused -CPTitreMenu=Puhkused +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Kuu aruanne -MenuAddCP=Taotle puhkust -NotActiveModCP=Selle lehe vaatamiseks pead sisse lülitama puhkuste mooduli -NotConfigModCP=Selle lehe vaatamiseks pead seadistama puhkuste mooduli. Selle jaoks klõpsa siia. -NoCPforUser=Sul ei ole puhkuse vajadust. -AddCP=Taotle puhkust +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Töötaja DateDebCP=Alguskuupäev DateFinCP=Lõppkuupäev @@ -18,24 +18,24 @@ ApprovedCP=Heaks kiidetud CancelCP=Tühistatud RefuseCP=Keeldutud ValidatorCP=Heaks kiitja -ListeCP=Puhkuste nimekiri +ListeCP=List of leaves ReviewedByCP=Ülevaatav isik DescCP=Kirjeldus -SendRequestCP=Puhkusevajaduste loomine -DelayToRequestCP=Puhkusetaotlusd peab esitama vähemalt %s päev(a) enne puhkust. -MenuConfCP=Puhkuste saldo -UpdateAllCP=Uuenda puhkusi -SoldeCPUser=Puhkuste saldo on %s päeva. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Lõppkuupäev peab olema alguskuupäevast suurem. ErrorSQLCreateCP=Loomisel tekkis SQLi viga: -ErrorIDFicheCP=Tekkis viga, puhkusetaotlust ei ole olemas. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Mine tagasi eelmisele lehele -ErrorUserViewCP=Sul ei ole ligipääsuõigusi antud puhkusetaotluse vaatamiseks. -InfosCP=Puhkusevajaduse info +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Informatsiooni töövoog RequestByCP=Taotles -TitreRequestCP=Puhkuste leht -NbUseDaysCP=Kulutatud puhkusepäevade arv +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Muuda DeleteCP=Kustuta ActionValidCP=Kinnita @@ -43,26 +43,26 @@ ActionRefuseCP=Keeldu ActionCancelCP=Tühista StatutCP=Staatus SendToValidationCP=Saada kinnitamiseks -TitleDeleteCP=Kustuta puhkusetaotlus -ConfirmDeleteCP=Kas oled täiesti kindel, et soovid antud puhkusetaotluse kustutada? -ErrorCantDeleteCP=Viga: antud puhkusetaotluse kustutamiseks puuduvad õigused. -CantCreateCP=Puhkusetaotluse esitamiseks puuduvad õigused. -InvalidValidatorCP=Puhkuse taotluse jaoks peab valima heaks kiitja. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Uuenda -CantUpdate=Seda puhkusetaotlust ei saa uuendada. +CantUpdate=You cannot update this leave request. NoDateDebut=Pead valima alguskuupäeva. NoDateFin=Pead valima lõppkuupäeva. ErrorDureeCP=Puhkusetaotlus ei sisalda ühtki tööpäeva. TitleValidCP=Kiida puhkusetaotlus heaks -ConfirmValidCP=Kas oled täiesti kindel, et soovid antud puhkusetaotluse heaks kiita? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Kuupäev heaks kiidetud -TitleToValidCP=Saada puhkusetaotlus -ConfirmToValidCP=Kas oled täiesti kindel, et soovid puhkusetaotluse saata? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Keeldu puhkusetaotlusest -ConfirmRefuseCP=Kas oled täiesti kindel, et soovid antud puhkusetaotlusest keelduda? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Keeldumiseks peab valima põhjuse. TitleCancelCP=Tühista puhkusetaotlus -ConfirmCancelCP=Kas oled täiesti kindel, et soovid puhkusetaotluse tühistada? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Keeldumise põhjus DateRefusCP=Keeldumise kuupäev DateCancelCP=Tühistamise kuupäev @@ -72,8 +72,8 @@ MotifCP=Põhjus UserCP=Kasutaja ErrorAddEventToUserCP=Erakorralise puhkuse lisamisel tekkis viga AddEventToUserOkCP=Erakorralise puhkuse lisamine edukalt lõpetatud. -MenuLogCP=Vaata puhkuste logi -LogCP=Puhkuste uuenduste logi +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Sooritas UserUpdateCP=Kasutajale PrevSoldeCP=Eelmine saldo @@ -81,33 +81,33 @@ NewSoldeCP=Uus saldo alreadyCPexist=Antud perioodi jaoks on juba puhkusetaotlus esitatud. UserName=Nimi Employee=Töötaja -FirstDayOfHoliday=Puhkuse esimene kuupäev -LastDayOfHoliday=Puhkuse viimane kuupäev +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Igakuine uuendus ManualUpdate=Käsitsi uuendus -HolidaysCancelation=Puhkuste tühistamine +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Puhkuste mooduli seadistamine DescOptionCP=Valiku kirjeldus ValueOptionCP=Väärtus -GroupToValidateCP=Grupp, kes võib puhkusi heaks kiita +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Valideeri seadistus -LastUpdateCP=Puhkuste viimane automaatne uuendus +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Edukalt uuendatud. ErrorUpdateConfCP=Uuendamise ajal tekkis viga, palun proovi uuesti. AddCPforUsers=Palun lisa kasutajate puhkuste saldo siia klõpsates. DelayForSubmitCP=Puhkusetaotluste esitamise tähtaeg AlertapprobatortorDelayCP=Peata heakskiit, kui puhkusetaotlus ei vasta tähtajale -AlertValidatorDelayCP=Pea heakskiit, kui puhkusetaotlus ületab viivitust -AlertValidorSoldeCP=Peata heakskiit, kui puhkusetaotlus ületab saldot -nbUserCP=Puhkuste moodulis toetatud kasutajate arv -nbHolidayDeductedCP=Kasutatud puhkusepäeva kohta lahutatav puhkuste arv -nbHolidayEveryMonthCP=Igas kuus lisatavate puhkuste arv -Module27130Name= Puhkuste haldamine -Module27130Desc= Puhkuste haldamine -TitleOptionMainCP=Puhkuste põhilised seaded -TitleOptionEventCP=Puhkuste ja tegevuste vahelised seosed +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Kinnita UpdateEventCP=Uuenda tegevused CreateEventCP=Loo @@ -127,23 +127,23 @@ UpdateEventOptionCP=Uuenda ErrorMailNotSend=E-kirja saatmisel tekkis viga: NoCPforMonth=Sellel kuul pole puhkusi. nbJours=Päevade arv -TitleAdminCP=Puhkuste seadistamine +TitleAdminCP=Configuration of Leaves #Messages Hello=Tere -HolidaysToValidate=Kinnita puhkused -HolidaysToValidateBody=Allpool on kinnitamist nõudvad puhkusetaotlused -HolidaysToValidateDelay=Selle taotluse puhkus toimub perioodil, mis on lühem kui %s päeva. -HolidaysToValidateAlertSolde=Antud puhkusetaotluse esitanud kasutajal pole piisavalt päevi saadaval. -HolidaysValidated=Kinnitatud puhkused -HolidaysValidatedBody=Sinu puhkusetaotlus alates %s kuni %s on kinnitatud. -HolidaysRefused=Tagasi lükatud puhkused -HolidaysRefusedBody=Sinu puhkusetaotlus alates %s kuni %s on tagasi lükatud põhjusel: -HolidaysCanceled=Tühistatud puhkused -HolidaysCanceledBody=Sinu puhkusetaotlus alates %s kuni %s on tühistatud. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Muudetud puhkuste logi vaatamine -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang index 90b557e55d6..1d89a7a0bee 100644 --- a/htdocs/langs/et_EE/interventions.lang +++ b/htdocs/langs/et_EE/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Sekkuja nimi ja allkiri: NameAndSignatureOfExternalContact=Kliendi nimi ja allkiri: DocumentModelStandard=Sekkumiste tüüpvormi mudel InterventionCardsAndInterventionLines=Sekkumised ja sekkumiste read -ClassifyBilled=Liigita "Arve esitatud" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Arve esitatud RelatedInterventions=Seotud sekkumised ShowIntervention=Näita sekkumist +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Sekkumise järelkontrolliga tegelev müügiesindaja TypeContact_fichinter_internal_INTERVENING=Sekkuv diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang index aaacd99c22f..ecb040b20a8 100644 --- a/htdocs/langs/et_EE/projects.lang +++ b/htdocs/langs/et_EE/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Projekti tegevused YouAreNotContactOfProject=Sa ei ole antud privaatse projekti kontakt DeleteATimeSpent=Kustuta kulutatud aeg ConfirmDeleteATimeSpent=Kas oled kindel, et soovid selle kulutatud aja kustutada? -DoNotShowMyTasksOnly=Vaata ka ülesandeid, mis ei ole minule määratud -ShowMyTasksOnly=Vaata ainult minule määratud ülesandeid +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressursid ProjectsDedicatedToThisThirdParty=Selle kolmanda isikuga seotud projektid NoTasks=Selle projektiga ei ole seotud ühtki ülesannet LinkedToAnotherCompany=Seotud muu kolmanda isikuga -TaskIsNotAffectedToYou=Ülesanne ei ole sinule määratud +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Kulutatud aeg on tüh ThisWillAlsoRemoveTasks=See kustutab ka kõik projekti ülesanded (hetkel %s ülesannet) ja kõik kulutatud aja sisestused. IfNeedToUseOhterObjectKeepEmpty=Kui mingid projekti loomiseks vajalikud objektid (arve, tellimus jne) kuuluvad mõnele muule kolmandale isikule, siis jäta see tühjaks, et oleks projekti võimalik siduda mitme kolmanda isikuga. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Toetaja TypeContact_project_task_external_TASKCONTRIBUTOR=Toetaja SelectElement=Vali element AddElement=Seosta elemendiga +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Täielik projekti aruande mudel (logo jne) PlannedWorkload = Planeeritav koormus @@ -128,3 +129,4 @@ ProjectReferers=Viitavad objektid SearchAProject=Otsi projekti ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama ProjectDraft=Projektide mustandid +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang index 38201659c22..0b787d804e3 100644 --- a/htdocs/langs/et_EE/sendings.lang +++ b/htdocs/langs/et_EE/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistika põhineb vaid kinnitatud saadetistel. K DateDeliveryPlanned=Plaanitud kohaletoimetamise aeg DateReceived=Saadetise kättesaamise kuupäev SendShippingByEMail=Saada saadetis e-postiga -SendShippingRef=Läheta saadetis %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Saatmisel toimuvad tegevused LinkToTrackYourPackage=Paki jälgimise link ShipmentCreationIsDoneFromOrder=Praegu luuakse saadetised tellimuse kaardilt. @@ -66,11 +66,13 @@ CarrierList=Vedajate nimekiri SendingMethodCATCH=Kliendi saak SendingMethodTRANS=Transportija SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Lihtne saatelehtede dokumendi mudel DocumentModelTyphon=Täiuslikum saatelehtede dokumendi mudel (logo jne) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER on määratlemata SumOfProductVolumes=Toodete ruumala summa SumOfProductWeights=Toodete kaalude summa + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang index 6a05b9bc0e3..fb019da9c5f 100644 --- a/htdocs/langs/et_EE/suppliers.lang +++ b/htdocs/langs/et_EE/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Loo ostuarve ListOfSupplierProductForSupplier=Hankija %s toodete ja hindade nimekiri NoneOrBatchFileNeverRan=Puudub või partiid %s pole hiljuti käivitatud SentToSuppliers=Saadetud hankijatele +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/eu_ES/accountancy.lang +++ b/htdocs/langs/eu_ES/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index 475bf8e4b1e..a48b51c952b 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang index adf9cc32f1a..9b3efc07dab 100644 --- a/htdocs/langs/eu_ES/agenda.lang +++ b/htdocs/langs/eu_ES/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Events ActionsArea=Events area (Actions and tasks) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang index b28086fa933..ed61bfc08a6 100644 --- a/htdocs/langs/eu_ES/categories.lang +++ b/htdocs/langs/eu_ES/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -# Category=Category -# Categories=Categories -# Rubrique=Category -# Rubriques=Categories -# categories=categories -# TheCategorie=The category -# NoCategoryYet=No category of this type created -# In=In -# AddIn=Add in -# modify=modify -# Classify=Classify -# CategoriesArea=Categories area -# ProductsCategoriesArea=Products/Services categories area -# SuppliersCategoriesArea=Suppliers categories area -# CustomersCategoriesArea=Customers categories area -# ThirdPartyCategoriesArea=Third parties categories area -# MembersCategoriesArea=Members categories area -# ContactsCategoriesArea=Contacts categories area -# MainCats=Main categories -# SubCats=Subcategories -# CatStatistics=Statistics -# CatList=List of categories -# AllCats=All categories -# ViewCat=View category -# NewCat=Add category -# NewCategory=New category -# ModifCat=Modify category -# CatCreated=Category created -# CreateCat=Create category -# CreateThisCat=Create this category -# ValidateFields=Validate the fields -# NoSubCat=No subcategory. -# SubCatOf=Subcategory -# FoundCats=Found categories -# FoundCatsForName=Categories found for the name : -# FoundSubCatsIn=Subcategories found in the category -# ErrSameCatSelected=You selected the same category several times -# ErrForgotCat=You forgot to choose the category -# ErrForgotField=You forgot to inform the fields -# ErrCatAlreadyExists=This name is already used -# AddProductToCat=Add this product to a category? -# ImpossibleAddCat=Impossible to add the category -# ImpossibleAssociateCategory=Impossible to associate the category to -# WasAddedSuccessfully=%s was added successfully. -# ObjectAlreadyLinkedToCategory=Element is already linked to this category. -# CategorySuccessfullyCreated=This category %s has been added with success. -# ProductIsInCategories=Product/service owns to following categories -# SupplierIsInCategories=Third party owns to following suppliers categories -# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -# MemberIsInCategories=This member owns to following members categories -# ContactIsInCategories=This contact owns to following contacts categories -# ProductHasNoCategory=This product/service is not in any categories -# SupplierHasNoCategory=This supplier is not in any categories -# CompanyHasNoCategory=This company is not in any categories -# MemberHasNoCategory=This member is not in any categories -# ContactHasNoCategory=This contact is not in any categories -# ClassifyInCategory=Classify in category -# NoneCategory=None -# NotCategorized=Without category -# CategoryExistsAtSameLevel=This category already exists with this ref -# ReturnInProduct=Back to product/service card -# ReturnInSupplier=Back to supplier card -# ReturnInCompany=Back to customer/prospect card -# ContentsVisibleByAll=The contents will be visible by all -# ContentsVisibleByAllShort=Contents visible by all -# ContentsNotVisibleByAllShort=Contents not visible by all -# CategoriesTree=Categories tree -# DeleteCategory=Delete category -# ConfirmDeleteCategory=Are you sure you want to delete this category ? -# RemoveFromCategory=Remove link with categorie -# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -# NoCategoriesDefined=No category defined -# SuppliersCategoryShort=Suppliers category -# CustomersCategoryShort=Customers category -# ProductsCategoryShort=Products category -# MembersCategoryShort=Members category -# SuppliersCategoriesShort=Suppliers categories -# CustomersCategoriesShort=Customers categories -# CustomersProspectsCategoriesShort=Custo./Prosp. categories -# ProductsCategoriesShort=Products categories -# MembersCategoriesShort=Members categories -# ContactCategoriesShort=Contacts categories -# ThisCategoryHasNoProduct=This category does not contain any product. -# ThisCategoryHasNoSupplier=This category does not contain any supplier. -# ThisCategoryHasNoCustomer=This category does not contain any customer. -# ThisCategoryHasNoMember=This category does not contain any member. -# ThisCategoryHasNoContact=This category does not contain any contact. -# AssignedToCustomer=Assigned to a customer -# AssignedToTheCustomer=Assigned to the customer -# InternalCategory=Internal category -# CategoryContents=Category contents -# CategId=Category id -# CatSupList=List of supplier categories -# CatCusList=List of customer/prospect categories -# CatProdList=List of products categories -# CatMemberList=List of members categories -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/eu_ES/companies.lang +++ b/htdocs/langs/eu_ES/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/eu_ES/compta.lang +++ b/htdocs/langs/eu_ES/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/eu_ES/donations.lang b/htdocs/langs/eu_ES/donations.lang index 12a72464cae..66ddea95a5c 100644 --- a/htdocs/langs/eu_ES/donations.lang +++ b/htdocs/langs/eu_ES/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -# Donation=Donation -# Donations=Donations -# DonationRef=Donation ref. -# Donor=Donor -# Donors=Donors -# AddDonation=Add a donation -# NewDonation=New donation -# ShowDonation=Show donation -# DonationPromise=Gift promise -# PromisesNotValid=Not validated promises -# PromisesValid=Validated promises -# DonationsPaid=Donations paid -# DonationsReceived=Donations received -# PublicDonation=Public donation -# DonationsNumber=Donation number -# DonationsArea=Donations area -# DonationStatusPromiseNotValidated=Draft promise -# DonationStatusPromiseValidated=Validated promise -# DonationStatusPaid=Donation received -# DonationStatusPromiseNotValidatedShort=Draft -# DonationStatusPromiseValidatedShort=Validated -# DonationStatusPaidShort=Received -# ValidPromess=Validate promise -# DonationReceipt=Donation receipt -# BuildDonationReceipt=Build receipt -# DonationsModels=Documents models for donation receipts -# LastModifiedDonations=Last %s modified donations -# SearchADonation=Search a donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Add a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/eu_ES/errors.lang +++ b/htdocs/langs/eu_ES/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/eu_ES/holiday.lang +++ b/htdocs/langs/eu_ES/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang index 0a5b3e15467..17641a0ab3e 100644 --- a/htdocs/langs/eu_ES/interventions.lang +++ b/htdocs/langs/eu_ES/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -# Intervention=Intervention -# Interventions=Interventions -# InterventionCard=Intervention card -# NewIntervention=New intervention -# AddIntervention=Add intervention -# ListOfInterventions=List of interventions -# EditIntervention=Edit intervention -# ActionsOnFicheInter=Actions on intervention -# LastInterventions=Last %s interventions -# AllInterventions=All interventions -# CreateDraftIntervention=Create draft -# CustomerDoesNotHavePrefix=Customer does not have a prefix -# InterventionContact=Intervention contact -# DeleteIntervention=Delete intervention -# ValidateIntervention=Validate intervention -# ModifyIntervention=Modify intervention -# DeleteInterventionLine=Delete intervention line -# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -# ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -# NameAndSignatureOfInternalContact=Name and signature of intervening : -# NameAndSignatureOfExternalContact=Name and signature of customer : -# DocumentModelStandard=Standard document model for interventions -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -# ClassifyBilled=Classify "Billed" -# StatusInterInvoiced=Billed -# RelatedInterventions=Related interventions -# ShowIntervention=Show intervention +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Add intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### -# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -# TypeContact_fichinter_internal_INTERVENING=Intervening -# TypeContact_fichinter_external_BILLING=Billing customer contact -# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact # Modele numérotation -# ArcticNumRefModelDesc1=Generic number model -# ArcticNumRefModelError=Failed to activate -# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/eu_ES/projects.lang +++ b/htdocs/langs/eu_ES/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang index 3bb65c295d2..2ae43f39766 100644 --- a/htdocs/langs/eu_ES/sendings.lang +++ b/htdocs/langs/eu_ES/sendings.lang @@ -1,76 +1,78 @@ # Dolibarr language file - Source file is en_US - sendings -# RefSending=Ref. shipment -# Sending=Shipment -# Sendings=Shipments -# Shipment=Shipment -# Shipments=Shipments -# Receivings=Receivings -# SendingsArea=Shipments area -# ListOfSendings=List of shipments -# SendingMethod=Shipping method -# SendingReceipt=Shipping receipt -# LastSendings=Last %s shipments -# SearchASending=Search for shipment -# StatisticsOfSendings=Statistics for shipments -# NbOfSendings=Number of shipments -# NumberOfShipmentsByMonth=Number of shipments by month -# SendingCard=Shipping card -# NewSending=New shipment -# CreateASending=Create a shipment -# CreateSending=Create shipment -# QtyOrdered=Qty ordered -# QtyShipped=Qty shipped -# QtyToShip=Qty to ship -# QtyReceived=Qty received -# KeepToShip=Keep to ship -# OtherSendingsForSameOrder=Other shipments for this order -# DateSending=Date sending order -# DateSendingShort=Date sending order -# SendingsForSameOrder=Shipments for this order -# SendingsAndReceivingForSameOrder=Shipments and receivings for this order -# SendingsToValidate=Shipments to validate -# StatusSendingCanceled=Canceled -# StatusSendingDraft=Draft -# StatusSendingValidated=Validated (products to ship or already shipped) -# StatusSendingProcessed=Processed -# StatusSendingCanceledShort=Canceled -# StatusSendingDraftShort=Draft -# StatusSendingValidatedShort=Validated -# StatusSendingProcessedShort=Processed -# SendingSheet=Sending sheet -# Carriers=Carriers -# Carrier=Carrier -# CarriersArea=Carriers area -# NewCarrier=New carrier -# ConfirmDeleteSending=Are you sure you want to delete this shipment ? -# ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? -# ConfirmCancelSending=Are you sure you want to cancel this shipment ? -# GenericTransport=Generic transport -# Enlevement=Gotten by customer -# DocumentModelSimple=Simple document model -# DocumentModelMerou=Merou A5 model -# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -# DateDeliveryPlanned=Planed date of delivery -# DateReceived=Date delivery received -# SendShippingByEMail=Send shipment by EMail -# SendShippingRef=Send shipment %s -# ActionsOnShipping=Events on shipment -# LinkToTrackYourPackage=Link to track your package -# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +Receivings=Receivings +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipping card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Keep to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Sending sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang index 01c90ede80f..b1545d6ca3c 100644 --- a/htdocs/langs/eu_ES/suppliers.lang +++ b/htdocs/langs/eu_ES/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers -# Suppliers=Suppliers -# Supplier=Supplier -# AddSupplier=Add a supplier -# SupplierRemoved=Supplier removed -# SuppliersInvoice=Suppliers invoice -# NewSupplier=New supplier -# History=History -# ListOfSuppliers=List of suppliers -# ShowSupplier=Show supplier -# OrderDate=Order date -# BuyingPrice=Buying price -# BuyingPriceMin=Minimum buying price -# BuyingPriceMinShort=Min buying price -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined -# AddSupplierPrice=Add supplier price -# ChangeSupplierPrice=Change supplier price -# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -# NoRecordedSuppliers=No suppliers recorded -# SupplierPayment=Supplier payment -# SuppliersArea=Suppliers area -# RefSupplierShort=Ref. supplier -# Availability=Availability -# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -# ExportDataset_fournisseur_2=Supplier invoices and payments -# ExportDataset_fournisseur_3=Supplier orders and order lines -# ApproveThisOrder=Approve this order -# ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -# DenyingThisOrder=Denying this order -# ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -# ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -# AddCustomerOrder=Create customer order -# AddCustomerInvoice=Create customer invoice -# AddSupplierOrder=Create supplier order -# AddSupplierInvoice=Create supplier invoice -# ListOfSupplierProductForSupplier=List of products and prices for supplier %s -# NoneOrBatchFileNeverRan=None or batch %s not ran recently -# SentToSuppliers=Sent to suppliers +Suppliers=Suppliers +Supplier=Supplier +AddSupplier=Add a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Denying this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/fa_IR/accountancy.lang +++ b/htdocs/langs/fa_IR/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index 8372785b3d2..1ecf3e51e85 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=خطا، این ماژول نیاز به Dolib ErrorDecimalLargerThanAreForbidden=خطا، دقت بالاتر از٪ s پشتیبانی نمی شود. DictionarySetup=راه اندازی فرهنگ لغت Dictionary=واژه نامه ها +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=ارزش 'سیستم' و 'systemauto برای نوع محفوظ است. شما می توانید 'کاربر' به عنوان ارزش برای اضافه کردن رکورد خود استفاده کنید ErrorCodeCantContainZero=کد می تواند مقدار 0 را شامل نمی شود DisableJavascript=توابع غیر فعال کردن جاوا اسکریپت و آژاکس (توصیه شده برای فرد نابینا یا مرورگرهای متنی) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=به صورت خودکار اگر جاوا اسک AvailableOnlyIfJavascriptNotDisabled=فقط در صورت های جاوا اسکریپت غیر فعال است AvailableOnlyIfJavascriptAndAjaxNotDisabled=فقط در صورت های جاوا اسکریپت غیر فعال است Required=ضروری +UsedOnlyWithTypeOption=Used by some agenda option only Security=امنیت Passwords=کلمه عبور DoNotStoreClearPassword=آیا بدون رمز عبور روشن ذخیره در پایگاه داده، اما ذخیره تنها مقدار رمز شده (فعال توصیه می شود) diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang index cee07a91e3c..38229070eaa 100644 --- a/htdocs/langs/fa_IR/agenda.lang +++ b/htdocs/langs/fa_IR/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=رویداد ID Actions=رویدادها ActionsArea=منطقه رویدادها (عملیات و وظایف) -Agenda= دستور کار -Agendas= برنامه -Calendar= تقویم -Calendars= تقویم -LocalAgenda=تقویم محلی +Agenda=دستور کار +Agendas=برنامه +Calendar=تقویم +Calendars=تقویم +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=واگذار شده به DoneBy=انجام شده توسط Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=همه رویدادها ناقص MenuDoneActions=همه رویدادها خاتمه یافته MenuToDoMyActions=رویدادهای ناقص من MenuDoneMyActions=رویدادهای خاتمه من -ListOfEvents=فهرست وقایع Dolibarr +ListOfEvents=List of events (internal calendar) ActionsAskedBy=رویدادهای گزارش شده توسط ActionsToDoBy=رویدادهای اختصاص یافته به ActionsDoneBy=رویدادهای انجام شده توسط @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=فایل مقرون URL برای دسترسی به. ExtSiteNoLabel=بدون شرح WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang index 53d7abd3002..ac356400750 100644 --- a/htdocs/langs/fa_IR/categories.lang +++ b/htdocs/langs/fa_IR/categories.lang @@ -42,9 +42,9 @@ ErrCatAlreadyExists=این نام قبلا استفاده شده AddProductToCat=اضافه کردن این محصول را به یک موضوع؟ ImpossibleAddCat=غیر ممکن برای اضافه کردن گروه ImpossibleAssociateCategory=غیر ممکن است از دسته -WasAddedSuccessfully=%s با موفقیت اضافه شد. +WasAddedSuccessfully=٪ s با موفقیت اضافه شد. ObjectAlreadyLinkedToCategory=عنصر در حال حاضر به این گروه مرتبط است. -CategorySuccessfullyCreated=این رده در%s را با موفقیت اضافه شده است. +CategorySuccessfullyCreated=این رده در٪ s را با موفقیت اضافه شده است. ProductIsInCategories=محصولات / خدمات دارای به مقوله های زیر است SupplierIsInCategories=شخص ثالث صاحب به زیر تامین کنندگان مجموعه ها CompanyIsInCustomersCategories=این شخص ثالث صاحب به زیر مشتریان / چشم انداز مجموعه ها @@ -111,3 +111,4 @@ ExtraFieldsCategories=ویژگی های مکمل CategoriesSetup=شاخه ها راه اندازی CategorieRecursiv=پیوند با گروه پدر و مادر به طور خودکار CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته پدر و مادر مرتبط است که با اضافه کردن به زیرشاخه +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang index 538b392b4ea..ed26730f90b 100644 --- a/htdocs/langs/fa_IR/companies.lang +++ b/htdocs/langs/fa_IR/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=شما باید ایمیل تماس برای شخص ث ListSuppliersShort=فهرست تامین کنندگان ListProspectsShort=فهرست چشم انداز ListCustomersShort=فهرست مشتریان -ThirdPartiesArea=منطقه احزاب سوم +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=تاریخ و زمان آخرین٪ بازدید کنندگان اشخاص ثالث اصلاح شده UniqueThirdParties=مجموع اشخاص ثالث منحصر به فرد InActivity=باز @@ -410,3 +410,5 @@ OutstandingBillReached=رسیدم حداکثر. برای لایحه برجسته MonkeyNumRefModelDesc=numero بازگشت با فرمت syymm-NNNN برای کد مشتری و٪ syymm-NNNN برای کد منبع که در آن YY سال است٪، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است. LeopardNumRefModelDesc=کد آزاد است. این کد را می توان در هر زمان تغییر یافتهاست. ManagingDirectors=مدیر (بازدید کنندگان) نام (مدیر عامل شرکت، مدیر، رئيس جمهور ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang index 252a2597b7c..a022470e51a 100644 --- a/htdocs/langs/fa_IR/compta.lang +++ b/htdocs/langs/fa_IR/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=خلاصه حسابداری ByProductsAndServices=با محصولات و خدمات RefExt=کد عکس خارجی ToCreateAPredefinedInvoice=برای ایجاد یک فاکتور از پیش تعریف شده، ایجاد یک فاکتور استاندارد پس از آن، بدون تأیید آن، با کلیک بر روی دکمه "تبدیل به فاکتور از پیش تعریف شده". -LinkedOrder=وابسته به سفارش +LinkedOrder=Link to order ReCalculate=دوباره حساب کردن Mode1=روش 1 Mode2=روش 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت حسابداری نقدی مربوط نیست. این گزارش که با استفاده از تعامل حالت حسابداری (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است. CalculationMode=حالت محاسبه AccountancyJournal=کد حسابداری مجله -ACCOUNTING_PRODUCT_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید محصولات -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=کد پیش فرض حسابداری برای فروش محصولات -ACCOUNTING_SERVICE_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید خدمات -ACCOUNTING_SERVICE_SOLD_ACCOUNT=کد پیش فرض حسابداری به فروش خدمات -ACCOUNTING_VAT_ACCOUNT=پیش فرض کد حسابداری برای جمع آوری مالیات بر ارزش افزوده -ACCOUNTING_VAT_BUY_ACCOUNT=پیش فرض کد حسابداری برای پرداخت مالیات بر ارزش افزوده -ACCOUNTING_ACCOUNT_CUSTOMER=کد حسابداری به طور پیش فرض برای thirdparties مشتری -ACCOUNTING_ACCOUNT_SUPPLIER=کد حسابداری به طور پیش فرض برای thirdparties منبع +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang index af3a84a2a75..784735cf920 100644 --- a/htdocs/langs/fa_IR/donations.lang +++ b/htdocs/langs/fa_IR/donations.lang @@ -30,3 +30,4 @@ SearchADonation=جستجوی یک کمک مالی DonationRecipient=دریافت کننده کمک مالی ThankYou=با تشکر از شما IConfirmDonationReception=گیرنده اعلام پذیرش، به عنوان یک کمک مالی، از مقدار زیر +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang index 2b8a8c2fc35..12220688262 100644 --- a/htdocs/langs/fa_IR/errors.lang +++ b/htdocs/langs/fa_IR/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=خطا، PHP شما باید بخش٪ s نصب کرد ErrorOpenIDSetupNotComplete=شما راه اندازی Dolibarr فایل پیکربندی اجازه می دهد تا احراز هویت ایجاد حساب کاربری، اما URL خدمات ایجاد حساب کاربری به٪ ثابت تعریف نشده ErrorWarehouseMustDiffers=منبع و هدف انبارها باید متفاوت ErrorBadFormat=فرمت بد! -ErrorPaymentDateLowerThanInvoiceDate=تاریخ پرداخت (٪ بازدید کنندگان) نمی باشد قبل از تاریخ فاکتور (٪ s) برای فاکتور٪ است. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطا، این عضو هنوز رتبهدهی نشده است به هر thirdparty مرتبط است. عضو لینک به یک شخص ثالث موجود یا ایجاد یک thirdparty جدید قبل از ایجاد اشتراک با فاکتور. ErrorThereIsSomeDeliveries=خطا، برخی از زایمان مرتبط با این حمل و نقل وجود دارد. حذف خودداری کرد. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=اخطار، با استفاده از این جعب WarningClickToDialUserSetupNotComplete=راه اندازی از اطلاعات ClickToDial برای کاربر شما کامل نیست (ClickToDial زبانه دیدن بر روی کارت کاربر خود را). WarningNotRelevant=عملیات بی ربط برای این مجموعه داده WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=قابلیت غیر فعال زمانی که راه اندازی صفحه نمایش برای فرد نابینا یا از مرورگرهای متن بهینه شده است. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang index 29606821a20..691872b0e82 100644 --- a/htdocs/langs/fa_IR/holiday.lang +++ b/htdocs/langs/fa_IR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=تعطیلات -CPTitreMenu=تعطیلات +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=بیانیه ماهانه -MenuAddCP=درخواست برای تعطیلات -NotActiveModCP=شما باید تعطیلات ماژول را قادر می سازد به این صفحه. -NotConfigModCP=شما باید تعطیلات ماژول را پیکربندی کنید به این صفحه. برای این کار، اینجا را کلیک کنید . -NoCPforUser=شما یک تقاضا برای تعطیلات ندارد. -AddCP=درخواست برای تعطیلات +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=کارمند DateDebCP=تاریخ شروع DateFinCP=تاریخ پایان @@ -18,24 +18,24 @@ ApprovedCP=تایید شده CancelCP=لغو شد RefuseCP=رد ValidatorCP=Approbator -ListeCP=فهرست از تعطیلات +ListeCP=List of leaves ReviewedByCP=خواهد شد بررسی DescCP=توصیف -SendRequestCP=ایجاد تقاضا برای تعطیلات -DelayToRequestCP=برنامه های کاربردی برای تعطیلات باید حداقل%s را روز قبل از آنها ساخته شده است. -MenuConfCP=ویرایش تعادل از تعطیلات -UpdateAllCP=به روز رسانی تعطیلات -SoldeCPUser=تعادل تعطیلات%s روز است. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=شما باید تاریخ پایان بیشتر از تاریخ شروع انتخاب کنید. ErrorSQLCreateCP=خطای SQL در ایجاد رخ داده است: -ErrorIDFicheCP=یک خطا رخ داده است، درخواست برای تعطیلات وجود ندارد. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=بازگشت به صفحه قبل -ErrorUserViewCP=شما مجاز به خواندن این درخواست برای تعطیلات. -InfosCP=اطلاعات تقاضا از تعطیلات +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=گردش کار اطلاعات RequestByCP=درخواست شده توسط -TitreRequestCP=ورق از تعطیلات -NbUseDaysCP=تعداد روز از تعطیلات مصرف +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=ویرایش DeleteCP=حذف کردن ActionValidCP=معتبر ساختن @@ -43,26 +43,26 @@ ActionRefuseCP=رد کردن ActionCancelCP=لغو کردن StatutCP=وضعیت SendToValidationCP=ارسال به اعتبار سنجی -TitleDeleteCP=حذف درخواست از تعطیلات -ConfirmDeleteCP=تایید حذف این درخواست برای تعطیلات؟ -ErrorCantDeleteCP=خطا شما حق این درخواست تعطیلی را حذف کنید ندارد. -CantCreateCP=شما این حق را برای تعطیلات اعمال می شود ندارد. -InvalidValidatorCP=شما باید approbator به درخواست تعطیلات خود را انتخاب کنید. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=به روز رسانی -CantUpdate=شما می توانید این درخواست از تعطیلات به روز رسانی نیست. +CantUpdate=You cannot update this leave request. NoDateDebut=شما باید یک تاریخ شروع انتخاب کنید. NoDateFin=شما باید تاریخ پایان را انتخاب کنید. ErrorDureeCP=درخواست شما برای تعطیلات حاوی روز کار نمی کند. TitleValidCP=تصویب تعطیلات درخواست -ConfirmValidCP=آیا مطمئن هستید که می خواهید برای تایید درخواست تعطیلات؟ +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=تاریخ تصویب -TitleToValidCP=ارسال تعطیلات درخواست -ConfirmToValidCP=آیا مطمئن هستید که می خواهید برای ارسال درخواست از تعطیلات؟ +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=امتناع تعطیلات درخواست -ConfirmRefuseCP=آیا مطمئن هستید که می خواهید به رد درخواست از تعطیلات؟ +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=شما باید دلیلی برای امتناع از درخواست را انتخاب کنید. TitleCancelCP=لغو تعطیلات درخواست -ConfirmCancelCP=آیا مطمئن هستید که می خواهید برای صرفنظر کردن از درخواست از تعطیلات؟ +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=دلیل امتناع DateRefusCP=تاریخ امتناع DateCancelCP=عضویت لغو @@ -72,8 +72,8 @@ MotifCP=دلیل UserCP=کاربر ErrorAddEventToUserCP=در حالی که با اضافه کردن مرخصی استثنایی خطایی رخ داد. AddEventToUserOkCP=علاوه بر این از مرخصی استثنایی کامل شده است. -MenuLogCP=نمایش سیاهههای مربوط از تعطیلات -LogCP=ورود از به روز رسانی از تعطیلات +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=انجام شده توسط UserUpdateCP=برای کاربر PrevSoldeCP=موجودی قبلی @@ -81,33 +81,33 @@ NewSoldeCP=موجودی جدید alreadyCPexist=درخواست برای تعطیلات در حال حاضر در این دوره انجام می شود. UserName=نام Employee=کارمند -FirstDayOfHoliday=اولین روز از تعطیلات -LastDayOfHoliday=آخرین روز از تعطیلات +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=به روز رسانی ماهانه ManualUpdate=دستی به روز رسانی -HolidaysCancelation=تعطیلات لغو +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=تنظیمات ماژول تعطیلات DescOptionCP=شرح گزینه ValueOptionCP=ارزش -GroupToValidateCP=گروه با توانایی به تصویب تعطیلات +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=اعتبارسنجی پیکربندی -LastUpdateCP=تاریخ و زمان آخرین طور خودکار از تعطیلات به روز شده +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=به روز رسانی با موفقیت. ErrorUpdateConfCP=خطا در به روز رسانی رخ داد، لطفا دوباره سعی کنید. AddCPforUsers=لطفا تعادل از تعطیلات از کاربران با استفاده از Add اینجا را کلیک کنید . DelayForSubmitCP=آخرین مهلت برای تعطیلات اعمال می شود AlertapprobatortorDelayCP=جلوگیری از approbator اگر درخواست تعطیلات می کند مهلت مطابقت ندارد -AlertValidatorDelayCP=Préevent approbator اگر درخواست تعطیلات تجاوز تاخیر -AlertValidorSoldeCP=جلوگیری از approbator اگر درخواست تعطیلات بیش از تعادل -nbUserCP=شماره کاربر پشتیبانی در تعطیلات ماژول -nbHolidayDeductedCP=تعداد تعطیلات به در روز از تعطیلات گرفته شده کسر می شود -nbHolidayEveryMonthCP=تعداد تعطیلات اضافه شده هر ماه -Module27130Name= مدیریت از تعطیلات -Module27130Desc= مدیریت از تعطیلات -TitleOptionMainCP=تنظیمات اصلی از تعطیلات -TitleOptionEventCP=تنظیمات از تعطیلات مربوط به حوادث +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=معتبر ساختن UpdateEventCP=رویدادی به روز رسانی CreateEventCP=ساختن @@ -127,23 +127,23 @@ UpdateEventOptionCP=به روز رسانی ErrorMailNotSend=در حالی که ارسال ایمیل یک خطا رخ داده است: NoCPforMonth=بدون این ماه را ترک کنند. nbJours=شماره روز -TitleAdminCP=تنظیمات تعطیلات +TitleAdminCP=Configuration of Leaves #Messages Hello=سلام -HolidaysToValidate=اعتبارسنجی تعطیلات -HolidaysToValidateBody=در زیر یک درخواست برای تعطیلات به اعتبار است -HolidaysToValidateDelay=این درخواست برای تعطیلات در طی یک دوره کمتر از%s روز است. -HolidaysToValidateAlertSolde=کاربری که این درخواست برای تعطیلات ساخته شده را روز به اندازه کافی در دسترس ندارد. -HolidaysValidated=تعطیلات اعتبار -HolidaysValidatedBody=درخواست شما برای تعطیلات را برای%s به%s دارای اعتبار بوده است. -HolidaysRefused=تعطیلات را رد کرد -HolidaysRefusedBody=درخواست شما برای تعطیلات را برای%s به%s شده است به این دلیل رد کرده است: -HolidaysCanceled=تعطیلات لغو شد -HolidaysCanceledBody=درخواست شما برای تعطیلات را برای%s به%s لغو شده است. -Permission20000=خوانده شده شما تعطیلات خود -Permission20001=ایجاد / اصلاح تعطیلات خود را -Permission20002=ایجاد / اصلاح تعطیلات برای همه -Permission20003=حذف تعطیلات درخواست -Permission20004=کاربران راه اندازی تعطیلات -Permission20005=ورود به سیستم فایل را نقد کنید از تعطیلات تغییر -Permission20006=دفعات بازدید: تعطیلات گزارش ماهانه +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang index 94e01b3ec51..ab199ca3e6b 100644 --- a/htdocs/langs/fa_IR/interventions.lang +++ b/htdocs/langs/fa_IR/interventions.lang @@ -17,17 +17,19 @@ ValidateIntervention=اعتبارسنجی مداخله ModifyIntervention=اصلاح مداخله DeleteInterventionLine=حذف خط مداخله ConfirmDeleteIntervention=آیا مطمئن هستید که می خواهید این مداخله را حذف کنید؟ -ConfirmValidateIntervention=آیا مطمئن هستید که می خواهید به اعتبار این مداخله تحت نام%s را؟ +ConfirmValidateIntervention=آیا مطمئن هستید که می خواهید به اعتبار این مداخله تحت نام٪ s را؟ ConfirmModifyIntervention=آیا مطمئن هستید که می خواهید به تغییر این مداخله؟ ConfirmDeleteInterventionLine=آیا مطمئن هستید که می خواهید این خط مداخله را حذف کنید؟ NameAndSignatureOfInternalContact=نام و امضا از مداخله: NameAndSignatureOfExternalContact=نام و امضا از مشتری: DocumentModelStandard=مدل استاندارد سند برای مداخلات InterventionCardsAndInterventionLines=مداخلات و خطوط مداخلات -ClassifyBilled=طبقه بندی "صورتحساب" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=ثبت شده در صورتحساب یا لیست RelatedInterventions=مداخلات مرتبط ShowIntervention=نمایش مداخله +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=نماینده زیر تا مداخله TypeContact_fichinter_internal_INTERVENING=مداخله @@ -36,7 +38,7 @@ TypeContact_fichinter_external_CUSTOMER=پس تا مشتری تماس # Modele numérotation ArcticNumRefModelDesc1=مدل تعداد عمومی ArcticNumRefModelError=برای فعال سازی ناموفق -PacificNumRefModelDesc1=بازگشت numero با فرمت%syymm-NNNN که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است +PacificNumRefModelDesc1=بازگشت numero با فرمت٪ syymm-NNNN که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است PacificNumRefModelError=کارت مداخله با $ شروع میشوند syymm حال حاضر وجود دارد و سازگار با این مدل توالی نیست. آن را حذف و یا تغییر نام آن را به این ماژول را فعال کنید. PrintProductsOnFichinter=محصول چاپ بر روی کارت مداخله PrintProductsOnFichinterDetails=forinterventions تولید شده از سفارشات diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang index da634d13a72..211b2834b13 100644 --- a/htdocs/langs/fa_IR/projects.lang +++ b/htdocs/langs/fa_IR/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=رویدادها در پروژه YouAreNotContactOfProject=شما یک تماس از این پروژه خصوصی نیست DeleteATimeSpent=زمان صرف شده حذف ConfirmDeleteATimeSpent=آیا مطمئن هستید که می خواهید به حذف این زمان صرف شده؟ -DoNotShowMyTasksOnly=همچنین نگاه کنید به وظایف به من اختصاص داده نشده -ShowMyTasksOnly=نمایش فقط وظایف اختصاص داده شده به من +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=پروژه ها اختصاص داده شده به این شخص ثالث NoTasks=بدون وظایف برای این پروژه LinkedToAnotherCompany=لینک به دیگر شخص ثالث -TaskIsNotAffectedToYou=کار به شما اختصاص ندارد +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=مدت زمان صرف شده خالی است ThisWillAlsoRemoveTasks=این کار همچنین تمام کارهای پروژه (وظایف٪ s در حال حاضر) حذف و تمام ورودی ها از زمان صرف شده. IfNeedToUseOhterObjectKeepEmpty=اگر برخی از اشیاء (فاکتور، سفارش، ...)، متعلق به شخص ثالث دیگری، باید به این پروژه برای ایجاد، نگه داشتن این خالی به این پروژه که احزاب چند سوم مرتبط است. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=شرکت کننده TypeContact_project_task_external_TASKCONTRIBUTOR=شرکت کننده SelectElement=انتخاب عنصر AddElement=لینک به عنصر +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=مدل گزارش یک پروژه کامل (logo. ..) PlannedWorkload = حجم کار برنامه ریزی شده @@ -128,3 +129,4 @@ ProjectReferers=مراجعه اشیاء SearchAProject=جستجوی یک پروژه ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد ProjectDraft=پروژه های پیش نویس +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang index fbffc79235b..ad9ad62b6d1 100644 --- a/htdocs/langs/fa_IR/sendings.lang +++ b/htdocs/langs/fa_IR/sendings.lang @@ -43,7 +43,7 @@ Carrier=حامل CarriersArea=منطقه حامل NewCarrier=حامل جدید ConfirmDeleteSending=آیا مطمئن هستید که می خواهید این حمل و نقل را حذف کنید؟ -ConfirmValidateSending=آیا مطمئن هستید که می خواهید به اعتبار این حمل و نقل با اشاره%s را؟ +ConfirmValidateSending=آیا مطمئن هستید که می خواهید به اعتبار این حمل و نقل با اشاره٪ s را؟ ConfirmCancelSending=آیا مطمئن هستید که می خواهید به لغو این حمل و نقل؟ GenericTransport=عمومی حمل و نقل Enlevement=بدست شده توسط مشتری @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=آمار انجام شده بر روی محمول DateDeliveryPlanned=تاریخ ورقه زایمان DateReceived=تاریخ تحویل SendShippingByEMail=ارسال محموله از طریق ایمیل -SendShippingRef=ارسال محموله از%s +SendShippingRef=Submission of shipment %s ActionsOnShipping=رویدادهای در حمل و نقل LinkToTrackYourPackage=لینک به پیگیری بسته بندی خود را ShipmentCreationIsDoneFromOrder=برای لحظه ای، ایجاد یک محموله های جدید از کارت منظور انجام می شود. @@ -72,3 +72,7 @@ DocumentModelTyphon=مدل سند کامل بیشتر برای رسید تحوی Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت تعریف نشده SumOfProductVolumes=مجموع حجم محصول SumOfProductWeights=مجموع وزن محصول + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang index 62385267614..6b3644b6796 100644 --- a/htdocs/langs/fa_IR/suppliers.lang +++ b/htdocs/langs/fa_IR/suppliers.lang @@ -19,7 +19,7 @@ ChangeSupplierPrice=تغییر قیمت عرضه کننده کالا ErrorQtyTooLowForThisSupplier=مقدار خیلی کم برای این عرضه کننده کالا یا بدون قیمت در این محصول برای این کالا تعریف شده ErrorSupplierCountryIsNotDefined=کشور برای این کالا تعریف نشده است. اولین تصحیح این. ProductHasAlreadyReferenceInThisSupplier=این محصول در حال حاضر یک مرجع در این منبع -ReferenceSupplierIsAlreadyAssociatedWithAProduct=این منبع مرجع در حال حاضر با یک مرجع در ارتباط است:%s را +ReferenceSupplierIsAlreadyAssociatedWithAProduct=این منبع مرجع در حال حاضر با یک مرجع در ارتباط است:٪ s را NoRecordedSuppliers=بدون تامین کنندگان ثبت SupplierPayment=پرداخت کننده SuppliersArea=منطقه تامین کنندگان @@ -29,14 +29,16 @@ ExportDataset_fournisseur_1=فهرست فاکتورها تامین کننده و ExportDataset_fournisseur_2=فاکتورها تامین کننده و پرداخت ExportDataset_fournisseur_3=سفارشات تامین کننده و خطوط جهت ApproveThisOrder=تصویب این منظور -ConfirmApproveThisOrder=آیا مطمئن هستید که می خواهید برای تایید از%s؟ +ConfirmApproveThisOrder=آیا مطمئن هستید که می خواهید برای تایید از٪ s؟ DenyingThisOrder=انکار این منظور -ConfirmDenyingThisOrder=آیا مطمئن هستید که می خواهید برای انکار این منظور از%s؟ -ConfirmCancelThisOrder=آیا مطمئن هستید که می خواهید به لغو این منظور از%s؟ +ConfirmDenyingThisOrder=آیا مطمئن هستید که می خواهید برای انکار این منظور از٪ s؟ +ConfirmCancelThisOrder=آیا مطمئن هستید که می خواهید به لغو این منظور از٪ s؟ AddCustomerOrder=ایجاد سفارش مشتری AddCustomerInvoice=ایجاد فاکتور مشتری AddSupplierOrder=ایجاد نظم عرضه کننده کالا AddSupplierInvoice=ایجاد کننده کالا فاکتور -ListOfSupplierProductForSupplier=لیست محصولات و قیمت ها را برای عرضه کننده کالا از%s -NoneOrBatchFileNeverRan=هیچ و یا دسته ای از%s فرار نمی اخیرا +ListOfSupplierProductForSupplier=لیست محصولات و قیمت ها را برای عرضه کننده کالا از٪ s +NoneOrBatchFileNeverRan=هیچ و یا دسته ای از٪ s فرار نمی اخیرا SentToSuppliers=ارسال شده به تامین کنندگان +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/fi_FI/accountancy.lang +++ b/htdocs/langs/fi_FI/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 1e9c918502a..1d4b8c7be6f 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Virhe Tätä moduulia edellyttää Dolibarr ve ErrorDecimalLargerThanAreForbidden=Virhe, tarkkuuden suurempi kuin %s ei ole tuettu. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automaattinen, jos JavaScript ei ole käytössä AvailableOnlyIfJavascriptNotDisabled=Käytettävissä vain, jos JavaScript ei ole poistettu AvailableOnlyIfJavascriptAndAjaxNotDisabled=Käytettävissä vain, jos JavaScript ei ole poistettu Required=Vaadittu +UsedOnlyWithTypeOption=Used by some agenda option only Security=Turvallisuus Passwords=Salasanat DoNotStoreClearPassword=Onko mitään salasanoja vuonna selväksi tietokantaan diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang index 5f6b6b32d41..552a7ccfae1 100644 --- a/htdocs/langs/fi_FI/agenda.lang +++ b/htdocs/langs/fi_FI/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Toimet ActionsArea=Toimien alueella (tapahtumat ja tehtävät) -Agenda= Agenda -Agendas= Esityslistat -Calendar= Kalenteri -Calendars= Kalenterit -LocalAgenda=Paikallinen kalenteri +Agenda=Agenda +Agendas=Esityslistat +Calendar=Kalenteri +Calendars=Kalenterit +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Vaikuttaa DoneBy=Tekemiäni Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Kaikki puutteelliset toimet MenuDoneActions=Kaikki irti toimia MenuToDoMyActions=Oma puutteellisia toimia MenuDoneMyActions=Oma irtisanotaan toimia -ListOfEvents=Luettelo Dolibarr tapahtumat +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Toimet kirjattava ActionsToDoBy=Toimet vaikuttaa ActionsDoneBy=Toimet tehdään @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL päästä. ICal-tiedostona ExtSiteNoLabel=Ei kuvausta WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang index e7a6848faa1..2ecd727bd47 100644 --- a/htdocs/langs/fi_FI/categories.lang +++ b/htdocs/langs/fi_FI/categories.lang @@ -16,7 +16,7 @@ SuppliersCategoriesArea=Toimittajien luokkiin alue CustomersCategoriesArea=Asiakkaiden kategoriat alueella ThirdPartyCategoriesArea=Kolmansien osapuolten luokkiin alue MembersCategoriesArea=Jäsenet luokat alue -# ContactsCategoriesArea=Contacts categories area +ContactsCategoriesArea=Contacts categories area MainCats=Pääryhmään SubCats=Alaluokat CatStatistics=Tilastot @@ -50,15 +50,15 @@ SupplierIsInCategories=Kolmas osapuoli omistaa seuraavien toimittajien tuoteryhm CompanyIsInCustomersCategories=Tämä kolmas osapuoli omistaa seuraavien asiakkaat / näkymät tuoteryhmät CompanyIsInSuppliersCategories=Tämä kolmas osapuoli omistaa seuraavien toimittajien tuoteryhmät MemberIsInCategories=Tämä jäsen omistaa seuraaville jäsenille ryhmiin -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=This contact owns to following contacts categories ProductHasNoCategory=Tämä tuote / palvelu ei ole mitään luokkia SupplierHasNoCategory=Tämä toimittaja ei ole mitään luokkia CompanyHasNoCategory=Tämä yritys ei ole mitään luokkia MemberHasNoCategory=Tämä jäsen ei ole mitään luokkiin -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=This contact is not in any categories ClassifyInCategory=Luokitella luokkaan NoneCategory=Ei mitään -# NotCategorized=Without category +NotCategorized=Without category CategoryExistsAtSameLevel=Tämä luokka on jo olemassa samassa paikassa ReturnInProduct=Takaisin tuotteen / palvelun kortti ReturnInSupplier=Palaa toimittaja-kortti @@ -66,7 +66,7 @@ ReturnInCompany=Palaa asiakas / näköpiirissä kortti ContentsVisibleByAll=Sisältö näkyy kaikkien ContentsVisibleByAllShort=Sisällys näkyviin kaikki ContentsNotVisibleByAllShort=Sisältö ei näy kaikissa -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Poista luokka ConfirmDeleteCategory=Oletko varma, että haluat poistaa tämän luokan? RemoveFromCategory=Poista yhteys Categorie @@ -81,12 +81,12 @@ CustomersCategoriesShort=Asiakkaat tuoteryhmät CustomersProspectsCategoriesShort=Custo. / prosp. luokat ProductsCategoriesShort=Tuotteet Tuoteryhmät MembersCategoriesShort=Jäsenet luokat -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contacts categories ThisCategoryHasNoProduct=Tämä kategoria ei sisällä mitään tuotetta. ThisCategoryHasNoSupplier=Tämä kategoria ei sisällä mitään toimittaja. ThisCategoryHasNoCustomer=Tämä kategoria ei sisällä asiakkaalle. ThisCategoryHasNoMember=Tämä kategoria ei sisällä mitään jäsen. -# ThisCategoryHasNoContact=This category does not contain any contact. +ThisCategoryHasNoContact=This category does not contain any contact. AssignedToCustomer=Annetaan asiakkaalle AssignedToTheCustomer=Annetaan asiakkaan InternalCategory=Inernal luokka @@ -96,18 +96,19 @@ CatSupList=Luettelo toimittaja tuoteryhmät CatCusList=Luettelo asiakas / näköpiirissä tuoteryhmät CatProdList=Luettelo tuotteista tuoteryhmät CatMemberList=Jäsenlista luokkien -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang index 3f08cafba50..213d6d299c2 100644 --- a/htdocs/langs/fi_FI/companies.lang +++ b/htdocs/langs/fi_FI/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Sinun on luotava sähköpostit yhteyksiä kolmannen os ListSuppliersShort=Luettelo toimittajat ListProspectsShort=Luettelo näkymät ListCustomersShort=Luettelo asiakkaiden -ThirdPartiesArea=Kolmannet osapuolet alue +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Viimeksi %s muutettu kolmansien osapuolten UniqueThirdParties=Yhteensä ainutlaatuinen kolmannen osapuolen InActivity=Avoinna @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Paluu numero on muodossa %syymm-nnnn asiakkaan koodi ja %syymm-nnnn luovuttajalle koodi jos VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0. LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi voidaan muuttaa milloin tahansa. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang index e1d9de0c869..24aeaa3bf4d 100644 --- a/htdocs/langs/fi_FI/compta.lang +++ b/htdocs/langs/fi_FI/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang index 33a50fd202b..ba1942578e4 100644 --- a/htdocs/langs/fi_FI/cron.lang +++ b/htdocs/langs/fi_FI/cron.lang @@ -1,114 +1,87 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -About = Noin -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = Yleisesti +CronAbout = Yleisesti Cronista +CronAboutPage = Cron yleisesti sivu # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Hae ajastetut tehtävät +Permission23102 = Luo/päivitä ajastettu tehtävä +Permission23103 = Poista ajastettu tehtävä +Permission23104 = Suorita ajastettu tehtävä # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Ajastettujen tehtävien asetusten hallinta +URLToLaunchCronJobs=URL-osoite ajastettujen tehtävien tarkistamiseen ja ajamiseen tarvittaessa +OrToLaunchASpecificJob=Tai tietyn tehtävän tarkistamiseen ja ajamiseen +KeyForCronAccess=Turva avain ajastettujen tehtävien ajamiseen URL-sta +FileToLaunchCronJobs=Ajastettujen tehtävien komentorivi +CronExplainHowToRunUnix=Unix ympäristössä sinun tulee käyttää crontabia ajaaksesi komnetoriviä joka minuutti +CronExplainHowToRunWin=Microsoft(tm) Windows ympäristössä voit käyttää ajastetut tehtävät -työkalua ajaaksesi komentorivin minuuteittain # Menu -# -# CronJobs=Scheduled jobs -# CronListActive= List of active jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive= Aktiivisten tehtävien lista +CronListInactive= Hylättyjen tehtävien lista +CronListActive= Aktiivisten tehtävien lista # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Viimeinen ajo +CronLastOutput=Viimeisen ajon tulostus +CronLastResult=Viimeisen tuloksen koodi +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= Ei mitään CronDtStart=Aloituspäivämäärä CronDtEnd=Lopetuspäivä -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=Menetelmä CronModule=Moduuli -# CronAction=Action +CronAction=Action CronStatus=Tila CronStatusActive=Enabled CronStatusInactive=Disabled -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=Prioriteetti CronLabel=Kuvaus -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=Parametrit -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=Kommentti -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=Poistaa käytöstä -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/fi_FI/donations.lang b/htdocs/langs/fi_FI/donations.lang index cf4a35da27f..81e404b0520 100644 --- a/htdocs/langs/fi_FI/donations.lang +++ b/htdocs/langs/fi_FI/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Lahjoitus Donations=Lahjoitukset -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Rahoittajien Donors=Luovuttajat AddDonation=Lisää lahjoitus NewDonation=Uusi lahjoitus -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Gift lupaus PromisesNotValid=Ei validoitava lupaukset PromisesValid=Validoidut lupaukset @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Vedos DonationStatusPromiseValidatedShort=Validoidut DonationStatusPaidShort=Vastatut ValidPromess=Vahvista lupaus -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Rakenna vastaanottamisesta DonationsModels=Asiakirjat malleja lahjoitus kuitit LastModifiedDonations=Viimeksi %s muutettu lahjoitukset SearchADonation=Etsi lahjoitus -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang index 1df5c5123fa..09fdff1071f 100644 --- a/htdocs/langs/fi_FI/errors.lang +++ b/htdocs/langs/fi_FI/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/fi_FI/externalsite.lang b/htdocs/langs/fi_FI/externalsite.lang index 124c4a4411a..2f417fb2da9 100644 --- a/htdocs/langs/fi_FI/externalsite.lang +++ b/htdocs/langs/fi_FI/externalsite.lang @@ -1,4 +1,4 @@ # Dolibarr language file - Source file is en_US - externalsite -ExternalSiteSetup=Setup linkki ulkoiseen sivustolla -ExternalSiteURL=Ulkoinen Sivuston URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteSetup=Setup linkki ulkoiseen sivustoon +ExternalSiteURL=Ulkoisen sivuston osoite (URL) +ExternalSiteModuleNotComplete=Ulkoisen sivuston Moduuli ei ole oikein konfiguroitu. diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang index 45287c46ec2..e65cdff6f76 100644 --- a/htdocs/langs/fi_FI/holiday.lang +++ b/htdocs/langs/fi_FI/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Vapaapäivät -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=Sinun täytyy aktivoida lomat -moduuli nähdäksesi tämän sivun. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=Sinulla ei ole voimassa olevaa lomatoivomusta. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Työntekijä DateDebCP=Aloituspäivämäärä DateFinCP=Lopetuspäivä @@ -18,24 +18,24 @@ ApprovedCP=Hyväksytty CancelCP=Peruttu RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Kuvaus -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Muokkaa DeleteCP=Poistaa ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Peruuta StatutCP=Tila SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Päivittää -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Syy UserCP=Käyttäjä ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Nimi Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Luo @@ -127,23 +127,23 @@ UpdateEventOptionCP=Päivittää ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang index 57adbc177ae..ed864f6244a 100644 --- a/htdocs/langs/fi_FI/install.lang +++ b/htdocs/langs/fi_FI/install.lang @@ -1,14 +1,14 @@ # Dolibarr language file - Source file is en_US - install -InstallEasy=Me yritimme tehdä Dolibarr setup mahdollisimman helppoa. Seuraa ohjeita vaihe vaiheelta. -MiscellaneousChecks=Esitiedot tarkistaa -DolibarrWelcome=Tervetuloa Dolibarr -ConfFileExists=Configuration file %s on olemassa. -ConfFileDoesNotExists=Configuration file %s ei ole olemassa! -ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s ei ole olemassa, ja ei voi luoda! -ConfFileCouldBeCreated=Configuration file %s voitaisiin luoda. -ConfFileIsNotWritable=Kokoonpano tiedostoa %s ei ole kirjoitettavissa. Tarkista käyttöoikeudet. Ensimmäistä kertaa asentaa, verkkopalvelimesi on myönnettävä voi kirjoittaa tämä tiedosto aikana asennusprosessi ( "chmod 666" esimerkiksi Unix kuten OS). +InstallEasy=Seuraa ohjeita askel askeleelta. +MiscellaneousChecks=Ehtojen tarkistus +DolibarrWelcome=Tervetuloa Dolibarriin +ConfFileExists=Asetustiedosto %s on olemassa. +ConfFileDoesNotExists=Asetustiedosto %s ei ole olemassa! +ConfFileDoesNotExistsAndCouldNotBeCreated=Asetustiedostoa %s ei ole olemassa, ja sitä ei voi luoda! +ConfFileCouldBeCreated=Asetustiedosto %s voitaisiin luoda. +ConfFileIsNotWritable=Asetustiedosto %s ei ole kirjoitettavissa. Tarkista käyttöoikeudet. Ensimmäistä kertaa asennettaessa, verkkopalvelimesi on annettava kirjoituslupa tämän asetusprosessin aikana asennus ( esimerkiksi "chmod 666" Unix tyylisisä OSsiessa). ConfFileIsWritable=Configuration file %s on kirjoitettavissa. -ConfFileReload=Päivitä kaikki tiedot asetustiedosto. +ConfFileReload=Uudelleen lataa kaikki tiedot asetustiedostosta. PHPSupportSessions=Tämä PHP tukee istuntoja. PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja GET. PHPSupportPOSTGETKo=On mahdollista, sinun PHP asennusohjelma ei tue muuttujat POST tai GET. Tarkista parametri variables_order vuonna php.ini. @@ -207,5 +207,5 @@ MigrationActioncommElement=Päivitä tiedot toimista MigrationPaymentMode=Tiedot muuttoliike maksua tilassa MigrationCategorieAssociation=Kategorioiden siirto -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Näytä ei saatavilla olevat valinnat +HideNotAvailableOptions=Piilota ei saatavilla olevat valinnat diff --git a/htdocs/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang index 413754a5d1e..e2d0c226b5b 100644 --- a/htdocs/langs/fi_FI/interventions.lang +++ b/htdocs/langs/fi_FI/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Oletko varma, että haluat poistaa tämän interve NameAndSignatureOfInternalContact=Nimi ja allekirjoitus puuttua: NameAndSignatureOfExternalContact=Nimi ja allekirjoitus asiakas: DocumentModelStandard=Vakioasiakirja malli interventioiden -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Luokitella "Laskutetaan" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Laskutetaan RelatedInterventions=Liittyvissä toimissa ShowIntervention=Näytä interventio +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Edustajan seuraamaan interventioelimen TypeContact_fichinter_internal_INTERVENING=Sääntely @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Generic numero malli ArcticNumRefModelError=Epäonnistui aktivoida PacificNumRefModelDesc1=Paluu numero on muodossa %syymm-nnnn jossa VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0 PacificNumRefModelError=Interventiokynnyksen kortin alkaen $ syymm jo olemassa, ja ei ole yhteensopiva tämän mallin järjestyksessä. Poistaa sen tai nimetä sen aktivoida tämän moduulin. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang index 5d86143c191..fee10556bfa 100644 --- a/htdocs/langs/fi_FI/projects.lang +++ b/htdocs/langs/fi_FI/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Toimien hanketta YouAreNotContactOfProject=Et ole kosketuksissa tämän yksityisen hankkeen DeleteATimeSpent=Poista käytetty aika ConfirmDeleteATimeSpent=Oletko varma että haluat poistaa tämän aika? -DoNotShowMyTasksOnly=Katso myös tehtävien En vaikuteta -ShowMyTasksOnly=Näytä vain tehtäviä olen vaikuttaa +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Hankkeet omistettu tälle kolmannelle NoTasks=Ei tehtävät hankkeen LinkedToAnotherCompany=Liittyy muihin kolmannen osapuolen -TaskIsNotAffectedToYou=Tehtävä ei ole kohdistettu sinua +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Käytetty aika on tyhjä ThisWillAlsoRemoveTasks=Tämä toiminto poistaa myös kaikki tehtävät projektin (%s tehtävät tällä hetkellä) ja kaikki panokset käytetty aika. IfNeedToUseOhterObjectKeepEmpty=Jos jotkin esineet (lasku, tilaus, ...), jotka kuuluvat toiselle kolmannelle osapuolelle, on liityttävä hankkeeseen luoda, pitää tämä tyhjä saada hanke on multi kolmansille osapuolille. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Täydellinen hankkeen tarkastusraportin malli (logo. ..) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang index c855359a862..954d63ad5eb 100644 --- a/htdocs/langs/fi_FI/sendings.lang +++ b/htdocs/langs/fi_FI/sendings.lang @@ -13,7 +13,7 @@ LastSendings=Viimeisin %s sendings SearchASending=Haku lähettävä StatisticsOfSendings=Tilastot sendings NbOfSendings=Lukumäärä sendings -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Lähetysvalinnat-kortti NewSending=Uusi lähettäminen CreateASending=Luo lähettäminen @@ -50,27 +50,29 @@ Enlevement=Saanut asiakkaan DocumentModelSimple=Yksinkertaisen mallin DocumentModelMerou=Merou A5 malli WarningNoQtyLeftToSend=Varoitus, ei tuotteet odottavat lähettämistä. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Höylätty toimituspäivämäärä DateReceived=Päivämäärä toimitus sai SendShippingByEMail=Lähetä lähetys sähköpostitse -SendShippingRef=Lähetä lähetys %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Tapahtumat lähetystä LinkToTrackYourPackage=Linkki seurata pakettisi ShipmentCreationIsDoneFromOrder=Tällä hetkellä uuden lähetys tehdään tilauksesta kortin. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Saalis asiakas SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Yksinkertaisen mallin toimitusten kuitit DocumentModelTyphon=Täydellisempi mallin toimitusten kuitit (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Jatkuva EXPEDITION_ADDON_NUMBER ei määritelty -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang index 137e021fd2a..034f9fd1652 100644 --- a/htdocs/langs/fi_FI/suppliers.lang +++ b/htdocs/langs/fi_FI/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Luo toimittajan laskun ListOfSupplierProductForSupplier=Luettelo tuotteista ja hinnoista toimittaja %s NoneOrBatchFileNeverRan=Ei mitään tai erän %s ei juoksi hiljattain SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 33615e0661d..d5692042b06 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -219,7 +219,7 @@ AutomaticIfJavascriptDisabled=Automatique si Javascript est désactivé AvailableOnlyIfJavascriptNotDisabled=Disponible uniquement si Javascript activé AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible uniquement si Javascript activé Required=Requis -UsedOnlyWithTypeOption=Used by some agenda option only +UsedOnlyWithTypeOption=Utilisé par certaines options de l'agenda uniquement Security=Sécurité Passwords=Mots de passe DoNotStoreClearPassword=Ne pas stocker de mots de passe en clair dans la base (Activation recommandée) diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index d4778cc47ca..a00d97ea191 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -111,4 +111,4 @@ ExtraFieldsCategories=Attributs supplémentaires CategoriesSetup=Configuration du module catégories CategorieRecursiv=Lier avec les catégories parentes CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une catégorie, l'ajouter aussi dans toutes les catégories parentes -AddProductServiceIntoCategory=Add the following product/service +AddProductServiceIntoCategory=Ajouter le produit/service suivant diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index e44cb0caa9f..bcfe356e10a 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Vous devez créer des contacts avec emails sur le tier ListSuppliersShort=Liste fournisseurs ListProspectsShort=Liste prospects ListCustomersShort=Liste clients -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Espace tiers et contacts LastModifiedThirdParties=Les %s derniers tiers modifiés UniqueThirdParties=Total de tiers uniques InActivity=En activité @@ -410,5 +410,5 @@ OutstandingBillReached=Montant max. endetté MonkeyNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn pour les codes clients et %syymm-nnnn pour les codes fournisseurs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0. LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment. ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +SearchThirdparty=Rechercher tiers +SearchContact=Rechercher contact diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 086d075d3f4..1f58970d1fd 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Synthèse compta/tréso ByProductsAndServices=Par produits et services RefExt=Référence externe ToCreateAPredefinedInvoice=Pour créer une facture prédéfinie, créer une facture standard puis sans la valider, cliquer sur le bouton "Convertir en facture prédéfine". -LinkedOrder=Link to order +LinkedOrder=Lier à une commande ReCalculate=Recalculer Mode1=Mode 1 Mode2=Mode 2 @@ -196,14 +196,14 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode comptabilité de caisse n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit comptabilité d'engagement (voir la configuration du module de comptabilité). CalculationMode=Mode de calcul AccountancyJournal=Code journal comptabilité -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT -ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties -CloneTax=Clone a social contribution -ConfirmCloneTax=Confirm the clone of a social contribution -CloneTaxForNextMonth=Clone it for next month +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits +ACCOUNTING_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits +ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA +ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA +ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients +ACCOUNTING_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs +CloneTax=Cloner une charge sociale +ConfirmCloneTax=Confirmer le clonage de la charge sociale +CloneTaxForNextMonth=Cloner pour le mois suivant diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index 4ba948aab30..c1601b1bb27 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -30,4 +30,4 @@ SearchADonation=Rechercher un don DonationRecipient=Bénéficiaire des versements ThankYou=Merci IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de -MinimumAmount=Minimum amount is %s +MinimumAmount=Don minimum de %s diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 8185e2f617b..eaa79b0fc00 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -155,5 +155,5 @@ WarningUsingThisBoxSlowDown=Attention, l'utilisation de cette boite provoque de WarningClickToDialUserSetupNotComplete=La configuration ClickToDial pour votre compte utilisateur n'est pas complète (voir l'onglet ClickToDial sur votre fiche utilisateur) WarningNotRelevant=Opération non pertinente pour cet ensemble de données WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivé quand l'affichage est en mode optimisé pour les personnes aveugles ou les navigateurs textes. -WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. -WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters +WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturation (%s) de la facture %s. +WarningTooManyDataPleaseUseMoreFilters=Trop de données. Utilisez des filtres plus précis. diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index c2041e71345..f391c3bffa0 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=GRH -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Congès +CPTitreMenu=Congès MenuReportMonth=Etat mensuel -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Pose un congès +NotActiveModCP=Vous devez activer le module Congés pour afficher cette page. +NotConfigModCP=Vous devez configurer le module Congés pour afficher cette page. Pour effectuer cette opération, cliquer ici. +NoCPforUser=Vous n'avez plus de jours disponibles +AddCP=Poser une demande de congès Employe=Employé DateDebCP=Date Début DateFinCP=Date Fin @@ -18,24 +18,24 @@ ApprovedCP=Approuvé CancelCP=Annulée RefuseCP=Refusée ValidatorCP=Approbateur -ListeCP=List of leaves +ListeCP=Liste des demandes de congès ReviewedByCP=Sera approuvé par DescCP=Description -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Créer une demande de congès +DelayToRequestCP=Les demandes de congés doivent être faites au moins %s jour(s) avant la date de ceux-ci. +MenuConfCP=Editer solde de congès +UpdateAllCP=Mettre à jour les congés +SoldeCPUser=Solde de congés: %s jours. ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début. ErrorSQLCreateCP=Une erreur SQL est survenue durant la création : -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=Une erreur est survenue, cette demande de congés n'existe pas. ReturnCP=Retour à la page précédente -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request +ErrorUserViewCP=Vous n'êtes pas autorisé à lire cette demande de congés. +InfosCP=Information sur la demande de congès InfosWorkflowCP=Informations du workflow RequestByCP=Demandée par -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Demande de congès +NbUseDaysCP=Nombre de jours de congès consommés EditCP=Modifier DeleteCP=Supprimer ActionValidCP=Valider @@ -43,26 +43,26 @@ ActionRefuseCP=Refuser ActionCancelCP=Annuler StatutCP=Statut SendToValidationCP=Envoyer en validation -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. +TitleDeleteCP=Supprimer la demande de Congés +ConfirmDeleteCP=Confirmer la suppression de cette demande de congés ? +ErrorCantDeleteCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés. +CantCreateCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés. +InvalidValidatorCP=Vous devez choisir un approbateur pour votre demande de congés. UpdateButtonCP=Mettre à jour -CantUpdate=You cannot update this leave request. +CantUpdate=Vous ne pouvez pas mettre à jour cette demande de congés. NoDateDebut=Vous devez choisir une date de début. NoDateFin=Vous devez choisir une date de fin. ErrorDureeCP=Votre demande de congés payés ne contient aucun jour ouvré. TitleValidCP=Valider la demande de Congés Payés -ConfirmValidCP=Are you sure you want to approve the leave request? +ConfirmValidCP=Êtes-vous sûr de vouloir approuver la demande de congés ? DateValidCP=Date d'approbation TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? +ConfirmToValidCP=Êtes-vous sûr de vouloir valider la demande de congés ? TitleRefuseCP=Refuser la demande de Congés Payés -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +ConfirmRefuseCP=Êtes-vous sûr de vouloir valider la demande de congés ? NoMotifRefuseCP=Vous devez choisir un motif pour refuser cette demande. TitleCancelCP=Annuler la demande de Congés Payés -ConfirmCancelCP=Are you sure you want to cancel the leave request? +ConfirmCancelCP=Êtes-vous sûr de vouloir annuler la demande de congés ? DetailRefusCP=Motif du refus DateRefusCP=Date du refus DateCancelCP=Date de l'annulation @@ -72,8 +72,8 @@ MotifCP=Motif UserCP=Utilisateur ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel. AddEventToUserOkCP=L'ajout du congé exceptionnel à bien été effectué. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +MenuLogCP=Voir les logs des demandes de congés +LogCP=Historique de la mise à jours de jours de congès disponibles ActionByCP=Réalisée par UserUpdateCP=Pour l'utilisateur PrevSoldeCP=Précédent Solde @@ -81,33 +81,33 @@ NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période. UserName=Nom Prénom Employee=Salarié -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Premier jour de congès +LastDayOfHoliday=Dernier jours de congès HolidaysMonthlyUpdate=Mise à jour mensuelle ManualUpdate=Mise à jour manuelle -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Annulation de la demande de congès ## Configuration du Module ## ConfCP=Configuration du module Congés DescOptionCP=Description de l'option ValueOptionCP=Valeur -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés ConfirmConfigCP=Valider la configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Notification automatique UpdateConfCPOK=Mise à jour effectuée avec succès. ErrorUpdateConfCP=Une erreur à eu lieu durant la mise à jour, merci de réessayer. AddCPforUsers=Veuillez ajouter le solde des congés des utilisateurs en cliquant ici. DelayForSubmitCP=Délai pour faire une demande de congés avant ceux-ci AlertapprobatortorDelayCP=Prévenir le validateur si la demande de congés ne correspond pas à la date limite -AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month -Module27130Name= Management of leave requests -Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request -TitleOptionEventCP=Settings of leave requets for events +AlertValidatorDelayCP=Prévenir le valideur si la demande de congés ne respecte pas le délai prévu +AlertValidorSoldeCP=Prévenir le valideur si l'utilisateur demande des congés dépassant son solde +nbUserCP=Nombre d'utilisateur pris en charge dans le module congés +nbHolidayDeductedCP=Nombre de congés payés à déduire par jour de congé pris +nbHolidayEveryMonthCP=Nombre de congés payés ajoutés chaque mois +Module27130Name= Gestion des demandes de congès +Module27130Desc= Ce module permet de gérer les demandes, approbations de congès. +TitleOptionMainCP=Réglages principaux des demande de congès +TitleOptionEventCP=Réglages des congés liés à des évènements ValidEventCP=Valider UpdateEventCP=Mettre à jour les évènements CreateEventCP=Créer @@ -127,23 +127,23 @@ UpdateEventOptionCP=Mettre à jour ErrorMailNotSend=Une erreur est survenue lors de l'envoi du mail : NoCPforMonth=Aucun congé ce mois-ci. nbJours=Nombre jours -TitleAdminCP=Configuration of Leaves +TitleAdminCP=Configuration du module congès #Messages Hello=Bonjour -HolidaysToValidate=Validate leave requests -HolidaysToValidateBody=Below is a leave request to validate -HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. -HolidaysValidated=Validated leave requests -HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied -HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled leaved request -HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -Permission20000=Read you own leave requests -Permission20001=Create/modify your leave requests -Permission20002=Create/modify leave requests for everybody -Permission20003=Delete leave requests -Permission20004=Setup users available vacation days -Permission20005=Review log of modified leave requests -Permission20006=Read leaves monthly report +HolidaysToValidate=Valider les demandes de congès +HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés à valider. +HolidaysToValidateDelay=Cette demande de congés à été effectué dans un délai de moins de %s jours avant ceux-ci. +HolidaysToValidateAlertSolde=L'utilisateur ayant fait cette demande de congés payés n'a pas le solde requis. +HolidaysValidated=Valider demande de congès +HolidaysValidatedBody=Votre demande de congés du %s au %s vient d'être approuvée. +HolidaysRefused=Accès refusé +HolidaysRefusedBody=Votre demande de congés payés %s à %s vient d'être refusée pour le motif suivant : +HolidaysCanceled=Abandonner la demande de congès +HolidaysCanceledBody=Votre demande de congés du %s au %s a été annulée. +Permission20000=Lire ses propres demandes de congès +Permission20001=Créer/modifier une demande de congès +Permission20002=Créer/modifier les congès pour tout le monde +Permission20003=Supprimer la demande de Congés +Permission20004=Configuration des jours disponibles +Permission20005=Voir l'historique des demandes de congés +Permission20006=Accéder au rapport mensuel des congés diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang index 5933e2f4bd0..d9a9b0f856e 100644 --- a/htdocs/langs/fr_FR/interventions.lang +++ b/htdocs/langs/fr_FR/interventions.lang @@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Nom et signature de l'intervenant : NameAndSignatureOfExternalContact=Nom et signature du client : DocumentModelStandard=Modèle de fiche d'intervention standard InterventionCardsAndInterventionLines=Fiches interventions et lignes d'interventions -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Classer "Facturée" +InterventionClassifyUnBilled=Classer "Non facturée" StatusInterInvoiced=Facturée RelatedInterventions=Interventions rattachées ShowIntervention=Afficher intervention diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 56242728012..7148ae0c1c0 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Événements sur le projet YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé DeleteATimeSpent=Suppression du temps consommé ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées +ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées TaskRessourceLinks=Affectation ressources ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers NoTasks=Aucune tâche pour ce projet LinkedToAnotherCompany=Liés à autre société -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Tâche qui ne vous sont pas affectées ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (%s tâches actuellement) et le suivi des consommés. IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers. @@ -120,7 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur SelectElement=Séléctionnez l'élément AddElement=Link to element -UnlinkElement=Unlink element +UnlinkElement=Délier l'élément # Documents models DocumentModelBaleine=Modèle de rapport de projet complet (logo...) PlannedWorkload = Charge de travail prévue @@ -129,4 +129,4 @@ ProjectReferers=Objets associés SearchAProject=Rechercher un projet ProjectMustBeValidatedFirst=Le projet doit être validé d'abord ProjectDraft=Projets brouillons -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 32ba068a942..47b359318e4 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -74,5 +74,5 @@ SumOfProductVolumes=Somme des volumes des produits SumOfProductWeights=Somme des poids des produits # warehouse details -DetailWarehouseNumber= Warehouse details -DetailWarehouseFormat= W:%s (Qty : %d) +DetailWarehouseNumber= Détail de l'entrepôt +DetailWarehouseFormat= W:%s (Qté : %d) diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index 4bfe3f9684b..8f7304b676a 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -40,5 +40,5 @@ AddSupplierInvoice=Créer facture fournisseur ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs %s NoneOrBatchFileNeverRan=Aucun ou traitement par lot %s non exécuté récemment SentToSuppliers=Envoyés aux fournisseurs -ListOfSupplierOrders=List of supplier orders -MenuOrdersSupplierToBill=Supplier orders to invoice +ListOfSupplierOrders=Liste des commandes fournisseurs +MenuOrdersSupplierToBill=Commandes fournisseurs en facture diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/he_IL/accountancy.lang +++ b/htdocs/langs/he_IL/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 7f9c373236e..08859ff806f 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=שגיאה, מודול זה דורש %s Doliba ErrorDecimalLargerThanAreForbidden=שגיאה, דיוק גבוה יותר %s אינו נתמך. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=אוטומטי אם JavaScript מושבת AvailableOnlyIfJavascriptNotDisabled=אפשרות זו זמינה רק אם JavaScript לא מבוטלת AvailableOnlyIfJavascriptAndAjaxNotDisabled=אפשרות זו זמינה רק אם JavaScript לא מבוטלת Required=דרוש +UsedOnlyWithTypeOption=Used by some agenda option only Security=בטחון Passwords=סיסמאות DoNotStoreClearPassword=האם כל חנות סיסמאות ברורות במסד הנתונים אלא רק בחנות ערך מוצפן (הופעל מומלץ) diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang index ee725009838..cbfb9f7c49b 100644 --- a/htdocs/langs/he_IL/agenda.lang +++ b/htdocs/langs/he_IL/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Events ActionsArea=Events area (Actions and tasks) -Agenda= סדר היום -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar +Agenda=סדר היום +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang index d6000e2825f..ae0b9d441af 100644 --- a/htdocs/langs/he_IL/categories.lang +++ b/htdocs/langs/he_IL/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -# Category=Category +Category=Category Categories=קטגוריות -# Rubrique=Category +Rubrique=Category Rubriques=קטגוריות -# categories=categories -# TheCategorie=The category -# NoCategoryYet=No category of this type created -# In=In -# AddIn=Add in -# modify=modify -# Classify=Classify -# CategoriesArea=Categories area -# ProductsCategoriesArea=Products/Services categories area -# SuppliersCategoriesArea=Suppliers categories area -# CustomersCategoriesArea=Customers categories area -# ThirdPartyCategoriesArea=Third parties categories area -# MembersCategoriesArea=Members categories area -# ContactsCategoriesArea=Contacts categories area -# MainCats=Main categories -# SubCats=Subcategories -# CatStatistics=Statistics -# CatList=List of categories -# AllCats=All categories -# ViewCat=View category -# NewCat=Add category -# NewCategory=New category -# ModifCat=Modify category -# CatCreated=Category created -# CreateCat=Create category -# CreateThisCat=Create this category -# ValidateFields=Validate the fields -# NoSubCat=No subcategory. -# SubCatOf=Subcategory -# FoundCats=Found categories -# FoundCatsForName=Categories found for the name : -# FoundSubCatsIn=Subcategories found in the category -# ErrSameCatSelected=You selected the same category several times -# ErrForgotCat=You forgot to choose the category -# ErrForgotField=You forgot to inform the fields -# ErrCatAlreadyExists=This name is already used -# AddProductToCat=Add this product to a category? -# ImpossibleAddCat=Impossible to add the category -# ImpossibleAssociateCategory=Impossible to associate the category to -# WasAddedSuccessfully=%s was added successfully. -# ObjectAlreadyLinkedToCategory=Element is already linked to this category. -# CategorySuccessfullyCreated=This category %s has been added with success. -# ProductIsInCategories=Product/service owns to following categories -# SupplierIsInCategories=Third party owns to following suppliers categories -# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -# MemberIsInCategories=This member owns to following members categories -# ContactIsInCategories=This contact owns to following contacts categories -# ProductHasNoCategory=This product/service is not in any categories -# SupplierHasNoCategory=This supplier is not in any categories -# CompanyHasNoCategory=This company is not in any categories -# MemberHasNoCategory=This member is not in any categories -# ContactHasNoCategory=This contact is not in any categories -# ClassifyInCategory=Classify in category +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category NoneCategory=None -# NotCategorized=Without category -# CategoryExistsAtSameLevel=This category already exists with this ref -# ReturnInProduct=Back to product/service card -# ReturnInSupplier=Back to supplier card -# ReturnInCompany=Back to customer/prospect card -# ContentsVisibleByAll=The contents will be visible by all -# ContentsVisibleByAllShort=Contents visible by all -# ContentsNotVisibleByAllShort=Contents not visible by all -# CategoriesTree=Categories tree -# DeleteCategory=Delete category -# ConfirmDeleteCategory=Are you sure you want to delete this category ? -# RemoveFromCategory=Remove link with categorie -# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -# NoCategoriesDefined=No category defined -# SuppliersCategoryShort=Suppliers category -# CustomersCategoryShort=Customers category -# ProductsCategoryShort=Products category -# MembersCategoryShort=Members category -# SuppliersCategoriesShort=Suppliers categories -# CustomersCategoriesShort=Customers categories -# CustomersProspectsCategoriesShort=Custo./Prosp. categories -# ProductsCategoriesShort=Products categories -# MembersCategoriesShort=Members categories -# ContactCategoriesShort=Contacts categories -# ThisCategoryHasNoProduct=This category does not contain any product. -# ThisCategoryHasNoSupplier=This category does not contain any supplier. -# ThisCategoryHasNoCustomer=This category does not contain any customer. -# ThisCategoryHasNoMember=This category does not contain any member. -# ThisCategoryHasNoContact=This category does not contain any contact. -# AssignedToCustomer=Assigned to a customer -# AssignedToTheCustomer=Assigned to the customer -# InternalCategory=Internal category -# CategoryContents=Category contents -# CategId=Category id -# CatSupList=List of supplier categories -# CatCusList=List of customer/prospect categories -# CatProdList=List of products categories -# CatMemberList=List of members categories -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang index 57db383c40a..95e682bcb67 100644 --- a/htdocs/langs/he_IL/companies.lang +++ b/htdocs/langs/he_IL/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang index bac153c241e..b172c139c4e 100644 --- a/htdocs/langs/he_IL/compta.lang +++ b/htdocs/langs/he_IL/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang index 88e58bd5b98..66ed9f4c8ab 100644 --- a/htdocs/langs/he_IL/donations.lang +++ b/htdocs/langs/he_IL/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -# Donation=Donation +Donation=Donation Donations=תרומות -# DonationRef=Donation ref. -# Donor=Donor -# Donors=Donors -# AddDonation=Add a donation -# NewDonation=New donation -# ShowDonation=Show donation -# DonationPromise=Gift promise -# PromisesNotValid=Not validated promises -# PromisesValid=Validated promises -# DonationsPaid=Donations paid -# DonationsReceived=Donations received -# PublicDonation=Public donation -# DonationsNumber=Donation number -# DonationsArea=Donations area -# DonationStatusPromiseNotValidated=Draft promise -# DonationStatusPromiseValidated=Validated promise -# DonationStatusPaid=Donation received -# DonationStatusPromiseNotValidatedShort=Draft -# DonationStatusPromiseValidatedShort=Validated -# DonationStatusPaidShort=Received -# ValidPromess=Validate promise -# DonationReceipt=Donation receipt -# BuildDonationReceipt=Build receipt -# DonationsModels=Documents models for donation receipts -# LastModifiedDonations=Last %s modified donations -# SearchADonation=Search a donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Add a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/he_IL/errors.lang +++ b/htdocs/langs/he_IL/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang index 7b5c96e3671..afb0df633c2 100644 --- a/htdocs/langs/he_IL/holiday.lang +++ b/htdocs/langs/he_IL/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=תאור -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=שם Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang index 421e1bfe35b..f60e9f6b19c 100644 --- a/htdocs/langs/he_IL/interventions.lang +++ b/htdocs/langs/he_IL/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -# Intervention=Intervention +Intervention=Intervention Interventions=התערבויות -# InterventionCard=Intervention card -# NewIntervention=New intervention -# AddIntervention=Add intervention -# ListOfInterventions=List of interventions -# EditIntervention=Edit intervention -# ActionsOnFicheInter=Actions on intervention -# LastInterventions=Last %s interventions -# AllInterventions=All interventions -# CreateDraftIntervention=Create draft -# CustomerDoesNotHavePrefix=Customer does not have a prefix -# InterventionContact=Intervention contact -# DeleteIntervention=Delete intervention -# ValidateIntervention=Validate intervention -# ModifyIntervention=Modify intervention -# DeleteInterventionLine=Delete intervention line -# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -# ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -# NameAndSignatureOfInternalContact=Name and signature of intervening : -# NameAndSignatureOfExternalContact=Name and signature of customer : -# DocumentModelStandard=Standard document model for interventions -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -# ClassifyBilled=Classify "Billed" -# StatusInterInvoiced=Billed -# RelatedInterventions=Related interventions -# ShowIntervention=Show intervention +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Add intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### -# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -# TypeContact_fichinter_internal_INTERVENING=Intervening -# TypeContact_fichinter_external_BILLING=Billing customer contact -# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact # Modele numérotation -# ArcticNumRefModelDesc1=Generic number model -# ArcticNumRefModelError=Failed to activate -# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang index 6b6396451b5..481a006cb7a 100644 --- a/htdocs/langs/he_IL/projects.lang +++ b/htdocs/langs/he_IL/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang index fd098bb307c..0789ed233ee 100644 --- a/htdocs/langs/he_IL/sendings.lang +++ b/htdocs/langs/he_IL/sendings.lang @@ -1,76 +1,78 @@ # Dolibarr language file - Source file is en_US - sendings -# RefSending=Ref. shipment -# Sending=Shipment +RefSending=Ref. shipment +Sending=Shipment Sendings=משלוחים -# Shipment=Shipment +Shipment=Shipment Shipments=משלוחים -# Receivings=Receivings -# SendingsArea=Shipments area -# ListOfSendings=List of shipments -# SendingMethod=Shipping method -# SendingReceipt=Shipping receipt -# LastSendings=Last %s shipments -# SearchASending=Search for shipment -# StatisticsOfSendings=Statistics for shipments -# NbOfSendings=Number of shipments -# NumberOfShipmentsByMonth=Number of shipments by month -# SendingCard=Shipping card -# NewSending=New shipment -# CreateASending=Create a shipment -# CreateSending=Create shipment -# QtyOrdered=Qty ordered -# QtyShipped=Qty shipped -# QtyToShip=Qty to ship -# QtyReceived=Qty received -# KeepToShip=Keep to ship -# OtherSendingsForSameOrder=Other shipments for this order -# DateSending=Date sending order -# DateSendingShort=Date sending order -# SendingsForSameOrder=Shipments for this order -# SendingsAndReceivingForSameOrder=Shipments and receivings for this order -# SendingsToValidate=Shipments to validate -# StatusSendingCanceled=Canceled -# StatusSendingDraft=Draft -# StatusSendingValidated=Validated (products to ship or already shipped) -# StatusSendingProcessed=Processed -# StatusSendingCanceledShort=Canceled -# StatusSendingDraftShort=Draft -# StatusSendingValidatedShort=Validated -# StatusSendingProcessedShort=Processed -# SendingSheet=Sending sheet -# Carriers=Carriers -# Carrier=Carrier -# CarriersArea=Carriers area -# NewCarrier=New carrier -# ConfirmDeleteSending=Are you sure you want to delete this shipment ? -# ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? -# ConfirmCancelSending=Are you sure you want to cancel this shipment ? -# GenericTransport=Generic transport -# Enlevement=Gotten by customer -# DocumentModelSimple=Simple document model -# DocumentModelMerou=Merou A5 model -# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -# DateDeliveryPlanned=Planed date of delivery -# DateReceived=Date delivery received -# SendShippingByEMail=Send shipment by EMail -# SendShippingRef=Send shipment %s -# ActionsOnShipping=Events on shipment -# LinkToTrackYourPackage=Link to track your package -# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +Receivings=Receivings +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipping card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Keep to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Sending sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang index 8098c7e9fd4..7f83fb30440 100644 --- a/htdocs/langs/he_IL/suppliers.lang +++ b/htdocs/langs/he_IL/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=ספקים -# Supplier=Supplier -# AddSupplier=Add a supplier -# SupplierRemoved=Supplier removed -# SuppliersInvoice=Suppliers invoice -# NewSupplier=New supplier -# History=History -# ListOfSuppliers=List of suppliers -# ShowSupplier=Show supplier -# OrderDate=Order date -# BuyingPrice=Buying price -# BuyingPriceMin=Minimum buying price -# BuyingPriceMinShort=Min buying price -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined -# AddSupplierPrice=Add supplier price -# ChangeSupplierPrice=Change supplier price -# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -# NoRecordedSuppliers=No suppliers recorded -# SupplierPayment=Supplier payment -# SuppliersArea=Suppliers area -# RefSupplierShort=Ref. supplier -# Availability=Availability -# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -# ExportDataset_fournisseur_2=Supplier invoices and payments -# ExportDataset_fournisseur_3=Supplier orders and order lines -# ApproveThisOrder=Approve this order -# ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -# DenyingThisOrder=Denying this order -# ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -# ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -# AddCustomerOrder=Create customer order -# AddCustomerInvoice=Create customer invoice -# AddSupplierOrder=Create supplier order -# AddSupplierInvoice=Create supplier invoice -# ListOfSupplierProductForSupplier=List of products and prices for supplier %s -# NoneOrBatchFileNeverRan=None or batch %s not ran recently -# SentToSuppliers=Sent to suppliers +Supplier=Supplier +AddSupplier=Add a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Denying this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/hr_HR/accountancy.lang +++ b/htdocs/langs/hr_HR/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 218e2009fd5..b5309121e95 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang index 943dd73010c..eb3b6a174f4 100644 --- a/htdocs/langs/hr_HR/agenda.lang +++ b/htdocs/langs/hr_HR/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID događaja Actions=Događaji ActionsArea=Područje za događaje (akcije i zadaci) -Agenda= Podsjetnik -Agendas= Podsjetnici -Calendar= Kalendar -Calendars= Kalendari -LocalAgenda=Lokalni kalendar +Agenda=Podsjetnik +Agendas=Podsjetnici +Calendar=Kalendar +Calendars=Kalendari +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Dodjeljeno korisniku DoneBy=Učinio/la Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Svi nepotpuni događaji MenuDoneActions=Svi prekinuti događaji MenuToDoMyActions=Svi nedovršeni događaji MenuDoneMyActions=Moji prekinuti događaji -ListOfEvents=Lista od Dolibarr događaja +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Događaje izvijestio/la ActionsToDoBy=Događaj dodjeljen ActionsDoneBy=Događaji završeni od strane korisnika @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL za pristup .ical datoteki ExtSiteNoLabel=Bez opisa WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang index b28086fa933..ed61bfc08a6 100644 --- a/htdocs/langs/hr_HR/categories.lang +++ b/htdocs/langs/hr_HR/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -# Category=Category -# Categories=Categories -# Rubrique=Category -# Rubriques=Categories -# categories=categories -# TheCategorie=The category -# NoCategoryYet=No category of this type created -# In=In -# AddIn=Add in -# modify=modify -# Classify=Classify -# CategoriesArea=Categories area -# ProductsCategoriesArea=Products/Services categories area -# SuppliersCategoriesArea=Suppliers categories area -# CustomersCategoriesArea=Customers categories area -# ThirdPartyCategoriesArea=Third parties categories area -# MembersCategoriesArea=Members categories area -# ContactsCategoriesArea=Contacts categories area -# MainCats=Main categories -# SubCats=Subcategories -# CatStatistics=Statistics -# CatList=List of categories -# AllCats=All categories -# ViewCat=View category -# NewCat=Add category -# NewCategory=New category -# ModifCat=Modify category -# CatCreated=Category created -# CreateCat=Create category -# CreateThisCat=Create this category -# ValidateFields=Validate the fields -# NoSubCat=No subcategory. -# SubCatOf=Subcategory -# FoundCats=Found categories -# FoundCatsForName=Categories found for the name : -# FoundSubCatsIn=Subcategories found in the category -# ErrSameCatSelected=You selected the same category several times -# ErrForgotCat=You forgot to choose the category -# ErrForgotField=You forgot to inform the fields -# ErrCatAlreadyExists=This name is already used -# AddProductToCat=Add this product to a category? -# ImpossibleAddCat=Impossible to add the category -# ImpossibleAssociateCategory=Impossible to associate the category to -# WasAddedSuccessfully=%s was added successfully. -# ObjectAlreadyLinkedToCategory=Element is already linked to this category. -# CategorySuccessfullyCreated=This category %s has been added with success. -# ProductIsInCategories=Product/service owns to following categories -# SupplierIsInCategories=Third party owns to following suppliers categories -# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -# MemberIsInCategories=This member owns to following members categories -# ContactIsInCategories=This contact owns to following contacts categories -# ProductHasNoCategory=This product/service is not in any categories -# SupplierHasNoCategory=This supplier is not in any categories -# CompanyHasNoCategory=This company is not in any categories -# MemberHasNoCategory=This member is not in any categories -# ContactHasNoCategory=This contact is not in any categories -# ClassifyInCategory=Classify in category -# NoneCategory=None -# NotCategorized=Without category -# CategoryExistsAtSameLevel=This category already exists with this ref -# ReturnInProduct=Back to product/service card -# ReturnInSupplier=Back to supplier card -# ReturnInCompany=Back to customer/prospect card -# ContentsVisibleByAll=The contents will be visible by all -# ContentsVisibleByAllShort=Contents visible by all -# ContentsNotVisibleByAllShort=Contents not visible by all -# CategoriesTree=Categories tree -# DeleteCategory=Delete category -# ConfirmDeleteCategory=Are you sure you want to delete this category ? -# RemoveFromCategory=Remove link with categorie -# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -# NoCategoriesDefined=No category defined -# SuppliersCategoryShort=Suppliers category -# CustomersCategoryShort=Customers category -# ProductsCategoryShort=Products category -# MembersCategoryShort=Members category -# SuppliersCategoriesShort=Suppliers categories -# CustomersCategoriesShort=Customers categories -# CustomersProspectsCategoriesShort=Custo./Prosp. categories -# ProductsCategoriesShort=Products categories -# MembersCategoriesShort=Members categories -# ContactCategoriesShort=Contacts categories -# ThisCategoryHasNoProduct=This category does not contain any product. -# ThisCategoryHasNoSupplier=This category does not contain any supplier. -# ThisCategoryHasNoCustomer=This category does not contain any customer. -# ThisCategoryHasNoMember=This category does not contain any member. -# ThisCategoryHasNoContact=This category does not contain any contact. -# AssignedToCustomer=Assigned to a customer -# AssignedToTheCustomer=Assigned to the customer -# InternalCategory=Internal category -# CategoryContents=Category contents -# CategId=Category id -# CatSupList=List of supplier categories -# CatCusList=List of customer/prospect categories -# CatProdList=List of products categories -# CatMemberList=List of members categories -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang index de79a067d15..48d8b78f547 100644 --- a/htdocs/langs/hr_HR/companies.lang +++ b/htdocs/langs/hr_HR/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=Lista dobavljača ListProspectsShort=Lista potencijalnih kupaca ListCustomersShort=Lista kupaca -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Otvoren @@ -410,3 +410,5 @@ OutstandingBillReached=Dosegnut je maksimalni iznos za otvorene stavke MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/hr_HR/compta.lang +++ b/htdocs/langs/hr_HR/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang index 12a72464cae..66ddea95a5c 100644 --- a/htdocs/langs/hr_HR/donations.lang +++ b/htdocs/langs/hr_HR/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -# Donation=Donation -# Donations=Donations -# DonationRef=Donation ref. -# Donor=Donor -# Donors=Donors -# AddDonation=Add a donation -# NewDonation=New donation -# ShowDonation=Show donation -# DonationPromise=Gift promise -# PromisesNotValid=Not validated promises -# PromisesValid=Validated promises -# DonationsPaid=Donations paid -# DonationsReceived=Donations received -# PublicDonation=Public donation -# DonationsNumber=Donation number -# DonationsArea=Donations area -# DonationStatusPromiseNotValidated=Draft promise -# DonationStatusPromiseValidated=Validated promise -# DonationStatusPaid=Donation received -# DonationStatusPromiseNotValidatedShort=Draft -# DonationStatusPromiseValidatedShort=Validated -# DonationStatusPaidShort=Received -# ValidPromess=Validate promise -# DonationReceipt=Donation receipt -# BuildDonationReceipt=Build receipt -# DonationsModels=Documents models for donation receipts -# LastModifiedDonations=Last %s modified donations -# SearchADonation=Search a donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Add a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/hr_HR/errors.lang +++ b/htdocs/langs/hr_HR/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/hr_HR/holiday.lang +++ b/htdocs/langs/hr_HR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang index 0a5b3e15467..17641a0ab3e 100644 --- a/htdocs/langs/hr_HR/interventions.lang +++ b/htdocs/langs/hr_HR/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -# Intervention=Intervention -# Interventions=Interventions -# InterventionCard=Intervention card -# NewIntervention=New intervention -# AddIntervention=Add intervention -# ListOfInterventions=List of interventions -# EditIntervention=Edit intervention -# ActionsOnFicheInter=Actions on intervention -# LastInterventions=Last %s interventions -# AllInterventions=All interventions -# CreateDraftIntervention=Create draft -# CustomerDoesNotHavePrefix=Customer does not have a prefix -# InterventionContact=Intervention contact -# DeleteIntervention=Delete intervention -# ValidateIntervention=Validate intervention -# ModifyIntervention=Modify intervention -# DeleteInterventionLine=Delete intervention line -# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -# ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -# NameAndSignatureOfInternalContact=Name and signature of intervening : -# NameAndSignatureOfExternalContact=Name and signature of customer : -# DocumentModelStandard=Standard document model for interventions -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -# ClassifyBilled=Classify "Billed" -# StatusInterInvoiced=Billed -# RelatedInterventions=Related interventions -# ShowIntervention=Show intervention +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Add intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### -# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -# TypeContact_fichinter_internal_INTERVENING=Intervening -# TypeContact_fichinter_external_BILLING=Billing customer contact -# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact # Modele numérotation -# ArcticNumRefModelDesc1=Generic number model -# ArcticNumRefModelError=Failed to activate -# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang index 5ca3c3e3f95..e1c66b34417 100644 --- a/htdocs/langs/hr_HR/projects.lang +++ b/htdocs/langs/hr_HR/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang index e404bb39120..0716aebfc79 100644 --- a/htdocs/langs/hr_HR/sendings.lang +++ b/htdocs/langs/hr_HR/sendings.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - sendings -# RefSending=Ref. shipment +RefSending=Ref. shipment Sending=Pošiljka Sendings=Pošiljke Shipment=Pošiljka Shipments=Pošiljke -# Receivings=Receivings -# SendingsArea=Shipments area +Receivings=Receivings +SendingsArea=Shipments area ListOfSendings=Popis pošiljki SendingMethod=Metoda dostave SendingReceipt=Otpremnica pošiljke @@ -14,7 +14,7 @@ SearchASending=Pretraži pošiljke StatisticsOfSendings=Statistike pošiljki NbOfSendings=Broj pošiljki NumberOfShipmentsByMonth=Broj pošiljki tijekom mjeseca -# SendingCard=Shipping card +SendingCard=Shipping card NewSending=Nova pošiljka CreateASending=Kreiraj pošiljku CreateSending=Kreiraj pošiljku @@ -22,22 +22,22 @@ QtyOrdered=Količina naručena QtyShipped=Količina poslana QtyToShip=Količina za poslat QtyReceived=Količina primljena -# KeepToShip=Keep to ship -# OtherSendingsForSameOrder=Other shipments for this order -# DateSending=Date sending order -# DateSendingShort=Date sending order -# SendingsForSameOrder=Shipments for this order -# SendingsAndReceivingForSameOrder=Shipments and receivings for this order -# SendingsToValidate=Shipments to validate +KeepToShip=Keep to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate StatusSendingCanceled=Poništeno StatusSendingDraft=Skica -# StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingValidated=Validated (products to ship or already shipped) StatusSendingProcessed=Obrađen StatusSendingCanceledShort=Poništeno StatusSendingDraftShort=Skica StatusSendingValidatedShort=Ovjereno StatusSendingProcessedShort=Obrađen -# SendingSheet=Sending sheet +SendingSheet=Sending sheet Carriers=Dostavljači Carrier=Dostavljač CarriersArea=Područje dostavljača @@ -45,32 +45,34 @@ NewCarrier=Novi dostavljač ConfirmDeleteSending=Jeste li sigurni da želite izbrisati ovu pošiljku? ConfirmValidateSending=jeste li sigurni da želite ovjeriti ovu pošiljku sa referencom %s ? ConfirmCancelSending=Jeste li sigurni da želite poništiti ovu pošiljku? -# GenericTransport=Generic transport -# Enlevement=Gotten by customer +GenericTransport=Generic transport +Enlevement=Gotten by customer DocumentModelSimple=Jednostavan model dokumenta -# DocumentModelMerou=Merou A5 model -# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -# DateDeliveryPlanned=Planed date of delivery +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery DateReceived=Datum primitka pošiljke SendShippingByEMail=Pošalji pošiljku Emailom -SendShippingRef=Pošalji pošiljku %s -# ActionsOnShipping=Events on shipment -# LinkToTrackYourPackage=Link to track your package -# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. RelatedShippings=Povezane pošiljke -# ShipmentLine=Shipment line -# CarrierList=List of transporters +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) - -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Ukupni volumen proizvoda SumOfProductWeights=Ukupna težina proizvoda + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang index 01c90ede80f..b1545d6ca3c 100644 --- a/htdocs/langs/hr_HR/suppliers.lang +++ b/htdocs/langs/hr_HR/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers -# Suppliers=Suppliers -# Supplier=Supplier -# AddSupplier=Add a supplier -# SupplierRemoved=Supplier removed -# SuppliersInvoice=Suppliers invoice -# NewSupplier=New supplier -# History=History -# ListOfSuppliers=List of suppliers -# ShowSupplier=Show supplier -# OrderDate=Order date -# BuyingPrice=Buying price -# BuyingPriceMin=Minimum buying price -# BuyingPriceMinShort=Min buying price -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined -# AddSupplierPrice=Add supplier price -# ChangeSupplierPrice=Change supplier price -# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -# NoRecordedSuppliers=No suppliers recorded -# SupplierPayment=Supplier payment -# SuppliersArea=Suppliers area -# RefSupplierShort=Ref. supplier -# Availability=Availability -# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -# ExportDataset_fournisseur_2=Supplier invoices and payments -# ExportDataset_fournisseur_3=Supplier orders and order lines -# ApproveThisOrder=Approve this order -# ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -# DenyingThisOrder=Denying this order -# ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -# ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -# AddCustomerOrder=Create customer order -# AddCustomerInvoice=Create customer invoice -# AddSupplierOrder=Create supplier order -# AddSupplierInvoice=Create supplier invoice -# ListOfSupplierProductForSupplier=List of products and prices for supplier %s -# NoneOrBatchFileNeverRan=None or batch %s not ran recently -# SentToSuppliers=Sent to suppliers +Suppliers=Suppliers +Supplier=Supplier +AddSupplier=Add a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Denying this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/hu_HU/accountancy.lang +++ b/htdocs/langs/hu_HU/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 64dc34cbf8a..4344a0df8d5 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Hiba történt, ez a modul Dolibarr %s verzió ErrorDecimalLargerThanAreForbidden=Hiba, a precíziós magasabb %s nem támogatott. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatikus ha a JavaScript le van tiltva AvailableOnlyIfJavascriptNotDisabled=Csak ha a JavaScript nincs letiltva AvailableOnlyIfJavascriptAndAjaxNotDisabled=Csak ha a JavaScript nincs letiltva Required=Kötelező +UsedOnlyWithTypeOption=Used by some agenda option only Security=Biztonság Passwords=Jelszavak DoNotStoreClearPassword=Do No Store egyértelmű jelszavakat adatbázisban tárolja, de csak a titkosított érték (aktivált ajánlott) diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang index 30fdc9d1738..fea301f7b24 100644 --- a/htdocs/langs/hu_HU/agenda.lang +++ b/htdocs/langs/hu_HU/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Cselekvés ActionsArea=Cselekvés terület (Események és Feladatok) -Agenda= Napirend -Agendas= Napirendek -Calendar= Naptár -Calendars= Naptárak -LocalAgenda=Helyi naptár +Agenda=Napirend +Agendas=Napirendek +Calendar=Naptár +Calendars=Naptárak +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Befolyásolhatja DoneBy=Által végzett Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Minden nem teljesített cselekvés MenuDoneActions=Minden megszüntetett cselekvés MenuToDoMyActions=Nem teljesített cselekvéseim MenuDoneMyActions=Megszüntetett cselekvéseim -ListOfEvents=Dolibarr események listája +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Cselekvéseket rögzítette ActionsToDoBy=Eseményeket befolyásolhatja ActionsDoneBy=Actions done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL eléréséhez. ICal fájl ExtSiteNoLabel=Nincs leírás WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang index 41fe7fbada0..3591ea58e6b 100644 --- a/htdocs/langs/hu_HU/categories.lang +++ b/htdocs/langs/hu_HU/categories.lang @@ -16,7 +16,7 @@ SuppliersCategoriesArea=Beszállítói kategóriák terület CustomersCategoriesArea=Ügyfél kategóriák terület ThirdPartyCategoriesArea=Harmadik fél kategóriák terület MembersCategoriesArea=Tagok kategória terület -# ContactsCategoriesArea=Contacts categories area +ContactsCategoriesArea=Contacts categories area MainCats=Fő kategóriák SubCats=Alkategóriák CatStatistics=Statisztikák @@ -50,15 +50,15 @@ SupplierIsInCategories=Ez a harmadik fél a következő beszállítókat tulajdo CompanyIsInCustomersCategories=Ez a harmadik fél a következő ügyfeleket/kilátásokat tulajdonolják CompanyIsInSuppliersCategories=Ez a harmadik fél a következő beszállítókat tulajdonolják MemberIsInCategories=Ez a tag ebbe a tag kategóriába tartozik -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=This contact owns to following contacts categories ProductHasNoCategory=Ez a termék/szolgáltatás nincs egy kategóriában sem SupplierHasNoCategory=Ez a beszállító nincs egy kategóriában sem CompanyHasNoCategory=Ez a cég nincs egy kategóriában sem MemberHasNoCategory=Ez a tag nincs egy kategóriában sem -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=This contact is not in any categories ClassifyInCategory=Kategorizálni NoneCategory=Nincs -# NotCategorized=Without category +NotCategorized=Without category CategoryExistsAtSameLevel=Ez a kategória ezzel a ref# -el már létezik ReturnInProduct=Vissza a termék/szolgáltatás kártyához ReturnInSupplier=Vissza a beszállító kártyához @@ -66,7 +66,7 @@ ReturnInCompany=Vissza az ügyfél/kilátás kártyához ContentsVisibleByAll=A tartalom mindenki számára látható lesz ContentsVisibleByAllShort=Tartalom látható mindenki számára ContentsNotVisibleByAllShort=Tartalom nem látható mindenki számára -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Kategória törlése ConfirmDeleteCategory=Biztos törölni akarja a kategóriát? RemoveFromCategory=Kategória link eltávolítása @@ -81,12 +81,12 @@ CustomersCategoriesShort=Vásárlói kategória CustomersProspectsCategoriesShort=Vásárló/Kilátás kategóriák ProductsCategoriesShort=Termék kategória MembersCategoriesShort=Tag kategória -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contacts categories ThisCategoryHasNoProduct=Ez a kategória nem tartalmaz termékeket. ThisCategoryHasNoSupplier=Ez a kategória nem tartalmaz beszállítót. ThisCategoryHasNoCustomer=Ez a kategória nem tartalmaz vásárlót. ThisCategoryHasNoMember=Ez a kategória nem tartalmaz tagot. -# ThisCategoryHasNoContact=This category does not contain any contact. +ThisCategoryHasNoContact=This category does not contain any contact. AssignedToCustomer=Vásárlóhoz rendelve AssignedToTheCustomer=Vásárlóhoz rendelve InternalCategory=Belső kategória @@ -96,18 +96,19 @@ CatSupList=Beszállítói kategóriák listázása CatCusList=Ügyfél/kilátás kategóriák listázása CatProdList=Termék kategóriák listázása CatMemberList=Tag kategóriák listázása -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang index f3e560298d9..0e5a758e750 100644 --- a/htdocs/langs/hu_HU/companies.lang +++ b/htdocs/langs/hu_HU/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Létre kell hoznia e-mail kapcsolatokat a harmadik pá ListSuppliersShort=Beszállítók listája ListProspectsShort=Listája kilátások ListCustomersShort=Ügyfelek listája -ThirdPartiesArea=Harmadik fél területén +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Utolsó módosítás %s harmadik fél UniqueThirdParties=Összesen egyedi harmadik fél InActivity=Nyitva @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Vissza a numero formátumban %syymm-nnnn kódot, és az ügyfelek %syymm-nnnn kódot, ahol a szállító yy év, hónap és mm nnnn sorozata szünet nélkül, és nincs visszaút 0-ra. LeopardNumRefModelDesc=Vevő / szállító kód ingyenes. Ez a kód lehet bármikor módosítható. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang index 1acf7e994fe..8a7e484f3f0 100644 --- a/htdocs/langs/hu_HU/compta.lang +++ b/htdocs/langs/hu_HU/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang index d0a18bec5ad..7e62d1b8e7c 100644 --- a/htdocs/langs/hu_HU/donations.lang +++ b/htdocs/langs/hu_HU/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Adomány Donations=Adományok -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Donor Donors=Donorok AddDonation=Új adomány hozzáadása NewDonation=Új adomány -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Ajándék ígéret PromisesNotValid=Nem hitelesített ígéretek PromisesValid=Hitelesített ígéretek @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Vázlat DonationStatusPromiseValidatedShort=Hitelesített DonationStatusPaidShort=Kapott ValidPromess=Érvényesítés ígéret -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Nyugta készítése DonationsModels=Dokumentum modellek adományok nyugtájához LastModifiedDonations=Utolsó módosítás adományok %s SearchADonation=Keresés adományt -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang index ac29c8970db..21b3252c7df 100644 --- a/htdocs/langs/hu_HU/errors.lang +++ b/htdocs/langs/hu_HU/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang index 1bab1342ddc..cb4e1241079 100644 --- a/htdocs/langs/hu_HU/holiday.lang +++ b/htdocs/langs/hu_HU/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Kezdési dátum DateFinCP=Befejezési dátum @@ -18,24 +18,24 @@ ApprovedCP=Jóváhagyott CancelCP=Megszakítva RefuseCP=Megtagadta ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Leírás -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Szerkesztés DeleteCP=Törlés ActionValidCP=Hitelesítés @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Megszakítás StatutCP=Állapot SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Frissítés -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Ok UserCP=Felhasználó ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Vezetéknév Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Érték -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Hitelesítés UpdateEventCP=Update events CreateEventCP=Létrehozás @@ -127,23 +127,23 @@ UpdateEventOptionCP=Frissítés ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang index c7eaf7499b8..59578b47fe2 100644 --- a/htdocs/langs/hu_HU/interventions.lang +++ b/htdocs/langs/hu_HU/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Biztos törölni akarja ezt az intervenciót vonal NameAndSignatureOfInternalContact=Beavatkozó neve és aláírása: NameAndSignatureOfExternalContact=Ügyfél neve és aláírása: DocumentModelStandard=Standard dokumentum modell intervenciókhoz -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Classify "számlázott" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Számlázott RelatedInterventions=Kapcsolódó beavatkozások ShowIntervention=Mutasd beavatkozás +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Reprezentatív követési intervenció TypeContact_fichinter_internal_INTERVENING=Beavatkozás @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Általános szám modell ArcticNumRefModelError=Sikertelen aktiválás PacificNumRefModelDesc1=Számot ad a következő formában: %syymm-nnnn ahol yy az év, mm a hónap és nnnn 4 szám 0-tól indúlva PacificNumRefModelError=Egy intervenciós kártya $syymm kezdéssel már létezik és nem kompatibilies ezzel a szekvencia modellel. Távolítsa el vagy nevezze át hogy aktiválhassa a modult. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang index ae4d0dcb20a..535514cb225 100644 --- a/htdocs/langs/hu_HU/projects.lang +++ b/htdocs/langs/hu_HU/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Projekteh tartozó cselekvések YouAreNotContactOfProject=Nem kapcsolata ennek a privát projektnek DeleteATimeSpent=Eltöltött idő törlése ConfirmDeleteATimeSpent=Biztos törölni akarja az eltöltött időt? -DoNotShowMyTasksOnly=Minden feladat mutatása -ShowMyTasksOnly=Csak azon feladatok mutatása ami érintő +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Erőforrások ProjectsDedicatedToThisThirdParty=Harmadik félhnek dedikált projektek NoTasks=Nincs a projekthez tartozó feladat LinkedToAnotherCompany=Harmadik félhez kapcsolva -TaskIsNotAffectedToYou=Feladat nem osztottak neked +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Töltött idő üres ThisWillAlsoRemoveTasks=Ez a művelet is törli az összes feladatot a projekt (%s feladatokat a pillanatban), és az összes bemenet eltöltött idő. IfNeedToUseOhterObjectKeepEmpty=Ha egyes tárgyakat (számla, megrendelés, ...), amelyek egy másik harmadik félnek kell kapcsolódniuk a projekt létrehozásához, tartsa ezt az üres, hogy a projekt, hogy több harmadik fél. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Teljes jelentés modell (logo, ...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang index bc7da1abf28..78863047b5e 100644 --- a/htdocs/langs/hu_HU/sendings.lang +++ b/htdocs/langs/hu_HU/sendings.lang @@ -13,7 +13,7 @@ LastSendings=%s utolsó szállítás SearchASending=Szállítás keresése StatisticsOfSendings=Szállítási statisztikák NbOfSendings=Szállítások száma -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Szállítási kártya NewSending=Új szállítás CreateASending=Szállítás létrehozása @@ -50,27 +50,29 @@ Enlevement=Ügyfél átvette DocumentModelSimple=Egyszerű dokumentum modell DocumentModelMerou=Merou A5 modell WarningNoQtyLeftToSend=Figyelem, nincs szállításra váró termék. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Tervezett szállítási dátum DateReceived=Átvétel dátuma SendShippingByEMail=Küldés e-mailben szállítás -SendShippingRef=Küldje szállítás %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Események a szállítás LinkToTrackYourPackage=Link követni a csomagot ShipmentCreationIsDoneFromOrder=Ebben a pillanatban, létrejön egy új szállítmány kerül sor a sorrendben kártyát. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Ügyfél fogád SendingMethodTRANS=Szállító SendingMethodCOLSUI=Futár szolgálat - # ModelDocument DocumentModelSirocco=Egyszerű dokumentum modell bizonylatokhoz DocumentModelTyphon=Teljesebb dokumentum modell bizonylatokhoz (logo...) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Állandó EXPEDITION_ADDON_NUMBER nincs definiálva -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang index 95b02f57429..ea6dcc26afa 100644 --- a/htdocs/langs/hu_HU/suppliers.lang +++ b/htdocs/langs/hu_HU/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Megrendelés dátuma BuyingPrice=Vásárlási ár BuyingPriceMin=Minimális felvásárlási árat BuyingPriceMinShort=Min felvásárlási ár -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Beszállítói ár hozzáadása ChangeSupplierPrice=Beszállítói ár megváltoztatása ErrorQtyTooLowForThisSupplier=A mennyiség túl kicsi ehhez a beszállítóhoz vagy nincs ár meghatározva erre a termékre ettől beszállítótól. @@ -27,7 +27,7 @@ RefSupplierShort=Beszállító # Availability=Elérhetőség ExportDataset_fournisseur_1=Beszállítói számla lista és számla sorok ExportDataset_fournisseur_2=Beszállítói számlák és fizetések -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Megrendelés jóváhagyása ConfirmApproveThisOrder=Biztos jóvá akarja hagyni a megrendelést? DenyingThisOrder=Megrendelés elutasítása @@ -39,4 +39,6 @@ AddSupplierOrder=Beszállítói megrendelés létrehozása AddSupplierInvoice=Beszállítói számla létrehozása ListOfSupplierProductForSupplier=%s beszállító termékei és árai NoneOrBatchFileNeverRan=Nincs vagy a %s batch fájl nem futott az utóbbi időben -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/id_ID/accountancy.lang +++ b/htdocs/langs/id_ID/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index 2f855e7e151..a3ff7341c4a 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Ada yang salah, modul ini membutuhkan versi Do ErrorDecimalLargerThanAreForbidden=Ada yang salah, presisi yang lebih tinggi dari %s tidak didukung DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Nilai atau value 'system' dan 'systemauto' untuk tipe / type sudah ada. Anda bisa menggunakan 'user' sebagai nilai / value untuk membuat pencatatan / record Anda sendiri. ErrorCodeCantContainZero=Kode tidak boleh menggandung nilai / value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang index 5fb9bbe8f14..1dd21b4c14e 100644 --- a/htdocs/langs/id_ID/agenda.lang +++ b/htdocs/langs/id_ID/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Acara ActionsArea=Acara daerah (Tindakan dan tugas) -Agenda= Agenda -Agendas= Agenda -Calendar= Kalender -Calendars= Kalender -LocalAgenda=Kalender lokal +Agenda=Agenda +Agendas=Agenda +Calendar=Kalender +Calendars=Kalender +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Ditugaskan untuk DoneBy=Dilakukan oleh Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Semua peristiwa yang tidak lengkap MenuDoneActions=Semua acara dihentikan MenuToDoMyActions=Acara lengkap saya MenuDoneMyActions=Acara saya dihentikan -ListOfEvents=Daftar kejadian Dolibarr +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Acara yang dilaporkan oleh ActionsToDoBy=Acara ditugaskan untuk ActionsDoneBy=Acara yang dilakukan oleh @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang index b28086fa933..ed61bfc08a6 100644 --- a/htdocs/langs/id_ID/categories.lang +++ b/htdocs/langs/id_ID/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -# Category=Category -# Categories=Categories -# Rubrique=Category -# Rubriques=Categories -# categories=categories -# TheCategorie=The category -# NoCategoryYet=No category of this type created -# In=In -# AddIn=Add in -# modify=modify -# Classify=Classify -# CategoriesArea=Categories area -# ProductsCategoriesArea=Products/Services categories area -# SuppliersCategoriesArea=Suppliers categories area -# CustomersCategoriesArea=Customers categories area -# ThirdPartyCategoriesArea=Third parties categories area -# MembersCategoriesArea=Members categories area -# ContactsCategoriesArea=Contacts categories area -# MainCats=Main categories -# SubCats=Subcategories -# CatStatistics=Statistics -# CatList=List of categories -# AllCats=All categories -# ViewCat=View category -# NewCat=Add category -# NewCategory=New category -# ModifCat=Modify category -# CatCreated=Category created -# CreateCat=Create category -# CreateThisCat=Create this category -# ValidateFields=Validate the fields -# NoSubCat=No subcategory. -# SubCatOf=Subcategory -# FoundCats=Found categories -# FoundCatsForName=Categories found for the name : -# FoundSubCatsIn=Subcategories found in the category -# ErrSameCatSelected=You selected the same category several times -# ErrForgotCat=You forgot to choose the category -# ErrForgotField=You forgot to inform the fields -# ErrCatAlreadyExists=This name is already used -# AddProductToCat=Add this product to a category? -# ImpossibleAddCat=Impossible to add the category -# ImpossibleAssociateCategory=Impossible to associate the category to -# WasAddedSuccessfully=%s was added successfully. -# ObjectAlreadyLinkedToCategory=Element is already linked to this category. -# CategorySuccessfullyCreated=This category %s has been added with success. -# ProductIsInCategories=Product/service owns to following categories -# SupplierIsInCategories=Third party owns to following suppliers categories -# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -# MemberIsInCategories=This member owns to following members categories -# ContactIsInCategories=This contact owns to following contacts categories -# ProductHasNoCategory=This product/service is not in any categories -# SupplierHasNoCategory=This supplier is not in any categories -# CompanyHasNoCategory=This company is not in any categories -# MemberHasNoCategory=This member is not in any categories -# ContactHasNoCategory=This contact is not in any categories -# ClassifyInCategory=Classify in category -# NoneCategory=None -# NotCategorized=Without category -# CategoryExistsAtSameLevel=This category already exists with this ref -# ReturnInProduct=Back to product/service card -# ReturnInSupplier=Back to supplier card -# ReturnInCompany=Back to customer/prospect card -# ContentsVisibleByAll=The contents will be visible by all -# ContentsVisibleByAllShort=Contents visible by all -# ContentsNotVisibleByAllShort=Contents not visible by all -# CategoriesTree=Categories tree -# DeleteCategory=Delete category -# ConfirmDeleteCategory=Are you sure you want to delete this category ? -# RemoveFromCategory=Remove link with categorie -# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -# NoCategoriesDefined=No category defined -# SuppliersCategoryShort=Suppliers category -# CustomersCategoryShort=Customers category -# ProductsCategoryShort=Products category -# MembersCategoryShort=Members category -# SuppliersCategoriesShort=Suppliers categories -# CustomersCategoriesShort=Customers categories -# CustomersProspectsCategoriesShort=Custo./Prosp. categories -# ProductsCategoriesShort=Products categories -# MembersCategoriesShort=Members categories -# ContactCategoriesShort=Contacts categories -# ThisCategoryHasNoProduct=This category does not contain any product. -# ThisCategoryHasNoSupplier=This category does not contain any supplier. -# ThisCategoryHasNoCustomer=This category does not contain any customer. -# ThisCategoryHasNoMember=This category does not contain any member. -# ThisCategoryHasNoContact=This category does not contain any contact. -# AssignedToCustomer=Assigned to a customer -# AssignedToTheCustomer=Assigned to the customer -# InternalCategory=Internal category -# CategoryContents=Category contents -# CategId=Category id -# CatSupList=List of supplier categories -# CatCusList=List of customer/prospect categories -# CatProdList=List of products categories -# CatMemberList=List of members categories -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/id_ID/companies.lang +++ b/htdocs/langs/id_ID/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/id_ID/compta.lang +++ b/htdocs/langs/id_ID/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang index 12a72464cae..66ddea95a5c 100644 --- a/htdocs/langs/id_ID/donations.lang +++ b/htdocs/langs/id_ID/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -# Donation=Donation -# Donations=Donations -# DonationRef=Donation ref. -# Donor=Donor -# Donors=Donors -# AddDonation=Add a donation -# NewDonation=New donation -# ShowDonation=Show donation -# DonationPromise=Gift promise -# PromisesNotValid=Not validated promises -# PromisesValid=Validated promises -# DonationsPaid=Donations paid -# DonationsReceived=Donations received -# PublicDonation=Public donation -# DonationsNumber=Donation number -# DonationsArea=Donations area -# DonationStatusPromiseNotValidated=Draft promise -# DonationStatusPromiseValidated=Validated promise -# DonationStatusPaid=Donation received -# DonationStatusPromiseNotValidatedShort=Draft -# DonationStatusPromiseValidatedShort=Validated -# DonationStatusPaidShort=Received -# ValidPromess=Validate promise -# DonationReceipt=Donation receipt -# BuildDonationReceipt=Build receipt -# DonationsModels=Documents models for donation receipts -# LastModifiedDonations=Last %s modified donations -# SearchADonation=Search a donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Add a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/id_ID/errors.lang +++ b/htdocs/langs/id_ID/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/id_ID/holiday.lang +++ b/htdocs/langs/id_ID/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang index 0a5b3e15467..17641a0ab3e 100644 --- a/htdocs/langs/id_ID/interventions.lang +++ b/htdocs/langs/id_ID/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -# Intervention=Intervention -# Interventions=Interventions -# InterventionCard=Intervention card -# NewIntervention=New intervention -# AddIntervention=Add intervention -# ListOfInterventions=List of interventions -# EditIntervention=Edit intervention -# ActionsOnFicheInter=Actions on intervention -# LastInterventions=Last %s interventions -# AllInterventions=All interventions -# CreateDraftIntervention=Create draft -# CustomerDoesNotHavePrefix=Customer does not have a prefix -# InterventionContact=Intervention contact -# DeleteIntervention=Delete intervention -# ValidateIntervention=Validate intervention -# ModifyIntervention=Modify intervention -# DeleteInterventionLine=Delete intervention line -# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -# ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -# NameAndSignatureOfInternalContact=Name and signature of intervening : -# NameAndSignatureOfExternalContact=Name and signature of customer : -# DocumentModelStandard=Standard document model for interventions -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -# ClassifyBilled=Classify "Billed" -# StatusInterInvoiced=Billed -# RelatedInterventions=Related interventions -# ShowIntervention=Show intervention +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Add intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### -# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -# TypeContact_fichinter_internal_INTERVENING=Intervening -# TypeContact_fichinter_external_BILLING=Billing customer contact -# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact # Modele numérotation -# ArcticNumRefModelDesc1=Generic number model -# ArcticNumRefModelError=Failed to activate -# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/id_ID/projects.lang +++ b/htdocs/langs/id_ID/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang index 3bb65c295d2..2ae43f39766 100644 --- a/htdocs/langs/id_ID/sendings.lang +++ b/htdocs/langs/id_ID/sendings.lang @@ -1,76 +1,78 @@ # Dolibarr language file - Source file is en_US - sendings -# RefSending=Ref. shipment -# Sending=Shipment -# Sendings=Shipments -# Shipment=Shipment -# Shipments=Shipments -# Receivings=Receivings -# SendingsArea=Shipments area -# ListOfSendings=List of shipments -# SendingMethod=Shipping method -# SendingReceipt=Shipping receipt -# LastSendings=Last %s shipments -# SearchASending=Search for shipment -# StatisticsOfSendings=Statistics for shipments -# NbOfSendings=Number of shipments -# NumberOfShipmentsByMonth=Number of shipments by month -# SendingCard=Shipping card -# NewSending=New shipment -# CreateASending=Create a shipment -# CreateSending=Create shipment -# QtyOrdered=Qty ordered -# QtyShipped=Qty shipped -# QtyToShip=Qty to ship -# QtyReceived=Qty received -# KeepToShip=Keep to ship -# OtherSendingsForSameOrder=Other shipments for this order -# DateSending=Date sending order -# DateSendingShort=Date sending order -# SendingsForSameOrder=Shipments for this order -# SendingsAndReceivingForSameOrder=Shipments and receivings for this order -# SendingsToValidate=Shipments to validate -# StatusSendingCanceled=Canceled -# StatusSendingDraft=Draft -# StatusSendingValidated=Validated (products to ship or already shipped) -# StatusSendingProcessed=Processed -# StatusSendingCanceledShort=Canceled -# StatusSendingDraftShort=Draft -# StatusSendingValidatedShort=Validated -# StatusSendingProcessedShort=Processed -# SendingSheet=Sending sheet -# Carriers=Carriers -# Carrier=Carrier -# CarriersArea=Carriers area -# NewCarrier=New carrier -# ConfirmDeleteSending=Are you sure you want to delete this shipment ? -# ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? -# ConfirmCancelSending=Are you sure you want to cancel this shipment ? -# GenericTransport=Generic transport -# Enlevement=Gotten by customer -# DocumentModelSimple=Simple document model -# DocumentModelMerou=Merou A5 model -# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -# DateDeliveryPlanned=Planed date of delivery -# DateReceived=Date delivery received -# SendShippingByEMail=Send shipment by EMail -# SendShippingRef=Send shipment %s -# ActionsOnShipping=Events on shipment -# LinkToTrackYourPackage=Link to track your package -# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +Receivings=Receivings +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipping card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Keep to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Sending sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang index 01c90ede80f..b1545d6ca3c 100644 --- a/htdocs/langs/id_ID/suppliers.lang +++ b/htdocs/langs/id_ID/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers -# Suppliers=Suppliers -# Supplier=Supplier -# AddSupplier=Add a supplier -# SupplierRemoved=Supplier removed -# SuppliersInvoice=Suppliers invoice -# NewSupplier=New supplier -# History=History -# ListOfSuppliers=List of suppliers -# ShowSupplier=Show supplier -# OrderDate=Order date -# BuyingPrice=Buying price -# BuyingPriceMin=Minimum buying price -# BuyingPriceMinShort=Min buying price -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined -# AddSupplierPrice=Add supplier price -# ChangeSupplierPrice=Change supplier price -# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -# NoRecordedSuppliers=No suppliers recorded -# SupplierPayment=Supplier payment -# SuppliersArea=Suppliers area -# RefSupplierShort=Ref. supplier -# Availability=Availability -# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -# ExportDataset_fournisseur_2=Supplier invoices and payments -# ExportDataset_fournisseur_3=Supplier orders and order lines -# ApproveThisOrder=Approve this order -# ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -# DenyingThisOrder=Denying this order -# ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -# ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -# AddCustomerOrder=Create customer order -# AddCustomerInvoice=Create customer invoice -# AddSupplierOrder=Create supplier order -# AddSupplierInvoice=Create supplier invoice -# ListOfSupplierProductForSupplier=List of products and prices for supplier %s -# NoneOrBatchFileNeverRan=None or batch %s not ran recently -# SentToSuppliers=Sent to suppliers +Suppliers=Suppliers +Supplier=Supplier +AddSupplier=Add a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Denying this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/is_IS/accountancy.lang +++ b/htdocs/langs/is_IS/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 80483ecae25..895cff19ca9 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Villa, þessa einingu þarf Dolibarr útgáfu ErrorDecimalLargerThanAreForbidden=Villa, a nákvæmni hærra en %s er ekki studd. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Sjálfvirk ef Javascript er fatlaður AvailableOnlyIfJavascriptNotDisabled=Aðeins í boði ef JavaScript er ekki fatlaður AvailableOnlyIfJavascriptAndAjaxNotDisabled=Aðeins í boði ef JavaScript er ekki fatlaður Required=Krafist +UsedOnlyWithTypeOption=Used by some agenda option only Security=Öryggi Passwords=Lykilorð DoNotStoreClearPassword=Gera ekki geyma skýrar lykilorð í gagnagrunninum en geyma aðeins dulkóðuð gildi (Virkja mælt með) diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang index a3e54538ac0..f5e5d9c96f7 100644 --- a/htdocs/langs/is_IS/agenda.lang +++ b/htdocs/langs/is_IS/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Actions ActionsArea=Actions svæði (Viðburðir og verkefni) -Agenda= Dagskrá -Agendas= Dagskrá -Calendar= Calendar -Calendars= Dagatöl -LocalAgenda=Staðbundin dagbók +Agenda=Dagskrá +Agendas=Dagskrá +Calendar=Calendar +Calendars=Dagatöl +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Áhrifum á DoneBy=Lokið við Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Allar ófullnægjandi aðgerðir MenuDoneActions=Allir ljúka aðgerðum MenuToDoMyActions=ófullnægjandi aðgerðir mínar MenuDoneMyActions=Hætta aðgerðum minn -ListOfEvents=Listi yfir Dolibarr viðburðir +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Actions skráð ActionsToDoBy=Actions áhrif til ActionsDoneBy=Actions gert með því að @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=Slóð til að opna. Kvæmd skrá ExtSiteNoLabel=Engin lýsing WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang index b8346498c60..7b94e5fa730 100644 --- a/htdocs/langs/is_IS/categories.lang +++ b/htdocs/langs/is_IS/categories.lang @@ -16,7 +16,7 @@ SuppliersCategoriesArea=Birgjar flokkar area CustomersCategoriesArea=Viðskiptavinir flokkar area ThirdPartyCategoriesArea=Í þriðja aðila flokkar area MembersCategoriesArea=Members flokkar area -# ContactsCategoriesArea=Contacts categories area +ContactsCategoriesArea=Contacts categories area MainCats=Helstu flokkar SubCats=Undirflokkar CatStatistics=Tölfræði @@ -50,15 +50,15 @@ SupplierIsInCategories=Þriðji aðili er eigandi að eftirtöldum birgjum flokk CompanyIsInCustomersCategories=Þessi þriðji aðili er eigandi að fylgja viðskiptavinum / horfur flokkar CompanyIsInSuppliersCategories=Þessi þriðji aðili er eigandi að eftirtöldum birgjum flokkar MemberIsInCategories=Þessi aðili er eigandi að eftirfarandi aðilar flokkar -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=This contact owns to following contacts categories ProductHasNoCategory=Þessi vara / þjónusta er ekki í neinum flokkum SupplierHasNoCategory=Þetta birgir ekki í neinum flokkum CompanyHasNoCategory=Þetta fyrirtæki er ekki í neinum flokkum MemberHasNoCategory=Þessi aðili er ekki í neinum flokkum -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=This contact is not in any categories ClassifyInCategory=Flokka í flokki NoneCategory=None -# NotCategorized=Without category +NotCategorized=Without category CategoryExistsAtSameLevel=Þessi flokkur er þegar til með þessu tilv ReturnInProduct=Til baka vöru / þjónustu kort ReturnInSupplier=Til baka birgir kort @@ -66,7 +66,7 @@ ReturnInCompany=Til baka viðskiptavina / horfur kort ContentsVisibleByAll=Inntak verður sýnilegt af öllum ContentsVisibleByAllShort=Efnisyfirlit sýnileg um alla ContentsNotVisibleByAllShort=Efnisyfirlit ekki sýnileg um alla -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Eyða flokki ConfirmDeleteCategory=Ertu viss um að þú viljir eyða þessum flokki? RemoveFromCategory=Fjarlægja hlekk með Flokkur @@ -81,12 +81,12 @@ CustomersCategoriesShort=Viðskiptavinir flokkar CustomersProspectsCategoriesShort=Custo. / Prosp. Flokkur ProductsCategoriesShort=Vörur flokkar MembersCategoriesShort=Members flokkar -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contacts categories ThisCategoryHasNoProduct=Þessi flokkur inniheldur ekki vöruna. ThisCategoryHasNoSupplier=Þessi flokkur inniheldur ekki birgir. ThisCategoryHasNoCustomer=Þessi flokkur inniheldur ekki allir viðskiptavinur. ThisCategoryHasNoMember=Þessi flokkur inniheldur ekki meðlimur. -# ThisCategoryHasNoContact=This category does not contain any contact. +ThisCategoryHasNoContact=This category does not contain any contact. AssignedToCustomer=Úthlutað til viðskiptavinar AssignedToTheCustomer=Úthlutað til viðskiptavinar InternalCategory=Innri flokkur @@ -96,18 +96,19 @@ CatSupList=Listi yfir flokka birgir CatCusList=Listi yfir viðskiptavini / horfur flokkar CatProdList=Listi yfir vörur flokkar CatMemberList=Listi yfir meðlimi flokkar -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang index 5cc49658483..f46c9383cc2 100644 --- a/htdocs/langs/is_IS/companies.lang +++ b/htdocs/langs/is_IS/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Þú verður að búa til tölvupóst tengiliði fyrir ListSuppliersShort=Listi yfir birgja ListProspectsShort=Listi yfir horfur ListCustomersShort=Listi yfir viðskiptavini -ThirdPartiesArea=Þriðja aðila svæði +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Síðustu %s breytt þriðja aðila UniqueThirdParties=Samtals einstaka þriðja aðila InActivity=Opnaðu @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Fara aftur numero með snið %s yymm-NNNN fyrir kóða viðskiptavina og %s yymm-NNNN fyrir númer birgja þar sem YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0. LeopardNumRefModelDesc=Viðskiptavinur / birgir númerið er ókeypis. Þessi kóði getur breytt hvenær sem er. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang index d9148be61f3..d04635fb00f 100644 --- a/htdocs/langs/is_IS/compta.lang +++ b/htdocs/langs/is_IS/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang index 8b8a68840b8..0a14a8eb626 100644 --- a/htdocs/langs/is_IS/donations.lang +++ b/htdocs/langs/is_IS/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Framlög Donations=Fjárframlög -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Gjafa Donors=Styrktaraðila AddDonation=Bæta við framlag NewDonation=New málefnið -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Gjöf loforð PromisesNotValid=Ekki staðfest loforð PromisesValid=Staðfestar loforð @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Víxill DonationStatusPromiseValidatedShort=Staðfestar DonationStatusPaidShort=Móttekin ValidPromess=Staðfesta loforð -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Byggja kvittun DonationsModels=Skjöl líkan fyrir kvittunum framlag LastModifiedDonations=Síðustu %s breytt framlög SearchADonation=Leita að framlag -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang index a6a23b7b1ed..a21ac67cabe 100644 --- a/htdocs/langs/is_IS/errors.lang +++ b/htdocs/langs/is_IS/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang index 5b48021e0c2..011397244f0 100644 --- a/htdocs/langs/is_IS/holiday.lang +++ b/htdocs/langs/is_IS/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Upphafsdagur DateFinCP=Lokadagur @@ -18,24 +18,24 @@ ApprovedCP=Samþykkt CancelCP=Hætt við RefuseCP=Neitaði ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Lýsing -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Breyta DeleteCP=Eyða ActionValidCP=Staðfesta @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Hætta við StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Uppfæra -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Ástæða UserCP=Notandi ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Nafn Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Gildi -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Staðfesta UpdateEventCP=Update events CreateEventCP=Búa til @@ -127,23 +127,23 @@ UpdateEventOptionCP=Uppfæra ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang index 0e3e87c7e59..12b2d4ee681 100644 --- a/htdocs/langs/is_IS/interventions.lang +++ b/htdocs/langs/is_IS/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Ertu viss um að þú viljir eyða þessari íhlut NameAndSignatureOfInternalContact=Nafn og undirritun íhlutun: NameAndSignatureOfExternalContact=Nafn og undirritun viðskiptavinar: DocumentModelStandard=Staðlað skjal líkan fyrir afskipti -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Flokka "borgað" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed RelatedInterventions=Tengdar inngrip ShowIntervention=Sýna afskipti +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Fulltrúi eftirfarandi upp afskipti TypeContact_fichinter_internal_INTERVENING=Íhlutun @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Generic tala líkan ArcticNumRefModelError=Ekki tókst að virkja PacificNumRefModelDesc1=Fara aftur numero með snið %s yymm-NNNN þar YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0 PacificNumRefModelError=Íhlutun kort sem byrjar á $ syymm er til nú þegar og er ekki með þessari tegund af röð. Fjarlægja hana eða gefa henni nýtt heiti þess að virkja þessa einingu. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang index a04898ee5f2..347428bf607 100644 --- a/htdocs/langs/is_IS/projects.lang +++ b/htdocs/langs/is_IS/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Aðgerðir á verkefninu YouAreNotContactOfProject=Þú ert ekki samband við þessa einka verkefni DeleteATimeSpent=Eyða tíma ConfirmDeleteATimeSpent=Ertu viss um að þú viljir eyða þessum tíma varið? -DoNotShowMyTasksOnly=Sjá einnig verkefni ég er ekki áhrif á -ShowMyTasksOnly=Skoða aðeins verkefni ég er hrærður til +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Verkefni hollur til þessa þriðja aðila NoTasks=Engin verkefni fyrir þetta verkefni LinkedToAnotherCompany=Tengjast öðrum þriðja aðila -TaskIsNotAffectedToYou=Verkefni úthlutað ekki við þig +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Tími er tómur ThisWillAlsoRemoveTasks=Þessi aðgerð mun einnig eyða öllum verkefnum verkefnisins (%s verkefni í augnablikinu) og allt inntak tíma varið. IfNeedToUseOhterObjectKeepEmpty=Ef sumir hlutir (nótum röð ...), sem tilheyra öðrum þriðja aðila, verður að vera í tengslum við verkefnið til að búa til, halda þessu tóm til að hafa verkefni verði fjölnota þriðja aðila. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=skýrslu lýkur verkefninu er líkan (logo. ..) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang index e7b178259dd..e53d724a0fe 100644 --- a/htdocs/langs/is_IS/sendings.lang +++ b/htdocs/langs/is_IS/sendings.lang @@ -13,7 +13,7 @@ LastSendings=Last %s sendingar SearchASending=Leita að sendingunni StatisticsOfSendings=Tölfræði fyrir sendingar NbOfSendings=Fjöldi sendinga -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Shipping kort NewSending=New sendingunni CreateASending=Búa til sendingu @@ -50,27 +50,29 @@ Enlevement=Fengið við viðskiptavini DocumentModelSimple=Einföld skjal líkan DocumentModelMerou=Merou A5 líkan WarningNoQtyLeftToSend=Aðvörun, að engar vörur sem bíður sendar. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Flugvél fæðingardag DateReceived=Date sending berast SendShippingByEMail=Senda sendingu með tölvupósti -SendShippingRef=Senda sendingunni %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Viðburðir á sendingunni LinkToTrackYourPackage=Tengill til að fylgjast með pakka ShipmentCreationIsDoneFromOrder=Í augnablikinu er sköpun af a nýr sendingunni gert úr þeirri röð kortinu. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Afli eftir viðskiptavina SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Einföld skjal líkan fyrir kvittunum sending DocumentModelTyphon=Meira heill skjal líkan fyrir kvittunum sending (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER skilgreind ekki -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang index 45fc029d1c1..72b1f89b046 100644 --- a/htdocs/langs/is_IS/suppliers.lang +++ b/htdocs/langs/is_IS/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Panta dagsetningu BuyingPrice=Kaupverð BuyingPriceMin=Lágmark Kaupverð BuyingPriceMinShort=Min Kaupverð -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Bæta við birgi verð ChangeSupplierPrice=Breyta birgir verð ErrorQtyTooLowForThisSupplier=Magn of lágt fyrir þetta birgis eða ekkert verði skilgreind á þessa vöru fyrir þennan birgir @@ -27,7 +27,7 @@ RefSupplierShort=Tilv. birgir Availability=Framboð ExportDataset_fournisseur_1=Birgir reikningum lista og línur reiknings er ExportDataset_fournisseur_2=Birgir reikninga og greiðslur -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Samþykkja þessari röð ConfirmApproveThisOrder=Ertu viss um að þú viljir samþykkja þessari röð? DenyingThisOrder=Afneita þessari röð @@ -39,4 +39,6 @@ AddSupplierOrder=Búa til birgja þess AddSupplierInvoice=Búa til birgja Reikningar ListOfSupplierProductForSupplier=Listi yfir vörur og verð fyrir% söluaðila s NoneOrBatchFileNeverRan=Enginn eða hópur %s er ekki hljóp nýlega -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang index 3c1337696d8..a28f87e3343 100644 --- a/htdocs/langs/it_IT/accountancy.lang +++ b/htdocs/langs/it_IT/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Data diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index e383a6e57f8..ee2688d5cbf 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -43,8 +43,10 @@ SecuritySetup=Impostazioni per la sicurezza ErrorModuleRequirePHPVersion=Errore: questo modulo richiede almeno la versione %s di PHP. ErrorModuleRequireDolibarrVersion=Errore: questo modulo richiede almeno la versione %s di Dolibarr ErrorDecimalLargerThanAreForbidden=Errore: Non è supportata una precisione superiore a %s . -DictionarySetup=Dictionary setup +DictionarySetup=Impostazioni dizionario Dictionary=Dizionari +Chartofaccounts=Chart of accounts +Fiscalyear=Anni Fiscali ErrorReservedTypeSystemSystemAuto=I valori 'system' e 'systemauto' sono riservati. Puoi usare 'user' come valore da aggiungere al tuo record. ErrorCodeCantContainZero=Il codice non può contenere il valore 0 DisableJavascript=Disabilita funzioni JavaScript and Ajax (Raccomandato per persone non vedenti o browser testuali) @@ -133,7 +135,7 @@ Box=Casella Boxes=Caselle riassuntive MaxNbOfLinesForBoxes=Numero di linee max per casella PositionByDefault=Per impostazione predefinita -Position=Position +Position=Posizione MenusDesc=Gestione del contenuto delle 2 barre dei menu (barra orizzontale e barra verticale). MenusEditorDesc=L'editor dei menu consente di definire voci personalizzate nei menu. Utilizzare con attenzione onde evitare di rendere instabile Dolibarr (es. voci di menu irraggiungibili per sempre).
Alcuni moduli aggiungono voci nei menu (nel menu Tutti nella maggior parte dei casi). Se alcune di queste voci vengono rimosse per errore, è possibile ripristinarle disattivando e riattivando il modulo. MenuForUsers=Menu per gli utenti @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatico se Javascript à disattivato AvailableOnlyIfJavascriptNotDisabled=Disponibile solo se JavaScript non è disattivato AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibile solo se JavaScript e Ajax non sono disattivati Required=Richiesto +UsedOnlyWithTypeOption=Used by some agenda option only Security=Sicurezza Passwords=Password DoNotStoreClearPassword=Non memorizzare le password in chiaro nel database (raccomandato) @@ -386,10 +389,10 @@ LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Link Aggiorna -LinkToTest=Clickable link generated for user %s (click phone number to test) +LinkToTest=Collegamento cliccabile generato per l'utente %s (clicca numero di telefono per testare) KeepEmptyToUseDefault=Lasciare vuoto per utilizzare il valore di default DefaultLink=Link predefinito -ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) +ValueOverwrittenByUserSetup=Attenzione, questo valore potrebbe essere sovrascritto da un impostazione specifica dell'utente (ogni utente può settare il proprio url clicktodial) ExternalModule=External module - Installed into directory %s BarcodeInitForThirdparties=Mass barcode init for thirdparties BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services @@ -476,8 +479,8 @@ Module400Name=Progetti Module400Desc=Gestione progetti all'interno di altri moduli Module410Name=Calendario web Module410Desc=Integrazione calendario web -Module500Name=Special expenses (tax, social contributions, dividends) -Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module500Name=Spese speciali (tasse, contributi sociali, dividendi) +Module500Desc=Amministrazione delle spese speciali quali tasse, contributi sociali, dividendi e salari. Module510Name=Stipendi Module510Desc=Management of employees salaries and payments Module600Name=Notifiche @@ -516,7 +519,7 @@ Module5000Desc=Permette la gestione di diverse aziende Module6000Name=Flusso di lavoro Module6000Desc=Gestione flussi di lavoro Module20000Name=Ferie -Module20000Desc=Declare and follow employees holidays +Module20000Desc=Dichiara e segui le ferie dei dipendenti Module39000Name=Product batch Module39000Desc=Batch number, eat-by and sell-by date management on products Module50000Name=PayBox @@ -718,7 +721,7 @@ Permission1185=Approvare ordini fornitore Permission1186=Ordinare ordini fornitore Permission1187=Accettare consegna ordini fornitore Permission1188=Chiudere ordini fornitore -Permission1201=Get result of an export +Permission1201=Ottieni il risultato di un esportazione Permission1202=Creare/Modificare esportazioni Permission1231=Vedere fatture fornitore Permission1232=Creare fatture fornitore @@ -726,7 +729,7 @@ Permission1233=Convalidare fatture passive Permission1234=Eliminare fatture fornitore Permission1235=Inviare fatture fornitore tramite email Permission1236=Esportare fatture fornitore, attributi e pagamenti -Permission1237=Export supplier orders and their details +Permission1237=Esportazione ordini fornitori e loro dettagli Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load) Permission1321=Esportare fatture cliente, attributi e pagamenti Permission1421=Esportare ordini cliente e attributi @@ -750,10 +753,10 @@ Permission50101=Usa punto vendita Permission50201=Vedere transazioni Permission50202=Importare transazioni Permission54001=Stampa -Permission55001=Read polls +Permission55001=Leggi sondaggi Permission55002=Crea/modifica sondaggi -Permission59001=Read commercial margins -Permission59002=Define commercial margins +Permission59001=Leggi margini commerciali +Permission59002=Definisci margini commerciali DictionaryCompanyType=Tipi di soggetti terzi DictionaryCompanyJuridicalType=Forme giuridiche dei soggetti terzi DictionaryProspectLevel=Prospect potential level @@ -764,14 +767,14 @@ DictionaryCurrency=Valute DictionaryCivility=Titoli civili DictionaryActions=Tipi di azioni/eventi DictionarySocialContributions=Social contributions types -DictionaryVAT=VAT Rates or Sales Tax Rates +DictionaryVAT=Aliquote IVA o Tasse di vendita DictionaryRevenueStamp=Amount of revenue stamps DictionaryPaymentConditions=Termini di pagamento DictionaryPaymentModes=Modalità di pagamento DictionaryTypeContact=Contact/Address types DictionaryEcotaxe=Ecotassa (WEEE) DictionaryPaperFormat=Formati di carta -DictionaryFees=Type of fees +DictionaryFees=Tipi di tasse DictionarySendingMethods=Metodi di spedizione DictionaryStaff=Personale DictionaryAvailability=Delivery delay @@ -789,19 +792,19 @@ VATIsNotUsedDesc=Impostazione predefinita in cui l'aliquota IVA è pari a 0. Ada VATIsUsedExampleFR=In Francia si intendono le imprese o organizzazioni che hanno un vero e proprio sistema fiscale (Semplificato, nominale o normale). Un sistema in cui l'IVA à dichiarata. VATIsNotUsedExampleFR=In Francia le associazioni non sono tenute alla dichiarazione IVA, così come le società, le organizzazioni o i liberi professionisti che hanno scelto la microimpresa come sistema fiscale (IVA a forfait) e il versamento di una franchigia IVA senza alcuna dichiarazione IVA. In questo caso viene visualizzata la dicitura "non applicabile IVA - Art-293B del CGI" sulle fatture. ##### Local Taxes ##### -LTRate=Rate -LocalTax1IsUsed=Use second tax -LocalTax1IsNotUsed=Do not use second tax -LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) -LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) -LocalTax1Management=Second type of tax +LTRate=Tariffa +LocalTax1IsUsed=Usa seconda tassa +LocalTax1IsNotUsed=Non usare seconda tassa +LocalTax1IsUsedDesc=Usa il secondo tipo di tassa (altra oltre l'IVA) +LocalTax1IsNotUsedDesc=Non usare altro tipo di tassa (altra oltre IVA) +LocalTax1Management=Secondo tipo di tassa LocalTax1IsUsedExample= LocalTax1IsNotUsedExample= -LocalTax2IsUsed=Use third tax -LocalTax2IsNotUsed=Do not use third tax -LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) -LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) -LocalTax2Management=Third type of tax +LocalTax2IsUsed=Usa terza tassa +LocalTax2IsNotUsed=Non usare terza tassa +LocalTax2IsUsedDesc=Usa un terzo tipo di tassa (altra oltre IVA) +LocalTax2IsNotUsedDesc=Non usare altro tipo di tassa (altra oltre IVA) +LocalTax2Management=Terzo tipo di tassa LocalTax2IsUsedExample= LocalTax2IsNotUsedExample= LocalTax1ManagementES= Gestione RE @@ -982,7 +985,7 @@ BackupDesc2=* Salvare il contenuto della directory dei documenti ( %s) ch BackupDesc3=* Salvare il contenuto del database in un dump. È possibile utilizzare l'assistente. BackupDescX=L'archivio delle directory va conservato in un luogo sicuro. BackupDescY=Il file generato va conservato in un luogo sicuro. -BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one +BackupPHPWarning=Il backup non può essere garantito con questo metodo. Preferito quello precedente RestoreDesc=Per ripristinare un backup Dolibarr, è necessario: RestoreDesc2=* Ripristinare il contenuto della directory dei documenti (%s) dal file di archivio (.zip, per esempio). RestoreDesc3=* Ripristinare i dati dal file di backup del database nel database del nuovo Dolibarr o dell'installazione corrente.
Attenzione: con questa operazione verranno ripristinate anche le password esistenti al momento del backup, può essere quindi necessaria una nuova autenticazione.

Per ripristinare un backup del database nell'installazione corrente è possibile seguire questo assistente. @@ -996,7 +999,7 @@ YourPHPDoesNotHaveSSLSupport=Il PHP del server non supporta SSL DownloadMoreSkins=Scarica altre skin SimpleNumRefModelDesc=Restituisce un numero di riferimento nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0. ShowProfIdInAddress=Nei documenti mostra identità professionale completa di indirizzi -ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents +ShowVATIntaInAddress=Nascondi il num IVA Intra con indirizzo sui documenti TranslationUncomplete=Traduzione incompleta SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. MenuUseLayout=Permetti di nascondere il menu verticale (javascript non può essere disabilitato) @@ -1012,16 +1015,16 @@ MAIN_PROXY_PASS=Password per utilizzare il server proxy DefineHereComplementaryAttributes=Definire qui tutti gli attributi non predefiniti che vuoi supportati da %s. ExtraFields=Campi extra ExtraFieldsLines=Complementary attributes (lines) -ExtraFieldsThirdParties=Complementary attributes (thirdparty) -ExtraFieldsContacts=Complementary attributes (contact/address) -ExtraFieldsMember=Complementary attributes (member) -ExtraFieldsMemberType=Complementary attributes (member type) +ExtraFieldsThirdParties=Attributi complementari (terze parti) +ExtraFieldsContacts=Attributi Complementari (contatti/indirizzi) +ExtraFieldsMember=Attributi Complementari (membri) +ExtraFieldsMemberType=Attributi Complementari (tipo di membro) ExtraFieldsCustomerOrders=Complementary attributes (orders) ExtraFieldsCustomerInvoices=Complementary attributes (invoices) -ExtraFieldsSupplierOrders=Complementary attributes (orders) -ExtraFieldsSupplierInvoices=Complementary attributes (invoices) -ExtraFieldsProject=Complementary attributes (projects) -ExtraFieldsProjectTask=Complementary attributes (tasks) +ExtraFieldsSupplierOrders=Attributi Complementari (ordini) +ExtraFieldsSupplierInvoices=Attributi Complementari (fatture) +ExtraFieldsProject=Attributi Complementari (progetti) +ExtraFieldsProjectTask=Attributi Complementari (attività) ExtraFieldHasWrongValue=L'attributo %s ha un valore errato. AlphaNumOnlyCharsAndNoSpace=Solo lettere e numeri, senza spazi AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space @@ -1036,17 +1039,17 @@ TotalNumberOfActivatedModules=Numero totale di moduli attivati: %s YouMustEnableOneModule=Devi abilitare almeno un modulo ClassNotFoundIntoPathWarning=La classe %s non è stata trovata al percorso PHP indicato YesInSummer=Si in estate -OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): +OnlyFollowingModulesAreOpenedToExternalUsers=Nota, solo i seguenti moduli sono aperti agli utenti esterni (qualunque siano i permessi per questi utenti) SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin -ConditionIsCurrently=Condition is currently %s +ConditionIsCurrently=La condizione corrente è %s TestNotPossibleWithCurrentBrowsers=Rilevamento automatico non è possibile YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. -SearchOptim=Search optimization +SearchOptim=Ottimizzazione della ricerca YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. -BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. -BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. +BrowserIsOK=Stai utilizzando il browser %s. Questo browser è ok per sicurezza è performance. +BrowserIsKO=Stai utilizzando il browser web %s. Questo browser è noto per essere una cattiva scelta per sicurezza, performance e stabilità. Ti raccomandiamo di usare Chrome, Firefox, Opera o Safari. XDebugInstalled=XDebug caricato XCacheInstalled=XCache attivato AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink @@ -1077,13 +1080,13 @@ ModuleCompanyCodeDigitaria=Codice contabile dipendente dal codice di terze parti UseNotifications=Attiva le notifiche NotificationsDesc=La funzione di notifica consente di inviare email automaticamente alle imprese che sono configurati per riceverle quando si verificano eventi predefiniti. ModelModules=Modelli per i documenti -DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) +DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...) WatermarkOnDraft=Filigrana sulle bozze JSOnPaimentBill=Activate feature to autofill payment lines on payment form CompanyIdProfChecker=Unicità dell'identità MustBeUnique=Dev'essere unico? -MustBeMandatory=Mandatory to create third parties ? -MustBeInvoiceMandatory=Mandatory to validate invoices ? +MustBeMandatory=Obbligatorio per creare terze parti? +MustBeInvoiceMandatory=Obbligatorio per validare fatture? Miscellaneous=Varie ##### Webcal setup ##### WebCalSetup=Impostazioni collegamento Webcalendar @@ -1097,7 +1100,7 @@ WebCalServer=Server di hosting calendario WebCalDatabaseName=Nome del database WebCalUser=Utente per l'accesso al database WebCalSetupSaved=Configurazione del calendario salvata con successo. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s' riuscita. WebCalTestKo1=Connessione al server ' %s' effettuata con successo, ma il database' %s' non è raggiungibile. WebCalTestKo2=Connessione al server ' %s' con l'utente' %s' fallita. WebCalErrorConnectOkButWrongDatabase=Connessione dati effettuata, ma il database è errato. @@ -1143,7 +1146,7 @@ WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se OrdersSetup=Configurazione della gestione ordini OrdersNumberingModules=Modelli di numerazione degli ordini OrdersModelModule=Modelli per ordini in pdf -HideTreadedOrders=Hide the treated or cancelled orders in the list +HideTreadedOrders=Nascondi ordini trattati o annullati nella lista ValidOrderAfterPropalClosed=Rendi possibile non passare per l'ordine provvisorio per la convalida dopo la chiusura della proposta commerciale FreeLegalTextOnOrders=Testo libero sugli ordini WatermarkOnDraftOrders=Bozze degli ordini filigranate (nessuna filigrana se vuoto) @@ -1161,7 +1164,7 @@ WatermarkOnDraftInterventionCards=Bozze delle schede di intervento filigranate ( ##### Contracts ##### ContractsSetup=Configurazione modulo contratti ContractsNumberingModules=Moduli per la numerazione dei contratti -TemplatePDFContracts=Contracts documents models +TemplatePDFContracts=Modelli per documenti e contratti FreeLegalTextOnContracts=Testo libero sui contratti WatermarkOnDraftContractCards=Bozze dei contratti filigranate (nessuna filigrana se vuoto) ##### Members ##### @@ -1297,7 +1300,7 @@ LDAPFieldSidExample=Esempio: objectSid LDAPFieldEndLastSubscription=Data di fine abbonamento LDAPFieldTitle=Posizione/funzione LDAPFieldTitleExample=Esempio: titolo -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=I parametri LDAP sono ancora hardcoded (nella classe contact) LDAPSetupNotComplete=Configurazione LDAP incompleta (vai alle altre schede) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nessun amministratore o password forniti. L'accesso a LDAP sarà eseguito in forma anonima e in sola lettura. LDAPDescContact=Questa pagina consente di definire i nomi degli attributi nella gerarchia LDAP corrispondenti ad ognuno dei dati dei contatti in Dolibarr. @@ -1306,9 +1309,9 @@ LDAPDescGroups=Questa pagina consente di definire i nomi degli attributi nella g LDAPDescMembers=Questa pagina consente di definire i nomi degli attributi nella gerarchia LDAP corrispondenti ad ognuno dei dati dei membri in Dolibarr. LDAPDescValues=I valori di esempio sono progettati per OpenLDAP con i seguenti schemi di carico: core.schema, cosine.schema, inetorgperson.schema). Se si utilizzano tali schemi in OpenLDAP, modificare il file di configurazione slapd.conf per caricare tutti tali schemi. ForANonAnonymousAccess=Per un accesso autenticato (per esempio un accesso in scrittura) -PerfDolibarr=Performance setup/optimizing report -YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. -NotInstalled=Not installed, so your server is not slow down by this. +PerfDolibarr=Report di setup/ottimizzazione della performance +YouMayFindPerfAdviceHere=Troverai su questa pagina alcune informazioni o avvisi relative alla performance. +NotInstalled=Non installato, il tuo server non è rallentato per questo. ApplicativeCache=Cache applicativa MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. @@ -1334,11 +1337,11 @@ ModifyProductDescAbility=Personalizzazione delle descrizioni dei prodotti nei fo ViewProductDescInFormAbility=Visualizzare la descrizione dei prodotti nei form (altrimenti appariranno come tooltip popup) ViewProductDescInThirdpartyLanguageAbility=Visualizzazione delle descrizioni dei prodotti nella lingua di terzi UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). +UseSearchToSelectProduct=Utilizza il form di ricerca per scegliere un prodotto (invece della lista a tendina) UseEcoTaxeAbility=Usare l'eco-Tax (RAEE) SetDefaultBarcodeTypeProducts=Tipo di codici a barre predefinito da utilizzare per i prodotti SetDefaultBarcodeTypeThirdParties=Tipo di codici a barre predefinito da utilizzare per terze parti -ProductCodeChecker= Module for product code generation and checking (product or service) +ProductCodeChecker= Modulo per la generazione e verifica dei codici prodotto (prodotto o servizio) ProductOtherConf= Configurazione Prodotto/servizio ##### Syslog ##### SyslogSetup=Impostazioni modulo per i log @@ -1350,7 +1353,7 @@ SyslogSimpleFile=File SyslogFilename=Nome file e percorso YouCanUseDOL_DATA_ROOT=È possibile utilizzare DOL_DATA_ROOT/dolibarr.log come file di log per la directory "documenti". È anche possibile impostare un percorso diverso per tale file. ErrorUnknownSyslogConstant=La costante %s è sconosciuta a syslog. -OnlyWindowsLOG_USER=Windows only supports LOG_USER +OnlyWindowsLOG_USER=Solo utenti Windows supportano LOG_USER ##### Donations ##### DonationsSetup=Impostazioni modulo donazioni DonationsReceiptModel=Modello di ricevuta per donazioni @@ -1370,7 +1373,7 @@ BarcodeDescC39=Codice a barre di tipo C39 BarcodeDescC128=Codice a barre di tipo C128 GenbarcodeLocation=Programma a riga di comando per generare i codici a barre (utilizzato dal modulo phpbarcode per alcuni tipi di codici a barre) BarcodeInternalEngine=Motore interno -BarCodeNumberManager=Manager to auto define barcode numbers +BarCodeNumberManager=Manager per auto-definizione dei numeri barcode ##### Prelevements ##### WithdrawalsSetup=Modulo impostazione prelievi ##### ExternalRSS ##### @@ -1405,8 +1408,8 @@ FCKeditorForCompany=Editor WYSIWIG per le società FCKeditorForProduct=Editor WYSIWIG per i prodotti/servizi FCKeditorForProductDetails=Editor WYSIWIG per il testo libero in tutti i moduli (proposte, ordini, fatture, ecc ..) FCKeditorForMailing= Editor WYSIWIG per le email -FCKeditorForUserSignature=WYSIWIG creation/edition of user signature -FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing) +FCKeditorForUserSignature=WYSIWIG creazione/modifica della firma utente +FCKeditorForMail=WYSIWIG creazione/modifica per tutte le mail (eccetto Outlis->eMailing) ##### OSCommerce 1 ##### OSCommerceErrorConnectOkButWrongDatabase=la connessione al server riuscita, ma il database è errato. OSCommerceTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s' riuscita. @@ -1464,13 +1467,13 @@ Sell=Vendi InvoiceDateUsed=Data utilizzata per la fatturazione YourCompanyDoesNotUseVAT=Società non soggetta all'IVA. Non ci sono parametri da impostare. AccountancyCode=Codice contabile -AccountancyCodeSell=Sale account. code -AccountancyCodeBuy=Purchase account. code +AccountancyCodeSell=Codice contabilità vendite +AccountancyCodeBuy=Codice contabilità acquisti ##### Agenda ##### AgendaSetup=Impostazioni modulo agenda PasswordTogetVCalExport=Chiave per autorizzare l'esportazione di link PastDelayVCalExport=Non esportare evento più vecchio di -AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_USE_EVENT_TYPE=Usa tipi di eventi (amministrazione nel menu Impostazioni -> Dizionario -> Tipi di eventi agenda) AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda @@ -1507,7 +1510,7 @@ MultiCompanySetup=Impostazioni modulo multiazienda SuppliersSetup=Impostazioni modulo fornitori SuppliersCommandModel=Modello completo di ordine fornitore (logo...) SuppliersInvoiceModel=Modello completo di fattura fornitore (logo...) -SuppliersInvoiceNumberingModel=Supplier invoices numbering models +SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitore ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=Impostazioni modulo GeoIP Maxmind PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang index e8e6d852cf0..02d38701175 100644 --- a/htdocs/langs/it_IT/agenda.lang +++ b/htdocs/langs/it_IT/agenda.lang @@ -2,14 +2,15 @@ IdAgenda=ID evento Actions=Azioni ActionsArea=Area eventi (azioni e compiti) -Agenda= Ordine del giorno -Agendas= Ordini del giorno -Calendar= Calendario -Calendars= Calendari -LocalAgenda=Calendario locale +Agenda=Ordine del giorno +Agendas=Ordini del giorno +Calendar=Calendario +Calendars=Calendari +LocalAgenda=Calendario interno +ActionsOwnedBy=Event owned by AffectedTo=Azione assegnata a DoneBy=Fatto da -Event=Event +Event=Evento Events=Eventi EventsNb=Numero di eventi MyEvents=I miei eventi @@ -22,7 +23,7 @@ MenuToDoActions=Tutte le azioni incomplete MenuDoneActions=Tutte le azioni passate MenuToDoMyActions=I mie eventi non completati MenuDoneMyActions=I miei eventi passati -ListOfEvents=Lista degli eventi +ListOfEvents=Lista di eventi (calendario interno) ActionsAskedBy=Azioni richieste da ActionsToDoBy=Eventi assegnati a ActionsDoneBy=Azioni fatte da @@ -34,7 +35,7 @@ ViewList=Vista elenco ViewCal=Vista mensile ViewDay=Vista giornaliera ViewWeek=Vista settimanale -ViewPerUser=Per user view +ViewPerUser=Visualizzazione per utente ViewWithPredefinedFilters= Vista con filtri predefiniti AutoActions= Riempimento automatico AgendaAutoActionDesc= Definire qui gli eventi che devono essere creati automaticamente da Dolibarr. Se non è selezionato nulla (impostazione predefinita), nel calendario saranno visualizzate solo azioni inserite manualmente. @@ -76,15 +77,17 @@ AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti Busy=Occupato ExportDataset_event1=Lista degli eventi in agenda -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +DefaultWorkingDays=Intervallo di giorni lavorativi standard in una settiamana (Esempio: 1-5, 1-6) +DefaultWorkingHours=Ore lavorative di base in una giornata (Esempio: 9-18) # External Sites ical ExportCal=Esporta calendario ExtSites=Calendari esterni -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Mostra calendari esterni (definiti nelle impostazioni generali) nell'agenda. Questo non influisce sui calendari esterni definiti dall'utente. ExtSitesNbOfAgenda=Numero di calendari AgendaExtNb=Calendario numero %s ExtSiteUrlAgenda=URL per accedere al file ICal ExtSiteNoLabel=Nessuna descrizione -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range +WorkingTimeRange=Intervallo di tempo di lavoro +WorkingDaysRange=Intervallo di giorni di lavoro +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang index 4aa4d3ce0d9..64247e0aa73 100644 --- a/htdocs/langs/it_IT/categories.lang +++ b/htdocs/langs/it_IT/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Campi extra CategoriesSetup=Impostazioni categorie CategorieRecursiv=Collega automaticamente con la categoria padre CategorieRecursivHelp=Se attivata, il prodotto sarà inserito anche nella categoria padre quando lo aggiungi ad una sottocategoria +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang index d537ab7ebc9..aef6f6cc559 100644 --- a/htdocs/langs/it_IT/companies.lang +++ b/htdocs/langs/it_IT/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=È necessario inserire un contatto email del soggetto ListSuppliersShort=Elenco fornitori ListProspectsShort=Elenco clienti potenziali ListCustomersShort=Elenco clienti -ThirdPartiesArea=Area soggetti terzi +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Ultime %s terze parti modificate UniqueThirdParties=Totale soggetti terzi InActivity=In attività @@ -410,3 +410,5 @@ OutstandingBillReached=Raggiunto il massimo numero di fatture scadute MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per codice cliente e %syymm-nnnn per il fornitore, in cui yy è l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0. LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento. ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang index ec2601ed1b2..bfb2dcd2152 100644 --- a/htdocs/langs/it_IT/compta.lang +++ b/htdocs/langs/it_IT/compta.lang @@ -4,7 +4,7 @@ AccountancyCard=Scheda contabilità Treasury=Tesoreria MenuFinancial=Finanziario TaxModuleSetupToModifyRules=Per modificare il modo in cui viene effettuato il calcolo, vai al modulo di configurazione delle tasse. -TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Vai a Impostazioni Azienda per modificare le regole del calcolo OptionMode=Opzione per la gestione contabile OptionModeTrue=Opzione entrate-uscite OptionModeVirtual=Opzione crediti-debiti @@ -12,7 +12,7 @@ OptionModeTrueDesc=In questo caso, il fatturato è calcolato sulla base dei paga OptionModeVirtualDesc=In modalità il fatturato è calcolato sulle fatture (data di convalida).
Alla data di scadenza le fatture verranno calcolate automaticamente in attivo o passivo, che siano state pagate o meno. FeatureIsSupportedInInOutModeOnly=Caratteristica disponibile solo in modalità contabile CREDITI-DEBITI (vedi Impostazioni modulo contabilità) VATReportBuildWithOptionDefinedInModule=Gli importi mostrati sono calcolati secondo le regole stabilite nelle impostazioni del modulo tasse e contributi. -LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +LTReportBuildWithOptionDefinedInModule=I totali qui mostrati sono calcolati usando le regole definite per le impostazioni dell'azienda Param=Configurazione RemainingAmountPayment=Pagamento a saldo: AmountToBeCharged=Importo totale da pagare: @@ -120,7 +120,7 @@ DeleteSocialContribution=Eliminazione di un contributo sociale ConfirmDeleteSocialContribution=Vuoi davvero eliminare questo contributo? ExportDataset_tax_1=Contributi e pagamenti CalcModeVATDebt=Mode %sVAT on commitment accounting%s. -CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. +CalcModeVATEngagement=Calcola %sIVA su entrate-uscite%s CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s @@ -144,12 +144,12 @@ DepositsAreNotIncluded=- Ricevute di deposito non incluse DepositsAreIncluded=- Ricevute di deposito incluse LT2ReportByCustomersInInputOutputModeES=IRPF soggetti terzi(Spagna) LT1ReportByCustomersInInputOutputModeES=Report by third party RE -VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid -VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid -VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid +VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata +VATReportByCustomersInDueDebtMode=Report per IVA cliente riscossa e pagata +VATReportByQuartersInInputOutputMode=Report per tasso di IVA riscossa e pagata LT1ReportByQuartersInInputOutputMode=Report by RE rate LT2ReportByQuartersInInputOutputMode=Report by IRPF rate -VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid +VATReportByQuartersInDueDebtMode=Report per tasso di IVA riscossa e pagata LT1ReportByQuartersInDueDebtMode=Report by RE rate LT2ReportByQuartersInDueDebtMode=Report by IRPF rate SeeVATReportInInputOutputMode=Vedi il report %sIVA pagata%s per la modalità di calcolo standard @@ -180,14 +180,14 @@ WarningDepositsNotIncluded=Le ricevute di deposito non sono incluse in questa ve DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto Pcg_version=Versione pcg Pcg_type=Tipo pcg -Pcg_subtype=Pcg subtype +Pcg_subtype=Sottotipo Pcg InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare InvoiceDispatched=Fatture spedite *consegnate AccountancyDashboard=Riassunto contabilità ByProductsAndServices=Per prodotti e servizi RefExt=Referente esterno ToCreateAPredefinedInvoice=Per creare una fattura predefinita, creare una fattura standard e poi, senza convalidarla, cliccare sul pulsante "Trasforma in fattura predefinita". -LinkedOrder=collegato agli ordini +LinkedOrder=Link to order ReCalculate=Ricalcola Mode1=Metodo 1 Mode2=Metodo 2 @@ -195,12 +195,15 @@ CalculationRuleDesc=Ci sono due metodi per calcolare l'IVA totale:
Metodo 1: CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo appropriato per applicare le stesse regole di calcolo e ottenere gli stessi risultati previsti dal fornitore. TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Metodo di calcolo -AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codice contabile predefinito per acquistare prodotti -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codice contabile predefinito per vendere prodotti -ACCOUNTING_SERVICE_BUY_ACCOUNT=Codice contabile predefinito per comprare servizi -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codice contabile predefinito per vendere servizi -ACCOUNTING_VAT_ACCOUNT=Codice contabile predefinito per IVA a credito -ACCOUNTING_VAT_BUY_ACCOUNT=Codice contabile predefinito per IVA a debito -ACCOUNTING_ACCOUNT_CUSTOMER=Codice contabile predefinito per clienti -ACCOUNTING_ACCOUNT_SUPPLIER=Codice contabile predefinito per fornitori +AccountancyJournal=Codice del giornale di contabilità +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang index 7dd79ec3930..ded531e8257 100644 --- a/htdocs/langs/it_IT/donations.lang +++ b/htdocs/langs/it_IT/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Cerca una donazione DonationRecipient=Ricevente della donazione ThankYou=Grazie IConfirmDonationReception=Si dichiara di aver ricevuto la seguente cifra a titolo di donazione +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang index 68ff9abb518..63153883a4c 100644 --- a/htdocs/langs/it_IT/errors.lang +++ b/htdocs/langs/it_IT/errors.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - errors # No errors -NoErrorCommitIsDone=No error, we commit +NoErrorCommitIsDone=Nessun errore, assegnamo # Errors Error=Errore Errors=Errori @@ -25,11 +25,11 @@ ErrorFromToAccountsMustDiffers=I conti bancari di origine e destinazione devono ErrorBadThirdPartyName=Valore non valido per il nome del soggetto terzo ErrorProdIdIsMandatory=%s obbligatorio ErrorBadCustomerCodeSyntax=Sintassi del codice cliente errata -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Sintassi del barcode errata ErrorCustomerCodeRequired=Il codice cliente è obbligatorio -ErrorBarCodeRequired=Bar code required +ErrorBarCodeRequired=Barcode richiesto ErrorCustomerCodeAlreadyUsed=Codice cliente già utilizzato -ErrorBarCodeAlreadyUsed=Bar code already used +ErrorBarCodeAlreadyUsed=Barcode già in uso ErrorPrefixRequired=È richiesto il prefisso ErrorUrlNotValid=L'indirizzo del sito è errato ErrorBadSupplierCodeSyntax=Sintassi del codice fornitore errata @@ -39,7 +39,7 @@ ErrorBadParameters=Parametri errati ErrorBadValueForParameter=Valore '%s' errato per il parametro '%s' ErrorBadImageFormat=Formato del file immagine non supportato ErrorBadDateFormat=Il valore '%s' ha un formato della data sbagliato -ErrorWrongDate=Date is not correct! +ErrorWrongDate=La data non è corretta! ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s ErrorFoundBadEmailInFile=Sintassi email errata nelle righe %s del file (ad esempio alla riga %s con email = %s) ErrorUserCannotBeDelete=L'utente non può essere eliminato. Probabilmente è collegato a qualcosa. @@ -65,16 +65,16 @@ ErrorNoValueForCheckBoxType=Per favore immetti un valore per la lista di control ErrorNoValueForRadioType=Per favore immetti un valore per la lista radio ErrorBadFormatValueList=La lista non può avere più di un'entrata : %s, ma ne serve almeno una: llave,valores ErrorFieldCanNotContainSpecialCharacters=Il campo %s non può contenere caratteri speciali. -ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Il campo %s non deve contenere caratteri speciali o maiuscole. ErrorNoAccountancyModuleLoaded=Modulo contabilità disattivato -ErrorExportDuplicateProfil=This profile name already exists for this export set. +ErrorExportDuplicateProfil=Questo nome profilo già esiste per questo set di esportazione ErrorLDAPSetupNotComplete=La configurazione per l'uso di LDAP è incompleta ErrorLDAPMakeManualTest=È stato generato un file Ldif nella directory %s. Prova a caricarlo dalla riga di comando per avere maggiori informazioni sugli errori. ErrorCantSaveADoneUserWithZeroPercentage=Impossibile salvare un'azione con "stato non iniziato" se il campo "da fare" non è vuoto. ErrorRefAlreadyExists=Il riferimento utilizzato esiste già. ErrorPleaseTypeBankTransactionReportName=Indicare il nome del rapporto della transazione bancaria (Nel formato AAAAMM o AAAAMMGG) ErrorRecordHasChildren=Impossibile eliminare i record da cui dipendono altri record -ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorRecordIsUsedCantDelete=Impossibile eliminare il dato. E' già in uso o incluso in altro oggetto. ErrorModuleRequireJavascript=Per questa funzionalità Javascript deve essere attivo. Per abilitare/disabilitare Javascript, vai su Home - Impostazioni - Schermo ErrorPasswordsMustMatch=Le due password digitate devono essere identiche ErrorContactEMail=Si è verificato un errore tecnico. Si prega di contattare l'amministratore all'indirizzo %s %s indicando il codice di errore nel messaggio, o, meglio ancora, allegando uno screenshot della schermata attuale. @@ -121,21 +121,22 @@ ErrNoZipEngine=Non c'è modo di spacchettare i file %s in questo PHP ErrorFileMustBeADolibarrPackage=Il file %s deve essere un archivio zip Dolibarr ErrorFileRequired=Ci vuole un file del pacchetto Dolibarr ErrorPhpCurlNotInstalled=PHP CURL non risulta installato, ma è necessario per comunicare con Paypal -ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base -ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base +ErrorFailedToAddToMailmanList=Impossibile aggiungere il dato %s alla Mailman lista %s o SPIP base +ErrorFailedToRemoveToMailmanList=Impossibile rimuovere il dato %s alla Mailman lista %s o SPIP base ErrorNewValueCantMatchOldValue=Il nuovo valore non può essere uguale al precedente ErrorFailedToValidatePasswordReset=Cambio password fallito. Forse è già stato richiesto (questo link può essere usato una volta sola). Se no, prova a rifare la procedura dall'inizio. ErrorToConnectToMysqlCheckInstance=Connessione al database fallita. Controlla che il server Mysql sia in attività (nella maggior parte dei casi puoi avviarlo digitando 'sudo /etc/init.d/mysql start' in un terminale). -ErrorFailedToAddContact=Failed to add contact -ErrorDateMustBeBeforeToday=The date can not be greater than today -ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode. -ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. -ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s -ErrorWarehouseMustDiffers=Source and target warehouses must differs -ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. -ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. -ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorFailedToAddContact=Impossibile aggiungere il contatto +ErrorDateMustBeBeforeToday=La data non può essere maggiore di quella odierna +ErrorPaymentModeDefinedToWithoutSetup=Un metodo di pagamento è stato impostato come %s ma il setup del modulo Fattura non è stato completato per definire le impostazioni da mostrare per questo metodo di pagamento. +ErrorPHPNeedModule=Errore, il tuo PHP deve avere il modulo %s installato per usare questa funzionalità. +ErrorOpenIDSetupNotComplete=Hai impostato il config file di Dolibarr per permettere l'autenticazione tramite OpenID, ma l'URL del service di OpenID non è definita nella costante %s +ErrorWarehouseMustDiffers=Il magazzino di origine e quello di destinazione devono essere differenti +ErrorBadFormat=Formato non valido! +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Errore, questo membro non è stato ancora collegato a nessuna terza parte. Collega il membro ad una delle terze parti esistenti o creane una nuova prima di creare sottoscrizioni con fattura. +ErrorThereIsSomeDeliveries=Errore, ci sono alcune consegne collegate a questa spedizione. Cancellazione rifiutata. +ErrorCantDeletePaymentReconciliated=Impossibile cancellare un pagamento che ha generato una transazione bancaria che è stata conciliata +ErrorCantDeletePaymentSharedWithPayedInvoice=Impossibile cancellare un pagamento condiviso con almeno una fattura con lo stato Pagato # Warnings WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti @@ -151,6 +152,8 @@ WarningLockFileDoesNotExists=Attenzione, una volta finito il setup, devi disabil WarningUntilDirRemoved=Questo avviso sarà visualizzato fino a quando questa directory è presente (disponibile solo per gli utenti admin). WarningCloseAlways=Attenzione, la chiusura è effettiva anche se il numero degli elementi non coincide fra inizio e fine. Abilitare questa opzione con cautela. WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantemente tutte le pagine che lo visualizzano -WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). +WarningClickToDialUserSetupNotComplete=Le impostazioni di informazione del ClickToDial per il tuo utente non sono complete (vedi la scheda ClickToDial sulla tua scheda utente) WarningNotRelevant=Operazione irrilevante per questo dataset -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funzione disabilitata quando le impostazioni di visualizzazione sono ottimizzate per persone non vedenti o browser testuali. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang index 13427049139..4b9e159118a 100644 --- a/htdocs/langs/it_IT/holiday.lang +++ b/htdocs/langs/it_IT/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=Risorse umane -Holidays=Ferie -CPTitreMenu=Ferie +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Estratto conto mensile -MenuAddCP=Richiedi ferie -NotActiveModCP=Per vedere questa pagina devi attivare il modulo ferie. -NotConfigModCP=Per vedere questa pagina devi configurare il modulo ferie. Clicca qui per attivarlo. -NoCPforUser=Non hai richieste di ferie. -AddCP=Richiedi ferie +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Dipendente DateDebCP=Data di inizio DateFinCP=Data di fine @@ -18,24 +18,24 @@ ApprovedCP=Approvato CancelCP=Cancellato RefuseCP=Rifiutato ValidatorCP=Approvato da -ListeCP=Elenco ferie +ListeCP=List of leaves ReviewedByCP=Sarà valutato da DescCP=Descrizione -SendRequestCP=Genero richiesta ferie -DelayToRequestCP=Le richieste di ferie devono essere inoltrate almeno %s giorni prima. -MenuConfCP=Modifica ferie rimanenti -UpdateAllCP=Aggiorna le ferie -SoldeCPUser=Rimangono %s giorni di ferie +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=La data di fine deve essere posteriore alla data di inizio. ErrorSQLCreateCP=Si è verificato un errore SQL durante la creazione: -ErrorIDFicheCP=Si è verificato un errore, la richiesta di ferie non esiste. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Torna alla pagina precedente -ErrorUserViewCP=Non sei autorizzato a leggere questa richiesta di ferie. -InfosCP=Informazioni sulla richiesta ferie +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Flusso di informazioni RequestByCP=Richiesto da -TitreRequestCP=Scheda ferie -NbUseDaysCP=Numero giorni i ferie goduti +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Modifica DeleteCP=Cancella ActionValidCP=Convalida @@ -43,26 +43,26 @@ ActionRefuseCP=Rifiuta ActionCancelCP=Annulla StatutCP=Stato SendToValidationCP=Invia alla convalida -TitleDeleteCP=Cancella la richiesta di ferie -ConfirmDeleteCP=Vuoi davvero eliminare questa richiesta di ferie? -ErrorCantDeleteCP=Errore: non sei autorizzato a cancellare questa richiesta di ferie. -CantCreateCP=Non hai diritto a richiedere ferie. -InvalidValidatorCP=Indica chi dovrà approvare la richiesta. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Aggiorna -CantUpdate=Non puoi aggiornare questa richiesta di ferie. +CantUpdate=You cannot update this leave request. NoDateDebut=Bisogna selezionare una data di inizio. NoDateFin=Bisogna selezionare una data di fine. ErrorDureeCP=La tua richiesta di ferie non comprende giorni lavorativi. TitleValidCP=Approva la richiesta di ferie -ConfirmValidCP=Vuoi davvero approvare la richiesta di ferie? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data approvazione -TitleToValidCP=Invia richiesta -ConfirmToValidCP=Vuoi davvero inoltrare la richiesta di ferie? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Rifiuta la richiesta -ConfirmRefuseCP=Vuoi davvero rifiutare la richiesta di ferie? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Devi indicare un motivo per il rifiuto. TitleCancelCP=Annulla la richiesta -ConfirmCancelCP=Vuoi davvero annullare la richiesta di ferie? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motivo del rifiuto DateRefusCP=Data del rifiuto DateCancelCP=Data dell'annullamento @@ -72,8 +72,8 @@ MotifCP=Motivo UserCP=Utente ErrorAddEventToUserCP=Si è verificato un errore nell'assegnazione del permesso straordinario. AddEventToUserOkCP=Permesso straordinario assegnato correttamente. -MenuLogCP=Vedi lo storico ferie -LogCP=Log degli aggiornamenti ferie +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Eseguito da UserUpdateCP=Per l'utente PrevSoldeCP=Saldo precedente @@ -81,33 +81,33 @@ NewSoldeCP=Nuovo saldo alreadyCPexist=C'è già una richiesta per lo stesso periodo. UserName=Nome Employee=Dipendente -FirstDayOfHoliday=Primo giorno di ferie -LastDayOfHoliday=Ultimo giorno di ferie +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Aggiornamento mensile ManualUpdate=Aggiornamento manuale -HolidaysCancelation=Cancellazione ferie +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configurazione del modulo ferie DescOptionCP=Descrizione dell'opzione ValueOptionCP=Valore -GroupToValidateCP=Gruppo autorizzato ad approvare le ferie +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Convalida la configurazione -LastUpdateCP=Ultimo aggiornamento automatico delle ferie +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Aggiornato con successo ErrorUpdateConfCP=Si è verificato un errore nell'aggiornamento, riprovare. AddCPforUsers=Aggiornare le ferie residue dell'utente facendo click qui. DelayForSubmitCP=Scadenza per l'inoltro di richieste ferie AlertapprobatortorDelayCP=Impedisci l'approvazione delle ferie se la richiesta non corrisponde alla deadline -AlertValidatorDelayCP=Impedisci l'approvazione se la richiesta ferie eccede il ritardo massimo -AlertValidorSoldeCP=Impedisci l'apporvazione ferie se la richiesta eccede la disponibilità residua -nbUserCP=Numero di utenti gestiti dal modulo ferie -nbHolidayDeductedCP=Numero di giorni di ferie da scalare per ogni giorno di ferie goduto -nbHolidayEveryMonthCP=Numero di giorni di ferie maturati al mese -Module27130Name= Gestione ferie -Module27130Desc= Gestione ferie -TitleOptionMainCP=Impostazioni principali della gestione ferie -TitleOptionEventCP=Impostazioni per le ferie relative ad eventi +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Convalida UpdateEventCP=Aggiorna eventi CreateEventCP=Crea @@ -127,23 +127,23 @@ UpdateEventOptionCP=Aggiorna ErrorMailNotSend=Si è verificato un errore nell'invio dell'email: NoCPforMonth=Nessun permesso questo mese. nbJours=Numero di giorni -TitleAdminCP=Impostazioni delle ferie +TitleAdminCP=Configuration of Leaves #Messages Hello=Salve -HolidaysToValidate=Convalida ferie -HolidaysToValidateBody=Di sotto una richiesta ferie da verificare -HolidaysToValidateDelay=Questa è una richiesta di ferie da godere fra meno di %s giorni -HolidaysToValidateAlertSolde=L'utente che ha fatto questa richiesta ferie non dispone di abbastanza ferie residue -HolidaysValidated=Ferie convalidate -HolidaysValidatedBody=La tua richiesta di ferie dal %s al %s è stata convalidata. -HolidaysRefused=Ferie negate -HolidaysRefusedBody=La tua richiesta di ferie dal %s al %s è stata negata con la seguente motivazione: -HolidaysCanceled=Ferie annullate -HolidaysCanceledBody=La tua richiesta di ferie dal %s al %s è stata annullata. -Permission20000=Visualizza le tue ferie -Permission20001=Crea/modifica le tue ferie -Permission20002=Crea/modifica le ferie di tutti -Permission20003=Cancella richieste ferie -Permission20004=Imposta ferie -Permission20005=Controlla il log delle modifiche alle ferie -Permission20006=Visualizza il report sulle ferie del mese +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang index 2b8f0a8aa3f..0ac023215ce 100644 --- a/htdocs/langs/it_IT/interventions.lang +++ b/htdocs/langs/it_IT/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Nome e firma del partecipante: NameAndSignatureOfExternalContact=Nome e firma del cliente: DocumentModelStandard=Modello documento standard per gli interventi InterventionCardsAndInterventionLines=Interventi e righe degli interventi -ClassifyBilled=Classifica come "Fatturato" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Fatturato RelatedInterventions=Interventi correlati ShowIntervention=Mostra intervento +SendInterventionRef=Invio di intervento %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsabile follow-up per l'intervento TypeContact_fichinter_internal_INTERVENING=Intervento effettuato da @@ -39,4 +41,4 @@ ArcticNumRefModelError=Impossibile attivare PacificNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza senza pausa e che non ritorna a 0 PacificNumRefModelError=Un modello di numerazione degli interventi che inizia con $syymm è già esistente e non è compatibile con questo modello di sequenza. Rimuovere o rinominare per attivare questo modulo. PrintProductsOnFichinter=Stampa prodotti sulla scheda di intervento -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=Per interventi generati da ordini diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang index 0a6e8ec956e..22dff95f489 100644 --- a/htdocs/langs/it_IT/projects.lang +++ b/htdocs/langs/it_IT/projects.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Ref. project -ProjectId=Project Id +RefProject=Rif. progetto +ProjectId=Id progetto Project=Progetto Projects=Progetti SharedProject=Progetto condiviso @@ -32,7 +32,7 @@ TimeSpent=Tempo lavorato TimesSpent=Tempo lavorato RefTask=Rif. compito LabelTask=Etichetta compito -TaskTimeSpent=Time spent on tasks +TaskTimeSpent=Tempo speso sulle attività TaskTimeUser=Utente TaskTimeNote=Nota TaskTimeDate=Data @@ -41,9 +41,9 @@ MyTimeSpent=Il mio tempo lavorato MyTasks=I miei compiti Tasks=Compiti Task=Compito -TaskDateStart=Task start date -TaskDateEnd=Task end date -TaskDescription=Task description +TaskDateStart=Data inizio attività +TaskDateEnd=Data fine attività +TaskDescription=Descrizione attività NewTask=Nuovo compito AddTask=Aggiungere compito AddDuration=Aggiungi periodo @@ -54,8 +54,8 @@ MyActivities=I miei compiti / operatività MyProjects=I miei progetti DurationEffective=Durata effettiva Progress=Avanzamento -ProgressDeclared=Declared progress -ProgressCalculated=Calculated progress +ProgressDeclared=Progresso dichiarato +ProgressCalculated=Progresso calcolato Time=Tempo ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto ListOrdersAssociatedProject=Elenco degli ordini associati al progetto @@ -85,13 +85,13 @@ ActionsOnProject=Azioni sul progetto YouAreNotContactOfProject=Non sei tra i contatti di questo progetto privato DeleteATimeSpent=Cancella il tempo lavorato ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato? -DoNotShowMyTasksOnly=Vedi anche compiti non assegnati a me -ShowMyTasksOnly=Visualizza solo i miei compiti +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Risorse ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo NoTasks=Nessun compito per questo progetto LinkedToAnotherCompany=Collegato ad un altro soggetto terzo -TaskIsNotAffectedToYou=Questo compito non è assegnato a te +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Il campo tempo lavorato è vuoto ThisWillAlsoRemoveTasks=Questa azione eliminerà anche tutti i compiti del progetto (al momento ci sono %s compiti) e tutto il tempo lavorato già inserito. IfNeedToUseOhterObjectKeepEmpty=Se qualche elemento (fattura, ordine, ...), appartenente ad un altro soggetto terzo deve essere collegato al progetto da creare, non compilare il campo per assegnare il progetto a più di un soggetto terzo. @@ -99,16 +99,16 @@ CloneProject=Clona progetto CloneTasks=Clona compiti CloneContacts=Clona contatti CloneNotes=Clona note -CloneProjectFiles=Clone project joined files -CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) +CloneProjectFiles=Clona progetto con file collegati +CloneTaskFiles=Clona i file collegati alle(a) attività (se le(a) attività sono clonate) ConfirmCloneProject=Vuoi davvero clonare il progetto? ProjectReportDate=Cambia la data del compito a seconda della data di inizio progetto ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto ProjectsAndTasksLines=Progetti e compiti ProjectCreatedInDolibarr=Progetto %s creato -TaskCreatedInDolibarr=Task %s created -TaskModifiedInDolibarr=Task %s modified -TaskDeletedInDolibarr=Task %s deleted +TaskCreatedInDolibarr=Attività %s creata +TaskModifiedInDolibarr=Attività %s modificata +TaskDeletedInDolibarr=Attività %s cancellata ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Capo progetto TypeContact_project_external_PROJECTLEADER=Capo progetto @@ -118,13 +118,15 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Responsabile del compito TypeContact_project_task_external_TASKEXECUTIVE=Responsabile del compito TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributore TypeContact_project_task_external_TASKCONTRIBUTOR=Contributore -SelectElement=Select element -AddElement=Link to element +SelectElement=Seleziona elemento +AddElement=Link all'elemento +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..) PlannedWorkload = Carico di lavoro previsto WorkloadOccupation= Carico di lavoro supposto ProjectReferers=Elementi correlati -SearchAProject=Search a project -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects +SearchAProject=Cerca un progetto +ProjectMustBeValidatedFirst=I progetti devono prima essere validati +ProjectDraft=Progetti bozza +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang index 39ae8d602e2..cb2335390d6 100644 --- a/htdocs/langs/it_IT/sendings.lang +++ b/htdocs/langs/it_IT/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistiche calcolate solo sulle spedizioni conval DateDeliveryPlanned=Data di consegna prevista DateReceived=Data di consegna ricevuto SendShippingByEMail=Invia spedizione via EMail -SendShippingRef=Invia %s spedizione +SendShippingRef=Invio della spedizione %s ActionsOnShipping=Acions sulla spedizione LinkToTrackYourPackage=Link a monitorare il tuo pacchetto ShipmentCreationIsDoneFromOrder=Per il momento, la creazione di una nuova spedizione viene effettuata dalla scheda dell'ordine. @@ -66,11 +66,13 @@ CarrierList=Elenco dei trasportatori SendingMethodCATCH=Ritiro da parte del Cliente SendingMethodTRANS=A cura del mittente SendingMethodCOLSUI=Corriere espresso - # ModelDocument DocumentModelSirocco=Semplice modello di documento per le ricevute di consegna DocumentModelTyphon=Modello più completo di documento per le ricevute di consegna (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER costante non definita SumOfProductVolumes=Totale volume prodotti SumOfProductWeights=Totale peso prodotti + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang index 7bf6b2ed7c5..e7c9fbcbd5e 100644 --- a/htdocs/langs/it_IT/suppliers.lang +++ b/htdocs/langs/it_IT/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Crea fattura fornitore ListOfSupplierProductForSupplier=Elenco prodotti e prezzi per il fornitore %s NoneOrBatchFileNeverRan=Nessuno batch file o %s non eseguito di recente SentToSuppliers=Inviato ai fornitori +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/ja_JP/accountancy.lang +++ b/htdocs/langs/ja_JP/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 9c9d4c0d0cf..61f46f13bdf 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=エラー、このモジュールはDolibarr ErrorDecimalLargerThanAreForbidden=%sより精度の高いエラーは、サポートされていません。 DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=自動Javascriptが無効になっている場合 AvailableOnlyIfJavascriptNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能 AvailableOnlyIfJavascriptAndAjaxNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能 Required=必須 +UsedOnlyWithTypeOption=Used by some agenda option only Security=セキュリティー Passwords=パスワード DoNotStoreClearPassword=行うにはデータベースに格納しない明確なパスワードがストアのみ暗号化された値（活性化推奨） diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang index 149c9408156..22464bdc31a 100644 --- a/htdocs/langs/ja_JP/agenda.lang +++ b/htdocs/langs/ja_JP/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=イベント ActionsArea=イベントエリア（アクションとタスク） -Agenda= 議題 -Agendas= アジェンダ -Calendar= カレンダー -Calendars= カレンダー -LocalAgenda=ローカルカレンダー +Agenda=議題 +Agendas=アジェンダ +Calendar=カレンダー +Calendars=カレンダー +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=影響を受ける DoneBy=によって行われ Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=すべての不完全なイベント MenuDoneActions=すべての終了イベント MenuToDoMyActions=私の不完全なイベント MenuDoneMyActions=私の終了イベント -ListOfEvents=Dolibarrイベントのリスト +ListOfEvents=List of events (internal calendar) ActionsAskedBy=によって報告されたイベント ActionsToDoBy=イベントへの影響を受けた ActionsDoneBy=によって行われたイベント @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=。iCalファイルにアクセスするためのURL ExtSiteNoLabel=全く説明がありません WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang index bcd458c1ad3..901fa5f5068 100644 --- a/htdocs/langs/ja_JP/categories.lang +++ b/htdocs/langs/ja_JP/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang index 7f5e61f6d16..3fd8c12c29a 100644 --- a/htdocs/langs/ja_JP/companies.lang +++ b/htdocs/langs/ja_JP/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=あなたは、電子メール通知を追加できる ListSuppliersShort=サプライヤーのリスト ListProspectsShort=見込み客リスト ListCustomersShort=顧客リスト -ThirdPartiesArea=第三者のエリア +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=最後%sは、第三者を変更 UniqueThirdParties=ユニークな第三者の合計 InActivity=開く @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=yyは年である顧客コードと仕入先コードの%syymm-nnnnの形式%syymm-NNNNとニュメロを返し、mmは月とnnnnはありません休憩0〜ノーリターンでシーケンスです。 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。このコードは、いつでも変更することができます。 ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang index a1d67ea4a1f..156864f7beb 100644 --- a/htdocs/langs/ja_JP/compta.lang +++ b/htdocs/langs/ja_JP/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang index d36096f4c15..73c5868c8e6 100644 --- a/htdocs/langs/ja_JP/donations.lang +++ b/htdocs/langs/ja_JP/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=寄付 Donations=寄付 -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=ドナー Donors=ドナー AddDonation=寄付を追加します。 NewDonation=新しい寄付 -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=ギフト約束 PromisesNotValid=検証されていない約束 PromisesValid=検証の約束 @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=ドラフト DonationStatusPromiseValidatedShort=検証 DonationStatusPaidShort=受信された ValidPromess=約束を検証する -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=領収書を構築する DonationsModels=寄付金の領収書のドキュメントモデル LastModifiedDonations=最後%sは寄付を変更 SearchADonation=寄付を検索 -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang index 7c6cea3468f..fa925a3f694 100644 --- a/htdocs/langs/ja_JP/errors.lang +++ b/htdocs/langs/ja_JP/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang index d50a1db2f96..6012a6b9631 100644 --- a/htdocs/langs/ja_JP/holiday.lang +++ b/htdocs/langs/ja_JP/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=開始日 DateFinCP=終了日 @@ -18,24 +18,24 @@ ApprovedCP=承認された CancelCP=キャンセル RefuseCP=拒否 ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=説明 -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=編集 DeleteCP=削除する ActionValidCP=検証 @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=キャンセル StatutCP=ステータス SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=更新 -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=理由 UserCP=ユーザー ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=の名前 Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=値 -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=検証 UpdateEventCP=Update events CreateEventCP=作る @@ -127,23 +127,23 @@ UpdateEventOptionCP=更新 ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang index 37cadf42a7b..df13f2bf3b6 100644 --- a/htdocs/langs/ja_JP/interventions.lang +++ b/htdocs/langs/ja_JP/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=あなたはこの介入の行を削除しても NameAndSignatureOfInternalContact=介入の名前と署名： NameAndSignatureOfExternalContact=顧客の名前と署名： DocumentModelStandard=介入のための標準のドキュメントモデル -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled="銘打たれた"分類 +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=請求 RelatedInterventions=関連する介入 ShowIntervention=介入を示す +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=代表的なフォローアップ介入 TypeContact_fichinter_internal_INTERVENING=間にある @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=一般的な数値モデル ArcticNumRefModelError=アクティブ化に失敗 PacificNumRefModelDesc1=yyは年である%syymm - nnnnの形式でニュメロを返す、mmは月ですと、nnnnはなく休憩と0〜ノーリターンでシーケンスです。 PacificNumRefModelError=$ syymmで始まる介入のカードは、すでに存在し、シーケンスのこのモデルと互換性がありません。それを削除するか、このモジュールをアクティブにするには、その名前を変更。 -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang index 1f927e48261..ad6075c0514 100644 --- a/htdocs/langs/ja_JP/projects.lang +++ b/htdocs/langs/ja_JP/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=プロジェクトのイベント YouAreNotContactOfProject=この民間プロジェクトの接触ではありません DeleteATimeSpent=費やした時間を削除します。 ConfirmDeleteATimeSpent=この時間を過ごし削除してもよろしいですか？ -DoNotShowMyTasksOnly=私に割り当てられていないタスクも参照してください。 -ShowMyTasksOnly=私に割り当てられたタスクのみを表示 +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=この第三者に専用のプロジェクト NoTasks=このプロジェクトのための作業をしない LinkedToAnotherCompany=他の第三者へのリンク -TaskIsNotAffectedToYou=タスクがあなたに割り当てられていない +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=費やした時間は空です ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべてのタスク（現時点では%sタスク）と過ごした時間のすべての入力を削除します。 IfNeedToUseOhterObjectKeepEmpty=いくつかのオブジェクト（請求書、注文、...）、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数のサードパーティ中のプロジェクトを持っているこの空を保持します。 @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=完全なプロジェクトのレポートモデル（logo. ..） PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang index b94da43470a..29247f90aa6 100644 --- a/htdocs/langs/ja_JP/sendings.lang +++ b/htdocs/langs/ja_JP/sendings.lang @@ -13,7 +13,7 @@ LastSendings=最後%s出荷 SearchASending=出荷の検索 StatisticsOfSendings=出荷の統計 NbOfSendings=出荷数 -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=配送カード NewSending=新しい出荷 CreateASending=出荷を作成します。 @@ -50,27 +50,29 @@ Enlevement=顧客が得 DocumentModelSimple=簡単な文書モデル DocumentModelMerou=メロウA5モデル WarningNoQtyLeftToSend=警告は、出荷されるのを待っていない製品。 -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=配達のかんな日付 DateReceived=日付の配信は、受信した SendShippingByEMail=電子メールで貨物を送る -SendShippingRef=出荷%sを送る +SendShippingRef=Submission of shipment %s ActionsOnShipping=出荷のイベント LinkToTrackYourPackage=あなたのパッケージを追跡するためのリンク ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、注文カードから行われます。 -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=顧客がキャッチ SendingMethodTRANS=トランスポーター SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=配信確認のためのシンプルなドキュメントモデル DocumentModelTyphon=配信確認のために、より完全なドキュメントモデル（logo. ..） - Error_EXPEDITION_ADDON_NUMBER_NotDefined=定数EXPEDITION_ADDON_NUMBERが定義されていません -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang index a18e7cf8d10..393bbfc7871 100644 --- a/htdocs/langs/ja_JP/suppliers.lang +++ b/htdocs/langs/ja_JP/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=注文日 BuyingPrice=買価 BuyingPriceMin=最小購入価格 BuyingPriceMinShort=最小購入価格 -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=サプライヤ価格を追加します。 ChangeSupplierPrice=サプライヤ価格を変更する ErrorQtyTooLowForThisSupplier=このサプライヤーのために低すぎる量やサプライヤーのために本製品に定義されていない価格 @@ -27,7 +27,7 @@ RefSupplierShort=REF。サプライヤー Availability=可用性 ExportDataset_fournisseur_1=サプライヤの請求書のリストと請求書の行 ExportDataset_fournisseur_2=サプライヤーの請求書と支払い -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=この注文を承認 ConfirmApproveThisOrder=あなたは、注文%sを承認してもよろしいですか？ DenyingThisOrder=この順序を否定 @@ -39,4 +39,6 @@ AddSupplierOrder=サプライヤーの順序を作成します。 AddSupplierInvoice=サプライヤの請求書を作成します。 ListOfSupplierProductForSupplier=サプライヤー%sの製品と価格の一覧 NoneOrBatchFileNeverRan=noneまたはバッチ%sは最近走っていない -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/ko_KR/accountancy.lang +++ b/htdocs/langs/ko_KR/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 76a8938f3b5..f08daf12dbb 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang index 15db383ab9b..f8dabc9f384 100644 --- a/htdocs/langs/ko_KR/agenda.lang +++ b/htdocs/langs/ko_KR/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=이벤트 ActionsArea=이벤트 영역 (액션과 작업) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang index b28086fa933..ed61bfc08a6 100644 --- a/htdocs/langs/ko_KR/categories.lang +++ b/htdocs/langs/ko_KR/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -# Category=Category -# Categories=Categories -# Rubrique=Category -# Rubriques=Categories -# categories=categories -# TheCategorie=The category -# NoCategoryYet=No category of this type created -# In=In -# AddIn=Add in -# modify=modify -# Classify=Classify -# CategoriesArea=Categories area -# ProductsCategoriesArea=Products/Services categories area -# SuppliersCategoriesArea=Suppliers categories area -# CustomersCategoriesArea=Customers categories area -# ThirdPartyCategoriesArea=Third parties categories area -# MembersCategoriesArea=Members categories area -# ContactsCategoriesArea=Contacts categories area -# MainCats=Main categories -# SubCats=Subcategories -# CatStatistics=Statistics -# CatList=List of categories -# AllCats=All categories -# ViewCat=View category -# NewCat=Add category -# NewCategory=New category -# ModifCat=Modify category -# CatCreated=Category created -# CreateCat=Create category -# CreateThisCat=Create this category -# ValidateFields=Validate the fields -# NoSubCat=No subcategory. -# SubCatOf=Subcategory -# FoundCats=Found categories -# FoundCatsForName=Categories found for the name : -# FoundSubCatsIn=Subcategories found in the category -# ErrSameCatSelected=You selected the same category several times -# ErrForgotCat=You forgot to choose the category -# ErrForgotField=You forgot to inform the fields -# ErrCatAlreadyExists=This name is already used -# AddProductToCat=Add this product to a category? -# ImpossibleAddCat=Impossible to add the category -# ImpossibleAssociateCategory=Impossible to associate the category to -# WasAddedSuccessfully=%s was added successfully. -# ObjectAlreadyLinkedToCategory=Element is already linked to this category. -# CategorySuccessfullyCreated=This category %s has been added with success. -# ProductIsInCategories=Product/service owns to following categories -# SupplierIsInCategories=Third party owns to following suppliers categories -# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -# MemberIsInCategories=This member owns to following members categories -# ContactIsInCategories=This contact owns to following contacts categories -# ProductHasNoCategory=This product/service is not in any categories -# SupplierHasNoCategory=This supplier is not in any categories -# CompanyHasNoCategory=This company is not in any categories -# MemberHasNoCategory=This member is not in any categories -# ContactHasNoCategory=This contact is not in any categories -# ClassifyInCategory=Classify in category -# NoneCategory=None -# NotCategorized=Without category -# CategoryExistsAtSameLevel=This category already exists with this ref -# ReturnInProduct=Back to product/service card -# ReturnInSupplier=Back to supplier card -# ReturnInCompany=Back to customer/prospect card -# ContentsVisibleByAll=The contents will be visible by all -# ContentsVisibleByAllShort=Contents visible by all -# ContentsNotVisibleByAllShort=Contents not visible by all -# CategoriesTree=Categories tree -# DeleteCategory=Delete category -# ConfirmDeleteCategory=Are you sure you want to delete this category ? -# RemoveFromCategory=Remove link with categorie -# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -# NoCategoriesDefined=No category defined -# SuppliersCategoryShort=Suppliers category -# CustomersCategoryShort=Customers category -# ProductsCategoryShort=Products category -# MembersCategoryShort=Members category -# SuppliersCategoriesShort=Suppliers categories -# CustomersCategoriesShort=Customers categories -# CustomersProspectsCategoriesShort=Custo./Prosp. categories -# ProductsCategoriesShort=Products categories -# MembersCategoriesShort=Members categories -# ContactCategoriesShort=Contacts categories -# ThisCategoryHasNoProduct=This category does not contain any product. -# ThisCategoryHasNoSupplier=This category does not contain any supplier. -# ThisCategoryHasNoCustomer=This category does not contain any customer. -# ThisCategoryHasNoMember=This category does not contain any member. -# ThisCategoryHasNoContact=This category does not contain any contact. -# AssignedToCustomer=Assigned to a customer -# AssignedToTheCustomer=Assigned to the customer -# InternalCategory=Internal category -# CategoryContents=Category contents -# CategId=Category id -# CatSupList=List of supplier categories -# CatCusList=List of customer/prospect categories -# CatProdList=List of products categories -# CatMemberList=List of members categories -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/ko_KR/companies.lang +++ b/htdocs/langs/ko_KR/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/ko_KR/compta.lang +++ b/htdocs/langs/ko_KR/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang index 12a72464cae..66ddea95a5c 100644 --- a/htdocs/langs/ko_KR/donations.lang +++ b/htdocs/langs/ko_KR/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -# Donation=Donation -# Donations=Donations -# DonationRef=Donation ref. -# Donor=Donor -# Donors=Donors -# AddDonation=Add a donation -# NewDonation=New donation -# ShowDonation=Show donation -# DonationPromise=Gift promise -# PromisesNotValid=Not validated promises -# PromisesValid=Validated promises -# DonationsPaid=Donations paid -# DonationsReceived=Donations received -# PublicDonation=Public donation -# DonationsNumber=Donation number -# DonationsArea=Donations area -# DonationStatusPromiseNotValidated=Draft promise -# DonationStatusPromiseValidated=Validated promise -# DonationStatusPaid=Donation received -# DonationStatusPromiseNotValidatedShort=Draft -# DonationStatusPromiseValidatedShort=Validated -# DonationStatusPaidShort=Received -# ValidPromess=Validate promise -# DonationReceipt=Donation receipt -# BuildDonationReceipt=Build receipt -# DonationsModels=Documents models for donation receipts -# LastModifiedDonations=Last %s modified donations -# SearchADonation=Search a donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Add a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang index 9fd6bc63ea4..cf892ddac82 100644 --- a/htdocs/langs/ko_KR/errors.lang +++ b/htdocs/langs/ko_KR/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/ko_KR/holiday.lang +++ b/htdocs/langs/ko_KR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang index 0a5b3e15467..17641a0ab3e 100644 --- a/htdocs/langs/ko_KR/interventions.lang +++ b/htdocs/langs/ko_KR/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -# Intervention=Intervention -# Interventions=Interventions -# InterventionCard=Intervention card -# NewIntervention=New intervention -# AddIntervention=Add intervention -# ListOfInterventions=List of interventions -# EditIntervention=Edit intervention -# ActionsOnFicheInter=Actions on intervention -# LastInterventions=Last %s interventions -# AllInterventions=All interventions -# CreateDraftIntervention=Create draft -# CustomerDoesNotHavePrefix=Customer does not have a prefix -# InterventionContact=Intervention contact -# DeleteIntervention=Delete intervention -# ValidateIntervention=Validate intervention -# ModifyIntervention=Modify intervention -# DeleteInterventionLine=Delete intervention line -# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -# ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -# NameAndSignatureOfInternalContact=Name and signature of intervening : -# NameAndSignatureOfExternalContact=Name and signature of customer : -# DocumentModelStandard=Standard document model for interventions -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -# ClassifyBilled=Classify "Billed" -# StatusInterInvoiced=Billed -# RelatedInterventions=Related interventions -# ShowIntervention=Show intervention +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Add intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### -# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -# TypeContact_fichinter_internal_INTERVENING=Intervening -# TypeContact_fichinter_external_BILLING=Billing customer contact -# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact # Modele numérotation -# ArcticNumRefModelDesc1=Generic number model -# ArcticNumRefModelError=Failed to activate -# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/ko_KR/projects.lang +++ b/htdocs/langs/ko_KR/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang index 3bb65c295d2..2ae43f39766 100644 --- a/htdocs/langs/ko_KR/sendings.lang +++ b/htdocs/langs/ko_KR/sendings.lang @@ -1,76 +1,78 @@ # Dolibarr language file - Source file is en_US - sendings -# RefSending=Ref. shipment -# Sending=Shipment -# Sendings=Shipments -# Shipment=Shipment -# Shipments=Shipments -# Receivings=Receivings -# SendingsArea=Shipments area -# ListOfSendings=List of shipments -# SendingMethod=Shipping method -# SendingReceipt=Shipping receipt -# LastSendings=Last %s shipments -# SearchASending=Search for shipment -# StatisticsOfSendings=Statistics for shipments -# NbOfSendings=Number of shipments -# NumberOfShipmentsByMonth=Number of shipments by month -# SendingCard=Shipping card -# NewSending=New shipment -# CreateASending=Create a shipment -# CreateSending=Create shipment -# QtyOrdered=Qty ordered -# QtyShipped=Qty shipped -# QtyToShip=Qty to ship -# QtyReceived=Qty received -# KeepToShip=Keep to ship -# OtherSendingsForSameOrder=Other shipments for this order -# DateSending=Date sending order -# DateSendingShort=Date sending order -# SendingsForSameOrder=Shipments for this order -# SendingsAndReceivingForSameOrder=Shipments and receivings for this order -# SendingsToValidate=Shipments to validate -# StatusSendingCanceled=Canceled -# StatusSendingDraft=Draft -# StatusSendingValidated=Validated (products to ship or already shipped) -# StatusSendingProcessed=Processed -# StatusSendingCanceledShort=Canceled -# StatusSendingDraftShort=Draft -# StatusSendingValidatedShort=Validated -# StatusSendingProcessedShort=Processed -# SendingSheet=Sending sheet -# Carriers=Carriers -# Carrier=Carrier -# CarriersArea=Carriers area -# NewCarrier=New carrier -# ConfirmDeleteSending=Are you sure you want to delete this shipment ? -# ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? -# ConfirmCancelSending=Are you sure you want to cancel this shipment ? -# GenericTransport=Generic transport -# Enlevement=Gotten by customer -# DocumentModelSimple=Simple document model -# DocumentModelMerou=Merou A5 model -# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -# DateDeliveryPlanned=Planed date of delivery -# DateReceived=Date delivery received -# SendShippingByEMail=Send shipment by EMail -# SendShippingRef=Send shipment %s -# ActionsOnShipping=Events on shipment -# LinkToTrackYourPackage=Link to track your package -# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +Receivings=Receivings +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipping card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Keep to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Sending sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang index 01c90ede80f..b1545d6ca3c 100644 --- a/htdocs/langs/ko_KR/suppliers.lang +++ b/htdocs/langs/ko_KR/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers -# Suppliers=Suppliers -# Supplier=Supplier -# AddSupplier=Add a supplier -# SupplierRemoved=Supplier removed -# SuppliersInvoice=Suppliers invoice -# NewSupplier=New supplier -# History=History -# ListOfSuppliers=List of suppliers -# ShowSupplier=Show supplier -# OrderDate=Order date -# BuyingPrice=Buying price -# BuyingPriceMin=Minimum buying price -# BuyingPriceMinShort=Min buying price -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined -# AddSupplierPrice=Add supplier price -# ChangeSupplierPrice=Change supplier price -# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -# NoRecordedSuppliers=No suppliers recorded -# SupplierPayment=Supplier payment -# SuppliersArea=Suppliers area -# RefSupplierShort=Ref. supplier -# Availability=Availability -# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -# ExportDataset_fournisseur_2=Supplier invoices and payments -# ExportDataset_fournisseur_3=Supplier orders and order lines -# ApproveThisOrder=Approve this order -# ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -# DenyingThisOrder=Denying this order -# ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -# ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -# AddCustomerOrder=Create customer order -# AddCustomerInvoice=Create customer invoice -# AddSupplierOrder=Create supplier order -# AddSupplierInvoice=Create supplier invoice -# ListOfSupplierProductForSupplier=List of products and prices for supplier %s -# NoneOrBatchFileNeverRan=None or batch %s not ran recently -# SentToSuppliers=Sent to suppliers +Suppliers=Suppliers +Supplier=Supplier +AddSupplier=Add a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Denying this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/lt_LT/accountancy.lang +++ b/htdocs/langs/lt_LT/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 56b2cf0674f..3158ece74b6 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Klaida, šiam moduliui reikalinga Dolibarr ver ErrorDecimalLargerThanAreForbidden=Klaida, tikslumas viršyjantis %s nėra palaikomas. DictionarySetup=Žodyno nustatymas Dictionary=Žodynai +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Vertės 'system' ir 'systemauto' yra rezervuotos šiam tipui. Galite naudoti 'user' vertę, jei norite įvesti savo įrašą ErrorCodeCantContainZero=Kode negali būti vertės 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatiškai, jei Javascript yra išjungtas AvailableOnlyIfJavascriptNotDisabled=Galimas tik tuomet, kai JavaScript neišjungtas AvailableOnlyIfJavascriptAndAjaxNotDisabled=Galimas tik tuomet, kai JavaScript neišjungtas Required=Reikalingas +UsedOnlyWithTypeOption=Used by some agenda option only Security=Saugumas Passwords=Slaptažodžiai DoNotStoreClearPassword=Nesaugokite aiškių slaptažodžių duomenų bazėje, laikykite tik užšifruotus (Activated recomended) diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang index 42ec315e1c3..54733de0408 100644 --- a/htdocs/langs/lt_LT/agenda.lang +++ b/htdocs/langs/lt_LT/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID įvykis Actions=Įvykiai ActionsArea=Įvykių sritis (Veiksmai ir uždaviniai) -Agenda= Operacijų sąrašas -Agendas= Operacijų sąrašai -Calendar= Kalendorius -Calendars= Kalendoriai -LocalAgenda=Vietinis kalendorius +Agenda=Operacijų sąrašas +Agendas=Operacijų sąrašai +Calendar=Kalendorius +Calendars=Kalendoriai +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Priskirtas DoneBy=Atliko Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Visi neužbaigti įvykiai MenuDoneActions=Visi užbaigti/nutraukti įvykiai MenuToDoMyActions=Mano neužbaigti įvykiai MenuDoneMyActions=Mano užbaigti/nutraukti įvykiai -ListOfEvents=Dolibarr įvykių sąrašas +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Įvykiai, apie kuriuos pranešė ActionsToDoBy=Įvykiai priskirti ActionsDoneBy=Įvykiai atlikti @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL prieiga prie .ical failo ExtSiteNoLabel=Aprašymo nėra WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang index b28086fa933..7f998cd3c4d 100644 --- a/htdocs/langs/lt_LT/categories.lang +++ b/htdocs/langs/lt_LT/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -# Category=Category -# Categories=Categories -# Rubrique=Category -# Rubriques=Categories -# categories=categories -# TheCategorie=The category -# NoCategoryYet=No category of this type created -# In=In -# AddIn=Add in -# modify=modify -# Classify=Classify -# CategoriesArea=Categories area -# ProductsCategoriesArea=Products/Services categories area -# SuppliersCategoriesArea=Suppliers categories area -# CustomersCategoriesArea=Customers categories area -# ThirdPartyCategoriesArea=Third parties categories area -# MembersCategoriesArea=Members categories area -# ContactsCategoriesArea=Contacts categories area -# MainCats=Main categories -# SubCats=Subcategories -# CatStatistics=Statistics -# CatList=List of categories -# AllCats=All categories -# ViewCat=View category -# NewCat=Add category -# NewCategory=New category -# ModifCat=Modify category -# CatCreated=Category created -# CreateCat=Create category -# CreateThisCat=Create this category -# ValidateFields=Validate the fields -# NoSubCat=No subcategory. -# SubCatOf=Subcategory -# FoundCats=Found categories -# FoundCatsForName=Categories found for the name : -# FoundSubCatsIn=Subcategories found in the category -# ErrSameCatSelected=You selected the same category several times -# ErrForgotCat=You forgot to choose the category -# ErrForgotField=You forgot to inform the fields -# ErrCatAlreadyExists=This name is already used -# AddProductToCat=Add this product to a category? -# ImpossibleAddCat=Impossible to add the category -# ImpossibleAssociateCategory=Impossible to associate the category to -# WasAddedSuccessfully=%s was added successfully. -# ObjectAlreadyLinkedToCategory=Element is already linked to this category. -# CategorySuccessfullyCreated=This category %s has been added with success. -# ProductIsInCategories=Product/service owns to following categories -# SupplierIsInCategories=Third party owns to following suppliers categories -# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -# MemberIsInCategories=This member owns to following members categories -# ContactIsInCategories=This contact owns to following contacts categories -# ProductHasNoCategory=This product/service is not in any categories -# SupplierHasNoCategory=This supplier is not in any categories -# CompanyHasNoCategory=This company is not in any categories -# MemberHasNoCategory=This member is not in any categories -# ContactHasNoCategory=This contact is not in any categories -# ClassifyInCategory=Classify in category -# NoneCategory=None -# NotCategorized=Without category -# CategoryExistsAtSameLevel=This category already exists with this ref -# ReturnInProduct=Back to product/service card -# ReturnInSupplier=Back to supplier card -# ReturnInCompany=Back to customer/prospect card -# ContentsVisibleByAll=The contents will be visible by all -# ContentsVisibleByAllShort=Contents visible by all -# ContentsNotVisibleByAllShort=Contents not visible by all -# CategoriesTree=Categories tree -# DeleteCategory=Delete category -# ConfirmDeleteCategory=Are you sure you want to delete this category ? -# RemoveFromCategory=Remove link with categorie -# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -# NoCategoriesDefined=No category defined -# SuppliersCategoryShort=Suppliers category -# CustomersCategoryShort=Customers category -# ProductsCategoryShort=Products category -# MembersCategoryShort=Members category -# SuppliersCategoriesShort=Suppliers categories -# CustomersCategoriesShort=Customers categories -# CustomersProspectsCategoriesShort=Custo./Prosp. categories -# ProductsCategoriesShort=Products categories -# MembersCategoriesShort=Members categories -# ContactCategoriesShort=Contacts categories -# ThisCategoryHasNoProduct=This category does not contain any product. -# ThisCategoryHasNoSupplier=This category does not contain any supplier. -# ThisCategoryHasNoCustomer=This category does not contain any customer. -# ThisCategoryHasNoMember=This category does not contain any member. -# ThisCategoryHasNoContact=This category does not contain any contact. -# AssignedToCustomer=Assigned to a customer -# AssignedToTheCustomer=Assigned to the customer -# InternalCategory=Internal category -# CategoryContents=Category contents -# CategId=Category id -# CatSupList=List of supplier categories -# CatCusList=List of customer/prospect categories -# CatProdList=List of products categories -# CatMemberList=List of members categories -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +Category=Kategorija +Categories=Kategorijos +Rubrique=Kategorija +Rubriques=Kategorijos +categories=kategorijos +TheCategorie=Kategorija +NoCategoryYet=Tokiam tipui nėra sukurtų kategorijų +In=Į +AddIn=Įtraukti +modify=Pakeisti +Classify=Priskirti +CategoriesArea=Kategorijų sritis +ProductsCategoriesArea=Produktų/Paslaugų kategorijų sritis +SuppliersCategoriesArea=Tiekėjų kategorijų sritis +CustomersCategoriesArea=Klientų kategorijų sritis +ThirdPartyCategoriesArea=Trečiųjų šalių kategorijų sritis +MembersCategoriesArea=Narių kategorijų sritis +ContactsCategoriesArea=Adresatų kategorijų sritis +MainCats=Pagrindinės kategorijos +SubCats=Subkategorijos +CatStatistics=Statistika +CatList=Kategorijų sąrašas +AllCats=Visos kategorijos +ViewCat=Žiūrėti kategoriją +NewCat=Įtraukti kategoriją +NewCategory=Nauja kategorija +ModifCat=Keisti kategoriją +CatCreated=Kategorija sukurta +CreateCat=Sukurti kategoriją +CreateThisCat=Sukurti šią kategoriją +ValidateFields=Patvirtinti laukus +NoSubCat=Nėra subkategorijos +SubCatOf=Subkategorija +FoundCats=Rastos kategorijos +FoundCatsForName=Rasta kategorijos pavadinimui: +FoundSubCatsIn=Kategorijoje rastos Subkategorijos +ErrSameCatSelected=Pasirinkote tą pačią kategoriją keletą kartų +ErrForgotCat=Pamiršote pasirinkti kategoriją +ErrForgotField=Pamiršote informuoti laukus +ErrCatAlreadyExists=Šis pavadinimas jau naudojamas +AddProductToCat=Pridėti šį produktą į kategoriją ? +ImpossibleAddCat=Neįmanoma pridėti kategoriją +ImpossibleAssociateCategory=Neįmanoma susieti kategoriją +WasAddedSuccessfully=%s buvo sėkmingai įrašytas. +ObjectAlreadyLinkedToCategory=Elementas jau yra susietas su šia kategorija +CategorySuccessfullyCreated=Ši kategorija %s buvo pridėta sėkmingai +ProductIsInCategories=Produktas/paslauga turi šias kategorijas +SupplierIsInCategories=Trečioji šalis turi sekančias tiekėjų kategorijas +CompanyIsInCustomersCategories=Ši trečioji šalis turi sekančias klientų/planų kategorijas +CompanyIsInSuppliersCategories=Ši trečioji šalis turi sekančias tiekėjų kategorijas +MemberIsInCategories=Šis narys priklauso sekančioms narių kategorijoms +ContactIsInCategories=Šis adresatas priklauso sekančioms adresatų kategorijoms +ProductHasNoCategory=Šis produktas/paslauga neturi jokių kategorijų +SupplierHasNoCategory=Šis tiekėjas neturi jokių kategorijų +CompanyHasNoCategory=Ši įmonė neturi jokių kategorijų +MemberHasNoCategory=Šis narys neturi jokių kategorijų +ContactHasNoCategory=Šis adresatas nėra jokioje kategorijoje +ClassifyInCategory=Priskirti kategorijai +NoneCategory=Nė vienas +NotCategorized=Be kategorijos +CategoryExistsAtSameLevel=Ši kategorija jau egzistuoja su šia nuoroda +ReturnInProduct=Atgal į produkto/paslaugos kortelę +ReturnInSupplier=Atgal į tiekėjo kortelę +ReturnInCompany=Atgal į kliento/plano kortelę +ContentsVisibleByAll=Turinys bus matomas visiems +ContentsVisibleByAllShort=Turinys matomas visiems +ContentsNotVisibleByAllShort=Turinys nėra matomos visiems +CategoriesTree=Kategorijų medis +DeleteCategory=Ištrinti kategoriją +ConfirmDeleteCategory=Ar tikrai norite ištrinti šią kategoriją? +RemoveFromCategory=Pašalinti ryšį su kategorija +RemoveFromCategoryConfirm=Ar tikrai norite pašalinti ryšį tarp operacijos ir kategorijos ? +NoCategoriesDefined=Nėra apibrėžtos kategorijos +SuppliersCategoryShort=Tiekėjų kategorija +CustomersCategoryShort=Klientų kategorija +ProductsCategoryShort=Produktų kategorija +MembersCategoryShort=Narių kategorija +SuppliersCategoriesShort=Tiekėjų kategorijos +CustomersCategoriesShort=Klientų kategorijos +CustomersProspectsCategoriesShort=Klientų/Planų kategorijos +ProductsCategoriesShort=Produktų kategorijos +MembersCategoriesShort=Narių kategorijos +ContactCategoriesShort=Adresatų kategorijos +ThisCategoryHasNoProduct=Ši kategorija neturi jokių produktų. +ThisCategoryHasNoSupplier=Ši kategorija neturi jokių tiekėjų. +ThisCategoryHasNoCustomer=Ši kategorija neturi jokių klientų. +ThisCategoryHasNoMember=Ši kategorija neturi jokių narių. +ThisCategoryHasNoContact=Ši kategorija neturi jokių adresatų +AssignedToCustomer=Paskirti klientui +AssignedToTheCustomer=Paskirtas klientui +InternalCategory=Vidinė kategorija +CategoryContents=Kategorijos turinys +CategId=Kategorijos ID +CatSupList=Tiekėjo kategorijų sąrašas +CatCusList=Kliento/Plano kategorijų sąrašas +CatProdList=Produktų kategorijų sąrašas +CatMemberList=Narių kategorijų sąrašas +CatContactList=Adresatų kategorijų ir adresatų sąrašas +CatSupLinks=Ryšys tarp tiekėjų ir kategorijų +CatCusLinks=Ryšys tarp klientų/planų ir kategorijų +CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų +CatMemberLinks=Ryšys tarp narių ir kategorijų +CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų +CatCusLinks=Ryšys tarp klientų/planų ir kategorijų +CatSupLinks=Ryšys tarp tiekėjų ir kategorijų +DeleteFromCat=Pašalinti iš kategorijos +DeletePicture=Ištrinti nuotrauką +ConfirmDeletePicture=Patvirtinkite nuotraukos trynimą +ExtraFieldsCategories=Papildomi atributai +CategoriesSetup=Kategorijų nustatymai +CategorieRecursiv=Automatiškai susieti su pirmine kategorija +CategorieRecursivHelp=Jei įjungta, produktas taip pat susijęs su pirmine kategorija, kai dedamas į subkategoriją +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang index 59cfb5f0bfd..96086bc442f 100644 --- a/htdocs/langs/lt_LT/companies.lang +++ b/htdocs/langs/lt_LT/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Pirmiausia Jūs turite sukurti kontaktus e-laiškams t ListSuppliersShort=Tiekėjų sąrašas ListProspectsShort=Numatomų klientų sąrašas ListCustomersShort=Klientų sąrašas -ThirdPartiesArea=Trečiųjų šalių sritis +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Paskutinės %s modifikuotos trečiosios šalys UniqueThirdParties=Viso unikalių trečiųjų šalių InActivity=Atviras @@ -410,3 +410,5 @@ OutstandingBillReached=Pasiekė neapmokėtų sąskaitų-faktūrų maksimumą MonkeyNumRefModelDesc=Gražinimo numeris formatu %syymm-nnnn kliento kodui ir %syymm-nnnn tiekėjo kodui, kur yy yra metai, mm yra mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0. LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas bet kada. ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang index 74afe6bd1e8..e30bc42289a 100644 --- a/htdocs/langs/lt_LT/compta.lang +++ b/htdocs/langs/lt_LT/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Apskaitos suvestinė ByProductsAndServices=Pagal Produktus ir Paslaugas RefExt=Išorinė nuoroda ToCreateAPredefinedInvoice=Norėdami sukurti iš anksto nustatytą sąskaitą-faktūrą, sukurkite standartinę sąskaitą-faktūrą, be patvirtinimo, spauskite mygtuką "Keisti į iš anksto nustatytą sąskaitą-faktūrą." -LinkedOrder=Susietas su užsakymu +LinkedOrder=Link to order ReCalculate=Perskaičiuoti Mode1=Metodas 1 Mode2=Metodas 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas Pinigų apskaita būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama Įsipareigojimų apskaita režimas (žr. Apskaitos modulio nustatymus). CalculationMode=Skaičiavimo metodas AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pirkimui -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pardavimui -ACCOUNTING_SERVICE_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pirkimui -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pardavimui -ACCOUNTING_VAT_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą gaunama PVM -ACCOUNTING_VAT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą sumokamam PVM -ACCOUNTING_ACCOUNT_CUSTOMER=Apskaitos taisyklės pagal nutylėjimą klientui trečiajai šaliai -ACCOUNTING_ACCOUNT_SUPPLIER=Apskaitos taisyklės pagal nutylėjimą tiekėjams trečiosioms šalims +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang index 12a72464cae..1f5134b50e7 100644 --- a/htdocs/langs/lt_LT/donations.lang +++ b/htdocs/langs/lt_LT/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -# Donation=Donation -# Donations=Donations -# DonationRef=Donation ref. -# Donor=Donor -# Donors=Donors -# AddDonation=Add a donation -# NewDonation=New donation -# ShowDonation=Show donation -# DonationPromise=Gift promise -# PromisesNotValid=Not validated promises -# PromisesValid=Validated promises -# DonationsPaid=Donations paid -# DonationsReceived=Donations received -# PublicDonation=Public donation -# DonationsNumber=Donation number -# DonationsArea=Donations area -# DonationStatusPromiseNotValidated=Draft promise -# DonationStatusPromiseValidated=Validated promise -# DonationStatusPaid=Donation received -# DonationStatusPromiseNotValidatedShort=Draft -# DonationStatusPromiseValidatedShort=Validated -# DonationStatusPaidShort=Received -# ValidPromess=Validate promise -# DonationReceipt=Donation receipt -# BuildDonationReceipt=Build receipt -# DonationsModels=Documents models for donation receipts -# LastModifiedDonations=Last %s modified donations -# SearchADonation=Search a donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +Donation=Auka +Donations=Aukos +DonationRef=Aukos nuoroda +Donor=Donoras +Donors=Donorai +AddDonation=Pridėti auką +NewDonation=Nauja auka +ShowDonation=Rodyti auką +DonationPromise=Dovanos pažadas +PromisesNotValid=Nepripažinti galiojančiais pažadai +PromisesValid=Pripažinti galiojančiais pažadai +DonationsPaid=Sumokėtos aukos +DonationsReceived=Gautos aukos +PublicDonation=Viešos aukos +DonationsNumber=Aukos numeris +DonationsArea=Aukų sritis +DonationStatusPromiseNotValidated=Pažado projektas +DonationStatusPromiseValidated=Patvirtintas pažadas +DonationStatusPaid=Gauta auka +DonationStatusPromiseNotValidatedShort=Projektas/apmatai +DonationStatusPromiseValidatedShort=Pripažintas galiojančiu +DonationStatusPaidShort=Gautas +ValidPromess=Pažadą pripažinti galiojančiu +DonationReceipt=Aukos įplaukos +BuildDonationReceipt=Sukurti įplaukas +DonationsModels=Aukos įplaukų dokumentų modeliai +LastModifiedDonations=Paskutinės %s pakeistos aukos +SearchADonation=Ieškoti aukos +DonationRecipient=Aukos gavėjas +ThankYou=Ačiū +IConfirmDonationReception=Gavėjas deklaruoja sekančios sumos priėmimą kaip auką +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang index 70ac77164a1..3393282345b 100644 --- a/htdocs/langs/lt_LT/errors.lang +++ b/htdocs/langs/lt_LT/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Klaida, Jūsų PHP turi turėti modulį %s įdiegtą ErrorOpenIDSetupNotComplete=Nustatyti Dolibarr config failą, kad būtų leidžiama OpenID patvirtinimas, bet OpenID paslaugos URL nėra apibrėžtas kaip konstanta %s. ErrorWarehouseMustDiffers=Šaltinio ir paskirties sandėliai privalo skirtis ErrorBadFormat=Blogas formatas ! -ErrorPaymentDateLowerThanInvoiceDate=Mokėjimo data (%s) negali būti ankstesnė už sąskaitos-faktūros %s datą (%s) . ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Klaida, šis narys nėra susijęs su jokia trečiąja šalimi. Prijungti narį prie esamos trečiosios šalies arba sukurti naują trečiąją šalį prieš kuriant pasirašymą su sąskaita-faktūra. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Įspėjimas. Naudojant šią dėžutę sulėtėja vi WarningClickToDialUserSetupNotComplete=Nustatymo ClickToDial informacija savo vartotojui nėra išsamūs (žr. skirtuką ClickToDial savo vartotojo kortelėje). WarningNotRelevant=Neaktuali operacija šiam duomenų rinkiniui WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang index 2e27a46a61a..41e18664822 100644 --- a/htdocs/langs/lt_LT/holiday.lang +++ b/htdocs/langs/lt_LT/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=Žmogiškųjų išteklių valdymas (HRM) -Holidays=Šventės -CPTitreMenu=Šventės +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Mėnesio suvestinė -MenuAddCP=Prašyti atostogų -NotActiveModCP=Turite įjungti atostogų modulį, kad galėtumėte mstyti šį puslapį. -NotConfigModCP=Reikia sukonfigūruoti atostogų modulį, kad galėtumėte matyti šį puslapį. Norėdami tai padaryti, spauskite čia. -NoCPforUser=Jūs neturite atostogų paraiškų. -AddCP=Prašyti atostogų +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Darbuotojas DateDebCP=Pradžios data DateFinCP=Pabaigos data @@ -18,24 +18,24 @@ ApprovedCP=Patvirtinta CancelCP=Atšauktas RefuseCP=Atmestas ValidatorCP=Tvirtintojas/aprobatorius -ListeCP=Švenčių sąrašas +ListeCP=List of leaves ReviewedByCP=Bus peržiūrėtas DescCP=Aprašymas -SendRequestCP=Sukurti atostogų paraišką -DelayToRequestCP=Prašymai dėl atostogų turi būti pateikti ne mažiau kaip %s dienų iki atostogų. -MenuConfCP=Redaguoti atostogų/švenčių balansą -UpdateAllCP=Atnaujinti atostogas/šventes -SoldeCPUser=Atostogų/švenčių balansas yra %s dienų. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Turite pasirinkti pabaigos datą didesnę nei pradžios data. ErrorSQLCreateCP=Kuriant įvyko SQL klaida: -ErrorIDFicheCP=Įvyko klaida, atostogų prašymas neegzistuoja. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Grįžti į ankstesnį puslapį -ErrorUserViewCP=Jūs neturite teisės skaityti šį prašymą atostogoms. -InfosCP=Informacija apie atostogų pareiklavimą +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Workflow informacija RequestByCP=Prašoma -TitreRequestCP=Atostogų lapas -NbUseDaysCP=Sunaudotų atostogų dienų skaičius +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Redaguoti DeleteCP=Ištrinti ActionValidCP=Patvirtinti @@ -43,26 +43,26 @@ ActionRefuseCP=Atmesti ActionCancelCP=Atšaukti StatutCP=Būklė SendToValidationCP=Siųsti patvirtinimui -TitleDeleteCP=Ištrinti atostogų prašymą -ConfirmDeleteCP=Patvirtinti šio prašymo atostogoms ištrynimą ? -ErrorCantDeleteCP=Klaida. Jūs neturite teisės ištrinti šį atostogų prašymą. -CantCreateCP=Jūs neturite teisės prašyti atostogų. -InvalidValidatorCP=Jūs turite pasirinkti Tvirtintoją/aprobatorių atostogų prašymui pateikti +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Atnaujinimas -CantUpdate=Jūs negalite atnaujinti šio atostogų prašymo. +CantUpdate=You cannot update this leave request. NoDateDebut=Turite pasirinkti pradžios datą. NoDateFin=Turite pasirinkti pabaigos datą. ErrorDureeCP=Jūsų prašymas suteikti atostogas neturi darbo dienų. TitleValidCP=Patvirtinti atostogų prašymą -ConfirmValidCP=Ar tikrai norite patvirtinti atostogų prašymą? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data patvirtinta -TitleToValidCP=Siųsti prašymą atostogoms -ConfirmToValidCP=Ar jūs tikrai norite išsiųsti atostogų prašymą? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Atmesti atostogų prašymą -ConfirmRefuseCP=Ar tikrai norite atmesti atostogų prašymą ? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Jūs turite pasirinkti priežastį dėl prašymo atostogoms atmetimo TitleCancelCP=Atšaukti atostogų prašymą -ConfirmCancelCP=Ar tikrai norite atšaukti atostogų prašymą ? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Atmetimo priežastis DateRefusCP=Atmetimo data DateCancelCP=Atšaukimo data @@ -72,8 +72,8 @@ MotifCP=Priežastis UserCP=Vartotojas ErrorAddEventToUserCP=Pridedant išimtines atostogas įvyko klaida. AddEventToUserOkCP=Išimtinių atostogų pridėjimas baigtas. -MenuLogCP=Peržiūrėti atostogų žurnalus -LogCP=Atostogų atnaujinimų žurnalas +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Atlieka UserUpdateCP=Vartotojui PrevSoldeCP=Ankstesnis balansas @@ -81,33 +81,33 @@ NewSoldeCP=Naujas balansas alreadyCPexist=Atostogų prašymas jau buvo padarytas šiuo laikotarpiu. UserName=Pavadinimas/vardas Employee=Darbuotojas -FirstDayOfHoliday=Pirma atostogų diena -LastDayOfHoliday=Paskutinė atostogų diena +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Mėnesio atnaujinimas ManualUpdate=Rankinis atnaujinimas -HolidaysCancelation=Atostogų atšaukimas +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Atostogų modulio konfigūracija DescOptionCP=Opcijos aprašymas ValueOptionCP=Reikšmė -GroupToValidateCP=Grupė su galimybe patvirtinti atostogas +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Patvirtinti konfigūraciją -LastUpdateCP=Paskutinės automatiškai atnaujintos atostogos +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Sėkmingai atnaujinta ErrorUpdateConfCP=Atnaujinimo metu įvyko klaida, prašome pabandyti dar kartą. AddCPforUsers=Prašome pridėti vartotojų atostogų balansą pagal paspaudę čia . DelayForSubmitCP=Terminas kreiptis dėl atostogų AlertapprobatortorDelayCP=Neleidžia aprobuoti, jeigu atostogų prašymo pateikimui praleisti terminai -AlertValidatorDelayCP=Préevent į approbator jei atostogų prašyme viršyti uždelsimą -AlertValidorSoldeCP=Neleidžia patvirtinti, jei prašoma atostogų virš balanso (jau išnaudotos) -nbUserCP=Atostogų modulyje palaikomų vartotojų skaičius -nbHolidayDeductedCP=Atostogų dienų akaičius, atimamas per dieną iš paimtų atostogų -nbHolidayEveryMonthCP=Kiekvieną mėnesį pridėtas atostogų skaičius -Module27130Name= Atostogų valdymas -Module27130Desc= Atostogų valdymas -TitleOptionMainCP=Atostogų pagrindiniai nustatymai -TitleOptionEventCP=Atostogų/švenčių, susijusių su įvykiais, nustatymai +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Patvirtinti UpdateEventCP=Atnaujinti įvykius CreateEventCP=Sukurti @@ -127,23 +127,23 @@ UpdateEventOptionCP=Atnaujinimas ErrorMailNotSend=Siunčiant laišką įvyko klaida: NoCPforMonth=Šį mėnesį nėra išimtinių atostogų nbJours=Dienų skaičius -TitleAdminCP=Atotogų konfigūracija +TitleAdminCP=Configuration of Leaves #Messages Hello=Sveiki ! -HolidaysToValidate=Patvirtinti atostogas -HolidaysToValidateBody=Žemiau yra atostogų prašymas tvirtinimui -HolidaysToValidateDelay=Šis atostogų prašymas galios trumpesnį laikotarpį nei %s dienų. -HolidaysToValidateAlertSolde=Vartotojas, kuris pateikė šį atostogų prašymą neturi pakankamai neišnaudotų dienų. -HolidaysValidated=Patvirtintos atostogos -HolidaysValidatedBody=Jūsų prašymas suteikti atostogas nuo %s iki %s buvo patvirtintas. -HolidaysRefused=Atmestos atostogos -HolidaysRefusedBody=Jūsų prašymas suteikti atostogas nuo %s iki %s buvo atmestas dėl sekančios priežasties: -HolidaysCanceled=Atšauktos atostogos -HolidaysCanceledBody=Jūsų prašymas suteikti atostogas nuo %s iki %s buvo atšauktas. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Peržiūrėti modifikuotų atostogų žurnalą -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang index 0a5b3e15467..1c046dff1bc 100644 --- a/htdocs/langs/lt_LT/interventions.lang +++ b/htdocs/langs/lt_LT/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -# Intervention=Intervention -# Interventions=Interventions -# InterventionCard=Intervention card -# NewIntervention=New intervention -# AddIntervention=Add intervention -# ListOfInterventions=List of interventions -# EditIntervention=Edit intervention -# ActionsOnFicheInter=Actions on intervention -# LastInterventions=Last %s interventions -# AllInterventions=All interventions -# CreateDraftIntervention=Create draft -# CustomerDoesNotHavePrefix=Customer does not have a prefix -# InterventionContact=Intervention contact -# DeleteIntervention=Delete intervention -# ValidateIntervention=Validate intervention -# ModifyIntervention=Modify intervention -# DeleteInterventionLine=Delete intervention line -# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -# ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -# NameAndSignatureOfInternalContact=Name and signature of intervening : -# NameAndSignatureOfExternalContact=Name and signature of customer : -# DocumentModelStandard=Standard document model for interventions -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -# ClassifyBilled=Classify "Billed" -# StatusInterInvoiced=Billed -# RelatedInterventions=Related interventions -# ShowIntervention=Show intervention +Intervention=Intervencija +Interventions=Intervencijos +InterventionCard=Intervencijos kortelė +NewIntervention=Nauja intervencija +AddIntervention=Pridėti intervenciją +ListOfInterventions=Intervencijų sąrašas +EditIntervention=Redaguoti intervenciją +ActionsOnFicheInter=Intervencijos veiksmai +LastInterventions=Paskutinės %s intervencijos +AllInterventions=Visos intervencijos +CreateDraftIntervention=Sukurti projektą +CustomerDoesNotHavePrefix=Klientas neturi prefikso +InterventionContact=Intervencijos kontaktai +DeleteIntervention=Ištrinti intervenciją +ValidateIntervention=Patvirtinti intervenciją +ModifyIntervention=Pakeisti intervenciją +DeleteInterventionLine=Ištrinti intervencijos eilutę +ConfirmDeleteIntervention=Ar tikrai norite ištrinti šią intervenciją? +ConfirmValidateIntervention=Ar tikrai norite patvirtinti šią intervenciją su pavadinimu %s ? +ConfirmModifyIntervention=Ar tikrai norite pakeisti šią intervenciją? +ConfirmDeleteInterventionLine=Ar tikrai norite ištrinti šią intervencijos eilutę ? +NameAndSignatureOfInternalContact=Intervencijos Pavadinimas/vardas ir parašas: +NameAndSignatureOfExternalContact=Kliento Pavadinimas/vardas ir parašas: +DocumentModelStandard=Intervencijų standartinio dokumento modelis +InterventionCardsAndInterventionLines=Intervencijos ir intervencijų eilutės +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Pateikta sąskaita +RelatedInterventions=Susiję intervencijos +ShowIntervention=Rodyti intervenciją +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### -# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -# TypeContact_fichinter_internal_INTERVENING=Intervening -# TypeContact_fichinter_external_BILLING=Billing customer contact -# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Sekančios intervencijos atstovas +TypeContact_fichinter_internal_INTERVENING=Intervencija +TypeContact_fichinter_external_BILLING=Kliento kontaktas sąskaitų pateikimui +TypeContact_fichinter_external_CUSTOMER=Sekantis kiento kontaktas # Modele numérotation -# ArcticNumRefModelDesc1=Generic number model -# ArcticNumRefModelError=Failed to activate -# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Bendrasis numerių modelis +ArcticNumRefModelError=Nepavyko suaktyvinti +PacificNumRefModelDesc1=Grąžinti numerį su formatu %syymm-nnnn, kur yy yra metai, mm mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0 +PacificNumRefModelError=Intervencijos kortelė pradedant $syymm jau egzistuoja ir yra nesuderinama su šios sekos modeliu. Pašalinti ją arba pakeisti vardą šio modulio aktyvavimui. +PrintProductsOnFichinter=Spausdinti produktus intervencinėje kortelėje +PrintProductsOnFichinterDetails=Intervencijoms, sukurtoms iš užsakymų diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang index 5a2e4c5a647..77744b81fd3 100644 --- a/htdocs/langs/lt_LT/projects.lang +++ b/htdocs/langs/lt_LT/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Projekto įvykiai YouAreNotContactOfProject=Jūs nesate šios privataus projekto kontaktinis adresatas DeleteATimeSpent=Ištrinti praleistą laiką ConfirmDeleteATimeSpent=Ar tikrai norite ištrinti šį praleistą laiką ? -DoNotShowMyTasksOnly=Taip pat žiūrėti užduotis nepriskiriamas man -ShowMyTasksOnly=Peržiūrėti tik man priskirtas užduotis +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ištekliai ProjectsDedicatedToThisThirdParty=Projektai, skirti šiai trečiąjai šaliai NoTasks=Nėra uždavinių šiam projektui LinkedToAnotherCompany=Susijęs su kita trečiąja šalimi -TaskIsNotAffectedToYou=Užduotis nėra skirta Jums +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Praleistas laikas yra tuščias ThisWillAlsoRemoveTasks=Šis veiksmas taip pat ištrins visas projekto užduotis (%s užduotis šiuo metu) ir visus praleisto laiko įvestus duomenis. IfNeedToUseOhterObjectKeepEmpty=Jei kai kurie objektai (sąskaitos-faktūros, užsakymai, ...), priklausantys kitai trečiąjai šaliai, turi būti susiję su kuriamu projektu, laikykite šitą tuščią, kad projektas būtų kelių trečiųjų šalių (multi). @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Aukotojas TypeContact_project_task_external_TASKCONTRIBUTOR=Straipsnio autorius SelectElement=Pasirinkti elementą AddElement=Susieti su elementu +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Pilnas projekto ataskaitos modelis (logo. ..) PlannedWorkload = Planuojamas darbo krūvis @@ -128,3 +129,4 @@ ProjectReferers=Nurodomi objektai SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang index 75d3ed7d2fa..2e735a6697c 100644 --- a/htdocs/langs/lt_LT/sendings.lang +++ b/htdocs/langs/lt_LT/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Tik patvirtintas siuntas parodanti statistika. Nau DateDeliveryPlanned=Suplanuota pristatymo data DateReceived=Pristatymo gavimo data SendShippingByEMail=Siųsti siuntą e-paštu -SendShippingRef=Siųsti siuntą %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Siuntų įvykiai LinkToTrackYourPackage=Nuoroda sekti Jūsų siuntos kelią ShipmentCreationIsDoneFromOrder=Šiuo metu, naujos siuntos sukūrimas atliktas iš užsakymo kortelės. @@ -72,3 +72,7 @@ DocumentModelTyphon=Labiau išsamus dokumento modelis pristatymo kvitui (logo. . Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nėra apibrėžta SumOfProductVolumes=Produkcijos apimties suma SumOfProductWeights=Produktų svorių suma + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang index d0a13633f41..d7103dbc295 100644 --- a/htdocs/langs/lt_LT/suppliers.lang +++ b/htdocs/langs/lt_LT/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Sukurti tiekėjo sąskaitą-faktūrą ListOfSupplierProductForSupplier=Produktų ir kainų sąrašas tiekėjui %s NoneOrBatchFileNeverRan=Nėra arba grupinis %s neseniai neįvyko SentToSuppliers=Nusiųsta tiekėjams +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang index cbe133b742f..e6c5bf4000e 100644 --- a/htdocs/langs/lv_LV/accountancy.lang +++ b/htdocs/langs/lv_LV/accountancy.lang @@ -18,11 +18,11 @@ Selectmodelcsv=Select a model of export Modelcsv_normal=Klasiskais eksports Modelcsv_CEGID=Export towards CEGID Expert BackToChartofaccounts=Return chart of accounts -Back=Return +Back=Atgriezšana Definechartofaccounts=Define a chart of accounts Selectchartofaccounts=Select a chart of accounts -Validate=Validate +Validate=Apstiprināt Addanaccount=Add an accounting account AccountAccounting=Accounting account Ventilation=Ventilation @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Pārdošanas žurnāls -ACCOUNTINGEX_PURCHASE_JOURNAL=Pirkumu žurnāls -ACCOUNTINGEX_BANK_JOURNAL=Bankas žurnāls -ACCOUNTINGEX_CASH_JOURNAL=Skaidras naudas žurnāls -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Dokumenta veids Docdate=Datums diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 16c4d2dd35b..42b7966eba7 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -12,7 +12,7 @@ SessionId=Sesijas ID SessionSaveHandler=Handler, lai saglabātu sesijas SessionSavePath=Atmiņas sesija lokalizācija PurgeSessions=Iztīrīt sesijas -ConfirmPurgeSessions=Vai jūs tiešām vēlaties, lai iztīrītu visus sesijas? Tas atvienot katram lietotājam (izņemot sevi). +ConfirmPurgeSessions=Vai jūs tiešām vēlaties iztīrītu visas sesijas? Tas atvienos katru lietotāju (izņemot sevi). NoSessionListWithThisHandler=Saglabāt sesija apdarinātājs konfigurēts jūsu PHP neļauj uzskaitīt visas darbojošās sesijas. LockNewSessions=Lock jaunus sakarus ConfirmLockNewSessions=Vai jūs tiešām vēlaties, lai ierobežotu jebkuru jaunu Dolibarr savienojumu ar sevi. Tikai lietotājs %s varēs pieslēgties pēc tam. @@ -126,8 +126,8 @@ PHPServerOffsetWithGreenwich=PHP servera kompensēt platums Greenwich (sekundes) ClientOffsetWithGreenwich=Klienta / Browser kompensēt platums Greenwich (sekundes) DaylingSavingTime=Vasaras laiks CurrentHour=PHP laiks (servera) -CompanyTZ=Uzņēmuma Time Zone (galvenais uzņēmums) -CompanyHour=Uzņēmums laiks (galvenais uzņēmums) +CompanyTZ=Uzņēmuma Laika Zona (galvenais uzņēmums) +CompanyHour=Uzņēmuma laiks (galvenais uzņēmums) CurrentSessionTimeOut=Pašreizējais sesijas taimauts YouCanEditPHPTZ=Noteikt atšķirīgu PHP laika joslu (nav obligāti), jūs varat mēģināt, lai pievienotu failu htacces ar līniju, piemēram, šīs "setenv TZ Eiropa / Paris" OSEnv=OS Vide @@ -169,8 +169,8 @@ NoBackupFileAvailable=Nav rezerves kopiju faili pieejami ExportMethod=Eksportēšanas veids ImportMethod=Importēšanas veids ToBuildBackupFileClickHere=Lai izveidotu rezerves kopiju noklikšķiniet šeit . -ImportMySqlDesc=Importēt dublējuma failu, jums ir izmantot mysql komandu no komandrindas: -ImportPostgreSqlDesc=Importēt dublējuma failu, jums ir jāizmanto pg_restore komandu no komandrindas: +ImportMySqlDesc=Lai importētu rezerves kopijas failu, jums ir jāizmanto mysql komandas komandrinda: +ImportPostgreSqlDesc=Lai importētu rezerves kopijas failu, jums ir jāizmanto pg_restore komandu komandrindā: ImportMySqlCommand=%s %s < manarezerveskopija.sql ImportPostgreSqlCommand=%s %s mybackupfails.sql FileNameToGenerate=Faila nosaukumu kuru izveido @@ -219,9 +219,10 @@ AutomaticIfJavascriptDisabled=Automātiski, ja Javascript ir atslēgts AvailableOnlyIfJavascriptNotDisabled=Pieejams tikai tad, ja JavaScript nav atslēgts AvailableOnlyIfJavascriptAndAjaxNotDisabled=Pieejams tikai tad, ja JavaScript nav atslēgts Required=Nepieciešams +UsedOnlyWithTypeOption=Used by some agenda option only Security=Drošība Passwords=Paroles -DoNotStoreClearPassword=Vai nav veikals skaidri paroles datu bāzē, bet veikalā tikai šifrēta vērtība (aktivētā ieteicams) +DoNotStoreClearPassword=Neglabāt nešifrētas paroles datubāzē bet izmantot šifrētas (aktivizācija ieteicama) MainDbPasswordFileConfEncrypted=Datubāzes paroli šifrēti conf.php (aktivēt ieteicams) InstrucToEncodePass=Lai iegūtu paroli, iekodētas conf.php failu, nomainiet līnija
$ Dolibarr_main_db_pass = "..."
līdz
$ Dolibarr_main_db_pass = "crypted: %s" InstrucToClearPass=Lai iegūtu paroli, dekodēt (skaidri) uz conf.php failu, nomainiet līnija
$ Dolibarr_main_db_pass = "crypted: ..."
līdz
$ Dolibarr_main_db_pass = "%s" @@ -307,7 +308,7 @@ GenericMaskCodes4a=Piemērs par 99. %s trešās puses Thecompany darīts 2007 GenericMaskCodes4b=Piemērs trešā persona veidota 2007-03-01:
GenericMaskCodes4c=Piemērs produkts veidots 2007-03-01:
GenericMaskCodes5=ABC {gggg} {mm} - {000000} dos ABC0701-000099
{0000 +100 @ 1}-ZZZ / {dd} / XXX dos 0199-ZZZ/31/XXX -GenericNumRefModelDesc=Atgriež pielāgojamu numuru atbilstoši noteiktai masku. +GenericNumRefModelDesc=Atgriež pielāgojamu numuru atbilstoši noteiktajai maskai. ServerAvailableOnIPOrPort=Serveris ir pieejams adresē %s ports %s ServerNotAvailableOnIPOrPort=Serveris nav pieejams adresē %s ports %s DoTestServerAvailability=Pārbaudīt servera savienojumu @@ -584,9 +585,6 @@ Permission92=Izveidot/labot sociālās iemaksas un PVN Permission93=Dzēst sociālās iemaksas un PVN Permission94=Eksportēt sociālās iemaksas Permission95=Lasīt atskaites -Permission96=Nosūtīšanas iestatīšana -Permission97=Lasīt rēķina grāmatvedību nosūtīšana -Permission98=Nosūtīšanas rēķinu grāmatvedības līnijas Permission101=Lasīt sūtījumus Permission102=Izveidot/mainīt sūtījumus Permission104=Apstiprināt sūtījumus @@ -670,7 +668,7 @@ Permission281=Lasīt kontaktus Permission282=Izveidot/mainīt kontaktus Permission283=Dzēst kontaktus Permission286=Eksportēt kontaktus -Permission291=Lasīt tarifus +Permission291=Skatīt tarifus Permission292=Kas atļaujas par tarifiem Permission293=Modificēt klientiem tarifus Permission300=Lasīt svītrkodus @@ -822,7 +820,7 @@ LocalTax2IsNotUsedExampleES= Spānijā tie Bussines neattiecas uz nodokļu sist CalcLocaltax=Atskaites CalcLocaltax1ES=Pārdošana - Iepirkumi CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2ES=Pirkumi CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases CalcLocaltax3ES=Pārdošana CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales @@ -873,7 +871,7 @@ SummarySystem=Sistēmas informācijas kopsavilkums SummaryConst=Sarakstu ar visiem Dolibarr uzstādīšanas parametriem SystemUpdate=Sistēmas atjaunināšana SystemSuccessfulyUpdate=Jūsu sistēma ir atjaunināta veiksmīgi -MenuCompanySetup=Kompānija / Foundation +MenuCompanySetup=Kompānija/Organizācija MenuNewUser=Jauns lietotājs MenuTopManager=Top menu vadītājs MenuLeftManager=Kreisā izvēlne vadītājs @@ -972,13 +970,13 @@ MiscellaneousDesc=Definēt šeit visus citus parametrus, kas saistīti ar droš LimitsSetup=Ierobežojumi / Precision iestatīšanas LimitsDesc=Jūs varat noteikt limitus, precizējumus un optimizācijas, kas izmantotas ar Dolibarr šeit MAIN_MAX_DECIMALS_UNIT=Maksimālais ciparu skaits aiz komata cenām -MAIN_MAX_DECIMALS_TOT=Max decimāldaļas attiecībā uz kopējo cenu +MAIN_MAX_DECIMALS_TOT=Maksimālās decimāldaļas kopējai cenai MAIN_MAX_DECIMALS_SHOWN=Max aiz komata par cenām parādīta ekrānā (Add ... pēc šo numuru, ja jūs vēlaties redzēt ... kad numurs tiek apcirsti, kad redzams uz ekrāna) MAIN_DISABLE_PDF_COMPRESSION=Izmantot PDF saspiešanu izveidotajiem PDF failiem. MAIN_ROUNDING_RULE_TOT= Izmērs noapaļošanas diapazons (par retajām valstīm, kur noapaļošana tiek darīts uz kaut ko citu par 10 bāzes) UnitPriceOfProduct=Neto vienības produkta cena TotalPriceAfterRounding=Kopējā cena (neto/pvn/ar nodokli) pēc noapaļošanas -ParameterActiveForNextInputOnly=Parametrs spēkā nākamās ievades tikai +ParameterActiveForNextInputOnly=Parametrs stājas spēkā no nākamās ievades NoEventOrNoAuditSetup=Nav drošības pasākums ir ierakstīta vēl. Tas var būt normāls, ja audits nav iespējots uz "Setup - drošība - revīzijas" lapā. NoEventFoundWithCriteria=Nav drošības pasākums ir atzīts par šādiem meklēšanas kritērijiem ir. SeeLocalSendMailSetup=Skatiet sendmail iestatījumus @@ -998,7 +996,7 @@ WeekStartOnDay=Pirmā nedēļas diena RunningUpdateProcessMayBeRequired=Running jaunināšanas procesu, šķiet, ir nepieciešams (Programmas versija %s atšķiras no bāzes versijas %s) YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no komandrindas pēc pieteikšanās uz apvalks ar lietotāju %s, vai jums ir pievienot-W iespēju beigās komandrindas, lai sniegtu %s paroli. YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP -DownloadMoreSkins=Vairāk ādas, lai lejupielādētu +DownloadMoreSkins=Vairāki izskati lejupielādei SimpleNumRefModelDesc=Atgriež atsauces numuru formātā %syymm-NNNN kur yy ir gads, MM ir mēnesis, un nnnn ir secība bez cauruma un bez reset ShowProfIdInAddress=Rādīt professionnal id ar adresēm par dokumentu ShowVATIntaInAddress=Slēpt PVN Intra num ar adresēm uz dokumentiem @@ -1514,7 +1512,7 @@ SuppliersCommandModel=Pilnīga veidni no piegādātāja secībā (logo. ..) SuppliersInvoiceModel=Pilnīga veidni no piegādātāja rēķina (logo. ..) SuppliersInvoiceNumberingModel=Piegādātāju rēķinu numerācijas modeļus ##### GeoIPMaxmind ##### -GeoIPMaxmindSetup=GeoIP MaxMind modulis iestatīšana +GeoIPMaxmindSetup=GeoIP MaxMind moduļa iestatīšana PathToGeoIPMaxmindCountryDataFile=Ceļš uz failu, kas satur MaxMind ip uz valsti tulkojumu.
Piemēri:
/ Usr / local / share / GeoIP / GeoIP.dat
/ Usr / share / GeoIP / GeoIP.dat NoteOnPathLocation=Ņemiet vērā, ka jūsu ip uz valsts datu failā jābūt iekšā direktoriju jūsu PHP var lasīt (uz Jūsu PHP open_basedir iestatīšanu un filesystem atļaujas). YouCanDownloadFreeDatFileTo=Jūs varat lejupielādēt bezmaksas demo versiju MaxMind GeoIP valsts failu no %s. diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang index b3417c6224b..5a18b50c2c7 100644 --- a/htdocs/langs/lv_LV/agenda.lang +++ b/htdocs/langs/lv_LV/agenda.lang @@ -2,14 +2,15 @@ IdAgenda=Notikuma ID Actions=Notikumi ActionsArea=Pasākumi sadaļa (notikumi un uzdevumi) -Agenda= Darba kārtība -Agendas= Darba kārtības -Calendar= Kalendārs -Calendars= Kalendāri -LocalAgenda=Lokālais kalendārs +Agenda=Darba kārtība +Agendas=Darba kārtības +Calendar=Kalendārs +Calendars=Kalendāri +LocalAgenda=Iekšējais kalendārs +ActionsOwnedBy=Event owned by AffectedTo=Piešķirts DoneBy=Izdarījis -Event=Event +Event=Notikums Events=Notikumi EventsNb=Notikumu skaits MyEvents=Mani notikumi @@ -22,10 +23,10 @@ MenuToDoActions=Visi nepabeigtie pasākumi MenuDoneActions=Visi izbeigtie notikumi MenuToDoMyActions=Mani nepabeigtie notikumi MenuDoneMyActions=Mani izbeigtie notikumi -ListOfEvents=Dolibarr notikumu saraksts +ListOfEvents=Notikumi (iekšējais kalendārs) ActionsAskedBy=Notikumu ziņoja ActionsToDoBy=Pasākums piešķirts -ActionsDoneBy=Pasākumi, ko veikušas +ActionsDoneBy=Pasākumi, ko veikuši ActionsForUser=Lietotāja notikumi ActionsForUsersGroup=Notikumi visiem grupas lietotājiem AllMyActions= Visi mani notikumi/uzdevumi @@ -35,7 +36,7 @@ ViewCal=Mēneša skats ViewDay=Dienas skats ViewWeek=Nedēļas skats ViewPerUser=Per user view -ViewWithPredefinedFilters= Skatīt ar iepriekš filtriem +ViewWithPredefinedFilters= Skatīt ar iepriekš definētiem filtriem AutoActions= Automātiskā aizpildīšana AgendaAutoActionDesc= Noteikt šeit notikumus, par kuriem vēlaties Dolibarr izveidot automātiski Notikuma kārtībā. Ja nekas netiks pārbaudīts (pēc noklusējuma), tikai manuālā pasākumi tiks iekļauti darba kārtībā. AgendaSetupOtherDesc= Šī lapa sniedz iespējas, lai ļautu eksportēt savu Dolibarr notikumiem uz ārēju kalendāru (Thunderbird, Google Calendar, ...) @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL, lai piekļūtu. ICal failam ExtSiteNoLabel=Nav Apraksta WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang index 5cdf17d6e48..8a698934629 100644 --- a/htdocs/langs/lv_LV/banks.lang +++ b/htdocs/langs/lv_LV/banks.lang @@ -63,7 +63,7 @@ Debts=Parādi LabelBankCashAccount=Banka vai naudas nosaukums AccountType=Konta veids BankType0=Krājkonts -BankType1=Pašreizējā vai kredītkartes konta +BankType1=Pašreizējais vai kredītkartes konts BankType2=Skaidras naudas konts IfBankAccount=Ja bankas konts AccountsArea=Kontu sadaļa @@ -73,16 +73,16 @@ ConfirmDeleteAccount=Vai tiešām vēlaties dzēst šo kontu? Account=Konts ByCategories=Pēc kategorijām ByRubriques=Pēc kategorijām -BankTransactionByCategories=Bankas darījumi pa kategorijām -BankTransactionForCategory=Bankas darījumi kategorijas %s +BankTransactionByCategories=Bankas darījumi pa sadaļām +BankTransactionForCategory=Bankas darījumi sadaļai %s RemoveFromRubrique=Noņemt saiti ar sadaļu -RemoveFromRubriqueConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījuma un kategorijā? +RemoveFromRubriqueConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījumu un kategoriju? ListBankTransactions=Saraksts ar bankas darījumiem IdTransaction=Darījuma ID BankTransactions=Banku darījumi SearchTransaction=Meklēt darījumu ListTransactions=Darījumu saraksts -ListTransactionsByCategory=Saraksts darījuma / kategorija +ListTransactionsByCategory=Saraksts darījuma / sadaļa TransactionsToConciliate=Darījumi, lai saskaņotu Conciliable=Var saskaņot Conciliate=Samierināt @@ -135,9 +135,9 @@ Graph=Grafiks ExportDataset_banque_1=Banku darījumi un konta izraksts ExportDataset_banque_2=Deposit slip TransactionOnTheOtherAccount=Pārskaitījums uz otru kontu -TransactionWithOtherAccount=Konta pārsūtīšana +TransactionWithOtherAccount=Konta pārskaitījumi PaymentNumberUpdateSucceeded=Maksājuma numurs atjaunināts veiksmīgi -PaymentNumberUpdateFailed=Maksājumu skaits nevar atjaunināt +PaymentNumberUpdateFailed=Maksājumu numuru nevar atjaunināt PaymentDateUpdateSucceeded=Maksājuma datums atjaunināt veiksmīgi PaymentDateUpdateFailed=Maksājuma datumu nevar atjaunināt Transactions=Darījumi diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang index acb2aba4570..cb87cac35a7 100644 --- a/htdocs/langs/lv_LV/bills.lang +++ b/htdocs/langs/lv_LV/bills.lang @@ -182,14 +182,14 @@ AmountOfBillsByMonthHT=Summa rēķini mēnesī (neto pēc nodokļiem) ShowSocialContribution=Rādīt sociālās iemaksas ShowBill=Rādīt rēķinu ShowInvoice=Rādīt rēķinu -ShowInvoiceReplace=Rādīt aizstājot rēķinu +ShowInvoiceReplace=Rādīt aizstājošo rēķinu ShowInvoiceAvoir=Rādīt kredīta piezīmi ShowInvoiceDeposit=Rādīt depozīta rēķinu ShowPayment=Rādīt maksājumu File=Fails AlreadyPaid=Jau samaksāts AlreadyPaidBack=Jau atgriezta nauda -AlreadyPaidNoCreditNotesNoDeposits=Jau izmaksātās (bez kredīta piezīmes un noguldījumu) +AlreadyPaidNoCreditNotesNoDeposits=Jau samaksāts (bez kredīta piezīmes un noguldījumiem) Abandoned=Pamests RemainderToPay=Atlikums, kas jāsamaksā RemainderToTake=Atlikums veikt @@ -268,7 +268,7 @@ ReasonDiscount=Iemesls DiscountOfferedBy=Piešķir DiscountStillRemaining=Atlaides vēl atlikušas DiscountAlreadyCounted=Atlaides jau ir skaitītas -BillAddress=Bill adrese +BillAddress=Rēķina adrese HelpEscompte=Šī atlaide ir atlaide piešķirta, lai klientam, jo ​​tās maksājums tika veikts pirms termiņa. HelpAbandonBadCustomer=Šī summa ir pamests (klients teica, ka slikts klients), un tiek uzskatīts par ārkārtēju zaudēt. HelpAbandonOther=Šī summa ir atteikusies, jo tā bija kļūda (nepareizs klients vai rēķins aizstāt ar citiem, piemēram) diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang index 907c9a9f58b..48eed47a280 100644 --- a/htdocs/langs/lv_LV/boxes.lang +++ b/htdocs/langs/lv_LV/boxes.lang @@ -63,8 +63,8 @@ ClickToAdd=Klikšķiniet šeit, lai pievienotu. NoRecordedCustomers=Nav ierakstīti klienti NoRecordedContacts=Nav ierakstītie kontakti NoActionsToDo=Nav nevienas darbības ko darīt -NoRecordedOrders=Nav ierakstīti klienta-u pasūtījumi -NoRecordedProposals=Nav ierakstītie priekšlikumi +NoRecordedOrders=Nav klientu pasūtījumu +NoRecordedProposals=Nav saglabātu priekšlikumu NoRecordedInvoices=Nav reģistrētu klientu rēķini NoUnpaidCustomerBills=Nav neapmaksātu klienta'u rēķinu NoRecordedSupplierInvoices=Bez reģistrētas piegādātāja rēķinus @@ -73,11 +73,11 @@ NoModifiedSupplierBills=Nav ierakstīti piegādātāja-u rēķini NoRecordedProducts=Nav ierakstīti produkti/pakalpojumi NoRecordedProspects=Nav ierakstītie perspektīvas NoContractedProducts=Nav produktu / pakalpojumu līgumi -NoRecordedContracts=Nav ierakstītie līgumi +NoRecordedContracts=Nav saglabātu līgumu NoRecordedInterventions=Nav ierakstītie pasākumi BoxLatestSupplierOrders=Jaunākie piegādātāja pasūtījumi BoxTitleLatestSupplierOrders=%s jaunākie piegādātāju pasūtījumi -NoSupplierOrder=Nav reģistrēts piegādātājs, lai +NoSupplierOrder=Nav ierakstītu piegādātāju pasūtījumu BoxCustomersInvoicesPerMonth=Klientu rēķini mēnesī BoxSuppliersInvoicesPerMonth=Piegādātājs rēķini mēnesī BoxCustomersOrdersPerMonth=Klientu pasūtījumi mēnesī diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang index 6fba1d35f6f..3337dc5b403 100644 --- a/htdocs/langs/lv_LV/categories.lang +++ b/htdocs/langs/lv_LV/categories.lang @@ -1,10 +1,10 @@ # Dolibarr language file - Source file is en_US - categories -Category=Kategorija -Categories=Kategorijas -Rubrique=Kategorija -Rubriques=Kategorijas -categories=kategorijas -TheCategorie=Kategorija +Category=Sadaļa +Categories=Sadaļas +Rubrique=Sadaļa +Rubriques=Sadaļas +categories=sadaļas +TheCategorie=Sadaļa NoCategoryYet=No category šī radīja veida In=Uz AddIn=Pievienot @@ -16,12 +16,12 @@ SuppliersCategoriesArea=Piegādātāju sadaļa CustomersCategoriesArea=Klientu sadaļa ThirdPartyCategoriesArea=Trešo personu sadaļa MembersCategoriesArea=Dalībnieku sadaļa -ContactsCategoriesArea=Kontakti kategorijas platība -MainCats=Galvenās kategorijas +ContactsCategoriesArea=Kontaktu sadaļa +MainCats=Galvenās sadaļas SubCats=Apakšsadaļas CatStatistics=Statistika CatList=Sadaļu saraksts -AllCats=Visas kategorijas +AllCats=Visas sadaļas ViewCat=Skatīt sadaļu NewCat=Pievienot sadaļu NewCategory=Jauna sadaļa @@ -34,7 +34,7 @@ NoSubCat=Nav apakšsadaļas. SubCatOf=Apakšsadaļa FoundCats=Atrastās sadaļas FoundCatsForName=Sadaļas atrastas ar nosaukumu: -FoundSubCatsIn=Apakškategorijas atrasts kategorijā +FoundSubCatsIn=Apakšsadaļas atrastas sadaļā ErrSameCatSelected=Izvēlējāties to pašu sadaļu vairākas reizes ErrForgotCat=Jūs aizmirsāt izvēlēties sadaļu ErrForgotField=Jūs aizmirsāt, lai informētu laukus @@ -46,9 +46,9 @@ WasAddedSuccessfully=%s tika veiksmīgi pievienots. ObjectAlreadyLinkedToCategory=Elements ir jau saistīts ar šo sadaļu. CategorySuccessfullyCreated=Šī sadaļa %s ir pievienota veiksmīgi. ProductIsInCategories=Produkts / pakalpojums pieder pie šādām kategorijām -SupplierIsInCategories=Trešai personai pieder pie pēc piegādātājiem kategorijas +SupplierIsInCategories=Trešai personai pieder sekojoša piegādātāju sadaļas CompanyIsInCustomersCategories=Šī trešā persona pieder pie šādiem klientiem / perspektīvas kategorijām -CompanyIsInSuppliersCategories=Šī trešā persona pieder, lai pēc piegādātājiem kategorijas +CompanyIsInSuppliersCategories=Šī trešā persona pieder, lai pēc piegādātājiem sadaļas MemberIsInCategories=Šis dalībnieks ir šādās dalībnieku sadaļās ContactIsInCategories=Šī kontaktpersona pieder pie šādiem kontaktiem kategorijām ProductHasNoCategory=Šis produkts/pakalpojums nav nevienā sadaļā @@ -74,15 +74,15 @@ RemoveFromCategoryConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti st NoCategoriesDefined=Nav izveidotu sadaļu SuppliersCategoryShort=Piegādātāju sadaļa CustomersCategoryShort=Klientu sadaļa -ProductsCategoryShort=Produktu kategorija +ProductsCategoryShort=Produktu sadaļa MembersCategoryShort=Dalībnieku sadaļa SuppliersCategoriesShort=Piegādātāju sdaļas CustomersCategoriesShort=Klientu sadaļas -CustomersProspectsCategoriesShort=Custo / prosp.. kategorijas +CustomersProspectsCategoriesShort=Custo / prosp. sadaļas ProductsCategoriesShort=Produktu sadaļas MembersCategoriesShort=Dalībnieku sadaļas -ContactCategoriesShort=Kontakti kategorijas -ThisCategoryHasNoProduct=Šī kategorija nesatur produktu. +ContactCategoriesShort=Kontaktu sadaļas +ThisCategoryHasNoProduct=Šī sadaļā nav produktu. ThisCategoryHasNoSupplier=Šajā sadaļā nav neviena piegādātāja. ThisCategoryHasNoCustomer=Šī sadaļa nesatur klientu. ThisCategoryHasNoMember=Šajā sadaļaā nav neviena dalībnieka. @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Sadaļas iestatījumi CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang index 66578e97d99..efb066851ea 100644 --- a/htdocs/langs/lv_LV/companies.lang +++ b/htdocs/langs/lv_LV/companies.lang @@ -240,7 +240,7 @@ VATIntraSyntaxIsValid=Sintakse ir pareiza VATIntraValueIsValid=Vērtība ir pareizas ProspectCustomer=Prospect / Klients Prospect=Perspektīva -CustomerCard=Klienta karte +CustomerCard=Klienta kartiņa Customer=Klients CustomerDiscount=Klienta Atlaide CustomerRelativeDiscount=Relatīvā klienta atlaide @@ -339,7 +339,7 @@ PL_HIGH=Augsts TE_UNKNOWN=- TE_STARTUP=Starta TE_GROUP=Liels uzņēmums -TE_MEDIUM=Vidēja uzņēmums +TE_MEDIUM=Vidējs uzņēmums TE_ADMIN=Valsts iestāde TE_SMALL=Mazs uzņēmums TE_RETAIL=Mazumtirgotājs @@ -382,7 +382,7 @@ NewDeliveryAddress=Jauna piegādes adrese AddDeliveryAddress=Pievienot adresi AddAddress=Pievienot adresi NoOtherDeliveryAddress=Nav definēta alternatīva piegādes adrese -SupplierCategory=Piegādātāja kategorija +SupplierCategory=Piegādātāja sadaļa JuridicalStatus200=Neatkarīgs DeleteFile=Izdzēst failu ConfirmDeleteFile=Vai jūs tiešām vēlaties izdzēst šo failu? @@ -397,10 +397,10 @@ YouMustCreateContactFirst=Jums ir izveidot e-pastus kontaktus trešās puses vis ListSuppliersShort=Piegādātāju saraksts ListProspectsShort=Saraksts perspektīvas ListCustomersShort=Klientu saraksts -ThirdPartiesArea=Trešo personu sadaļa -LastModifiedThirdParties=Pēdējās %s modificētāss trešās personas +ThirdPartiesArea=Third parties and contact area +LastModifiedThirdParties=Pēdējās %s labotās trešās personas UniqueThirdParties=Kopējās unikālās trešās personas -InActivity=Atvērt +InActivity=Atvērts ActivityCeased=Slēgts ActivityStateFilter=Aktivitātes statuss ProductsIntoElements=Preču saraksts %s @@ -410,3 +410,5 @@ OutstandingBillReached=Sasniedza maks. par izcilu rēķinu MonkeyNumRefModelDesc=Atgriešanās Numero ar formātu %syymm-NNNN par klientu kodu un %syymm-NNNN forsupplier kodu, kur gg ir gads, MM ir mēnesis, un nnnn ir secība bez pārtraukuma un bez atgriezties 0. LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā. ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang index 86edd4a2e0e..21c2433e46d 100644 --- a/htdocs/langs/lv_LV/compta.lang +++ b/htdocs/langs/lv_LV/compta.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - compta Accountancy=Grāmatvedība -AccountancyCard=Grāmatvedība karte +AccountancyCard=Grāmatvedības kartiņa Treasury=Valsts kase MenuFinancial=Finansu TaxModuleSetupToModifyRules=Iet uz Nodokļi moduļa uzstādīšanas mainīt aprēķināšanas noteikumus @@ -106,7 +106,7 @@ ByUserAuthorOfInvoice=Ar rēķinu autors AccountancyExport=Grāmatvedība eksports ErrorWrongAccountancyCodeForCompany=Bad klienta grāmatvedības kodu %s SuppliersProductsSellSalesTurnover=Radītais apgrozījums, ko no piegādātāja produkcijas pārdošanas. -CheckReceipt=Pārbaudiet depozītu +CheckReceipt=Čeka depozīts CheckReceiptShort=Pārbaudīt depozītu NewCheckReceipt=Jauna atlaide NewCheckDeposit=Jauns pārbaude depozīts @@ -161,7 +161,7 @@ RulesVATDueProducts=- Par materiālo vērtību, tas ietver PVN rēķinus, pamato OptionVatInfoModuleComptabilite=Piezīme: materiālo aktīvu, tai vajadzētu izmantot dzemdību datumu ir vairāk godīgi. PercentOfInvoice=%%/Rēķins NotUsedForGoods=Nav izmantots precēm -ProposalStats=Statistika par priekšlikumiem +ProposalStats=Priekšlikumu statistika OrderStats=Pastūtījumu statistika InvoiceStats=Rēķinu statistika Dispatch=Nosūtīšana @@ -187,7 +187,7 @@ AccountancyDashboard=Grāmatvedība kopsavilkums ByProductsAndServices=Ar precēm un pakalpojumiem RefExt=Ārējā ref ToCreateAPredefinedInvoice=Lai izveidotu iepriekš rēķinu, izveidot standarta rēķinu, tad, bez apstiprinot to, noklikšķiniet uz pogas "Konvertēt uz iepriekš rēķinu". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Pārrēķināt Mode1=Metode 1 Mode2=Metode 2 @@ -202,5 +202,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Grāmatvedība kods pēc noklusējuma klientu thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Grāmatvedība kods pēc noklusējuma piegādātāja thirdparties +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang index 8a77b2f5e62..44268727261 100644 --- a/htdocs/langs/lv_LV/contracts.lang +++ b/htdocs/langs/lv_LV/contracts.lang @@ -3,18 +3,18 @@ ContractsArea=Līgumu sadaļa ListOfContracts=Līgumu sarakstu LastContracts=Pēdējās %s modificēts līgumus AllContracts=Visi līgumi -ContractCard=Līgums karte +ContractCard=Līguma kartiņa ContractStatus=Līgums statuss ContractStatusNotRunning=Nedarbojas ContractStatusRunning=Darbojas ContractStatusDraft=Projekts -ContractStatusValidated=Validēta +ContractStatusValidated=Apstiprināts ContractStatusClosed=Slēgts ServiceStatusInitial=Nedarbojas -ServiceStatusRunning=Ekspluatācijas -ServiceStatusNotLate=Skriešana, nav beidzies +ServiceStatusRunning=Darbojas +ServiceStatusNotLate=Darbojas, nav beidzies ServiceStatusNotLateShort=Nav beidzies -ServiceStatusLate=Skriešana, beidzās +ServiceStatusLate=Darbojas, beidzies ServiceStatusLateShort=Beidzies ServiceStatusClosed=Slēgts ServicesLegend=Pakalpojumu apraksts @@ -23,7 +23,7 @@ Contract=Līgums NoContracts=Nav līgumi MenuServices=Pakalpojumi MenuInactiveServices=Pakalpojumi, kas nav aktīvi -MenuRunningServices=Running pakalpojumi +MenuRunningServices=Darbojošies pakalpojumi MenuExpiredServices=Beigušies pakalpojumi MenuClosedServices=Slēgtie pakalpojumi NewContract=Jaunu līgumu @@ -67,7 +67,7 @@ DateStartReal=Real sākuma datums DateStartRealShort=Real sākuma datums DateEndReal=Real beigu datums DateEndRealShort=Real beigu datums -NbOfServices=Nb pakalpojumu +NbOfServices=Pakalpojumu skaits CloseService=Aizvērt pakalpojumu ServicesNomberShort=%s pakalpojums(-i) RunningServices=Darbojošies pakalpojumi diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang index 68586a09cfb..cca8d25e5af 100644 --- a/htdocs/langs/lv_LV/cron.lang +++ b/htdocs/langs/lv_LV/cron.lang @@ -17,7 +17,7 @@ FileToLaunchCronJobs=Komandrindas uzsākt cron darbavietas CronExplainHowToRunUnix=Par Unix vidē, jums vajadzētu izmantot crontab palaist komandrindas viena otras minūtes CronExplainHowToRunWin=Microsoft (tm), Windows environement jūs varat izmantot regulāro uzdevums rīkus, lai palaistu komandrindas viena otras minūtes # Menu -CronJobs=Plānotais darba vietas +CronJobs=Plānotie darbi CronListActive= Aktīvo darbu saraksts CronListInactive= Saraksts ar invaliditāti darba vietas CronListActive= Aktīvo darbu saraksts @@ -45,7 +45,7 @@ CronClass=Klase CronMethod=Metode CronModule=Modulis CronAction=Darbība -CronStatus=Status +CronStatus=Statuss CronStatusActive=Ieslēgts CronStatusInactive=Bloķēts CronNoJobs=Nav reģistrētu darbu @@ -53,10 +53,10 @@ CronPriority=Prioritāte CronLabel=Apraksts CronNbRun=Nb. sākt CronEach=Katru -JobFinished=Darba uzsākta un pabeigta +JobFinished=Darbs uzsākts un pabeigts #Page card CronAdd= Pievienot darbu -CronHourStart= Starta laiks un uzdevuma datumu +CronHourStart= Starta laiks un uzdevuma datums CronEvery= Un izpildīt uzdevumu katrā CronObject= Instances / Object, lai radītu CronArgs=Parametri diff --git a/htdocs/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang index 20d22986f1d..c42f8b91f05 100644 --- a/htdocs/langs/lv_LV/dict.lang +++ b/htdocs/langs/lv_LV/dict.lang @@ -290,15 +290,17 @@ CurrencySingXOF=CFA Franc BCEAO CurrencyXPF=KZP franki CurrencySingXPF=CFP Franc CurrencyCentSingEUR=cents +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=tūkstošais #### Input reasons ##### DemandReasonTypeSRC_INTE=Internets -DemandReasonTypeSRC_CAMP_MAIL=Pasta kampaņu -DemandReasonTypeSRC_CAMP_EMAIL=Pasta vēstuļu sūtīšanas kampaņu +DemandReasonTypeSRC_CAMP_MAIL=Pasta kampaņa +DemandReasonTypeSRC_CAMP_EMAIL=E-pasta vēstuļu sūtīšanas kampaņa DemandReasonTypeSRC_CAMP_PHO=Tālruņa kampaņa DemandReasonTypeSRC_CAMP_FAX=Faksa kampaņa -DemandReasonTypeSRC_COMM=Commercial kontakts -DemandReasonTypeSRC_SHOP=Veikals kontakts +DemandReasonTypeSRC_COMM=Komerciālais kontakts +DemandReasonTypeSRC_SHOP=Veikala kontakts DemandReasonTypeSRC_WOM=No mutes mutē DemandReasonTypeSRC_PARTNER=Partneris DemandReasonTypeSRC_EMPLOYEE=Darbinieks diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang index 8b15c7b5fc6..8eeef8d3755 100644 --- a/htdocs/langs/lv_LV/donations.lang +++ b/htdocs/langs/lv_LV/donations.lang @@ -15,18 +15,19 @@ DonationsReceived=Ziedojumi saņemti PublicDonation=Sabiedrības ziedojums DonationsNumber=Ziedojuma numurs DonationsArea=Ziedojumu sadaļa -DonationStatusPromiseNotValidated=Projekts solījumu +DonationStatusPromiseNotValidated=Sagataves solījums DonationStatusPromiseValidated=Apstiprinātas solījumu -DonationStatusPaid=Ziedojums saņemti +DonationStatusPaid=Ziedojums saņemts DonationStatusPromiseNotValidatedShort=Melnraksts -DonationStatusPromiseValidatedShort=Validēta +DonationStatusPromiseValidatedShort=Apstiprināts DonationStatusPaidShort=Saņemti ValidPromess=Apstiprināt solījumu -DonationReceipt=Ziedojums saņemšana -BuildDonationReceipt=Veidot saņemšanu +DonationReceipt=Ziedojuma kvīts +BuildDonationReceipt=Veidot kvīti DonationsModels=Dokumenti modeļi ziedojumu ieņēmumiem LastModifiedDonations=Pēdējie %s labotie ziedojumi SearchADonation=Meklēt ziedojumu DonationRecipient=Ziedojuma saņēmējs ThankYou=Paldies IConfirmDonationReception=Saņēmējs atzīt saņemšanu, kā ziedojums, par šādu summu +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang index ec8036bb5fc..569a9cb69d3 100644 --- a/htdocs/langs/lv_LV/ecm.lang +++ b/htdocs/langs/lv_LV/ecm.lang @@ -8,7 +8,7 @@ DocsContracts=Līgumu dokumenti DocsProposals=Dokumenti priekšlikumi DocsOrders=Dokumenti pasūtījumi DocsInvoices=Dokumenti rēķini -ECMNbOfDocs=Nb Dokumentu katalogs +ECMNbOfDocs=Dokumentu skaits sadaļā ECMNbOfDocsSmall=Nb doc. ECMSection=Katalogs ECMSectionManual=Manuālā sadaļa diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang index c65bd32673f..c0a9555b153 100644 --- a/htdocs/langs/lv_LV/errors.lang +++ b/htdocs/langs/lv_LV/errors.lang @@ -22,7 +22,7 @@ ErrorFailedToDeleteJoinedFiles=Nevar izdzēst vide, jo tur ir daži pievienojās ErrorThisContactIsAlreadyDefinedAsThisType=Šī kontaktpersona jau ir definēts kā kontaktpersona šāda veida. ErrorCashAccountAcceptsOnlyCashMoney=Šis bankas konts ir naudas konts, lai tā pieņem maksājumus no veida tikai skaidrā naudā. ErrorFromToAccountsMustDiffers=Avots un mērķiem banku kontiem jābūt atšķirīgai. -ErrorBadThirdPartyName=Slikti vērtība trešo personu vārda +ErrorBadThirdPartyName=Nepareiza vērtība trešo personu nosaukumā ErrorProdIdIsMandatory=%s ir obligāti ErrorBadCustomerCodeSyntax=Nepareiza klienta koda sintakse ErrorBadBarCodeSyntax=Nepareiza sintakse svītrukodam @@ -59,7 +59,7 @@ ErrorNoTmpDir=Pagaidu direktorija %s neeksistē. ErrorUploadBlockedByAddon=Augšupielāde bloķēja ar PHP/Apache spraudni. ErrorFileSizeTooLarge=Faila izmērs ir pārāk liels. ErrorSizeTooLongForIntType=Izmērs ir pārāk garš int tipam (%s cipari maksimums) -ErrorSizeTooLongForVarcharType=Izmērs ir pārāk ilgi stīgu tipu (%s simboli maksimums) +ErrorSizeTooLongForVarcharType=Izmērs ir pārāk garš (%s simboli maksimums) ErrorNoValueForSelectType=Lūdzu izvēlieties vērtību no saraksta ErrorNoValueForCheckBoxType=Lūdzu, aizpildiet vērtību rūtiņu sarakstā ErrorNoValueForRadioType=Lūdzu, aizpildiet vērtību radio pogu sarakstā @@ -77,8 +77,8 @@ ErrorRecordHasChildren=Neizdevās dzēst ierakstus, jo tas ir daži Childs. ErrorRecordIsUsedCantDelete=Nevar izdzēst ierakstu. Tas ir pievienots citam objektam. ErrorModuleRequireJavascript=Javascript nedrīkst tikt izslēgti, ka šī funkcija strādā. Lai aktivizētu / deaktivizētu Javascript, dodieties uz izvēlni Home-> Setup-> Display. ErrorPasswordsMustMatch=Abām ievadītām parolēm jāsakrīt -ErrorContactEMail=Tehniska kļūda. Lūdzu, sazinieties ar administratoru, lai pēc e-pasta %s en sniegt kļūdas kods %s jūsu ziņu, vai pat labāk, pievienojot ekrāna kopiju šajā lapā. -ErrorWrongValueForField=Nepareiza vērtība lauka numuru %s (vērtība "%s" nesakrīt regex noteikums %s) +ErrorContactEMail=Tehniska kļūda. Lūdzu, sazinieties ar administratoru pa sekojošu e-pastu %s, lai iesniegtu kļūdas kodu %s jūsu ziņojumā, vai labāk, pievienojot šīs lapas ekrāna. +ErrorWrongValueForField=Nepareiza vērtība lauka numuru %s (vērtība '%s' nesakrīt regex noteikums %s) ErrorFieldValueNotIn=Nepareiza vērtība lauka numura %s (vērtība "%s" nav vērtība, pieejams uz lauka %s galda %s) ErrorFieldRefNotIn=Nepareiza vērtība lauka numuru %s (vērtība "%s" nav %s esošo ref) ErrorsOnXLines=Kļūdas %s avota ierakstu (-s) @@ -92,20 +92,20 @@ ErrorBadMask=Kļūda masku ErrorBadMaskFailedToLocatePosOfSequence=Kļūda, maska ​​bez kārtas numuru ErrorBadMaskBadRazMonth=Kļūdas, slikta reset vērtība ErrorSelectAtLeastOne=Kļūda. Izvēlieties vismaz vienu ierakstu. -ErrorProductWithRefNotExist=Preces ar norādi "%s" neeksistē +ErrorProductWithRefNotExist=Preces ar atsauci '%s' neeksistē ErrorDeleteNotPossibleLineIsConsolidated=Izdzēst nav iespējams, jo ieraksts ir saistīts ar bankas darījumu summa, kas tiek conciliated ErrorProdIdAlreadyExist=%s piešķirta citai trešajai ErrorFailedToSendPassword=Neizdevās nosūtīt paroli ErrorFailedToLoadRSSFile=Nespēj iegūt RSS barotni. Centieties, lai pievienotu pastāvīgu MAIN_SIMPLEXMLLOAD_DEBUG ja kļūdu ziņojumi nesniedz pietiekamu informāciju. ErrorPasswordDiffers=Paroles atšķiras, lūdzu, ierakstiet tās atkal. ErrorForbidden=Pieeja liegta.
Jūs mēģināt piekļūt lapu, zonā vai funkciju nenonākot norakstu sesijā vai, kas nav atļauts jūsu lietotāja. -ErrorForbidden2=Atļauja šajā saitā var definēt ar savu Dolibarr administrators no izvēlnes %s-> %s. +ErrorForbidden2=Atļaujas šajā lapā var definēt Dolibarr administrators no izvēlnes %s->%s. ErrorForbidden3=Šķiet, ka Dolibarr netiek izmantota, izmantojot autentiskums sesiju. Ieskatieties Dolibarr uzstādīšanas dokumentācijas zināt, kā pārvaldīt apstiprinājumi (Htaccess, mod_auth vai citu ...). ErrorNoImagickReadimage=Klases Imagick nav atrodams šajā PHP. Priekšskatījums nav, var būt pieejamas. Administratori var atspējot šo uzlīmi no izvēlnes Setup - displejs. ErrorRecordAlreadyExists=Ieraksts jau eksistē ErrorCantReadFile=Neizdevās nolasīt failu '%s' ErrorCantReadDir=Neizdevās nolasīt katalogu '%s' -ErrorFailedToFindEntity=Neizdevās nolasīt Vide '%s' +ErrorFailedToFindEntity=Neizdevās nolasīt vidi '%s' ErrorBadLoginPassword=Nepareiza vērtība lietotājvārdam vai parolei ErrorLoginDisabled=Jūsu konts ir bloķēts ErrorFailedToRunExternalCommand=Neizdevās palaist ārēju komandu. Pārbaudiet, tas ir pieejams, un skrienams ar savu PHP servera. Ja PHP Safe Mode ir iespējots, pārbaudiet, vai komanda ir iekšā direktorijā noteiktajā parametru safe_mode_exec_dir. @@ -118,7 +118,7 @@ ErrorWebServerUserHasNotPermission=Lietotāja konts %s izmantot, lai veik ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive ErrNoZipEngine=Nav dzinēja unzip %s failu šajā PHP -ErrorFileMustBeADolibarrPackage=Failu %s jābūt Dolibarr zip paketi +ErrorFileMustBeADolibarrPackage=Failam %s jābūt Dolibarr zip ErrorFileRequired=Tas aizņem paketi Dolibarr failu ErrorPhpCurlNotInstalled=PHP CURL nav uzstādīts, tas ir svarīgi runāt ar Paypal ErrorFailedToAddToMailmanList=Neizdevās pievienot ierakstu %s, lai pastnieks saraksta %s vai SPIP bāze @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Kļūda, jūsu PHP ir jābūt moduli %s uzstādītas, ErrorOpenIDSetupNotComplete=Jūs uzstādīšana Dolibarr config failu, lai ļautu OpenID autentifikācijas, bet OpenID pakalpojuma URL nav definēts spēkā salīdzināmajās %s ErrorWarehouseMustDiffers=Avota un mērķa noliktavas jābūt atšķiras ErrorBadFormat=Nepareizs formāts -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Uzmanību, izmantojot šo lodziņu palēnināt nopie WarningClickToDialUserSetupNotComplete=Iestatīšana ClickToDial informāciju par jūsu lietotāja nav pilnīga (skat. tab ClickToDial uz jūsu lietotāja kartes). WarningNotRelevant=Nozīmes operācija šajā datu WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Iespēja bloķēta kad iestatījumi ir optimizēti aklai persionai vai teksta pārlūkprogrammām +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang index 5fca1b76a48..337f2aa5f39 100644 --- a/htdocs/langs/lv_LV/exports.lang +++ b/htdocs/langs/lv_LV/exports.lang @@ -29,11 +29,11 @@ FieldsOrder=Lauku secība FieldsTitle=Lauku nosaukums FieldOrder=Lauku kārtība FieldTitle=Lauka nosaukums -ChooseExportFormat=Izvēlieties eksporta formātu +ChooseExportFormat=Izvēlieties eksportēšanas formātu NowClickToGenerateToBuildExportFile=Tagad izvēlieties faila formātu Combo lodziņā un noklikšķiniet uz "Izveidot", lai izveidotu eksporta failu ... AvailableFormats=Pieejamie formāti LibraryShort=Bibliotēka -LibraryUsed=Bibliotēkas izmanto, +LibraryUsed=Izmantotā bibliotēka LibraryVersion=Versija Step=Solis FormatedImport=Importēšanas palīgs @@ -49,7 +49,7 @@ FileSuccessfullyBuilt=Eksporta fails izveidots SQLUsedForExport=SQL Pieprasījums izmanto, lai veidotu eksporta failu LineId=Līnijas id LineDescription=Līnijas apraksts -LineUnitPrice=Vienības cena līnijas +LineUnitPrice=Vienības cenas līnija LineVATRate=PVN likme līnijas LineQty=Daudzums līnijas LineTotalHT=Summa bez nodokļiem līnijas @@ -81,9 +81,9 @@ DoNotImportFirstLine=Neimportēt pirmo rindiņu no avota faila NbOfSourceLines=Līniju skaits avota failā NowClickToTestTheImport=Pārbaudiet importa rādītājus esat definējis. Ja tie ir pareizi, noklikšķiniet uz pogas "%s", lai palaistu simulāciju importa process (dati tiks mainīti jūsu datu bāzē, tas ir tikai simulācija uz brīdi) ... RunSimulateImportFile=Uzsākt importa simulāciju -FieldNeedSource=This field requires data from the source file +FieldNeedSource=Šim laukam nepieciešami dati no avota faila SomeMandatoryFieldHaveNoSource=Daži obligātie lauki nav avotu, no datu faila -InformationOnSourceFile=Informācija par avota failā +InformationOnSourceFile=Informācija avota failā InformationOnTargetTables=Informācija par mērķa laukiem SelectAtLeastOneField=Pārslēgt vismaz vienu avota lauku slejā jomās eksportēt SelectFormat=Izvēlieties šo importa failu formātu diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang index e4ac91f36d2..6580ca40ca2 100644 --- a/htdocs/langs/lv_LV/holiday.lang +++ b/htdocs/langs/lv_LV/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=CRV -Holidays=Brīvdienas -CPTitreMenu=Brīvdienas +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Ikmēneša paziņojums -MenuAddCP=Pieteikties brīvdienām -NotActiveModCP=Jums ir jābūt ieslēgtam modulim brīvdienas, lai apskatītu šo lapu. -NotConfigModCP=Jums ir konfigurēt modulis brīvdienas, lai apskatītu šo lapu. Lai to izdarītu, noklikšķiniet šeit . -NoCPforUser=Jums nav pieprasījumu pēc brīvdienām. -AddCP=Pieteikties brīvdienām +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Darbinieks DateDebCP=Sākuma datums DateFinCP=Beigu datums @@ -18,24 +18,24 @@ ApprovedCP=Apstiprināts CancelCP=Atcelts RefuseCP=Atteikts ValidatorCP=Approbator -ListeCP=Brīvdienu saraksts +ListeCP=List of leaves ReviewedByCP=Būs jāpārskata DescCP=Apraksts -SendRequestCP=Radot pieprasījumu pēc brīvdienām -DelayToRequestCP=Pieteikumi par brīvdienām jāveic vismaz %s diena (s) pirms viņiem. -MenuConfCP=Labot līdzsvaru brīvdienas -UpdateAllCP=Atjaunot brīvdienas -SoldeCPUser=Brīvdienu bilance ir %s dienas. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Jums ir jāizvēlas beigu datumu lielāks nekā sākuma datuma. ErrorSQLCreateCP=SQL kļūda izveides laikā: -ErrorIDFicheCP=Kļūda, brīvdienām pieprasījums neeksistē. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Atgriezties uz iepriekšējo lappusi -ErrorUserViewCP=Jums nav atļauts lasīt šo pieprasījumu brīvdienas. -InfosCP=Informāciju par pieprasījuma brīvdienas -InfosWorkflowCP=Informācijas Workflow +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request +InfosWorkflowCP=Informācijas plūsma RequestByCP=Pieprasījis -TitreRequestCP=Loksne brīvdienas -NbUseDaysCP=Dienu skaits patērēto brīvdienās +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Rediģēt DeleteCP=Dzēst ActionValidCP=Apstiprināt @@ -43,26 +43,26 @@ ActionRefuseCP=Atteikt ActionCancelCP=Atcelt StatutCP=Statuss SendToValidationCP=Sūtīt uz apstiprināšanu -TitleDeleteCP=Dzēst lūgumu brīvdienas -ConfirmDeleteCP=Apstiprinātu dzēšanu šā pieprasījuma brīvdienās? -ErrorCantDeleteCP=Kļūda jums nav tiesības dzēst šo svētku pieprasījumu. -CantCreateCP=Jums nav tiesību pretendēt uz brīvdienām. -InvalidValidatorCP=Jums ir jāizvēlas approbator jūsu brīvdienu pieprasījumu. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Atjaunināt -CantUpdate=Jūs nevarat atjaunināt šo lūgumu brīvdienas. +CantUpdate=You cannot update this leave request. NoDateDebut=Jums ir jāizvēlas sākuma datums. NoDateFin=Jums ir jāizvēlas beigu datums. ErrorDureeCP=Jūsu pieprasījums brīvdienas nesatur darba dienu. TitleValidCP=Apstiprināt brīvdienu pieprasījumu -ConfirmValidCP=Vai jūs tiešām vēlaties apstiprināt brīvdienu pieprasījumu? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Datums apstiprināts -TitleToValidCP=Nosūtīt brīvdienu pieprasījumu -ConfirmToValidCP=Vai jūs tiešām vēlaties nosūtīt brīvdienu pieprasījumu? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Noraidīt brīvdienu pieprasījumu -ConfirmRefuseCP=Vai tiešām vēlaties atteikties no brīvdienu pieprasīšanas? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Jums ir jāizvēlas iemesls kāpēc atteikt pieprasījums. TitleCancelCP=Atcelt brīvdienu pieprasījumu -ConfirmCancelCP=Vai esat pārliecināts, ka vēlaties atcelt brīvdienu pieprasījumu? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Atteikuma iemesls DateRefusCP=Atteikuma datums DateCancelCP=Atcelšanas datums @@ -72,8 +72,8 @@ MotifCP=Iemesls UserCP=Lietotājs ErrorAddEventToUserCP=Kļūda, pievienojot ārkārtas atvaļinājumu. AddEventToUserOkCP=Par ārkārtas atvaļinājumu papildinājums ir pabeigta. -MenuLogCP=Skatīt žurnālus brīvdienas -LogCP=Pieteikties par jaunumiem no brīvdienām +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Veic UserUpdateCP=Lietotājam PrevSoldeCP=Iepriekšējā bilance @@ -81,33 +81,33 @@ NewSoldeCP=Jana Bilance alreadyCPexist=Brīvdienām pieprasījums jau ir izdarīts šajā laika posmā. UserName=Vārds Employee=Darbinieks -FirstDayOfHoliday=Pirmā brīvdienu diena -LastDayOfHoliday=Pēdējā brīvdienu diena +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Ikmēneša atjauninājums ManualUpdate=Manuāla aktualizēšana -HolidaysCancelation=Brīvdienas atcelšanas +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Konfigurācija brīvdienas moduļa DescOptionCP=Apraksts iespēju ValueOptionCP=Vērtība -GroupToValidateCP=Grupa ar spēju apstiprināt brīvdienas +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Apstiprināt konfigurāciju -LastUpdateCP=Pēdējo reizi atjaunots automātiski no brīvdienām +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Veiksmīgi atjaunināta. ErrorUpdateConfCP=Kļūda atjaunināšanas laikā, lūdzu, mēģiniet vēlreiz. AddCPforUsers=Lūdzu, pievienojiet līdzsvaru svētkiem lietotājiem, klikšķinot šeit . DelayForSubmitCP=Termiņš, lai pieteiktos brīvdienām AlertapprobatortorDelayCP=Novērst approbator ja brīvdienu pieprasījums neatbilst termiņu -AlertValidatorDelayCP=Préevent ar approbator ja brīvdienu pieprasījums pārsniedz kavēšanos -AlertValidorSoldeCP=Novērst approbator ja brīvdienu pieprasījums pārsniedz līdzsvaru -nbUserCP=Lietotāju skaits atbalstīta moduļa brīvdienās -nbHolidayDeductedCP=Brīvdienu skaits, kas jāatskaita katru dienu veikti brīvdienās -nbHolidayEveryMonthCP=Brīvdienu skaits pievienoti katru mēnesi -Module27130Name= Brīvdienu vadība -Module27130Desc= Vadība brīvdienas -TitleOptionMainCP=Galvenie uzstādījumi brīvdienas -TitleOptionEventCP=Uzstādījumi brīvdienas ir saistīts ar notikumiem +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Apstiprināt UpdateEventCP=Atjaunināt notikumus CreateEventCP=Izveidot @@ -127,23 +127,23 @@ UpdateEventOptionCP=Atjaunot ErrorMailNotSend=Kļūda sūtot e-pastu: NoCPforMonth=Nē atstāt šo mēnesi. nbJours=Dienu skaits -TitleAdminCP=Brīvdienu konfigurācija +TitleAdminCP=Configuration of Leaves #Messages Hello=Sveiki -HolidaysToValidate=Apstiprināt brīvdienas -HolidaysToValidateBody=Zemāk ir brīvdienas, lai izvērtētu pieprasījumu -HolidaysToValidateDelay=Šis brīvdienām pieprasījums notiks laika posmā, kas ir mazāks nekā %s dienām. -HolidaysToValidateAlertSolde=Lietotājs, kas padarīja šo pieprasījumu brīvdienas nav pietiekami daudz brīvas dienas. -HolidaysValidated=Apstiprinātas brīvdienas -HolidaysValidatedBody=Jūsu pieprasījums brīvdienās %s uz %s ir apstiprināta. -HolidaysRefused=Liegtas brīvdienas -HolidaysRefusedBody=Jūsu pieprasījums brīvdienās %s uz %s ir liegta šādu iemeslu dēļ: -HolidaysCanceled=Atceltās brīvdienas -HolidaysCanceledBody=Jūsu pieprasījums brīvdienās %s uz %s ir atcelts. -Permission20000=Apskatīt savas brīvdienas -Permission20001=Izveidot/labot brīvdienas -Permission20002=Izveidot/labot brīvdienas visiem -Permission20003=Dzēst brīvdienu pieprasījumus -Permission20004=Iestatīt lietotāju brīvdienas -Permission20005=Pārskatīt žurnālu modificētu brīvdienas -Permission20006=Skatīt brīvdienu mēnešu atskaites +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang index 414164f9556..58646a1e012 100644 --- a/htdocs/langs/lv_LV/install.lang +++ b/htdocs/langs/lv_LV/install.lang @@ -73,11 +73,11 @@ DatabaseConnection=Datubāzes savienojums DatabaseCreation=Datubāzes izveide UserCreation=Lietotāja izveidošana CreateDatabaseObjects=Datu bāzes objektu izveide -ReferenceDataLoading=Atsauces dati iekraušana +ReferenceDataLoading=Atsauces datu ielāde TablesAndPrimaryKeysCreation=Tabulu un primāro atslēgu veidošana CreateTableAndPrimaryKey=Izveidot tabulu %s CreateOtherKeysForTable=Izveidot ārvalstu atslēgas un indeksi attiecībā uz galda %s -OtherKeysCreation=Ārvalstu atslēgas un indeksi radīšana +OtherKeysCreation=Atslēgu un indeksu veidošana FunctionsCreation=Funkcijas izveide AdminAccountCreation=Administrator pieteikšanās izveide PleaseTypePassword=Lūdzu, ievadiet paroli, tukšas paroles ir aizliegtas! @@ -86,7 +86,7 @@ PasswordsMismatch=Paroles atšķiras, lūdzu, mēģiniet vēlreiz! SetupEnd=Beigas iestatīšanas SystemIsInstalled=Instalācija ir pabeigta. SystemIsUpgraded=Dolibarr ir atjaunota veiksmīgi. -YouNeedToPersonalizeSetup=Jums ir nepieciešams, lai konfigurētu Dolibarr, lai atbilstu jūsu vajadzībām (izskats, funkcijas, ...). Lai to izdarītu, lūdzu, sekojiet saitei zemāk: +YouNeedToPersonalizeSetup=Jums ir nepieciešams konfigurēt Dolibarr, lai atbilstu Jūsu vajadzībām (izskats, funkcijas, ...). Lai to izdarītu, lūdzu, sekojiet saitei zemāk: AdminLoginCreatedSuccessfuly=Dolibarr Administratora lietotāja vārds '%s' izveidots veiksmīgi. GoToDolibarr=Iet uz Dolibarr GoToSetupArea=Iet uz Dolibarr (iestatīšanas apgabalu) @@ -96,9 +96,9 @@ Examples=Piemēri WithNoSlashAtTheEnd=Bez slīpsvītras "/" beigās DirectoryRecommendation=Ieteicams izmantot mapi ārpus mājas lapas failu direktorijas. LoginAlreadyExists=Jau eksistē -DolibarrAdminLogin=Dolibarr administratora ieeja +DolibarrAdminLogin=Dolibarr administratora lietotāja vārds AdminLoginAlreadyExists=Dolibarr administratora konts '%s' jau eksistē. Dodieties atpakaļ, ja jūs vēlaties izveidot vēl vienu kontu. -WarningRemoveInstallDir=Brīdinājums, drošības apsvērumu dēļ kad instalēšana vai atjaunināšana ir pabeigta, lai izvairīties no instalēšanas rīku atkal izmantošanas, jums vajadzētu pievienot failu ar nosaukumu install.lock Dolibarr dokumentu direktorijā, lai novērstu ļaunprātīgu tās izmantošanu. +WarningRemoveInstallDir=Brīdinājums, drošības apsvērumu dēļ pēc instalēšanas vai atjaunināšanas beigām, lai izvairītos no instalēšanas rīku atkārtotas izmantošanas, Jums jāpievieno failu ar nosaukumu install.lock Dolibarr dokumentu direktorijā, lai novērstu ļaunprātīgu instalācijas izmantošanu. ThisPHPDoesNotSupportTypeBase=Šis PHP sistēma neatbalsta nevienu interfeisu, lai piekļūtu datu bāzes tipa %s FunctionNotAvailableInThisPHP=Nav pieejams šajā PHP versijā MigrateScript=Migrācijas skripts @@ -108,13 +108,13 @@ DatabaseMigration=Struktūras datu bāzes migrācija ProcessMigrateScript=Skripts darbojas ChooseYourSetupMode=Izvēlies savu instalācijas režīmu un noklikšķiniet uz "Sākt" ... FreshInstall=Svaiga instalēšana -FreshInstallDesc=Izmantojiet šo režīmu, ja tas ir jūsu pirmo reizi instalēt. Ja nē, šis režīms var izlabot nepilnīgu iepriekšējo instalēt, bet, ja jūs vēlaties uzlabot savu versiju, izvēlieties "Upgrade" režīmā. +FreshInstallDesc=Izmantojiet šo režīmu, ja pirmo reizi instalējat. Ja nē, šis režīms var izlabot nepilnīgu iepriekšējo instalāciju. Ja jūs vēlaties atjaunot versiju, izvēlieties "Atjaunošanas" režīmu. Upgrade=Atjaunot -UpgradeDesc=Izmantojiet šo režīmu, ja esat nomainījis veco Dolibarr failus ar failiem no jaunāku versiju. Tas būs uzlabot savu datu bāzi un datus. +UpgradeDesc=Izmantojiet šo režīmu, ja vēlaties atjaunot veco Dolibarr versiju uz jaunāku. Šis process atjauno datu bāzi un failus. Start=Sākt -InstallNotAllowed=Setup nav atļauts ar conf.php atļaujas +InstallNotAllowed=Instalēšana nav atļauta ar conf.php tiesībām NotAvailable=Nav pieejams -YouMustCreateWithPermission=Jums ir izveidot failu %s un noteikt rakstīt atļaujas par to, lai web serveri laikā instalēšanas procesu. +YouMustCreateWithPermission=Jums ir jāizveido fails %s un jāpiešķir rakstīšanas atļaujas tam, lai web serveris instalēšanas laikā varētu to izmantot. CorrectProblemAndReloadPage=Lūdzu atrisiniet problēmu un nospiediet F5, lai pārlādētu lapu. AlreadyDone=Jau pārvietoti DatabaseVersion=Datubāzes versija diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang index c781d865760..c24ded1a130 100644 --- a/htdocs/langs/lv_LV/interventions.lang +++ b/htdocs/langs/lv_LV/interventions.lang @@ -1,14 +1,14 @@ # Dolibarr language file - Source file is en_US - interventions Intervention=Iejaukšanās Interventions=Iejaukšanās -InterventionCard=Intervences karte -NewIntervention=Jauna intervences -AddIntervention=Pievienot iejaukšanās -ListOfInterventions=Saraksts iejaukšanās -EditIntervention=Labot iejaukšanās +InterventionCard=Iejaukšanās kartiņa +NewIntervention=Jauna iejaukšanās +AddIntervention=Pievienot iejaukšanos +ListOfInterventions=Iejaukšanās saraksts +EditIntervention=Labot iejaukšanos ActionsOnFicheInter=Pasākumi attiecībā uz intervenci LastInterventions=Pēdējās %s iejaukšanās -AllInterventions=Visi pasākumi +AllInterventions=Visas iejaukšanās CreateDraftIntervention=Izveidot projektu CustomerDoesNotHavePrefix=Klientam nav prefiksu InterventionContact=Intervences kontakts @@ -16,7 +16,7 @@ DeleteIntervention=Dzēst iejaukšanās ValidateIntervention=Apstiprināt iejaukšanās ModifyIntervention=Modificēt iejaukšanās DeleteInterventionLine=Dzēst intervences līnija -ConfirmDeleteIntervention=Vai tiešām vēlaties dzēst šo pasākumu? +ConfirmDeleteIntervention=Vai tiešām vēlaties dzēst šo iejaukšanos? ConfirmValidateIntervention=Vai jūs tiešām vēlaties, lai apstiprinātu šo intervenci ar nosaukumu %s? ConfirmModifyIntervention=Vai esat pārliecināts, ka vēlaties mainīt šo pasākumu? ConfirmDeleteInterventionLine=Vai tiešām vēlaties dzēst šo intervences līnijas? @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Vārds, uzvārds un paraksts iejaukties: NameAndSignatureOfExternalContact=Vārds un klienta paraksts: DocumentModelStandard=Standarta dokumenta paraugs intervencēm InterventionCardsAndInterventionLines=Iejaukšanās un līnijas intervenču -ClassifyBilled=Klasificēt "Jāmaksā" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Jāmaksā RelatedInterventions=Saistītie pasākumi ShowIntervention=Rādīt iejaukšanās +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Pārstāvis turpinot darboties iejaukšanās TypeContact_fichinter_internal_INTERVENING=Iejaukšanās diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang index be7983ee3c2..97e77443c8b 100644 --- a/htdocs/langs/lv_LV/mails.lang +++ b/htdocs/langs/lv_LV/mails.lang @@ -35,7 +35,7 @@ TestMailing=Testa e-pasts ValidMailing=Derīgas pasta vēstuļu sūtīšanas ApproveMailing=Apstiprināt e-pastu MailingStatusDraft=Projekts -MailingStatusValidated=Validēta +MailingStatusValidated=Apstiprināts MailingStatusApproved=Apstiprināts MailingStatusSent=Nosūtīts MailingStatusSentPartialy=Nosūtīts daļēji @@ -74,7 +74,7 @@ DateSending=Sūtīšanas datums SentTo=Nosūtīts %s MailingStatusRead=Lasīt CheckRead=Lasīt kvīti -YourMailUnsubcribeOK=E-pasts %s ir pareizi unsubcribe no adresātu saraksta +YourMailUnsubcribeOK=E-pasts %s ir veiksmīgi izņemts no adresātu saraksta MailtoEMail=Saite uz e-pastu ActivateCheckRead=Atļaut izmantot "Atrakstīšanās" saiti ActivateCheckReadKey=Galvenais izmantot, lai šifrētu URL izmantošanu, lai "izlasītu saņemšanai" un "Unsubcribe" funkciju @@ -94,9 +94,9 @@ MailingModuleDescDolibarrUsers=Dolibarr lietotājiem MailingModuleDescFundationMembers=Fonda biedri ar e-pastiem MailingModuleDescEmailsFromFile=E-pastus no teksta faila (e-pasts, Uzvārds, Vārds, cits) MailingModuleDescEmailsFromUser=Pastus no lietotāja ievadi (e-pasts, Uzvārds, Vārds, cits) -MailingModuleDescContactsCategories=Trešās personas (pēc kategorijas) +MailingModuleDescContactsCategories=Trešās personas (pēc sadaļas) MailingModuleDescDolibarrContractsLinesExpired=Trešās personas ar beidzies līgums ir līnijas -MailingModuleDescContactsByCompanyCategory=Kontakti / adreses trešajām personām (trešo personu kategorija) +MailingModuleDescContactsByCompanyCategory=Kontakti/adreses trešajām personām (trešo personu sadaļas) MailingModuleDescContactsByCategory=Kontakti / adreses trešajām personām kategorijā MailingModuleDescMembersCategories=Fonda biedri (pa kategorijām) MailingModuleDescContactsByFunction=Kontakti / adreses trešajām personām (pēc pozīcijas / funkciju) diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang index 728d6a2b851..4038bc8ad6b 100644 --- a/htdocs/langs/lv_LV/members.lang +++ b/htdocs/langs/lv_LV/members.lang @@ -2,7 +2,7 @@ MembersArea=Dalībnieku sadaļa PublicMembersArea=Sabiedrības dalībnieku zonā MemberCard=Dalībnieka karte -SubscriptionCard=Abonēšana karte +SubscriptionCard=Abonēšana kartiņa Member=Dalībnieks Members=Dalībnieki MemberAccount=Biedrs pieteikšanās @@ -18,7 +18,7 @@ ListOfValidatedPublicMembers=Saraksts ar apstiprināto valsts locekļu ErrorThisMemberIsNotPublic=Šis dalībnieks nav publisks ErrorMemberIsAlreadyLinkedToThisThirdParty=Vēl viens dalībnieks (nosaukums: %s, pieteikšanās: %s) jau ir saistīts ar trešo personu %s. Noņemt šo saiti vispirms tāpēc, ka trešā persona nevar saistīt tikai loceklim (un otrādi). ErrorUserPermissionAllowsToLinksToItselfOnly=Drošības apsvērumu dēļ, jums ir jāpiešķir atļaujas, lai rediģētu visi lietotāji varētu saistīt locekli, lai lietotājam, kas nav jūsu. -ThisIsContentOfYourCard=Šī ir informācija par jūsu karti +ThisIsContentOfYourCard=Šī ir informācija par jūsu kartiņu CardContent=Saturu jūsu dalības kartes SetLinkToUser=Saite uz Dolibarr lietotāju SetLinkToThirdParty=Saite uz Dolibarr trešajai personai @@ -54,7 +54,7 @@ SearchAMember=Meklēt dalībnieku MemberStatusDraft=Projekts (ir jāapstiprina) MemberStatusDraftShort=Projekts MemberStatusActive=Validēta (gaidīšanas abonements) -MemberStatusActiveShort=Validēta +MemberStatusActiveShort=Apstiprināts MemberStatusActiveLate=abonements beidzies MemberStatusActiveLateShort=Beidzies MemberStatusPaid=Abonēšana atjaunināta @@ -105,7 +105,7 @@ DeleteSubscription=Dzēst abonementu ConfirmDeleteSubscription=Vai tiešām vēlaties dzēst šo abonementu? Filehtpasswd=Htpasswd failu ValidateMember=Apstiprināt dalībnieku -ConfirmValidateMember=Vai jūs tiešām vēlaties, lai apstiprinātu šo biedrs? +ConfirmValidateMember=Vai jūs tiešām vēlaties apstiprināt šo biedru? FollowingLinksArePublic=Šādas saites ir atvērtas lapas, kas nav aizsargāti ar kādu Dolibarr atļauju. Tie nav formated lapas, sniedz kā piemērs, lai parādītu, kā uzskaitīt biedrus datu bāzi. PublicMemberList=Sabiedrības Biedru saraksts BlankSubscriptionForm=Publiskā auto-abonēšanas veidlapu @@ -123,7 +123,7 @@ Text=Teksts Int=Int Date=Datums DateAndTime=Datums un laiks -PublicMemberCard=Dalībvalsts publisko karte +PublicMemberCard=Dalībnieku publiskā kartiņa MemberNotOrNoMoreExpectedToSubscribe=Dalībvalsts nevar vai vairs sagaidāms, ka parakstīties AddSubscription=Pievienot abonementu ShowSubscription=Rādīt abonementu @@ -158,7 +158,7 @@ MoreActions=Papildu darbības ar ierakstu MoreActionsOnSubscription=Papildina rīcību, kas ierosināta pēc noklusējuma, ierakstot abonementu MoreActionBankDirect=Izveidot tiešu darījumu ierakstu par kontu MoreActionBankViaInvoice=Izveidot rēķinu un maksājumu par kontu -MoreActionInvoiceOnly=Izveidot rēķinu bez maksājumu +MoreActionInvoiceOnly=Izveidot rēķinu bez maksājuma LinkToGeneratedPages=Izveidot vizītkartes LinkToGeneratedPagesDesc=Šis ekrāns ļauj jums, lai radītu PDF failus ar vizītkartēm visiem saviem biedriem, vai konkrētā loceklis. DocForAllMembersCards=Izveidot vizītkartes visiem dalībniekiem @@ -168,8 +168,8 @@ SubscriptionPayment=Abonēšanas maksa LastSubscriptionDate=Pēdējā abonēšanas datums LastSubscriptionAmount=Pēdējā parakstīšanās summu MembersStatisticsByCountries=Dalībnieku statistika pa valstīm -MembersStatisticsByState=Dalībnieku statistika pēc valsts / province -MembersStatisticsByTown=Dalībnieku statistika pa pilsētu +MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm +MembersStatisticsByTown=Dalībnieku statistika pa pilsētām MembersStatisticsByRegion=Members statistics by region MemberByRegion=Members by region NbOfMembers=Biedru skaits diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang index e8d5f68655d..f612333dce4 100644 --- a/htdocs/langs/lv_LV/other.lang +++ b/htdocs/langs/lv_LV/other.lang @@ -39,9 +39,9 @@ Notify_CONTRACT_VALIDATE=Līgums apstiprināts Notify_FICHEINTER_VALIDATE=Intervences apstiprināts Notify_SHIPPING_VALIDATE=Piegāde apstiprināta Notify_SHIPPING_SENTBYMAIL=Piegāde nosūtīt pa pastu -Notify_MEMBER_VALIDATE=Loceklis apstiprināts +Notify_MEMBER_VALIDATE=Dalībnieks apstiprināts Notify_MEMBER_MODIFY=Member modified -Notify_MEMBER_SUBSCRIPTION=Dalībvalsts parakstītā +Notify_MEMBER_SUBSCRIPTION=Dalībnieks pierakstījies Notify_MEMBER_RESILIATE=Biedrs resiliated Notify_MEMBER_DELETE=Biedrs svītrots Notify_PROJECT_CREATE=Projekts izveidots @@ -67,7 +67,7 @@ PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the s PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ DemoDesc=Dolibarr ir kompakts ERP / CRM veido vairāki funkcionālos moduļus. Demo, kas ietver visus moduļus nenozīmē neko, jo tas nekad nav noticis. Tātad, vairāki demo profili ir pieejami. -ChooseYourDemoProfil=Izvēlieties demo profilu, kas atbilstu jūsu darbību ... +ChooseYourDemoProfil=Izvēlieties demo profilu, kas atbilstu jūsu darbībai ... DemoFundation=Pārvaldīt locekļus nodibinājumam DemoFundation2=Pārvaldīt dalībniekus un bankas kontu nodibinājumam DemoCompanyServiceOnly=Pārvaldīt ārštata darbības pārdošanas pakalpojumus tikai @@ -80,6 +80,16 @@ ModifiedBy=Laboja %s ValidatedBy=Apstiprināja %s CanceledBy=Atcēla %s ClosedBy=Slēdza %s +CreatedById=Lietotāja id kurš izveidojis +ModifiedById=Lietotāja id kurš veica pēdējās izmaiņas +ValidatedById=Lietotāja id, kurš apstiprināja +CanceledById=Lietotāja id kurš atcēlis +ClosedById=Lietotāja id kurš aiztaisījis +CreatedByLogin=Lietotāja lietotājs kurš izveidojis +ModifiedByLogin=Lietotājs, kurš pēdējais labojis +ValidatedByLogin=Lietotājs, kurš apstiprinājis +CanceledByLogin=Lietotājs, kurš atcēlis +ClosedByLogin=Lietotājs, kurš slēdzis FileWasRemoved=Fails %s tika dzēsts DirWasRemoved=Katalogs %s tika dzēsts FeatureNotYetAvailableShort=Pieejams nākamajā versijā @@ -154,14 +164,14 @@ NumberOfUnitsCustomerOrders=Klientu pasūtījumos pasūtīto preču skaits pēd NumberOfUnitsCustomerInvoices=Skaits klientiem izrakstītajos rēķinos pēdējo 12 mēnešu laikā NumberOfUnitsSupplierOrders=Vienību skaits kuras pasūtītas pēdējos 12 mēnešos NumberOfUnitsSupplierInvoices=Skaits piegādātāju rēķinos pēdējo 12 mēnešu laikā -EMailTextInterventionValidated=Intervences %s ir apstiprināta. +EMailTextInterventionValidated=Iejaukšanās %s ir apstiprināta. EMailTextInvoiceValidated=Rēķins %s ir apstiprināts. -EMailTextProposalValidated=Priekšlikums %s ir apstiprināta. -EMailTextOrderValidated=Lai %s ir apstiprināta. -EMailTextOrderApproved=Lai %s ir apstiprināts. -EMailTextOrderApprovedBy=Lai %s ir apstiprinājusi %s. -EMailTextOrderRefused=Lai %s ir noraidīts. -EMailTextOrderRefusedBy=Lai %s ir noraidījusi %s. +EMailTextProposalValidated=Priekšlikums %s ir apstiprināts. +EMailTextOrderValidated=Pasūtījums %s ir apstiprināts. +EMailTextOrderApproved=Pasūtījums %s ir apstiprināts. +EMailTextOrderApprovedBy=Pasūtījumu %s ir apstiprinājis %s. +EMailTextOrderRefused=Pasūtījums %s ir noraidīts. +EMailTextOrderRefusedBy=Pasūtījums %s ir noraidījis %s. EMailTextExpeditionValidated=Kuģniecības %s ir apstiprināta. ImportedWithSet=Ievešanas datu kopu DolibarrNotification=Automātiska paziņošana @@ -203,14 +213,14 @@ PropalValidatedInDolibarr=Priekšlikums %s apstiprināts Dolibarr InvoiceValidatedInDolibarr=Rēķins %s pārbaudīts Dolibarr InvoicePaidInDolibarr=Rēķins mainīts %s uz samaksāts Dolibarr InvoiceCanceledInDolibarr=Rēķins %s atcelts Dolibarr -PaymentDoneInDolibarr=Maksājumu %s darīts Dolibarr -CustomerPaymentDoneInDolibarr=Klientu maksājumu %s darīts Dolibarr -SupplierPaymentDoneInDolibarr=Piegādātājs maksājumu %s darīts Dolibarr -MemberValidatedInDolibarr=Dalībvalstis %s apstiprinātas ar Dolibarr +PaymentDoneInDolibarr=Maksājumu %s veikts Dolibarr +CustomerPaymentDoneInDolibarr=Klientu maksājumu %s veikts Dolibarr +SupplierPaymentDoneInDolibarr=Piegādātāja maksājums %s veikts Dolibarr +MemberValidatedInDolibarr=Dalībnieks %s apstiprināts ar Dolibarr MemberResiliatedInDolibarr=Dalībvalstis %s resiliated jo Dolibarr -MemberDeletedInDolibarr=Dalībvalstis %s izdzēsts no Dolibarr +MemberDeletedInDolibarr=Dalībnieks %s izdzēsts no Dolibarr MemberSubscriptionAddedInDolibarr=Parakstīšanās uz dalībvalstīm %s papildina Dolibarr -ShipmentValidatedInDolibarr=Sūtījuma %s validētas Dolibarr +ShipmentValidatedInDolibarr=Sūtījumi %s apstiprināti Dolibarr ShipmentDeletedInDolibarr=Sūtījums %s izdzēsts no Dolibarr ##### Export ##### Export=Eksportēt @@ -218,7 +228,7 @@ ExportsArea=Eksportēšanas sadaļa AvailableFormats=Pieejamie formāti LibraryUsed=Librairy lieto LibraryVersion=Versija -ExportableDatas=Eksportējami dati +ExportableDatas=Eksportējamie dati NoExportableData=Nav eksportējami dati (nav moduļi ar eksportējami datu ielādes, vai trūkstošos atļaujas) ToExport=Eksportēt NewExport=Jauns eksports diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang index 2f5af9151b6..b575e82a1c9 100644 --- a/htdocs/langs/lv_LV/products.lang +++ b/htdocs/langs/lv_LV/products.lang @@ -82,7 +82,7 @@ ContractStatusExpired=beidzies ContractStatusOnHold=Nedarbojas ContractStatusToRun=To get running ContractNotRunning=Šis līgums nedarbojas -ErrorProductAlreadyExists=Ar atsauci %s produkts jau pastāv. +ErrorProductAlreadyExists=Prece ar atsauci %s jau pastāv. ErrorProductBadRefOrLabel=Nepareiza vērtība atsauces vai etiķeti. ErrorProductClone=Radās problēma, mēģinot klons produktu vai pakalpojumu. ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. @@ -90,7 +90,7 @@ Suppliers=Piegādātāji SupplierRef=Piegādātāja produkta ref. ShowProduct=Rādīt preci ShowService=Rādīt pakalpojumu -ProductsAndServicesArea=Produktu un pakalpojumu jomā +ProductsAndServicesArea=Produktu un pakalpojumu sadaļa ProductsArea=Preču sadaļa ServicesArea=Pakalpojumu sadaļa AddToMyProposals=Pievienot pie maniem priekšlikumiem @@ -155,12 +155,12 @@ QtyMin=Minimālais Daudzums PriceQty=Cena par šo daudzumu PriceQtyMin=Cena par šo min. daudzums (bez atlaides) VATRateForSupplierProduct=PVN likme (šim piegādātājam / produktam) -DiscountQtyMin=Noklusējuma atlaide qty -NoPriceDefinedForThisSupplier=Nē cena / gab definētas šim piegādātājam / produktu -NoSupplierPriceDefinedForThisProduct=Piegādātājs cena / gab definētas šo produktu -RecordedProducts=Produkti reģistrē -RecordedServices=Pakalpojumi reģistrē -RecordedProductsAndServices=Produkti / pakalpojumi ierakstītas +DiscountQtyMin=Noklusējuma apjoma atlaide +NoPriceDefinedForThisSupplier=Nav cena /gab definēti šim piegādātājam/precei +NoSupplierPriceDefinedForThisProduct=Nav piegādātāja cena/gab definēti šim produktam +RecordedProducts=Produkti saglabāti +RecordedServices=Pakalpojumi saglabāti +RecordedProductsAndServices=Produkti/pakalpojumi saglabāti PredefinedProductsToSell=Predefined products to sell PredefinedServicesToSell=Predefined services to sell PredefinedProductsAndServicesToSell=Predefined products/services to sell @@ -202,7 +202,7 @@ PriceByQuantity=Cena pēc daudzuma PriceByQuantityRange=Daudzuma diapazons ProductsDashboard=Produkti / Pakalpojumi kopsavilkums UpdateOriginalProductLabel=Labot sākotnējo nosaukumu -HelpUpdateOriginalProductLabel=Ļauj, lai rediģētu produkta nosaukumu +HelpUpdateOriginalProductLabel=Ļauj rediģēt produkta nosaukumu ### composition fabrication Building=Ražošana un priekšmeti dispatchment Build=Ražot @@ -228,7 +228,7 @@ PrintsheetForOneBarCode=Drukāt vairākas svītrkoda uzlīmes BuildPageToPrint=Ģenerēt lapu drukāšanai FillBarCodeTypeAndValueManually=Aizpildīt svītrukodu veidu un vērtību manuāli. FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. -FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. +FillBarCodeTypeAndValueFromThirdParty=Aizpildīt svītrkodu veidu un vērtību no trešo pušu svītrkoda. DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. BarCodeDataForProduct=Svītrkoda produkta informācija %s : @@ -237,8 +237,8 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r PriceByCustomer=Klienta cena PriceCatalogue=Unikāla cena poduktam/pakalpojumam PricingRule=Cenu veidošanas noteikumi -AddCustomerPrice=Add price by customers +AddCustomerPrice=Pievienot cenu klientiem ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +MinimumPriceLimit=Minimālā cena nevar būt zemāka par %s +MinimumRecommendedPrice=Minimālā rekomendējamā cena : %s diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang index f078c1a4e26..6e826e0f93d 100644 --- a/htdocs/langs/lv_LV/projects.lang +++ b/htdocs/langs/lv_LV/projects.lang @@ -32,12 +32,12 @@ TimeSpent=Laiks, kas pavadīts TimesSpent=Laiks, kas patērēts RefTask=Ref. uzdevums LabelTask=Label uzdevums -TaskTimeSpent=Time spent on tasks +TaskTimeSpent=Pavadītais laiks veicot uzdevumus TaskTimeUser=Lietotājs TaskTimeNote=Piezīme TaskTimeDate=Datums NewTimeSpent=Jauns pavadītais laiks -MyTimeSpent=Mans laiks pavadīts +MyTimeSpent=Mans pavadīts laiks MyTasks=Mani uzdevumi Tasks=Uzdevumi Task=Uzdevums @@ -52,7 +52,7 @@ Activities=Uzdevumi/aktivitātes MyActivity=Manas darbības MyActivities=Mani uzdevumi / aktivitātes MyProjects=Mani projekti -DurationEffective=Efektīva ilgums +DurationEffective=Efektīvais ilgums Progress=Progress ProgressDeclared=Deklarētais progress ProgressCalculated=Aprēķinātais progress @@ -73,25 +73,25 @@ ActivityOnProjectThisYear=Aktivitāte projektā šogad ChildOfTask=Bērna projekta / uzdevuma NotOwnerOfProject=Ne īpašnieks šo privātam projektam AffectedTo=Piešķirtas -CantRemoveProject=Šis projekts nevar noņemt, jo tas ir atsauce ar kādu citu objektu (rēķinu, rīkojumus vai citus). Skatīt atsaucēm? Tab. +CantRemoveProject=Šo projektu nevar noņemt, jo tam ir atsauce ar kādu citu objektu (rēķinu, rīkojumus vai cits). Skatīt atsauču sadaļa. ValidateProject=Apstiprināt Projet -ConfirmValidateProject=Vai jūs tiešām vēlaties, lai apstiprinātu šo projektu? +ConfirmValidateProject=Vai jūs tiešām vēlaties apstiprināt šo projektu? CloseAProject=Aizvērt projektu -ConfirmCloseAProject=Vai jūs tiešām vēlaties, lai aizvērtu šo projektu? +ConfirmCloseAProject=Vai jūs tiešām vēlaties aizvērt šo projektu? ReOpenAProject=Atvērt projektu ConfirmReOpenAProject=Vai jūs tiešām vēlaties no jauna atvērtu šo projektu? ProjectContact=Projekta kontakti ActionsOnProject=Pasākumi par projektu YouAreNotContactOfProject=Jūs neesat kontakts šīs privātam projektam DeleteATimeSpent=Dzēst pavadīts laiks -ConfirmDeleteATimeSpent=Vai tiešām vēlaties šo dzēst pavadītais laiks? -DoNotShowMyTasksOnly=Skatīt arī uzdevumus, kas nav piešķirti mani -ShowMyTasksOnly=Skatīt tikai uzdevumus, kas man +ConfirmDeleteATimeSpent=Vai tiešām vēlaties dzēst pavadīto laiku? +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Resursi ProjectsDedicatedToThisThirdParty=Projekti, kas veltīta šai trešajai personai NoTasks=Neviens uzdevumi šajā projektā LinkedToAnotherCompany=Saistīts ar citām trešajām personām -TaskIsNotAffectedToYou=Uzdevums nav piešķirts jums +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Pavadīts laiks ir tukšs ThisWillAlsoRemoveTasks=Šī darbība arī izdzēst visus uzdevumus projekta (%s uzdevumi brīdī) un visu laiku ieguldījumiem pavadīts. IfNeedToUseOhterObjectKeepEmpty=Ja daži objekti (rēķinu, pasūtījumu, ...), kas pieder citai trešai personai, ir saistītas ar projektu, lai izveidotu, saglabāt šo tukšo, lai būtu projektam, multi trešajām personām. @@ -119,7 +119,8 @@ TypeContact_project_task_external_TASKEXECUTIVE=Uzdevuma izpildītājs TypeContact_project_task_internal_TASKCONTRIBUTOR=Ieguldītājs TypeContact_project_task_external_TASKCONTRIBUTOR=Ieguldītājs SelectElement=Izvēlieties elementu -AddElement=Saite uz elementa +AddElement=Saite uz elementu +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Pilnīgu projekta ziņojums modelis (logo. ..) PlannedWorkload = Plānotais darba apjoms @@ -128,3 +129,4 @@ ProjectReferers=Atsaucoties objekti SearchAProject=Meklēt projektu ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda ProjectDraft=Melnraksta projekts +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang index c43d6a05baf..7a7603d4e8f 100644 --- a/htdocs/langs/lv_LV/propal.lang +++ b/htdocs/langs/lv_LV/propal.lang @@ -27,21 +27,21 @@ LastProposals=Jaunākie priekšlikumi SearchAProposal=Meklēt priekšlikumu ProposalsStatistics=Komerciālo priekšlikuma'u statistika NumberOfProposalsByMonth=Numurs pēc mēneša -AmountOfProposalsByMonthHT=Summa, ko mēnesī (neto pēc nodokļiem) +AmountOfProposalsByMonthHT=Summa pa mēnešiem (neto pēc nodokļiem) NbOfProposals=Skaits tirdzniecības priekšlikumiem ShowPropal=Rādīt priekšlikumu PropalsDraft=Sagatave PropalsOpened=Atvērts PropalsNotBilled=Slēgts nav apmaksāts PropalStatusDraft=Projekts (ir jāapstiprina) -PropalStatusValidated=Validēta (priekšlikums ir atvērta) -PropalStatusOpened=Validēta (priekšlikums ir atvērta) +PropalStatusValidated=Apstiprināts (priekšlikums ir atvērts) +PropalStatusOpened=Apstiprināts (priekšlikums ir atvērts) PropalStatusClosed=Slēgts PropalStatusSigned=Parakstīts (vajadzības rēķinu) PropalStatusNotSigned=Nav parakstīts (slēgta) PropalStatusBilled=Jāmaksā PropalStatusDraftShort=Melnraksts -PropalStatusValidatedShort=Validēta +PropalStatusValidatedShort=Apstiprināts PropalStatusOpenedShort=Atvērts PropalStatusClosedShort=Slēgts PropalStatusSignedShort=Parakstīts diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang index 1725d579493..72849e0b9f7 100644 --- a/htdocs/langs/lv_LV/sendings.lang +++ b/htdocs/langs/lv_LV/sendings.lang @@ -5,8 +5,8 @@ Sendings=Sūtījumi Shipment=Sūtījums Shipments=Sūtījumi Receivings=Receivings -SendingsArea=Sūtījumi platība -ListOfSendings=Saraksts sūtījumiem +SendingsArea=Sūtījumu sadaļa +ListOfSendings=Sūtījumu saraksts SendingMethod=Sūtīšanas metode SendingReceipt=Piegāde saņemšana LastSendings=Pēdējie %s sūtījumi @@ -14,7 +14,7 @@ SearchASending=Meklēt sūtījumu StatisticsOfSendings=Sūtījumu statistika NbOfSendings=Sūtījumu skaits NumberOfShipmentsByMonth=Sūtījumu skaits pa mēnešiem -SendingCard=Piegādes karte +SendingCard=Piegādes kartiņa NewSending=Jauns sūtījums CreateASending=Izveidot sūtījumu CreateSending=Izveidot sūtījumu @@ -35,7 +35,7 @@ StatusSendingValidated=Apstiprinātas (produkti, uz kuģi vai jau nosūtīti) StatusSendingProcessed=Apstrādāts StatusSendingCanceledShort=Atcelts StatusSendingDraftShort=Melnraksts -StatusSendingValidatedShort=Validēta +StatusSendingValidatedShort=Apstiprināts StatusSendingProcessedShort=Apstrādāti SendingSheet=Nosūtot lapu Carriers=Pārvadātāji @@ -54,17 +54,17 @@ StatsOnShipmentsOnlyValidated=Statistika veikti uz sūtījumiem tikai apstiprin DateDeliveryPlanned=Plānotais piegādes datums DateReceived=Datums piegāde saņemti SendShippingByEMail=Nosūtīt sūtījumu pa e-pastu -SendShippingRef=Nosūtīt sūtījuma %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Notikumi sūtījumu LinkToTrackYourPackage=Saite uz izsekot savu paketi ShipmentCreationIsDoneFromOrder=Izveidot jaunu sūtījumu var no pasūtījuma kartiņas. -RelatedShippings=Saistītie shippings -ShipmentLine=Sūtījuma līnija +RelatedShippings=Saistītie sūtījumi +ShipmentLine=Sūtījumu līnija CarrierList=Saraksts pārvadātājiem # Sending methods SendingMethodCATCH=Nozvejas klienta -SendingMethodTRANS=Transporter +SendingMethodTRANS=Pārvadātājs SendingMethodCOLSUI=Colissimo # ModelDocument DocumentModelSirocco=Vienkāršs dokuments modelis piegādes ieņēmumiem @@ -72,3 +72,7 @@ DocumentModelTyphon=Vairāk pilnīgu dokumentu modelis piegādes ieņēmumiem (l Error_EXPEDITION_ADDON_NUMBER_NotDefined=Pastāvīga EXPEDITION_ADDON_NUMBER nav noteikts SumOfProductVolumes=Summa saražotās produkcijas apjomu SumOfProductWeights=Summēt produkta svaru + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/lv_LV/sms.lang b/htdocs/langs/lv_LV/sms.lang index 30681baa42b..280969541ed 100644 --- a/htdocs/langs/lv_LV/sms.lang +++ b/htdocs/langs/lv_LV/sms.lang @@ -41,7 +41,7 @@ WarningNoSmsAdded=Nav jaunu tālruņa numuru, lai pievienotu mērķa sarakstam ConfirmValidSms=Vai varat apstiprināt, apstiprināt šīs informācijas kampaņas? ConfirmResetMailing=Uzmanību, ja jūs veicat reinit par Sms informācijas kampaņas %s, jums ļaus veikt masu nosūtot to otrreiz. Vai tas tiešām ir tas, ko jūs wan darīt? ConfirmDeleteMailing=Vai varat apstiprināt, likvidējot informācijas kampaņas? -NbOfRecipients=Skaits mērķus +NbOfRecipients=Mērķu skaits NbOfUniqueSms=Nb DOF unikālo tālruņa numuriem NbOfSms=Nbre no fona numuru ThisIsATestMessage=Šī ir testa ziņa diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang index 4456f1d4e92..7434400985b 100644 --- a/htdocs/langs/lv_LV/suppliers.lang +++ b/htdocs/langs/lv_LV/suppliers.lang @@ -31,12 +31,14 @@ ExportDataset_fournisseur_3=Piegādātājs pasūtījumus un pasūtījumu līnija ApproveThisOrder=Apstiprināt šo pasūtījumu ConfirmApproveThisOrder=Vai jūs tiešām vēlaties apstiprināt pasūtījumu %s? DenyingThisOrder=Liedzot šo pasūtījumu -ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties, lai liegtu šo rīkojumu %s? -ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo rīkojumu %s? +ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties aizliegt šo pasūtījumu %s ? +ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo pasūtījumu %s ? AddCustomerOrder=Izveidot klienta pasūtījumu AddCustomerInvoice=Izveidot klienta rēķinu AddSupplierOrder=Izveidot piegādātāju pasūtījumu AddSupplierInvoice=Izveidot piegādātāju rēķinu -ListOfSupplierProductForSupplier=To produktu saraksts, un cenām piegādātāju %s +ListOfSupplierProductForSupplier=Produktu saraksts un piegādātāju cenas %s NoneOrBatchFileNeverRan=Neviens vai partijas %s ne skrēja nesen SentToSuppliers=Nosūtīti uz piegādātājiem +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/mk_MK/accountancy.lang +++ b/htdocs/langs/mk_MK/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index d09bf84402e..13821724bc9 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang index adf9cc32f1a..9b3efc07dab 100644 --- a/htdocs/langs/mk_MK/agenda.lang +++ b/htdocs/langs/mk_MK/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Events ActionsArea=Events area (Actions and tasks) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang index b28086fa933..ed61bfc08a6 100644 --- a/htdocs/langs/mk_MK/categories.lang +++ b/htdocs/langs/mk_MK/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -# Category=Category -# Categories=Categories -# Rubrique=Category -# Rubriques=Categories -# categories=categories -# TheCategorie=The category -# NoCategoryYet=No category of this type created -# In=In -# AddIn=Add in -# modify=modify -# Classify=Classify -# CategoriesArea=Categories area -# ProductsCategoriesArea=Products/Services categories area -# SuppliersCategoriesArea=Suppliers categories area -# CustomersCategoriesArea=Customers categories area -# ThirdPartyCategoriesArea=Third parties categories area -# MembersCategoriesArea=Members categories area -# ContactsCategoriesArea=Contacts categories area -# MainCats=Main categories -# SubCats=Subcategories -# CatStatistics=Statistics -# CatList=List of categories -# AllCats=All categories -# ViewCat=View category -# NewCat=Add category -# NewCategory=New category -# ModifCat=Modify category -# CatCreated=Category created -# CreateCat=Create category -# CreateThisCat=Create this category -# ValidateFields=Validate the fields -# NoSubCat=No subcategory. -# SubCatOf=Subcategory -# FoundCats=Found categories -# FoundCatsForName=Categories found for the name : -# FoundSubCatsIn=Subcategories found in the category -# ErrSameCatSelected=You selected the same category several times -# ErrForgotCat=You forgot to choose the category -# ErrForgotField=You forgot to inform the fields -# ErrCatAlreadyExists=This name is already used -# AddProductToCat=Add this product to a category? -# ImpossibleAddCat=Impossible to add the category -# ImpossibleAssociateCategory=Impossible to associate the category to -# WasAddedSuccessfully=%s was added successfully. -# ObjectAlreadyLinkedToCategory=Element is already linked to this category. -# CategorySuccessfullyCreated=This category %s has been added with success. -# ProductIsInCategories=Product/service owns to following categories -# SupplierIsInCategories=Third party owns to following suppliers categories -# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -# MemberIsInCategories=This member owns to following members categories -# ContactIsInCategories=This contact owns to following contacts categories -# ProductHasNoCategory=This product/service is not in any categories -# SupplierHasNoCategory=This supplier is not in any categories -# CompanyHasNoCategory=This company is not in any categories -# MemberHasNoCategory=This member is not in any categories -# ContactHasNoCategory=This contact is not in any categories -# ClassifyInCategory=Classify in category -# NoneCategory=None -# NotCategorized=Without category -# CategoryExistsAtSameLevel=This category already exists with this ref -# ReturnInProduct=Back to product/service card -# ReturnInSupplier=Back to supplier card -# ReturnInCompany=Back to customer/prospect card -# ContentsVisibleByAll=The contents will be visible by all -# ContentsVisibleByAllShort=Contents visible by all -# ContentsNotVisibleByAllShort=Contents not visible by all -# CategoriesTree=Categories tree -# DeleteCategory=Delete category -# ConfirmDeleteCategory=Are you sure you want to delete this category ? -# RemoveFromCategory=Remove link with categorie -# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -# NoCategoriesDefined=No category defined -# SuppliersCategoryShort=Suppliers category -# CustomersCategoryShort=Customers category -# ProductsCategoryShort=Products category -# MembersCategoryShort=Members category -# SuppliersCategoriesShort=Suppliers categories -# CustomersCategoriesShort=Customers categories -# CustomersProspectsCategoriesShort=Custo./Prosp. categories -# ProductsCategoriesShort=Products categories -# MembersCategoriesShort=Members categories -# ContactCategoriesShort=Contacts categories -# ThisCategoryHasNoProduct=This category does not contain any product. -# ThisCategoryHasNoSupplier=This category does not contain any supplier. -# ThisCategoryHasNoCustomer=This category does not contain any customer. -# ThisCategoryHasNoMember=This category does not contain any member. -# ThisCategoryHasNoContact=This category does not contain any contact. -# AssignedToCustomer=Assigned to a customer -# AssignedToTheCustomer=Assigned to the customer -# InternalCategory=Internal category -# CategoryContents=Category contents -# CategId=Category id -# CatSupList=List of supplier categories -# CatCusList=List of customer/prospect categories -# CatProdList=List of products categories -# CatMemberList=List of members categories -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/mk_MK/companies.lang +++ b/htdocs/langs/mk_MK/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/mk_MK/compta.lang +++ b/htdocs/langs/mk_MK/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang index 12a72464cae..66ddea95a5c 100644 --- a/htdocs/langs/mk_MK/donations.lang +++ b/htdocs/langs/mk_MK/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -# Donation=Donation -# Donations=Donations -# DonationRef=Donation ref. -# Donor=Donor -# Donors=Donors -# AddDonation=Add a donation -# NewDonation=New donation -# ShowDonation=Show donation -# DonationPromise=Gift promise -# PromisesNotValid=Not validated promises -# PromisesValid=Validated promises -# DonationsPaid=Donations paid -# DonationsReceived=Donations received -# PublicDonation=Public donation -# DonationsNumber=Donation number -# DonationsArea=Donations area -# DonationStatusPromiseNotValidated=Draft promise -# DonationStatusPromiseValidated=Validated promise -# DonationStatusPaid=Donation received -# DonationStatusPromiseNotValidatedShort=Draft -# DonationStatusPromiseValidatedShort=Validated -# DonationStatusPaidShort=Received -# ValidPromess=Validate promise -# DonationReceipt=Donation receipt -# BuildDonationReceipt=Build receipt -# DonationsModels=Documents models for donation receipts -# LastModifiedDonations=Last %s modified donations -# SearchADonation=Search a donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Add a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/mk_MK/errors.lang +++ b/htdocs/langs/mk_MK/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/mk_MK/holiday.lang +++ b/htdocs/langs/mk_MK/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang index 0a5b3e15467..17641a0ab3e 100644 --- a/htdocs/langs/mk_MK/interventions.lang +++ b/htdocs/langs/mk_MK/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -# Intervention=Intervention -# Interventions=Interventions -# InterventionCard=Intervention card -# NewIntervention=New intervention -# AddIntervention=Add intervention -# ListOfInterventions=List of interventions -# EditIntervention=Edit intervention -# ActionsOnFicheInter=Actions on intervention -# LastInterventions=Last %s interventions -# AllInterventions=All interventions -# CreateDraftIntervention=Create draft -# CustomerDoesNotHavePrefix=Customer does not have a prefix -# InterventionContact=Intervention contact -# DeleteIntervention=Delete intervention -# ValidateIntervention=Validate intervention -# ModifyIntervention=Modify intervention -# DeleteInterventionLine=Delete intervention line -# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -# ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -# NameAndSignatureOfInternalContact=Name and signature of intervening : -# NameAndSignatureOfExternalContact=Name and signature of customer : -# DocumentModelStandard=Standard document model for interventions -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -# ClassifyBilled=Classify "Billed" -# StatusInterInvoiced=Billed -# RelatedInterventions=Related interventions -# ShowIntervention=Show intervention +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Add intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### -# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -# TypeContact_fichinter_internal_INTERVENING=Intervening -# TypeContact_fichinter_external_BILLING=Billing customer contact -# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact # Modele numérotation -# ArcticNumRefModelDesc1=Generic number model -# ArcticNumRefModelError=Failed to activate -# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/mk_MK/projects.lang +++ b/htdocs/langs/mk_MK/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang index 3bb65c295d2..2ae43f39766 100644 --- a/htdocs/langs/mk_MK/sendings.lang +++ b/htdocs/langs/mk_MK/sendings.lang @@ -1,76 +1,78 @@ # Dolibarr language file - Source file is en_US - sendings -# RefSending=Ref. shipment -# Sending=Shipment -# Sendings=Shipments -# Shipment=Shipment -# Shipments=Shipments -# Receivings=Receivings -# SendingsArea=Shipments area -# ListOfSendings=List of shipments -# SendingMethod=Shipping method -# SendingReceipt=Shipping receipt -# LastSendings=Last %s shipments -# SearchASending=Search for shipment -# StatisticsOfSendings=Statistics for shipments -# NbOfSendings=Number of shipments -# NumberOfShipmentsByMonth=Number of shipments by month -# SendingCard=Shipping card -# NewSending=New shipment -# CreateASending=Create a shipment -# CreateSending=Create shipment -# QtyOrdered=Qty ordered -# QtyShipped=Qty shipped -# QtyToShip=Qty to ship -# QtyReceived=Qty received -# KeepToShip=Keep to ship -# OtherSendingsForSameOrder=Other shipments for this order -# DateSending=Date sending order -# DateSendingShort=Date sending order -# SendingsForSameOrder=Shipments for this order -# SendingsAndReceivingForSameOrder=Shipments and receivings for this order -# SendingsToValidate=Shipments to validate -# StatusSendingCanceled=Canceled -# StatusSendingDraft=Draft -# StatusSendingValidated=Validated (products to ship or already shipped) -# StatusSendingProcessed=Processed -# StatusSendingCanceledShort=Canceled -# StatusSendingDraftShort=Draft -# StatusSendingValidatedShort=Validated -# StatusSendingProcessedShort=Processed -# SendingSheet=Sending sheet -# Carriers=Carriers -# Carrier=Carrier -# CarriersArea=Carriers area -# NewCarrier=New carrier -# ConfirmDeleteSending=Are you sure you want to delete this shipment ? -# ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? -# ConfirmCancelSending=Are you sure you want to cancel this shipment ? -# GenericTransport=Generic transport -# Enlevement=Gotten by customer -# DocumentModelSimple=Simple document model -# DocumentModelMerou=Merou A5 model -# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -# DateDeliveryPlanned=Planed date of delivery -# DateReceived=Date delivery received -# SendShippingByEMail=Send shipment by EMail -# SendShippingRef=Send shipment %s -# ActionsOnShipping=Events on shipment -# LinkToTrackYourPackage=Link to track your package -# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +Receivings=Receivings +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipping card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Keep to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Sending sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang index 01c90ede80f..b1545d6ca3c 100644 --- a/htdocs/langs/mk_MK/suppliers.lang +++ b/htdocs/langs/mk_MK/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers -# Suppliers=Suppliers -# Supplier=Supplier -# AddSupplier=Add a supplier -# SupplierRemoved=Supplier removed -# SuppliersInvoice=Suppliers invoice -# NewSupplier=New supplier -# History=History -# ListOfSuppliers=List of suppliers -# ShowSupplier=Show supplier -# OrderDate=Order date -# BuyingPrice=Buying price -# BuyingPriceMin=Minimum buying price -# BuyingPriceMinShort=Min buying price -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined -# AddSupplierPrice=Add supplier price -# ChangeSupplierPrice=Change supplier price -# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -# NoRecordedSuppliers=No suppliers recorded -# SupplierPayment=Supplier payment -# SuppliersArea=Suppliers area -# RefSupplierShort=Ref. supplier -# Availability=Availability -# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -# ExportDataset_fournisseur_2=Supplier invoices and payments -# ExportDataset_fournisseur_3=Supplier orders and order lines -# ApproveThisOrder=Approve this order -# ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -# DenyingThisOrder=Denying this order -# ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -# ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -# AddCustomerOrder=Create customer order -# AddCustomerInvoice=Create customer invoice -# AddSupplierOrder=Create supplier order -# AddSupplierInvoice=Create supplier invoice -# ListOfSupplierProductForSupplier=List of products and prices for supplier %s -# NoneOrBatchFileNeverRan=None or batch %s not ran recently -# SentToSuppliers=Sent to suppliers +Suppliers=Suppliers +Supplier=Supplier +AddSupplier=Add a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Denying this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/nb_NO/accountancy.lang +++ b/htdocs/langs/nb_NO/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 8fa90e77d40..6fc6b7579d1 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Feil: Denne modulen krever Dolibarr versjon %s ErrorDecimalLargerThanAreForbidden=Feil: Presisjon over %s støttes ikke. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' og 'systemauto' for type er reservert. Du kan bruke 'user' som verdi å legge til din egen oppføring ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatisk hvis Javascript er slått av AvailableOnlyIfJavascriptNotDisabled=Tilgjengelig bare når JavaScript ikke er slått av AvailableOnlyIfJavascriptAndAjaxNotDisabled=Tilgjengelig bare hvis Javascript og Ajax ikke er slått av Required=Påkrevet +UsedOnlyWithTypeOption=Used by some agenda option only Security=Sikkerhet Passwords=Passord DoNotStoreClearPassword=Har ingen butikk klar passord i databasen men butikken bare kryptert verdi (Aktiverte anbefales) diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang index 4c4c9004fe3..0d405ccd554 100644 --- a/htdocs/langs/nb_NO/agenda.lang +++ b/htdocs/langs/nb_NO/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID hendelse Actions=Handlinger ActionsArea=Handlingsområde (Hendelser og oppgaver) -Agenda= Agenda -Agendas= Agendaer -Calendar= Kalender -Calendars= Kalendrer -LocalAgenda=Lokal kalender +Agenda=Agenda +Agendas=Agendaer +Calendar=Kalender +Calendars=Kalendrer +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Relatert til DoneBy=Utført av Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Alle åpne handlinger MenuDoneActions=Alle avsluttede handlinger MenuToDoMyActions=Mine åpne handlinger MenuDoneMyActions=Mine avsluttede handlinger -ListOfEvents=Oversikt over Dolibarr-hendelser +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Handlinger registrert av ActionsToDoBy=Handlinger relatert til ActionsDoneBy=Handlinger utført av @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL tilgang til. ICal-fil ExtSiteNoLabel=Ingen beskrivelse WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang index 9fabd9f4133..d272648cfc6 100644 --- a/htdocs/langs/nb_NO/categories.lang +++ b/htdocs/langs/nb_NO/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Komplementære attributter CategoriesSetup=Kategori-oppsett CategorieRecursiv=Link med overordnet kategori automatisk CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang index acc45333969..81f355a8e62 100644 --- a/htdocs/langs/nb_NO/companies.lang +++ b/htdocs/langs/nb_NO/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Du må opprette e-postmeldinger kontakter for tredjepa ListSuppliersShort=Liste over leverandører ListProspectsShort=Liste av prospekter ListCustomersShort=Liste over kunder -ThirdPartiesArea=Tredje parter område +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Siste %s endret tredjeparter UniqueThirdParties=Totalt unike tredjeparter InActivity=Åpent @@ -410,3 +410,5 @@ OutstandingBillReached=Nådd maks. for utestående regning MonkeyNumRefModelDesc=Tilbake numero med format %syymm-nnnn for kunden koden og %syymm-nnnn for leverandør koden der åå er året, er mm måned og nnnn er en sekvens uten pause og ingen retur til 0. LeopardNumRefModelDesc=Kunde / leverandør-koden er gratis. Denne koden kan endres når som helst. ManagingDirectors=(E) navn (CEO, direktør, president ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang index 3c9ec2a9d79..0656184c281 100644 --- a/htdocs/langs/nb_NO/compta.lang +++ b/htdocs/langs/nb_NO/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang index 898856341ac..f3b03e310b5 100644 --- a/htdocs/langs/nb_NO/donations.lang +++ b/htdocs/langs/nb_NO/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Donasjon Donations=Donasjoner -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Giver Donors=Givere AddDonation=Legg til donasjon NewDonation=Ny donasjon -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Lovet donasjon PromisesNotValid=Ikke godkjente løfter PromisesValid=Godkjente løfter @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Kladd DonationStatusPromiseValidatedShort=Godkjent DonationStatusPaidShort=Mottatt ValidPromess=Valider lover -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Opprett kvittering DonationsModels=Dokumentmal for donasjonskvitteringer LastModifiedDonations=Siste %s endret donasjoner SearchADonation=Søk etter donasjon -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang index 74b10669344..1e993ae8706 100644 --- a/htdocs/langs/nb_NO/errors.lang +++ b/htdocs/langs/nb_NO/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang index 43d8718f4f1..b8a8d1195da 100644 --- a/htdocs/langs/nb_NO/holiday.lang +++ b/htdocs/langs/nb_NO/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Startdato DateFinCP=Sluttdato @@ -18,24 +18,24 @@ ApprovedCP=Godkjent CancelCP=Kansellert RefuseCP=Nektet ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Beskrivelse -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Rediger DeleteCP=Slett ActionValidCP=Godkjenn @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Avbryt StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Oppdater -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Begrunnelse UserCP=Bruker ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Navn Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Verdi -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Godkjenn UpdateEventCP=Update events CreateEventCP=Opprett @@ -127,23 +127,23 @@ UpdateEventOptionCP=Oppdater ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang index d312a657ef4..1c7ce9ae202 100644 --- a/htdocs/langs/nb_NO/interventions.lang +++ b/htdocs/langs/nb_NO/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Er du sikker på at du vil slette denne intervensj NameAndSignatureOfInternalContact=Navn og signatur tekniker : NameAndSignatureOfExternalContact=Navn og signatutr kunde : DocumentModelStandard=Standard dokumentet modell for intervensjoner -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Klassifisere "Faktureres" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Fakturert RelatedInterventions=Relaterte intervensjoner ShowIntervention=Vis intervensjon +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Ansvarlig for å følge opp intervensjonen TypeContact_fichinter_internal_INTERVENING=Tekniker @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Generisk nummereringsmodell ArcticNumRefModelError=Feil ved aktivering PacificNumRefModelDesc1=Gir et nummer med formatet %sååmm-nnnn hvor åå er året, mm er måneden og nnnn er et løpenummer som ikke settes tilbake til null PacificNumRefModelError=Det finnes allerede et intervensjonskort som starter med $sååmm, og dette er ikke kompatibelt med denne nummereringsmodellen. Du må fjerne denne for å aktivere denne modellen. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang index ec593c17b16..62e4b1ce453 100644 --- a/htdocs/langs/nb_NO/projects.lang +++ b/htdocs/langs/nb_NO/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Handlinger på prosjektet YouAreNotContactOfProject=Du er ikke en kontakt på denne private prosjektet DeleteATimeSpent=Slett tidsbruk ConfirmDeleteATimeSpent=Er du sikker på at du vil slette denne gangen brukt? -DoNotShowMyTasksOnly=Se også oppgaver jeg er ikke påvirket -ShowMyTasksOnly=Se bare oppgaver jeg er berørt +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressurser ProjectsDedicatedToThisThirdParty=Prosjekter dedikert til denne tredje part NoTasks=Ingen oppgaver for dette prosjektet LinkedToAnotherCompany=Knyttet opp til andre tredjepart -TaskIsNotAffectedToYou=Oppgaven ikke allokert til deg +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Tid brukt er tom ThisWillAlsoRemoveTasks=Denne handlingen vil også slette alle oppgaver av prosjektet (%s oppgaver for øyeblikket) og alle innganger av medgått tid. IfNeedToUseOhterObjectKeepEmpty=Dersom noen objekter (faktura, orden, ...), som tilhører en annen tredjepart, må knyttes til prosjektet for å lage, beholde denne tomme for å få prosjektet blir flere tredjeparter. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=En komplett prosjektets rapport modell (logo. ..) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang index 00f52d72b18..0780ba80c90 100644 --- a/htdocs/langs/nb_NO/sendings.lang +++ b/htdocs/langs/nb_NO/sendings.lang @@ -13,7 +13,7 @@ LastSendings=Siste %s leveringer SearchASending=Finn levering StatisticsOfSendings=Statistikk NbOfSendings=Antall leveringer -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Leveringekort NewSending=Ny levering CreateASending=Lag en levering @@ -50,27 +50,29 @@ Enlevement=Hentet av kunde DocumentModelSimple=ENkel dokumentmodell DocumentModelMerou=Merou A5 modell WarningNoQtyLeftToSend=Advarsel, ingen produkter venter sendes. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Høvlet levering DateReceived=Dato levering mottatt SendShippingByEMail=Send forsendelse via e-post -SendShippingRef=Send forsendelse %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Hendelser på forsendelse LinkToTrackYourPackage=Lenke for å spore pakken ShipmentCreationIsDoneFromOrder=For øyeblikket er opprettelsen av en ny forsendelse gjort fra ordren kortet. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Catch av kunde SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Enkelt dokument modellen for levering kvitteringer DocumentModelTyphon=Mer fullstendig dokument modellen for levering kvitteringer (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke definert -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang index d5dbd74233a..a71a1ec74a4 100644 --- a/htdocs/langs/nb_NO/suppliers.lang +++ b/htdocs/langs/nb_NO/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Opprett innkjøpsfaktura ListOfSupplierProductForSupplier=Oversikt over produkter og priser for leverandøren %s NoneOrBatchFileNeverRan=Ingen eller batch %s ikke løp nylig SentToSuppliers=Sendt til leverandører +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/nl_NL/accountancy.lang +++ b/htdocs/langs/nl_NL/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 4e191a84619..2fc99c549b2 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s o ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan %s wordt niet ondersteund. DictionarySetup=Woordenboek setup Dictionary=Woordenboeken +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem. Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen. ErrorCodeCantContainZero=Code mag geen 0 bevatten DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatisch als Javascript is uitgeschakeld AvailableOnlyIfJavascriptNotDisabled=Alleen beschikbaar als JavaScript niet is uitgeschakeld AvailableOnlyIfJavascriptAndAjaxNotDisabled=Alleen beschikbaar als JavaScript en AJAX niet zijn uitgeschakeld Required=Verplicht +UsedOnlyWithTypeOption=Used by some agenda option only Security=Beveiliging Passwords=Wachtwoorden DoNotStoreClearPassword=Geen onversleutelde wachtwoorden opslaan in de database, maar alleen versleutelde (Activering aanbevolen) diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang index 5a6fd3c5274..057cd9bdb37 100644 --- a/htdocs/langs/nl_NL/agenda.lang +++ b/htdocs/langs/nl_NL/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID gebeurtenis Actions=Acties ActionsArea=Actieoverzicht (Gebeurtenissen en taken) -Agenda= Agenda -Agendas= Agenda's -Calendar= Kalender -Calendars= Kalenders -LocalAgenda=Lokale kalender +Agenda=Agenda +Agendas=Agenda's +Calendar=Kalender +Calendars=Kalenders +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Geaffecteerden DoneBy=Gedaan door Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Alle openstaande acties MenuDoneActions=Alle beëindigde acties MenuToDoMyActions=Mijn openstaande acties MenuDoneMyActions=Mijn beëindigde acties -ListOfEvents=Dolibarr gebeurtenissenlijst +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Acties geregistreerd door ActionsToDoBy=Acties toegewezen aan ActionsDoneBy=Acties gedaan door @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL aan. Ical bestand te openen ExtSiteNoLabel=Geen omschrijving WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index dc4d7fd1ca2..4ae5ae198e1 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementaire kenmerken CategoriesSetup=Opzetten categorieën CategorieRecursiv=Automatisch linken met bovenliggende categorie CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt. +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang index bad8270ff62..ba55536c159 100644 --- a/htdocs/langs/nl_NL/companies.lang +++ b/htdocs/langs/nl_NL/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=U dient voor de Klant eerst contactpersonen met een e- ListSuppliersShort=Leveranciersoverzicht ListProspectsShort=Prospectenoverzicht ListCustomersShort=Afnemersoverzicht -ThirdPartiesArea=Overzicht van derde partijen +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Laatste %s bewerkte derde partijen UniqueThirdParties=Totaal aantal unieke derde partijen InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Maximum bereikt voor openstaande rekening MonkeyNumRefModelDesc=Geeft een nummer als %syymm-nnnn voor afnemerscodes en %sjjmm-nnnn voor leverancierscodes waar jj het jaar is, mm de maand en nnnn een opeenvolgend nummer vanaf 0. LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang index 88556ef051e..09c4b6782fc 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Boekhouding samenvatting ByProductsAndServices=Volgens producten en diensten RefExt=Externe ref ToCreateAPredefinedInvoice=Om een ​​vooraf gedefinieerde factuur maken, maakt een standaard factuur dan, zonder te valideren, klikt u op de knop "Converteer naar voorgedefinieerde factuur". -LinkedOrder=gekoppeld aan bestelling +LinkedOrder=Link to order ReCalculate=Herberekenen Mode1=Methode 1 Mode2=Methode 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een kas boukhoudings-modus is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van betrokkenheid accountancy-modus (zie setup van boukhoud module). CalculationMode=Berekeningswijze AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard boekhoud code om producten te kopen -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standaard boekhoud code om producten te verkopen -ACCOUNTING_SERVICE_BUY_ACCOUNT=Standaard boekhoud code om diensten te kopen -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standaard boekhoud code om diensten te verkopen -ACCOUNTING_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW -ACCOUNTING_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw -ACCOUNTING_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties -ACCOUNTING_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang index bf72bd7a612..549c1831682 100644 --- a/htdocs/langs/nl_NL/donations.lang +++ b/htdocs/langs/nl_NL/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Zoek een donatie DonationRecipient=Gift ontvanger ThankYou=Dank u IConfirmDonationReception=De ontvanger verklaart ontvangst als gift van het volgende bedrag +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang index d82ec88a6bf..f56a053b476 100644 --- a/htdocs/langs/nl_NL/errors.lang +++ b/htdocs/langs/nl_NL/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Bron en doel magazijnen moeten verschillend zijn ErrorBadFormat=Verkeerd formaat! -ErrorPaymentDateLowerThanInvoiceDate=Datum van betaling (%s) kan niet voor factuurdatum zijn (%s) voor factuur %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Fout, er sommige leveringen gekoppeld met deze verzending. Schrapping geweigerd. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang index fa2ce079c18..d2e65bbc92e 100644 --- a/htdocs/langs/nl_NL/holiday.lang +++ b/htdocs/langs/nl_NL/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Begindatum DateFinCP=Einddatum @@ -18,24 +18,24 @@ ApprovedCP=Goedgekeurd CancelCP=Geannuleerd RefuseCP=Geweigerd ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Beschrijving -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Bewerken DeleteCP=Verwijderen ActionValidCP=Valideer @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Annuleren StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reden UserCP=Gebruiker ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Achternaam Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Waardering -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Valideer UpdateEventCP=Update events CreateEventCP=Creëren @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang index 33dfc276c21..54609061a56 100644 --- a/htdocs/langs/nl_NL/interventions.lang +++ b/htdocs/langs/nl_NL/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Naam en handtekening van de uitvoerder: NameAndSignatureOfExternalContact=Naam en handtekening van de afnemer: DocumentModelStandard=Standaard modeldocument voor interventies InterventionCardsAndInterventionLines=Inteventiebladen en -regels -ClassifyBilled=Classificeren "Gefactureerd" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Gefactureerd RelatedInterventions=Interventies ShowIntervention=Tonen tussenkomst +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Vertegenwoordiger die de nabehandeling van de interventie doet TypeContact_fichinter_internal_INTERVENING=Tussenliggende diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index b233de69c35..3f6d56447eb 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Acties in het project YouAreNotContactOfProject=U bent geen contactpersoon van dit privé project DeleteATimeSpent=Verwijder gespendeerde tijd ConfirmDeleteATimeSpent=Weet u zeker dat u de gespendeerde tijd wilt verwijderen? -DoNotShowMyTasksOnly=Bekijk ook taken niet aan mij toegewezen -ShowMyTasksOnly=Bekijk alleen de taken aan mij toegewezen +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Bronnen ProjectsDedicatedToThisThirdParty=Projecten gewijd aan deze derde partij NoTasks=Geen taken voor dit project LinkedToAnotherCompany=Gekoppeld aan een andere derde partij -TaskIsNotAffectedToYou=Taken niet toegewezen aan u +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Gespendeerde tijd is leeg ThisWillAlsoRemoveTasks=Deze actie zal ook alle taken van het project (%s taken op het moment) en alle ingangen van de tijd doorgebracht. IfNeedToUseOhterObjectKeepEmpty=Als sommige objecten (factuur, order, ...), die behoren tot een andere derde, moet worden gekoppeld aan het project te maken, houden deze leeg naar het project dat met meerdere derden. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Een compleet projectrapportagemodel (logo, etc) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang index 4cb99384408..eb293581bbf 100644 --- a/htdocs/langs/nl_NL/sendings.lang +++ b/htdocs/langs/nl_NL/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistiek op verzendingen die bevestigd zijn. Da DateDeliveryPlanned=Geplande leveringsdatum DateReceived=Datum leveringsonvangst SendShippingByEMail=Stuur verzending per e-mail -SendShippingRef=Stuur scheepvaart %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Acions op verzendkosten LinkToTrackYourPackage=Link naar uw pakket ShipmentCreationIsDoneFromOrder=Op dit moment, is oprichting van een nieuwe zending gedaan van de volgorde kaart. @@ -66,11 +66,13 @@ CarrierList=Lijst van transporteurs SendingMethodCATCH=Afhalen door de afnemer SendingMethodTRANS=Vervoerder SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Eenvoudig leveringsbewijs documentmodel DocumentModelTyphon=Completer leveringsbewijs documentmodel (logo, etc) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER niet gedefinieerd SumOfProductVolumes=Som van alle productvolumes SumOfProductWeights=Som van product-gewichten + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang index 4954f46200d..b7608db10a3 100644 --- a/htdocs/langs/nl_NL/suppliers.lang +++ b/htdocs/langs/nl_NL/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Voeg leveranciersfactuur toe ListOfSupplierProductForSupplier=Lijst van producten en de prijzen van de leverancier %s NoneOrBatchFileNeverRan=Geen of bundel (batch) %s niet recentelijk gedraaid SentToSuppliers=Stuur naar leveranciers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/pl_PL/accountancy.lang +++ b/htdocs/langs/pl_PL/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 72dd5fc0842..2e6738e2725 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lu ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa niż %s nie jest obsługiwany. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Kod nie może zawierać wartości "0" DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatyczne gdy JavaScript jest wyłączony AvailableOnlyIfJavascriptNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony Required=Wymagany +UsedOnlyWithTypeOption=Used by some agenda option only Security=Bezpieczeństwo Passwords=Hasła DoNotStoreClearPassword=Czy nie przechowywać hasła w sposób jasny w bazie danych diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang index 62e81885f1a..c21cd72a6dc 100644 --- a/htdocs/langs/pl_PL/agenda.lang +++ b/htdocs/langs/pl_PL/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID zdarzenia Actions=Działania ActionsArea=Obszar działań (Zdarzenia i zadania) -Agenda= Agenda -Agendas= Agendy -Calendar= Kalendarz -Calendars= Kalendarze -LocalAgenda=Kalendarz lokalny +Agenda=Agenda +Agendas=Agendy +Calendar=Kalendarz +Calendars=Kalendarze +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Przypisany do DoneBy=Wykonane przez Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Wszystkie zdarzenia niekompletne MenuDoneActions=Wszystkie zdarzenia zakończone MenuToDoMyActions=Moje działania niekompletne MenuDoneMyActions=Moje zdarzenia zakończone -ListOfEvents=Lista zdarzeń Dolibarr +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Akcje zostały zarejestrowane przez ActionsToDoBy=Zdarzenia przypisane do ActionsDoneBy=Zdarzenia wykonane przez @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL dostępu. Plik iCal ExtSiteNoLabel=Brak opisu WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang index 01c7fa59b77..9b86e6485be 100644 --- a/htdocs/langs/pl_PL/categories.lang +++ b/htdocs/langs/pl_PL/categories.lang @@ -16,7 +16,7 @@ SuppliersCategoriesArea=Dostawcy kategorii powierzchni CustomersCategoriesArea=Klienci kategorii powierzchni ThirdPartyCategoriesArea=Stron trzecich kategorii powierzchni MembersCategoriesArea=Członków kategorii obszaru -# ContactsCategoriesArea=Contacts categories area +ContactsCategoriesArea=Contacts categories area MainCats=Główne kategorie SubCats=Podkategorie CatStatistics=Statystyki @@ -50,15 +50,15 @@ SupplierIsInCategories=Trzeciej posiada do następujących kategorii dostawców CompanyIsInCustomersCategories=Wspomniana strona trzecia posiada do następujących klientów / perspektywy kategorii\nTen kontrahent posiada następujące kategorie klientów / potencjalnych klientów CompanyIsInSuppliersCategories=Wspomniana strona trzecia posiada do następujących kategorii dostawców MemberIsInCategories=Ten użytkownik posiada do następujących kategorii użytkowników -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=This contact owns to following contacts categories ProductHasNoCategory=Ten produkt / usługa nie jest w żaden kategorii SupplierHasNoCategory=To dostawca nie jest w żaden kategorii CompanyHasNoCategory=Ta firma nie jest w żaden kategorii MemberHasNoCategory=Członek ten nie jest w żadnym kategorii -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=This contact is not in any categories ClassifyInCategory=Klasyfikacja w kategorii NoneCategory=Żaden -# NotCategorized=Without category +NotCategorized=Without category CategoryExistsAtSameLevel=Ta kategoria już istnieje w tym samym miejscu ReturnInProduct=Powrót do produktów / usług karty ReturnInSupplier=Powrót do dostawcy kart @@ -66,7 +66,7 @@ ReturnInCompany=Powrót do klienta / perspektywa karty ContentsVisibleByAll=Zawartość będzie widoczny przez wszystkich ContentsVisibleByAllShort=Zawartość widoczna przez wszystkie ContentsNotVisibleByAllShort=Treść nie jest widoczna dla wszystkich -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Usuwanie kategorii ConfirmDeleteCategory=Czy na pewno chcesz usunąć tę kategorię? RemoveFromCategory=Usuń powiązanie z kategorii @@ -81,12 +81,12 @@ CustomersCategoriesShort=Klienci kategorii CustomersProspectsCategoriesShort=Custo. / prosp. kategorie ProductsCategoriesShort=Produkty kategorii MembersCategoriesShort=Członków kategorii -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contacts categories ThisCategoryHasNoProduct=Ta kategoria nie zawiera żadnych produktów. ThisCategoryHasNoSupplier=Ta kategoria nie zawiera żadnego dostawcy. ThisCategoryHasNoCustomer=Ta kategoria nie zawiera żadnych klientów. ThisCategoryHasNoMember=Ta kategoria nie zawiera żadnych członków. -# ThisCategoryHasNoContact=This category does not contain any contact. +ThisCategoryHasNoContact=This category does not contain any contact. AssignedToCustomer=Przypisany do klienta AssignedToTheCustomer=Przypisany do klienta InternalCategory=Inernal kategorii @@ -96,18 +96,19 @@ CatSupList=Lista kategorii dostawcy CatCusList=Lista klientów / perspektywa kategorii CatProdList=Lista produktów kategorii CatMemberList=Lista członków kategorii -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang index 62fc1e30367..c38e732a362 100644 --- a/htdocs/langs/pl_PL/companies.lang +++ b/htdocs/langs/pl_PL/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Musisz stworzyć e-maile, kontakty dla trzeciej pierws ListSuppliersShort=Lista dostawców ListProspectsShort=Lista potencjalnych klientów ListCustomersShort=Lista klientów -ThirdPartiesArea=Strona kontrahentów +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=%s ostatnio modyfikowanych kontrahentów UniqueThirdParties=Łącznie unikatowych kontrahentów InActivity=Otwarte @@ -410,3 +410,5 @@ OutstandingBillReached=Osiągnieto maksimum niezapłaconych rachunków MonkeyNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn klienta i kod %syymm-nnnn dla dostawcy kod yy gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0.\nZwraca numer w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie yy to rok, mm to miesiąc i nnnn jest sekwencją bez przerwy, bez powrotu do 0. LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie. ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang index e4853c56231..e8339bac60d 100644 --- a/htdocs/langs/pl_PL/compta.lang +++ b/htdocs/langs/pl_PL/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang index 21528e90934..8193fe23acb 100644 --- a/htdocs/langs/pl_PL/donations.lang +++ b/htdocs/langs/pl_PL/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Darowizna Donations=Darowizny -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Donor Donors=Darczyńcy AddDonation=Dodaj darowiznę NewDonation=Nowe wpłaty -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Prezent obietnicy PromisesNotValid=Nie potwierdzone obietnic PromisesValid=Zatwierdzona obietnic @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Szkic DonationStatusPromiseValidatedShort=Zatwierdzona DonationStatusPaidShort=Odebrane ValidPromess=Sprawdź obietnicy -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Zbuduj otrzymania DonationsModels=Dokumenty modeli oddawania wpływy LastModifiedDonations=Ostatnie %s modyfikowane darowizn SearchADonation=Szukaj darowiznę -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang index b90c05248da..696634a340e 100644 --- a/htdocs/langs/pl_PL/errors.lang +++ b/htdocs/langs/pl_PL/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang index 9d6a6d89525..3f09f0c79e9 100644 --- a/htdocs/langs/pl_PL/holiday.lang +++ b/htdocs/langs/pl_PL/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Data rozpoczęcia DateFinCP=Data zakończenia @@ -18,24 +18,24 @@ ApprovedCP=Zatwierdzony CancelCP=Odwołany RefuseCP=Odmówił ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Opis -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edytuj DeleteCP=Usunąć ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Zrezygnuj StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Uaktualnić -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Powód UserCP=Użytkownik ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Nazwa użytkownika Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Wartość -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Edytuj @@ -127,23 +127,23 @@ UpdateEventOptionCP=Uaktualnić ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang index 467d6c5cf32..924ffd5321f 100644 --- a/htdocs/langs/pl_PL/interventions.lang +++ b/htdocs/langs/pl_PL/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Czy na pewno chcesz usunąć tę linię interwencj NameAndSignatureOfInternalContact=Nazwisko i podpis interwencji: NameAndSignatureOfExternalContact=Nazwisko i podpis klienta: DocumentModelStandard=Model standardowy dokument dla interwencji -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Klasyfikowanie "Zapowiadane" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Zapowiadane RelatedInterventions=Podobne interwencje ShowIntervention=Pokaż interwencji +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Przedstawiciela w ślad za interwencję TypeContact_fichinter_internal_INTERVENING=Interwencja @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Generic numer modelu ArcticNumRefModelError=Nie można włączyć PacificNumRefModelDesc1=Wróć NUMERO z formatu %syymm rr-nnnn gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0 PacificNumRefModelError=Interwencja karty zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang index b1b995d3d41..24c44a6fe67 100644 --- a/htdocs/langs/pl_PL/projects.lang +++ b/htdocs/langs/pl_PL/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Działania w ramach projektu YouAreNotContactOfProject=Nie masz kontaktu to prywatne przedsięwzięcie DeleteATimeSpent=Czas spędzony Usuń ConfirmDeleteATimeSpent=Czy na pewno chcesz usunąć ten czas? -DoNotShowMyTasksOnly=Zobacz także zadania i nie jestem wpływ na -ShowMyTasksOnly=Zobacz zadania ja jestem tylko wpływ na +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Zasoby ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej trzeciej NoTasks=Brak zadań dla tego projektu LinkedToAnotherCompany=Powiązane z innymi trzeciej -TaskIsNotAffectedToYou=Zadanie nie przypisane do Ciebie +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Czas spędzony jest pusty ThisWillAlsoRemoveTasks=Działanie to będzie także usunąć wszystkie zadania projektu (%s zadania w tej chwili) i wszystkimi wejściami czasu spędzonego. IfNeedToUseOhterObjectKeepEmpty=Jeżeli pewne obiekty (faktura, zamówienie, ...), należące do innej osoby trzeciej, musi być związane z projektem tworzenia, zachować ten pusty mieć projekt jest multi osób trzecich. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Kompletny model projektu sprawozdania (logo. ..) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang index 443e9bccbaa..c678dc2b9f9 100644 --- a/htdocs/langs/pl_PL/sendings.lang +++ b/htdocs/langs/pl_PL/sendings.lang @@ -13,7 +13,7 @@ LastSendings=Ostatnia %s sendings SearchASending=Wyszukaj wysyłanie StatisticsOfSendings=Statystyka sendings NbOfSendings=Liczba sendings -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Wysyłanie kart NewSending=Nowe wysyłanie CreateASending=Utwórz wysyłanie @@ -50,27 +50,29 @@ Enlevement=Zgarnięte przez klienta DocumentModelSimple=Prosty wzór dokumentu DocumentModelMerou=Mérou model A5 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Strugane daty dostawy DateReceived=Data otrzymania dostawy SendShippingByEMail=Wyślij przesyłki przez e-mail -SendShippingRef=Wyślij %s przesyłki +SendShippingRef=Submission of shipment %s ActionsOnShipping=Wydarzenia na dostawy LinkToTrackYourPackage=Link do strony śledzenia paczki ShipmentCreationIsDoneFromOrder=Na razie utworzenie nowego przesyłki odbywa się z karty zamówienia. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Catch przez klientów SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Prosty dokument model dostawy wpływy DocumentModelTyphon=Więcej kompletny dokument model dostawy wpływy (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Stała EXPEDITION_ADDON_NUMBER nie zdefiniowano -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang index 29bdc720408..2f6cdd78859 100644 --- a/htdocs/langs/pl_PL/suppliers.lang +++ b/htdocs/langs/pl_PL/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Stwórz fakturę dostawcy ListOfSupplierProductForSupplier=Wykaz produktów i cen dostawcy %s NoneOrBatchFileNeverRan=Brak lub partii %s nie prowadził niedawno SentToSuppliers=Wysyłane do dostawców +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/pt_PT/accountancy.lang +++ b/htdocs/langs/pt_PT/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 85cfc54d096..8e88cdea601 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Erro, este módulo requer a versão %s ou supe ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a %s não são suportadas. DictionarySetup=Configurar Dicionário Dictionary=Dicionários +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=O código não pode conter o valor 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automático se o Javascript está desactivado AvailableOnlyIfJavascriptNotDisabled=Disponivel somente se o Javascript esta activo AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponivel somente se o Javascript e Ajax estiverem activos Required=Requerido +UsedOnlyWithTypeOption=Used by some agenda option only Security=Segurança Passwords=Palavras-Passe DoNotStoreClearPassword=Não guardar a palavra-passe sem codificar na base de dados diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang index 74aac844f74..1363003e274 100644 --- a/htdocs/langs/pt_PT/agenda.lang +++ b/htdocs/langs/pt_PT/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID do evento Actions=Acções ActionsArea=Área de Acções -Agenda= Agenda -Agendas= Agendas -Calendar= Calendário -Calendars= Calendários -LocalAgenda=Calendário local +Agenda=Agenda +Agendas=Agendas +Calendar=Calendário +Calendars=Calendários +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Afecta o DoneBy=Realizado por Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Acções a fazer MenuDoneActions=Todos os eventos terminados MenuToDoMyActions=Os meus eventos incompletos MenuDoneMyActions=Os meus eventos terminados -ListOfEvents=Lista de Eventos +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Os meus eventos reportados ActionsToDoBy=Eventos atribuídos a ActionsDoneBy=Eventos realizados por @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL para aceder. Ficheiro iCal ExtSiteNoLabel=Sem Descrição WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang index d66dd071134..06ef47aa0c3 100644 --- a/htdocs/langs/pt_PT/categories.lang +++ b/htdocs/langs/pt_PT/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Configurar Categorias CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang index 74159d98598..83024e188b6 100644 --- a/htdocs/langs/pt_PT/companies.lang +++ b/htdocs/langs/pt_PT/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Você deve criar contactos e-mails para terceiros, pri ListSuppliersShort=Lista de fornecedores ListProspectsShort=Lista das perspectivas ListCustomersShort=Lista de clientes -ThirdPartiesArea=Área de terceiros +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=%s Última modificação terceiros UniqueThirdParties=Total de originais terceiros InActivity=Aberto @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador sequêncial sem ruptura e sem Voltar a 0. LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento. ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang index fc482644769..d4d73129bf1 100644 --- a/htdocs/langs/pt_PT/compta.lang +++ b/htdocs/langs/pt_PT/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=Ref externa ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=associado à encomenda +LinkedOrder=Link to order ReCalculate=Recalcular Mode1=Método 1 Mode2=Método 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang index 790da1a9b6e..a6788f3fa03 100644 --- a/htdocs/langs/pt_PT/donations.lang +++ b/htdocs/langs/pt_PT/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Procure uma doação DonationRecipient=Destinatário do donativo ThankYou=Obrigado IConfirmDonationReception=O destinatário acusou a recepção, como um donativo, do seguinte montante +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang index e46de45abe8..ed6a020fa81 100644 --- a/htdocs/langs/pt_PT/errors.lang +++ b/htdocs/langs/pt_PT/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Erro, o php deve ter o módulo %s instalado para utili ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Os armazéns de origem e de destino não devem ser iguais ErrorBadFormat=Formato incorrecto! -ErrorPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) não pode ser anterior à data de faturação (%s) para a fatura %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang index 996875e7368..581f48d225c 100644 --- a/htdocs/langs/pt_PT/holiday.lang +++ b/htdocs/langs/pt_PT/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=RH -Holidays=Férias -CPTitreMenu=Férias +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Efectuar pedido de férias -NotActiveModCP=É necessário activar o módulo "Férias" para visualizar esta página. -NotConfigModCP=É necessário configurar o módulo "Férias" para visualizar esta página. Clique aqui para o fazer. -NoCPforUser=Não possui qualquer pedido de férias. -AddCP=Efectuar pedido de férias +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Empregado DateDebCP=Data de início DateFinCP=Data de fim @@ -18,24 +18,24 @@ ApprovedCP=Aprovado CancelCP=Cancelado RefuseCP=Recusado ValidatorCP=Approbator -ListeCP=Lista de férias +ListeCP=List of leaves ReviewedByCP=Será analisado por DescCP=Descrição -SendRequestCP=Enviar pedido de férias -DelayToRequestCP=Os pedidos de férias devem ser efectuados com, pelo menos, % s dia(s) de antecedência. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação: -ErrorIDFicheCP=Ocorreu um erro, o pedido de férias não existe. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Voltar à página anterior -ErrorUserViewCP=Não possui permissões para visualizar este pedido de férias. -InfosCP=Informações do pedido de Férias +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Pedido por -TitreRequestCP=Folha de férias -NbUseDaysCP=Número de dias de férias utilizados +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Editar DeleteCP=Apagar ActionValidCP=Validar @@ -43,26 +43,26 @@ ActionRefuseCP=Recusar ActionCancelCP=Cancelar StatutCP=Estado SendToValidationCP=Enviar para validação -TitleDeleteCP=Apagar o pedido de férias -ConfirmDeleteCP=Tem a certeza que deseja eliminar este pedido de férias? -ErrorCantDeleteCP=Não possui permissões para apagar este pedido de férias. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Actualizar -CantUpdate=Não é possível modificar este pedido de férias. +CantUpdate=You cannot update this leave request. NoDateDebut=Seleccione a data de início. NoDateFin=Seleccione a data de fim. ErrorDureeCP=O seu pedido de férias não contém dias de trabalho. TitleValidCP=Aprovar pedido de férias -ConfirmValidCP=Tema certeza que deseja aprovar este pedido de férias? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data aprovada -TitleToValidCP=Enviar pedido de férias -ConfirmToValidCP=Tem a certeza que deseja enviar este pedido de férias? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Recusar pedido de férias -ConfirmRefuseCP=Tem a certeza que deseja recusar este pedido de férias? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Deve indicar um motivo para recusar o pedido. TitleCancelCP=Cancelar o pedido de férias -ConfirmCancelCP=Tem a certeza que deseja cancelar este pedido de férias? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Razão para a rejeiçao DateRefusCP=Data de rejeição DateCancelCP=Data de cancelamento @@ -72,8 +72,8 @@ MotifCP=Motivo UserCP=Utilizador ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Realizado por UserUpdateCP=Para o utilizador PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Nome Employee=Empregado -FirstDayOfHoliday=Primeiro dia de férias -LastDayOfHoliday=Último dia de férias +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Actualização Mensal ManualUpdate=Actualização Manual -HolidaysCancelation=Cancelamento de Férias +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validar UpdateEventCP=Update events CreateEventCP=Criar @@ -127,23 +127,23 @@ UpdateEventOptionCP=Actualizar ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuração de Férias +TitleAdminCP=Configuration of Leaves #Messages Hello=Olá -HolidaysToValidate=Aprovar férias -HolidaysToValidateBody=Abaixo encontram-se os pedidos de férias por validar -HolidaysToValidateDelay=Este pedido de férias terá início em menos de %s dias. -HolidaysToValidateAlertSolde=O utilizador que efectuou este pedido de férias não tem dias disponíveis suficientes. -HolidaysValidated=Férias aprovadas -HolidaysValidatedBody=O seu pedido de férias de %s a %s foi aprovado. -HolidaysRefused=Férias recusadas -HolidaysRefusedBody=O seu pedido de férias de %s a %s foi recusado pelo seguinte motivo: -HolidaysCanceled=Férias canceladas -HolidaysCanceledBody=O seu pedido de férias de %s a %s foi cancelado. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang index 12557b65f32..5fece10ddef 100644 --- a/htdocs/langs/pt_PT/interventions.lang +++ b/htdocs/langs/pt_PT/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Nome e Assinatura do Participante: NameAndSignatureOfExternalContact=Nome e Assinatura do Cliente: DocumentModelStandard=Modelo da Norma Intervenção InterventionCardsAndInterventionLines=Fichas e Linhas de Intervenção -ClassifyBilled=Classificar "Faturado" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Faturados RelatedInterventions=Intervenções relacionadas ShowIntervention=Mostrar intervenção +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsável do Seguimiento da Intervenção TypeContact_fichinter_internal_INTERVENING=Interveniente diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang index 4afff564f64..224c0921c35 100644 --- a/htdocs/langs/pt_PT/members.lang +++ b/htdocs/langs/pt_PT/members.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - members -MembersArea=Área Membros -PublicMembersArea=Área pública dos Membros +MembersArea=Área de Membros +PublicMembersArea=Área pública de Membros MemberCard=Ficha membro -SubscriptionCard=Ficha filiação +SubscriptionCard=Ficha de Subscrição Member=Membro Members=Membros MemberAccount=Login membro @@ -10,7 +10,7 @@ ShowMember=Mostrar ficha membro UserNotLinkedToMember=Utilizador não vinculado a um membro ThirdpartyNotLinkedToMember=Terceiro não está associado a um membro MembersTickets=Etiquetas Membros -FundationMembers=Membros da associação +FundationMembers=Membros da organização Attributs=Atributos ErrorMemberTypeNotDefined=Não foi indicado o tipo de membro ListOfPublicMembers=Lista de Membros públicos @@ -93,9 +93,9 @@ SubscriptionRequired=Sujeito a cotação EditType=Edição do tipo de membro DeleteType=Eliminar VoteAllowed=Voto autorizado -Physical=Físico -Moral=Moral -MorPhy=Moral/Físico +Physical=Pessoa Singular +Moral=Pessoa Coletiva +MorPhy=Pessoa Singular/Pessoa Coletiva Reenable=Reactivar ResiliateMember=Dar de baixa um membro ConfirmResiliateMember=Está seguro de querer dar de baixa a este membro? @@ -170,7 +170,7 @@ LastSubscriptionAmount=Montante de subscrição Última MembersStatisticsByCountries=Membros estatísticas por país MembersStatisticsByState=Membros estatísticas por estado / província MembersStatisticsByTown=Membros estatísticas por cidade -MembersStatisticsByRegion=Members statistics by region +MembersStatisticsByRegion=Estatísticas do membros por região MemberByRegion=Membros por região NbOfMembers=Número de membros NoValidatedMemberYet=Nenhum membro validado encontrado diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang index c3539118df9..cd2b63fb250 100644 --- a/htdocs/langs/pt_PT/projects.lang +++ b/htdocs/langs/pt_PT/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Ações sobre o projeto YouAreNotContactOfProject=Não é um contato deste projeto privado DeleteATimeSpent=Excluir o tempo gasto ConfirmDeleteATimeSpent=Tem certeza que quer eliminar este tempo dispensado? -DoNotShowMyTasksOnly=Ver também as tarefas não atribuidas por mim -ShowMyTasksOnly=Ver tarefas atribuidas por mim +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Recursos ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro NoTasks=Não existem tarefas para este projeto LinkedToAnotherCompany=Vinculado a Terceiros -TaskIsNotAffectedToYou=Tarefa não atribuida a si +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Tempo dispensado está vazio ThisWillAlsoRemoveTasks=Esta ação também vai excluir todas as tarefas do projeto (%s tarefas no momento) e todas as entradas de tempo dispensadas. IfNeedToUseOhterObjectKeepEmpty=Caso alguns objetos (fatura, encomenda, ...), pertencentes a um terceiro, deve estar vinculado ao projeto para criar, manter este vazio para ter o projeto sendo multi-terceiros. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Selecionar elemento AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=modelo de um projeto completo do relatório (logo. ..) PlannedWorkload = Carga de trabalho planeada @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang index 952806d131c..4418a84ae42 100644 --- a/htdocs/langs/pt_PT/sendings.lang +++ b/htdocs/langs/pt_PT/sendings.lang @@ -50,27 +50,29 @@ Enlevement=Pick-up por o Cliente DocumentModelSimple=Modelo Simples DocumentModelMerou=Mérou modelo A5 WarningNoQtyLeftToSend=Atenção, não existe qualquer produto à espera de ser enviado. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Data de entrega planeada DateReceived=Data da entrega recebida SendShippingByEMail=Efectuar envio por e-mail -SendShippingRef=Enviar %s embarque +SendShippingRef=Submission of shipment %s ActionsOnShipping=Eventos em embarque LinkToTrackYourPackage=Link para acompanhar o seu pacote ShipmentCreationIsDoneFromOrder=A criação de uma nova remessa é efectuada a partir da encomenda. RelatedShippings=Envios relacionados -# ShipmentLine=Shipment line +ShipmentLine=Shipment line CarrierList=Lista de transportadores # Sending methods SendingMethodCATCH=Capturas por cliente SendingMethodTRANS=Transportador SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Modelo de documento simples de recibos de entrega DocumentModelTyphon=Modelo de documento mais completo para a entrega recibos (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER constante não definida SumOfProductVolumes=Soma dos volumes dos produtos SumOfProductWeights=Soma dos pesos dos produtos + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang index ee7aafedc5b..116f00ca116 100644 --- a/htdocs/langs/pt_PT/suppliers.lang +++ b/htdocs/langs/pt_PT/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Criar Factura do Fornecedor ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor %s NoneOrBatchFileNeverRan=Nenhum lote ou %s não executou recentemente SentToSuppliers=Enviado para os fornecedores +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/ro_RO/accountancy.lang +++ b/htdocs/langs/ro_RO/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index e298ca883b8..b0dafabe665 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -43,8 +43,10 @@ SecuritySetup=Setări Securitate ErrorModuleRequirePHPVersion=Eroare, acest modul necesită PHP versiunea %s sau mai mare ErrorModuleRequireDolibarrVersion=Eroare, acest modul Dolibarr necesită versiunea %s sau mai mare ErrorDecimalLargerThanAreForbidden=Eroare, o precizie mai mare decât %s nu este suportat. -DictionarySetup=Dictionary setup -Dictionary=Dictionaries +DictionarySetup=Setări Dictionar +Dictionary=Dicţionare +Chartofaccounts=Plan de conturi +Fiscalyear=Ani fiscali ErrorReservedTypeSystemSystemAuto=Valorile 'system' și 'systemauto' pentru tip sunt rezervate. Puteți utiliza 'user' ca valoare pentru a adăuga propriile dvs. înregistrări ErrorCodeCantContainZero=Codul nu poate conţine valoarea 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -104,9 +106,9 @@ OtherOptions=Alte opţiuni OtherSetup=Alte Setări CurrentValueSeparatorDecimal=Separator zecimal CurrentValueSeparatorThousand=Separator mii -Destination=Destination -IdModule=Module ID -IdPermissions=Permissions ID +Destination=Destinaţii +IdModule=ID Modul +IdPermissions=ID Permisiuni Modules=Module ModulesCommon=Module Principale ModulesOther=Alte Module @@ -116,9 +118,9 @@ ParameterInDolibarr=Parametru %s LanguageParameter=Parametru Limba %s LanguageBrowserParameter=Parametru %s LocalisationDolibarrParameters=Parametrii Localizare -ClientTZ=Client Time Zone (user) -ClientHour=Client time (user) -OSTZ=Server OS Time Zone +ClientTZ=Time Zone client (utilizator) +ClientHour=Client Time(utilizator) +OSTZ=Time Zone Server OS PHPTZ=Time Zone Server PHP PHPServerOffsetWithGreenwich=Offset pentru PHP server de latime Greenwich (secondes) ClientOffsetWithGreenwich=Client / Browser offset lăţime Greenwich (secunde) @@ -133,7 +135,7 @@ Box=Căsuţă Boxes=Căsuţe MaxNbOfLinesForBoxes=Max numărul de linii pentru căsuţe PositionByDefault=Poziţia implicită -Position=Position +Position=Poziţie MenusDesc=Meniuri manageri definesc conţinutul de 2 bare de meniu (bara orizontală şi bară verticală). MenusEditorDesc=Meniul editor vă permit să definiţi personalizate intrările din meniuri. Utilizaţi-l cu atenţie, pentru a evita luarea dolibarr instabilă şi intrări de meniu permanent inaccesibil.
Unele module se adaugă intrările din meniuri (în meniul Tot în cele mai multe cazuri). Dacă aţi eliminat unele din aceste intrări din greşeală, puteţi să le restaura de reenabling şi dezactivarea modulului. MenuForUsers=Meniu pentru utilizatori @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automat dacă Javascript este dezactivat AvailableOnlyIfJavascriptNotDisabled=Disponibil numai dacă nu este dezactivat JavaScript AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibil numai dacă nu este dezactivat JavaScript Required=Solicitat +UsedOnlyWithTypeOption=Used by some agenda option only Security=Securitate Passwords=Parolele DoNotStoreClearPassword=Nu stoca parole în mod clar în baza de date @@ -236,8 +239,8 @@ OfficialWiki=Dolibarr Wiki OfficialDemo=Dolibarr demo online OfficialMarketPlace=Oficial loc pe piaţă pentru modulelor externe / addons OfficialWebHostingService=Referenced web hosting services (Cloud hosting) -ReferencedPreferredPartners=Preferred Partners -OtherResources=Autres ressources +ReferencedPreferredPartners=Parteneri preferati +OtherResources=Alte Resurse ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...),
aruncăm o privire la Dolibarr Wiki:
%s ForAnswersSeeForum=Pentru orice alte întrebări / ajutor, se poate utiliza Dolibarr forum:
%s HelpCenterDesc1=Această zonă vă poate ajuta să obţineţi un suport de Ajutor de servicii pe Dolibarr. @@ -478,7 +481,7 @@ Module410Name=Webcalendar Module410Desc=Webcalendar integrare Module500Name=Special expenses (tax, social contributions, dividends) Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries -Module510Name=Salaries +Module510Name=Salarii Module510Desc=Management of employees salaries and payments Module600Name=Notificări Module600Desc=Trimite notificări (prin e-mail) pe Dolibarr de afaceri evenimente @@ -525,8 +528,8 @@ Module50100Name=Punct de Vanzare Module50100Desc=Modul Punct de Vanzare Module50200Name= PayPal Module50200Desc= Modul de a oferi o pagina de plata online prin card de credit cu Paypal -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50400Name=Contabilitate (avansat) +Module50400Desc=Management Contabilitate (partidă dublă) Module54000Name=Print lP IPrinter Module54000Desc=Printează prin serviciul Cups cu ajutorul imprimantei IPP Module55000Name=Open Poll @@ -689,10 +692,10 @@ Permission401=Citiţi cu reduceri Permission402=Creare / Modificare reduceri Permission403=Validate reduceri Permission404=Ştergere reduceri -Permission510=Read Salaries -Permission512=Create/modify salaries -Permission514=Delete salaries -Permission517=Export salaries +Permission510=Citeşte salarii +Permission512=Creare / Modificare salarii +Permission514=Şterge salarii +Permission517=Export salarii Permission531=Citeşte servicii Permission532=Creare / Modificare servicii Permission534=Ştergere servicii @@ -754,30 +757,30 @@ Permission55001=Read polls Permission55002=Create/modify polls Permission59001=Read commercial margins Permission59002=Define commercial margins -DictionaryCompanyType=Thirdparties type +DictionaryCompanyType=Tip Terţ DictionaryCompanyJuridicalType=Juridical kinds of thirdparties DictionaryProspectLevel=Prospect potential level -DictionaryCanton=State/Cantons -DictionaryRegion=Regions -DictionaryCountry=Countries -DictionaryCurrency=Currencies -DictionaryCivility=Civility title +DictionaryCanton=Stat/Judeţ +DictionaryRegion=Regiuni +DictionaryCountry=Ţări +DictionaryCurrency=Monede +DictionaryCivility=Mod adresare DictionaryActions=Type of agenda events DictionarySocialContributions=Social contributions types DictionaryVAT=VAT Rates or Sales Tax Rates DictionaryRevenueStamp=Amount of revenue stamps -DictionaryPaymentConditions=Payment terms -DictionaryPaymentModes=Payment modes +DictionaryPaymentConditions=Conditiile de plata +DictionaryPaymentModes=Moduri plată DictionaryTypeContact=Contact/Address types -DictionaryEcotaxe=Ecotax (WEEE) +DictionaryEcotaxe=Ecotax (DEEE) DictionaryPaperFormat=Paper formats -DictionaryFees=Type of fees +DictionaryFees=Tip de taxe DictionarySendingMethods=Shipping methods -DictionaryStaff=Staff +DictionaryStaff=Efectiv DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyplan=Chart of accounts +DictionaryAccountancyplan=Plan de conturi DictionaryAccountancysystem=Models for chart of accounts SetupSaved=Setup salvate BackToModuleList=Inapoi la lista de module @@ -789,7 +792,7 @@ VATIsNotUsedDesc=În mod implicit propuse de TVA este 0, care poate fi utilizat VATIsUsedExampleFR=În Franţa, aceasta înseamnă societăţilor sau organizaţiilor care au un real sistemului fiscal (Simplified reale sau normale de real). Un sistem în care TVA-ul este declarat. VATIsNotUsedExampleFR=În Franţa, înseamnă că asociaţiile care nu sunt declarate de TVA sau de companii, organizaţii sau profesiilor liberale care au ales de micro-întreprindere sistemului fiscal (TVA în franciză) şi a plătit o franciza de TVA, fără nici o declaraţie de TVA. Această opţiune va afişa de referinţă "nu se aplică TVA - art-293B din CGI" pe facturi. ##### Local Taxes ##### -LTRate=Rate +LTRate=Rată LocalTax1IsUsed=Utilizează taxa secundă LocalTax1IsNotUsed=Nu utilizează taxa secundă LocalTax1IsUsedDesc=Utilizează un al doilea tip de taxă ( altul decât TVA ) @@ -814,12 +817,12 @@ LocalTax2IsUsedDescES= Rata de RE, în mod implicit atunci când perspectivele c LocalTax2IsNotUsedDescES= În mod implicit propus IRPF este 0. Sfârşitul regulă. LocalTax2IsUsedExampleES= În Spania, liber profesionişti şi specialişti independenţi, care presta servicii şi companiile care au ales sistemul de impozitare de module. LocalTax2IsNotUsedExampleES= În Spania nu sunt afaceri care fac obiectul sistemului de impozitare de module. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Rapoarte +CalcLocaltax1ES=Vânzări - Cumpârări CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2ES=Achiziţii CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3ES=Vânzări CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul LabelOnDocuments=Eticheta de pe documente @@ -932,13 +935,13 @@ EventsSetup=Setup pentru jurnalele de evenimente LogEvents=Audit de securitate evenimente Audit=Audit InfoDolibarr=Info Dolibarr -InfoBrowser=Infos Browser +InfoBrowser=Info Browser InfoOS=Info SO InfoWebServer=Info server web InfoDatabase=Info database InfoPHP=Info PHP InfoPerf=Info performanţe -BrowserName=Browser name +BrowserName=Nume Browser BrowserOS=Browser OS ListEvents=Audit evenimente ListOfSecurityEvents=Lista de evenimente Dolibarr de securitate @@ -1022,7 +1025,7 @@ ExtraFieldsSupplierOrders=Atribute complementare (comenzi) ExtraFieldsSupplierInvoices=Atribute complementare (facturi) ExtraFieldsProject=Atribute complementare (proiecte) ExtraFieldsProjectTask=Atribute complementare (sarcini) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. +ExtraFieldHasWrongValue=Atributul %s are o valoare greşită. AlphaNumOnlyCharsAndNoSpace=numai caractere alfanumerice fără spaţiu AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space SendingMailSetup=Setup de trimiteri prin e-mail @@ -1525,17 +1528,17 @@ TaskModelModule=Modele de document de rapoarte taskuri ECMSetup = GED Setup ECMAutoTree = Arborescenţa automată este disponibilă ##### Fiscal Year ##### -FiscalYears=Fiscal years -FiscalYear=Fiscal year -FiscalYearCard=Fiscal year card -NewFiscalYear=New fiscal year -EditFiscalYear=Edit fiscal year -OpenFiscalYear=Open fiscal year -CloseFiscalYear=Close fiscal year -DeleteFiscalYear=Delete fiscal year -ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? -Opened=Opened -Closed=Closed +FiscalYears=Ani fiscali +FiscalYear=An fiscal +FiscalYearCard=Fişa An fiscal +NewFiscalYear=An fiscal nou +EditFiscalYear=Editează an fiscal +OpenFiscalYear=Deschide an fiscal +CloseFiscalYear=Închide an fiscal +DeleteFiscalYear=Şterge an fiscal +ConfirmDeleteFiscalYear=Sigur doriţi să ştergeţi acest an fiscal ? +Opened=Deschis +Closed=Închis Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang index cbb5ffaed2f..256dfc18116 100644 --- a/htdocs/langs/ro_RO/agenda.lang +++ b/htdocs/langs/ro_RO/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID eveniment Actions=Evenimente ActionsArea=Zona evenimente (acțiuni și sarcini) -Agenda= Agenda -Agendas= Agende -Calendar= Calendar -Calendars= Calendare -LocalAgenda=Calendar local +Agenda=Agenda +Agendas=Agende +Calendar=Calendar +Calendars=Calendare +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Atribuit lui DoneBy=Realizat de Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Toate evenimentele neterminate MenuDoneActions=Toate evenimentele terminate MenuToDoMyActions=Evenimentele mele neterminate MenuDoneMyActions=Evenimentele mele terminate -ListOfEvents=Lista evenimente Dolibarr +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Evenimente înregistarte de ActionsToDoBy=Evenimente atribuite lui ActionsDoneBy=Evenimente efectuate de @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL-ul pentru a accesa fişierul . ical ExtSiteNoLabel=Nici o descriere WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang index 93b737edda5..3032165936b 100644 --- a/htdocs/langs/ro_RO/banks.lang +++ b/htdocs/langs/ro_RO/banks.lang @@ -133,7 +133,7 @@ CashBudget=Buget de trezorerie PlannedTransactions=Tranzacţii Prevăzute Graph=Grafice ExportDataset_banque_1=Tranzacţii bancare şi extrase de cont -ExportDataset_banque_2=Deposit slip +ExportDataset_banque_2=Formular depunere TransactionOnTheOtherAccount=Tranzacţie pe de alt cont TransactionWithOtherAccount=Transfer Cont PaymentNumberUpdateSucceeded=Plata numărul fost actualizat cu succes diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang index 42e34f0ddf3..4e958bc4cc4 100644 --- a/htdocs/langs/ro_RO/categories.lang +++ b/htdocs/langs/ro_RO/categories.lang @@ -66,7 +66,7 @@ ReturnInCompany=Inapoi la Fişa client / prospect ContentsVisibleByAll=Conţinutul va fi vizibil pentru toţi ContentsVisibleByAllShort=Conţinut vizibil de către toţi ContentsNotVisibleByAllShort=Conţinutul nu va fi vizibil pentru toţi -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Şterge categorie ConfirmDeleteCategory=Sigur doriţi să ştergeţi această categorie? RemoveFromCategory=Eliminaţi link-ul cu Categoria @@ -105,9 +105,10 @@ CatProdLinks=Legături dintre produse/servicii şi categorii CatCusLinks=Legături dintre clienţi/prospecte şi categorii CatSupLinks=Legături dintre furnizori şi categorii DeleteFromCat=Elimină din categorii -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang index 496133b1829..ac08a1819dd 100644 --- a/htdocs/langs/ro_RO/companies.lang +++ b/htdocs/langs/ro_RO/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Trebuie să creați e-mailuri de contact pentru terţi ListSuppliersShort=Lista furnizori ListProspectsShort=Lista prospecte ListCustomersShort=Lista clienţi -ThirdPartiesArea=Zona Terţi +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Ultimii %s terţi modificaţi UniqueThirdParties=Total terţi unici InActivity=Deschis @@ -410,3 +410,5 @@ OutstandingBillReached=Max. atins pentru facturi in suspensie MonkeyNumRefModelDesc=Retrimite numărulcu formatul %syymm-nnnn pentru codul de client și %syymm-nnnn pentru codul de furnizor unde YY este anul, mm este luna și nnnn este o secvență continuă și fără să revină la 0. LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi modificat în orice moment. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang index 333fabb0205..99e1ac8f6d3 100644 --- a/htdocs/langs/ro_RO/compta.lang +++ b/htdocs/langs/ro_RO/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Sinteză Contabilitate ByProductsAndServices=După produse şi servicii RefExt=Referinţă externă ToCreateAPredefinedInvoice=Pentru a crea o factură predefinită, creaşi o factură standard, apoi, fără validarea aceasteia, faceți clic pe butonul"Converteşte ca factură predefinită". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculează Mode1=Method 1 Mode2=Metoda 2 @@ -202,5 +202,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Contul contabil implicit pentru terţii clienţi -ACCOUNTING_ACCOUNT_SUPPLIER=Contul contabil implicit pentru terţii furnizori +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/ro_RO/dict.lang b/htdocs/langs/ro_RO/dict.lang index 5910c295f25..431816c8561 100644 --- a/htdocs/langs/ro_RO/dict.lang +++ b/htdocs/langs/ro_RO/dict.lang @@ -253,7 +253,6 @@ CivilityMR=Dl CivilityMLE=Doamna CivilityMTRE=Maestru CivilityDR=Doctor - ##### Currencies ##### Currencyeuros=Euro CurrencyAUD=Dolar AU @@ -290,10 +289,10 @@ CurrencyXOF=CFA BCEAO Franci CurrencySingXOF=CFA franc BCEAO CurrencyXPF=PCP franci CurrencySingXPF=PCP franc - CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=mii - #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Mailing campanie @@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=din gură în gură DemandReasonTypeSRC_PARTNER=Partener DemandReasonTypeSRC_EMPLOYEE=Angajat DemandReasonTypeSRC_SPONSORING=Sponsor - #### Paper formats #### PaperFormatEU4A0=Format 4A0 PaperFormatEU2A0=Format 2A0 diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang index e2f881e539f..3a99e656af4 100644 --- a/htdocs/langs/ro_RO/donations.lang +++ b/htdocs/langs/ro_RO/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Caută o donaţie DonationRecipient=Beneficiar donaţie ThankYou=Vă multumim IConfirmDonationReception=Beneficiarul declară primirea, ca donaţie , a următoarei sume +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang index c776db3534a..ccec4530505 100644 --- a/htdocs/langs/ro_RO/errors.lang +++ b/htdocs/langs/ro_RO/errors.lang @@ -27,9 +27,9 @@ ErrorProdIdIsMandatory=%s este obligatoriu ErrorBadCustomerCodeSyntax=Bad sintaxă pentru codul de client ErrorBadBarCodeSyntax=Bad syntax for bar code ErrorCustomerCodeRequired=Clientul codul necesar -ErrorBarCodeRequired=Bar code required +ErrorBarCodeRequired=Cod de bare cerut ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja -ErrorBarCodeAlreadyUsed=Bar code already used +ErrorBarCodeAlreadyUsed=cod bare utilizat deja ErrorPrefixRequired=Prefix necesare ErrorUrlNotValid=Site-ul este incorect adresa ErrorBadSupplierCodeSyntax=Bad sintaxă pentru furnizor cod @@ -39,7 +39,7 @@ ErrorBadParameters=Bad parametrii ErrorBadValueForParameter=Valoarea greşită "%s" incorecte "pentru parametrul de %s ErrorBadImageFormat=Fişier de imagine nu are un format acceptat ErrorBadDateFormat="%s" Valoarea are formatul de dată greşit -ErrorWrongDate=Date is not correct! +ErrorWrongDate=Data nu este corecta! ErrorFailedToWriteInDir=Nu a reuşit să scrie în directorul %s ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Found incorecte de email sintaxă pentru %s linii în fişier (de exemplu linia de e-mail cu %s= %s) ErrorUserCannotBeDelete=Utilizatorul nu poate fi şters. Mai fi ce este asociată pe Dolibarr entităţi. @@ -74,7 +74,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=Nu se poate salva o acţiune cu "statut ErrorRefAlreadyExists=Ref utilizate pentru crearea există deja. ErrorPleaseTypeBankTransactionReportName=Vă rugăm să scrieţi numele băncii primirea în cazul în care tranzacţia este raportate (Format YYYYMM sau YYYYMMDD) ErrorRecordHasChildren=Nu a reuşit să ştergeţi înregistrări, deoarece acesta are unele Childs. -ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorRecordIsUsedCantDelete=Nu se ppate sterge inregistrarea. Este inca utilizata sau inclusa intr-un alt obiect ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivate pentru a avea această facilitate de lucru. Pentru a activa / dezactiva Javascript, du-te la meniul Home-> Configurare-> Display. ErrorPasswordsMustMatch=Ambele parolele tastate trebuie să se potrivească reciproc ErrorContactEMail=O eroare de tehnică avut loc. Vă rugăm, contactaţi administratorul de a urma %s de e-mail ro oferi %s cod de eroare în mesajul Dvs., sau chiar mai bine prin adăugarea o copie ecran a acestei pagini. @@ -132,10 +132,11 @@ ErrorPaymentModeDefinedToWithoutSetup=Un modul de plată a fost setat la tipul% ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modul %s instalat pentru a utiliza această funcţionalitate. ErrorOpenIDSetupNotComplete=Trebuie setat fișier de configurare Dolibarr pentru a permite autentificarea OpenID, dar URL-ul serviciului OpenID nu este definit în constanta %s ErrorWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere -ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. +ErrorBadFormat=Format gresit! ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Atenție, folosind această casetă încetiniţi ser WarningClickToDialUserSetupNotComplete=Setările informațiilor ClickToDial pentru userul dvs. nu sunt complete (vezi tabul ClickToDial pe fişal dvs. de utilizator). WarningNotRelevant=Operaţiuni irelevante pentru acest dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang index 2c0416d083a..abd06541d7a 100644 --- a/htdocs/langs/ro_RO/holiday.lang +++ b/htdocs/langs/ro_RO/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Vacanţe -CPTitreMenu=Vacanţe +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Situaţia lunară -MenuAddCP=Aplică pentru concediu -NotActiveModCP=Trebuie să activaţi modulul de concedii pentru a vedea această pagină. -NotConfigModCP=Trebuie să configuraţi modulul de concedii pentru a vedea această pagină.Pentru aceasta , clic aici . -NoCPforUser=Nu aveţi o cerere de concediu. -AddCP=Aplică pentru concediu +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Angajat DateDebCP=Dată început DateFinCP=Dată sfărşit @@ -18,24 +18,24 @@ ApprovedCP=Aprobat CancelCP=Şters RefuseCP=Refuzat ValidatorCP=Aprobator -ListeCP=Listă vacanţe +ListeCP=List of leaves ReviewedByCP=Va fi revăzut de DescCP=Descriere -SendRequestCP=Creare cerere de concediu -DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin %s zi(le) înainte. -MenuConfCP=Editează soldul concediilor -UpdateAllCP=Actualizează concediile -SoldeCPUser=Soldul concediilor este de %s zile. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Trebuie să selectaţi data de sfârşit mai mare decât data de început. ErrorSQLCreateCP=O eroare SQL întâlnită în timpul creării: -ErrorIDFicheCP=O eroare a intervenit, cererea de concediu nu exista +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Înapoi la pagina precedentă -ErrorUserViewCP=Dvs nu aveti dreptul de a citi aceata cerere de concediu. -InfosCP=Informaţii ale cererii de concediu +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Flux de lucru Informatii RequestByCP=Solicitat de -TitreRequestCP=Foaia concediilor -NbUseDaysCP=Numărul de zile de concediu consumate +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Editare DeleteCP=Ştergere ActionValidCP=Validare @@ -43,26 +43,26 @@ ActionRefuseCP=Refuzare ActionCancelCP=Anulare StatutCP=Status SendToValidationCP=Trimite spre validare -TitleDeleteCP=Şterge cererile de concediu -ConfirmDeleteCP=Confirmaţi ştergerea a acestei cereri de concediu? -ErrorCantDeleteCP=Eroare, dvs nu aveti drepturi de stergere acestei cereri de concediu. -CantCreateCP=Nu aveţi dreptul de a aplica pentru concediu -InvalidValidatorCP=Dvs trebuie sa alegeti un validator pentru cererea dvs de concediu. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Actualizare -CantUpdate=Nu puteţi actualiza această cerere de concediu. +CantUpdate=You cannot update this leave request. NoDateDebut=Trebuie să selectaţi data de debut. NoDateFin=Trebuie să selectaţi data de sfârşit. ErrorDureeCP=Cererea dvs pentru concediu nu conţine zile lucrătoare. TitleValidCP=Aprobaţi cererile de concediu -ConfirmValidCP=Sunteţi sigur că doriţi să aprobaţi această cerere de concediu ? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data aprobării -TitleToValidCP=Trimite cererea de concediu -ConfirmToValidCP=Sunteţi sigur că doriţi să trimiteţi această cerere de concediu? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuză cererea de concediu -ConfirmRefuseCP=Sunteţi sigur că doriţi să refuzaţi această cerere de concediu? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Trebuie să alegeţi un motiv pentru refuzarea cererii. TitleCancelCP=Anulează cererea de concediu -ConfirmCancelCP=Sunteţi sigur că doriţi să anulaţi cererea de concediu? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motivul refuzului DateRefusCP=Data refuzului DateCancelCP=Data anulării @@ -72,8 +72,8 @@ MotifCP=Motiv UserCP=Utilizator ErrorAddEventToUserCP=O eroare a survenit in timpul adaugarii de concediu exceptional. AddEventToUserOkCP=Adaugarea de concediu exceptional a fost efectuat -MenuLogCP=Vezi logurile concediilor -LogCP=Loguri de actualizari concedii +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Realizat de UserUpdateCP=Pentru utilizatorul PrevSoldeCP=Soldul precedent @@ -81,33 +81,33 @@ NewSoldeCP=Soldul nou alreadyCPexist=O cerere de concediu a fost deja făcută pe această perioadă. UserName=Nume Employee=Angajat -FirstDayOfHoliday=Prima zi a concediului -LastDayOfHoliday=Ultima zi a concediului +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Actualizare lunară ManualUpdate=Actualizare manuală -HolidaysCancelation=Anulare vacanţe +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configurarea modulului concedii DescOptionCP=Descrierea opţiunii ValueOptionCP=Valoare -GroupToValidateCP=Grup cu drepturi de validare a concediilor +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validare configuraţie -LastUpdateCP=Ultima actualizare automată a concediilor +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Actualizare realizată. ErrorUpdateConfCP=O eroare a apărut în timpul actualizării, încercaţi din nou. AddCPforUsers=Adaugaţi soldul concediului al utilizatorului la clic aici. DelayForSubmitCP=Termen maxim de a aplica pentru concediu AlertapprobatortorDelayCP=Previne aprobatorul daca cerere de concediu nu corespunde cu data limită -AlertValidatorDelayCP=Preveine aprobatorul dacă cererea de concediu depaseste perioada de anuntare -AlertValidorSoldeCP=Previne aprobatorul daca utilizatorul cere zile de concediu ce depaseste soldul -nbUserCP=Numarul utilizatorilor suportaţi în modulul concedii -nbHolidayDeductedCP=Setări a concediilor corelate la evenimente -nbHolidayEveryMonthCP=Numarul de concedii adaugate în fiecare lună -Module27130Name= Managementul vacanţelor -Module27130Desc= Managementul vacanţelor -TitleOptionMainCP=Setări principale vacanţe -TitleOptionEventCP=Setări concedii referitoare la evenimente +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Vaidare UpdateEventCP=Evenimente actualizate CreateEventCP=Creare @@ -127,23 +127,23 @@ UpdateEventOptionCP=Modifică ErrorMailNotSend=O eroare a intervenit la trimiterea mailului : NoCPforMonth=Niciun concediu această lună. nbJours=Număr zile -TitleAdminCP=Configurarea Concediilor +TitleAdminCP=Configuration of Leaves #Messages Hello=Salut -HolidaysToValidate=Concedii validate -HolidaysToValidateBody=Mai jos este o cerere de concediu de validat -HolidaysToValidateDelay=Această cerere de concediuva avea loc intr-o perioadă mai puţin de %s zile. -HolidaysToValidateAlertSolde=Utilizatorul care a făcut această cerere de concediu nu avea destule zile disponibile. -HolidaysValidated=Vacanţe validate -HolidaysValidatedBody=Cererea dvs pentru concediu pentru %s la %s a fost validată. -HolidaysRefused=Concedii respinse -HolidaysRefusedBody=Cererea dvs pentru concediu pentru %s la %s a fost respinsă pentru următoul motiv: -HolidaysCanceled=Concedii anulate -HolidaysCanceledBody=Cererea dvs pentru concediu pentru %s la %s a fost anulată. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Revezi logurile ale concediilor modificate -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang index 377836c4819..9c30de5e36a 100644 --- a/htdocs/langs/ro_RO/interventions.lang +++ b/htdocs/langs/ro_RO/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Nume şi semnătură celui ce a intervenit: NameAndSignatureOfExternalContact=Nume şi semnătură client: DocumentModelStandard=Model standard document de intervenţii InterventionCardsAndInterventionLines=Intervenţii şi linii ale intervenţiilor -ClassifyBilled=Clasează Facturat +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Facturat RelatedInterventions=Intervenţii asociate ShowIntervention=Afişează intervenţie +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Reprezentant urmărire intervenţie TypeContact_fichinter_internal_INTERVENING=Realizator intervenţie diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index 92a8b0f81c3..d36e70a2bbc 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -356,7 +356,7 @@ ActionNotApplicable=Nu se aplică ActionRunningNotStarted=De realizat ActionRunningShort=Început ActionDoneShort=Terminat -ActionUncomplete=Uncomplete +ActionUncomplete=Incomplet CompanyFoundation=Societate sau Instituţie ContactsForCompany=Contacte pentru aceast terţ ContactsAddressesForCompany=Contacte pentru aceast terţ @@ -508,7 +508,7 @@ NbOfCustomers=Număr clienţi NbOfLines=Număr linii NbOfObjects=Număr obiecte NbOfReferers=Număr referinţe -Referers=Refering objects +Referers=Obiecte referite TotalQuantity=Cantitatea totală DateFromTo=De la %s la %s DateFrom=Începând cu %s @@ -645,6 +645,7 @@ OptionalFieldsSetup=Setări atribute suplimentare URLPhoto=Url către foto/logo SetLinkToThirdParty=Link către un alt terţ CreateDraft=Creareză ciornă +SetToDraft=Inapoi la Draft ClickToEdit=Clic pentru a edita ObjectDeleted=Obiect %s şters ByCountry=Pe ţară @@ -672,12 +673,12 @@ HelpCopyToClipboard=Utilizați Ctrl + C pentru a copia în clipboard SaveUploadedFileWithMask=Salvați fișierul pe server cu numele "%s" (altfel"%s") OriginFileName=Nume fişier original SetDemandReason=Setează sursa -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Defineste Cont bancar +AccountCurrency=Moneda Contabilitate ViewPrivateNote=Vezi notițe XMoreLines=%s linii(e) ascunse PublicUrl=URL Public -AddBox=Add box +AddBox=Adauga box # Week day Monday=Luni diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang index bbe22906c65..6f95e6755ef 100644 --- a/htdocs/langs/ro_RO/projects.lang +++ b/htdocs/langs/ro_RO/projects.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Ref. project -ProjectId=Project Id +RefProject=Ref. proiect +ProjectId=ID proiect Project=Proiect Projects=Proiecte SharedProject=Toată lumea @@ -32,18 +32,18 @@ TimeSpent=Timp comsumat TimesSpent=Timpi consumaţi RefTask=Ref. Task LabelTask=Eticheta Task -TaskTimeSpent=Time spent on tasks -TaskTimeUser=User -TaskTimeNote=Note -TaskTimeDate=Date +TaskTimeSpent=Timp consumat pe task +TaskTimeUser=Utilizator +TaskTimeNote=Nota +TaskTimeDate=Data NewTimeSpent=Timp nou consumat MyTimeSpent=Timpul meu consumat MyTasks=TAskurile mele Tasks=Taskuri Task=Task -TaskDateStart=Task start date -TaskDateEnd=Task end date -TaskDescription=Task description +TaskDateStart=Data start task +TaskDateEnd=Data de final task +TaskDescription=Descriere task NewTask=Task nou AddTask=Adaugă Task AddDuration=Adaugă durată @@ -85,13 +85,13 @@ ActionsOnProject=Evenimente pe proiect YouAreNotContactOfProject=Nu sunteţi un contact al acestui proiect privat DeleteATimeSpent=Ştergeţi timpul consumat ConfirmDeleteATimeSpent=Ssigur doriţi să ştergeţi acest timp consumat? -DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie -ShowMyTasksOnly=Vezi numai taskurile atribuite mie +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Resurse ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ NoTasks=Nr sarcini pentru acest proiect LinkedToAnotherCompany=Legat de terţe părţi, alta -TaskIsNotAffectedToYou=Sarcina nu alocate pentru tine +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Timpul consumat nu este completat ThisWillAlsoRemoveTasks=Această acţiune va şterge, de asemenea, toate taskurile proiectului (%s ) la acest moment şitoţi timpii petrecuţi. IfNeedToUseOhterObjectKeepEmpty=Dacă unele obiecte (facturi, comenzi, ...), care aparţin altui terţ, trebuie să fie legate de proiect, pentru creare, menţine acest gol pentru a avea proiectul fiind multiterţi. @@ -106,9 +106,9 @@ ProjectReportDate=Schimbă data taskului conform cu data de debut a proiectului ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului ProjectsAndTasksLines=Proiecte şi taskuri ProjectCreatedInDolibarr=Proiect %s creat -TaskCreatedInDolibarr=Task %s created -TaskModifiedInDolibarr=Task %s modified -TaskDeletedInDolibarr=Task %s deleted +TaskCreatedInDolibarr=Task %s creat +TaskModifiedInDolibarr=Task %s modificat +TaskDeletedInDolibarr=Task %s sters ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Şef de Proiect TypeContact_project_external_PROJECTLEADER=Şef de Proiect @@ -120,11 +120,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Selectați elementul AddElement=Link către element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Modelul de rapor al unui proiect complet t (logo. ..) PlannedWorkload = Volum de lucru Planificat WorkloadOccupation= Volum de lucru Procent ProjectReferers=Obiecte asociate -SearchAProject=Search a project +SearchAProject=Cauta proiect ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects +ProjectDraft=Proiecte draft +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang index 0ad770b7db7..3dde850405b 100644 --- a/htdocs/langs/ro_RO/salaries.lang +++ b/htdocs/langs/ro_RO/salaries.lang @@ -1,8 +1,12 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cont contabil pentru plata salariilor +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cont contabil pentru cheltuieli financiare +Salary=Salariu +Salaries=Salarii Employee=Angajat NewSalaryPayment=Plata noua salariu SalaryPayment=Plata salariu SalariesPayments=Plati salarii ShowSalaryPayment=Arata plata salariu +THM=Pret mediu pe ora +TJM=Pret mediu zilnic diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang index 933a2d43402..46203a59c29 100644 --- a/htdocs/langs/ro_RO/sendings.lang +++ b/htdocs/langs/ro_RO/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statisticil ectuate privind numai livrările valid DateDeliveryPlanned=Data de livrare planificată DateReceived=Data de livrare reală SendShippingByEMail=Trimite dispoziţia de livrare prin e-mail -SendShippingRef=Trimite dispoziţia de livrare %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Evenimente pe livrare LinkToTrackYourPackage=Link pentru a urmări pachetul dvs ShipmentCreationIsDoneFromOrder=Pentru moment, crearea unei noi livrări se face din fişa comenzii. @@ -66,11 +66,13 @@ CarrierList=Lista transportatori SendingMethodCATCH=Colectată de client SendingMethodTRANS=Transportator SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Model simplu pentru dispoziţie de livrare DocumentModelTyphon=Model complet pentru dispoziţie de livrare (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constanta EXPEDITION_ADDON_NUMBER nu este definită SumOfProductVolumes=Volumul total al produselor SumOfProductWeights=Greutatea totală a produselor + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang index 07cbe484dab..f9018371052 100644 --- a/htdocs/langs/ro_RO/stocks.lang +++ b/htdocs/langs/ro_RO/stocks.lang @@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Comanda nu mai este sau nu mai are un statut care StockDiffPhysicTeoric=Motivul pentru diferenţa dintre stocurile fizice şicele teoretice NoPredefinedProductToDispatch=Nu sunt produse predefinite pentru acest obiect. Deci, nici o dispecerizare în stoc necesară. DispatchVerb=Dispecerizează -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=Limita pentru alerta +StockLimit=Stoc limită pentru alerta PhysicalStock=Stoc Fizic RealStock=Stoc Real VirtualStock=Stoc Virtual @@ -96,11 +96,11 @@ Replenishment=Reaprovizionare ReplenishmentOrders=Comenzi reaprovizionare VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature -UseVirtualStock=Use virtual stock -UsePhysicalStock=Use physical stock -CurentSelectionMode=Curent selection mode -CurentlyUsingVirtualStock=Virtual stock -CurentlyUsingPhysicalStock=Physical stock +UseVirtualStock=Utilizeaza Stoc Virtual +UsePhysicalStock=Utilizeaza Stoc Fizic +CurentSelectionMode=Mod selectie curent +CurentlyUsingVirtualStock=Stoc Virtual +CurentlyUsingPhysicalStock=Stoc Fizic RuleForStockReplenishment=Reguli pentru reaprovizionarea stocului SelectProductWithNotNullQty=Selectați cel puțin un produs cu cantitatea nenulă și un furnizor AlertOnly= Numai Alerte @@ -118,7 +118,7 @@ SelectProductInAndOutWareHouse=Selectați un produs, o cantitate, un depozit sur RecordMovement=Înregistrare transfer ReceivingForSameOrder=Recepţii pentru această comandă StockMovementRecorded=Stock movements recorded -RuleForStockAvailability=Rules on stock requirements +RuleForStockAvailability=Reguli pentru cereri stoc StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang index 84641224b57..cba0bff3e21 100644 --- a/htdocs/langs/ro_RO/suppliers.lang +++ b/htdocs/langs/ro_RO/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Crează factură furnizor ListOfSupplierProductForSupplier=Lista produse şi preţuri pentru furnizorul %s NoneOrBatchFileNeverRan=Nici una sau tratate %s ne executate recent SentToSuppliers=Trimite la furnizori +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/ru_RU/accountancy.lang +++ b/htdocs/langs/ru_RU/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index ad8925b7feb..2f3924ef90e 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Ошибка, этот модуль требу ErrorDecimalLargerThanAreForbidden=Ошибка, точность выше, чем %s, не поддерживается. DictionarySetup=Настройка словаря Dictionary=Словари +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Значение 'system' и 'systemauto' для типа зарезервировано. Вы можете использовать значение 'user' для добавления вашей собственной записи ErrorCodeCantContainZero=Код не может содержать значение 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Автоматически, если Javascript о AvailableOnlyIfJavascriptNotDisabled=Доступно, только если JavaScript не отключен AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно, только если JavaScript не отключен Required=Обязательный +UsedOnlyWithTypeOption=Used by some agenda option only Security=Безопасность Passwords=Пароли DoNotStoreClearPassword=Не храните пароли в чистом виде в базе данных - храните зашифрованные значения (Рекомендуем) diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang index 0be572060d0..709c39ab119 100644 --- a/htdocs/langs/ru_RU/agenda.lang +++ b/htdocs/langs/ru_RU/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID события Actions=События ActionsArea=Действия области (События и задач) -Agenda= Повестка дня -Agendas= Повестка дня -Calendar= Календарь -Calendars= Календари -LocalAgenda=Местный календарь +Agenda=Повестка дня +Agendas=Повестка дня +Calendar=Календарь +Calendars=Календари +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Ответств. DoneBy=Сделано Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Все незавершенные события MenuDoneActions=Все прекращенные события MenuToDoMyActions=Мои незавершенные события MenuDoneMyActions=Мои прекращенные события -ListOfEvents=Список Dolibarr событий +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Действия зарегистрированы ActionsToDoBy=События назначенные ActionsDoneBy=Действия, проделанную @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL для доступа. Ческих файлов ExtSiteNoLabel=Нет описания WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang index 06a821c24e5..c9179be2bb4 100644 --- a/htdocs/langs/ru_RU/categories.lang +++ b/htdocs/langs/ru_RU/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Дополнительные атрибуты CategoriesSetup=Настройка категорий CategorieRecursiv=Автоматически связать с родительской категорией CategorieRecursivHelp=Если активировать, то продукт будет связан с родительской категорией при добавлении в подкатегорию +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang index e25c1123ade..d453f1b3fba 100644 --- a/htdocs/langs/ru_RU/companies.lang +++ b/htdocs/langs/ru_RU/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Вы должны сначала создать кон ListSuppliersShort=Список поставщиков ListProspectsShort=Список потенц. клиентов ListCustomersShort=Список покупателей -ThirdPartiesArea=Область контрагентов +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Последние %s измененных контрагентов UniqueThirdParties=Всего уникальных контрагентов InActivity=Открыто @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0. LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang index 4dc595627ee..61902cc19f6 100644 --- a/htdocs/langs/ru_RU/compta.lang +++ b/htdocs/langs/ru_RU/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=По продуктам и услугам RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=Связано с заказом +LinkedOrder=Link to order ReCalculate=Пересчитать Mode1=Метод 1 Mode2=Метод 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang index 8404cc729cb..bb883e3a0d2 100644 --- a/htdocs/langs/ru_RU/donations.lang +++ b/htdocs/langs/ru_RU/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Пожертвование Donations=Пожертвования -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Донор Donors=Доноры AddDonation=Добавить пожертвование NewDonation=Новое пожертвование -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Обещание пожертвования PromisesNotValid=Неподтвержденные обещания PromisesValid=Подтвержденные обещания @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Проект DonationStatusPromiseValidatedShort=Подтверждено DonationStatusPaidShort=Получено ValidPromess=Подтвердить обещание -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Создать подтверждение получения DonationsModels=Модели документов для подтверждение получения пожертвования LastModifiedDonations=Последние %s измененных пожертвований SearchADonation=Поиск пожертвования -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang index 39578cf5daf..a4f06909eab 100644 --- a/htdocs/langs/ru_RU/errors.lang +++ b/htdocs/langs/ru_RU/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Неправильный формат! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Обязательные параметры не определены @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang index 0c48cd60953..1018ab82ace 100644 --- a/htdocs/langs/ru_RU/holiday.lang +++ b/htdocs/langs/ru_RU/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=Вы должны включить модуль Выходные для просмотра данной страницы -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Сотрудник DateDebCP=Начальная дата DateFinCP=Конечная дата @@ -18,24 +18,24 @@ ApprovedCP=Утверждено CancelCP=Отменено RefuseCP=Отказано ValidatorCP=Утвердивший -ListeCP=Список выходных дней +ListeCP=List of leaves ReviewedByCP=Проверит DescCP=Описание -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Заявки на отпуск должны быть сделаны как минимум за %s дня(ей) до него. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Обновить выходные дни -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Выберите конечную дату позже чем начальную. ErrorSQLCreateCP=Ошибка SQL возникла во время создания: -ErrorIDFicheCP=Возникла ошибка, запроса на выходные дни не существует +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Вернуться на предыдущую страницу -ErrorUserViewCP=У вас нет прав на просмотр списка выходных дней -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=График отпусков -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Редактировать DeleteCP=Удалить ActionValidCP=Проверить @@ -43,26 +43,26 @@ ActionRefuseCP=Отказать ActionCancelCP=Отмена StatutCP=Статус SendToValidationCP=Отправить на проверку -TitleDeleteCP=Удалить заявку на выходные дни -ConfirmDeleteCP=Подтверждаете удаление этой заявки на выходные? -ErrorCantDeleteCP=Ошибка, вы не имеете права на удаление заявки на выходные дни -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=Вы должны выбрать того, кто утвердить вашу заявку на выходные дни. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Обновить -CantUpdate=Вы не можете обновлять этот запрос на выходные дни +CantUpdate=You cannot update this leave request. NoDateDebut=Вы должны выбрать начальную дату NoDateFin=Вы должны выбрать конечную дату ErrorDureeCP=Ваш запрос на выходной не содержит рабочих дней TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Дата утверждена -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Вы должны выбрать причину отказа на запрос о выходных днях TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Причина отказа DateRefusCP=Дата отказа DateCancelCP=Дата отмены @@ -72,8 +72,8 @@ MotifCP=Причина UserCP=Пользователь ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=Для пользователя PrevSoldeCP=Предыдущий баланс @@ -81,33 +81,33 @@ NewSoldeCP=Новый баланс alreadyCPexist=A request for holidays has already been done on this period. UserName=Имя Employee=Сотрудник -FirstDayOfHoliday=Первый день отпуска -LastDayOfHoliday=Последний день отпуска +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Ежемесячное обновление ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Настройка модуля выходных дней DescOptionCP=Описание опции ValueOptionCP=Значение -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Проверить конфигурацию -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Обновлено успешно ErrorUpdateConfCP=Во время обновления произошла ошибка. Пожалуйста, попробуйте еще раз. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Проверить UpdateEventCP=Update events CreateEventCP=Создать @@ -127,23 +127,23 @@ UpdateEventOptionCP=Обновить ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang index cd6b9106a58..25c47fa96a5 100644 --- a/htdocs/langs/ru_RU/interventions.lang +++ b/htdocs/langs/ru_RU/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Вы уверены, что хотите удал NameAndSignatureOfInternalContact=Имя и подпись вмешательства: NameAndSignatureOfExternalContact=Имя и подпись клиента: DocumentModelStandard=Стандартная модель документа для выступлений -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Классифицировать "Объявленный" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Объявленный RelatedInterventions=Связанные с ней мероприятия ShowIntervention=Показать вмешательства +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Представители следующих мер вмешательства TypeContact_fichinter_internal_INTERVENING=Вмешательство @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Общие номера модели ArcticNumRefModelError=Ошибка при активации PacificNumRefModelDesc1=Вернуться Numero с форматом %syymm-YY, где NNNN это год, мм в месяц, и это NNNN последовательности без перерыва и не вернуться до 0 PacificNumRefModelError=Вмешательство карточки начиная с $ syymm уже и не совместимы с этой моделью последовательности. Удалить или переименовать его, чтобы активировать этот модуль. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang index 4e12d779682..85f329b89b2 100644 --- a/htdocs/langs/ru_RU/projects.lang +++ b/htdocs/langs/ru_RU/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Действия по проекту YouAreNotContactOfProject=Вы не контакт этого частного проекта DeleteATimeSpent=Удалить времени ConfirmDeleteATimeSpent=Вы уверены, что хотите удалить этот раз провели? -DoNotShowMyTasksOnly=См. также задачи, я не влияет на -ShowMyTasksOnly=Открыть только задачи я затронутые +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Библиография ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне NoTasks=Нет задач, для этого проекта LinkedToAnotherCompany=Связь с другими третий участник -TaskIsNotAffectedToYou=Задача не выделено для вас +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Время, проведенное пуста ThisWillAlsoRemoveTasks=Это действие приведет к удалению всех задач проекта (%s задач на данный момент), и все входы затраченного времени. IfNeedToUseOhterObjectKeepEmpty=Если некоторые объекты (счет-фактура, заказ, ...), принадлежащей другому третьему лицу, должна быть увязана с проектом по созданию, держать этот пустой иметь проект, несколько третьих лиц. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Выберите элемент AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=доклад полной проекта модели (logo. ..) PlannedWorkload = Запланированная нагрузка @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang index fdda6c1fcf5..c97f43111a8 100644 --- a/htdocs/langs/ru_RU/sendings.lang +++ b/htdocs/langs/ru_RU/sendings.lang @@ -13,8 +13,8 @@ LastSendings=Последнее %s отправок SearchASending=Поиск направления StatisticsOfSendings=Статистика отправок NbOfSendings=Число отправок -# NumberOfShipmentsByMonth=Number of shipments by month -# SendingCard=Shipping card +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipping card NewSending=Новые направления CreateASending=Создать отправке CreateSending=Создать отправке @@ -50,27 +50,29 @@ Enlevement=Полученной клиентом DocumentModelSimple=Простая модель документа DocumentModelMerou=Mérou модели A5 WarningNoQtyLeftToSend=Внимание, без продуктов, ожидающих отправки. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Планируемая дата поставки DateReceived=Дата доставки получили SendShippingByEMail=Отправить доставкой по EMail -SendShippingRef=Отправить доставки %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Acions на судоходство LinkToTrackYourPackage=Ссылка на дорожку ваш пакет ShipmentCreationIsDoneFromOrder=На данный момент, создание новой партии производится с целью карту. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Catch заказчиком SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Простая модель документа для доставки квитанций DocumentModelTyphon=Более полная модель документа для доставки квитанций (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянное EXPEDITION_ADDON_NUMBER не определена -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang index 0216ac8558b..9ce90a49a4b 100644 --- a/htdocs/langs/ru_RU/suppliers.lang +++ b/htdocs/langs/ru_RU/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Создать поставщику счет-фактуру ListOfSupplierProductForSupplier=Перечень продукции и цен для поставщиков %s NoneOrBatchFileNeverRan=Ни одна партия или% не побежал в последнее время SentToSuppliers=Отправлено поставщикам +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/sk_SK/accountancy.lang +++ b/htdocs/langs/sk_SK/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 33fc0967a1d..f341b745418 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verzie % ErrorDecimalLargerThanAreForbidden=Chyba, presnosť vyššia než %s nie je podporované. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Hodnota "systém" a "systemauto" typu je vyhradená. Môžete použiť "používateľom" ako hodnota pridať svoj vlastný rekord ErrorCodeCantContainZero=Kód môže obsahovať hodnotu 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatická, ak je zakázaná Javascript AvailableOnlyIfJavascriptNotDisabled=Dostupné len v prípade, že je JavaScript nie je zakázaný AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupné len v prípade, že je JavaScript nie je zakázaný Required=Potrebný +UsedOnlyWithTypeOption=Used by some agenda option only Security=Zabezpečenie Passwords=Heslá DoNotStoreClearPassword=Do žiadny obchod jasná heslá v databáze, ale iba šifrované úložisko hodnota (Activated odporúčané) diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang index 882102d3ef2..109fb062205 100644 --- a/htdocs/langs/sk_SK/agenda.lang +++ b/htdocs/langs/sk_SK/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID udalosti Actions=Udalosti ActionsArea=Akcia plocha (Akcie a úlohy) -Agenda= Program rokovania -Agendas= Program -Calendar= Kalendár -Calendars= Kalendára -LocalAgenda=Miestny kalendár +Agenda=Program rokovania +Agendas=Program +Calendar=Kalendár +Calendars=Kalendára +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Priradené DoneBy=Vykonal Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Všetky neúplné udalosti MenuDoneActions=Všetky ukončené akcie MenuToDoMyActions=Moje neúplné udalosti MenuDoneMyActions=Moje ukončených akcií -ListOfEvents=Zoznam udalostí Dolibarr +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Akcia hlásené ActionsToDoBy=Akcia priradené ActionsDoneBy=Akcie vykonané @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL pre prístup. Súbor iCal ExtSiteNoLabel=Nie Popis WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang index b44194d9b9c..09458668a00 100644 --- a/htdocs/langs/sk_SK/categories.lang +++ b/htdocs/langs/sk_SK/categories.lang @@ -66,7 +66,7 @@ ReturnInCompany=Späť na zákazníka / Vyhliadka karty ContentsVisibleByAll=Obsah bude vidieť všetci ContentsVisibleByAllShort=Obsah viditeľné všetkými ContentsNotVisibleByAllShort=Obsah nie je vidieť všetci -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=Odstrániť kategóriu ConfirmDeleteCategory=Ste si istí, že chcete zmazať túto kategóriu? RemoveFromCategory=Odstráňte spojenie s kategóriách @@ -105,9 +105,10 @@ CatProdLinks=Väzby medzi produktov / služieb a kategórií CatCusLinks=Väzby medzi zákazníkmi / vyhliadky a kategórií CatSupLinks=Väzby medzi dodávateľmi a kategórií DeleteFromCat=Odobrať z kategórie -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang index 944943c5a7c..edca2288e6a 100644 --- a/htdocs/langs/sk_SK/companies.lang +++ b/htdocs/langs/sk_SK/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Musíte vytvoriť e-maily, kontakty pre tretie strany ListSuppliersShort=Zoznam dodávateľov ListProspectsShort=Zoznam vyhliadky ListCustomersShort=Zoznam zákazníkov -ThirdPartiesArea=Tretie strany plocha +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Posledné %s upravené tretej strany UniqueThirdParties=Celkom jedinečné tretích strán InActivity=Otvorené @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Späť numero vo formáte %syymm-nnnn pre zákazníka kódu a %syymm-NNNN s dodávateľmi kódu, kde yy je rok, MM je mesiac a nnnn je sekvencia bez prerušenia a bez návratu na 0. LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang index a5164dc8c0f..358e190443c 100644 --- a/htdocs/langs/sk_SK/compta.lang +++ b/htdocs/langs/sk_SK/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Účtovníctvo zhrnutie ByProductsAndServices=Výrobkami a službami RefExt=Externé ref ToCreateAPredefinedInvoice=Ak chcete vytvoriť vopred definovaný faktúru, vytvorte štandardné faktúru a potom, bez toho aby ju potvrdíte, kliknite na tlačidlo "Previesť do vopred faktúra". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Prepočítať Mode1=Method 1 Mode2=Metóda 2 @@ -202,5 +202,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Účtovníctvo štandardný kód pre zákaznícke thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Účtovníctvo štandardný kód pre dodávateľov thirdparties +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang index 8743faa71db..78454eefb8e 100644 --- a/htdocs/langs/sk_SK/donations.lang +++ b/htdocs/langs/sk_SK/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Hľadať daru DonationRecipient=Darovanie príjemcu ThankYou=Ďakujem IConfirmDonationReception=Príjemca deklarovať príjem, ako dar, tieto sumy +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang index 4d0a2cdf850..06bdb2b3b44 100644 --- a/htdocs/langs/sk_SK/errors.lang +++ b/htdocs/langs/sk_SK/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Chyba, musí mať PHP modul %s nainštalovať túto fu ErrorOpenIDSetupNotComplete=Môžete nastavenie Dolibarr konfiguračný súbor, aby OpenID overovania, ale URL OpenID služby nie je definovaný do stálych %s ErrorWarehouseMustDiffers=Zdrojovej a cieľovej sklady musia sa líši ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Upozornenie Pri použití tohto políčka spomaliť WarningClickToDialUserSetupNotComplete=Nastavenie ClickToDial informácií pre užívateľa si nie sú kompletné (pozri tab ClickToDial na vaše užívateľské karty). WarningNotRelevant=Nerozhoduje prevádzku v našom súbore WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang index afd04a2ddf8..99ce30644eb 100644 --- a/htdocs/langs/sk_SK/holiday.lang +++ b/htdocs/langs/sk_SK/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Prázdniny -CPTitreMenu=Prázdniny +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Mesačný výkaz -MenuAddCP=Použiť pre dovolenku -NotActiveModCP=Musíte umožniť modul sviatky zobrazenie tejto stránky. -NotConfigModCP=Musíte nakonfigurovať modul dovolenku na zobrazenie tejto stránky. Ak to chcete vykonať, kliknite sem . -NoCPforUser=Nemáte dopyt na dovolenku. -AddCP=Použiť pre dovolenku +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Zamestnanec DateDebCP=Dátum začatia DateFinCP=Dátum ukončenia @@ -18,24 +18,24 @@ ApprovedCP=Schválený CancelCP=Zrušený RefuseCP=Odmietol ValidatorCP=Approbator -ListeCP=Zoznam sviatkov +ListeCP=List of leaves ReviewedByCP=Bude preskúmaná DescCP=Popis -SendRequestCP=Vytvorenie dopytu po prázdninách -DelayToRequestCP=Žiadosti o dovolenku musí byť podaná aspoň deň %s (y) pred nimi. -MenuConfCP=Upraviť rovnováhu dovolenku -UpdateAllCP=Aktualizujte dovolenku -SoldeCPUser=Dovolenka rovnováha je %s dní. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Musíte vybrať koncový dátum je väčší ako dátum začatia. ErrorSQLCreateCP=SQL chyba pri tvorbe: -ErrorIDFicheCP=Došlo k chybe, žiadosť o dovolenku neexistuje. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Späť na predchádzajúcu stránku -ErrorUserViewCP=Nie ste oprávnený čítať toto žiadosti o dovolenku. -InfosCP=Informácie o dopyte po prázdninách +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Informácie Workflow RequestByCP=Žiadosť -TitreRequestCP=List dovolenku -NbUseDaysCP=Počet dní dovolenky spotrebovaných +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Upraviť DeleteCP=Vymazať ActionValidCP=Potvrdiť @@ -43,26 +43,26 @@ ActionRefuseCP=Odmietnuť ActionCancelCP=Zrušiť StatutCP=Postavenie SendToValidationCP=Poslať na potvrdenie -TitleDeleteCP=Odstrániť žiadosť dovolenku -ConfirmDeleteCP=Potvrďte odstránenie tejto žiadosti o dovolenku? -ErrorCantDeleteCP=Chyba nemáte právo zmazať túto dovolenku žiadosti. -CantCreateCP=Nemáte právo požiadať o dovolenku. -InvalidValidatorCP=Musíte vybrať approbator na dovolenku vyžiadanie. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Aktualizovať -CantUpdate=Nemožno aktualizovať túto požiadavku sviatkov. +CantUpdate=You cannot update this leave request. NoDateDebut=Musíte vybrať počiatočný dátum. NoDateFin=Musíte vybrať dátum ukončenia. ErrorDureeCP=Vaša žiadosť o dovolenku neobsahuje pracovný deň. TitleValidCP=Žiadosť odsúhlasí dovolenku -ConfirmValidCP=Ste si istí, že chcete schváliť žiadosť o dovolenku? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Dátum schválenia -TitleToValidCP=Odoslať žiadosť o dovolenku -ConfirmToValidCP=Ste si istí, že chcete odoslať požiadavku na dovolenku? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Žiadosť odmietnuť dovolenku -ConfirmRefuseCP=Ste si istí, že chcete odmietnuť žiadosť o prázdninách? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Musíte si vybrať dôvod pre odmietnutie žiadosti. TitleCancelCP=Zrušiť požiadavku dovolenku -ConfirmCancelCP=Ste si istí, že chcete zrušiť požiadavku na dovolenku? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Dôvod odmietnutia DateRefusCP=Dátum odmietnutia DateCancelCP=Dátum zrušenia @@ -72,8 +72,8 @@ MotifCP=Dôvod UserCP=Užívateľ ErrorAddEventToUserCP=Došlo k chybe pri pridávaní výnimočnú dovolenku. AddEventToUserOkCP=Pridanie mimoriadnej dovolenky bola dokončená. -MenuLogCP=Zobraziť protokoly dovolenku -LogCP=Prihláste o zmenách dovoleniek +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Účinkujú UserUpdateCP=Pre užívateľa PrevSoldeCP=Predchádzajúci Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=Žiadosť o dovolenku už bolo vykonané na toto obdobie. UserName=Názov Employee=Zamestnanec -FirstDayOfHoliday=Prvý deň dovolenky -LastDayOfHoliday=Posledný deň dovolenky +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Mesačná aktualizácia ManualUpdate=Manuálna aktualizácia -HolidaysCancelation=Dovolenka storno +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Konfigurácia modulu dovolenku DescOptionCP=Popis možnosti ValueOptionCP=Hodnota -GroupToValidateCP=Skupina s možnosťou schváliť dovolenku +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Overenie konfigurácie -LastUpdateCP=Posledná aktualizácia automaticky prázdnin +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Aktualizované úspešne. ErrorUpdateConfCP=Došlo k chybe pri aktualizácii, skúste to prosím znova. AddCPforUsers=Prosím, pridajte rovnováhu prázdnin užívateľom kliknutím tu . DelayForSubmitCP=Uzávierka žiadať o dovolenku AlertapprobatortorDelayCP=Zabráňte approbator ak sviatok žiadosť nezodpovedá lehotu -AlertValidatorDelayCP=Préevent na approbator Ak požiadavka presahuje dovolenku meškanie -AlertValidorSoldeCP=Zabráňte approbator ak sviatok požiadavka presahuje zostatok -nbUserCP=Počet užívateľov podporované v module dovolenku -nbHolidayDeductedCP=Počet sviatkov sa odpočítavajú za každý deň dovolenky prijatých -nbHolidayEveryMonthCP=Počet dovolenku pridávané každý mesiac -Module27130Name= Riadenie dovolenku -Module27130Desc= Riadenie dovolenku -TitleOptionMainCP=Základné nastavenie dovolenku -TitleOptionEventCP=Nastavenie dovolenky týkajúce sa udalostí +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Potvrdiť UpdateEventCP=Aktualizácia akcie CreateEventCP=Vytvoriť @@ -127,23 +127,23 @@ UpdateEventOptionCP=Aktualizovať ErrorMailNotSend=Došlo k chybe pri odosielaní e-mail: NoCPforMonth=Nie opustiť tento mesiac. nbJours=Počet dní -TitleAdminCP=Konfigurácia sviatky +TitleAdminCP=Configuration of Leaves #Messages Hello=Ahoj -HolidaysToValidate=Overiť dovolenku -HolidaysToValidateBody=Nižšie je žiadosť o dovolenku pre potvrdzovanie -HolidaysToValidateDelay=Táto žiadosť o prázdninách sa uskutoční v lehote kratšej ako %s dní. -HolidaysToValidateAlertSolde=Užívateľ, ktorý z tejto požiadavky pre dovolenku nemajú k dispozícii dostatok dni. -HolidaysValidated=Overené prázdniny -HolidaysValidatedBody=Vaša žiadosť o dovolenku pre %s na %s bol overený. -HolidaysRefused=Odopretie prázdniny -HolidaysRefusedBody=Vaša žiadosť o dovolenku pre %s na %s bol zamietnutý z nasledujúcich dôvodov: -HolidaysCanceled=Zrušené sviatky -HolidaysCanceledBody=Vaša žiadosť o dovolenku pre %s na %s bola zrušená. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Recenzia protokol modifikovaných dovolenku -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang index 3f1d7b9edca..8b72c569161 100644 --- a/htdocs/langs/sk_SK/interventions.lang +++ b/htdocs/langs/sk_SK/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Meno a podpis intervencie: NameAndSignatureOfExternalContact=Meno a podpis objednávateľa: DocumentModelStandard=Štandardný dokument model pre zásahy InterventionCardsAndInterventionLines=Intervencia a linky intervencií -ClassifyBilled=Klasifikovať "účtovaný" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Účtované RelatedInterventions=Súvisiace zákroky ShowIntervention=Zobraziť zásah +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Zástupca nasledujúce-up zásah TypeContact_fichinter_internal_INTERVENING=Zásah diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang index 01c1babff62..1772c61049f 100644 --- a/htdocs/langs/sk_SK/projects.lang +++ b/htdocs/langs/sk_SK/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Udalosti na projekte YouAreNotContactOfProject=Nie ste kontakt tomto súkromnom projekte DeleteATimeSpent=Odstrániť čas strávený ConfirmDeleteATimeSpent=Ste si istí, že chcete zmazať tento čas strávený? -DoNotShowMyTasksOnly=Pozri tiež úlohy, ktoré neboli pridelené pre mňa -ShowMyTasksOnly=Zobraziť iba úlohy pridelené mne +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Zdroje ProjectsDedicatedToThisThirdParty=Projekty venovaný tejto tretej osobe NoTasks=Žiadne úlohy tohto projektu LinkedToAnotherCompany=Súvisí s tretej strane -TaskIsNotAffectedToYou=Úloha nebude vám pridelená +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Čas strávený je prázdny ThisWillAlsoRemoveTasks=Táto akcia bude tiež odstrániť všetky úlohy projektu (%s úlohy v túto chvíľu) a všetky vstupy času stráveného. IfNeedToUseOhterObjectKeepEmpty=Ak sú niektoré predmety (faktúra, objednávka, ...), ktoré patria do inej tretej osobe, musí byť spojené s projektom, vytvoriť, aby bol tento prázdny mať projekt bytia multi tretej strany. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Vyberte prvok AddElement=Odkaz na elementu +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Kompletné projektu model zostavy (logo. ..) PlannedWorkload = Plánované zaťaženie @@ -128,3 +129,4 @@ ProjectReferers=Odkazujúce objekty SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang index 66fce201540..843cc586b96 100644 --- a/htdocs/langs/sk_SK/sendings.lang +++ b/htdocs/langs/sk_SK/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Štatistiky vykonaná na zásielky iba overených. DateDeliveryPlanned=Čelné termín dodania DateReceived=Dátum doručenia obdržal SendShippingByEMail=Poslať zásielku EMail -SendShippingRef=Poslať zásielok %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Udalosti na zásielky LinkToTrackYourPackage=Odkaz pre sledovanie balíkov ShipmentCreationIsDoneFromOrder=Pre túto chvíľu, je vytvorenie novej zásielky vykonať z objednávky karty. @@ -66,11 +66,13 @@ CarrierList=Zoznam dopravcov SendingMethodCATCH=Chytiť zákazníka SendingMethodTRANS=Prepravca SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Jednoduchý model pre dokument o doručenie DocumentModelTyphon=Viac Celý dokument model pre potvrdenie o doručení (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konštantná EXPEDITION_ADDON_NUMBER nie je definované SumOfProductVolumes=Súčet objemov produktov SumOfProductWeights=Súčet hmotností produktov + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang index 4897ef99037..fe08da6e0bc 100644 --- a/htdocs/langs/sk_SK/suppliers.lang +++ b/htdocs/langs/sk_SK/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Objednať Dátum BuyingPrice=Nákup cenu BuyingPriceMin=Minimálna kúpna cena BuyingPriceMinShort=Minimálna kúpna cena -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Pridať cena dodávateľa tovaru ChangeSupplierPrice=Zmena dodávateľa cenu ErrorQtyTooLowForThisSupplier=Nedostatočné množstvo tohto podniku, alebo nie je definovaná cena k tomuto produktu tohto podniku @@ -40,3 +40,5 @@ AddSupplierInvoice=Vytvorte dodávateľskej faktúry ListOfSupplierProductForSupplier=Zoznam výrobkov a cien dodávateľských %s NoneOrBatchFileNeverRan=Žiadny alebo dávkový %s nie bežal nedávno SentToSuppliers=Odoslané dodávateľom +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/sl_SI/accountancy.lang +++ b/htdocs/langs/sl_SI/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 49084a49e17..afdba19edd1 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Napaka, Ta modul zahteva Dolibarr različico % ErrorDecimalLargerThanAreForbidden=Napaka, višja natančnost od %s ni podprta. DictionarySetup=Nastavitve slovarja Dictionary=Slovarji +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Vrednosti 'system' in 'systemauto' za tip sta rezervirani. Uporabite lahko 'user' za dodajanje lastnih zapisov ErrorCodeCantContainZero=Koda ne sme vsebovati vrednosti 0 DisableJavascript=Onemogoči JavaScript in Ajax funkcije (priporočeno za slepe osebe ali tekstualne brskalnike) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Avtomatsko, če je Javascript onemogočen AvailableOnlyIfJavascriptNotDisabled=Na voljo samo, če JavaScript ni onemogočen AvailableOnlyIfJavascriptAndAjaxNotDisabled=Na voljo samo, če JavaScript in Ajax nista onemogočena Required=Zahtevano +UsedOnlyWithTypeOption=Used by some agenda option only Security=Varnost Passwords=Gesla DoNotStoreClearPassword=Ne shranjujte v bazi podatkov celih gesel, temveč samo šifrirane vrednosti (priporočena aktivacija) @@ -257,9 +260,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS gostitelj (Ni definiran MAIN_MAIL_EMAIL_FROM=Pošiljateljev e-mail za avtomatske emaile (Privzeto v php.ini: %s) MAIN_MAIL_ERRORS_TO=E-mail naslov pošiljatelja je uporabljen za vrnitev napačno poslanih e-mailov MAIN_MAIL_AUTOCOPY_TO= Sistematično pošilljanje skritih kopij (cc) vseh poslanih emailov za -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to -MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Sistematično pošilljanje skritih kopij -cc- ponudb, poslanih po e-pošti za +MAIN_MAIL_AUTOCOPY_ORDER_TO= Sistematično pošilljanje skritih kopij -cc- naročil, poslanih po e-pošti za +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Sistematično pošilljanje skritih kopij -cc- računov, poslanih po e-pošti za MAIN_DISABLE_ALL_MAILS=Onemogoči vsa pošiljanja e-mailov (za namene testiranja ali demonstracij) MAIN_MAIL_SENDMODE=Načini za pošiljanje e-pošte MAIN_MAIL_SMTPS_ID=SMTP ID, če je zahtevano preverjanje pristnosti @@ -479,7 +482,7 @@ Module410Desc=Integracija internetnega koledarja Module500Name=Posebni stroški (davki, socialni prispevki, dividende) Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki, dividende in plače Module510Name=Plače -Module510Desc=Management of employees salaries and payments +Module510Desc=Upravljanje plač in plačil zaposlenim Module600Name=Obvestila Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih Module700Name=Donacije @@ -525,8 +528,8 @@ Module50100Name=Prodajalne Module50100Desc=Modul za prodajalne Module50200Name= Paypal Module50200Desc= Modul za omogočanje strani za spletno plačevanje s kreditno kartico - Paypal -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50400Name=Računovodstvo (napredno) +Module50400Desc=Upravljanje računovodstva (dvostavno) Module54000Name=Tiskanje IPP Module54000Desc=Tiskanje preko Cups IPP tiskalnika Module55000Name=Odpri anketo @@ -1079,7 +1082,7 @@ NotificationsDesc=Funkcija sporočil po E-pošti omogoča tiho pošiljanje avtom ModelModules=Predloge dokumentov DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...) WatermarkOnDraft=Vodni žig na osnutku dokumenta -JSOnPaimentBill=Activate feature to autofill payment lines on payment form +JSOnPaimentBill=Aktivacija funkcije za avtomatsko izpolnitev plačilnih vrstic na obrazcu za plačilo CompanyIdProfChecker=Strokovno Id edinstven MustBeUnique=Mora biti edinstven? MustBeMandatory=Obvezno kreiranje partnerjev diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang index ad419cdb423..29e1912e636 100644 --- a/htdocs/langs/sl_SI/agenda.lang +++ b/htdocs/langs/sl_SI/agenda.lang @@ -2,14 +2,15 @@ IdAgenda=ID dogodka Actions=Dogodki ActionsArea=Področje dogodkov (aktivnosti in naloge) -Agenda= Urnik -Agendas= Urniki -Calendar= Koledar -Calendars= Koledarji -LocalAgenda=Lokalni koledar +Agenda=Urnik +Agendas=Urniki +Calendar=Koledar +Calendars=Koledarji +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Se nanaša na DoneBy=Izdelal -Event=Event +Event=Aktivnost Events=Dogodki EventsNb=Število dogodkov MyEvents=Moji dogodki @@ -22,7 +23,7 @@ MenuToDoActions=Vsi nedokončani dogodki MenuDoneActions=Vsi prekinjeni dogodki MenuToDoMyActions=Moji nedokončani dogodki MenuDoneMyActions=Moji prekinjeni dogodki -ListOfEvents=Seznam Dolibarr dogodkov +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Dogodek vnesel ActionsToDoBy=Dogoki, ki se nanašajo na ActionsDoneBy=Dogodke izvedel @@ -34,7 +35,7 @@ ViewList=Glej seznam ViewCal=Mesečni pogled ViewDay=Dnevni pogled ViewWeek=Tedenski pogled -ViewPerUser=Per user view +ViewPerUser=Pogled po uporabniku ViewWithPredefinedFilters= Glej z prednastavljenimi filtri AutoActions= Avtomatska izpolnitev AgendaAutoActionDesc= Tukaj definirajte dogodke, za katere želite, da Dolibarr avtomatsko kreira aktivnost v urniku. Če ni označeno ničesar (privzeto), bodo v urnik vključene samo ročno vnesene aktivnosti. @@ -81,10 +82,12 @@ DefaultWorkingHours=Privzet dnevni delovnik (primer: 9-18) # External Sites ical ExportCal=Izvoz koledarja ExtSites=Zunanji koledarji -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Prikaži zunanje koledarje (definirane v globalnih nastavitvah) v agendi. Nima učinka na zunanje koledarje, ki jih določi uporabnik. ExtSitesNbOfAgenda=Število koledarjev AgendaExtNb=Koledar št. %s ExtSiteUrlAgenda=URL za dostop do .ical datoteke ExtSiteNoLabel=Ni opisa -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range +WorkingTimeRange=Delovni čas +WorkingDaysRange=Delovni dnevi +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang index b6aa05ed20e..6397a1a6905 100644 --- a/htdocs/langs/sl_SI/categories.lang +++ b/htdocs/langs/sl_SI/categories.lang @@ -16,7 +16,7 @@ SuppliersCategoriesArea=Področje kategorij dobaviteljev CustomersCategoriesArea=Področje kategorij kupcev ThirdPartyCategoriesArea=Področje kategorij partnerjev MembersCategoriesArea=Področje kategorij članov -# ContactsCategoriesArea=Contacts categories area +ContactsCategoriesArea=Področje kategorij kontaktov MainCats=Glavne kategorije SubCats=Podkategorije CatStatistics=Statistika @@ -50,15 +50,15 @@ SupplierIsInCategories=Partner pripada naslednjim kategorijam dobaviteljev CompanyIsInCustomersCategories=Ta partner pripada naslednjim kategorijam kupcev/možnih strank CompanyIsInSuppliersCategories=Ta partner pripada naslednjim kategorijam dobaviteljev MemberIsInCategories=Ta član pripada naslednjim kategorijam -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=Ta kontakt pripada naslednjim kategorijam kontaktov ProductHasNoCategory=Ta proizvod/storitev ni vključen v nobeno kategorijo SupplierHasNoCategory=Ta dobavitelj ni vključen v nobeno kategorijo CompanyHasNoCategory=To podjetje ni vključeno v nobeno kategorijo MemberHasNoCategory=Ta član ni v nobeni kategoriji -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=Ta kontakt ni v nobeni kategoriji ClassifyInCategory=Razvrsti v kategorijo NoneCategory=Nobena -# NotCategorized=Without category +NotCategorized=Brez kategorije CategoryExistsAtSameLevel=Kategorija s to referenco že obstaja ReturnInProduct=Nazaj na kartico proizvodov/storitev ReturnInSupplier=Nazaj na kartico dobaviteljev @@ -66,7 +66,7 @@ ReturnInCompany=Nazaj na kartico kupcev/možnih strank ContentsVisibleByAll=Vsebina bo vidna vsem ContentsVisibleByAllShort=Vsebina vidna vsem ContentsNotVisibleByAllShort=Vsebina ni vidna vsem -# CategoriesTree=Categories tree +CategoriesTree=Drevesna struktura kategorij DeleteCategory=Izbriši kategorijo ConfirmDeleteCategory=Ali zares želite izbrisati to kategorijo? RemoveFromCategory=Odstranite povezavo s kategorijo @@ -81,12 +81,12 @@ CustomersCategoriesShort=Kategorije kupcev CustomersProspectsCategoriesShort=Kategorije kupcev/možnih strank ProductsCategoriesShort=Kategorije proizvodov MembersCategoriesShort=Kategorije članov -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Kategorije kontaktov ThisCategoryHasNoProduct=Ta kategorija ne vsebuje nobenega proizvoda. ThisCategoryHasNoSupplier=Ta kategorija ne vsebuje nobenega proizvoda. ThisCategoryHasNoCustomer=Ta kategorija ne vsebuje nobenega kupca. ThisCategoryHasNoMember=Ta kategorija ne vsebuje nobenega člana. -# ThisCategoryHasNoContact=This category does not contain any contact. +ThisCategoryHasNoContact=Ta kategorija ne vsebuje nobenega kontakta. AssignedToCustomer=Dodeljeno kupcu AssignedToTheCustomer=Dodeljeno kupcu InternalCategory=Interna kategorija @@ -96,18 +96,19 @@ CatSupList=Seznam kategorij dobaviteljev CatCusList=Seznam kategorij kupcev/možnih strank CatProdList=Seznam kategorij proizvodov CatMemberList=Seznam kategorij članov -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatContactList=Seznam kategorij kontaktov in kontaktov +CatSupLinks=Povezave med dobavitelji in kategorijami +CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami +CatProdLinks=Povezave med proizvodi/storitvami in kategorijami +CatMemberLinks=Povezave med člani in kategorijami +CatProdLinks=Povezave med proizvodi/storitvami in kategorijami +CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami +CatSupLinks=Povezave med dobavitelji in kategorijami +DeleteFromCat=Odstrani iz kategorije +DeletePicture=Izbriši sliko +ConfirmDeletePicture=Potrdi izbris slike? +ExtraFieldsCategories=Koplementarni atributi +CategoriesSetup=Nastavitve kategorij +CategorieRecursiv=Avtomatsko poveži z nadrejeno kategorijo +CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang index 5ff74d798a7..32202272217 100644 --- a/htdocs/langs/sl_SI/companies.lang +++ b/htdocs/langs/sl_SI/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Če želite dodati e-mail obveščanje, morate najprej ListSuppliersShort=Seznam dobaviteljev ListProspectsShort=Seznam možnih strank ListCustomersShort=Seznam kupcev -ThirdPartiesArea=Področje partnerjev +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Zadnjih %s spremenjenih partnerjev UniqueThirdParties=Skupno število partnerjev InActivity=Aktiven @@ -410,3 +410,5 @@ OutstandingBillReached=Dosežen maksimum za neplačan račun MonkeyNumRefModelDesc=Predlaga kodo kupca v formatu %syymm-nnnn in kodo dobavitelja v formatu %syymm-nnnn kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledka, večja od 0. LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli spremenite. ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang index d744d2d588c..d6b000bbeb9 100644 --- a/htdocs/langs/sl_SI/compta.lang +++ b/htdocs/langs/sl_SI/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang index 5271b7a345c..dc9f7f2ca26 100644 --- a/htdocs/langs/sl_SI/donations.lang +++ b/htdocs/langs/sl_SI/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Donacija Donations=Donacije -# DonationRef=Donation ref. +DonationRef=Referenca donacije Donor=Donator Donors=Donatorji AddDonation=Dodaj donacijo NewDonation=Nova donacija -# ShowDonation=Show donation +ShowDonation=Prikaži donacijo DonationPromise=Obljuba darila PromisesNotValid=Nepotrjene obljube PromisesValid=Potrjene obljube @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Osnutek DonationStatusPromiseValidatedShort=Potrjena DonationStatusPaidShort=Prejeta ValidPromess=Potrjena obljuba -# DonationReceipt=Donation receipt +DonationReceipt=Prejem donacije BuildDonationReceipt=Izdelava potrdila DonationsModels=Modeli dokumentov za potrdila o donacijah LastModifiedDonations=Zadnjih %s spremenjenih donacij SearchADonation=Iskanje donacij -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Prejemnik donacije +ThankYou=Hvala +IConfirmDonationReception=Prejemnik potrjuje prejem donacije v naslednjem znesku +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang index 328b32d52b6..d0b1d69bfb5 100644 --- a/htdocs/langs/sl_SI/errors.lang +++ b/htdocs/langs/sl_SI/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang index 42f3b6da611..9d422c390c5 100644 --- a/htdocs/langs/sl_SI/holiday.lang +++ b/htdocs/langs/sl_SI/holiday.lang @@ -1,149 +1,149 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays -MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays -Employe=Employee +Holidays=Leaves +CPTitreMenu=Leaves +MenuReportMonth=Mesečno stanje +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request +Employe=Zaposleni DateDebCP=Začetni datum DateFinCP=Končni datum DateCreateCP=Datum kreiranja DraftCP=Osnutek -ToReviewCP=Awaiting approval -ApprovedCP=Odobren +ToReviewCP=Čaka odobritev +ApprovedCP=Odobreno CancelCP=Preklicano RefuseCP=Zavrnjeno -ValidatorCP=Approbator -ListeCP=List of holidays -ReviewedByCP=Will be reviewed by +ValidatorCP=Odobril +ListeCP=List of leaves +ReviewedByCP=Pregledal DescCP=Opis -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. -ErrorEndDateCP=You must select an end date greater than the start date. -ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. -ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays -InfosWorkflowCP=Information Workflow -RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. +ErrorEndDateCP=Končni datum mora biti večji od začetnega. +ErrorSQLCreateCP=Pri ustvarjanju SQL je prišlo do napake +ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ReturnCP=Nazaj na prejšnjo stran +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request +InfosWorkflowCP=Pretok informacij +RequestByCP=Zahteval +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Uredi DeleteCP=Izbriši ActionValidCP=Potrdi -ActionRefuseCP=Refuse +ActionRefuseCP=Zavrnitev ActionCancelCP=Razveljavi StatutCP=Status -SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +SendToValidationCP=Pošlji v potrditev +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Posodobi -CantUpdate=You cannot update this request of holidays. -NoDateDebut=You must select a start date. -NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? -DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? -TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? -NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? -DetailRefusCP=Reason for refusal -DateRefusCP=Date of refusal -DateCancelCP=Date of cancellation -DefineEventUserCP=Assign an exceptional leave for a user -addEventToUserCP=Assign leave +CantUpdate=You cannot update this leave request. +NoDateDebut=Izbrati morate začetni datum. +NoDateFin=Izbrati morate končni datum. +ErrorDureeCP=Vaš zahtevek za dopust ne vsebuje delovnih dni. +TitleValidCP=Odobri zahtevan dopust +ConfirmValidCP=Are you sure you want to approve the leave request? +DateValidCP=Datum odobritve +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? +TitleRefuseCP=Zavrni zahtevek za dopust +ConfirmRefuseCP=Are you sure you want to refuse the leave request? +NoMotifRefuseCP=Izbrati morate razlog za zavrnitev zahtevka. +TitleCancelCP=Preklic zahtevka za dopust +ConfirmCancelCP=Are you sure you want to cancel the leave request? +DetailRefusCP=Razlog za zavrnitev +DateRefusCP=Datum zavrnitve +DateCancelCP=Datum preklica +DefineEventUserCP=Dodeli izredno odsotnost uporabniku +addEventToUserCP=Dodeli odsotnost MotifCP=Razlog UserCP=Uporabnik -ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. -AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays -ActionByCP=Performed by -UserUpdateCP=For the user -PrevSoldeCP=Previous Balance -NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +ErrorAddEventToUserCP=Prišlo je do napake pri dodajanju izredne odsotnosti. +AddEventToUserOkCP=Dodajanje izredne odsotnosti je zaključeno. +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days +ActionByCP=Izvajalec +UserUpdateCP=Za uporabnika +PrevSoldeCP=Prejšnje stanje +NewSoldeCP=Novo stanje +alreadyCPexist=Zahtevek za dopust za to obdobje je bil že vložen. UserName=Priimek -Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday -HolidaysMonthlyUpdate=Monthly update -ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +Employee=Zaposleni +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation +HolidaysMonthlyUpdate=Mesečna posodobitev +ManualUpdate=Ročna posodobitev +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module -DescOptionCP=Description of the option +ConfCP=Konfiguracija modula dopustov +DescOptionCP=Opis opcij ValueOptionCP=Vrednost -GroupToValidateCP=Group with the ability to approve holidays -ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays -UpdateConfCPOK=Updated successfully. -ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +GroupToValidateCP=Group with the ability to approve vacation +ConfirmConfigCP=Potrditev konfiguracije +LastUpdateCP=Last automatic update of vacation +UpdateConfCPOK=Uspešno posodobljeno. +ErrorUpdateConfCP=Pri posodabljanju je prišlo do napake, prosimo poskusite ponovno. +AddCPforUsers=Prosimo dodajte stanje dopustov uporabnikov s klikom tukaj. +DelayForSubmitCP=Zadnji rok za vložitev zahteve za dopust +AlertapprobatortorDelayCP=Opozori, če zahtevek za dopust ni bil vložen pravočasno +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Potrdi -UpdateEventCP=Update events +UpdateEventCP=Posodobitev aktivnosti CreateEventCP=Kreiraj -NameEventCP=Event name -OkCreateEventCP=The addition of the event went well. -ErrorCreateEventCP=Error creating the event. -UpdateEventOkCP=The update of the event went well. -ErrorUpdateEventCP=Error while updating the event. -DeleteEventCP=Delete Event -DeleteEventOkCP=The event has been deleted. -ErrorDeleteEventCP=Error while deleting the event. -TitleDeleteEventCP=Delete a exceptional leave -TitleCreateEventCP=Create a exceptional leave -TitleUpdateEventCP=Edit or delete a exceptional leave +NameEventCP=Ime aktivnosti +OkCreateEventCP=Uspešno izvedeno dodajanje aktivnosti. +ErrorCreateEventCP=Napaka pri ustvarjanju aktivnosti. +UpdateEventOkCP=Uspešno izvedena posodobitev aktivnosti. +ErrorUpdateEventCP=Napaka pri posodobitvi aktivnosti. +DeleteEventCP=Brisanje aktivnosti +DeleteEventOkCP=Aktivnost je bila izbrisana. +ErrorDeleteEventCP=Napaka pri brisanju aktivnosti. +TitleDeleteEventCP=Brisanje izredne odsotnosti +TitleCreateEventCP=Ustvari izredno odsotnost +TitleUpdateEventCP=Uredi ali izbriši izredno odsotnost DeleteEventOptionCP=Izbriši UpdateEventOptionCP=Posodobi -ErrorMailNotSend=An error occurred while sending email: -NoCPforMonth=No leave this month. -nbJours=Number days -TitleAdminCP=Configuration of Holidays +ErrorMailNotSend=Pri pošiljanju e-pošte je prišlo do napake: +NoCPforMonth=Ta mesec ni odsotnosti. +nbJours=Število dni +TitleAdminCP=Configuration of Leaves #Messages -Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +Hello=Pozdravljeni +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang index 9e9727bca9e..576fbbc791a 100644 --- a/htdocs/langs/sl_SI/interventions.lang +++ b/htdocs/langs/sl_SI/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Ime in podpis serviserja : NameAndSignatureOfExternalContact=Ime in podpis kupca : DocumentModelStandard=Standardni vzorec dokumenta za intervencijo InterventionCardsAndInterventionLines=Intervencije in vrstice na intervenciji -ClassifyBilled=Označi kot "Zaračunano" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Zaračunano RelatedInterventions=Odvisne intervencije ShowIntervention=Prikaži intervencijo +SendInterventionRef=Oddana intervencija %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Referent za nadaljnjo obravnavo intervencije TypeContact_fichinter_internal_INTERVENING=Serviser diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang index f5234ed759b..ccad08cebaf 100644 --- a/htdocs/langs/sl_SI/projects.lang +++ b/htdocs/langs/sl_SI/projects.lang @@ -85,27 +85,27 @@ ActionsOnProject=Aktivnosti o projektu YouAreNotContactOfProject=Niste kontakt tega privatnega projekta DeleteATimeSpent=Izbrišite porabljen čas ConfirmDeleteATimeSpent=Ali zares želite izbrisati porabljen čas? -DoNotShowMyTasksOnly=Prikaži tudi naloge, ki se me ne tičejo -ShowMyTasksOnly=Prikaži samo naloge, ki se me tičejo +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Izvori ProjectsDedicatedToThisThirdParty=Projekti, ki so povezani s tem partnerjem NoTasks=Ni nalog za ta projekt LinkedToAnotherCompany=Povezane z drugimi partnerji -TaskIsNotAffectedToYou=Naloga ni namenjena vam +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Ni porabljenega časa ThisWillAlsoRemoveTasks=Ta aktivnost bo tudi izbrisala vse naloge projekta (%s trenutne naloge) in vse vnose porabljenega časa. IfNeedToUseOhterObjectKeepEmpty=Če nekateri objekti (računi, naročila, ...), ki pripadajo drugemu partnerju, morajo biti vezani na projekt, ki se kreira, pustite polje prazno, da je projekt lahko vezan na več partnerjev. -CloneProject=Clone project -CloneTasks=Clone tasks -CloneContacts=Clone contacts -CloneNotes=Clone notes -CloneProjectFiles=Clone project joined files -CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) -ConfirmCloneProject=Are you sure to clone this project ? -ProjectReportDate=Change task date according project start date -ErrorShiftTaskDate=Impossible to shift task date according to new project start date -ProjectsAndTasksLines=Projects and tasks -ProjectCreatedInDolibarr=Project %s created +CloneProject=Kloniraj projekt +CloneTasks=Kloniraj naloge +CloneContacts=Kloniraj kontakte +CloneNotes=Kloniraj opombe +CloneProjectFiles=Kloniraj skupne datoteke projekta +CloneTaskFiles=Kloniraj skupno(e) datoteko(e) naloge (če je bila naloga klonirana) +ConfirmCloneProject=Ali zares želite klonirati ta projekt? +ProjectReportDate=Spremenite datum naloge glede na začetni datum projekta +ErrorShiftTaskDate=Nemogoče je spremeniti datum naloge glede na nov začetni datum projekta +ProjectsAndTasksLines=Projekti in naloge +ProjectCreatedInDolibarr=Projekt %s je bil ustvarjen TaskCreatedInDolibarr=Task %s created TaskModifiedInDolibarr=Task %s modified TaskDeletedInDolibarr=Task %s deleted @@ -120,11 +120,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Model poročila za celoten projekt (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation -ProjectReferers=Refering objects +PlannedWorkload = Planirana delovna obremenitev +WorkloadOccupation= Pretvarjanje delovne obremenitve +ProjectReferers=Referenčni objekti SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang index 2185f869726..2602c7c01eb 100644 --- a/htdocs/langs/sl_SI/sendings.lang +++ b/htdocs/langs/sl_SI/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistika na osnovi potrjenih pošiljk. Uporablje DateDeliveryPlanned=Planiran datum dobave DateReceived=Datum prejema dobave SendShippingByEMail=Pošlji odpremnico po e-mailu -SendShippingRef=Pošlji odpremnico %s +SendShippingRef=Oddaja pošiljke %s ActionsOnShipping=Aktivnosti v zvezi z odpremnico LinkToTrackYourPackage=Povezave za sledenje vaše pošiljke ShipmentCreationIsDoneFromOrder=Za trenutek je oblikovanje nove pošiljke opravi od naročila kartice. @@ -72,3 +72,7 @@ DocumentModelTyphon=Popolnejši vzorec dobavnice (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined== SumOfProductVolumes=Vsota volumnov proizvodov SumOfProductWeights=Vsota tež proizvodov + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang index 283374dce1c..5fb3d415dac 100644 --- a/htdocs/langs/sl_SI/suppliers.lang +++ b/htdocs/langs/sl_SI/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Kreirajte račun dobavitelja ListOfSupplierProductForSupplier=Seznam proizvodov in cen dobavitelja %s NoneOrBatchFileNeverRan=Nobena datoteka ali paket %s nedavno ni bila zagnana SentToSuppliers=Pošlji dobaviteljem +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/sq_AL/accountancy.lang +++ b/htdocs/langs/sq_AL/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index d09bf84402e..13821724bc9 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang index adf9cc32f1a..9b3efc07dab 100644 --- a/htdocs/langs/sq_AL/agenda.lang +++ b/htdocs/langs/sq_AL/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Events ActionsArea=Events area (Actions and tasks) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang index 27c4fc44394..ed61bfc08a6 100644 --- a/htdocs/langs/sq_AL/categories.lang +++ b/htdocs/langs/sq_AL/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/sq_AL/companies.lang +++ b/htdocs/langs/sq_AL/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/sq_AL/compta.lang +++ b/htdocs/langs/sq_AL/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang index 728661dfa04..66ddea95a5c 100644 --- a/htdocs/langs/sq_AL/donations.lang +++ b/htdocs/langs/sq_AL/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Search a donation DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/sq_AL/errors.lang +++ b/htdocs/langs/sq_AL/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/sq_AL/holiday.lang +++ b/htdocs/langs/sq_AL/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang index 58579a74276..17641a0ab3e 100644 --- a/htdocs/langs/sq_AL/interventions.lang +++ b/htdocs/langs/sq_AL/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Name and signature of intervening : NameAndSignatureOfExternalContact=Name and signature of customer : DocumentModelStandard=Standard document model for interventions InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Classify "Billed" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/sq_AL/projects.lang +++ b/htdocs/langs/sq_AL/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang index 039d47f6aa9..2ae43f39766 100644 --- a/htdocs/langs/sq_AL/sendings.lang +++ b/htdocs/langs/sq_AL/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. DateDeliveryPlanned=Planed date of delivery DateReceived=Date delivery received SendShippingByEMail=Send shipment by EMail -SendShippingRef=Send shipment %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. @@ -72,3 +72,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Sum of product volumes SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang index fdc0787646a..b1545d6ca3c 100644 --- a/htdocs/langs/sq_AL/suppliers.lang +++ b/htdocs/langs/sq_AL/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s NoneOrBatchFileNeverRan=None or batch %s not ran recently SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/sv_SE/accountancy.lang +++ b/htdocs/langs/sv_SE/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 5f565bc5490..31c94f978ad 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Fel, kräver denna modul Dolibarr version %s e ErrorDecimalLargerThanAreForbidden=Fel, en precision högre än %s stöds inte. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Värdena "system" och "systemauto" för typ är reserverade. Du kan använda "user" som värde för att lägga till en egen post. ErrorCodeCantContainZero=Kod får inte innehålla värdet 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatisk om Javascript är avstängt AvailableOnlyIfJavascriptNotDisabled=Endast tillgängligt om JavaScript är inte oduglig AvailableOnlyIfJavascriptAndAjaxNotDisabled=Endast tillgängligt om JavaScript är inte oduglig Required=Obligatorisk +UsedOnlyWithTypeOption=Used by some agenda option only Security=Säkerhet Passwords=Lösenord DoNotStoreClearPassword=Har ingen butik tydlig lösenord i databasen, men endast lagra krypterade värde (Aktiverad rekommenderas) diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang index 6ab497d0962..131080c5c8f 100644 --- a/htdocs/langs/sv_SE/agenda.lang +++ b/htdocs/langs/sv_SE/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Åtgärder ActionsArea=Åtgärder område (händelser och uppgifter) -Agenda= Agenda -Agendas= Dagordningar -Calendar= Kalender -Calendars= Kalendrar -LocalAgenda=Lokal kalender +Agenda=Agenda +Agendas=Dagordningar +Calendar=Kalender +Calendars=Kalendrar +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Påverkas i DoneBy=Utfärdat av Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=Alla ofullständiga handlingar MenuDoneActions=Alla avslutade åtgärder MenuToDoMyActions=Min ofullständiga handlingar MenuDoneMyActions=Min avslutas åtgärder -ListOfEvents=Lista över Dolibarr händelser +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Åtgärder som registrerats av ActionsToDoBy=Åtgärder påverkas ActionsDoneBy=Åtgärder som utförs av @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL att komma åt. Ical-fil ExtSiteNoLabel=Ingen beskrivning WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang index 845cb31f230..92d9bde0b02 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -72,10 +72,10 @@ PaymentsReportsForYear=Betalningar rapporter för %s PaymentsReports=Betalningar rapporter PaymentsAlreadyDone=Betalningar redan gjort PaymentsBackAlreadyDone=Återbetalningar är utförda tidigare -PaymentRule=Betalning regel +PaymentRule=Betalningsregel PaymentMode=Betalning typ -PaymentConditions=Betalning sikt -PaymentConditionsShort=Betalning sikt +PaymentConditions=Betalningsvillkor +PaymentConditionsShort=Betalningsvillkor PaymentAmount=Betalningsbelopp ValidatePayment=Bekräfta betalning PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala @@ -87,7 +87,7 @@ ClassifyCanceled=Klassificera "svikna" ClassifyClosed=Klassificera "sluten" ClassifyUnBilled=Classify 'Unbilled' CreateBill=Skapa faktura -AddBill=Lägg faktura eller kreditnota +AddBill=Lägg till faktura eller kreditnota AddToDraftInvoices=Lägg till faktura-utkast DeleteBill=Ta bort faktura SearchACustomerInvoice=Sök efter en kundfaktura @@ -109,7 +109,7 @@ BillStatusPaidBackOrConverted=Betalats eller omvandlas till rabatt BillStatusConverted=Omräknat i rabatt BillStatusCanceled=Övergiven BillStatusValidated=Validerad (måste betalas) -BillStatusStarted=Började +BillStatusStarted=Påbörjad BillStatusNotPaid=Inte betalas BillStatusClosedUnpaid=Stängt (obetalda) BillStatusClosedPaidPartially=Betalt (delvis) diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang index 660a820d021..34f80e7f951 100644 --- a/htdocs/langs/sv_SE/categories.lang +++ b/htdocs/langs/sv_SE/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Extra attibut CategoriesSetup=Kategorier, inställningar CategorieRecursiv=Länka automatiskt med förälderkategori CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälderkategori när den läggs i en underkategori +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang index 6095f7c37c7..54df1904f26 100644 --- a/htdocs/langs/sv_SE/companies.lang +++ b/htdocs/langs/sv_SE/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Du måste först skapa e-postkontakter för tredje par ListSuppliersShort=Lista över leverantörer ListProspectsShort=Lista över möjliga kunder ListCustomersShort=Lista över kunder -ThirdPartiesArea=Tredje part området +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Senaste %s modifierade tredje part UniqueThirdParties=Totalt unika tredje part InActivity=Öppet @@ -410,3 +410,5 @@ OutstandingBillReached=Upnått tak för obetalda fakturor MonkeyNumRefModelDesc=Ger nummer med format %syymm-nnnn för kundnummer och %syymm-nnnn för leverantörnummer där YY är år, mm månad och nnnn är en sekvens utan avbrott och utan återgång till 0. LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändras när som helst. ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang index f224a0b49a7..7f4af42e889 100644 --- a/htdocs/langs/sv_SE/compta.lang +++ b/htdocs/langs/sv_SE/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang index e776feab572..dbce6c62402 100644 --- a/htdocs/langs/sv_SE/donations.lang +++ b/htdocs/langs/sv_SE/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=Donation Donations=Donationer -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=Givare Donors=Givare AddDonation=Lägg till en donation NewDonation=Ny donation -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=Gift löfte PromisesNotValid=Inte validerade löften PromisesValid=Validerad löften @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=Förslag DonationStatusPromiseValidatedShort=Validerad DonationStatusPaidShort=Mottagna ValidPromess=Validate löfte -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=Bygg kvitto DonationsModels=Dokument modeller för donation kvitton LastModifiedDonations=Sista %s modifierad donationer SearchADonation=Sök en donation -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang index 7216280e10a..bac137d98a1 100644 --- a/htdocs/langs/sv_SE/errors.lang +++ b/htdocs/langs/sv_SE/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang index 62c7499ad0f..fb2f003cfcb 100644 --- a/htdocs/langs/sv_SE/holiday.lang +++ b/htdocs/langs/sv_SE/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Startdatum DateFinCP=Slutdatum @@ -18,24 +18,24 @@ ApprovedCP=Godkänd CancelCP=Annullerad RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Beskrivning -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Redigera DeleteCP=Ta bort ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Avbryt StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Uppdatera -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=Användare ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Namn Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Värde -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Skapa @@ -127,23 +127,23 @@ UpdateEventOptionCP=Uppdatera ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang index bbead3d106f..cfb2d4ee6d7 100644 --- a/htdocs/langs/sv_SE/install.lang +++ b/htdocs/langs/sv_SE/install.lang @@ -207,5 +207,5 @@ MigrationActioncommElement=Uppdatera uppgifter om åtgärder MigrationPaymentMode=Datamigrering betalning mode MigrationCategorieAssociation=Migreringskategorier -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Visa ej tillgängliga val +HideNotAvailableOptions=Dölj ej tillgängliga val diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang index 60c65ee763e..d99110f8bfb 100644 --- a/htdocs/langs/sv_SE/interventions.lang +++ b/htdocs/langs/sv_SE/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=Är du säker på att du vill ta bort detta ingrip NameAndSignatureOfInternalContact=Namn och underskrift ingripa: NameAndSignatureOfExternalContact=Namn och underskrift av kund: DocumentModelStandard=Standarddokument modell för insatser -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Klassificera "Fakturerade" +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Fakturerade RelatedInterventions=Insatserna ShowIntervention=Visar ingripande +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representanten uppföljning ingripande TypeContact_fichinter_internal_INTERVENING=Ingripa @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=Generic nummer modell ArcticNumRefModelError=Misslyckades med att aktivera PacificNumRefModelDesc1=Återgå numero med format %syymm-nnnn där YY är år, mm månaden och nnnn är en sekvens utan avbrott och ingen återgång till 0 PacificNumRefModelError=En intervention kort börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang index 3291cea2e70..d5d0379b62f 100644 --- a/htdocs/langs/sv_SE/projects.lang +++ b/htdocs/langs/sv_SE/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Åtgärder för projektet YouAreNotContactOfProject=Du är inte en kontakt på denna privata projekt DeleteATimeSpent=Ta bort tid ConfirmDeleteATimeSpent=Är du säker på att du vill ta bort denna tid? -DoNotShowMyTasksOnly=Se även uppgifter jag er inte påverkas i -ShowMyTasksOnly=Se bara uppgifter jag påverkas +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Resurser ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part NoTasks=Inga uppgifter för detta projekt LinkedToAnotherCompany=Kopplat till annan tredje part -TaskIsNotAffectedToYou=Uppgift tilldelas inte dig +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Tid är tom ThisWillAlsoRemoveTasks=Denna åtgärd kommer också att ta bort alla aktiviteter av projekt (%s uppgifter på för tillfället) och alla ingångar för nedlagd tid. IfNeedToUseOhterObjectKeepEmpty=Om vissa objekt (faktura, order, ...), som tillhör en annan tredje part, måste kopplas till projektet för att skapa, hålla denna tomt för att få projektet att flera tredje part. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=En fullständig projektets rapport modellen (logo. ..) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang index 08008caa374..5c81077a14e 100644 --- a/htdocs/langs/sv_SE/sendings.lang +++ b/htdocs/langs/sv_SE/sendings.lang @@ -13,7 +13,7 @@ LastSendings=Senaste %s transporter SearchASending=Sök efter transport StatisticsOfSendings=Statistik för transporter NbOfSendings=Antal transporter -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Frakt-kort NewSending=Ny leverans CreateASending=Skapa en sändning @@ -50,27 +50,29 @@ Enlevement=Fått av kunden DocumentModelSimple=Enkel förlagan DocumentModelMerou=Merou A5-modellen WarningNoQtyLeftToSend=Varning, att inga produkter väntar sändas. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=Hyvlat leveransdatum DateReceived=Datum leverans fick SendShippingByEMail=Skicka leverans via e-post -SendShippingRef=Skicka transport %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Evenemang på leverans LinkToTrackYourPackage=Länk till spåra ditt paket ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans sker från ordern kortet. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=Fångst av kunden SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Enkel handling modell för leverans kvitton DocumentModelTyphon=Mer komplett dokument modell för leverans intäkter (logo. ..) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER definieras inte -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang index 77aedee3391..1d0aac29844 100644 --- a/htdocs/langs/sv_SE/suppliers.lang +++ b/htdocs/langs/sv_SE/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=Beställ datum BuyingPrice=BETALKURS BuyingPriceMin=Lägsta köpkurs BuyingPriceMinShort=Min köpkurs -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Lägg leverantör pris ChangeSupplierPrice=Byta leverantör pris ErrorQtyTooLowForThisSupplier=Kvantitet för låg för denna leverantör eller något pris som anges på denna produkt för denna leverantör @@ -27,7 +27,7 @@ RefSupplierShort=Ref. leverantör Availability=Tillgänglighet ExportDataset_fournisseur_1=Leverantörsfakturor listan och fakturornas linjer ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Godkänna denna ordning ConfirmApproveThisOrder=Är du säker på att du vill godkänna att %s? DenyingThisOrder=Att förneka denna beställning @@ -39,4 +39,6 @@ AddSupplierOrder=Skapa leverantör för AddSupplierInvoice=Skapa leverantörsfaktura ListOfSupplierProductForSupplier=Förteckning över produkter och priser för leverantör %s NoneOrBatchFileNeverRan=Ingen eller parti %s sprang inte nyligen -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/th_TH/accountancy.lang +++ b/htdocs/langs/th_TH/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index 508231555a8..d147744ec24 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang index adf9cc32f1a..9b3efc07dab 100644 --- a/htdocs/langs/th_TH/agenda.lang +++ b/htdocs/langs/th_TH/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Events ActionsArea=Events area (Actions and tasks) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang index 27c4fc44394..ed61bfc08a6 100644 --- a/htdocs/langs/th_TH/categories.lang +++ b/htdocs/langs/th_TH/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/th_TH/companies.lang +++ b/htdocs/langs/th_TH/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/th_TH/compta.lang +++ b/htdocs/langs/th_TH/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang index 728661dfa04..66ddea95a5c 100644 --- a/htdocs/langs/th_TH/donations.lang +++ b/htdocs/langs/th_TH/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Search a donation DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/th_TH/errors.lang +++ b/htdocs/langs/th_TH/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/th_TH/holiday.lang +++ b/htdocs/langs/th_TH/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang index 58579a74276..17641a0ab3e 100644 --- a/htdocs/langs/th_TH/interventions.lang +++ b/htdocs/langs/th_TH/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Name and signature of intervening : NameAndSignatureOfExternalContact=Name and signature of customer : DocumentModelStandard=Standard document model for interventions InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Classify "Billed" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/th_TH/projects.lang +++ b/htdocs/langs/th_TH/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang index 039d47f6aa9..2ae43f39766 100644 --- a/htdocs/langs/th_TH/sendings.lang +++ b/htdocs/langs/th_TH/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. DateDeliveryPlanned=Planed date of delivery DateReceived=Date delivery received SendShippingByEMail=Send shipment by EMail -SendShippingRef=Send shipment %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. @@ -72,3 +72,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Sum of product volumes SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang index fdc0787646a..b1545d6ca3c 100644 --- a/htdocs/langs/th_TH/suppliers.lang +++ b/htdocs/langs/th_TH/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s NoneOrBatchFileNeverRan=None or batch %s not ran recently SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang index 5ea1eb67478..fbbd8502a48 100644 --- a/htdocs/langs/tr_TR/accountancy.lang +++ b/htdocs/langs/tr_TR/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Fatura satırı VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=CSV ayırıcısı +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Dolibarr'da gösterilen muhasebe hesapları uzunluğu AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Genel hesapların uzunluğu -ACCOUNTINGEX_LENGTH_AACCOUNT=Üçüncü parti hesapları uzunluğu +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Satış günlüğü -ACCOUNTINGEX_PURCHASE_JOURNAL=Satınalma günlüğü -ACCOUNTINGEX_BANK_JOURNAL=Banka günlüğü -ACCOUNTINGEX_CASH_JOURNAL=Kasa günlüğü -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Çeşitli günlük -ACCOUNTINGEX_SOCIAL_JOURNAL=Sosyal günlük +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Aktarım hesabı -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Bekleme hesabı +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Belge türü Docdate=Tarih diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 7660bf06ad0..cb3fd775dff 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Hata, bu modül %s veya daha yüksek Dolibarr ErrorDecimalLargerThanAreForbidden=Hata, %s den daha yüksek hassasiyet desteklenmez. DictionarySetup=Sözlük ayarları Dictionary=Sözlükler +Chartofaccounts=Hesap planı +Fiscalyear=Mali yıllar ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tür için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz ErrorCodeCantContainZero=Kod 0 değeri içeremez DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle (Görme engelli kişiler ve metin tarayıcılar için önerilir) @@ -133,11 +135,11 @@ Box=Kutu Boxes=Kutular MaxNbOfLinesForBoxes=Kutulardaki ençok satır sayısı PositionByDefault=Varsayılan sıra -Position=Position +Position=Durum MenusDesc=Menü yöneticisi 2 adet menü çubuğunun içeriğini tanımlar (yatay çubuk ve dikey çubuk). MenusEditorDesc=Menü düzenleyici, menülerde kişiselleştirilmiş girdilerin tanımlanmasına izin verir. Dolibarr ve menü girişlerinin kararsız hale gelip sürekli erişilemiyor olmaması için dikkatli kullanın.
Bazı modüller menülere girdi ekler (Çoğu durumlarda Hepsi (All) menüsününde). Eğer yanlışlıkla bazı girişleri kaldırdıysanız, modülleri kaldırıp tekrar etinleştirerek bunları düzeltebilirsiniz. MenuForUsers=Kullanıcı menüsü -LangFile=Dosya. Lang +LangFile=.lang dosyası System=Sistem SystemInfo=Sistem bilgileri SystemTools=Sistem araçları @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=JavaScript devre dışı ise otomatiktir AvailableOnlyIfJavascriptNotDisabled=Yalnızca JavaScript devre dışı değilse vardır AvailableOnlyIfJavascriptAndAjaxNotDisabled=Yalnızca JavaScript ve Ajax devre dışı değilse vardır Required=Gerekli +UsedOnlyWithTypeOption=Used by some agenda option only Security=Güvenlik Passwords=Parolalar DoNotStoreClearPassword=Parolaları veritabanında saklamayın silin, yalnızca şifreli değerleri saklayın (Etkinleştirme önerilir) @@ -248,7 +251,7 @@ CurrentMenuHandler=Geçerli menü işlemcisi CurrentSmartphoneMenuHandler=Geçerli smartphone menü işlemcisi MeasuringUnit=Ölçü birimi Emails=E-postalar -EMailsSetup=E-posta kurulumu +EMailsSetup=E-posta ayarları EMailsDesc=Bu sayfa e-posta göndermek için PHP parametrelerini çiğnemenize izin verir. UNIX/Linux İşletim Sisteminde çoğu durumda PHP niz doğru kurulmuştur ve bu parametreler kullanışsızdır. MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Sunucu (php.ini de varsayılan: %s) MAIN_MAIL_SMTP_SERVER=Php.ini SMTP / SMTPS Host (Varsayılan:% s) @@ -257,9 +260,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Sunucu (Unix gibi siste MAIN_MAIL_EMAIL_FROM=Otomatik e-postalarda gönderici (php.inide varsayılan: %s) MAIN_MAIL_ERRORS_TO=Gönderilen hatalı e-postalar için kullanılacak gönderici e-postası MAIN_MAIL_AUTOCOPY_TO= Gönderilen bütün epostaların bir gizli karbon-kopyasını sistemli olarak gönder -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to -MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Eposta ile gönderilen tekliflerin bir karbon kopyasını bu adrese sistematik olarak gönder +MAIN_MAIL_AUTOCOPY_ORDER_TO= Eposta ile gönderilen siparişlerin bir karbon kopyasını bu adrese sistematik olarak gönder +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Eposta ile gönderilen faturaların bir karbon kopyasını bu adrese sistematik olarak gönder MAIN_DISABLE_ALL_MAILS=Bütün e-posta gönderimlerini engelle (test yada demo amacıyla) MAIN_MAIL_SENDMODE=E-posta göndermek için kullanılan yöntem MAIN_MAIL_SMTPS_ID=Doğrulama gerektirdiğinde SMTP Kimliği @@ -517,16 +520,16 @@ Module6000Name=İş akışı Module6000Desc=İş akışı yönetimi Module20000Name=Tatiller Module20000Desc=Çalışanların tatillerini bildir ve izle -Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Name=Ürün kümesi +Module39000Desc=Parti numarası, ürünlerin yenme ve satış tarihi yönetiminde Module50000Name=PayBox Module50000Desc=PayBox modülü ile kredi kartı ile çevrimiçi ödeme sayfası sunmak için Module50100Name=Satış Noktaları Module50100Desc=Satış Noktası modülü Module50200Name= Paypal Module50200Desc= Kredi kartı ya da Paypal ile ödeme sağlayan çevrimiçi ödeme sayfası modülü -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50400Name=Muhasebe (gelişmiş) +Module50400Desc=Muhasebe yönetimi (çift taraf) Module54000Name=IPP Yazdır Module54000Desc=Cup'a IPP Yazıcıyla yazdır. Module55000Name=Anket aç @@ -757,7 +760,7 @@ Permission59002=Ticari oran tanımla DictionaryCompanyType=Üçüncü parti türleri DictionaryCompanyJuridicalType=Üçüncü parti yasal türleri DictionaryProspectLevel=Aday potansiyel düzeyi -DictionaryCanton=Eyalet/Kanton +DictionaryCanton=Eyalet/Şehir DictionaryRegion=Bölgeler DictionaryCountry=Ülkeler DictionaryCurrency=Para birimleri @@ -1079,7 +1082,7 @@ NotificationsDesc=E-posta bildirimleri özelliği, sessiz şekilde otomatik post ModelModules=Belge şablonları DocumentModelOdt=OpenDocuments şablonlarından belgeler oluşturun (OpenOffice, KOffice, TextEdit .ODT veya .ODS dosyaları) WatermarkOnDraft=Taslak belge üzerinde filigran -JSOnPaimentBill=Activate feature to autofill payment lines on payment form +JSOnPaimentBill=Ödeme formunda ödeme satırlarını otomatik doldurma özelliğini etkinleştir CompanyIdProfChecker=Uzman Kimliği kuralları MustBeUnique=Benzersiz olmalıdır? MustBeMandatory=Üçüncü partileri oluşturmak zorunludur ? @@ -1132,7 +1135,7 @@ CreateForm=Form oluştur NumberOfProductLines=Ürün satır sayısı ProposalsNumberingModules=Teklif numaralandırma modülü ProposalsPDFModules=Teklif belge modelleri -ClassifiedInvoiced=Sınıflandırılmış faturalar +ClassifiedInvoiced=Faturalandı olarak sınıflandı HideTreadedPropal=İşlenmiş teklifleri listede gizle AddShippingDateAbility=Nakliye tarihi özelliği ekle AddDeliveryAddressAbility=Teslim tarihi özelliği ekle @@ -1453,7 +1456,7 @@ OptionVATDefault=Nakit temelli OptionVATDebitOption=Tahakkuk temelli OptionVatDefaultDesc=KDV nedeniyle:
- malların tesliminde ( fatura tarihini kullanırız)
- hizmet ödemelerinde (borç) OptionVatDebitOptionDesc=KDV nedeniyle:
- malların tesliminde ( fatura tarihini kullanırız)
- hizmet faturalarında (borç) -SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +SummaryOfVatExigibilityUsedByDefault=Seçilen seçeneğe göre KDV uygunluk süresi: OnDelivery=Teslimatta OnPayment=Ödemede OnInvoice=Faturada @@ -1538,4 +1541,4 @@ Opened=Açık Closed=Kapalı Format=Biçim -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang index d3421d8d336..324560637a7 100644 --- a/htdocs/langs/tr_TR/agenda.lang +++ b/htdocs/langs/tr_TR/agenda.lang @@ -7,6 +7,7 @@ Agendas=Gündemler Calendar=Takvim Calendars=Takvimler LocalAgenda=İç takvim +ActionsOwnedBy=Event owned by AffectedTo=Etkilenen DoneBy=Yapan Event=Etkinlik @@ -88,4 +89,5 @@ ExtSiteUrlAgenda=.ical dosyasına erişmek için URL ExtSiteNoLabel=Tanımlama yok WorkingTimeRange=Çalışma saati aralığı WorkingDaysRange=Çalışma günleri aralığı -AddEvent=Etkinlik oluştur +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang index 1cea1c555ae..d005baae3ab 100644 --- a/htdocs/langs/tr_TR/categories.lang +++ b/htdocs/langs/tr_TR/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Tamamlayıcı öznitelikler CategoriesSetup=Kategori ayarları CategorieRecursiv=Ana kategoriyle otomatik bağlantılı CategorieRecursivHelp=Etkinse, ürün bir alt kategoriye eklenirken aynı zamanda ana kategoriye de eklenecektir +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang index 86ff28e3e8e..122d6dae41b 100644 --- a/htdocs/langs/tr_TR/companies.lang +++ b/htdocs/langs/tr_TR/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Eposta bildirimleri ekleyebilmek için üçüncü part ListSuppliersShort=Tedarikçi listesi ListProspectsShort=Aday Listesi ListCustomersShort=Müşteri listesi -ThirdPartiesArea=Üçüncü parti alanı +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Değiştirilen son %s üçüncü parti UniqueThirdParties=Toplam eşsiz üçüncü parti InActivity=Açık @@ -410,3 +410,5 @@ OutstandingBillReached=En yüksek ödenmemiş fatura tutarına ulaşıldı MonkeyNumRefModelDesc=Sayı biçimini müşteri için %syymm-nnn, tedarikçi için %syymm-nnn gösterir, yy yıl, mm ay ve nnnn ise 0 olmayan bir dizidir LeopardNumRefModelDesc=Müşteri/tedarikçi kodu serbesttir. Bu kod herhangi bir zamanda değiştirilebilir. ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang index 13c10ed06eb..73b7714bd7d 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Muhasebe özeti ByProductsAndServices=Ürün ve hizmete göre RefExt=Dış ref ToCreateAPredefinedInvoice=Ön tanımlı bir fatura oluşturmak için, standart bir fatura oluşturun, sonra onu doğrulamadan "Ön tanımlı faturaya dönüştür" düğmesine tıklayın. -LinkedOrder=bu siparişle bağlantılı +LinkedOrder=Link to order ReCalculate=Yeniden hesapla Mode1=Yöntem 1 Mode2=Yöntem 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kulla TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, nakit muhasebesimodu için uygun değildir. Bu rapor yalnızca, tahakkuk muhasebesi modu için uygundur (muhasebe modülü ayarlarına bakın). CalculationMode=Hesaplama modu AccountancyJournal=Muhasebe kodu günlüğü -COMPTA_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu -COMPTA_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu -COMPTA_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu -COMPTA_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu -COMPTA_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu -COMPTA_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu -COMPTA_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu -COMPTA_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang index 1994626d299..4af09da18a3 100644 --- a/htdocs/langs/tr_TR/donations.lang +++ b/htdocs/langs/tr_TR/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Bağış ara DonationRecipient=Bağış alıcısı ThankYou=Teşekkürler IConfirmDonationReception=Alıcı, bağış olarak aşağıdaki tutarı aldığını belirtir +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang index 67077b69d64..871e366a1b0 100644 --- a/htdocs/langs/tr_TR/errors.lang +++ b/htdocs/langs/tr_TR/errors.lang @@ -133,7 +133,6 @@ ErrorPHPNeedModule=Hata, bu özelliği kulanmak için PHP nizde %s modül ErrorOpenIDSetupNotComplete=Dolibarr yapılandırma dosyasını OpenID kimlik doğrulamaya izin verecek şekilde ayarladınız, ancak OpenID hizmetine ait URL, %s değişmezine tanımlanmamıştır ErrorWarehouseMustDiffers=Kaynak ve hedef depo farklı olmalıdır ErrorBadFormat=Hatalı biçim! -ErrorPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) önce bu faturada %s olamaz. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üçüncü partiye bağlanmamıştır. Üyeyi varolan bir üçüncü partiye bağlayın ya da faturayla abonelik oluşturmadan önce yeni bir üçüncü parti oluşturun. ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi. ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez @@ -156,3 +155,5 @@ WarningUsingThisBoxSlowDown=Uyarı, bu kutuyu kullanmak kutuyu gösteren tüm sa WarningClickToDialUserSetupNotComplete=Kullanıcınızın ClickToDial bilgileri ayarı tamamlanmamış (kullanıcı kartınızdaki ClickToDial tabına bakın) WarningNotRelevant=Bu veri kümesi için alakasız işlem WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Bu özellik, ekran görme engelliler için ya da metin tarayıcılar için ayarlandığında devre dışı kalır. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang index a79c0e1fd8a..dd4331c8e6c 100644 --- a/htdocs/langs/tr_TR/holiday.lang +++ b/htdocs/langs/tr_TR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=IK -Holidays=Tatiller -CPTitreMenu=Tatiller +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Aylık özet -MenuAddCP=Tatil için başvur -NotActiveModCP=Bu sayfayı görmek için tatiller modülünü etkinleştirmelisiniz. -NotConfigModCP=Bu sayfayı görmek için tatiller modülünü etkinleştirmelisiniz. Bunu yapmak için, buraya tıklayın . -NoCPforUser=Bir tatil isteğiniz yok. -AddCP=Tatil için başvur +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Çalışan DateDebCP=Başlama tarihi DateFinCP=Bitiş tarihi @@ -18,24 +18,24 @@ ApprovedCP=Onaylandı CancelCP=İptal edildi RefuseCP=Reddedildi ValidatorCP=Onaylayan -ListeCP=Tatil listesi +ListeCP=List of leaves ReviewedByCP=İnceleyen DescCP=Açıklama -SendRequestCP=Tatil isteği oluşturma -DelayToRequestCP=Tatil başvuruları enaz %s gün önce yapılmalı. -MenuConfCP=Tatil bakiyesi düzenle -UpdateAllCP=Tatilleri güncelle -SoldeCPUser=Tatil bakiyesi %s gündür. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Başlama tarihinden büyük bir bitiş tarihi seçmelisiniz. ErrorSQLCreateCP=Oluşturma sırasında bir SQL hatası oluştu: -ErrorIDFicheCP=Bir hata oluştu, tatil isteği mevcut değil. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Önceki sayfaya dön -ErrorUserViewCP=Tatil isteklerini okumaya yetkili değilsiniz. -InfosCP=Tatil isteği bilgileri +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Bilgi işakışı RequestByCP=İsteyen -TitreRequestCP=Tatil tablosu -NbUseDaysCP=Harcanan tatil günleri +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Düzenle DeleteCP=Sil ActionValidCP=Doğrula @@ -43,26 +43,26 @@ ActionRefuseCP=Reddet ActionCancelCP=İptal StatutCP=Durumu SendToValidationCP=Doğrulamaya gönder -TitleDeleteCP=Tatil isteğini sil -ConfirmDeleteCP=Bu tatil isteğinin silinmesini onayla? -ErrorCantDeleteCP=Bu tatil isteğini silme hakkınız yok. -CantCreateCP=Tatil için başvuru yapma hakkınız yok. -InvalidValidatorCP=Tatil isteğiniz için onaylayacak birini seçmelisiniz. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Güncelle -CantUpdate=Bu tatil isteğini güncelleyemezsiniz. +CantUpdate=You cannot update this leave request. NoDateDebut=Bir başlama tarihi seçmelisiniz. NoDateFin=Bir bitiş tarihi seçmelisiniz. ErrorDureeCP=Tatil isteğiniz çalışma günlerini kapsamıyor. TitleValidCP=Tatil isteğini onayla -ConfirmValidCP=Tatil isteğini onaylamak istediğinizden emin misiniz? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Tarih onaylandı -TitleToValidCP=Tatil isteği gönder -ConfirmToValidCP=Tatil isteğini göndermek istediğinizden emin misiniz? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Tatil isteğini reddet -ConfirmRefuseCP=Tatil isteğini reddetmek istediğinizden emin misiniz? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=İsteği reddetmek için bir neden seçmelisiniz. TitleCancelCP=Tatil isteğini iptal et -ConfirmCancelCP=Tatil isteğini iptal etmek istediğinizden emin misiniz? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Ret nedeni DateRefusCP=Ret tarihi DateCancelCP=İptal tarihi @@ -72,8 +72,8 @@ MotifCP=Neden UserCP=Kullanıcı ErrorAddEventToUserCP=Özel izin eklenirken hata oluştu. AddEventToUserOkCP=Özel izin eklenmesi tamamlanmıştır. -MenuLogCP=Tatil kayıtlarını gör -LogCP=Tatil güncellemeleri kayıtı +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Uygulayan UserUpdateCP=Kullanıcı için PrevSoldeCP=Önceki Bakiye @@ -81,33 +81,33 @@ NewSoldeCP=Yeni Bakiye alreadyCPexist=Bu dönem için bir tatil isteği zaten yapılmış. UserName=Adı Employee=Çalışan -FirstDayOfHoliday=Tatilin ilk günü -LastDayOfHoliday=Tatilin son günü +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Aylık güncelleme ManualUpdate=Elle güncelleme -HolidaysCancelation=Tatil iptali +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Tatil modülünün yapılandırılması DescOptionCP=Seçeneğin tanımı ValueOptionCP=Değer -GroupToValidateCP=Tatilleri onaylama yetkisindeki grup +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Yapılandırmayı onayla -LastUpdateCP=Tatillerin son otomatik güncellenmesi +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Güncelleme başarılı ErrorUpdateConfCP=Güncelleme sırasında bir hata oluştu, lütfen yeniden deneyin. AddCPforUsers=Kullanıcıların tatil bakiyelerini eklemek için lütfen buraya tıklayın. DelayForSubmitCP=Tatil için son başvuru tarihi AlertapprobatortorDelayCP=Eğer tatil istekleri son tarihle eşleşmezse onaylayanı uyar -AlertValidatorDelayCP=Eğer tatil istekleri son tarihle eşleşmezse onaylayanı uyar -AlertValidorSoldeCP=Eğer tatil istekleri bakiyeyi aşarsa onayalayanı uyar -nbUserCP=Tatil modülünde desteklenen kullanıcı sayısı -nbHolidayDeductedCP=Alınan tatilden düşülecek tatil günü sayısı -nbHolidayEveryMonthCP=Her eklenen tatil sayısı -Module27130Name= Tatillerin yönetimi -Module27130Desc= Tatillerin yönetimi -TitleOptionMainCP=Tatillerin ana ayarları -TitleOptionEventCP=Tatillerin etkinliklerle ilişkilendirilme ayarları +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Doğrula UpdateEventCP=Etkinlikleri güncelle CreateEventCP=Oluştur @@ -127,23 +127,23 @@ UpdateEventOptionCP=Güncelle ErrorMailNotSend=Eposta gönderilirken bir hata oluştu: NoCPforMonth=Bu ay hiç izin yok. nbJours=Gün sayısı -TitleAdminCP=Tatillerin Yapılandırması +TitleAdminCP=Configuration of Leaves #Messages Hello=Merhaba -HolidaysToValidate=Tatil doğrula -HolidaysToValidateBody=Aşağıda doğrulanacak bir tatil isteği var -HolidaysToValidateDelay=Bu tatil isteği %s günden daha az bir sürede gerçekleşecektir. -HolidaysToValidateAlertSolde=Bu tatil isteğini yapan kullanıcının yeterli günü yoktur. -HolidaysValidated=Tatil doğrula -HolidaysValidatedBody=%s tarihinden %s tarihine kadar tatil isteğiniz doğrulanmıştır. -HolidaysRefused=Tatil reddedildi -HolidaysRefusedBody=%s tarihinden %s tarihine kadar olan tatil isteğiniz aşağıdaki nedenden dolayı reddeilmiştir : -HolidaysCanceled=İptal edilen tatiller -HolidaysCanceledBody=%s tarihinden %s tarihine kadar olan tatil isteğiniz iptal edilmiştir. -Permission20000=Tatillerinizi okuyun -Permission20001=Tatilini oluştur/değiştir -Permission20002=herkes için tatilleri oluştur/değiştir -Permission20003=Tatil isteklerini sil -Permission20004=Kullanıcıların tatillerini tanımla -Permission20005=Değiştirilen tatil kayıtlarını incele -Permission20006=Aylık tatil raporlarını oku +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang index 1f05331ba2a..3fd1d2086a0 100644 --- a/htdocs/langs/tr_TR/interventions.lang +++ b/htdocs/langs/tr_TR/interventions.lang @@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Müdahilin adı ve imzası : NameAndSignatureOfExternalContact=Müşterinin adı ve imzası : DocumentModelStandard=Müdahaleler için standart belge modeli InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları -ClassifyBilled=Sınıflandırma "Faturalanmış" -ClassifyUnBilled=Sınıflandırma "Faturalanmadı" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Faturalanmış RelatedInterventions=İlgili müdahaleler ShowIntervention=Müdahale göster diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang index 1a29e5540e4..c945635a36a 100644 --- a/htdocs/langs/tr_TR/projects.lang +++ b/htdocs/langs/tr_TR/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Proje etkinlikleri YouAreNotContactOfProject=Bu özel projenin bir ilgilisi değilsiniz DeleteATimeSpent=Harcana süre sil ConfirmDeleteATimeSpent=Bu harcanan süreyi silmek istediğinizden emin misiniz? -DoNotShowMyTasksOnly=Bana ayrılmamış görevlere de bakın -ShowMyTasksOnly=Sadece bana ayrılan görevleri gözter +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Kaynaklar ProjectsDedicatedToThisThirdParty=Bu üçüncü parti atanmış projeler NoTasks=Bu proje için hiçbir görev yok LinkedToAnotherCompany=Diğer üçüncü partiye bağlantılı -TaskIsNotAffectedToYou=Görev size ayrılmamış +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Harcanan süre boş ThisWillAlsoRemoveTasks=Bu eylem aynı zamanda projenin tüm görevlerini (şu andaki %s görevleri) ve tüm harcanan süre girişlernii siler . IfNeedToUseOhterObjectKeepEmpty=Eğer bazı nesneler başka bir üçüncü partiye aitse (fatura, sipariş, ...), oluşturulması için bu projeye bağlanmalıdır, projenin birden çok üçüncü partiye bağlı olması için bunu boş bırakın. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Katılımcı TypeContact_project_task_external_TASKCONTRIBUTOR=Katılımcı SelectElement=Öğe seç AddElement=Öğeye bağlan +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Eksiksiz bir proje rapor modeli (logo. ..) PlannedWorkload = Planlı işyükü @@ -128,3 +129,4 @@ ProjectReferers=Yönlendirme nesneleri SearchAProject=Bir proje ara ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır ProjectDraft=Taslak projeler +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang index 4c883321878..3d84e62205f 100644 --- a/htdocs/langs/tr_TR/sendings.lang +++ b/htdocs/langs/tr_TR/sendings.lang @@ -72,3 +72,7 @@ DocumentModelTyphon=Teslimat makbuzları için daha fazla eksiksiz doküman mode Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER değişmezi tanımlanmamış SumOfProductVolumes=Ürün hacimleri toplamı SumOfProductWeights=Ürün ağırlıkları toplamı + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang index 41702fff665..56480109c70 100644 --- a/htdocs/langs/tr_TR/suppliers.lang +++ b/htdocs/langs/tr_TR/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Tedarikçi faturası oluştur ListOfSupplierProductForSupplier=Tedarikçi %s için ürün ve fiyat listesi NoneOrBatchFileNeverRan=Hiçbiri veya toplu %s yürütülmedi SentToSuppliers=Tedarikçilere gönderilen +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/uk_UA/accountancy.lang +++ b/htdocs/langs/uk_UA/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index d09bf84402e..c8b20ae090c 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -1,14 +1,14 @@ # Dolibarr language file - Source file is en_US - admin -Foundation=Foundation -Version=Version -VersionProgram=Version program -VersionLastInstall=Version initial install -VersionLastUpgrade=Version last upgrade -VersionExperimental=Experimental -VersionDevelopment=Development -VersionUnknown=Unknown -VersionRecommanded=Recommended -SessionId=Session ID +Foundation=Установа +Version=Версія +VersionProgram=Версія програми +VersionLastInstall=Версія первинної інсталяції +VersionLastUpgrade=Версія останнього оновлення +VersionExperimental=Експериментальна +VersionDevelopment=Розробча +VersionUnknown=Невизначена +VersionRecommanded=Рекомендована +SessionId=ID Сессії SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization PurgeSessions=Purge of sessions @@ -17,14 +17,14 @@ NoSessionListWithThisHandler=Save session handler configured in your PHP does no LockNewSessions=Lock new connections ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user %s will be able to connect after that. UnlockNewSessions=Remove connection lock -YourSession=Your session +YourSession=Ваш сеанс Sessions=Users session WebUserGroup=Web server user/group NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). HTMLCharset=Charset for generated HTML pages DBStoringCharset=Database charset to store data DBSortingCharset=Database charset to sort data -WarningModuleNotActive=Module %s must be enabled +WarningModuleNotActive=Модуль %s повинен бути активованим WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. DolibarrSetup=Dolibarr install or upgrade DolibarrUser=Dolibarr user @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang index adf9cc32f1a..b279f5aa92c 100644 --- a/htdocs/langs/uk_UA/agenda.lang +++ b/htdocs/langs/uk_UA/agenda.lang @@ -1,28 +1,29 @@ # Dolibarr language file - Source file is en_US - agenda IdAgenda=ID event -Actions=Events -ActionsArea=Events area (Actions and tasks) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar -AffectedTo=Assigned to -DoneBy=Done by +Actions=Події +ActionsArea=Ділянка Подій (Дії та задачі) +Agenda=Повістка дня +Agendas=Повістки денні +Calendar=Календар +Calendars=Календарі +LocalAgenda=Внутрішній календар +ActionsOwnedBy=Event owned by +AffectedTo=Призначено +DoneBy=Виконано Event=Event -Events=Events -EventsNb=Number of events -MyEvents=My events -OtherEvents=Other events -ListOfActions=List of events -Location=Location -EventOnFullDay=Event on all day(s) -SearchAnAction= Search an event/task -MenuToDoActions=All incomplete events +Events=Події +EventsNb=Кількість подій +MyEvents=Мої події +OtherEvents=Інші події +ListOfActions=Список подій +Location=Розташування +EventOnFullDay=Подія на цілий день(дні) +SearchAnAction= Шукати подію/задачу +MenuToDoActions=Усі невиконані події MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang index 27c4fc44394..ed61bfc08a6 100644 --- a/htdocs/langs/uk_UA/categories.lang +++ b/htdocs/langs/uk_UA/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/uk_UA/companies.lang +++ b/htdocs/langs/uk_UA/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/uk_UA/compta.lang +++ b/htdocs/langs/uk_UA/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang index 728661dfa04..66ddea95a5c 100644 --- a/htdocs/langs/uk_UA/donations.lang +++ b/htdocs/langs/uk_UA/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Search a donation DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/uk_UA/errors.lang +++ b/htdocs/langs/uk_UA/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/uk_UA/holiday.lang +++ b/htdocs/langs/uk_UA/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang index 58579a74276..17641a0ab3e 100644 --- a/htdocs/langs/uk_UA/interventions.lang +++ b/htdocs/langs/uk_UA/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Name and signature of intervening : NameAndSignatureOfExternalContact=Name and signature of customer : DocumentModelStandard=Standard document model for interventions InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Classify "Billed" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/uk_UA/projects.lang +++ b/htdocs/langs/uk_UA/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang index 3bb65c295d2..2ae43f39766 100644 --- a/htdocs/langs/uk_UA/sendings.lang +++ b/htdocs/langs/uk_UA/sendings.lang @@ -1,76 +1,78 @@ # Dolibarr language file - Source file is en_US - sendings -# RefSending=Ref. shipment -# Sending=Shipment -# Sendings=Shipments -# Shipment=Shipment -# Shipments=Shipments -# Receivings=Receivings -# SendingsArea=Shipments area -# ListOfSendings=List of shipments -# SendingMethod=Shipping method -# SendingReceipt=Shipping receipt -# LastSendings=Last %s shipments -# SearchASending=Search for shipment -# StatisticsOfSendings=Statistics for shipments -# NbOfSendings=Number of shipments -# NumberOfShipmentsByMonth=Number of shipments by month -# SendingCard=Shipping card -# NewSending=New shipment -# CreateASending=Create a shipment -# CreateSending=Create shipment -# QtyOrdered=Qty ordered -# QtyShipped=Qty shipped -# QtyToShip=Qty to ship -# QtyReceived=Qty received -# KeepToShip=Keep to ship -# OtherSendingsForSameOrder=Other shipments for this order -# DateSending=Date sending order -# DateSendingShort=Date sending order -# SendingsForSameOrder=Shipments for this order -# SendingsAndReceivingForSameOrder=Shipments and receivings for this order -# SendingsToValidate=Shipments to validate -# StatusSendingCanceled=Canceled -# StatusSendingDraft=Draft -# StatusSendingValidated=Validated (products to ship or already shipped) -# StatusSendingProcessed=Processed -# StatusSendingCanceledShort=Canceled -# StatusSendingDraftShort=Draft -# StatusSendingValidatedShort=Validated -# StatusSendingProcessedShort=Processed -# SendingSheet=Sending sheet -# Carriers=Carriers -# Carrier=Carrier -# CarriersArea=Carriers area -# NewCarrier=New carrier -# ConfirmDeleteSending=Are you sure you want to delete this shipment ? -# ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? -# ConfirmCancelSending=Are you sure you want to cancel this shipment ? -# GenericTransport=Generic transport -# Enlevement=Gotten by customer -# DocumentModelSimple=Simple document model -# DocumentModelMerou=Merou A5 model -# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -# DateDeliveryPlanned=Planed date of delivery -# DateReceived=Date delivery received -# SendShippingByEMail=Send shipment by EMail -# SendShippingRef=Send shipment %s -# ActionsOnShipping=Events on shipment -# LinkToTrackYourPackage=Link to track your package -# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -# RelatedShippings=Related shippings -# ShipmentLine=Shipment line -# CarrierList=List of transporters +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +Receivings=Receivings +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipping card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Keep to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Sending sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shippings +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods -# SendingMethodCATCH=Catch by customer -# SendingMethodTRANS=Transporter -# SendingMethodCOLSUI=Colissimo - +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo # ModelDocument -# DocumentModelSirocco=Simple document model for delivery receipts -# DocumentModelTyphon=More complete document model for delivery receipts (logo...) +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights -# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang index 01c90ede80f..b1545d6ca3c 100644 --- a/htdocs/langs/uk_UA/suppliers.lang +++ b/htdocs/langs/uk_UA/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers -# Suppliers=Suppliers -# Supplier=Supplier -# AddSupplier=Add a supplier -# SupplierRemoved=Supplier removed -# SuppliersInvoice=Suppliers invoice -# NewSupplier=New supplier -# History=History -# ListOfSuppliers=List of suppliers -# ShowSupplier=Show supplier -# OrderDate=Order date -# BuyingPrice=Buying price -# BuyingPriceMin=Minimum buying price -# BuyingPriceMinShort=Min buying price -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined -# AddSupplierPrice=Add supplier price -# ChangeSupplierPrice=Change supplier price -# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -# NoRecordedSuppliers=No suppliers recorded -# SupplierPayment=Supplier payment -# SuppliersArea=Suppliers area -# RefSupplierShort=Ref. supplier -# Availability=Availability -# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -# ExportDataset_fournisseur_2=Supplier invoices and payments -# ExportDataset_fournisseur_3=Supplier orders and order lines -# ApproveThisOrder=Approve this order -# ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -# DenyingThisOrder=Denying this order -# ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -# ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -# AddCustomerOrder=Create customer order -# AddCustomerInvoice=Create customer invoice -# AddSupplierOrder=Create supplier order -# AddSupplierInvoice=Create supplier invoice -# ListOfSupplierProductForSupplier=List of products and prices for supplier %s -# NoneOrBatchFileNeverRan=None or batch %s not ran recently -# SentToSuppliers=Sent to suppliers +Suppliers=Suppliers +Supplier=Supplier +AddSupplier=Add a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Denying this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index d09bf84402e..13821724bc9 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version % ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only Security=Security Passwords=Passwords DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang index adf9cc32f1a..9b3efc07dab 100644 --- a/htdocs/langs/uz_UZ/agenda.lang +++ b/htdocs/langs/uz_UZ/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=Events ActionsArea=Events area (Actions and tasks) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events +ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang index 27c4fc44394..ed61bfc08a6 100644 --- a/htdocs/langs/uz_UZ/categories.lang +++ b/htdocs/langs/uz_UZ/categories.lang @@ -111,3 +111,4 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang index 1b2ea17215b..5580d87b517 100644 --- a/htdocs/langs/uz_UZ/companies.lang +++ b/htdocs/langs/uz_UZ/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first ListSuppliersShort=List of suppliers ListProspectsShort=List of prospects ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=Last %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang index b44f52ee2fa..3929cfde036 100644 --- a/htdocs/langs/uz_UZ/compta.lang +++ b/htdocs/langs/uz_UZ/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang index 728661dfa04..66ddea95a5c 100644 --- a/htdocs/langs/uz_UZ/donations.lang +++ b/htdocs/langs/uz_UZ/donations.lang @@ -30,3 +30,4 @@ SearchADonation=Search a donation DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang index 6f96b00f5f2..a2c8ec77de2 100644 --- a/htdocs/langs/uz_UZ/errors.lang +++ b/htdocs/langs/uz_UZ/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/uz_UZ/holiday.lang +++ b/htdocs/langs/uz_UZ/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang index 58579a74276..17641a0ab3e 100644 --- a/htdocs/langs/uz_UZ/interventions.lang +++ b/htdocs/langs/uz_UZ/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Name and signature of intervening : NameAndSignatureOfExternalContact=Name and signature of customer : DocumentModelStandard=Standard document model for interventions InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Classify "Billed" +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang index 55970f0b35c..4affd1fdc5a 100644 --- a/htdocs/langs/uz_UZ/projects.lang +++ b/htdocs/langs/uz_UZ/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? -DoNotShowMyTasksOnly=See also tasks not allocated to me -ShowMyTasksOnly=View only tasks allocated to me +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Ressources ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party NoTasks=No tasks for this project LinkedToAnotherCompany=Linked to other third party -TaskIsNotAffectedToYou=Task not allocated to you +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Time spent is empty ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang index 039d47f6aa9..2ae43f39766 100644 --- a/htdocs/langs/uz_UZ/sendings.lang +++ b/htdocs/langs/uz_UZ/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. DateDeliveryPlanned=Planed date of delivery DateReceived=Date delivery received SendShippingByEMail=Send shipment by EMail -SendShippingRef=Send shipment %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. @@ -72,3 +72,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Sum of product volumes SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang index fdc0787646a..b1545d6ca3c 100644 --- a/htdocs/langs/uz_UZ/suppliers.lang +++ b/htdocs/langs/uz_UZ/suppliers.lang @@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s NoneOrBatchFileNeverRan=None or batch %s not ran recently SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang index f103efef589..2d2bda8acb2 100644 --- a/htdocs/langs/vi_VN/accountancy.lang +++ b/htdocs/langs/vi_VN/accountancy.lang @@ -1,158 +1,158 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting -Globalparameters=Global parameters -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years -Menuaccount=Accounting accounts -Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +Accounting=Kế toán +Globalparameters=Các thông số toàn cầu +Chartofaccounts=Biểu đồ tài khoản +Fiscalyear=Năm tài chính +Menuaccount=Tài khoản kế toán +Menuthirdpartyaccount=Tài khoản của bên thứ ba +MenuTools=Công cụ -ConfigAccountingExpert=Configuration of the module accounting expert -Journaux=Journals -JournalFinancial=Financial journals -Exports=Exports -Modelcsv=Model of export -Selectmodelcsv=Select a model of export -Modelcsv_normal=Classic export -Modelcsv_CEGID=Export towards CEGID Expert -BackToChartofaccounts=Return chart of accounts -Back=Return +ConfigAccountingExpert=Cấu hình của các chuyên gia kế toán mô-đun +Journaux=Tạp chí +JournalFinancial=Tạp chí tài chính +Exports=Xuất khẩu +Modelcsv=Mô hình xuất khẩu +Selectmodelcsv=Chọn một mô hình xuất khẩu +Modelcsv_normal=Cổ điển xuất khẩu +Modelcsv_CEGID=Xuất khẩu theo hướng CEGID chuyên gia +BackToChartofaccounts=Quay trở lại biểu đồ của tài khoản +Back=Quay trở lại -Definechartofaccounts=Define a chart of accounts -Selectchartofaccounts=Select a chart of accounts -Validate=Validate -Addanaccount=Add an accounting account -AccountAccounting=Accounting account -Ventilation=Ventilation -ToDispatch=To dispatch -Dispatched=Dispatched +Definechartofaccounts=Xác định một biểu đồ của tài khoản +Selectchartofaccounts=Chọn một biểu đồ của tài khoản +Validate=Xác nhận +Addanaccount=Thêm một tài khoản kế toán +AccountAccounting=Tài khoản kế toán +Ventilation=Thông gió +ToDispatch=Cử +Dispatched=Cử -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers -TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -ByMonth=By Month -NewAccount=New accounting account -Update=Update -List=List -Create=Create -UpdateAccount=Modification of an accounting account -UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger -AccountBalanceByMonth=Account balance by month +CustomersVentilation=Khách hàng thông gió +SuppliersVentilation=Các nhà cung cấp hệ thống thông gió +TradeMargin=Lợi nhuận thương mại +Reports=Báo cáo +ByCustomerInvoice=Hoá đơn cho khách hàng +ByMonth=Theo tháng +NewAccount=Tài khoản kế toán mới +Update=Cập nhật +List=Danh sách +Create=Tạo +UpdateAccount=Sự biến đổi của một tài khoản kế toán +UpdateMvts=Sửa đổi của một phong trào +WriteBookKeeping=Tài khoản ghi trong sổ kế toán tổng +Bookkeeping=Sổ cái tổng hợp +AccountBalanceByMonth=Số dư tài khoản theo tháng -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer -Line=Line +AccountingVentilation=Thông gió Kế toán +AccountingVentilationSupplier=Nhà cung cấp hệ thống thông gió Kế toán +AccountingVentilationCustomer=Kế toán thông gió khách hàng +Line=Dòng -CAHTF=Total purchase supplier HT -InvoiceLines=Lines of invoice to be ventilated -InvoiceLinesDone=Ventilated lines of invoice -IntoAccount=In the accounting account +CAHTF=Tổng số nhà cung cấp mua HT +InvoiceLines=Dòng hoá đơn được thông gió +InvoiceLinesDone=Đường thông gió hóa đơn +IntoAccount=Trong tài khoản kế toán -Ventilate=Ventilate -VentilationAuto=Automatic ventilation +Ventilate=Thông gió +VentilationAuto=Thông gió tự động -Processing=Processing -EndProcessing=The end of processing -AnyLineVentilate=Any lines to ventilate -SelectedLines=Selected lines -Lineofinvoice=Line of invoice -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account +Processing=Chế biến +EndProcessing=Sự kết thúc của chế biến +AnyLineVentilate=Bất kỳ dòng để thông gió +SelectedLines=Đường lựa chọn +Lineofinvoice=Dòng của hóa đơn +VentilatedinAccount=Thông gió thành công trong các tài khoản kế toán +NotVentilatedinAccount=Không thông gió trong tài khoản kế toán -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +AccountLength=Chiều dài của kế toán tài khoản thể hiện trong Dolibarr +AccountLengthDesc=Chức năng cho phép để giả vờ chiều dài của tài khoản kế toán bằng cách thay thế không gian bởi các con số không. Chức năng này chỉ chạm vào màn hình, nó không sửa đổi các tài khoản kế toán đăng ký tại Dolibarr. Đối với xuất khẩu, chức năng này là cần thiết để tương thích với phần mềm nhất định. +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) -Doctype=Type of document -Docdate=Date -Docref=Reference -Numerocompte=Account -Code_tiers=Thirdparty -Labelcompte=Label account -Debit=Debit -Credit=Credit -Amount=Amount +Doctype=Loại văn bản +Docdate=Ngày +Docref=Tài liệu tham khảo +Numerocompte=Tài khoản +Code_tiers=Của bên thứ ba +Labelcompte=Tài khoản Label +Debit=Nợ +Credit=Tín dụng +Amount=Số tiền Sens=Sens -Codejournal=Journal +Codejournal=Tạp chí -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Xóa các bản ghi của sổ kế toán tổng -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +SellsJournal=Bán tạp chí +PurchasesJournal=Mua tạp chí +DescSellsJournal=Bán tạp chí +DescPurchasesJournal=Mua tạp chí +BankJournal=Tạp chí Ngân hàng +DescBankJournal=Tạp chí Ngân hàng bao gồm tất cả các loại chi phí khác hơn tiền mặt +CashJournal=Tạp chí Tiền +DescCashJournal=Tiền tạp chí bao gồm cả các loại tiền thanh toán -CashPayment=Cash Payment +CashPayment=Thanh toán bằng tiền mặt -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Thanh toán hóa đơn của nhà cung cấp +CustomerInvoicePayment=Thanh toán hóa đơn của khách hàng -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Tài khoản của bên thứ ba -NewAccountingMvt=New movement -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +NewAccountingMvt=Phong trào mới +NumMvts=Số phong trào +ListeMvts=Danh sách của phong trào +ErrorDebitCredit=Thẻ ghi nợ và tín dụng không thể có một giá trị cùng một lúc -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=Danh sách tài khoản của bên thứ ba +DescThirdPartyReport=Tham khảo ý kiến ​​ở đây là danh sách các khách hàng của bên thứ ba và các nhà cung cấp và các tài khoản kế toán -ListAccounts=List of the accounting accounts +ListAccounts=Danh sách các tài khoản kế toán -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -Accountparent=Root of the account -Active=Statement +Pcgversion=Phiên bản kế hoạch +Pcgtype=Lớp tài khoản +Pcgsubtype=Trong lớp học của các tài khoản +Accountparent=Gốc của tài khoản +Active=Trữ -NewFiscalYear=New fiscal year +NewFiscalYear=Năm tài chính mới -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilCustomer=Tham khảo ý kiến ​​ở đây thông gió kế toán năm của hoá đơn khách hàng của bạn +TotalVente=Tổng kim ngạch HT +TotalMarge=Lợi nhuận tổng doanh thu +DescVentilDoneCustomer=Tham khảo ý kiến ​​ở đây là danh sách các dòng hoá đơn cho khách hàng và tài khoản kế toán +DescVentilTodoCustomer=Thông gió cho đường dây của bạn hóa đơn của khách hàng với một tài khoản kế toán +ChangeAccount=Thay đổi tài khoản kế toán cho dòng lựa chọn tài khoản: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +DescVentilSupplier=Tham khảo ý kiến ​​ở đây thông gió kế toán năm của các nhà cung cấp hoá đơn của bạn +DescVentilTodoSupplier=Thông gió cho đường dây của nhà cung cấp hóa đơn với một tài khoản kế toán +DescVentilDoneSupplier=Tham khảo ý kiến ​​ở đây là danh sách các dòng nhà cung cấp hoá đơn, tài khoản kế toán -ValidateHistory=Validate Automatically +ValidateHistory=Tự động xác nhận -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản kế toán này bởi vì nó được sử dụng -FicheVentilation=Ventilation card +FicheVentilation=Thẻ thông gió diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index df38162024f..1e13448338f 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -43,17 +43,19 @@ SecuritySetup=Thiết lập an nin ErrorModuleRequirePHPVersion=Lỗi, module này yêu cầu phiên bản PHP %s hoặc mới hơn ErrorModuleRequireDolibarrVersion=Lỗi, module này yêu cầu Dolibarr phiên bản %s hoặc mới hơn ErrorDecimalLargerThanAreForbidden=Lỗi, thao tác này có độ ưu tiên cao hơn %s sẽ không được hỗ trợ. -DictionarySetup=Dictionary setup -Dictionary=Dictionaries +DictionarySetup=Thiết lập từ điển +Dictionary=Từ điển +Chartofaccounts=Biểu đồ tài khoản +Fiscalyear=Năm tài chính ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'hệ thống tự động' đối với loại đã được lưu trữ. Bạn có thể sử dụng 'người dùng' như là dạng giá trị để thêm vào bản ghi của riêng mình ErrorCodeCantContainZero=Mã lệnh không thể chứa giá trị 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Vô hiệu hóa JavaScript và Ajax chức năng (Đề xuất cho người mù hoặc văn bản trình duyệt) ConfirmAjax=Sử dụng popups xác định từ Ajax -UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +UseSearchToSelectCompanyTooltip=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập COMPANY_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi. +UseSearchToSelectCompany=Sử dụng các lĩnh vực tự động gõ để lựa chọn bên thứ ba thay vì sử dụng một hộp danh sách. ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa -UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +UseSearchToSelectContactTooltip=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập CONTACT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi. +UseSearchToSelectContact=Sử dụng các trường để lựa chọn năng tự động gõ liên lạc (thay vì sử dụng một hộp danh sách). SearchFilter=Tùy chọn bộ lọc tìm kiếm NumberOfKeyToSearch=Ký tự nbr để tìm: %s ViewFullDateActions=Hiển thị ngày tháng đầy đủ của sự kiện ở bảng tính thứ ba @@ -65,8 +67,8 @@ ShowPreview=Hiển thị xem trước PreviewNotAvailable=Xem trước hiện không khả dụng ThemeCurrentlyActive=Giao diện hiện đã kích hoạt CurrentTimeZone=Mã vùng thời gian PHP (server) -MySQLTimeZone=TimeZone MySql (database) -TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +MySQLTimeZone=TimeZone MySql (cơ sở dữ liệu) +TZHasNoEffect=Ngày được lưu trữ và máy chủ cơ sở dữ liệu trả về bởi như thể chúng được lưu giữ như là chuỗi đệ trình. Các múi giờ có tác dụng chỉ khi sử dụng chức năng UNIX_TIMESTAMP (mà không nên được sử dụng bởi Dolibarr, vì vậy cơ sở dữ liệu TZ nên không có hiệu lực, ngay cả khi thay đổi sau khi dữ liệu đã được nhập vào). Space=Khoảng trống Table=Bàn Fields=Trường @@ -75,8 +77,8 @@ Mask=Mặt nạ NextValue=Giá trị tiếp theo NextValueForInvoices=Giá trị tiếp theo (invoices) NextValueForCreditNotes=Giá trị tiếp theo (ghi chú tín dụng) -NextValueForDeposit=Next value (deposit) -NextValueForReplacements=Next value (replacements) +NextValueForDeposit=Giá trị tiếp theo (tiền đặt cọc) +NextValueForReplacements=Giá trị tiếp theo (thay thế) MustBeLowerThanPHPLimit=Chú ý: PHP của bạn giới hạn kích thước của tập tin tải lên là %s%s, cho dù giá trị thông số phần này là NoMaxSizeByPHPLimit=Chú ý: Không có giới hạn được chỉnh sửa trong phần chỉnh sửa PHP MaxSizeForUploadedFiles=Kích thước tối đa của tập tin được tải lên (0 sẽ tắt chế độ tải lên) @@ -104,9 +106,9 @@ OtherOptions=Tùy chọn khác OtherSetup=Cài đặt khác CurrentValueSeparatorDecimal=Phân cách tập phân CurrentValueSeparatorThousand=Phân cách phần ngàn -Destination=Destination +Destination=Điểm đến IdModule=Module ID -IdPermissions=Permissions ID +IdPermissions=Quyền ID Modules=Module ModulesCommon=Module chính ModulesOther=Các module khác @@ -116,28 +118,28 @@ ParameterInDolibarr=Thông số %s LanguageParameter=Thông số ngôn ngữ %s LanguageBrowserParameter=Thông số %s LocalisationDolibarrParameters=Địa phương hóa thông số -ClientTZ=Client Time Zone (user) -ClientHour=Client time (user) -OSTZ=Server OS Time Zone -PHPTZ=PHP server Time Zone +ClientTZ=Time Zone khách hàng (người sử dụng) +ClientHour=Hiện khách hàng (người sử dụng) +OSTZ=Máy chủ hệ điều hành Time Zone +PHPTZ=PHP máy chủ Time Zone PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (giây) ClientOffsetWithGreenwich=Client/Trình duyệt độ rộng offset Greenwich (giây) DaylingSavingTime=Tiết kiệm thời gian ban ngày -CurrentHour=PHP Time (server) -CompanyTZ=Company Time Zone (main company) -CompanyHour=Company Time (main company) +CurrentHour=PHP thời gian (máy chủ) +CompanyTZ=Thời gian Công ty Zone (công ty chính) +CompanyHour=Công ty thời gian (công ty chính) CurrentSessionTimeOut=Thời gian hết hạn của phiên làm việc hiện tại -YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" +YouCanEditPHPTZ=Để thiết lập một PHP múi giờ khác nhau (không bắt buộc), bạn có thể cố gắng thêm một tập tin .htacces với một dòng như thế này "setenv TZ Châu Âu / Paris" OSEnv=Môi trường hệ điều hành Box=Hộp Boxes=Các Hộp MaxNbOfLinesForBoxes=Số lượng dòng tối đa đối với các hộp PositionByDefault=Trật tự mặc định -Position=Position +Position=Chức vụ MenusDesc=Phần quản lý menu xác định nội dung đối với 2 thanh menu (thanh đặt ở chiều ngang và đặt theo chiều dọc). -MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. +MenusEditorDesc=Các biên tập viên menu cho phép bạn xác định mục cá nhân trong các menu. Sử dụng nó một cách cẩn thận để tránh làm cho dolibarr không ổn định và các mục trình đơn vĩnh viễn không thể truy cập.
Một số mô-đun thêm các mục trong menu (trong trình đơn Tất cả trong hầu hết các trường hợp). Nếu bạn loại bỏ một số trong những mục do nhầm lẫn, bạn có thể khôi phục lại chúng bằng cách vô hiệu hóa và kích hoạt lại các mô-đun. MenuForUsers=Menu dành cho người sử dụng -LangFile=.lang file +LangFile=tập tin .lang System=Hệ thống SystemInfo=Thông tin về hệ thống SystemTools=Công cụ hệ thống @@ -147,1395 +149,1396 @@ Purge=Thanh lọc PurgeAreaDesc=Trang này cho phép bạn xóa toàn bộ các tập tin đã được xây dựng hoặc trữ bở Dolibarr (các tập tin tạm hoặc tất cả các tập tin trong thư mục %s). Không cần thiết phải sử dụng tính năng này. Phần này được cung cấp cho những người dùng Dolibarr mà phần hosting được cung cấp bởi một nhà cung cấp không cung cấp tính năng xóa các tập tin được xây dựng trên web server đó. PurgeDeleteLogFile=Xóa tập tin nhật trình %s được tạo bởi module Syslog (không gây nguy hiểm cho việc mất mát dữ liệu) PurgeDeleteTemporaryFiles=Xóa toàn bộ các tập tin tạm (không gây nguy hiểm cho việc thất thoát dữ liệu) -PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. -PurgeRunNow=Purge now -PurgeNothingToDelete=No directory or file to delete. -PurgeNDirectoriesDeleted=%s files or directories deleted. -PurgeAuditEvents=Purge all security events -ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. -NewBackup=New backup -GenerateBackup=Generate backup -Backup=Backup -Restore=Restore -RunCommandSummary=Backup has been launched with the following command -RunCommandSummaryToLaunch=Backup can be launched with the following command -WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands -BackupResult=Backup result -BackupFileSuccessfullyCreated=Backup file successfully generated -YouCanDownloadBackupFile=Generated files can now be downloaded -NoBackupFileAvailable=No backup files available. -ExportMethod=Export method -ImportMethod=Import method -ToBuildBackupFileClickHere=To build a backup file, click here. -ImportMySqlDesc=To import a backup file, you must use mysql command from command line: -ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: -ImportMySqlCommand=%s %s < mybackupfile.sql -ImportPostgreSqlCommand=%s %s mybackupfile.sql -FileNameToGenerate=File name to generate -Compression=Compression -CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import -CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later -ExportCompatibility=Compatibility of generated export file -MySqlExportParameters=MySQL export parameters -PostgreSqlExportParameters= PostgreSQL export parameters -UseTransactionnalMode=Use transactional mode -FullPathToMysqldumpCommand=Full path to mysqldump command -FullPathToPostgreSQLdumpCommand=Full path to pg_dump command -ExportOptions=Export Options -AddDropDatabase=Add DROP DATABASE command -AddDropTable=Add DROP TABLE command -ExportStructure=Structure -Datas=Data -NameColumn=Name columns -ExtendedInsert=Extended INSERT -NoLockBeforeInsert=No lock commands around INSERT -DelayedInsert=Delayed insert -EncodeBinariesInHexa=Encode binary data in hexadecimal -IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE) -Yes=Yes -No=No -AutoDetectLang=Autodetect (browser language) -FeatureDisabledInDemo=Feature disabled in demo -Rights=Permissions -BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. -OnlyActiveElementsAreShown=Only elements from enabled modules are shown. -ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. -ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. -ModulesSpecialDesc=Special modules are very specific or seldom used modules. -ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business. -ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... -ModulesMarketPlaces=More modules... -DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules -WebSiteDesc=Web site providers you can search to find more modules... -URL=Link -BoxesAvailable=Boxes available -BoxesActivated=Boxes activated -ActivateOn=Activate on -ActiveOn=Activated on -SourceFile=Source file -AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled -AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled -AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled -Required=Required -Security=Security -Passwords=Passwords -DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) -MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) -InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="..."
by
$dolibarr_main_db_pass="crypted:%s" -InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:..."
by
$dolibarr_main_db_pass="%s" -ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) -ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). -Feature=Feature -DolibarrLicense=License +PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư mục% s. Tập tin tạm thời mà còn sao lưu cơ sở dữ liệu bãi, tập tin đính kèm với các yếu tố (các bên thứ ba, hóa đơn, ...) và tải lên vào module ECM sẽ bị xóa. +PurgeRunNow=Tẩy giờ +PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa. +PurgeNDirectoriesDeleted=% Của các tập tin hoặc thư mục bị xóa. +PurgeAuditEvents=Thanh trừng tất cả các sự kiện an ninh +ConfirmPurgeAuditEvents=Bạn Bạn có chắc chắn muốn thanh trừng tất cả các sự kiện an ninh? Tất cả các nhật bảo mật sẽ bị xóa, không có dữ liệu khác sẽ bị xóa. +NewBackup=Sao lưu mới +GenerateBackup=Tạo sao lưu +Backup=Sao lưu +Restore=Khôi phục +RunCommandSummary=Sao lưu đã được đưa ra với lệnh sau đây +RunCommandSummaryToLaunch=Sao lưu có thể được đưa ra với lệnh sau đây +WebServerMustHavePermissionForCommand=Máy chủ web của bạn phải có sự cho phép để chạy các lệnh như vậy +BackupResult=Kết quả sao lưu +BackupFileSuccessfullyCreated=Tập tin sao lưu được tạo ra thành công +YouCanDownloadBackupFile=Các tập tin được tạo ra có thể được tải về +NoBackupFileAvailable=Không sao lưu tập tin có sẵn. +ExportMethod=Phương pháp xuất khẩu +ImportMethod=Phương pháp nhập khẩu +ToBuildBackupFileClickHere=Để xây dựng một tập tin sao lưu, nhấn vào đây . +ImportMySqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh mysql từ dòng lệnh: +ImportPostgreSqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh pg_restore từ dòng lệnh: +ImportMySqlCommand=% S% s kích hoạt module được hiển thị. +ModulesDesc=Module Dolibarr xác định các chức năng được kích hoạt trong phần mềm. Một số module yêu cầu cấp phép mà bạn phải cấp cho người sử dụng, sau khi kích hoạt module. Click vào nút on / off trong cột "Trạng thái" để cho phép một mô-đun / tính năng. +ModulesInterfaceDesc=Các Dolibarr giao diện module cho phép bạn thêm các tính năng phụ thuộc vào phần mềm bên ngoài, hệ thống hoặc dịch vụ. +ModulesSpecialDesc=Các mô-đun đặc biệt là các mô-đun rất cụ thể hoặc ít khi sử dụng. +ModulesJobDesc=Module kinh doanh cung cấp thiết lập được xác định trước đơn giản của Dolibarr cho một doanh nghiệp cụ thể. +ModulesMarketPlaceDesc=Bạn có thể tìm thấy các mô-đun tải bên ngoài trang web trên Internet ... +ModulesMarketPlaces=Nhiều mô-đun ... +DoliStoreDesc=DoliStore, trên thị trường chính thức cho Dolibarr ERP / CRM module bên ngoài +WebSiteDesc=Cung cấp dịch vụ trang web, bạn có thể tìm kiếm để tìm các mô-đun ... +URL=Liên kết +BoxesAvailable=Hộp có sẵn +BoxesActivated=Hộp kích hoạt +ActivateOn=Kích hoạt trên +ActiveOn=Hoạt tính +SourceFile=Tập tin nguồn +AutomaticIfJavascriptDisabled=Tự động nếu Javascript bị vô hiệu hóa +AvailableOnlyIfJavascriptNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa +Required=Yêu cầu +UsedOnlyWithTypeOption=Used by some agenda option only +Security=An ninh +Passwords=Mật khẩu +DoNotStoreClearPassword=Do không có cửa hàng mật khẩu rõ ràng trong cơ sở dữ liệu nhưng cửa hàng chỉ có giá trị được mã hóa (đề nghị Đã kích hoạt) +MainDbPasswordFileConfEncrypted=Cơ sở dữ liệu mật khẩu được mã hóa trong conf.php (Đã kích hoạt được đề nghị) +InstrucToEncodePass=Để có mật khẩu mã hóa vào tập tin conf.php, thay thế dòng
$ Dolibarr_main_db_pass = "..."
bởi
$ Dolibarr_main_db_pass = "crypted:% s" +InstrucToClearPass=Để có mật khẩu giải mã (làm sạch) vào tập tin conf.php, thay thế dòng
$ Dolibarr_main_db_pass = "crypted: ..."
bởi
$ Dolibarr_main_db_pass = "% s" +ProtectAndEncryptPdfFiles=Bảo vệ các tập tin pdf được tạo ra (hoạt không được khuyến khích, phá vỡ hệ pdf khối lượng) +ProtectAndEncryptPdfFilesDesc=Bảo vệ tài liệu PDF giữ cho nó có sẵn để đọc và in với bất kỳ trình duyệt PDF. Tuy nhiên, chỉnh sửa và sao chép là không thể nữa. Lưu ý rằng việc sử dụng tính năng này làm cho xây dựng một tích lũy pdf toàn cầu không làm việc (như hóa đơn chưa thanh toán). +Feature=Tính năng +DolibarrLicense=Giấy phép DolibarrProjectLeader=Người lãnh đạo dự án -Developpers=Developers/contributors -OtherDeveloppers=Other developers/contributors -OfficialWebSite=Dolibarr international official web site -OfficialWebSiteFr=French official web site -OfficialWiki=Dolibarr documentation on Wiki -OfficialDemo=Dolibarr online demo -OfficialMarketPlace=Official market place for external modules/addons -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) -ReferencedPreferredPartners=Preferred Partners -OtherResources=Autres ressources -ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s -ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s -HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. -HelpCenterDesc2=Some part of this service are available in english only. -CurrentTopMenuHandler=Current top menu handler -CurrentLeftMenuHandler=Current left menu handler -CurrentMenuHandler=Current menu handler -CurrentSmartphoneMenuHandler=Current smartphone menu handler -MeasuringUnit=Measuring unit -Emails=E-mails -EMailsSetup=E-mails setup -EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. -MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) -MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) -MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) -MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) -MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) -MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent -MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to -MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to -MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) -MAIN_MAIL_SENDMODE=Method to use to send EMails -MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required -MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required -MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt -MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) -MAIN_SMS_SENDMODE=Method to use to send SMS -MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending -FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. -SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum. -ModuleSetup=Module setup -ModulesSetup=Modules setup +Developpers=Các nhà phát triển / thành viên góp +OtherDeveloppers=Phát triển khác / đóng góp +OfficialWebSite=Dolibarr trang web chính thức quốc tế +OfficialWebSiteFr=Trang web chính thức của Pháp +OfficialWiki=Tài liệu Dolibarr trên Wiki +OfficialDemo=Dolibarr demo trực tuyến +OfficialMarketPlace=Thị trường chính thức cho các module bên ngoài / addons +OfficialWebHostingService=Dịch vụ lưu trữ web tham chiếu (Cloud lưu trữ) +ReferencedPreferredPartners=Đối tác ưa thích +OtherResources=Autres nguồn tài +ForDocumentationSeeWiki=Đối với người dùng hay tài liệu hướng dẫn phát triển (tài liệu, Hỏi đáp về ...),
hãy xem các Dolibarr Wiki:
% S +ForAnswersSeeForum=Đối với bất kỳ câu hỏi khác / giúp đỡ, bạn có thể sử dụng diễn đàn Dolibarr:
% S +HelpCenterDesc1=Khu vực này có thể giúp bạn để có được một dịch vụ hỗ trợ giúp về Dolibarr. +HelpCenterDesc2=Một số phần của dịch vụ này chỉ có sẵn trong tiếng Anh. +CurrentTopMenuHandler=Hiện xử lý đơn hàng đầu +CurrentLeftMenuHandler=Xử lý menu bên trái hiện tại +CurrentMenuHandler=Xử lý đơn hiện tại +CurrentSmartphoneMenuHandler=Xử lý đơn điện thoại thông minh hiện nay +MeasuringUnit=Đơn vị đo +Emails=E-mail +EMailsSetup=E-mail cài đặt +EMailsDesc=Trang này cho phép bạn ghi đè lên các thông số PHP của bạn cho e-mail gửi. Trong hầu hết các trường hợp trên Unix / Linux hệ điều hành, thiết lập PHP của bạn là chính xác và các thông số này là vô ích. +MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Port (Theo mặc định trong php.ini:% s) +MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (Theo mặc định trong php.ini:% s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Không xác định vào PHP trên Unix như hệ thống) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Không xác định vào PHP trên Unix như hệ thống) +MAIN_MAIL_EMAIL_FROM=Tên người gửi e-mail cho các email tự động (theo mặc định trong php.ini:% s) +MAIN_MAIL_ERRORS_TO=Tên người gửi e-mail được sử dụng cho các lỗi trả về email được gửi +MAIN_MAIL_AUTOCOPY_TO= Gửi một cách có hệ thống ẩn carbon bản sao của tất cả các email gửi tới +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Gửi một cách có hệ thống ẩn carbon bản sao của kiến ​​nghị gửi qua email +MAIN_MAIL_AUTOCOPY_ORDER_TO= Gửi một cách có hệ thống ẩn carbon bản sao của đơn đặt hàng được gửi qua email đến +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Gửi một cách có hệ thống ẩn carbon bản sao hoá đơn gửi bằng email đến +MAIN_DISABLE_ALL_MAILS=Vô hiệu hoá tất cả các e-mail sendings (cho mục đích thử nghiệm hoặc trình diễn) +MAIN_MAIL_SENDMODE=Phương pháp sử dụng để gửi email +MAIN_MAIL_SMTPS_ID=SMTP ID nếu có yêu cầu xác thực +MAIN_MAIL_SMTPS_PW=Mật khẩu SMTP nếu có yêu cầu xác thực +MAIN_MAIL_EMAIL_TLS= Sử dụng TLS (SSL) mã hóa +MAIN_DISABLE_ALL_SMS=Vô hiệu hoá tất cả sendings SMS (cho mục đích thử nghiệm hoặc trình diễn) +MAIN_SMS_SENDMODE=Phương pháp sử dụng để gửi tin nhắn SMS +MAIN_MAIL_SMS_FROM=Số điện thoại mặc định cho người gửi SMS gửi +FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ thống. Kiểm tra chương trình sendmail của bạn tại địa phương. +SubmitTranslation=Nếu dịch cho ngôn ngữ này không phải là hoàn toàn hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục langs /% s và nộp hồ sơ sửa www.dolibarr.org diễn đàn. +ModuleSetup=Thiết lập mô-đun +ModulesSetup=Các mô-đun cài đặt ModuleFamilyBase=Hệ thống -ModuleFamilyCrm=Customer Relation Management (CRM) -ModuleFamilyProducts=Products Management -ModuleFamilyHr=Human Resource Management -ModuleFamilyProjects=Projects/Collaborative work -ModuleFamilyOther=Other -ModuleFamilyTechnic=Multi-modules tools -ModuleFamilyExperimental=Experimental modules -ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) -ModuleFamilyECM=Electronic Content Management (ECM) -MenuHandlers=Menu handlers -MenuAdmin=Menu editor -DoNotUseInProduction=Do not use in production -ThisIsProcessToFollow=This is setup to process: -StepNb=Step %s -FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). -DownloadPackageFromWebSite=Download package. -UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s -SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. -NotExistsDirect=The alternative root directory is not defined.
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
-InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. -YouCanSubmitFile=Select module: -CurrentVersion=Dolibarr current version -CallUpdatePage=Go to the page that updates the database structure and datas: %s. -LastStableVersion=Last stable version -GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
-GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
-GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
-GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
-GenericMaskCodes4b=Example on third party created on 2007-03-01:
-GenericMaskCodes4c=Example on product created on 2007-03-01:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX -GenericNumRefModelDesc=Returns a customizable number according to a defined mask. -ServerAvailableOnIPOrPort=Server is available at address %s on port %s -ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s -DoTestServerAvailability=Test server connectivity -DoTestSend=Test sending -DoTestSendHTML=Test sending HTML -ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask. -ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. -UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system. -UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
It must be the octal value (for example, 0666 means read and write for everyone).
This parameter is useless on a Windows server. -SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation -UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache) -DisableLinkToHelpCenter=Hide link "Need help or support" on login page -DisableLinkToHelp=Hide link "%s Online help" on left menu -AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. -ModuleDisabled=Module disabled -ModuleDisabledSoNoEvent=Module disabled so event never created -ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). -MinLength=Minimum length -LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory -ExamplesWithCurrentSetup=Examples with current running setup -ListOfDirectories=List of OpenDocument templates directories -ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. -NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir -FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: +ModuleFamilyCrm=Quản lý quan hệ khách hàng (CRM) +ModuleFamilyProducts=Quản lý sản phẩm +ModuleFamilyHr=Quản lý nguồn nhân lực +ModuleFamilyProjects=Các dự án / công trình hợp tác +ModuleFamilyOther=Khác +ModuleFamilyTechnic=Nhiều mô-đun công cụ +ModuleFamilyExperimental=Các mô-đun thí nghiệm +ModuleFamilyFinancial=Mô-đun tài chính (Kế toán / Tài chính) +ModuleFamilyECM=Quản lý nội dung điện tử (ECM) +MenuHandlers=Xử lý đơn +MenuAdmin=Biên tập đơn +DoNotUseInProduction=Không sử dụng trong sản xuất +ThisIsProcessToFollow=Đây là thiết lập để quá trình: +StepNb=Bước% s +FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức% s). +DownloadPackageFromWebSite=Tải về gói. +UnpackPackageInDolibarrRoot=Tập tin gói giải nén vào thư mục gốc của Dolibarr% s +SetupIsReadyForUse=Cài đặt xong và Dolibarr đã sẵn sàng để sử dụng với thành phần mới này. +NotExistsDirect=Các thư mục gốc thay thế không được định nghĩa.
+InfDirAlt=Kể từ phiên bản 3 có thể xác định một directory.This gốc thay thế cho phép bạn lưu trữ, cùng một vị trí, plug-in và các mẫu tùy chỉnh.
Chỉ cần tạo một thư mục trong thư mục gốc của Dolibarr (ví dụ như: tùy chỉnh).
+InfDirExample=
Sau đó khai báo trong tập tin conf.php
$ Dolibarr_main_url_root_alt = 'http: // myserver / tùy chỉnh'
$ Dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / tùy chỉnh'
* Những dòng này được nhận xét với "#", để bỏ ghi chú chỉ loại bỏ các nhân vật. +YouCanSubmitFile=Chọn mô-đun: +CurrentVersion=Phiên bản hiện tại Dolibarr +CallUpdatePage=Tới trang đó cập nhật các cấu trúc cơ sở dữ liệu và dữ liệu:% s. +LastStableVersion=Cuối phiên bản ổn định +GenericMaskCodes=Bạn có thể nhập bất kỳ số mặt nạ. Trong mặt nạ này, các thẻ sau đây có thể được sử dụng:
{000000} tương ứng với một số trong đó sẽ được phát triển trên mỗi% s. Nhập càng nhiều số không như độ dài mong muốn của các truy cập. Truy cập sẽ được hoàn thành vào số không trên bên trái để có nhiều số không như mặt nạ.
{000000 + 000} giống như trước nhưng một bù đắp tương ứng với số bên phải dấu + là đã áp dụng bắt đầu từ ngày đầu tiên% s.
{000000 @ x} giống như trước, nhưng truy cập được thiết lập lại để không khi tháng x đạt được (x từ 1 đến 12, hoặc từ 0 đến sử dụng những tháng đầu của năm tài chính được xác định trong cấu hình của bạn, hoặc 99 để thiết lập lại bằng không mỗi tháng ). Nếu tùy chọn này được sử dụng và x là 2 hoặc cao hơn, sau đó tự yy {} {mm} hoặc {yyyy} {mm} cũng được yêu cầu.
{Đ} ngày (01-31).
{Mm} tháng (01 đến 12).
{Yyyy}, {yyyy} hoặc {y} năm trong 2, 4 hoặc 1 con số.
+GenericMaskCodes2={} Cccc mã khách hàng về n ký tự
{} Cccc000 mã khách hàng về n ký tự tiếp theo là một truy cập dành riêng cho khách hàng. Truy cập này dành riêng cho khách hàng được thiết lập lại tại cùng một thời gian hơn truy cập toàn cầu.
{Tttt} Đoạn mã của loại của bên thứ ba trên n ký tự (xem các loại từ điển của bên thứ ba).
+GenericMaskCodes3=Tất cả các nhân vật khác trong mặt nạ sẽ vẫn còn nguyên vẹn.
Không gian không được phép.
+GenericMaskCodes4a=Ví dụ trên% s thứ 99 của TheCompany bên thứ ba thực hiện 2007-01-31:
+GenericMaskCodes4b=Ví dụ về bên thứ ba tạo ra trên 2007/03/01:
+GenericMaskCodes4c=Ví dụ về sản phẩm tạo ra trên 2007/03/01:
+GenericMaskCodes5=ABC {yy} {mm} - {000000} sẽ cung cấp cho ABC0701-000099
{0000 + 100 @ 1} -ZZZ / đ {} / XXX sẽ cung cấp cho 0.199-ZZZ / 31 / XXX +GenericNumRefModelDesc=Trả về một số tùy biến theo một mặt nạ được xác định. +ServerAvailableOnIPOrPort=Máy chủ có sẵn tại địa chỉ% s trên cổng% s +ServerNotAvailableOnIPOrPort=Máy chủ không có sẵn tại địa chỉ% s trên cổng% s +DoTestServerAvailability=Kết nối máy chủ thử nghiệm +DoTestSend=Kiểm tra gửi +DoTestSendHTML=Kiểm tra gửi HTML +ErrorCantUseRazIfNoYearInMask=Lỗi, không thể sử dụng tùy chọn @ để thiết lập lại truy cập mỗi năm nếu chuỗi {} hoặc {yy yyyy} không có trong mặt nạ. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Lỗi, không thể sử dụng tùy chọn @ nếu chuỗi {yy} {mm} hoặc {yyyy} {mm} không có trong mặt nạ. +UMask=Umask tham số cho các tập tin mới trên hệ thống tập tin Unix / Linux / BSD / Mac. +UMaskExplanation=Thông số này cho phép bạn xác định quyền truy cập thiết lập mặc định trên các tập tin được tạo ra bởi Dolibarr trên máy chủ (khi tải ví dụ).
Nó phải là giá trị bát phân (ví dụ, 0666 có nghĩa là đọc và viết cho tất cả mọi người).
Tham số này là vô dụng trên một máy chủ Windows. +SeeWikiForAllTeam=Hãy xem các trang wiki cho danh sách đầy đủ của tất cả các diễn viên và các tổ chức của họ +UseACacheDelay= Delay cho xuất khẩu đáp ứng bộ nhớ đệm trong vài giây (0 hoặc trống rỗng không có bộ nhớ cache) +DisableLinkToHelpCenter=Ẩn liên kết "Cần giúp đỡ hoặc hỗ trợ" trên trang đăng nhập +DisableLinkToHelp=Ẩn liên kết "% s Hỗ trợ trực tuyến" trên menu bên trái +AddCRIfTooLong=Không có gói tự động, do đó, nếu dòng là ra khỏi trang trên các tài liệu bởi vì quá dài, bạn phải thêm mình xuống dòng trong khung văn bản. +ModuleDisabled=Mô-đun bị vô hiệu hóa +ModuleDisabledSoNoEvent=Mô-đun để vô hiệu hóa sự kiện không bao giờ tạo ra +ConfirmPurge=Bạn Bạn có chắc chắn muốn thực hiện cuộc thanh trừng này?
Điều này chắc chắn sẽ xóa tất cả các file dữ liệu của bạn không có cách nào khôi phục lại được (file ECM, file đính kèm ...). +MinLength=Chiều dài tối thiểu +LanguageFilesCachedIntoShmopSharedMemory=Tập tin .lang nạp vào bộ nhớ chia sẻ +ExamplesWithCurrentSetup=Ví dụ với các thiết lập đang chạy +ListOfDirectories=Danh sách các mẫu tài liệu mở thư mục +ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa tập tin mẫu với các định dạng tài liệu mở.

Đặt ở đây đường dẫn đầy đủ của thư mục.
Thêm một trở về vận chuyển giữa các thư mục EAH.
Để thêm một thư mục của module GED, thêm ở đây DOL_DATA_ROOT / ECM / yourdirectoryname.

File trong thư mục phải kết thúc với .odt. +NumberOfModelFilesFound=Số ODT / tập tin mẫu ODS tìm thấy trong các thư mục +ExampleOfDirectoriesForModelGen=Ví dụ về các cú pháp:
c: \\ mydir
/ Home / mydir
DOL_DATA_ROOT / ECM / ecmdir +FollowingSubstitutionKeysCanBeUsed=
Để biết làm thế nào để tạo ra odt mẫu tài liệu của bạn, trước khi lưu trữ chúng trong các thư mục, đọc tài liệu wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template -FirstnameNamePosition=Position of Name/Lastname -DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: -KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) -TestSubmitForm=Input test form -ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours. -ThemeDir=Skins directory -ConnectionTimeout=Connexion timeout -ResponseTimeout=Response timeout -SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ -ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. -SecurityToken=Key to secure URLs -NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s +FirstnameNamePosition=Chức vụ Tên / LastName +DescWeather=Những hình ảnh sau đây sẽ được hiển thị trên bảng điều khiển khi số hành động cuối đạt các giá trị sau đây: +KeyForWebServicesAccess=Chìa khóa để sử dụng dịch vụ Web (tham số "dolibarrkey" trong webservices) +TestSubmitForm=Hình thức kiểm tra đầu vào +ThisForceAlsoTheme=Quản lý sử dụng trình đơn này cũng sẽ sử dụng chủ đề của riêng mình bất cứ điều gì là sự lựa chọn của người dùng. Ngoài ra menu này quản lý chuyên ngành cho điện thoại thông minh không hoạt động trên tất cả các điện thoại thông minh. Quản lý sử dụng một trình đơn nếu bạn gặp vấn đề trên của bạn. +ThemeDir=Skins thư mục +ConnectionTimeout=Connexion thời gian chờ +ResponseTimeout=Đáp ứng thời gian chờ +SmsTestMessage=Tin nhắn kiểm tra từ __PHONEFROM__ để __PHONETO__ +ModuleMustBeEnabledFirst=Mô-đun% s phải được kích hoạt trước khi sử dụng tính năng này. +SecurityToken=Chìa khóa để đảm bảo URL +NoSmsEngine=Không quản lý người gửi tin nhắn SMS có sẵn. Quản lý người gửi tin nhắn SMS không được cài đặt mặc định với phân phối (vì họ phụ thuộc vào một nhà cung cấp bên ngoài) nhưng bạn có thể tìm thấy một số trên% s PDF=PDF -PDFDesc=You can set each global options related to the PDF generation -PDFAddressForging=Rules to forge address boxes -HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF -HideDescOnPDF=Hide products description on generated PDF -HideRefOnPDF=Hide products ref. on generated PDF -HideDetailsOnPDF=Hide products lines details on generated PDF -Library=Library -UrlGenerationParameters=Parameters to secure URLs -SecurityTokenIsUnique=Use a unique securekey parameter for each URL -EnterRefToBuildUrl=Enter reference for object %s -GetSecuredUrl=Get calculated URL -ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons -OldVATRates=Old VAT rate -NewVATRates=New VAT rate -PriceBaseTypeToChange=Modify on prices with base reference value defined on -MassConvert=Launch mass convert -String=String -TextLong=Long text +PDFDesc=Bạn có thể thiết lập cho mỗi tùy chọn toàn cầu liên quan đến các thế hệ PDF +PDFAddressForging=Quy định giả mạo địa chỉ hộp +HideAnyVATInformationOnPDF=Ẩn tất cả các thông tin liên quan đến thuế GTGT đối với PDF được tạo ra +HideDescOnPDF=Ẩn mô tả sản phẩm vào PDF được tạo ra +HideRefOnPDF=Ẩn các sản phẩm ref. PDF được tạo ra trên +HideDetailsOnPDF=Ẩn dòng sản phẩm chi tiết về PDF được tạo ra +Library=Thư viện +UrlGenerationParameters=Các thông số để đảm bảo URL +SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL +EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng% s +GetSecuredUrl=Nhận URL tính +ButtonHideUnauthorized=Ẩn nút cho các hành động trái phép, thay vì hiển thị các nút khuyết tật +OldVATRates=Thuế suất thuế GTGT cũ +NewVATRates=Thuế suất thuế GTGT mới +PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu được xác định trên cơ sở +MassConvert=Khởi động chuyển đổi hàng loạt +String=Chuỗi +TextLong=Văn bản dài Int=Integer Float=Float -DateAndTime=Date and hour -Unique=Unique +DateAndTime=Ngày và giờ +Unique=Độc đáo Boolean=Boolean (Checkbox) -ExtrafieldPhone = Phone -ExtrafieldPrice = Price +ExtrafieldPhone = Điện thoại +ExtrafieldPrice = Giá ExtrafieldMail = Email -ExtrafieldSelect = Select list -ExtrafieldSelectList = Select from table +ExtrafieldSelect = Danh sách lựa chọn +ExtrafieldSelectList = Chọn từ bảng ExtrafieldSeparator=Separator ExtrafieldCheckBox=Checkbox -ExtrafieldRadio=Radio button -ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key -ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... -ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... -ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter -LibraryToBuildPDF=Library used to build PDF -WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' -LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) +ExtrafieldRadio=Nút radio +ExtrafieldParamHelpselect=Danh sách các thông số phải như quan trọng, giá trị

ví dụ:
1, value1
2, value2
3, value3
...

Để có danh sách tùy thuộc vào khác:
1, value1 | parent_list_code: parent_key
2, value2 | parent_list_code: parent_key +ExtrafieldParamHelpcheckbox=Danh sách các thông số phải như quan trọng, giá trị

ví dụ:
1, value1
2, value2
3, value3
... +ExtrafieldParamHelpradio=Danh sách các thông số phải như quan trọng, giá trị

ví dụ:
1, value1
2, value2
3, value3
... +ExtrafieldParamHelpsellist=Danh sách các thông số xuất phát từ một bảng
Cú pháp: tên_bảng: label_field: id_field :: lọc
Ví dụ: c_typent: libelle: id :: lọc

bộ lọc có thể là một thử nghiệm đơn giản (ví dụ như hoạt động = 1) để hiển thị chỉ có giá trị tích cực
nếu bạn muốn lọc vào extrafields sử dụng syntaxt extra.fieldcode = ... (nơi mã trường là mã của extrafield)

Để có danh sách tùy thuộc vào khác:
c_typent: libelle: id: parent_list_code | parent_column: bộ lọc +LibraryToBuildPDF=Thư viện được sử dụng để xây dựng PDF +WarningUsingFPDF=Cảnh báo: conf.php của bạn có chứa dolibarr_pdf_force_fpdf chỉ = 1. Điều này có nghĩa là bạn sử dụng thư viện FPDF để tạo ra các tập tin PDF. Thư viện này là cũ và không hỗ trợ rất nhiều tính năng (Unicode, minh bạch, hình ảnh, ngôn ngữ Cyrillic, Arab và châu Á, ...), vì vậy bạn có thể gặp một số lỗi trong hệ PDF.
Để giải quyết điều này và có một sự hỗ trợ đầy đủ các thế hệ PDF, xin vui lòng tải thư viện TCPDF , sau đó bình luận hoặc loại bỏ các dòng $ dolibarr_pdf_force_fpdf = 1, và thêm thay vì $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' +LocalTaxDesc=Một số quốc gia áp dụng 2 hoặc 3 loại thuế trên mỗi dòng hóa đơn. Nếu đây là trường hợp, chọn loại thuế thứ hai và thứ ba và tỷ lệ của nó. Loại có thể là:
1: thuế địa phương áp dụng trên các sản phẩm và dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương)
2: thuế địa phương áp dụng trên các sản phẩm và dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax)
3: thuế địa phương áp dụng vào các sản phẩm mà không có thùng (thùng không được áp dụng thuế địa phương)
4: thuế địa phương áp dụng trên các sản phẩm trước khi thùng (thùng được tính trên số tiền + localtax)
5: thuế địa phương áp dụng vào các dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương)
6: thuế địa phương áp dụng vào các dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax) SMS=SMS -LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s -RefreshPhoneLink=Refresh link -LinkToTest=Clickable link generated for user %s (click phone number to test) -KeepEmptyToUseDefault=Keep empty to use default value -DefaultLink=Default link -ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) -ExternalModule=External module - Installed into directory %s -BarcodeInitForThirdparties=Mass barcode init for thirdparties -BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services -CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. -InitEmptyBarCode=Init value for next %s empty records -EraseAllCurrentBarCode=Erase all current barcode values -ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ? -AllBarcodeReset=All barcode values have been removed -NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. -NoRecordWithoutBarcodeDefined=No record with no barcode value defined. +LinkToTestClickToDial=Nhập số điện thoại để gọi cho thấy một liên kết để kiểm tra url ClickToDial cho người dùng% s +RefreshPhoneLink=Làm mới liên kết +LinkToTest=Liên kết có thể click được tạo ra cho người dùng% s (bấm số điện thoại để kiểm tra) +KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định +DefaultLink=Liên kết mặc định +ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể người sử dụng (mỗi người dùng có thể thiết lập url clicktodial riêng của mình) +ExternalModule=Bên ngoài mô-đun - cài đặt vào thư mục% s +BarcodeInitForThirdparties=Init mã vạch hàng loạt cho thirdparties +BarcodeInitForProductsOrServices=Init mã vạch khối lượng hoặc thiết lập lại các sản phẩm hoặc dịch vụ +CurrentlyNWithoutBarCode=Hiện tại, bạn có% s biên bản% s% s không có mã vạch xác định. +InitEmptyBarCode=Giá trị init cho các hồ sơ có sản phẩm nào tiếp theo% s +EraseAllCurrentBarCode=Xóa tất cả các giá trị hiện tại của mã vạch +ConfirmEraseAllCurrentBarCode=Bạn Bạn có chắc chắn muốn xóa tất cả các giá trị mã vạch hiện nay? +AllBarcodeReset=Tất cả giá trị mã vạch đã được loại bỏ +NoBarcodeNumberingTemplateDefined=Không có đánh số mã vạch mẫu kích hoạt vào thiết lập mô-đun mã vạch. +NoRecordWithoutBarcodeDefined=Không có hồ sơ không có giá trị xác định mã vạch. # Modules -Module0Name=Users & groups -Module0Desc=Users and groups management -Module1Name=Third parties -Module1Desc=Companies and contact management (customers, prospects...) -Module2Name=Commercial -Module2Desc=Commercial management -Module10Name=Accounting -Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. -Module20Name=Proposals -Module20Desc=Commercial proposal management -Module22Name=Mass E-mailings -Module22Desc=Mass E-mailing management -Module23Name= Energy -Module23Desc= Monitoring the consumption of energies -Module25Name=Customer Orders -Module25Desc=Customer order management -Module30Name=Invoices -Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers -Module40Name=Suppliers -Module40Desc=Supplier management and buying (orders and invoices) -Module42Name=Logs -Module42Desc=Logging facilities (file, syslog, ...) -Module49Name=Editors -Module49Desc=Editor management -Module50Name=Products -Module50Desc=Product management -Module51Name=Mass mailings -Module51Desc=Mass paper mailing management -Module52Name=Stocks -Module52Desc=Stock management (products) -Module53Name=Services -Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management -Module55Name=Barcodes -Module55Desc=Barcode management -Module56Name=Telephony -Module56Desc=Telephony integration -Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module0Name=Người dùng & nhóm +Module0Desc=Người dùng và nhóm quản lý +Module1Name=Các bên thứ ba +Module1Desc=Các công ty và quản lý liên lạc (khách hàng, khách hàng tiềm năng ...) +Module2Name=Thương mại +Module2Desc=Quản lý thương mại +Module10Name=Kế toán +Module10Desc=Báo cáo kế toán đơn giản (các tạp chí, kim ngạch) dựa vào nội dung cơ sở dữ liệu. Không có điều phối. +Module20Name=Đề xuất +Module20Desc=Quản lý đề nghị thương mại +Module22Name=Thánh Lễ E-thư +Module22Desc=Thánh Lễ E-mail quản lý +Module23Name= Năng lượng +Module23Desc= Giám sát việc tiêu thụ năng lượng +Module25Name=Đơn đặt hàng của khách hàng +Module25Desc=Quản lý đơn đặt hàng +Module30Name=Hoá đơn +Module30Desc=Hóa đơn và lưu ý quản lý tín dụng cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp +Module40Name=Nhà cung cấp +Module40Desc=Quản lý nhà cung cấp và mua (đơn đặt hàng và hoá đơn) +Module42Name=Bản ghi +Module42Desc=Các cơ sở khai thác gỗ (tập tin, nhật ký hệ thống, ...) +Module49Name=Biên tập +Module49Desc=Quản lý biên tập +Module50Name=Sản phẩm +Module50Desc=Quản lý sản phẩm +Module51Name=Thư hàng loạt +Module51Desc=Khối quản lý gửi thư giấy +Module52Name=Cổ phiếu +Module52Desc=Quản lý tồn kho (sản phẩm) +Module53Name=Dịch vụ +Module53Desc=Quản lý dịch vụ +Module54Name=Hợp đồng +Module54Desc=Hợp đồng dịch vụ quản lý +Module55Name=Mã vạch +Module55Desc=Quản lý mã vạch +Module56Name=Điện thoại +Module56Desc=Tích hợp điện thoại +Module57Name=Đứng đơn đặt hàng +Module57Desc=Đơn đặt hàng thường trực và quản lý thu hồi Module58Name=ClickToDial -Module58Desc=Integration of a ClickToDial system (Asterisk, ...) +Module58Desc=Tích hợp hệ thống ClickToDial (Asterisk, ...) Module59Name=Bookmark4u -Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account -Module70Name=Interventions -Module70Desc=Intervention management -Module75Name=Expense and trip notes -Module75Desc=Expense and trip notes management -Module80Name=Shipments -Module80Desc=Shipments and delivery order management -Module85Name=Banks and cash -Module85Desc=Management of bank or cash accounts -Module100Name=External site -Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame -Module105Name=Mailman and SPIP -Module105Desc=Mailman or SPIP interface for member module +Module59Desc=Thêm chức năng để tạo ra tài khoản Bookmark4u từ một tài khoản Dolibarr +Module70Name=Các can thiệp +Module70Desc=Quản lý can thiệp +Module75Name=Chi phí chuyến đi và ghi chú +Module75Desc=Chi phí chuyến đi và ghi chú quản lý +Module80Name=Lô hàng +Module80Desc=Vận chuyển và quản lý trật tự giao hàng +Module85Name=Các ngân hàng và tiền mặt +Module85Desc=Quản lý tài khoản ngân hàng hoặc tiền mặt +Module100Name=Trang web bên ngoài +Module100Desc=Module này bao gồm một trang web bên ngoài hoặc trang vào menu Dolibarr và xem nó vào một khung Dolibarr +Module105Name=Mailman và SPIP +Module105Desc=Giao diện Mailman hoặc SPIP cho mô-đun thành viên Module200Name=LDAP -Module200Desc=LDAP directory synchronisation +Module200Desc=Đồng bộ hóa thư mục LDAP Module210Name=PostNuke -Module210Desc=PostNuke integration -Module240Name=Data exports -Module240Desc=Tool to export Dolibarr datas (with assistants) -Module250Name=Data imports -Module250Desc=Tool to import datas in Dolibarr (with assistants) -Module310Name=Members -Module310Desc=Foundation members management +Module210Desc=PostNuke hội nhập +Module240Name=Xuất khẩu dữ liệu +Module240Desc=Công cụ để xuất khẩu Dolibarr dữ liệu ngay (với các trợ lý) +Module250Name=Nhập khẩu dữ liệu +Module250Desc=Công cụ để nhập dữ liệu ngay trong Dolibarr (với trợ lý) +Module310Name=Thành viên +Module310Desc=Tổ chức quản lý thành viên Module320Name=RSS Feed -Module320Desc=Add RSS feed inside Dolibarr screen pages -Module330Name=Bookmarks -Module330Desc=Bookmark management +Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibarr +Module330Name=Đánh dấu +Module330Desc=Quản lý Bookmark Module400Name=Các dự án -Module400Desc=Project management inside other modules +Module400Desc=Quản lý dự án bên trong mô-đun khác Module410Name=Webcalendar -Module410Desc=Webcalendar integration -Module500Name=Special expenses (tax, social contributions, dividends) -Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries -Module510Name=Salaries -Module510Desc=Management of employees salaries and payments -Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts -Module700Name=Donations -Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. +Module410Desc=Webcalendar hội nhập +Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức) +Module500Desc=Quản lý chi phí đặc biệt như thuế, đóng góp xã hội, cổ tức và tiền lương +Module510Name=Tiền lương +Module510Desc=Quản lý lao động tiền lương và các khoản thanh toán +Module600Name=Thông báo +Module600Desc=Gửi thông báo bằng thư điện tử trên một số sự kiện kinh doanh Dolibarr để liên lạc với bên thứ ba +Module700Name=Đóng góp +Module700Desc=Quản lý tài trợ +Module800Name=OsCommerce bởi truy cập cơ sở dữ liệu trực tiếp +Module800Desc=Giao diện hiển thị một cửa hàng osCommerce hoặc OSCSS thông qua truy cập cơ sở dữ liệu trực tiếp +Module900Name=OsCommerce bởi WS +Module900Desc=Giao diện hiển thị một cửa hàng osCommerce thông qua các dịch vụ Web. Module này requiere bạn cài đặt các thành phần từ / oscommerce_ws / ws_server vào máy chủ osCommerce của bạn. Xem tập tin README trong / oscommerce_ws / ws_server. Module1200Name=Mantis -Module1200Desc=Mantis integration -Module1400Name=Accounting -Module1400Desc=Accounting management (double parties) -Module1780Name=Categories -Module1780Desc=Category management (products, suppliers and customers) -Module2000Name=WYSIWYG editor -Module2000Desc=Allow to edit some text area using an advanced editor +Module1200Desc=Mantis hội nhập +Module1400Name=Kế toán +Module1400Desc=Kế toán quản trị (đôi bên) +Module1780Name=Loại +Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng) +Module2000Name=Trình soạn thảo WYSIWYG +Module2000Desc=Cho phép chỉnh sửa một số vùng văn bản bằng cách sử dụng một biên tập viên cao cấp Module2300Name=Cron -Module2300Desc=Scheduled task management -Module2400Name=Agenda -Module2400Desc=Events/tasks and agenda management -Module2500Name=Electronic Content Management -Module2500Desc=Save and share documents +Module2300Desc=Quản lý công việc theo lịch trình +Module2400Name=Chương trình nghị sự +Module2400Desc=Sự kiện / nhiệm vụ và quản lý chương trình nghị sự +Module2500Name=Quản lý nội dung điện tử +Module2500Desc=Lưu và chia sẻ tài liệu Module2600Name=WebServices -Module2600Desc=Enable the Dolibarr web services server +Module2600Desc=Cho phép các máy chủ dịch vụ web Dolibarr Module2700Name=Gravatar -Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access +Module2700Desc=Sử dụng dịch vụ trực tuyến Gravatar (www.gravatar.com) để hiển thị hình ảnh của người sử dụng / thành viên (được tìm thấy với các email của họ). Cần truy cập internet Module2800Desc=FTP Client Module2900Name=GeoIPMaxmind -Module2900Desc=GeoIP Maxmind conversions capabilities +Module2900Desc=GeoIP MaxMind khả năng chuyển đổi Module3100Name=Skype -Module3100Desc=Add a Skype button into card of adherents / third parties / contacts -Module5000Name=Multi-company -Module5000Desc=Allows you to manage multiple companies -Module6000Name=Workflow -Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays -Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products -Module50000Name=PayBox -Module50000Desc=Module to offer an online payment page by credit card with PayBox -Module50100Name=Point of sales -Module50100Desc=Point of sales module +Module3100Desc=Thêm một nút Skype vào thẻ tín đồ / bên thứ ba / địa chỉ liên lạc +Module5000Name=Nhiều công ty +Module5000Desc=Cho phép bạn quản lý nhiều công ty +Module6000Name=Quy trình làm việc +Module6000Desc=Quản lý công việc +Module20000Name=Ngày lễ +Module20000Desc=Kê khai, theo nhân viên lễ +Module39000Name=Hàng loạt sản phẩm +Module39000Desc=Số lô, ăn theo và bán theo quản lý ngày sản phẩm +Module50000Name=Nơi trả tiền +Module50000Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với nơi trả tiền +Module50100Name=Điểm bán hàng +Module50100Desc=Quan điểm của mô-đun bán hàng Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50200Desc= Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với Paypal +Module50400Name=Kế toán (nâng cao) +Module50400Desc=Kế toán quản trị (đôi bên) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. -Module55000Name=Open Poll -Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) -Module59000Name=Margins -Module59000Desc=Module to manage margins -Module60000Name=Commissions -Module60000Desc=Module to manage commissions -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product -Permission11=Read customer invoices -Permission12=Create/modify customer invoices -Permission13=Unvalidate customer invoices -Permission14=Validate customer invoices -Permission15=Send customer invoices by email -Permission16=Create payments for customer invoices -Permission19=Delete customer invoices -Permission21=Read commercial proposals -Permission22=Create/modify commercial proposals -Permission24=Validate commercial proposals -Permission25=Send commercial proposals -Permission26=Close commercial proposals -Permission27=Delete commercial proposals -Permission28=Export commercial proposals -Permission31=Read products -Permission32=Create/modify products -Permission34=Delete products -Permission36=See/manage hidden products -Permission38=Export products -Permission41=Read projects (shared project and projects i'm contact for) -Permission42=Create/modify projects (shared project and projects i'm contact for) -Permission44=Delete projects (shared project and projects i'm contact for) -Permission61=Read interventions -Permission62=Create/modify interventions -Permission64=Delete interventions -Permission67=Export interventions -Permission71=Read members -Permission72=Create/modify members -Permission74=Delete members -Permission75=Setup types and attributes for members -Permission76=Export datas -Permission78=Read subscriptions -Permission79=Create/modify subscriptions -Permission81=Read customers orders -Permission82=Create/modify customers orders -Permission84=Validate customers orders -Permission86=Send customers orders -Permission87=Close customers orders -Permission88=Cancel customers orders -Permission89=Delete customers orders -Permission91=Read social contributions and vat -Permission92=Create/modify social contributions and vat -Permission93=Delete social contributions and vat -Permission94=Export social contributions -Permission95=Read reports -Permission101=Read sendings -Permission102=Create/modify sendings -Permission104=Validate sendings -Permission106=Export sendings -Permission109=Delete sendings -Permission111=Read financial accounts -Permission112=Create/modify/delete and compare transactions -Permission113=Setup financiel accounts (create, manage categories) -Permission114=Consolidate transactions -Permission115=Export transactions and account statements -Permission116=Transfers between accounts -Permission117=Manage cheques dispatching -Permission121=Read third parties linked to user -Permission122=Create/modify third parties linked to user -Permission125=Delete third parties linked to user -Permission126=Export third parties -Permission141=Read projects (also private i am not contact for) -Permission142=Create/modify projects (also private i am not contact for) -Permission144=Delete projects (also private i am not contact for) -Permission146=Read providers -Permission147=Read stats -Permission151=Read standing orders -Permission152=Create/modify a standing orders request -Permission153=Transmission standing orders receipts -Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips -Permission180=Read suppliers -Permission181=Read supplier orders -Permission182=Create/modify supplier orders -Permission183=Validate supplier orders -Permission184=Approve supplier orders -Permission185=Order supplier orders -Permission186=Receive supplier orders -Permission187=Close supplier orders -Permission188=Cancel supplier orders -Permission192=Create lines -Permission193=Cancel lines -Permission194=Read the bandwith lines -Permission202=Create ADSL connections -Permission203=Order connections orders -Permission204=Order connections -Permission205=Manage connections -Permission206=Read connections -Permission211=Read Telephony -Permission212=Order lines -Permission213=Activate line -Permission214=Setup Telephony -Permission215=Setup providers -Permission221=Read emailings -Permission222=Create/modify emailings (topic, recipients...) -Permission223=Validate emailings (allows sending) -Permission229=Delete emailings -Permission237=View recipients and info -Permission238=Manually send mailings -Permission239=Delete mailings after validation or sent -Permission241=Read categories -Permission242=Create/modify categories -Permission243=Delete categories -Permission244=See the contents of the hidden categories -Permission251=Read other users and groups -PermissionAdvanced251=Read other users -Permission252=Read permissions of other users -Permission253=Create/modify other users, groups and permisssions -PermissionAdvanced253=Create/modify internal/external users and permissions -Permission254=Create/modify external users only -Permission255=Modify other users password -Permission256=Delete or disable other users -Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves). -Permission271=Read CA -Permission272=Read invoices -Permission273=Issue invoices -Permission281=Read contacts -Permission282=Create/modify contacts -Permission283=Delete contacts -Permission286=Export contacts -Permission291=Read tariffs -Permission292=Set permissions on the tariffs -Permission293=Modify costumers tariffs -Permission300=Read bar codes -Permission301=Create/modify bar codes -Permission302=Delete bar codes -Permission311=Read services -Permission312=Assign service to contract -Permission331=Read bookmarks -Permission332=Create/modify bookmarks -Permission333=Delete bookmarks -Permission341=Read its own permissions -Permission342=Create/modify his own user information -Permission343=Modify his own password -Permission344=Modify its own permissions -Permission351=Read groups -Permission352=Read groups permissions -Permission353=Create/modify groups -Permission354=Delete or disable groups -Permission358=Export users -Permission401=Read discounts -Permission402=Create/modify discounts -Permission403=Validate discounts -Permission404=Delete discounts -Permission510=Read Salaries -Permission512=Create/modify salaries -Permission514=Delete salaries -Permission517=Export salaries -Permission531=Read services -Permission532=Create/modify services -Permission534=Delete services -Permission536=See/manage hidden services -Permission538=Export services -Permission701=Read donations -Permission702=Create/modify donations -Permission703=Delete donations -Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks -Permission1004=Read stock movements -Permission1005=Create/modify stock movements -Permission1101=Read delivery orders -Permission1102=Create/modify delivery orders -Permission1104=Validate delivery orders -Permission1109=Delete delivery orders -Permission1181=Read suppliers -Permission1182=Read supplier orders -Permission1183=Create/modify supplier orders -Permission1184=Validate supplier orders -Permission1185=Approve supplier orders -Permission1186=Order supplier orders -Permission1187=Acknowledge receipt of supplier orders -Permission1188=Delete supplier orders -Permission1201=Get result of an export -Permission1202=Create/Modify an export -Permission1231=Read supplier invoices -Permission1232=Create/modify supplier invoices -Permission1233=Validate supplier invoices -Permission1234=Delete supplier invoices -Permission1235=Send supplier invoices by email -Permission1236=Export supplier invoices, attributes and payments -Permission1237=Export supplier orders and their details -Permission1251=Run mass imports of external data into database (data load) -Permission1321=Export customer invoices, attributes and payments -Permission1421=Export customer orders and attributes -Permission23001 = Read Scheduled task -Permission23002 = Create/update Scheduled task -Permission23003 = Delete Scheduled task -Permission23004 = Execute Scheduled task -Permission2401=Read actions (events or tasks) linked to his account -Permission2402=Create/modify actions (events or tasks) linked to his account -Permission2403=Delete actions (events or tasks) linked to his account -Permission2411=Read actions (events or tasks) of others -Permission2412=Create/modify actions (events or tasks) of others -Permission2413=Delete actions (events or tasks) of others -Permission2501=Read/Download documents -Permission2502=Download documents -Permission2503=Submit or delete documents -Permission2515=Setup documents directories -Permission2801=Use FTP client in read mode (browse and download only) -Permission2802=Use FTP client in write mode (delete or upload files) -Permission50101=Use Point of sales -Permission50201=Read transactions -Permission50202=Import transactions -Permission54001=Print -Permission55001=Read polls -Permission55002=Create/modify polls -Permission59001=Read commercial margins -Permission59002=Define commercial margins -DictionaryCompanyType=Thirdparties type -DictionaryCompanyJuridicalType=Juridical kinds of thirdparties -DictionaryProspectLevel=Prospect potential level -DictionaryCanton=State/Cantons -DictionaryRegion=Regions -DictionaryCountry=Countries -DictionaryCurrency=Currencies -DictionaryCivility=Civility title -DictionaryActions=Type of agenda events -DictionarySocialContributions=Social contributions types -DictionaryVAT=VAT Rates or Sales Tax Rates -DictionaryRevenueStamp=Amount of revenue stamps -DictionaryPaymentConditions=Payment terms -DictionaryPaymentModes=Payment modes -DictionaryTypeContact=Contact/Address types +Module54000Desc=In qua Cup IPP in. +Module55000Name=Mở Poll +Module55000Desc=Mô-đun để thực hiện các cuộc thăm dò trực tuyến (như Doodle, Studs, Rdvz, ...) +Module59000Name=Lợi nhuận +Module59000Desc=Mô-đun để quản lý lợi nhuận +Module60000Name=Hoa hồng +Module60000Desc=Mô-đun để quản lý hoa hồng +Module150010Name=Số lô, ăn theo ngày và bán theo ngày +Module150010Desc=số lô, ăn theo ngày và bán theo quản lý ngày cho sản phẩm +Permission11=Đọc hóa đơn của khách hàng +Permission12=Tạo / chỉnh sửa hóa đơn khách hàng +Permission13=Hóa đơn khách hàng Unvalidate +Permission14=Xác nhận hoá đơn của khách hàng +Permission15=Gửi hóa đơn khách hàng qua email +Permission16=Tạo hoá đơn thanh toán cho khách hàng +Permission19=Xóa hóa đơn của khách hàng +Permission21=Đọc đề xuất thương mại +Permission22=Tạo / sửa đổi đề xuất thương mại +Permission24=Xác nhận đề xuất thương mại +Permission25=Gửi đề nghị thương mại +Permission26=Đóng đề xuất thương mại +Permission27=Xóa đề xuất thương mại +Permission28=Xuất khẩu đề nghị thương mại +Permission31=Ðọc sản phẩm +Permission32=Tạo / chỉnh sửa sản phẩm +Permission34=Xóa sản phẩm +Permission36=Xem / quản lý sản phẩm ẩn +Permission38=Sản phẩm xuất khẩu +Permission41=Đọc các dự án (dự án được chia sẻ và các dự án tôi liên lạc) +Permission42=Tạo / sửa đổi dự án (dự án chung và các dự án tôi liên lạc) +Permission44=Xóa dự án (dự án chung và các dự án tôi liên lạc) +Permission61=Đọc can thiệp +Permission62=Tạo / chỉnh sửa can thiệp +Permission64=Xóa can thiệp +Permission67=Can thiệp xuất khẩu +Permission71=Thành viên đã đọc +Permission72=Tạo / thay đổi thành viên +Permission74=Xóa thành viên +Permission75=Thiết lập các loại và các thuộc tính cho các thành viên +Permission76=Xuất dữ liệu ngay +Permission78=Đọc đăng ký +Permission79=Tạo / sửa đổi đăng ký +Permission81=Khách hàng đã đọc đơn đặt hàng +Permission82=Tạo / sửa đổi khách hàng đơn đặt hàng +Permission84=Xác nhận đơn đặt hàng cho khách hàng +Permission86=Gửi đơn đặt hàng cho khách hàng +Permission87=Đóng khách hàng đơn đặt hàng +Permission88=Hủy bỏ đơn đặt hàng khách hàng +Permission89=Xóa khách hàng đơn đặt hàng +Permission91=Đọc đóng góp xã hội và vat +Permission92=Tạo / sửa đổi các khoản đóng góp xã hội và vat +Permission93=Xóa đóng góp xã hội và vat +Permission94=Đóng góp xã hội xuất khẩu +Permission95=Đọc báo cáo +Permission101=Đọc sendings +Permission102=Tạo / sửa đổi sendings +Permission104=Xác nhận sendings +Permission106=Sendings xuất khẩu +Permission109=Xóa sendings +Permission111=Đọc các tài khoản tài chính +Permission112=Tạo / sửa đổi / xóa và so sánh giao dịch +Permission113=Thiết lập tài khoản financiel (tạo, quản lý danh mục) +Permission114=Củng cố giao dịch +Permission115=Các giao dịch xuất khẩu, báo cáo tài khoản +Permission116=Chuyển giữa các tài khoản +Permission117=Quản lý kiểm tra cử +Permission121=Đọc các bên thứ ba liên quan đến người sử dụng +Permission122=Tạo / chỉnh sửa các bên thứ ba liên quan đến người sử dụng +Permission125=Xóa các bên thứ ba liên quan đến người sử dụng +Permission126=Các bên thứ ba xuất khẩu +Permission141=Đọc các dự án (cũng tin tôi không liên lạc với) +Permission142=Tạo / sửa đổi dự án (cũng tin tôi không liên lạc với) +Permission144=Xóa dự án (cũng tin tôi không liên lạc với) +Permission146=Đọc cung cấp +Permission147=Đọc số liệu thống kê +Permission151=Đọc lệnh đứng +Permission152=Tạo / sửa đổi một yêu cầu đơn đặt hàng thường trực +Permission153=Đơn đặt hàng đứng truyền thu +Permission154=Tín dụng / từ chối đứng đơn đặt hàng biên lai +Permission161=Đọc hợp đồng +Permission162=Tạo / sửa đổi hợp đồng +Permission163=Kích hoạt dịch vụ của hợp đồng +Permission164=Vô hiệu hoá một dịch vụ của hợp đồng +Permission165=Xóa hợp đồng +Permission171=Đọc đi +Permission172=Tạo / sửa đổi các chuyến đi +Permission173=Xóa các chuyến đi +Permission178=Các chuyến đi xuất khẩu +Permission180=Đọc cung cấp +Permission181=Đọc đơn đặt hàng nhà cung cấp +Permission182=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp +Permission183=Xác nhận đơn đặt hàng nhà cung cấp +Permission184=Phê duyệt đơn đặt hàng nhà cung cấp +Permission185=Đơn đặt hàng nhà cung cấp thứ tự +Permission186=Nhận đặt hàng cung cấp +Permission187=Đóng cửa các đơn đặt hàng nhà cung cấp +Permission188=Hủy bỏ đơn đặt hàng nhà cung cấp +Permission192=Tạo dòng +Permission193=Hủy bỏ dòng +Permission194=Đọc những dòng băng thông +Permission202=Tạo kết nối ADSL +Permission203=Kết nối để đơn đặt hàng +Permission204=Kết nối theo thứ tự +Permission205=Quản lý kết nối +Permission206=Đọc kết nối +Permission211=Đọc điện thoại +Permission212=Dòng thứ tự +Permission213=Kích hoạt dòng +Permission214=Cài đặt điện thoại +Permission215=Các nhà cung cấp thiết lập +Permission221=Đọc emailings +Permission222=Tạo / sửa đổi emailings (đề, nhận ...) +Permission223=Xác nhận emailings (cho phép gửi) +Permission229=Xóa emailings +Permission237=Xem người nhận và các thông tin +Permission238=Tự gửi thư +Permission239=Xóa thư sau khi xác nhận hoặc gửi +Permission241=Đã đọc chuyên mục +Permission242=Tạo / sửa đổi danh mục +Permission243=Xóa danh mục +Permission244=Xem nội dung của thể loại ẩn +Permission251=Đọc người dùng và các nhóm khác +PermissionAdvanced251=Ðọc những người dùng khác +Permission252=Đọc các điều khoản của người dùng khác +Permission253=Tạo / sửa đổi những người dùng khác, các nhóm và permisssions +PermissionAdvanced253=Tạo / thay đổi người sử dụng nội bộ / bên ngoài và cho phép +Permission254=Tạo / chỉnh sửa người dùng bên ngoài chỉ +Permission255=Thay đổi mật khẩu của những người dùng khác +Permission256=Xóa hoặc vô hiệu hóa những người dùng khác +Permission262=Mở rộng quyền truy cập vào tất cả các bên thứ ba (không phải chỉ có những người liên quan đến người sử dụng). Không có hiệu quả cho người dùng bên ngoài (luôn có giới hạn cho bản thân). +Permission271=CA đã đọc +Permission272=Đọc hóa đơn +Permission273=Hóa đơn phát hành +Permission281=Đọc địa chỉ liên lạc +Permission282=Tạo / chỉnh sửa địa chỉ liên lạc +Permission283=Xóa số liên lạc +Permission286=Xuất khẩu địa chỉ liên lạc +Permission291=Đọc thuế +Permission292=Thiết lập quyền truy cập vào các mức thuế +Permission293=Sửa đổi mức thuế costumers +Permission300=Đọc mã vạch +Permission301=Tạo / chỉnh sửa mã vạch +Permission302=Xóa mã vạch +Permission311=Đọc dịch vụ +Permission312=Chỉ định dịch vụ ký hợp đồng +Permission331=Đánh dấu đã đọc +Permission332=Tạo / chỉnh sửa bookmark +Permission333=Xóa dấu trang +Permission341=Đọc các điều khoản riêng của mình +Permission342=Tạo / chỉnh sửa thông tin người dùng của mình +Permission343=Thay đổi mật khẩu của mình +Permission344=Sửa đổi điều khoản riêng của mình +Permission351=Nhóm đọc +Permission352=Đọc các nhóm quyền +Permission353=Tạo / sửa đổi nhóm +Permission354=Xóa hoặc vô hiệu hóa các nhóm +Permission358=Người sử dụng xuất khẩu +Permission401=Ðọc giảm giá +Permission402=Tạo / sửa đổi giảm giá +Permission403=Xác nhận giảm giá +Permission404=Xóa giảm giá +Permission510=Đọc Lương +Permission512=Tạo / sửa đổi tiền lương +Permission514=Xóa lương +Permission517=Xuất khẩu lương +Permission531=Đọc dịch vụ +Permission532=Tạo / thay đổi các dịch vụ +Permission534=Xóa dịch vụ +Permission536=Xem / quản lý dịch vụ ẩn +Permission538=Dịch vụ xuất khẩu +Permission701=Đọc đóng góp +Permission702=Tạo / sửa đổi hiến +Permission703=Xóa tài trợ +Permission1001=Đọc cổ phiếu +Permission1002=Tạo / sửa đổi cổ phiếu +Permission1003=Xóa cổ phiếu +Permission1004=Đọc chuyển động chứng khoán +Permission1005=Tạo / sửa đổi chuyển động chứng khoán +Permission1101=Đọc lệnh giao hàng +Permission1102=Tạo / chỉnh sửa lệnh giao hàng +Permission1104=Xác nhận lệnh giao hàng +Permission1109=Xóa lệnh giao hàng +Permission1181=Đọc cung cấp +Permission1182=Đọc đơn đặt hàng nhà cung cấp +Permission1183=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp +Permission1184=Xác nhận đơn đặt hàng nhà cung cấp +Permission1185=Phê duyệt đơn đặt hàng nhà cung cấp +Permission1186=Đơn đặt hàng nhà cung cấp thứ tự +Permission1187=Xác nhận đã nhận đơn đặt hàng nhà cung cấp +Permission1188=Xóa đơn đặt hàng nhà cung cấp +Permission1201=Nhận kết quả của một xuất khẩu +Permission1202=Tạo / Sửa đổi một xuất khẩu +Permission1231=Đọc hóa đơn nhà cung cấp +Permission1232=Tạo / chỉnh sửa hóa đơn nhà cung cấp +Permission1233=Xác nhận hoá đơn nhà cung cấp +Permission1234=Xóa hóa đơn nhà cung cấp +Permission1235=Gửi hóa đơn nhà cung cấp qua email +Permission1236=Nhà cung cấp xuất hóa đơn, thuộc tính và thanh toán +Permission1237=Đơn đặt hàng nhà cung cấp xuất khẩu và chi tiết của họ +Permission1251=Chạy nhập khẩu khối lượng của dữ liệu bên ngoài vào cơ sở dữ liệu (tải dữ liệu) +Permission1321=Hóa đơn xuất khẩu của khách hàng, các thuộc tính và thanh toán +Permission1421=Đơn đặt hàng xuất khẩu và các thuộc tính +Permission23001 = Đọc nhiệm vụ theo lịch trình +Permission23002 = Tạo / cập nhật theo lịch trình công việc +Permission23003 = Xóa nhiệm vụ theo lịch trình +Permission23004 = Thực hiện nhiệm vụ theo lịch trình +Permission2401=Đọc hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình +Permission2402=Tạo / sửa đổi các hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình +Permission2403=Xóa hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình +Permission2411=Đọc hành động (sự kiện hay nhiệm vụ) của người khác +Permission2412=Tạo / sửa đổi các hành động (sự kiện hay nhiệm vụ) của người khác +Permission2413=Xóa hành động (sự kiện hay nhiệm vụ) của người khác +Permission2501=Đọc / Tải tài liệu +Permission2502=Tải về tài liệu +Permission2503=Nộp hoặc xóa tài liệu +Permission2515=Tài liệu thiết lập các thư mục +Permission2801=Sử dụng FTP client trong chế độ đọc (duyệt và chỉ tải về) +Permission2802=Sử dụng FTP client trong chế độ ghi (xóa hoặc tải lên các tập tin) +Permission50101=Sử dụng điểm bán hàng +Permission50201=Đọc các giao dịch +Permission50202=Các giao dịch nhập khẩu +Permission54001=In +Permission55001=Đọc các cuộc thăm dò +Permission55002=Tạo / sửa đổi các cuộc thăm dò +Permission59001=Đọc lợi nhuận thương mại +Permission59002=Xác định lợi nhuận thương mại +DictionaryCompanyType=Thirdparties loại +DictionaryCompanyJuridicalType=Các loại pháp nhân của thirdparties +DictionaryProspectLevel=Triển vọng mức tiềm năng +DictionaryCanton=Nhà nước / Cantons +DictionaryRegion=Khu vực +DictionaryCountry=Nước +DictionaryCurrency=Đơn vị tiền tệ +DictionaryCivility=Danh hiệu văn minh +DictionaryActions=Loại sự kiện chương trình nghị sự +DictionarySocialContributions=Các loại đóng góp xã hội +DictionaryVAT=Giá thuế GTGT, thuế tiêu thụ giá +DictionaryRevenueStamp=Số tiền tem doanh thu +DictionaryPaymentConditions=Phương thức thanh toán +DictionaryPaymentModes=Phương thức thanh toán +DictionaryTypeContact=Liên hệ / loại Địa chỉ DictionaryEcotaxe=Ecotax (WEEE) -DictionaryPaperFormat=Paper formats -DictionaryFees=Type of fees -DictionarySendingMethods=Shipping methods -DictionaryStaff=Staff -DictionaryAvailability=Delivery delay -DictionaryOrderMethods=Ordering methods -DictionarySource=Origin of proposals/orders -DictionaryAccountancyplan=Chart of accounts -DictionaryAccountancysystem=Models for chart of accounts -SetupSaved=Setup saved -BackToModuleList=Back to modules list -BackToDictionaryList=Back to dictionaries list -VATReceivedOnly=Special rate not charged -VATManagement=VAT Management -VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.
If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
Else the proposed default VAT=0. End of rule. -VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. -VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. -VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. +DictionaryPaperFormat=Định dạng giấy +DictionaryFees=Loại phí +DictionarySendingMethods=Phương pháp vận chuyển +DictionaryStaff=Nhân viên +DictionaryAvailability=Chậm trễ giao hàng +DictionaryOrderMethods=Phương pháp đặt hàng +DictionarySource=Nguồn gốc của các đề xuất / đơn đặt hàng +DictionaryAccountancyplan=Biểu đồ tài khoản +DictionaryAccountancysystem=Mô hình biểu đồ của tài khoản +SetupSaved=Thiết lập lưu +BackToModuleList=Trở lại danh sách các mô-đun +BackToDictionaryList=Trở lại danh sách từ điển +VATReceivedOnly=Tỷ lệ đặc biệt không bị tính phí +VATManagement=Quản lý thuế GTGT +VATIsUsedDesc=Thuế suất thuế GTGT theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động:
Nếu người bán không phải chịu thuế GTGT, sau đó thuế GTGT theo mặc định = 0. Kết thúc quy tắc.
Nếu (bán nước = mua nước), sau đó thuế GTGT theo mặc định = thuế GTGT của sản phẩm trong nước bán. Kết thúc quy tắc.
Nếu người bán và người mua trong cộng đồng và hàng hóa châu Âu là những sản phẩm giao thông (ô tô, tàu, máy bay), thuế GTGT mặc định = 0 (Thuế GTGT phải được thanh toán của người mua tại customoffice của đất nước của mình và không ít người bán). Kết thúc quy tắc.
Nếu người bán và người mua trong Cộng đồng châu Âu và người mua không phải là một công ty, sau đó thuế GTGT theo mặc định = thuế GTGT của sản phẩm bán ra. Kết thúc quy tắc.
Nếu người bán và người mua trong Cộng đồng châu Âu và người mua là một công ty, sau đó thuế GTGT theo mặc định = 0. Kết thúc quy tắc.
Thuế GTGT khác đề xuất mặc định = 0. Kết thúc quy tắc. +VATIsNotUsedDesc=Theo mặc định, đề xuất thuế GTGT là 0 có thể được sử dụng cho các trường hợp như các hiệp hội, cá nhân ou công ty nhỏ. +VATIsUsedExampleFR=Ở Pháp, nó có nghĩa là các công ty, tổ chức có một hệ thống tài chính thực (giản thể thực sự hay bình thường thực tế). Một hệ thống trong đó thuế GTGT đã kê khai. +VATIsNotUsedExampleFR=Ở Pháp, nó có nghĩa là hiệp hội được khai báo không thuế VAT hoặc các công ty, tổ chức, nghề nghiệp tự do đã lựa chọn hệ thống tài chính doanh nghiệp nhỏ (VAT trong nhượng quyền thương mại) và nộp thuế GTGT nhượng quyền thương mại mà không có bất kỳ kê khai thuế GTGT. Lựa chọn này sẽ hiển thị các tài liệu tham khảo "không được áp dụng thuế GTGT - nghệ thuật-293B của CGI" trên hoá đơn. ##### Local Taxes ##### -LTRate=Rate -LocalTax1IsUsed=Use second tax -LocalTax1IsNotUsed=Do not use second tax -LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) -LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) -LocalTax1Management=Second type of tax +LTRate=Tỷ giá +LocalTax1IsUsed=Thuế sử dụng thứ hai +LocalTax1IsNotUsed=Không sử dụng thuế thứ hai +LocalTax1IsUsedDesc=Sử dụng một loại thứ hai của thuế (trừ thuế GTGT) +LocalTax1IsNotUsedDesc=Không sử dụng các loại thuế khác (trừ thuế GTGT) +LocalTax1Management=Loại thứ hai của thuế LocalTax1IsUsedExample= LocalTax1IsNotUsedExample= -LocalTax2IsUsed=Use third tax -LocalTax2IsNotUsed=Do not use third tax -LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) -LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) -LocalTax2Management=Third type of tax +LocalTax2IsUsed=Thuế sử dụng thứ ba +LocalTax2IsNotUsed=Không sử dụng thuế thứ ba +LocalTax2IsUsedDesc=Sử dụng một loại thứ ba của thuế (trừ thuế GTGT) +LocalTax2IsNotUsedDesc=Không sử dụng các loại thuế khác (trừ thuế GTGT) +LocalTax2Management=Loại thứ ba của thuế LocalTax2IsUsedExample= LocalTax2IsNotUsedExample= -LocalTax1ManagementES= RE Management -LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If te buyer is not subjected to RE, RE by default=0. End of rule.
If the buyer is subjected to RE then the RE by default. End of rule.
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule. -LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE. -LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE. -LocalTax2ManagementES= IRPF Management -LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.
If the seller is subjected to IRPF then the IRPF by default. End of rule.
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule. -LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules. -LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases -CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases -CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales -CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales -LabelUsedByDefault=Label used by default if no translation can be found for code -LabelOnDocuments=Label on documents -NbOfDays=Nb of days -AtEndOfMonth=At end of month -Offset=Offset -AlwaysActive=Always active -UpdateRequired=Your system needs to be updated. To do this, click on Update now. -Upgrade=Upgrade -MenuUpgrade=Upgrade / Extend -AddExtensionThemeModuleOrOther=Add extension (theme, module, ...) -WebServer=Web server -DocumentRootServer=Web server's root directory -DataRootServer=Data files directory +LocalTax1ManagementES= Quản lý RE +LocalTax1IsUsedDescES= Tỷ lệ RE theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động:
Nếu te mua không chịu RE, RE mặc định = 0. Kết thúc quy tắc.
Nếu người mua là đối tượng của RE thì RE theo mặc định. Kết thúc quy tắc.
+LocalTax1IsNotUsedDescES= Theo mặc định, RE đề xuất là 0 Kết thúc quy tắc. +LocalTax1IsUsedExampleES= Tại Tây Ban Nha họ là các chuyên gia phụ thuộc vào một số phần cụ thể của các IAE Tây Ban Nha. +LocalTax1IsNotUsedExampleES= Tại Tây Ban Nha họ rất chuyên nghiệp và xã hội và có thể phần nào đó của IAE Tây Ban Nha. +LocalTax2ManagementES= Quản lý IRPF +LocalTax2IsUsedDescES= Tỷ lệ RE theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động:
Nếu người bán không chịu IRPF, sau đó IRPF theo mặc định = 0. Kết thúc quy tắc.
Nếu người bán phải chịu IRPF thì IRPF theo mặc định. Kết thúc quy tắc.
+LocalTax2IsNotUsedDescES= Theo mặc định, IRPF đề xuất là 0 Kết thúc quy tắc. +LocalTax2IsUsedExampleES= Tại Tây Ban Nha, dịch giả tự do và các chuyên gia độc lập cung cấp dịch vụ và các công ty đã chọn hệ thống thuế của mô-đun. +LocalTax2IsNotUsedExampleES= Tại Tây Ban Nha họ Bussines không phụ thuộc vào hệ thống thuế của mô-đun. +CalcLocaltax=Báo cáo +CalcLocaltax1ES=Bán - mua +CalcLocaltax1Desc=Thuế địa phương báo cáo được tính toán với sự khác biệt giữa localtaxes bán hàng và mua hàng localtaxes +CalcLocaltax2ES=Mua +CalcLocaltax2Desc=Thuế địa phương báo cáo là tổng của localtaxes mua +CalcLocaltax3ES=Bán hàng +CalcLocaltax3Desc=Thuế địa phương báo cáo là tổng của localtaxes bán hàng +LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy mã +LabelOnDocuments=Nhãn trên các tài liệu +NbOfDays=Nb ngày +AtEndOfMonth=Vào cuối tháng +Offset=Bù đắp +AlwaysActive=Luôn luôn hoạt động +UpdateRequired=Hệ thống của bạn cần được cập nhật. Để làm điều này, bấm vào Update now . +Upgrade=Nâng cấp +MenuUpgrade=Nâng cấp / Mở rộng +AddExtensionThemeModuleOrOther=Thêm phần mở rộng (chủ đề, mô-đun, ...) +WebServer=Máy chủ Web +DocumentRootServer=Thư mục gốc của máy chủ Web +DataRootServer=Dữ liệu thư mục tập tin IP=IP -Port=Port -VirtualServerName=Virtual server name -AllParameters=All parameters -OS=OS +Port=Cảng +VirtualServerName=Tên máy chủ ảo +AllParameters=Tất cả các thông số +OS=Hệ điều hành PhpEnv=Env PhpModules=Module PhpConf=Conf -PhpWebLink=Web-Php link +PhpWebLink=Liên kết web Php Pear=Pear -PearPackages=Pear Packages -Browser=Browser -Server=Server -Database=Database -DatabaseServer=Database host -DatabaseName=Database name -DatabasePort=Database port -DatabaseUser=Database user -DatabasePassword=Database password -DatabaseConfiguration=Database setup -Tables=Tables -TableName=Table name -TableLineFormat=Line format -NbOfRecord=Nb of records -Constraints=Constraints -ConstraintsType=Constraints type -ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry -AllMustBeOk=All of these must be checked -Host=Server -DriverType=Driver type -SummarySystem=System information summary -SummaryConst=List of all Dolibarr setup parameters -SystemUpdate=System update -SystemSuccessfulyUpdate=Your system has been updated successfuly -MenuCompanySetup=Company/Foundation -MenuNewUser=New user -MenuTopManager=Top menu manager -MenuLeftManager=Left menu manager -MenuManager=Menu manager -MenuSmartphoneManager=Smartphone menu manager -DefaultMenuTopManager=Top menu manager -DefaultMenuLeftManager=Left menu manager -DefaultMenuManager= Standard menu manager -DefaultMenuSmartphoneManager=Smartphone menu manager -Skin=Skin theme -DefaultSkin=Default skin theme -MaxSizeList=Max length for list -DefaultMaxSizeList=Default max length for list -MessageOfDay=Message of the day -MessageLogin=Login page message -PermanentLeftSearchForm=Permanent search form on left menu -DefaultLanguage=Default language to use (language code) -EnableMultilangInterface=Enable multilingual interface -EnableShowLogo=Show logo on left menu -SystemSuccessfulyUpdated=Your system has been updated successfully -CompanyInfo=Company/foundation information -CompanyIds=Company/foundation identities -CompanyName=Name -CompanyAddress=Address +PearPackages=Gói lê +Browser=Trình duyệt +Server=Máy chủ +Database=Cơ sở dữ liệu +DatabaseServer=Máy chủ cơ sở dữ liệu +DatabaseName=Tên cơ sở dữ liệu +DatabasePort=Cổng cơ sở dữ liệu +DatabaseUser=Sử dụng cơ sở dữ liệu +DatabasePassword=Cơ sở dữ liệu mật khẩu +DatabaseConfiguration=Thiết lập cơ sở dữ liệu +Tables=Bàn +TableName=Tên bảng +TableLineFormat=Định dạng dòng +NbOfRecord=Nb hồ sơ +Constraints=Hạn chế +ConstraintsType=Hạn chế loại +ConstraintsToShowOrNotEntry=Hạn chế để hiển thị hoặc không phải là mục trình đơn +AllMustBeOk=Tất cả những điều này phải được kiểm tra +Host=Máy chủ +DriverType=Loại điều khiển +SummarySystem=Hệ thống thông tin tóm tắt +SummaryConst=Danh sách của tất cả các thông số cài đặt Dolibarr +SystemUpdate=Cập nhật hệ thống +SystemSuccessfulyUpdate=Hệ thống của bạn đã được cập nhật successfuly +MenuCompanySetup=Công ty / cơ sở +MenuNewUser=Người dùng mới +MenuTopManager=Quản lý đơn hàng đầu +MenuLeftManager=Quản lý menu bên trái +MenuManager=Quản lý đơn +MenuSmartphoneManager=Quản lý đơn điện thoại thông minh +DefaultMenuTopManager=Quản lý đơn hàng đầu +DefaultMenuLeftManager=Quản lý menu bên trái +DefaultMenuManager= Quản lý đơn tiêu chuẩn +DefaultMenuSmartphoneManager=Quản lý đơn điện thoại thông minh +Skin=Skin chủ đề +DefaultSkin=Giao diện mặc định da +MaxSizeList=Max length cho danh sách +DefaultMaxSizeList=Mặc định chiều dài tối đa cho danh sách +MessageOfDay=Tin trong ngày +MessageLogin=Tin trang đăng nhập +PermanentLeftSearchForm=Hình thức tìm kiếm thường xuyên trên menu bên trái +DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ) +EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ +EnableShowLogo=Hiển thị biểu tượng trên menu bên trái +SystemSuccessfulyUpdated=Hệ thống của bạn đã được cập nhật thành công +CompanyInfo=Công ty / thông tin nền tảng +CompanyIds=Bản sắc công ty / cơ sở +CompanyName=Tên +CompanyAddress=Địa chỉ CompanyZip=Zip CompanyTown=Town -CompanyCountry=Country -CompanyCurrency=Main currency +CompanyCountry=Đất nước +CompanyCurrency=Tiền tệ chính Logo=Logo -DoNotShow=Do not show -DoNotSuggestPaymentMode=Do not suggest -NoActiveBankAccountDefined=No active bank account defined -OwnerOfBankAccount=Owner of bank account %s -BankModuleNotActive=Bank accounts module not enabled -ShowBugTrackLink=Show link "Report a bug" -ShowWorkBoard=Show "workbench" on homepage -Alerts=Alerts -Delays=Delays -DelayBeforeWarning=Delay before warning -DelaysBeforeWarning=Delays before warning -DelaysOfToleranceBeforeWarning=Tolerance delays before warning -DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element. -Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised -Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed -Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed -Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close -Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed -Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate -Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services -Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices -Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices -Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation -Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee -Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do -SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it. -SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page: -SetupDescription3=Parameters in menu Setup -> Company/foundation are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). -SetupDescription4=Parameters in menu Setup -> Modules are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus. -SetupDescription5=Other menu entries manage optional parameters. -EventsSetup=Setup for events logs -LogEvents=Security audit events -Audit=Audit +DoNotShow=Không hiển thị +DoNotSuggestPaymentMode=Không đề nghị +NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định +OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng% s +BankModuleNotActive=Ngân hàng mô-đun tài khoản chưa được kích hoạt +ShowBugTrackLink=Hiển thị liên kết "Báo cáo một lỗi" +ShowWorkBoard=Xem "bàn làm việc" trên trang chủ +Alerts=Cảnh báo +Delays=Sự chậm trễ +DelayBeforeWarning=Chậm trễ trước khi cảnh báo +DelaysBeforeWarning=Sự chậm trễ trước khi cảnh báo +DelaysOfToleranceBeforeWarning=Sự chậm trễ khoan dung trước khi cảnh báo +DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định sự chậm trễ trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto% s cho mỗi phần tử cuối. +Delays_MAIN_DELAY_ACTIONS_TODO=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các sự kiện theo kế hoạch chưa thực hiện +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về đơn đặt hàng chưa qua chế biến +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo các nhà cung cấp đơn đặt hàng chưa qua chế biến +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các đề xuất để đóng +Delays_MAIN_DELAY_PROPALS_TO_BILL=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các đề xuất không hóa đơn +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về dịch vụ để kích hoạt +Delays_MAIN_DELAY_RUNNING_SERVICES=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về dịch vụ hết hạn +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về hóa đơn chưa thanh toán nhà cung cấp +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về hóa đơn chưa thanh toán của khách hàng +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về cấp phát ngân hàng hòa giải +Delays_MAIN_DELAY_MEMBERS=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về lệ phí thành viên bị trì hoãn +Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo đối với tiền gửi kiểm tra để làm +SetupDescription1=Tất cả các thông số có sẵn trong khu vực thiết lập cho phép bạn thiết lập Dolibarr trước khi bắt đầu sử dụng nó. +SetupDescription2=2 bước thiết lập quan trọng nhất là 2 người đầu tiên trong menu cài đặt bên trái, điều này có nghĩa là công ty / cơ sở trang thiết lập và cài đặt module trang: +SetupDescription3=Các thông số trong menu Setup -> Công ty / cơ sở được yêu cầu bởi vì các thông tin đầu vào được sử dụng trên Dolibarr hiển thị và chỉnh sửa Dolibarr hành vi (ví dụ cho các tính năng liên quan đến đất nước của bạn). +SetupDescription4=Các thông số trong menu Setup -> module được yêu cầu bởi vì Dolibarr không phải là một hệ thống ERP / CRM cố định nhưng một số tiền của một số mô-đun, tất cả ít nhiều độc lập. Nó chỉ sau khi kích hoạt module bạn thú vị trong đó bạn sẽ thấy các tính năng xuất hiện trong menu. +SetupDescription5=Mục trình đơn khác quản lý các thông số tùy chọn. +EventsSetup=Thiết lập cho các sự kiện nhật ký +LogEvents=Sự kiện kiểm toán bảo mật +Audit=Kiểm toán InfoDolibarr=Infos Dolibarr -InfoBrowser=Infos Browser -InfoOS=Infos OS -InfoWebServer=Infos web server -InfoDatabase=Infos database +InfoBrowser=Infos trình duyệt +InfoOS=Infos hệ điều hành +InfoWebServer=Infos máy chủ web +InfoDatabase=Cơ sở dữ liệu Infos InfoPHP=Infos PHP -InfoPerf=Infos performances -BrowserName=Browser name -BrowserOS=Browser OS -ListEvents=Audit events -ListOfSecurityEvents=List of Dolibarr security events -SecurityEventsPurged=Security events purged -LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of data in database. -AreaForAdminOnly=Those features can be used by administrator users only. -SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only. -SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. -CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page) -DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here -AvailableModules=Available modules -ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). -SessionTimeOut=Time out for session -SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every %s/%s access, but only during access made by other sessions.
Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default session.gc_maxlifetime, no matter what the value entered here. -TriggersAvailable=Available triggers -TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). -TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. -TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. -TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. -TriggerActiveAsModuleActive=Triggers in this file are active as module %s is enabled. -GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password -DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. -ConstDesc=This page allows you to edit all other parameters not available in previous pages. They are reserved parameters for advanced developers or for troubleshouting. -OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu. -MiscellaneousDesc=Define here all other parameters related to security. -LimitsSetup=Limits/Precision setup -LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here -MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices -MAIN_MAX_DECIMALS_TOT=Max decimals for total prices -MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add ... after this number if you want to see ... when number is truncated when shown on screen) -MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files. -MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10) -UnitPriceOfProduct=Net unit price of a product -TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding -ParameterActiveForNextInputOnly=Parameter effective for next input only -NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page. -NoEventFoundWithCriteria=No security event has been found for such search criterias. -SeeLocalSendMailSetup=See your local sendmail setup -BackupDesc=To make a complete backup of Dolibarr, you must: -BackupDesc2=* Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). -BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant. -BackupDescX=Archived directory should be stored in a secure place. -BackupDescY=The generated dump file should be stored in a secure place. -BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one -RestoreDesc=To restore a Dolibarr backup, you must: -RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). -RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. -RestoreMySQL=MySQL import -ForcedToByAModule= This rule is forced to %s by an activated module -PreviousDumpFiles=Available database backup dump files -WeekStartOnDay=First day of week -RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s) -YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password. -YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP -DownloadMoreSkins=More skins to download -SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset -ShowProfIdInAddress=Show professionnal id with addresses on documents -ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents -TranslationUncomplete=Partial translation -SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. -MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled) -MAIN_DISABLE_METEO=Disable meteo view -TestLoginToAPI=Test login to API -ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. -ExternalAccess=External access -MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet) -MAIN_PROXY_HOST=Name/Address of proxy server -MAIN_PROXY_PORT=Port of proxy server -MAIN_PROXY_USER=Login to use the proxy server -MAIN_PROXY_PASS=Password to use the proxy server -DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. -ExtraFields=Complementary attributes -ExtraFieldsLines=Complementary attributes (lines) -ExtraFieldsThirdParties=Complementary attributes (thirdparty) -ExtraFieldsContacts=Complementary attributes (contact/address) -ExtraFieldsMember=Complementary attributes (member) -ExtraFieldsMemberType=Complementary attributes (member type) -ExtraFieldsCustomerOrders=Complementary attributes (orders) -ExtraFieldsCustomerInvoices=Complementary attributes (invoices) -ExtraFieldsSupplierOrders=Complementary attributes (orders) -ExtraFieldsSupplierInvoices=Complementary attributes (invoices) -ExtraFieldsProject=Complementary attributes (projects) -ExtraFieldsProjectTask=Complementary attributes (tasks) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. -AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space -AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space -SendingMailSetup=Setup of sendings by email -SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba). -PathToDocuments=Path to documents -PathDirectory=Directory -SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by thoose bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommanded) is to use the method "SMTP socket library" that has no disadvantages. -TranslationSetup=Configuration de la traduction -TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen). -TotalNumberOfActivatedModules=Total number of activated feature modules: %s -YouMustEnableOneModule=You must at least enable 1 module -ClassNotFoundIntoPathWarning=Class %s not found into PHP path -YesInSummer=Yes in summer -OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): -SuhosinSessionEncrypt=Session storage encrypted by Suhosin -ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible -YouUseBestDriver=You use driver %s that is best driver available currently. -YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. -NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. -SearchOptim=Search optimization -YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. -BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. -BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. -XDebugInstalled=XDebug is loaded. -XCacheInstalled=XCache is loaded. -AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink -FieldEdition=Edition of field %s -FixTZ=TimeZone fix -FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) -GetBarCode=Get barcode -EmptyNumRefModelDesc=The code is free. This code can be modified at any time. +InfoPerf=Infos biểu diễn +BrowserName=Tên trình duyệt +BrowserOS=Trình duyệt hệ điều hành +ListEvents=Sự kiện kiểm toán +ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr +SecurityEventsPurged=Sự kiện bảo mật thanh lọc +LogEventDesc=Bạn có thể kích hoạt ở đây khai thác gỗ cho các sự kiện an ninh Dolibarr. Sau đó các quản trị viên có thể xem nội dung của nó thông qua các công cụ hệ thống menu - Kiểm toán. Cảnh báo, tính năng này có thể tiêu thụ một lượng lớn dữ liệu trong cơ sở dữ liệu. +AreaForAdminOnly=Những tính năng này có thể được sử dụng bởi những người dùng quản trị. +SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và nhìn thấy chỉ quản trị viên. +SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số các điều khoản Dolibarr có thể làm giảm giới hạn này. +CompanyFundationDesc=Chỉnh sửa trên trang này được biết tất cả thông tin của công ty hoặc nền tảng bạn cần quản lý (Đối với điều này, nhấn vào nút "Sửa đổi" ở dưới cùng của trang) +DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr nhìn và cảm thấy ở đây +AvailableModules=Các mô-đun có sẵn +ToActivateModule=Để kích hoạt mô-đun, đi vào thiết lập trong khu vực (chủ-> Setup-> Modules). +SessionTimeOut=Thời gian cho phiên +SessionExplanation=Bảo lãnh này con số đó sẽ không bao giờ hết hạn phiên trước sự chậm trễ này, nếu phiên sạch được thực hiện bằng nội PHP phiên sạch hơn (và không có gì khác). Nội phiên PHP sạch hơn không làm bảo lãnh rằng phiên sẽ hết hiệu lực ngay sau khi sự chậm trễ này. Nó sẽ hết hạn, sau khi sự chậm trễ này, và khi phiên sạch hơn là chạy, vì vậy mỗi% s /% s truy cập, nhưng chỉ trong thời gian truy cập được thực hiện bởi các phần khác.
Lưu ý: trên một số máy chủ với một cơ chế phiên làm sạch bên ngoài (cron dưới Debian, Ubuntu ...), các phiên giao dịch có thể bị phá hủy sau một thời gian được xác định bởi session.gc_maxlifetime mặc định, không có vấn đề gì giá trị nhập ở đây. +TriggersAvailable=Kích hoạt sẵn +TriggersDesc=Gây nên là các tập tin mà sẽ thay đổi hành vi của Dolibarr quy trình làm việc một lần sao chép vào thư mục htdocs / core / gây nên. Họ nhận ra những hành động mới, kích hoạt các sự kiện Dolibarr (công ty mới thành lập, xác nhận hóa đơn, ...). +TriggerDisabledByName=Gây ra trong tập tin này đang bị vô hiệu hóa bởi các hậu tố -NORUN trong tên của họ. +TriggerDisabledAsModuleDisabled=Gây ra trong tập tin này bị vô hiệu hóa như mô-đun% s bị vô hiệu hóa. +TriggerAlwaysActive=Gây ra trong tập tin này luôn hoạt động, nào là các mô-đun Dolibarr kích hoạt. +TriggerActiveAsModuleActive=Triggers trong tập tin này đang hoạt động như mô-đun% s được kích hoạt. +GeneratedPasswordDesc=Xác định đây mà cai trị mà bạn muốn sử dụng để tạo mật khẩu mới nếu bạn hỏi có tự động tạo ra mật khẩu +DictionaryDesc=Xác định đây tất cả dữ liệu ngay tài liệu tham khảo. Bạn có thể hoàn thành được xác định trước giá trị với bạn. +ConstDesc=Trang này cho phép bạn chỉnh sửa tất cả các thông số khác không có sẵn trong các trang trước đó. Họ được dành riêng cho các nhà phát triển các thông số cao cấp hoặc cho troubleshouting. +OnceSetupFinishedCreateUsers=Cảnh báo, bạn là một người dùng quản trị Dolibarr. Người sử dụng quản trị viên được sử dụng để thiết lập Dolibarr. Đối với một cách sử dụng thông thường của Dolibarr, nó được khuyến khích sử dụng một người dùng không quản trị được tạo ra từ người sử dụng và đơn Groups. +MiscellaneousDesc=Xác định đây tất cả các thông số khác liên quan đến an ninh. +LimitsSetup=Giới hạn / thiết lập chính xác +LimitsDesc=Bạn có thể xác định giới hạn, độ chính xác và tối ưu hoá được sử dụng bởi Dolibarr đây +MAIN_MAX_DECIMALS_UNIT=Max số thập phân cho đơn giá +MAIN_MAX_DECIMALS_TOT=Max số thập phân cho tổng giá +MAIN_MAX_DECIMALS_SHOWN=Max số thập phân cho giá được hiển thị trên màn hình (Add ... sau khi con số này nếu bạn muốn xem ... khi số là cắt ngắn khi hiển thị trên màn hình) +MAIN_DISABLE_PDF_COMPRESSION=Sử dụng PDF nén các file PDF được tạo ra. +MAIN_ROUNDING_RULE_TOT= Kích thước của phạm vi làm tròn (đối với các quốc gia hiếm hoi mà làm tròn được thực hiện trên một cái gì đó khác hơn so với cơ số 10) +UnitPriceOfProduct=Đơn giá ròng của một sản phẩm +TotalPriceAfterRounding=Tổng giá (net / thùng / bao gồm thuế) sau khi làm tròn +ParameterActiveForNextInputOnly=Thông số hiệu quả cho đầu vào tiếp theo chỉ +NoEventOrNoAuditSetup=Không có sự kiện an ninh đã được ghi lại được nêu ra. Đây có thể là bình thường nếu kiểm toán đã không được kích hoạt trên "thiết lập - an ninh - kiểm toán" trang. +NoEventFoundWithCriteria=Không có sự kiện bảo mật đã được tìm thấy cho các tiêu chí tìm kiếm như vậy. +SeeLocalSendMailSetup=Xem thiết lập sendmail địa phương của bạn +BackupDesc=Để thực hiện một sao lưu đầy đủ Dolibarr, bạn phải: +BackupDesc2=* Lưu nội dung của tài liệu thư mục (% s) có chứa tất cả các tập tin tải lên và tạo ra (bạn có thể làm cho một zip ví dụ). +BackupDesc3=* Lưu nội dung của cơ sở dữ liệu của bạn vào một tập tin dump. Đối với điều này, bạn có thể sử dụng trợ lý sau. +BackupDescX=Thư mục lưu trữ nên được lưu trữ ở một nơi an toàn. +BackupDescY=Tạo ra các tập tin dump nên được lưu trữ ở một nơi an toàn. +BackupPHPWarning=Sao lưu không thể được guaranted với phương pháp này. Thích trước đó +RestoreDesc=Để khôi phục lại một bản sao lưu Dolibarr, bạn phải: +RestoreDesc2=* Khôi phục tập tin lưu trữ (file zip ví dụ) các tài liệu thư mục để trích xuất các tập tin trong cây thư mục tài liệu của một cài đặt Dolibarr mới hoặc vào văn bản hiện hành này directoy (% s). +RestoreDesc3=* Khôi phục dữ liệu từ một tập tin dump sao lưu, vào cơ sở dữ liệu cài đặt Dolibarr mới hoặc vào cơ sở dữ liệu cài đặt hiện tại này. Cảnh báo, một khi khôi phục xong, bạn phải sử dụng một tên đăng nhập / mật khẩu, đã tồn tại khi sao lưu đã được thực hiện, để kết nối lại. Để khôi phục lại cơ sở dữ liệu sao lưu vào cài đặt hiện tại, bạn có thể làm theo trợ lý này. +RestoreMySQL=MySQL nhập khẩu +ForcedToByAModule= Quy luật này buộc phải% s bởi một mô-đun kích hoạt +PreviousDumpFiles=Sao lưu cơ sở dữ liệu tập tin dump có sẵn +WeekStartOnDay=Ngày đầu tiên của tuần +RunningUpdateProcessMayBeRequired=Chạy quá trình nâng cấp dường như được yêu cầu (Chương trình phiên bản% s khác với phiên bản cơ sở dữ liệu% s) +YouMustRunCommandFromCommandLineAfterLoginToUser=Bạn phải chạy lệnh này từ dòng lệnh sau khi đăng nhập vào một vỏ với người sử dụng% s hoặc bạn phải thêm tùy chọn -W ở cuối dòng lệnh để cung cấp% s mật khẩu. +YourPHPDoesNotHaveSSLSupport=Chức năng SSL không có sẵn trong chương trình PHP +DownloadMoreSkins=Nhiều giao diện để tải về +SimpleNumRefModelDesc=Trả về số tài liệu tham khảo với các định dạng% syymm-nnnn nơi yyyy là năm, mm là tháng và NNNN là một chuỗi không có lỗ và không có thiết lập lại +ShowProfIdInAddress=Hiển thị id professionnal với các địa chỉ trên các tài liệu +ShowVATIntaInAddress=Ẩn VAT nội num với các địa chỉ trên các tài liệu +TranslationUncomplete=Một phần dịch +SomeTranslationAreUncomplete=Một số ngôn ngữ có thể được dịch một phần hoặc tháng năm có lỗi. Nếu bạn phát hiện một số, bạn có thể sửa chữa các file ngôn ngữ đăng ký http://transifex.com/projects/p/dolibarr/ . +MenuUseLayout=Hãy hidable menu dọc (tùy chọn javascript không được vô hiệu hóa) +MAIN_DISABLE_METEO=Xem khí tượng vô hiệu hóa +TestLoginToAPI=Kiểm tra đăng nhập vào API +ProxyDesc=Một số tính năng của Dolibarr cần phải có một kết nối Internet để làm việc. Xác định các thông số ở đây cho việc này. Nếu máy chủ Dolibarr là phía sau một máy chủ proxy, các tham số cho Dolibarr làm thế nào để truy cập Internet thông qua nó. +ExternalAccess=Truy cập bên ngoài +MAIN_PROXY_USE=Sử dụng một máy chủ proxy (truy cập nếu không trực tiếp đến internet) +MAIN_PROXY_HOST=Tên / Địa chỉ của máy chủ proxy +MAIN_PROXY_PORT=Cổng của máy chủ proxy +MAIN_PROXY_USER=Đăng nhập để sử dụng máy chủ proxy +MAIN_PROXY_PASS=Mật khẩu để sử dụng máy chủ proxy +DefineHereComplementaryAttributes=Xác định đây tất cả các thuộc tính, không phải đã có sẵn theo mặc định, và bạn muốn được hỗ trợ cho% s. +ExtraFields=Thuộc tính bổ sung +ExtraFieldsLines=Thuộc tính bổ sung (dòng) +ExtraFieldsThirdParties=Thuộc tính bổ sung (của bên thứ ba) +ExtraFieldsContacts=Thuộc tính bổ sung (liên lạc / địa chỉ) +ExtraFieldsMember=Thuộc tính bổ sung (thành viên) +ExtraFieldsMemberType=Thuộc tính bổ sung (loại thành viên) +ExtraFieldsCustomerOrders=Thuộc tính bổ sung (đơn đặt hàng) +ExtraFieldsCustomerInvoices=Thuộc tính bổ sung (hoá đơn) +ExtraFieldsSupplierOrders=Thuộc tính bổ sung (đơn đặt hàng) +ExtraFieldsSupplierInvoices=Thuộc tính bổ sung (hoá đơn) +ExtraFieldsProject=Thuộc tính bổ sung (dự án) +ExtraFieldsProjectTask=Thuộc tính bổ sung (nhiệm vụ) +ExtraFieldHasWrongValue=Thuộc tính% s có giá trị sai. +AlphaNumOnlyCharsAndNoSpace=chỉ alphanumericals ký tự không có không gian +AlphaNumOnlyLowerCharsAndNoSpace=chỉ alphanumericals và ký tự chữ thường không có không gian +SendingMailSetup=Thiết lập sendings qua email +SendmailOptionNotComplete=Cảnh báo, trên một số hệ thống Linux, để gửi email từ email của bạn, thiết lập sendmail thực hiện phải có lựa chọn -ba (mail.force_extra_parameters tham số vào file php.ini của bạn). Nếu một số người nhận không bao giờ nhận được email, hãy thử để chỉnh sửa thông số này PHP với mail.force_extra_parameters = -ba). +PathToDocuments=Đường dẫn đến tài liệu +PathDirectory=Thư mục +SendmailOptionMayHurtBuggedMTA=Tính năng gửi mail sử dụng phương pháp "PHP thư trực tiếp" sẽ tạo ra một tin nhắn qua thư có thể được phân tích cú pháp không chính xác bởi một số máy chủ email nhận được. Kết quả là một số mail không thể được đọc bởi những người tổ chức bởi thoose nền tảng nghe trộm. Đó là trường hợp đối với một số nhà cung cấp Internet (Ví dụ: Orange tại Pháp). Đây không phải là một vấn đề vào Dolibarr cũng không vào PHP nhưng nhận được vào máy chủ mail. Tuy nhiên bạn có thể thêm tùy chọn MAIN_FIX_FOR_BUGGED_MTA tới 1 vào thiết lập - khác để sửa đổi Dolibarr để tránh điều này. Tuy nhiên, bạn có thể gặp vấn đề với các máy chủ khác mà triệt để tôn trọng các tiêu chuẩn SMTP. Các giải pháp khác (recommanded) là sử dụng phương pháp "ổ cắm SMTP thư viện" mà không có nhược điểm. +TranslationSetup=Cấu hình de la Traduction +TranslationDesc=Lựa chọn ngôn ngữ hiển thị trên màn hình có thể được chỉnh sửa:
* Trên toàn cầu từ menu Home - Cài đặt - Hiển thị
* Đối với người dùng chỉ từ tab hiển thị tài khoản của người sử dụng thẻ (click vào đăng nhập trên đầu trang của màn hình). +TotalNumberOfActivatedModules=Tổng số các module tính năng kích hoạt:% s +YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép +ClassNotFoundIntoPathWarning=Lớp% s không tìm thấy con đường vào PHP +YesInSummer=Có trong mùa hè +OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, các mô-đun chỉ sau đây được mở cho người dùng bên ngoài (bất cứ điều gì là sự cho phép của người dùng như vậy): +SuhosinSessionEncrypt=Lưu trữ phiên mã hóa bằng Suhosin +ConditionIsCurrently=Điều kiện hiện nay là% s +TestNotPossibleWithCurrentBrowsers=Tự động phát hiện không thể +YouUseBestDriver=Bạn sử dụng trình điều khiển% s đó là điều khiển tốt nhất có sẵn hiện nay. +YouDoNotUseBestDriver=Bạn sử dụng ổ đĩa% s% s, nhưng lái xe được khuyến khích. +NbOfProductIsLowerThanNoPb=Bạn chỉ có% s sản phẩm / dịch vụ vào cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa đặc biệt. +SearchOptim=Tối ưu hóa tìm kiếm +YouHaveXProductUseSearchOptim=Bạn có sản phẩm% s vào cơ sở dữ liệu. Bạn nên thêm PRODUCT_DONOTSEARCH_ANYWHERE liên tục tới 1 vào Home-Setup khác, bạn giới hạn tìm kiếm với đầu dây làm cho cơ sở dữ liệu có thể sử dụng chỉ số và bạn sẽ nhận được một phản ứng ngay lập tức. +BrowserIsOK=Bạn đang sử dụng trình duyệt web% s. Trình duyệt này là ok cho bảo mật và hiệu suất. +BrowserIsKO=Bạn đang sử dụng trình duyệt web% s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay Safari. +XDebugInstalled=XDebug được tải. +XCacheInstalled=XCache được tải. +AddRefInList=Hiển thị khách hàng / nhà cung cấp ref vào danh sách (chọn danh sách hoặc combobox) và hầu hết các siêu liên kết +FieldEdition=Edition của trường% s +FixTZ=Sửa chữa TimeZone +FillThisOnlyIfRequired=Ví dụ: 2 (chỉ điền nếu múi giờ bù đắp vấn đề có nhiều kinh nghiệm) +GetBarCode=Nhận mã vạch +EmptyNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào. ##### Module password generation -PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. -PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. +PasswordGenerationStandard=Quay trở lại một mật khẩu được tạo ra theo thuật toán Dolibarr nội bộ: 8 ký tự có chứa số chia sẻ và ký tự trong chữ thường. +PasswordGenerationNone=Không đề nghị bất kỳ mật khẩu được tạo ra. Mật khẩu phải được gõ bằng tay. ##### Users setup ##### -UserGroupSetup=Users and groups module setup -GeneratePassword=Suggest a generated password -RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords -DoNotSuggest=Do not suggest any password -EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database -DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page -UsersSetup=Users module setup -UserMailRequired=EMail required to create a new user +UserGroupSetup=Người sử dụng và nhóm thiết lập mô-đun +GeneratePassword=Đề nghị một mật khẩu được tạo ra +RuleForGeneratedPasswords=Quy tắc để tạo mật khẩu đề nghị hoặc xác nhận mật khẩu +DoNotSuggest=Không đề nghị bất kỳ mật khẩu +EncryptedPasswordInDatabase=Để cho phép mã hóa các mật khẩu trong cơ sở dữ liệu +DisableForgetPasswordLinkOnLogonPage=Không hiển thị liên kết "Quên mật khẩu" trên trang đăng nhập +UsersSetup=Thiết lập người sử dụng mô-đun +UserMailRequired=Email cần thiết để tạo một người dùng mới ##### Company setup ##### -CompanySetup=Companies module setup -CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier) -AccountCodeManager=Module for accountancy code generation (customer or supplier) -ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by third party supplier code for a supplier accountancy code,
%s followed by third party customer code for a customer accountancy code. -ModuleCompanyCodePanicum=Return an empty accountancy code. -ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. -UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. -ModelModules=Documents templates -DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) -WatermarkOnDraft=Watermark on draft document -JSOnPaimentBill=Activate feature to autofill payment lines on payment form -CompanyIdProfChecker=Rules on Professional Ids -MustBeUnique=Must be unique ? -MustBeMandatory=Mandatory to create third parties ? -MustBeInvoiceMandatory=Mandatory to validate invoices ? -Miscellaneous=Miscellaneous +CompanySetup=Thiết lập các công ty mô-đun +CompanyCodeChecker=Module cho thế hệ thứ ba bên mã và kiểm tra (khách hàng hoặc nhà cung cấp) +AccountCodeManager=Module cho hệ mã kế toán (khách hàng hoặc nhà cung cấp) +ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được xây dựng bởi:
% S tiếp theo là mã nhà cung cấp bên thứ ba cho một mã nhà cung cấp kế toán,
% S tiếp theo là mã khách hàng của bên thứ ba cho một mã số kế toán của khách hàng. +ModuleCompanyCodePanicum=Trả lại một mã kế toán sản phẩm nào. +ModuleCompanyCodeDigitaria=Kế toán đang phụ thuộc vào mã của bên thứ ba. Các mã được bao gồm các ký tự "C" ở vị trí đầu tiên theo sau là 5 ký tự đầu tiên của mã của bên thứ ba. +UseNotifications=Sử dụng thông báo +NotificationsDesc=Email thông báo tính năng cho phép bạn để âm thầm gửi thư tự động, đối với một số sự kiện Dolibarr, cho bên thứ ba (khách hàng hoặc nhà cung cấp) được cấu hình để. Lựa chọn các địa chỉ liên lạc thông báo và mục tiêu hoạt động được thực hiện một bên thứ ba lúc. +ModelModules=Tài liệu mẫu +DocumentModelOdt=Tạo tài liệu từ OpenDocuments mẫu (.odt hoặc .ods tập tin cho OpenOffice, KOffice, TextEdit, ...) +WatermarkOnDraft=Watermark vào dự thảo văn bản +JSOnPaimentBill=Kích hoạt tính năng tự động điền vào các dòng tiền vào hình thức thanh toán +CompanyIdProfChecker=Các quy định về chuyên môn Id +MustBeUnique=Phải là duy nhất? +MustBeMandatory=Bắt buộc để tạo ra các bên thứ ba? +MustBeInvoiceMandatory=Bắt buộc để xác nhận hóa đơn? +Miscellaneous=Linh tinh ##### Webcal setup ##### -WebCalSetup=Webcalendar link setup -WebCalSyncro=Add Dolibarr events to WebCalendar -WebCalAllways=Always, no asking -WebCalYesByDefault=On demand (yes by default) -WebCalNoByDefault=On demand (no by default) -WebCalNever=Never -WebCalURL=URL for calendar access -WebCalServer=Server hosting calendar database -WebCalDatabaseName=Database name -WebCalUser=User to access database -WebCalSetupSaved=Webcalendar setup saved successfully. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. -WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. -WebCalTestKo2=Connection to server '%s' with user '%s' failed. -WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database. -WebCalAddEventOnCreateActions=Add calendar event on actions create -WebCalAddEventOnCreateCompany=Add calendar event on companies create -WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change -WebCalAddEventOnStatusContract=Add calendar event on contracts status change -WebCalAddEventOnStatusBill=Add calendar event on bills status change -WebCalAddEventOnStatusMember=Add calendar event on members status change -WebCalUrlForVCalExport=An export link to %s format is available at following link: %s -WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. +WebCalSetup=Thiết lập liên kết Webcalendar +WebCalSyncro=Thêm sự kiện Dolibarr để WebCalendar +WebCalAllways=Luôn luôn, không chào bán +WebCalYesByDefault=Theo yêu cầu (có mặc định) +WebCalNoByDefault=Theo yêu cầu (không theo mặc định) +WebCalNever=Không bao giờ +WebCalURL=URL để truy cập lịch +WebCalServer=Máy chủ cơ sở dữ liệu lưu trữ lịch +WebCalDatabaseName=Tên cơ sở dữ liệu +WebCalUser=Người sử dụng cơ sở dữ liệu truy cập +WebCalSetupSaved=Thiết lập Webcalendar lưu thành công. +WebCalTestOk=Kết nối với máy chủ '% s' vào cơ sở dữ liệu '% s' với người sử dụng '% s' thành công. +WebCalTestKo1=Kết nối với máy chủ '% s' thành công nhưng cơ sở dữ liệu '% s' không thể đạt được. +WebCalTestKo2=Kết nối với máy chủ '% s' với người dùng% s 'thất bại. +WebCalErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu Webcalendar. +WebCalAddEventOnCreateActions=Thêm sự kiện lịch về các hoạt động tạo ra +WebCalAddEventOnCreateCompany=Thêm sự kiện lịch trên các công ty tạo ra +WebCalAddEventOnStatusPropal=Thêm sự kiện lịch trên đề xuất thương mại thay đổi trạng thái +WebCalAddEventOnStatusContract=Thêm sự kiện lịch trên hợp đồng thay đổi trạng thái +WebCalAddEventOnStatusBill=Thêm sự kiện lịch trên hóa đơn thay đổi trạng thái +WebCalAddEventOnStatusMember=Thêm sự kiện lịch trên các thành viên thay đổi trạng thái +WebCalUrlForVCalExport=Một liên kết xuất khẩu sang định dạng% s có sẵn tại liên kết sau đây:% s +WebCalCheckWebcalSetup=Có thể thiết lập mô-đun Webcal là không đúng. ##### Invoices ##### -BillsSetup=Invoices module setup -BillsDate=Invoices date -BillsNumberingModule=Invoices and credit notes numbering model -BillsPDFModules=Invoice documents models -CreditNoteSetup=Credit note module setup -CreditNotePDFModules=Credit note document models -CreditNote=Credit note -CreditNotes=Credit notes -ForceInvoiceDate=Force invoice date to validation date -DisableRepeatable=Disable repeatable invoices -SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice -EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment -SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account -SuggestPaymentByChequeToAddress=Suggest payment by cheque to -FreeLegalTextOnInvoices=Free text on invoices -WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) +BillsSetup=Thiết lập mô-đun hóa đơn +BillsDate=Ngày hóa đơn +BillsNumberingModule=Hoá đơn, ghi chú tín dụng đánh số mô hình +BillsPDFModules=Tài liệu mô hình hóa đơn +CreditNoteSetup=Thiết lập mô-đun lưu ý tín dụng +CreditNotePDFModules=Mô hình tín dụng tài liệu lưu ý +CreditNote=Lưu ý tín dụng +CreditNotes=Ghi chú tín dụng +ForceInvoiceDate=Lực lượng ngày hóa đơn cho đến nay xác nhận +DisableRepeatable=Vô hiệu hoá đơn lặp lại +SuggestedPaymentModesIfNotDefinedInInvoice=Đề nghị chế độ thanh toán trên hoá đơn theo mặc định nếu không được xác định cho hóa đơn +EnableEditDeleteValidInvoice=Kích hoạt tính năng khả năng để chỉnh sửa / xóa hóa đơn hợp lệ không có thanh toán +SuggestPaymentByRIBOnAccount=Đề nghị thanh toán bằng thu hồi vào tài khoản +SuggestPaymentByChequeToAddress=Đề nghị thanh toán bằng séc để +FreeLegalTextOnInvoices=Miễn phí văn bản trên hoá đơn +WatermarkOnDraftInvoices=Watermark về dự thảo hoá đơn (nếu không có sản phẩm nào) ##### Proposals ##### -PropalSetup=Commercial proposals module setup -CreateForm=Create forms -NumberOfProductLines=Number of product lines -ProposalsNumberingModules=Commercial proposal numbering models -ProposalsPDFModules=Commercial proposal documents models -ClassifiedInvoiced=Classified invoiced -HideTreadedPropal=Hide the treated commercial proposals in the list -AddShippingDateAbility=Add shipping date ability -AddDeliveryAddressAbility=Add delivery date ability -UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option -FreeLegalTextOnProposal=Free text on commercial proposals -WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +PropalSetup=Đề xuất thương mại thiết lập mô-đun +CreateForm=Tạo các biểu mẫu +NumberOfProductLines=Số dòng sản phẩm +ProposalsNumberingModules=Mô hình đánh số đề nghị thương mại +ProposalsPDFModules=Văn bản đề nghị thương mại mô hình +ClassifiedInvoiced=Phân loại hóa đơn +HideTreadedPropal=Ẩn đề xuất thương mại được điều trị trong danh sách +AddShippingDateAbility=Thêm khả năng vận chuyển ngày +AddDeliveryAddressAbility=Thêm khả năng ngày giao hàng +UseOptionLineIfNoQuantity=Một dòng sản phẩm / dịch vụ với một số lượng không được coi là một lựa chọn +FreeLegalTextOnProposal=Miễn phí văn bản trên đề xuất thương mại +WatermarkOnDraftProposal=Watermark về dự thảo đề xuất thương mại (nếu không có sản phẩm nào) ##### Orders ##### -OrdersSetup=Order management setup -OrdersNumberingModules=Orders numbering models -OrdersModelModule=Order documents models -HideTreadedOrders=Hide the treated or cancelled orders in the list -ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order -FreeLegalTextOnOrders=Free text on orders -WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +OrdersSetup=Thiết lập trật tự quản lý +OrdersNumberingModules=Đơn đặt hàng đánh số mô hình +OrdersModelModule=Tài liệu để mô hình +HideTreadedOrders=Ẩn các đơn đặt hàng được xử lý hoặc hủy bỏ trong danh sách +ValidOrderAfterPropalClosed=Để xác nhận đơn đặt hàng sau khi đề xuất gần hơn, làm cho nó có thể không bước theo lệnh tạm thời +FreeLegalTextOnOrders=Miễn phí văn bản trên đơn đặt hàng +WatermarkOnDraftOrders=Watermark về dự thảo đơn đặt hàng (nếu không có sản phẩm nào) ##### Clicktodial ##### -ClickToDialSetup=Click To Dial module setup -ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
__PHONETO__ that will be replaced with the phone number of person to call
__PHONEFROM__ that will be replaced with phone number of calling person (yours)
__LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
__PASS__ that will be replaced with your clicktodial password (defined on your user card). +ClickToDialSetup=Nhấn vào đây để quay số thiết lập mô-đun +ClickToDialUrlDesc=Url gọi khi một nhấp chuột trên điện thoại Picto được thực hiện. Trong URL, bạn có thể sử dụng các thẻ
__PHONETO__ Sẽ được thay thế bằng số điện thoại của người gọi
__PHONEFROM__ Sẽ được thay thế bằng số điện thoại của người gọi (của bạn)
__LOGIN__ Sẽ được thay thế bằng đăng nhập clicktodial của bạn (xác định trên thẻ người dùng của bạn)
__PASS__ Sẽ được thay thế bằng mật khẩu clicktodial của bạn (xác định trên thẻ người dùng của bạn). ##### Bookmark4u ##### -Bookmark4uSetup=Bookmark4u module setup +Bookmark4uSetup=Thiết lập mô-đun Bookmark4u ##### Interventions ##### -InterventionsSetup=Interventions module setup -FreeLegalTextOnInterventions=Free text on intervention documents -FicheinterNumberingModules=Intervention numbering models -TemplatePDFInterventions=Intervention card documents models -WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) +InterventionsSetup=Thiết lập mô-đun can thiệp +FreeLegalTextOnInterventions=Miễn phí văn bản trên các tài liệu can thiệp +FicheinterNumberingModules=Mô hình can thiệp đánh số +TemplatePDFInterventions=Tài liệu mô hình can thiệp thẻ +WatermarkOnDraftInterventionCards=Watermark vào tài liệu thẻ can thiệp (nếu không có sản phẩm nào) ##### Contracts ##### -ContractsSetup=Contracts module setup -ContractsNumberingModules=Contracts numbering modules -TemplatePDFContracts=Contracts documents models -FreeLegalTextOnContracts=Free text on contracts -WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) +ContractsSetup=Thiết lập hợp đồng mô-đun +ContractsNumberingModules=Hợp đồng đánh số module +TemplatePDFContracts=Hợp đồng tài liệu mô hình +FreeLegalTextOnContracts=Miễn phí văn bản về hợp đồng +WatermarkOnDraftContractCards=Watermark vào dự thảo hợp đồng (nếu không có sản phẩm nào) ##### Members ##### -MembersSetup=Members module setup -MemberMainOptions=Main options -AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription -AdherentLoginRequired= Manage a Login for each member -AdherentMailRequired=EMail required to create a new member -MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default +MembersSetup=Thiết lập các thành viên mô-đun +MemberMainOptions=Lựa chọn chính +AddSubscriptionIntoAccount=Đề nghị theo mặc định để tạo ra một giao dịch ngân hàng, trong mô-đun ngân hàng, khi thêm một thuê bao payed mới +AdherentLoginRequired= Quản lý một Đăng nhập cho mỗi thành viên +AdherentMailRequired=Email cần thiết để tạo ra một thành viên mới +MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định ##### LDAP setup ##### -LDAPSetup=LDAP Setup -LDAPGlobalParameters=Global parameters -LDAPUsersSynchro=Users -LDAPGroupsSynchro=Groups -LDAPContactsSynchro=Contacts -LDAPMembersSynchro=Members -LDAPSynchronization=LDAP synchronisation -LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP -LDAPToDolibarr=LDAP -> Dolibarr +LDAPSetup=Thiết lập LDAP +LDAPGlobalParameters=Các thông số toàn cầu +LDAPUsersSynchro=Người sử dụng +LDAPGroupsSynchro=Nhóm +LDAPContactsSynchro=Liên hệ +LDAPMembersSynchro=Thành viên +LDAPSynchronization=Đồng bộ hóa LDAP +LDAPFunctionsNotAvailableOnPHP=LDAP chức năng không có sẵn trên PHP của bạn +LDAPToDolibarr=LDAP - Dolibarr> DolibarrToLDAP=Dolibarr -> LDAP -LDAPNamingAttribute=Key in LDAP -LDAPSynchronizeUsers=Organization of users in LDAP -LDAPSynchronizeGroups=Organization of groups in LDAP -LDAPSynchronizeContacts=Organization of contacts in LDAP -LDAPSynchronizeMembers=Organization of foundation's members in LDAP -LDAPTypeExample=OpenLdap, Egroupware or Active Directory -LDAPPrimaryServer=Primary server -LDAPSecondaryServer=Secondary server -LDAPServerPort=Server port -LDAPServerPortExample=Default port : 389 -LDAPServerProtocolVersion=Protocol version -LDAPServerUseTLS=Use TLS -LDAPServerUseTLSExample=Your LDAP server use TLS -LDAPServerDn=Server DN -LDAPAdminDn=Administrator DN -LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com) -LDAPPassword=Administrator password -LDAPUserDn=Users' DN -LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com) -LDAPGroupDn=Groups' DN -LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com) -LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) -LDAPServerDnExample=Complete DN (ex: dc=example,dc=com) -LDAPPasswordExample=Admin password -LDAPDnSynchroActive=Users and groups synchronization -LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization -LDAPDnContactActive=Contacts' synchronization -LDAPDnContactActiveYes=Activated synchronization -LDAPDnContactActiveExample=Activated/Unactivated synchronization -LDAPDnMemberActive=Members' synchronization -LDAPDnMemberActiveExample=Activated/Unactivated synchronization -LDAPContactDn=Dolibarr contacts' DN -LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com) -LDAPMemberDn=Dolibarr members DN -LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com) -LDAPMemberObjectClassList=List of objectClass -LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) -LDAPUserObjectClassList=List of objectClass -LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) -LDAPGroupObjectClassList=List of objectClass -LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames) -LDAPContactObjectClassList=List of objectClass -LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) -LDAPMemberTypeDn=Dolibarr members type DN -LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com) -LDAPTestConnect=Test LDAP connection -LDAPTestSynchroContact=Test contacts synchronization -LDAPTestSynchroUser=Test user synchronization -LDAPTestSynchroGroup=Test group synchronization -LDAPTestSynchroMember=Test member synchronization -LDAPTestSearch= Test a LDAP search -LDAPSynchroOK=Synchronization test successful -LDAPSynchroKO=Failed synchronization test -LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates -LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) -LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) -LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) -LDAPUnbindSuccessfull=Disconnect successful -LDAPUnbindFailed=Disconnect failed -LDAPConnectToDNSuccessfull=Connection to DN (%s) successful -LDAPConnectToDNFailed=Connection to DN (%s) failed -LDAPSetupForVersion3=LDAP server configured for version 3 -LDAPSetupForVersion2=LDAP server configured for version 2 -LDAPDolibarrMapping=Dolibarr Mapping -LDAPLdapMapping=LDAP Mapping -LDAPFieldLoginUnix=Login (unix) -LDAPFieldLoginExample=Example : uid -LDAPFilterConnection=Search filter -LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) -LDAPFieldLoginSamba=Login (samba, activedirectory) -LDAPFieldLoginSambaExample=Example : samaccountname -LDAPFieldFullname=Full name -LDAPFieldFullnameExample=Example : cn -LDAPFieldPassword=Password -LDAPFieldPasswordNotCrypted=Password not crypted -LDAPFieldPasswordCrypted=Password crypted -LDAPFieldPasswordExample=Example : userPassword -LDAPFieldCommonName=Common name -LDAPFieldCommonNameExample=Example : cn -LDAPFieldName=Name -LDAPFieldNameExample=Example : sn -LDAPFieldFirstName=First name -LDAPFieldFirstNameExample=Example : givenName -LDAPFieldMail=Email address -LDAPFieldMailExample=Example : mail -LDAPFieldPhone=Professional phone number -LDAPFieldPhoneExample=Example : telephonenumber -LDAPFieldHomePhone=Personal phone number -LDAPFieldHomePhoneExample=Example : homephone -LDAPFieldMobile=Cellular phone -LDAPFieldMobileExample=Example : mobile -LDAPFieldFax=Fax number -LDAPFieldFaxExample=Example : facsimiletelephonenumber -LDAPFieldAddress=Street -LDAPFieldAddressExample=Example : street +LDAPNamingAttribute=Quan trọng trong LDAP +LDAPSynchronizeUsers=Tổ chức của người sử dụng trong LDAP +LDAPSynchronizeGroups=Tổ chức của các nhóm trong LDAP +LDAPSynchronizeContacts=Tổ chức liên lạc trong LDAP +LDAPSynchronizeMembers=Tổ chức thành viên sáng lập trong LDAP +LDAPTypeExample=OpenLDAP, eGroupWare hoặc Active Directory +LDAPPrimaryServer=Máy chủ chính +LDAPSecondaryServer=Máy chủ thứ cấp +LDAPServerPort=Cổng máy chủ +LDAPServerPortExample=Cổng mặc định: 389 +LDAPServerProtocolVersion=Phiên bản giao thức +LDAPServerUseTLS=Sử dụng TLS +LDAPServerUseTLSExample=LDAP của bạn sử dụng máy chủ TLS +LDAPServerDn=Máy chủ DN +LDAPAdminDn=Quản trị DN +LDAPAdminDnExample=Toàn bộ DN (ví dụ: cn = admin, dc = Ví dụ, dc = com) +LDAPPassword=Mật khẩu quản trị +LDAPUserDn=DN của người sử dụng +LDAPUserDnExample=Toàn bộ DN (ví dụ: ou = người dùng, dc = Ví dụ, dc = com) +LDAPGroupDn=DN nhóm ' +LDAPGroupDnExample=Toàn bộ DN (ví dụ: ou = nhóm, dc = Ví dụ, dc = com) +LDAPServerExample=Địa chỉ máy chủ (ví dụ: localhost, 192.168.0.2, LDAPS: //ldap.example.com/) +LDAPServerDnExample=Toàn bộ DN (ví dụ: dc = Ví dụ, dc = com) +LDAPPasswordExample=Mật khẩu quản trị +LDAPDnSynchroActive=Người sử dụng và nhóm đồng bộ hóa +LDAPDnSynchroActiveExample=LDAP để Dolibarr hoặc Dolibarr để đồng bộ hóa LDAP +LDAPDnContactActive=Đồng bộ hóa địa chỉ liên lạc ' +LDAPDnContactActiveYes=Đồng bộ hóa kích hoạt +LDAPDnContactActiveExample=Kích hoạt / Unactivated đồng bộ hóa +LDAPDnMemberActive=Đồng bộ của các thành viên +LDAPDnMemberActiveExample=Kích hoạt / Unactivated đồng bộ hóa +LDAPContactDn=DN Dolibarr liên lạc ' +LDAPContactDnExample=Toàn bộ DN (ví dụ: ou = địa chỉ liên lạc, dc = Ví dụ, dc = com) +LDAPMemberDn=Thành viên Dolibarr DN +LDAPMemberDnExample=Toàn bộ DN (ví dụ: ou = thành viên, dc = Ví dụ, dc = com) +LDAPMemberObjectClassList=Danh sách objectClass +LDAPMemberObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục) +LDAPUserObjectClassList=Danh sách objectClass +LDAPUserObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục) +LDAPGroupObjectClassList=Danh sách objectClass +LDAPGroupObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, groupOfUniqueNames) +LDAPContactObjectClassList=Danh sách objectClass +LDAPContactObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục) +LDAPMemberTypeDn=Thành viên Dolibarr nhập DN +LDAPMemberTypeDnExample=Toàn bộ DN (ví dụ: ou = type_members, dc = Ví dụ, dc = com) +LDAPTestConnect=Kiểm tra kết nối LDAP +LDAPTestSynchroContact=Kiểm tra đồng bộ hóa địa chỉ liên lạc +LDAPTestSynchroUser=Đồng bộ hóa sử dụng thử nghiệm +LDAPTestSynchroGroup=Đồng bộ hóa nhóm thử nghiệm +LDAPTestSynchroMember=Đồng bộ thành viên kiểm tra +LDAPTestSearch= Kiểm tra một tìm kiếm LDAP +LDAPSynchroOK=Kiểm tra đồng bộ thành công +LDAPSynchroKO=Kiểm tra đồng bộ hóa thất bại +LDAPSynchroKOMayBePermissions=Kiểm tra đồng bộ hóa thất bại. Kiểm tra xem xui đến máy chủ được cấu hình đúng và cho phép udpates LDAP +LDAPTCPConnectOK=TCP kết nối với máy chủ LDAP thành công (Server =% s, Port =% s) +LDAPTCPConnectKO=TCP kết nối với máy chủ LDAP thất bại (Server =% s, Port =% s) +LDAPBindOK=Kết nối / Authentificate đến máy chủ LDAP thành công (Server =% s, Port =% s, Admin =% s, mật khẩu =% s) +LDAPBindKO=Kết nối / Authentificate đến máy chủ LDAP thất bại (Server =% s, Port =% s, Admin =% s, mật khẩu =% s) +LDAPUnbindSuccessfull=Ngắt kết nối thành công +LDAPUnbindFailed=Ngắt kết nối thất bại +LDAPConnectToDNSuccessfull=Kết nối với DN (% s) thành công +LDAPConnectToDNFailed=Kết nối với DN (% s) không thành công +LDAPSetupForVersion3=Máy chủ LDAP cấu hình cho phiên bản 3 +LDAPSetupForVersion2=Máy chủ LDAP cấu hình của phiên bản 2 +LDAPDolibarrMapping=Dolibarr bản đồ +LDAPLdapMapping=LDAP bản đồ +LDAPFieldLoginUnix=Đăng nhập (Unix) +LDAPFieldLoginExample=Ví dụ: uid +LDAPFilterConnection=Bộ lọc tìm kiếm +LDAPFilterConnectionExample=Ví dụ: & (objectClass = inetOrgPerson) +LDAPFieldLoginSamba=Đăng nhập (samba, ActiveDirectory) +LDAPFieldLoginSambaExample=Ví dụ: sAMAccountName +LDAPFieldFullname=Họ và tên +LDAPFieldFullnameExample=Ví dụ: cn +LDAPFieldPassword=Mật khẩu +LDAPFieldPasswordNotCrypted=Mật khẩu không crypted +LDAPFieldPasswordCrypted=Mật khẩu crypted +LDAPFieldPasswordExample=Ví dụ: userPassword +LDAPFieldCommonName=Tên thường gặp +LDAPFieldCommonNameExample=Ví dụ: cn +LDAPFieldName=Tên +LDAPFieldNameExample=Ví dụ: sn +LDAPFieldFirstName=Tên đầu tiên +LDAPFieldFirstNameExample=Ví dụ: givenName +LDAPFieldMail=Địa chỉ email +LDAPFieldMailExample=Ví dụ mail của bạn: +LDAPFieldPhone=Số điện thoại chuyên nghiệp +LDAPFieldPhoneExample=Ví dụ: telephonenumber +LDAPFieldHomePhone=Số điện thoại cá nhân +LDAPFieldHomePhoneExample=Ví dụ: HomePhone +LDAPFieldMobile=Điện thoại di động +LDAPFieldMobileExample=Ví dụ: điện thoại di động +LDAPFieldFax=Số fax +LDAPFieldFaxExample=Ví dụ: facsimiletelephonenumber +LDAPFieldAddress=Đường phố +LDAPFieldAddressExample=Ví dụ: đường phố LDAPFieldZip=Zip -LDAPFieldZipExample=Example : postalcode +LDAPFieldZipExample=Ví dụ: Mã Bưu chính LDAPFieldTown=Town -LDAPFieldTownExample=Example : l -LDAPFieldCountry=Country -LDAPFieldCountryExample=Example : c -LDAPFieldDescription=Description -LDAPFieldDescriptionExample=Example : description -LDAPFieldGroupMembers= Group members -LDAPFieldGroupMembersExample= Example : uniqueMember -LDAPFieldBirthdate=Birthdate -LDAPFieldBirthdateExample=Example : -LDAPFieldCompany=Company -LDAPFieldCompanyExample=Example : o +LDAPFieldTownExample=Ví dụ: l +LDAPFieldCountry=Đất nước +LDAPFieldCountryExample=Ví dụ: c +LDAPFieldDescription=Mô tả +LDAPFieldDescriptionExample=Ví dụ: Mô tả +LDAPFieldGroupMembers= Nhóm thành viên +LDAPFieldGroupMembersExample= Ví dụ: uniqueMember +LDAPFieldBirthdate=Ngày sinh +LDAPFieldBirthdateExample=Ví dụ: +LDAPFieldCompany=Công ty +LDAPFieldCompanyExample=Ví dụ: o LDAPFieldSid=SID -LDAPFieldSidExample=Example : objectsid -LDAPFieldEndLastSubscription=Date of subscription end -LDAPFieldTitle=Post/Function -LDAPFieldTitleExample=Example: title -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) -LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) -LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode. -LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts. -LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users. -LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups. -LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module. -LDAPDescValues=Example values are designed for OpenLDAP with following loaded schemas: core.schema, cosine.schema, inetorgperson.schema). If you use thoose values and OpenLDAP, modify your LDAP config file slapd.conf to have all thoose schemas loaded. -ForANonAnonymousAccess=For an authenticated access (for a write access for example) -PerfDolibarr=Performance setup/optimizing report -YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. -NotInstalled=Not installed, so your server is not slow down by this. -ApplicativeCache=Applicative cache -MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. -MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. -MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. -OPCodeCache=OPCode cache -NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). -HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) -FilesOfTypeCached=Files of type %s are cached by HTTP server -FilesOfTypeNotCached=Files of type %s are not cached by HTTP server -FilesOfTypeCompressed=Files of type %s are compressed by HTTP server -FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server -CacheByServer=Cache by server -CacheByClient=Cache by browser -CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +LDAPFieldSidExample=Ví dụ: objectsid +LDAPFieldEndLastSubscription=Ngày đăng ký cuối cùng +LDAPFieldTitle=Bài / Chức năng +LDAPFieldTitleExample=Ví dụ: tiêu đề +LDAPParametersAreStillHardCoded=Thông số LDAP vẫn được mã hóa (trong lớp liên lạc) +LDAPSetupNotComplete=Thiết lập LDAP không hoàn thành (đi trên các tab khác) +LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Không có người quản trị hoặc mật khẩu được cung cấp. Truy cập LDAP sẽ được ẩn danh và ở chế độ chỉ đọc. +LDAPDescContact=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên địa chỉ liên lạc Dolibarr. +LDAPDescUsers=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên người sử dụng Dolibarr. +LDAPDescGroups=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên các nhóm Dolibarr. +LDAPDescMembers=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên các thành viên Dolibarr mô-đun. +LDAPDescValues=Ví dụ giá trị được thiết kế cho OpenLDAP với các lược đồ sau đây nạp: core.schema, cosine.schema, inetorgperson.schema). Nếu bạn sử dụng thoose giá trị và OpenLDAP, LDAP sửa đổi tập tin cấu hình slapd.conf của bạn có tất cả các lược đồ thoose nạp. +ForANonAnonymousAccess=Đối với một truy cập xác thực (đối với quyền truy cập ghi ví dụ) +PerfDolibarr=Thiết lập hiệu suất / tối ưu hóa báo cáo +YouMayFindPerfAdviceHere=Bạn sẽ tìm thấy trên trang này một số kiểm tra và tư vấn liên quan đến hiệu suất. +NotInstalled=Không cài đặt, do máy chủ của bạn không làm chậm của thành viên này. +ApplicativeCache=Bộ nhớ cache applicative +MemcachedNotAvailable=Không có bộ nhớ cache applicative được tìm thấy. Bạn có thể nâng cao hiệu suất bằng cách cài đặt một máy chủ memcached bộ nhớ cache và một mô-đun có thể sử dụng máy chủ cache này.
Thêm thông tin ở đây http://wiki.dolibarr.org/index.php/Module_MemCached_EN .
Lưu ý rằng rất nhiều nhà cung cấp máy chủ web không cung cấp máy chủ cache như vậy. +MemcachedModuleAvailableButNotSetup=Mô-đun bộ nhớ cache memcached cho applicative tìm thấy nhưng cài đặt các mô-đun không đầy đủ. +MemcachedAvailableAndSetup=Memcached mô-đun dành riêng cho sử dụng máy chủ memcached được kích hoạt. +OPCodeCache=Bộ nhớ cache opcode +NoOPCodeCacheFound=Không có bộ nhớ cache opcode được tìm thấy. Có thể là bạn sử dụng một bộ nhớ cache opcode hơn XCache hoặc eAccelerator (tốt), có thể bạn không có bộ nhớ cache opcode (rất xấu). +HTTPCacheStaticResources=Bộ nhớ cache HTTP cho tài nguyên tĩnh (css, img, javascript) +FilesOfTypeCached=Files of type% s được lưu trữ bởi máy chủ HTTP +FilesOfTypeNotCached=Files of type% s không được lưu trữ bởi máy chủ HTTP +FilesOfTypeCompressed=Files of type% s được nén bởi máy chủ HTTP +FilesOfTypeNotCompressed=Files of type% s không bị nén bởi máy chủ HTTP +CacheByServer=Bộ nhớ cache của máy chủ +CacheByClient=Bộ nhớ cache của trình duyệt +CompressionOfResources=Nén các phản hồi HTTP +TestNotPossibleWithCurrentBrowsers=Tự động phát hiện không thể ##### Products ##### -ProductSetup=Products module setup -ServiceSetup=Services module setup -ProductServiceSetup=Products and Services modules setup -NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) -ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms -ModifyProductDescAbility=Personalization of product descriptions in forms -ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) -ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language -UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). -UseEcoTaxeAbility=Support Eco-Taxe (WEEE) -SetDefaultBarcodeTypeProducts=Default barcode type to use for products -SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties -ProductCodeChecker= Module for product code generation and checking (product or service) -ProductOtherConf= Product / Service configuration +ProductSetup=Thiết lập các sản phẩm mô-đun +ServiceSetup=Thiết lập mô-đun dịch vụ +ProductServiceSetup=Sản phẩm và dịch vụ thiết lập các mô-đun +NumberOfProductShowInSelect=Số lượng tối đa của sản phẩm trong danh sách combo chọn (0 = không giới hạn) +ConfirmDeleteProductLineAbility=Xác nhận khi loại bỏ các dòng sản phẩm trong các hình thức +ModifyProductDescAbility=Cá nhân mô tả sản phẩm dưới nhiều hình thức +ViewProductDescInFormAbility=Hình ảnh của mô tả sản phẩm bằng các hình thức (nếu không như bật lên tooltip) +ViewProductDescInThirdpartyLanguageAbility=Hình ảnh của sản phẩm mô tả trong ngôn ngữ của bên thứ ba +UseSearchToSelectProductTooltip=Ngoài ra nếu bạn có một số lượng lớn các sản phẩm (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập PRODUCT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi. +UseSearchToSelectProduct=Sử dụng một hình thức tìm kiếm để chọn một sản phẩm (chứ không phải là một danh sách thả xuống). +UseEcoTaxeAbility=Hỗ trợ sinh thái taxe (WEEE) +SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm +SetDefaultBarcodeTypeThirdParties=Mặc định loại mã vạch để sử dụng cho các bên thứ ba +ProductCodeChecker= Module cho hệ mã sản phẩm và kiểm tra (sản phẩm hoặc dịch vụ) +ProductOtherConf= Sản phẩm / dịch vụ cấu hình ##### Syslog ##### -SyslogSetup=Logs module setup -SyslogOutput=Logs outputs +SyslogSetup=Thiết lập các bản ghi mô-đun +SyslogOutput=Bản ghi kết quả đầu ra SyslogSyslog=Syslog -SyslogFacility=Facility -SyslogLevel=Level -SyslogSimpleFile=File -SyslogFilename=File name and path -YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. -ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant -OnlyWindowsLOG_USER=Windows only supports LOG_USER +SyslogFacility=Cơ sở +SyslogLevel=Cấp +SyslogSimpleFile=Tập tin +SyslogFilename=Tên tập tin và đường dẫn +YouCanUseDOL_DATA_ROOT=Bạn có thể sử dụng DOL_DATA_ROOT / dolibarr.log cho một tập tin đăng nhập Dolibarr "tài liệu" thư mục. Bạn có thể thiết lập một con đường khác nhau để lưu trữ các tập tin này. +ErrorUnknownSyslogConstant=Liên tục% s không phải là một hằng số Syslog biết +OnlyWindowsLOG_USER=Windows chỉ hỗ trợ LOG_USER ##### Donations ##### -DonationsSetup=Donation module setup -DonationsReceiptModel=Template of donation receipt +DonationsSetup=Thiết lập mô-đun tặng +DonationsReceiptModel=Mẫu nhận tặng ##### Barcode ##### -BarcodeSetup=Barcode setup -PaperFormatModule=Print format module -BarcodeEncodeModule=Barcode encoding type -UseBarcodeInProductModule=Use bar codes for products -CodeBarGenerator=Barcode generator -ChooseABarCode=No generator defined -FormatNotSupportedByGenerator=Format not supported by this generator -BarcodeDescEAN8=Barcode of type EAN8 -BarcodeDescEAN13=Barcode of type EAN13 -BarcodeDescUPC=Barcode of type UPC -BarcodeDescISBN=Barcode of type ISBN -BarcodeDescC39=Barcode of type C39 -BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) -BarcodeInternalEngine=Internal engine -BarCodeNumberManager=Manager to auto define barcode numbers +BarcodeSetup=Thiết lập mã vạch +PaperFormatModule=Mô-đun định dạng In +BarcodeEncodeModule=Mã vạch kiểu mã hóa +UseBarcodeInProductModule=Sử dụng mã vạch cho sản phẩm +CodeBarGenerator=Máy phát điện mã vạch +ChooseABarCode=Không có máy phát điện được xác định +FormatNotSupportedByGenerator=Định dạng không được hỗ trợ bởi máy phát điện này +BarcodeDescEAN8=Barcode loại EAN8 +BarcodeDescEAN13=Barcode loại EAN13 +BarcodeDescUPC=Mã vạch UPC loại +BarcodeDescISBN=Barcode loại ISBN +BarcodeDescC39=Barcode loại C39 +BarcodeDescC128=Barcode loại C128 +GenbarcodeLocation=Thanh công cụ dòng lệnh thế hệ mã (sử dụng động cơ nội bộ đối với một số loại mã vạch) +BarcodeInternalEngine=Động cơ nội bộ +BarCodeNumberManager=Manager để tự động xác định số mã vạch ##### Prelevements ##### -WithdrawalsSetup=Withdrawal module setup +WithdrawalsSetup=Thiết lập mô-đun thu hồi ##### ExternalRSS ##### -ExternalRSSSetup=External RSS imports setup -NewRSS=New RSS Feed +ExternalRSSSetup=RSS ngoài nhập khẩu thiết lập +NewRSS=RSS Feed Mới RSSUrl=RSS URL -RSSUrlExample=An interesting RSS feed +RSSUrlExample=Một nguồn cấp dữ liệu RSS thú vị ##### Mailing ##### -MailingSetup=EMailing module setup -MailingEMailFrom=Sender EMail (From) for emails sent by emailing module -MailingEMailError=Return EMail (Errors-to) for emails with errors +MailingSetup=Gửi email cài đặt mô-đun +MailingEMailFrom=Tên người gửi thư điện tử (Từ) cho email được gửi bằng cách gửi email mô-đun +MailingEMailError=Quay trở lại thư điện tử (lỗi-to) cho email với các lỗi ##### Notification ##### -NotificationSetup=Notification bu email module setup -NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +NotificationSetup=Bu thông báo thiết lập mô-đun email +NotificationEMailFrom=Tên người gửi thư điện tử (Từ) cho các email gửi đi thông báo +ListOfAvailableNotifications=Danh sách thông báo có sẵn (danh sách này phụ thuộc vào các mô-đun kích hoạt) ##### Sendings ##### -SendingsSetup=Sending module setup -SendingsReceiptModel=Sending receipt model -SendingsNumberingModules=Sendings numbering modules -SendingsAbility=Support sendings sheets for customer deliveries -NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. -FreeLegalTextOnShippings=Free text on shippings +SendingsSetup=Gửi thiết lập mô-đun +SendingsReceiptModel=Gửi mô hình nhận +SendingsNumberingModules=Sendings đánh số module +SendingsAbility=Hỗ trợ sendings tờ cho việc giao hàng của khách hàng +NoNeedForDeliveryReceipts=Trong hầu hết các trường hợp, sendings hóa đơn được sử dụng như tờ cho việc giao hàng của khách hàng (danh sách các sản phẩm để gửi) và tấm được recevied và chữ ký của khách hàng. Vì vậy, phân phối sản phẩm hóa đơn là một tính năng sao chép và hiếm khi được kích hoạt. +FreeLegalTextOnShippings=Miễn phí văn bản trên shippings ##### Deliveries ##### -DeliveryOrderNumberingModules=Products deliveries receipt numbering module -DeliveryOrderModel=Products deliveries receipt model -DeliveriesOrderAbility=Support products deliveries receipts -FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts +DeliveryOrderNumberingModules=Sản phẩm phân phối mô-đun số nhận +DeliveryOrderModel=Sản phẩm mô hình giao nhận +DeliveriesOrderAbility=Sản phẩm hỗ trợ giao biên lai +FreeLegalTextOnDeliveryReceipts=Văn bản miễn phí trên hóa đơn giao hàng ##### FCKeditor ##### -AdvancedEditor=Advanced editor -ActivateFCKeditor=Activate advanced editor for: -FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) -FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommanded as it can create problems with special characters and page formating when building PDF files. -FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) -FCKeditorForUserSignature=WYSIWIG creation/edition of user signature -FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing) +AdvancedEditor=Biên tập viên cao cấp +ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho: +FCKeditorForCompany=WYSIWIG tạo / phiên bản của các yếu tố mô tả và lưu ý (trừ các sản phẩm / dịch vụ) +FCKeditorForProduct=WYSIWIG tạo / phiên bản của sản phẩm / dịch vụ mô tả và lưu ý +FCKeditorForProductDetails=WYSIWIG tạo / phiên bản của sản phẩm chi tiết cho tất cả các dòng thực thể (đề xuất, đơn đặt hàng, hóa đơn, vv ...). Cảnh báo: Sử dụng tùy chọn này trong trường hợp này là nghiêm túc không recommanded vì nó có thể tạo ra các vấn đề với các ký tự đặc biệt và các định dạng trang khi xây dựng PDF tập tin. +FCKeditorForMailing= WYSIWIG tạo / phiên bản cho eMailings khối (Tools> gửi email) +FCKeditorForUserSignature=WYSIWIG tạo / phiên bản của chữ ký người sử dụng +FCKeditorForMail=WYSIWIG tạo / phiên bản cho tất cả thư (trừ Outils-> gửi email) ##### OSCommerce 1 ##### -OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). -OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. -OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. -OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. +OSCommerceErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu osCommerce (% s chính không tìm thấy trong bảng% s). +OSCommerceTestOk=Kết nối với máy chủ '% s' vào cơ sở dữ liệu '% s' với người sử dụng '% s' thành công. +OSCommerceTestKo1=Kết nối với máy chủ '% s' thành công nhưng cơ sở dữ liệu '% s' không thể đạt được. +OSCommerceTestKo2=Kết nối với máy chủ '% s' với người dùng% s 'thất bại. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Cấu hình chứng khoán mô-đun +UserWarehouse=Cổ phiếu cá nhân sử dụng người dùng ##### Menu ##### -MenuDeleted=Menu deleted -TreeMenu=Tree menus -Menus=Menus -TreeMenuPersonalized=Personalized menus -NewMenu=New menu -MenuConf=Menus setup -Menu=Selection of menu -MenuHandler=Menu handler -MenuModule=Source module -HideUnauthorizedMenu= Hide unauthorized menus (gray) +MenuDeleted=Đơn bị xóa +TreeMenu=Menu cây +Menus=Thực đơn +TreeMenuPersonalized=Menu cá nhân +NewMenu=Đơn mới +MenuConf=Thiết lập menu +Menu=Lựa chọn các đơn +MenuHandler=Xử lý đơn +MenuModule=Mô-đun mã nguồn +HideUnauthorizedMenu= Ẩn menu trái phép (màu xám) DetailId=Id menu -DetailMenuHandler=Menu handler where to show new menu -DetailMenuModule=Module name if menu entry come from a module -DetailType=Type of menu (top or left) -DetailTitre=Menu label or label code for translation -DetailMainmenu=Group for which it belongs (obsolete) -DetailUrl=URL where menu send you (Absolute URL link or external link with http://) -DetailLeftmenu=Display condition or not (obsolete) -DetailEnabled=Condition to show or not entry -DetailRight=Condition to display unauthorized grey menus -DetailLangs=Lang file name for label code translation -DetailUser=Intern / Extern / All -Target=Target -DetailTarget=Target for links (_blank top open a new window) -DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu) -ModifMenu=Menu change -DeleteMenu=Delete menu entry -ConfirmDeleteMenu=Are you sure you want to delete menu entry %s ? -DeleteLine=Delete line -ConfirmDeleteLine=Are you sure you want to delete this line ? +DetailMenuHandler=Đơn xử lý vị trí hiển thị trình đơn mới +DetailMenuModule=Tên module nếu mục trình đơn đến từ một mô-đun +DetailType=Loại menu (trên hoặc bên trái) +DetailTitre=Nhãn Menu hoặc nhãn mã cho dịch +DetailMainmenu=Nhóm mà nó thuộc về (đã lỗi thời) +DetailUrl=URL nơi đơn gửi cho bạn (liên kết URL tuyệt đối hoặc liên kết bên ngoài với http: //) +DetailLeftmenu=Điều kiện hiển thị hay không (đã lỗi thời) +DetailEnabled=Điều kiện để hiển thị hoặc không nhập +DetailRight=Điều kiện để hiển thị menu màu xám trái phép +DetailLangs=Tên file lang cho dịch nhãn mã +DetailUser=Intern / ở ngoài / Tất cả +Target=Mục tiêu +DetailTarget=Mục tiêu cho các liên kết (_blank đầu mở một cửa sổ mới) +DetailLevel=Cấp (-1: menu trên cùng, 0: đơn tiêu đề,> 0 menu và menu phụ) +ModifMenu=Thực đơn thay đổi +DeleteMenu=Xóa mục trình đơn +ConfirmDeleteMenu=Bạn có chắc chắn muốn xóa mục trình đơn% s? +DeleteLine=Xóa dòng +ConfirmDeleteLine=Bạn Bạn có chắc chắn muốn xóa dòng này? ##### Tax ##### -TaxSetup=Taxes, social contributions and dividends module setup -OptionVatMode=VAT due -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis -OptionVatDefaultDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on payments for services -OptionVatDebitOptionDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on invoice (debit) for services -SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: -OnDelivery=On delivery -OnPayment=On payment -OnInvoice=On invoice -SupposedToBePaymentDate=Payment date used -SupposedToBeInvoiceDate=Invoice date used -Buy=Buy -Sell=Sell -InvoiceDateUsed=Invoice date used -YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup. -AccountancyCode=Accountancy Code -AccountancyCodeSell=Sale account. code -AccountancyCodeBuy=Purchase account. code +TaxSetup=Thuế, các khoản đóng góp xã hội và cổ tức thiết lập mô-đun +OptionVatMode=Thuế GTGT do +OptionVATDefault=Tiền cơ sở +OptionVATDebitOption=Cơ sở dồn tích +OptionVatDefaultDesc=Thuế GTGT là do:
- Giao hàng đối với hàng hóa (chúng ta sử dụng ngày hóa đơn)
- Về chi trả dịch vụ +OptionVatDebitOptionDesc=Thuế GTGT là do:
- Giao hàng đối với hàng hóa (chúng ta sử dụng ngày hóa đơn)
- Trên hoá đơn (ghi nợ) cho các dịch vụ +SummaryOfVatExigibilityUsedByDefault=Thời gian exigibility thuế GTGT theo mặc định theo lựa chọn lựa chọn: +OnDelivery=Ngày giao hàng +OnPayment=Ngày thanh toán +OnInvoice=Trên hóa đơn +SupposedToBePaymentDate=Ngày thanh toán sử dụng +SupposedToBeInvoiceDate=Ngày sử dụng hóa đơn +Buy=Mua +Sell=Bán +InvoiceDateUsed=Ngày sử dụng hóa đơn +YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không sử dụng thuế GTGT (Trang chủ - Thiết lập - Công ty / cơ sở), vì vậy không có tùy chọn để thiết lập thuế GTGT. +AccountancyCode=Kế toán Mã +AccountancyCodeSell=Tài khoản bán hàng. Mã +AccountancyCodeBuy=Mua tài khoản. Mã ##### Agenda ##### -AgendaSetup=Events and agenda module setup -PasswordTogetVCalExport=Key to authorize export link -PastDelayVCalExport=Do not export event older than -AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) -AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view -AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view -AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +AgendaSetup=Sự kiện và thiết lập mô-đun chương trình nghị sự +PasswordTogetVCalExport=Key cho phép liên kết xuất khẩu +PastDelayVCalExport=Không xuất sự kiện lớn hơn +AGENDA_USE_EVENT_TYPE=Loại hình sử dụng sự kiện (quản lý vào menu Setup -> từ điển -> Loại sự kiện chương trình) +AGENDA_DEFAULT_FILTER_TYPE=Thiết lập tự động loại sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự +AGENDA_DEFAULT_FILTER_STATUS=Tự động thiết lập trạng thái này cho các sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự +AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn chương trình nghị sự đơn ##### ClickToDial ##### -ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. +ClickToDialDesc=Module này cho phép để thêm một biểu tượng sau khi số điện thoại. Một nhấp chuột vào biểu tượng này sẽ gọi một máy chủ với một địa chỉ URL đặc biệt bạn xác định dưới đây. Điều này có thể được sử dụng để gọi một hệ thống trung tâm cuộc gọi từ Dolibarr có thể gọi số điện thoại trên một hệ thống SIP ví dụ. ##### Point Of Sales (CashDesk) ##### -CashDesk=Point of sales -CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells -CashDeskBankAccountForSell=Default account to use to receive cash payments -CashDeskBankAccountForCheque= Default account to use to receive payments by cheque -CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +CashDesk=Điểm bán hàng +CashDeskSetup=Quan điểm của thiết lập mô-đun bán hàng +CashDeskThirdPartyForSell=Bên thứ ba chung để sử dụng cho bán +CashDeskBankAccountForSell=Tài khoản mặc định để sử dụng để nhận thanh toán bằng tiền mặt +CashDeskBankAccountForCheque= Tài khoản mặc định để sử dụng để nhận thanh toán bằng séc +CashDeskBankAccountForCB= Tài khoản mặc định để sử dụng để nhận thanh toán bằng thẻ tín dụng +CashDeskIdWareHouse=Kho để sử dụng cho bán ##### Bookmark ##### -BookmarkSetup=Bookmark module setup -BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. -NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu +BookmarkSetup=Thiết lập mô-đun Bookmark +BookmarkDesc=Module này cho phép bạn quản lý bookmark. Bạn cũng có thể thêm các phím tắt cho bất kỳ trang Dolibarr hoặc các trang web externale trên menu bên trái của bạn. +NbOfBoomarkToShow=Số lượng tối đa các trang đánh dấu để hiển thị trong menu bên trái ##### WebServices ##### -WebServicesSetup=Webservices module setup -WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services. -WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here -EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url +WebServicesSetup=Thiết lập mô-đun webservices +WebServicesDesc=Bằng cách cho phép mô-đun này, Dolibarr trở thành một máy chủ dịch vụ web để cung cấp dịch vụ web linh tinh. +WSDLCanBeDownloadedHere=Các tập tin mô tả WSDL của dịch vụ cung cấp có thể được tải về tại đây +EndPointIs=SOAP khách hàng phải gửi yêu cầu tới các thiết bị đầu cuối Dolibarr tại Url ##### Bank ##### -BankSetupModule=Bank module setup -FreeLegalTextOnChequeReceipts=Free text on cheque receipts -BankOrderShow=Display order of bank accounts for countries using "detailed bank number" -BankOrderGlobal=General -BankOrderGlobalDesc=General display order -BankOrderES=Spanish -BankOrderESDesc=Spanish display order +BankSetupModule=Thiết lập mô-đun Ngân hàng +FreeLegalTextOnChequeReceipts=Văn bản miễn phí trên hóa đơn kiểm tra +BankOrderShow=Để hiển thị các tài khoản ngân hàng cho các nước đang sử dụng "số ngân hàng chi tiết" +BankOrderGlobal=Chung +BankOrderGlobalDesc=Thứ tự hiển thị chung +BankOrderES=Tây Ban Nha +BankOrderESDesc=Thứ tự hiển thị tiếng Tây Ban Nha ##### Multicompany ##### -MultiCompanySetup=Multi-company module setup +MultiCompanySetup=Thiết lập mô-đun Multi-công ty ##### Suppliers ##### -SuppliersSetup=Supplier module setup -SuppliersCommandModel=Complete template of supplier order (logo...) -SuppliersInvoiceModel=Complete template of supplier invoice (logo...) -SuppliersInvoiceNumberingModel=Supplier invoices numbering models +SuppliersSetup=Thiết lập mô-đun nhà cung cấp +SuppliersCommandModel=Hoàn thành mẫu đơn đặt hàng nhà cung cấp (logo ...) +SuppliersInvoiceModel=Toàn bộ mẫu của nhà cung cấp hóa đơn (biểu tượng ...) +SuppliersInvoiceNumberingModel=Nhà cung cấp hoá đơn đánh số mô hình ##### GeoIPMaxmind ##### -GeoIPMaxmindSetup=GeoIP Maxmind module setup -PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat -NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions). -YouCanDownloadFreeDatFileTo=You can download a free demo version of the Maxmind GeoIP country file at %s. -YouCanDownloadAdvancedDatFileTo=You can also download a more complete version, with updates, of the Maxmind GeoIP country file at %s. -TestGeoIPResult=Test of a conversion IP -> country +GeoIPMaxmindSetup=Thiết lập mô-đun GeoIP MaxMind +PathToGeoIPMaxmindCountryDataFile=Đường dẫn đến tập tin có chứa MaxMind ip dịch nước.
Ví dụ:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat +NoteOnPathLocation=Lưu ý rằng chỉ IP của bạn để đất nước tập tin dữ liệu phải được bên trong một thư mục PHP của bạn có thể đọc (Kiểm tra PHP open_basedir cho phép cài đặt và hệ thống tập tin). +YouCanDownloadFreeDatFileTo=Bạn có thể tải về một phiên bản demo miễn phí của tập tin nước MaxMind GeoIP tại% s. +YouCanDownloadAdvancedDatFileTo=Bạn cũng có thể tải về một phiên bản hoàn thiện hơn, với bản cập nhật, các tập tin nước MaxMind GeoIP tại% s. +TestGeoIPResult=Thử nghiệm của một IP chuyển đổi -> nước ##### Projects ##### -ProjectsNumberingModules=Projects numbering module -ProjectsSetup=Project module setup -ProjectsModelModule=Project reports document model -TasksNumberingModules=Tasks numbering module -TaskModelModule=Tasks reports document model +ProjectsNumberingModules=Dự án đánh số mô-đun +ProjectsSetup=Thiết lập mô-đun dự án +ProjectsModelModule=Dự án báo cáo mô hình tài liệu +TasksNumberingModules=Nhiệm vụ đánh số mô-đun +TaskModelModule=Nhiệm vụ báo cáo mô hình tài liệu ##### ECM (GED) ##### -ECMSetup = GED Setup -ECMAutoTree = Automatic tree folder and document +ECMSetup = GED cài đặt +ECMAutoTree = Cây thư mục tự động và tài liệu ##### Fiscal Year ##### -FiscalYears=Fiscal years -FiscalYear=Fiscal year -FiscalYearCard=Fiscal year card -NewFiscalYear=New fiscal year -EditFiscalYear=Edit fiscal year -OpenFiscalYear=Open fiscal year -CloseFiscalYear=Close fiscal year -DeleteFiscalYear=Delete fiscal year -ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? -Opened=Opened -Closed=Closed +FiscalYears=Năm tài chính +FiscalYear=Năm tài chính +FiscalYearCard=Thẻ năm tài chính +NewFiscalYear=Năm tài chính mới +EditFiscalYear=Chỉnh sửa năm tài chính +OpenFiscalYear=Mở cửa năm tài chính +CloseFiscalYear=Đóng năm tài chính +DeleteFiscalYear=Xóa năm tài chính +ConfirmDeleteFiscalYear=Bạn chắc chắn muốn xóa năm tài chính này? +Opened=Mở +Closed=Đóng -Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +Format=Định dạng +TypePaymentDesc=0: Loại khách hàng thanh toán 1: Nhà cung cấp phương thức thanh toán, 2: Cả hai khách hàng và nhà cung cấp loại hình thanh toán diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang index adf9cc32f1a..aa55936b5ec 100644 --- a/htdocs/langs/vi_VN/agenda.lang +++ b/htdocs/langs/vi_VN/agenda.lang @@ -1,90 +1,93 @@ # Dolibarr language file - Source file is en_US - agenda -IdAgenda=ID event -Actions=Events -ActionsArea=Events area (Actions and tasks) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendar -Calendars= Calendars -LocalAgenda=Local calendar -AffectedTo=Assigned to -DoneBy=Done by -Event=Event -Events=Events -EventsNb=Number of events -MyEvents=My events -OtherEvents=Other events -ListOfActions=List of events -Location=Location -EventOnFullDay=Event on all day(s) -SearchAnAction= Search an event/task -MenuToDoActions=All incomplete events -MenuDoneActions=All terminated events -MenuToDoMyActions=My incomplete events -MenuDoneMyActions=My terminated events -ListOfEvents=List of Dolibarr events -ActionsAskedBy=Events reported by -ActionsToDoBy=Events assigned to -ActionsDoneBy=Events done by -ActionsForUser=Events for user -ActionsForUsersGroup=Events for all users of group -AllMyActions= All my events/tasks -AllActions= All events/tasks -ViewList=List view -ViewCal=Month view -ViewDay=Day view -ViewWeek=Week view -ViewPerUser=Per user view -ViewWithPredefinedFilters= View with predefined filters -AutoActions= Automatic filling -AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. -AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) -AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated -InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status -InvoiceDeleteDolibarr=Invoice %s deleted -OrderValidatedInDolibarr= Order %s validated -OrderApprovedInDolibarr=Order %s approved -OrderRefusedInDolibarr=Order %s refused -OrderBackToDraftInDolibarr=Order %s go back to draft status -OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated -ProposalSentByEMail=Commercial proposal %s sent by EMail -OrderSentByEMail=Customer order %s sent by EMail -InvoiceSentByEMail=Customer invoice %s sent by EMail -SupplierOrderSentByEMail=Supplier order %s sent by EMail -SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail -ShippingSentByEMail=Shipping %s sent by EMail -ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed -NewCompanyToDolibarr= Third party created -DateActionPlannedStart= Planned start date -DateActionPlannedEnd= Planned end date -DateActionDoneStart= Real start date -DateActionDoneEnd= Real end date -DateActionStart= Start date -DateActionEnd= End date -AgendaUrlOptions1=You can also add following parameters to filter output: -AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. -AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. -AgendaShowBirthdayEvents=Show birthday's contacts -AgendaHideBirthdayEvents=Hide birthday's contacts -Busy=Busy -ExportDataset_event1=List of agenda events -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +IdAgenda=ID sự kiện +Actions=Sự kiện +ActionsArea=Khu vực sự kiện (hành động và nhiệm vụ) +Agenda=Chương trình nghị sự +Agendas=Chương trình nghị sự +Calendar=Lịch +Calendars=Lịch +LocalAgenda=Lịch nội bộ +ActionsOwnedBy=Event owned by +AffectedTo=Giao cho +DoneBy=Thực hiện bằng cách +Event=Sự kiện +Events=Sự kiện +EventsNb=Số sự kiện +MyEvents=Sự kiện của tôi +OtherEvents=Các sự kiện khác +ListOfActions=Danh sách các sự kiện +Location=Đến từ +EventOnFullDay=Sự kiện trên tất cả các ngày (s) +SearchAnAction= Tìm kiếm một sự kiện / nhiệm vụ +MenuToDoActions=Tất cả các sự kiện không đầy đủ +MenuDoneActions=Tất cả các sự kiện kết thúc +MenuToDoMyActions=Sự kiện không đầy đủ của tôi +MenuDoneMyActions=Sự kiện chấm dứt của tôi +ListOfEvents=Danh sách các sự kiện (lịch nội bộ) +ActionsAskedBy=Sự kiện báo cáo của +ActionsToDoBy=Sự kiện được giao +ActionsDoneBy=Sự kiện được thực hiện bởi +ActionsForUser=Sự kiện cho người sử dụng +ActionsForUsersGroup=Sự kiện cho tất cả người dùng của nhóm +AllMyActions= Tất cả các sự kiện của tôi / nhiệm vụ +AllActions= Tất cả các sự kiện / nhiệm vụ +ViewList=Danh sách xem +ViewCal=Xem tháng +ViewDay=Ngày xem +ViewWeek=Xem theo tuần +ViewPerUser=Trung bình mỗi người dùng xem +ViewWithPredefinedFilters= Xem với các bộ lọc được xác định trước +AutoActions= Tự động điền +AgendaAutoActionDesc= Xác định đây sự kiện mà bạn muốn Dolibarr để tạo ra tự động một sự kiện trong chương trình nghị sự. Nếu không có gì được kiểm tra (theo mặc định), chỉ có hành động thủ công sẽ được đưa vào chương trình nghị sự. +AgendaSetupOtherDesc= Trang này cung cấp tùy chọn để cho phép xuất khẩu các sự kiện Dolibarr của bạn thành một lịch bên ngoài (thunderbird, google lịch, ...) +AgendaExtSitesDesc=Trang này cho phép khai báo các nguồn bên ngoài lịch để xem các sự kiện của họ vào chương trình nghị sự Dolibarr. +ActionsEvents= Sự kiện mà Dolibarr sẽ tạo ra một hành động trong chương trình nghị sự tự động +PropalValidatedInDolibarr= Đề nghị xác nhận% s +InvoiceValidatedInDolibarr= Hoá đơn% s xác nhận +InvoiceBackToDraftInDolibarr=Hoá đơn% s trở lại trạng thái soạn thảo +InvoiceDeleteDolibarr=Hoá đơn% s bị xóa +OrderValidatedInDolibarr= Thứ tự% s xác nhận +OrderApprovedInDolibarr=Thứ tự% s đã được phê duyệt +OrderRefusedInDolibarr=Thứ tự% s từ chối +OrderBackToDraftInDolibarr=Thứ tự% s trở lại trạng thái soạn thảo +OrderCanceledInDolibarr=Thứ tự% s hủy bỏ +InterventionValidatedInDolibarr=Can thiệp% s xác nhận +ProposalSentByEMail=Đề nghị thương mại% s gửi bằng thư điện tử +OrderSentByEMail=Đơn đặt hàng% s gửi Thư điện tử +InvoiceSentByEMail=Hóa đơn của khách hàng% s gửi Thư điện tử +SupplierOrderSentByEMail=Để nhà cung cấp% s gửi Thư điện tử +SupplierInvoiceSentByEMail=Nhà cung cấp hóa đơn% s gửi bằng thư điện tử +ShippingSentByEMail=Vận chuyển% s gửi thư điện tử +ShippingValidated= Vận chuyển% s xác nhận +InterventionSentByEMail=Can thiệp% s gửi thư điện tử +InterventionClassifiedBilled=Can thiệp% s phân loại như Quảng cáo tại +NewCompanyToDolibarr= Bên thứ ba tạo ra +DateActionPlannedStart= Ngày bắt đầu lên kế hoạch +DateActionPlannedEnd= Ngày kết thúc kế hoạch +DateActionDoneStart= Ngày bắt đầu thực +DateActionDoneEnd= Bất ngày cuối +DateActionStart= Ngày bắt đầu +DateActionEnd= Ngày kết thúc +AgendaUrlOptions1=Bạn cũng có thể thêm các thông số sau đây để lọc đầu ra: +AgendaUrlOptions2=login =% s ​​để hạn chế sản lượng để hành động được tạo ra bởi, phân định hoặc thực hiện bằng cách sử dụng% s. +AgendaUrlOptions3=Logina =% s ​​để hạn chế sản lượng để hành động được tạo ra bởi người sử dụng% s. +AgendaUrlOptions4=logint =% s ​​để hạn chế sản lượng để hành động được gán cho người dùng% s. +AgendaUrlOptions5=logind =% s ​​để hạn chế sản lượng để hành động thực hiện bằng cách sử dụng% s. +AgendaShowBirthdayEvents=Hiển thị địa chỉ liên lạc sinh nhật +AgendaHideBirthdayEvents=Giấu địa chỉ liên lạc sinh nhật +Busy=Bận +ExportDataset_event1=Danh sách các sự kiện chương trình nghị sự +DefaultWorkingDays=Mặc định ngày làm việc trong phạm vi tuần (Ví dụ: 1-5, 1-6) +DefaultWorkingHours=Mặc định giờ làm việc trong ngày (Ví dụ: 9-18) # External Sites ical -ExportCal=Export calendar -ExtSites=Import external calendars -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. -ExtSitesNbOfAgenda=Number of calendars -AgendaExtNb=Calendar nb %s -ExtSiteUrlAgenda=URL to access .ical file -ExtSiteNoLabel=No Description -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range +ExportCal=Lịch xuất khẩu +ExtSites=Nhập lịch bên ngoài +ExtSitesEnableThisTool=Hiển thị lịch bên ngoài (được định nghĩa vào thiết lập toàn cầu) vào chương trình nghị sự. Không ảnh hưởng đến lịch bên ngoài được xác định bởi người sử dụng. +ExtSitesNbOfAgenda=Số lịch +AgendaExtNb=Lịch nb% s +ExtSiteUrlAgenda=URL để truy cập tập tin .ical +ExtSiteNoLabel=Không có Mô tả +WorkingTimeRange=Phạm vi thời gian làm việc +WorkingDaysRange=Ngày làm việc trong khoảng +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang index 05156a723ad..c8f914a802a 100644 --- a/htdocs/langs/vi_VN/banks.lang +++ b/htdocs/langs/vi_VN/banks.lang @@ -1,160 +1,160 @@ # Dolibarr language file - Source file is en_US - banks -Bank=Bank -Banks=Banks -MenuBankCash=Bank/Cash -MenuSetupBank=Bank/Cash setup -BankName=Bank name -FinancialAccount=Account -FinancialAccounts=Accounts -BankAccount=Bank account -BankAccounts=Bank accounts -AccountRef=Financial account ref -AccountLabel=Financial account label -CashAccount=Cash account -CashAccounts=Cash accounts -MainAccount=Main account -CurrentAccount=Current account -CurrentAccounts=Current accounts -SavingAccount=Savings account -SavingAccounts=Savings accounts -ErrorBankLabelAlreadyExists=Financial account label already exists -BankBalance=Balance -BankBalanceBefore=Balance before -BankBalanceAfter=Balance after -BalanceMinimalAllowed=Minimum allowed balance -BalanceMinimalDesired=Minimum desired balance -InitialBankBalance=Initial balance -EndBankBalance=End balance -CurrentBalance=Current balance -FutureBalance=Future balance -ShowAllTimeBalance=Show balance from start -AllTime=From start -Reconciliation=Reconciliation -RIB=Bank Account Number -IBAN=IBAN number -BIC=BIC/SWIFT number -StandingOrders=Standing orders -StandingOrder=Standing order -Withdrawals=Withdrawals -Withdrawal=Withdrawal -AccountStatement=Account statement -AccountStatementShort=Statement -AccountStatements=Account statements -LastAccountStatements=Last account statements +Bank=Ngân hàng +Banks=Các ngân hàng +MenuBankCash=Ngân hàng / Tiền +MenuSetupBank=Thiết lập Ngân hàng / Tiền +BankName=Tên ngân hàng +FinancialAccount=Tài khoản +FinancialAccounts=Tài khoản +BankAccount=Tài khoản ngân hàng +BankAccounts=Tài khoản ngân hàng +AccountRef=Tài khoản tài chính ref +AccountLabel=Nhãn tài khoản tài chính +CashAccount=Tài khoản tiền mặt +CashAccounts=Tài khoản tiền mặt +MainAccount=Tài khoản chính +CurrentAccount=Tài khoản vãng lai +CurrentAccounts=Tài khoản vãng lai +SavingAccount=Tài khoản tiết kiệm +SavingAccounts=Tài khoản tiết kiệm +ErrorBankLabelAlreadyExists=Nhãn tài khoản tài chính đã tồn tại +BankBalance=Cân bằng +BankBalanceBefore=Cân bằng trước +BankBalanceAfter=Cân bằng sau +BalanceMinimalAllowed=Cân bằng tối thiểu cho phép +BalanceMinimalDesired=Cân bằng mong muốn tối thiểu +InitialBankBalance=Cân bằng ban đầu +EndBankBalance=Dư cuối +CurrentBalance=Số dư hiện tại +FutureBalance=Cân bằng trong tương lai +ShowAllTimeBalance=Hiển thị cân bằng từ đầu +AllTime=Từ đầu +Reconciliation=Hòa giải +RIB=Số tài khoản ngân hàng +IBAN=Số IBAN +BIC=BIC / SWIFT số +StandingOrders=Đứng đơn đặt hàng +StandingOrder=Lệnh chuyển tiền định +Withdrawals=Tiền thu hồi +Withdrawal=Rút +AccountStatement=Sao kê tài khoản +AccountStatementShort=Trữ +AccountStatements=Báo cáo tài khoản +LastAccountStatements=Báo cáo tài khoản cuối cùng Rapprochement=Reconciliate -IOMonthlyReporting=Monthly reporting -BankAccountDomiciliation=Account address -BankAccountCountry=Account country -BankAccountOwner=Account owner name -BankAccountOwnerAddress=Account owner address -RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN). -CreateAccount=Create account -NewAccount=New account -NewBankAccount=New bank account -NewFinancialAccount=New financial account -MenuNewFinancialAccount=New financial account -NewCurrentAccount=New current account -NewSavingAccount=New savings account -NewCashAccount=New cash account -EditFinancialAccount=Edit account -AccountSetup=Financial accounts setup -SearchBankMovement=Search bank movement -Debts=Debts -LabelBankCashAccount=Bank or cash label -AccountType=Account type -BankType0=Savings account -BankType1=Current or credit card account -BankType2=Cash account -IfBankAccount=If bank account -AccountsArea=Accounts area -AccountCard=Account card -DeleteAccount=Delete account -ConfirmDeleteAccount=Are you sure you want to delete this account ? -Account=Account -ByCategories=By categories -ByRubriques=By categories -BankTransactionByCategories=Bank transactions by categories -BankTransactionForCategory=Bank transactions for category %s -RemoveFromRubrique=Remove link with category -RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ? -ListBankTransactions=List of bank transactions -IdTransaction=Transaction ID -BankTransactions=Bank transactions -SearchTransaction=Search transaction -ListTransactions=List transactions -ListTransactionsByCategory=List transaction/category -TransactionsToConciliate=Transactions to reconcile -Conciliable=Can be reconciled -Conciliate=Reconcile -Conciliation=Reconciliation -ConciliationForAccount=Reconcile this account -IncludeClosedAccount=Include closed accounts -OnlyOpenedAccount=Only opened accounts -AccountToCredit=Account to credit -AccountToDebit=Account to debit -DisableConciliation=Disable reconciliation feature for this account -ConciliationDisabled=Reconciliation feature disabled -StatusAccountOpened=Opened -StatusAccountClosed=Closed -AccountIdShort=Number -EditBankRecord=Edit record -LineRecord=Transaction -AddBankRecord=Add transaction -AddBankRecordLong=Add transaction manually -ConciliatedBy=Reconciled by -DateConciliating=Reconcile date -BankLineConciliated=Transaction reconciled -CustomerInvoicePayment=Customer payment -CustomerInvoicePaymentBack=Customer payment back -SupplierInvoicePayment=Supplier payment -WithdrawalPayment=Withdrawal payment -SocialContributionPayment=Social contribution payment -FinancialAccountJournal=Financial account journal -BankTransfer=Bank transfer -BankTransfers=Bank transfers -TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction) -TransferFrom=From -TransferTo=To -TransferFromToDone=A transfer from %s to %s of %s %s has been recorded. +IOMonthlyReporting=Báo cáo hàng tháng +BankAccountDomiciliation=Địa chỉ tài khoản +BankAccountCountry=Tài khoản quốc gia +BankAccountOwner=Tên chủ tài khoản +BankAccountOwnerAddress=Địa chỉ chủ sở hữu tài khoản +RIBControlError=Kiểm tra tính toàn vẹn của các giá trị bị lỗi. Điều này có nghĩa là thông tin về số tài khoản này là không đầy đủ hoặc sai (kiểm tra cả nước, con số và IBAN). +CreateAccount=Tạo tài khoản +NewAccount=Tài khoản mới +NewBankAccount=Tài khoản ngân hàng mới +NewFinancialAccount=Tài khoản tài chính mới +MenuNewFinancialAccount=Tài khoản tài chính mới +NewCurrentAccount=Tài khoản vãng lai mới +NewSavingAccount=Tài khoản tiết kiệm mới +NewCashAccount=Tài khoản tiền mới +EditFinancialAccount=Chỉnh sửa tài khoản +AccountSetup=Thiết lập tài khoản tài chính +SearchBankMovement=Phong trào tìm kiếm ngân hàng +Debts=Các khoản nợ +LabelBankCashAccount=Ngân hàng hoặc nhãn tiền +AccountType=Loại tài khoản +BankType0=Tài khoản tiết kiệm +BankType1=Tài khoản vãng lai hoặc thẻ tín dụng +BankType2=Tài khoản tiền mặt +IfBankAccount=Nếu tài khoản ngân hàng +AccountsArea=Khu vực tài khoản +AccountCard=Thẻ tài khoản +DeleteAccount=Xóa tài khoản +ConfirmDeleteAccount=Bạn Bạn có chắc chắn muốn xóa tài khoản này? +Account=Tài khoản +ByCategories=By loại +ByRubriques=By loại +BankTransactionByCategories=Giao dịch ngân hàng theo danh mục +BankTransactionForCategory=Giao dịch ngân hàng cho thể loại% s +RemoveFromRubrique=Hủy bỏ liên kết với thể loại +RemoveFromRubriqueConfirm=Bạn Bạn có chắc chắn muốn xóa liên kết giữa các giao dịch và danh mục? +ListBankTransactions=Danh sách các giao dịch ngân hàng +IdTransaction=Mã số giao dịch +BankTransactions=Giao dịch ngân hàng +SearchTransaction=Giao dịch tìm kiếm +ListTransactions=Danh sách giao dịch +ListTransactionsByCategory=Danh sách giao dịch / thể loại +TransactionsToConciliate=Giao dịch để hòa giải +Conciliable=Có thể được hòa giải +Conciliate=Hòa giải +Conciliation=Hòa giải +ConciliationForAccount=Đối chiếu tài khoản này +IncludeClosedAccount=Bao gồm các tài khoản đã đóng +OnlyOpenedAccount=Chỉ có tài khoản mở +AccountToCredit=Tài khoản tín dụng +AccountToDebit=Tài khoản ghi nợ +DisableConciliation=Vô hiệu hoá tính năng hòa giải cho tài khoản này +ConciliationDisabled=Tính năng hòa giải bị vô hiệu hóa +StatusAccountOpened=Mở +StatusAccountClosed=Đóng +AccountIdShort=Số +EditBankRecord=Sửa kỷ lục +LineRecord=Giao dịch +AddBankRecord=Thêm giao dịch +AddBankRecordLong=Thêm giao dịch bằng tay +ConciliatedBy=Hòa giải bởi +DateConciliating=Ngày hòa giải +BankLineConciliated=Giao dịch hòa giải +CustomerInvoicePayment=Thanh toán của khách hàng +CustomerInvoicePaymentBack=Lại thanh toán của khách hàng +SupplierInvoicePayment=Thanh toán nhà cung cấp +WithdrawalPayment=Thanh toán rút +SocialContributionPayment=Thanh toán đóng góp xã hội +FinancialAccountJournal=Tạp chí tài khoản tài chính +BankTransfer=Chuyển khoản ngân hàng +BankTransfers=Chuyển khoản ngân hàng +TransferDesc=Chuyển từ một tài khoản với nhau, Dolibarr sẽ viết hai bản ghi (ghi nợ trong tài khoản nguồn và tín dụng trong tài khoản mục tiêu, số tiền tương tự. Cùng một nhãn và ngày sẽ được sử dụng cho giao dịch này) +TransferFrom=Từ +TransferTo=Để +TransferFromToDone=Việc chuyển giao từ% s đến% s trong% s% s đã được ghi nhận. CheckTransmitter=Transmitter -ValidateCheckReceipt=Validate this check receipt ? -ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ? -DeleteCheckReceipt=Delete this check receipt ? -ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ? -BankChecks=Bank checks -BankChecksToReceipt=Checks waiting for deposit -ShowCheckReceipt=Show check deposit receipt -NumberOfCheques=Nb of check -DeleteTransaction=Delete transaction -ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? -ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions -BankMovements=Movements -CashBudget=Cash budget -PlannedTransactions=Planned transactions -Graph=Graphics -ExportDataset_banque_1=Bank transactions and account statement -ExportDataset_banque_2=Deposit slip -TransactionOnTheOtherAccount=Transaction on the other account -TransactionWithOtherAccount=Account transfer -PaymentNumberUpdateSucceeded=Payment number updated succesfully -PaymentNumberUpdateFailed=Payment number could not be updated -PaymentDateUpdateSucceeded=Payment date update succesfully -PaymentDateUpdateFailed=Payment date could not be updated -Transactions=Transactions -BankTransactionLine=Bank transaction -AllAccounts=All bank/cash accounts -BackToAccount=Back to account -ShowAllAccounts=Show for all accounts -FutureTransaction=Transaction in futur. No way to conciliate. -SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) -EventualyAddCategory=Eventually, specify a category in which to classify the records -ToConciliate=To conciliate? -ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click -BankDashboard=Bank accounts summary -DefaultRIB=Default BAN -AllRIB=All BAN +ValidateCheckReceipt=Xác nhận việc kiểm tra này? +ConfirmValidateCheckReceipt=Bạn có chắc chắn bạn muốn xác nhận việc kiểm tra này, không có thay đổi sẽ có thể một lần này được thực hiện? +DeleteCheckReceipt=Xóa nhận việc kiểm tra này? +ConfirmDeleteCheckReceipt=Bạn Bạn có chắc chắn muốn xóa nhận việc kiểm tra này? +BankChecks=Kiểm tra ngân hàng +BankChecksToReceipt=Kiểm tra chờ đợi tiền gửi +ShowCheckReceipt=Hiện nhận tiền gửi kiểm tra +NumberOfCheques=Nb của kiểm tra +DeleteTransaction=Xóa giao dịch +ConfirmDeleteTransaction=Bạn Bạn có chắc chắn muốn xóa giao dịch này? +ThisWillAlsoDeleteBankRecord=Điều này cũng sẽ xóa các giao dịch ngân hàng tạo ra +BankMovements=Biến động +CashBudget=Tiền ngân sách +PlannedTransactions=Giao dịch dự kiến +Graph=Đồ họa +ExportDataset_banque_1=Giao dịch ngân hàng và số tài khoản +ExportDataset_banque_2=Tiền đặt cọc trượt +TransactionOnTheOtherAccount=Giao dịch trên tài khoản khác +TransactionWithOtherAccount=Chuyển khoản +PaymentNumberUpdateSucceeded=Số thanh toán cập nhật thành công +PaymentNumberUpdateFailed=Số thanh toán không thể được cập nhật +PaymentDateUpdateSucceeded=Thanh toán cập nhật ngày thành công +PaymentDateUpdateFailed=Ngày thanh toán không thể được cập nhật +Transactions=Giao dịch +BankTransactionLine=Giao dịch ngân hàng +AllAccounts=Tất cả ngân hàng / tài khoản tiền mặt +BackToAccount=Trở lại vào tài khoản +ShowAllAccounts=Hiển thị cho tất cả tài khoản +FutureTransaction=Giao dịch trong futur. Không có cách nào để hoà giải. +SelectChequeTransactionAndGenerate=Chọn / kiểm tra bộ lọc để đưa vào nhận tiền gửi kiểm tra và bấm vào "Create". +InputReceiptNumber=Chọn kê ngân hàng liên quan đến hoà giải. Sử dụng một giá trị số có thể phân loại (ví dụ như, YYYYMM) +EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ +ToConciliate=Hoà giải? +ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp +BankDashboard=Tài khoản ngân hàng tóm tắt +DefaultRIB=Mặc định BAN +AllRIB=Tất cả BAN LabelRIB=BAN Label -NoBANRecord=No BAN record -DeleteARib=Delete BAN record -ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +NoBANRecord=Không có hồ sơ BAN +DeleteARib=Xóa BAN kỷ lục +ConfirmDeleteRib=Bạn Bạn có chắc chắn muốn xóa bản ghi BAN này? diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang index 1edd7213076..a2b13f31f0d 100644 --- a/htdocs/langs/vi_VN/bills.lang +++ b/htdocs/langs/vi_VN/bills.lang @@ -1,415 +1,415 @@ # Dolibarr language file - Source file is en_US - bills -Bill=Invoice -Bills=Invoices -BillsCustomers=Customer's invoices -BillsCustomer=Customer's invoice -BillsSuppliers=Supplier's invoices -BillsCustomersUnpaid=Unpaid customer's invoices -BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s -BillsSuppliersUnpaid=Unpaid supplier's invoices -BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s -BillsLate=Late payments -BillsStatistics=Customer's invoices statistics -BillsStatisticsSuppliers=Supplier's invoices statistics -DisabledBecauseNotErasable=Disabled because can not be erased -InvoiceStandard=Standard invoice -InvoiceStandardAsk=Standard invoice -InvoiceStandardDesc=This kind of invoice is the common invoice. -InvoiceDeposit=Deposit invoice -InvoiceDepositAsk=Deposit invoice -InvoiceDepositDesc=This kind of invoice is done when a deposit has been received. -InvoiceProForma=Proforma invoice -InvoiceProFormaAsk=Proforma invoice -InvoiceProFormaDesc=Proforma invoice is an image of a true invoice but has no accountancy value. -InvoiceReplacement=Replacement invoice -InvoiceReplacementAsk=Replacement invoice for invoice -InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. -InvoiceAvoir=Credit note -InvoiceAvoirAsk=Credit note to correct invoice -InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). -invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake -ReplaceInvoice=Replace invoice %s -ReplacementInvoice=Replacement invoice -ReplacedByInvoice=Replaced by invoice %s -ReplacementByInvoice=Replaced by invoice -CorrectInvoice=Correct invoice %s -CorrectionInvoice=Correction invoice -UsedByInvoice=Used to pay invoice %s -ConsumedBy=Consumed by -NotConsumed=Not consumed -NoReplacableInvoice=No replacable invoices -NoInvoiceToCorrect=No invoice to correct -InvoiceHasAvoir=Corrected by one or several invoices -CardBill=Invoice card -PredefinedInvoices=Predefined Invoices -Invoice=Invoice -Invoices=Invoices -InvoiceLine=Invoice line -InvoiceCustomer=Customer invoice -CustomerInvoice=Customer invoice -CustomersInvoices=Customers invoices -SupplierInvoice=Supplier invoice -SuppliersInvoices=Suppliers invoices -SupplierBill=Supplier invoice -SupplierBills=suppliers invoices -Payment=Payment -PaymentBack=Payment back -Payments=Payments -PaymentsBack=Payments back -PaidBack=Paid back -DatePayment=Payment date -DeletePayment=Delete payment -ConfirmDeletePayment=Are you sure you want to delete this payment ? -ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?
The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. -SupplierPayments=Suppliers payments -ReceivedPayments=Received payments -ReceivedCustomersPayments=Payments received from customers -PayedSuppliersPayments=Payments payed to suppliers -ReceivedCustomersPaymentsToValid=Received customers payments to validate -PaymentsReportsForYear=Payments reports for %s -PaymentsReports=Payments reports -PaymentsAlreadyDone=Payments already done -PaymentsBackAlreadyDone=Payments back already done -PaymentRule=Payment rule -PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term -PaymentAmount=Payment amount -ValidatePayment=Validate payment -PaymentHigherThanReminderToPay=Payment higher than reminder to pay -HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. -HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. -ClassifyPaid=Classify 'Paid' -ClassifyPaidPartially=Classify 'Paid partially' -ClassifyCanceled=Classify 'Abandoned' -ClassifyClosed=Classify 'Closed' -ClassifyUnBilled=Classify 'Unbilled' -CreateBill=Create Invoice -AddBill=Add invoice or credit note -AddToDraftInvoices=Add to draft invoice -DeleteBill=Delete invoice -SearchACustomerInvoice=Search for a customer invoice -SearchASupplierInvoice=Search for a supplier invoice -CancelBill=Cancel an invoice -SendRemindByMail=Send reminder by EMail -DoPayment=Do payment -DoPaymentBack=Do payment back -ConvertToReduc=Convert into future discount -EnterPaymentReceivedFromCustomer=Enter payment received from customer -EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero -Amount=Amount -PriceBase=Price base -BillStatus=Invoice status -BillStatusDraft=Draft (needs to be validated) -BillStatusPaid=Paid -BillStatusPaidBackOrConverted=Paid or converted into discount -BillStatusConverted=Paid (ready for final invoice) -BillStatusCanceled=Abandoned -BillStatusValidated=Validated (needs to be paid) -BillStatusStarted=Started -BillStatusNotPaid=Not paid -BillStatusClosedUnpaid=Closed (unpaid) -BillStatusClosedPaidPartially=Paid (partially) -BillShortStatusDraft=Draft -BillShortStatusPaid=Paid -BillShortStatusPaidBackOrConverted=Processed -BillShortStatusConverted=Processed -BillShortStatusCanceled=Abandoned -BillShortStatusValidated=Validated -BillShortStatusStarted=Started -BillShortStatusNotPaid=Not paid -BillShortStatusClosedUnpaid=Closed -BillShortStatusClosedPaidPartially=Paid (partially) -PaymentStatusToValidShort=To validate -ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined -ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this. -ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes -ErrorBillNotFound=Invoice %s does not exist -ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s. -ErrorDiscountAlreadyUsed=Error, discount already used -ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount -ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount -ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status -BillFrom=From -BillTo=To -ActionsOnBill=Actions on invoice -NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order -LastBills=Last %s invoices -LastCustomersBills=Last %s customers invoices -LastSuppliersBills=Last %s suppliers invoices -AllBills=All invoices -OtherBills=Other invoices -DraftBills=Draft invoices -CustomersDraftInvoices=Customers draft invoices -SuppliersDraftInvoices=Suppliers draft invoices -Unpaid=Unpaid -ConfirmDeleteBill=Are you sure you want to delete this invoice ? -ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ? -ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status ? -ConfirmClassifyPaidBill=Are you sure you want to change invoice %s to status paid ? -ConfirmCancelBill=Are you sure you want to cancel invoice %s ? -ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? -ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? -ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. -ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer -ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned -ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason -ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») -ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. -ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit -ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuse to pay his debt. -ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned -ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:
- payment not complete because some products were shipped back
- amount claimed too important because a discount was forgotten
In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note. -ConfirmClassifyAbandonReasonOther=Other -ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice. -ConfirmCustomerPayment=Do you confirm this payment input for %s %s ? -ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? -ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated. -ValidateBill=Validate invoice -UnvalidateBill=Unvalidate invoice -NumberOfBills=Nb of invoices -NumberOfBillsByMonth=Nb of invoices by month -AmountOfBills=Amount of invoices -AmountOfBillsByMonthHT=Amount of invoices by month (net of tax) -ShowSocialContribution=Show social contribution -ShowBill=Show invoice -ShowInvoice=Show invoice -ShowInvoiceReplace=Show replacing invoice -ShowInvoiceAvoir=Show credit note -ShowInvoiceDeposit=Show deposit invoice -ShowPayment=Show payment -File=File -AlreadyPaid=Already paid -AlreadyPaidBack=Already paid back -AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) -Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back -Rest=Pending -AmountExpected=Amount claimed -ExcessReceived=Excess received -EscompteOffered=Discount offered (payment before term) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) -StandingOrders=Standing orders -StandingOrder=Standing order -NoDraftBills=No draft invoices -NoOtherDraftBills=No other draft invoices -NoDraftInvoices=No draft invoices -RefBill=Invoice ref -ToBill=To bill -RemainderToBill=Remainder to bill -SendBillByMail=Send invoice by email -SendReminderBillByMail=Send reminder by email -RelatedCommercialProposals=Related commercial proposals -MenuToValid=To valid -DateMaxPayment=Payment due before -DateEcheance=Due date limit -DateInvoice=Invoice date -NoInvoice=No invoice -ClassifyBill=Classify invoice -SupplierBillsToPay=Suppliers invoices to pay -CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -NonPercuRecuperable=Non-recoverable -SetConditions=Set payment terms -SetMode=Set payment mode -Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice -CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines -CustomersInvoicesAndPayments=Customer invoices and payments -ExportDataset_invoice_1=Customer invoices list and invoice's lines -ExportDataset_invoice_2=Customer invoices and payments +Bill=Hoá đơn +Bills=Hoá đơn +BillsCustomers=Hoá đơn của khách hàng +BillsCustomer=Hóa đơn của khách hàng +BillsSuppliers=Hoá đơn của nhà cung cấp +BillsCustomersUnpaid=Hoá đơn chưa thanh toán của khách hàng +BillsCustomersUnpaidForCompany=Hoá đơn chưa thanh toán của khách hàng cho% s +BillsSuppliersUnpaid=Hoá đơn chưa thanh toán của nhà cung cấp +BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho% s +BillsLate=Khoản thanh toán trễ +BillsStatistics=Hoá đơn số liệu thống kê của khách hàng +BillsStatisticsSuppliers=Hoá đơn của nhà cung cấp số liệu thống kê +DisabledBecauseNotErasable=Vô hiệu hóa vì không thể bị xóa +InvoiceStandard=Hóa đơn tiêu chuẩn +InvoiceStandardAsk=Hóa đơn tiêu chuẩn +InvoiceStandardDesc=Đây là loại hóa đơn là hóa đơn thông thường. +InvoiceDeposit=Hóa đơn tiền gửi +InvoiceDepositAsk=Hóa đơn tiền gửi +InvoiceDepositDesc=Đây là loại hoá đơn được thực hiện khi một khoản tiền gửi đã được nhận. +InvoiceProForma=Proforma hóa đơn +InvoiceProFormaAsk=Proforma hóa đơn +InvoiceProFormaDesc=Proforma hóa đơn là một hình ảnh của một hóa đơn đúng, nhưng không có giá trị kế toán. +InvoiceReplacement=Thay thế hóa đơn +InvoiceReplacementAsk=Thay thế hóa đơn cho hóa đơn +InvoiceReplacementDesc=Thay thế hóa đơn được sử dụng để hủy bỏ và thay thế hoàn toàn một hóa đơn không có thanh toán đã nhận được.

Lưu ý: Chỉ có hoá đơn không có thanh toán trên nó có thể được thay thế. Nếu bạn thay thế hóa đơn chưa khép kín, nó sẽ được tự động đóng cửa để 'bỏ rơi'. +InvoiceAvoir=Lưu ý tín dụng +InvoiceAvoirAsk=Lưu ý tín dụng cho hóa đơn đúng +InvoiceAvoirDesc=Những lưu ý tín dụng là một hóa đơn tiêu cực được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi ông quay trở lại một số sản phẩm chẳng hạn). +invoiceAvoirWithLines=Tạo tín dụng Lưu ý với dòng từ hoá đơn nguồn gốc +invoiceAvoirWithPaymentRestAmount=Tạo tín dụng Lưu ý với số lượng hồ có nguồn gốc hóa đơn thanh toán của +invoiceAvoirLineWithPaymentRestAmount=Lượng tín dụng Ghi chú của hồ hóa đơn thanh toán của +ReplaceInvoice=Thay thế hóa đơn% s +ReplacementInvoice=Thay thế hóa đơn +ReplacedByInvoice=Thay thế bằng hóa đơn% s +ReplacementByInvoice=Thay thế bằng hóa đơn +CorrectInvoice=Hóa đơn đúng% s +CorrectionInvoice=Chỉnh hóa đơn +UsedByInvoice=Được sử dụng để thanh toán hoá đơn% s +ConsumedBy=Tiêu thụ +NotConsumed=Không tiêu thụ +NoReplacableInvoice=Không có hoá đơn replacable +NoInvoiceToCorrect=Không có hoá đơn để điều chỉnh +InvoiceHasAvoir=Sửa chữa theo một hoặc một số hoá đơn +CardBill=Thẻ hóa đơn +PredefinedInvoices=Hoá đơn được xác định trước +Invoice=Hoá đơn +Invoices=Hoá đơn +InvoiceLine=Đường hóa đơn +InvoiceCustomer=Hóa đơn của khách hàng +CustomerInvoice=Hóa đơn của khách hàng +CustomersInvoices=Khách hàng hoá đơn +SupplierInvoice=Nhà cung cấp hóa đơn +SuppliersInvoices=Nhà cung cấp hoá đơn +SupplierBill=Nhà cung cấp hóa đơn +SupplierBills=các nhà cung cấp hoá đơn +Payment=Thanh toán +PaymentBack=Lại thanh toán +Payments=Thanh toán +PaymentsBack=Thanh toán lại +PaidBack=Trả lại +DatePayment=Ngày thanh toán +DeletePayment=Xóa thanh toán +ConfirmDeletePayment=Bạn Bạn có chắc chắn muốn xóa thanh toán này? +ConfirmConvertToReduc=Bạn có muốn chuyển đổi giấy báo này hoặc khoản đặt cọc vào một giảm giá tuyệt đối?
Số lượng như vậy sẽ được lưu trong số tất cả giảm giá và có thể được sử dụng như giảm giá cho một hiện tại hoặc tương lai hóa đơn cho khách hàng này. +SupplierPayments=Nhà cung cấp các khoản thanh toán +ReceivedPayments=Khoản tiền nhận được +ReceivedCustomersPayments=Khoản tiền nhận được từ khách hàng +PayedSuppliersPayments=Thanh toán payed để nhà cung cấp +ReceivedCustomersPaymentsToValid=Nhận được khoản thanh toán cho khách hàng để xác nhận +PaymentsReportsForYear=Báo cáo thanh toán cho% s +PaymentsReports=Thanh toán báo cáo +PaymentsAlreadyDone=Thanh toán đã được thực hiện +PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại +PaymentRule=Quy tắc thanh toán +PaymentMode=Phương thức thanh toán +PaymentConditions=Thời hạn thanh toán +PaymentConditionsShort=Thời hạn thanh toán +PaymentAmount=Số tiền thanh toán +ValidatePayment=Xác nhận thanh toán +PaymentHigherThanReminderToPay=Thanh toán cao hơn so với lời nhắc nhở phải trả +HelpPaymentHigherThanReminderToPay=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền.
Chỉnh sửa mục nhập của bạn, nếu không xác nhận và suy nghĩ về việc tạo ra một giấy báo có của dư thừa nhận được cho mỗi hoá đơn đã nộp thừa. +HelpPaymentHigherThanReminderToPaySupplier=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền.
Chỉnh sửa mục nhập của bạn, nếu không xác nhận. +ClassifyPaid=Phân loại 'trả tiền' +ClassifyPaidPartially=Phân loại 'trả một phần' +ClassifyCanceled=Phân loại 'bỏ rơi' +ClassifyClosed=Phân loại 'Đóng' +ClassifyUnBilled=Phân loại 'chưa lập hoá đơn' +CreateBill=Tạo hóa đơn +AddBill=Thêm hóa đơn hoặc tín dụng lưu ý +AddToDraftInvoices=Thêm vào dự thảo hóa đơn +DeleteBill=Xóa hóa đơn +SearchACustomerInvoice=Tìm kiếm một hóa đơn của khách hàng +SearchASupplierInvoice=Tìm kiếm một nhà cung cấp hóa đơn +CancelBill=Hủy bỏ một hóa đơn +SendRemindByMail=Gửi lời nhắc nhở bằng thư điện tử +DoPayment=Do thanh toán +DoPaymentBack=Do thanh toán lại +ConvertToReduc=Chuyển đổi thành giảm giá trong tương lai +EnterPaymentReceivedFromCustomer=Nhập thanh toán nhận được từ khách hàng +EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng +DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa vì còn phải trả là số không +Amount=Số tiền +PriceBase=Giá cơ sở +BillStatus=Tình trạng hóa đơn +BillStatusDraft=Dự thảo (cần phải được xác nhận) +BillStatusPaid=Trả +BillStatusPaidBackOrConverted=Trả tiền hoặc chuyển đổi thành giảm giá +BillStatusConverted=Trả (sẵn sàng cho hóa đơn cuối cùng) +BillStatusCanceled=Bị bỏ rơi +BillStatusValidated=Xác nhận (cần phải được thanh toán) +BillStatusStarted=Bắt đầu +BillStatusNotPaid=Không trả tiền +BillStatusClosedUnpaid=Đóng (chưa thanh toán) +BillStatusClosedPaidPartially=Trả tiền (một phần) +BillShortStatusDraft=Dự thảo +BillShortStatusPaid=Trả +BillShortStatusPaidBackOrConverted=Xử lý +BillShortStatusConverted=Xử lý +BillShortStatusCanceled=Bị bỏ rơi +BillShortStatusValidated=Xác nhận +BillShortStatusStarted=Bắt đầu +BillShortStatusNotPaid=Không trả tiền +BillShortStatusClosedUnpaid=Đóng +BillShortStatusClosedPaidPartially=Trả tiền (một phần) +PaymentStatusToValidShort=Để xác nhận +ErrorVATIntraNotConfigured=Số thuế GTGT Intracommunautary chưa được xác định +ErrorNoPaiementModeConfigured=Không có phương thức thanh toán mặc định được xác định. Tới hóa đơn thiết lập mô-đun để sửa lỗi này. +ErrorCreateBankAccount=Tạo một tài khoản ngân hàng, sau đó đi vào bảng cài đặt của mô-đun hóa đơn để xác định phương thức thanh toán +ErrorBillNotFound=Hoá đơn% s không tồn tại +ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn% s. Nhưng điều này đã được thay thế bằng hóa đơn% s. +ErrorDiscountAlreadyUsed=Lỗi, giảm giá đã được sử dụng +ErrorInvoiceAvoirMustBeNegative=Lỗi, hóa đơn đúng phải có một số tiêu cực +ErrorInvoiceOfThisTypeMustBePositive=Lỗi, loại hóa đơn phải có một số lượng tích cực +ErrorCantCancelIfReplacementInvoiceNotValidated=Lỗi, không thể hủy bỏ một hóa đơn đã được thay thế bằng hóa đơn khác mà vẫn còn trong tình trạng dự thảo +BillFrom=Từ +BillTo=Để +ActionsOnBill=Hoạt động trên hoá đơn +NewBill=Hóa đơn mới +Prélèvements=Lệnh chuyển tiền định +Prélèvements=Lệnh chuyển tiền định +LastBills=Hoá đơn cuối% s +LastCustomersBills=Cuối% của hoá đơn cho khách hàng +LastSuppliersBills=Cuối% s nhà cung cấp hoá đơn +AllBills=Tất cả hóa đơn +OtherBills=Hoá đơn khác +DraftBills=Dự thảo hoá đơn +CustomersDraftInvoices=Khách hàng soạn thảo hoá đơn +SuppliersDraftInvoices=Nhà cung cấp dự thảo hoá đơn +Unpaid=Chưa thanh toán +ConfirmDeleteBill=Bạn Bạn có chắc chắn muốn xóa hóa đơn này? +ConfirmValidateBill=Bạn có chắc chắn bạn muốn xác nhận hóa đơn này với tham chiếu% s? +ConfirmUnvalidateBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn% s để soạn thảo trạng thái? +ConfirmClassifyPaidBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn% s đến tình trạng thanh toán? +ConfirmCancelBill=Bạn có chắc chắn bạn muốn hủy bỏ hóa đơn% s? +ConfirmCancelBillQuestion=Tại sao bạn muốn để phân loại hóa đơn này 'bỏ rơi'? +ConfirmClassifyPaidPartially=Bạn có chắc chắn bạn muốn thay đổi hóa đơn% s đến tình trạng thanh toán? +ConfirmClassifyPaidPartiallyQuestion=Hoá đơn này chưa được thanh toán hoàn toàn. Lý do để bạn có thể đóng hóa đơn này là gì? +ConfirmClassifyPaidPartiallyReasonAvoir=Phần còn lại phải trả (% s% s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi bị quy tắc thuế GTGT với một lưu ý tín dụng. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Phần còn lại phải trả (% s% s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận để mất thuế GTGT giảm giá này. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Phần còn lại phải trả (% s% s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi khôi phục lại thuế GTGT giảm giá này mà không có một ghi chú tín dụng. +ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad khách hàng +ConfirmClassifyPaidPartiallyReasonProductReturned=Sản phẩm trả lại một phần +ConfirmClassifyPaidPartiallyReasonOther=Số tiền bị bỏ rơi vì lý do khác +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Sự lựa chọn này là có thể nếu hóa đơn của bạn đã được cung cấp với bình luận phù hợp. (Ví dụ «Chỉ có thuế tương ứng với mức giá mà đã được thực tế phải trả cho quyền khấu trừ») +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số nước, sự lựa chọn này có thể là có thể chỉ khi hóa đơn của bạn có đúng ý. +ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp với +ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Một khách hàng xấu là một khách hàng mà từ chối trả nợ của mình. +ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Lựa chọn này được sử dụng khi thanh toán không đầy đủ vì một số sản phẩm đã được trả lại +ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây:
- Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại
- Số tiền đòi quá quan trọng bởi vì giảm giá bị lãng quên
Trong mọi trường hợp, số tiền trên, tuyên bố phải được sửa chữa trong hệ thống kế toán bằng cách tạo ra một lưu ý tín dụng. +ConfirmClassifyAbandonReasonOther=Khác +ConfirmClassifyAbandonReasonOtherDesc=Lựa chọn này sẽ được sử dụng trong tất cả các trường hợp khác. Ví dụ bởi vì bạn có kế hoạch để tạo ra một hóa đơn thay thế. +ConfirmCustomerPayment=Bạn có xác nhận đầu vào thanh toán này cho% s% s? +ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này cho% s% s? +ConfirmValidatePayment=Bạn có chắc chắn bạn muốn xác nhận thanh toán này? Không có thay đổi có thể được thực hiện một lần thanh toán được xác nhận. +ValidateBill=Xác nhận hóa đơn +UnvalidateBill=Hóa đơn Unvalidate +NumberOfBills=Nb hoá đơn +NumberOfBillsByMonth=Nb hoá đơn theo tháng +AmountOfBills=Số tiền của hóa đơn +AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (sau thuế) +ShowSocialContribution=Hiển thị đóng góp xã hội +ShowBill=Hiện hóa đơn +ShowInvoice=Hiện hóa đơn +ShowInvoiceReplace=Hiển thị thay thế hóa đơn +ShowInvoiceAvoir=Xem tin tín dụng +ShowInvoiceDeposit=Hiện tiền gửi hóa đơn +ShowPayment=Hiện thanh toán +File=Tập tin +AlreadyPaid=Đã thanh toán +AlreadyPaidBack=Đã thanh toán lại +AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú tín dụng và tiền gửi) +Abandoned=Bị bỏ rơi +RemainderToPay=Phần còn lại phải trả +RemainderToTake=Phần còn lại để có +RemainderToPayBack=Phần còn lại để trả lại +Rest=Cấp phát +AmountExpected=Số tiền tuyên bố +ExcessReceived=Dư thừa đã nhận +EscompteOffered=Giảm giá cung cấp (thanh toán trước hạn) +SendBillRef=Trình hóa đơn% s +SendReminderBillRef=Trình hóa đơn% s (nhắc nhở) +StandingOrders=Đứng đơn đặt hàng +StandingOrder=Lệnh chuyển tiền định +NoDraftBills=Không có dự thảo hoá đơn +NoOtherDraftBills=Không có dự thảo hoá đơn khác +NoDraftInvoices=Không có dự thảo hoá đơn +RefBill=Ref hóa đơn +ToBill=Vào hóa đơn +RemainderToBill=Còn lại vào hóa đơn +SendBillByMail=Gửi hóa đơn qua email +SendReminderBillByMail=Gửi lời nhắc nhở bằng email +RelatedCommercialProposals=Các đề xuất liên quan đến thương mại +MenuToValid=Để hợp lệ +DateMaxPayment=Thanh toán do trước +DateEcheance=Giới hạn thời hạn +DateInvoice=Ngày hóa đơn +NoInvoice=Không có hoá đơn +ClassifyBill=Phân loại hóa đơn +SupplierBillsToPay=Nhà cung cấp hoá đơn thanh toán +CustomerBillsUnpaid=Hóa đơn khách hàng chưa thanh toán +DispenseMontantLettres=Dự luật này được soạn thảo bởi mechanographical được miễn thứ tự chữ +DispenseMontantLettres=Dự luật này được soạn thảo bởi mechanographical được miễn thứ tự chữ +NonPercuRecuperable=Không thể thu hồi +SetConditions=Thiết lập các điều khoản thanh toán +SetMode=Đặt chế độ thanh toán +Billed=Hóa đơn +RepeatableInvoice=Được xác định trước hóa đơn +RepeatableInvoices=Hoá đơn được xác định trước +Repeatable=Được xác định trước +Repeatables=Được xác định trước +ChangeIntoRepeatableInvoice=Chuyển đổi thành được xác định trước +CreateRepeatableInvoice=Tạo được xác định trước hóa đơn +CreateFromRepeatableInvoice=Tạo từ được xác định trước hóa đơn +CustomersInvoicesAndInvoiceLines=Hoá đơn của khách hàng và dòng hóa đơn của +CustomersInvoicesAndPayments=Hoá đơn và các khoản thanh toán của khách hàng +ExportDataset_invoice_1=Hóa đơn khách hàng danh sách và đường hóa đơn của +ExportDataset_invoice_2=Hoá đơn và các khoản thanh toán của khách hàng ProformaBill=Proforma Bill: -Reduction=Reduction +Reduction=Giảm ReductionShort=Reduc. -Reductions=Reductions +Reductions=Giảm ReductionsShort=Reduc. -Discount=Discount -Discounts=Discounts -AddDiscount=Create discount -AddRelativeDiscount=Create relative discount -EditRelativeDiscount=Edit relative discount -AddGlobalDiscount=Create absolute discount -EditGlobalDiscounts=Edit absolute discounts -AddCreditNote=Create credit note -ShowDiscount=Show discount -ShowReduc=Show the deduction -RelativeDiscount=Relative discount -GlobalDiscount=Global discount -CreditNote=Credit note -CreditNotes=Credit notes -Deposit=Deposit -Deposits=Deposits -DiscountFromCreditNote=Discount from credit note %s -DiscountFromDeposit=Payments from deposit invoice %s -AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation -CreditNoteDepositUse=Invoice must be validated to use this king of credits -NewGlobalDiscount=New absolute discount -NewRelativeDiscount=New relative discount -NoteReason=Note/Reason -ReasonDiscount=Reason -DiscountOfferedBy=Granted by -DiscountStillRemaining=Discounts still remaining -DiscountAlreadyCounted=Discounts already counted -BillAddress=Bill address -HelpEscompte=This discount is a discount granted to customer because its payment was made before term. -HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose. -HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example) -IdSocialContribution=Social contribution id -PaymentId=Payment id -InvoiceId=Invoice id -InvoiceRef=Invoice ref. -InvoiceDateCreation=Invoice creation date -InvoiceStatus=Invoice status -InvoiceNote=Invoice note -InvoicePaid=Invoice paid -PaymentNumber=Payment number -RemoveDiscount=Remove discount -WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty) -InvoiceNotChecked=No invoice selected -CloneInvoice=Clone invoice -ConfirmCloneInvoice=Are you sure you want to clone this invoice %s ? -DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced -DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. -NbOfPayments=Nb of payments -SplitDiscount=Split discount in two -ConfirmSplitDiscount=Are you sure you want to split this discount of %s %s into 2 lower discounts ? -TypeAmountOfEachNewDiscount=Input amount for each of two parts : -TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. -ConfirmRemoveDiscount=Are you sure you want to remove this discount ? -RelatedBill=Related invoice -RelatedBills=Related invoices -LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +Discount=Giảm giá +Discounts=Giảm giá +AddDiscount=Tạo giảm giá +AddRelativeDiscount=Tạo giảm giá tương đối +EditRelativeDiscount=Chỉnh sửa giảm giá tương đối +AddGlobalDiscount=Tạo giảm tuyệt đối +EditGlobalDiscounts=Chỉnh sửa giảm giá tuyệt đối +AddCreditNote=Tạo ghi chú tín dụng +ShowDiscount=Hiện giảm giá +ShowReduc=Các khấu trừ +RelativeDiscount=Giảm tương đối +GlobalDiscount=Giảm giá toàn cầu +CreditNote=Lưu ý tín dụng +CreditNotes=Ghi chú tín dụng +Deposit=Tiền đặt cọc +Deposits=Tiền gửi +DiscountFromCreditNote=Giảm giá từ giấy báo% s +DiscountFromDeposit=Thanh toán từ hóa đơn tiền gửi% s +AbsoluteDiscountUse=Đây là loại tín dụng có thể được sử dụng trên hóa đơn trước khi xác nhận nó +CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng vị vua này tín dụng +NewGlobalDiscount=Giảm giá mới tuyệt đối +NewRelativeDiscount=Giảm giá mới tương đối +NoteReason=Lưu ý / Lý do +ReasonDiscount=Lý do +DiscountOfferedBy=Do +DiscountStillRemaining=Giảm giá vẫn còn lại +DiscountAlreadyCounted=Giảm giá đã tính +BillAddress=Địa chỉ hóa đơn +HelpEscompte=Giảm giá này là giảm giá dành cho các khách hàng thanh toán bởi vì nó đã được thực hiện trước thời hạn. +HelpAbandonBadCustomer=Số tiền này đã bị bỏ rơi (khách hàng cho là một khách hàng xấu) và được coi là một ngoại lệ lỏng lẻo. +HelpAbandonOther=Số tiền này đã bị bỏ rơi vì đó là một lỗi (khách hàng sai hoặc hóa đơn thay thế bằng một ví dụ khác) +IdSocialContribution=Xã hội đóng góp id +PaymentId=Id thanh toán +InvoiceId=Id hóa đơn +InvoiceRef=Ref hóa đơn. +InvoiceDateCreation=Ngày tạo hóa đơn +InvoiceStatus=Tình trạng hóa đơn +InvoiceNote=Lưu ý hóa đơn +InvoicePaid=Hoá đơn thanh toán +PaymentNumber=Số thanh toán +RemoveDiscount=Hủy bỏ giảm giá +WatermarkOnDraftBill=Watermark về dự thảo hoá đơn (không có gì nếu trống) +InvoiceNotChecked=Không có hoá đơn được lựa chọn +CloneInvoice=Hóa đơn Clone +ConfirmCloneInvoice=Bạn có chắc chắn bạn muốn nhân bản hóa đơn này% s? +DisabledBecauseReplacedInvoice=Hành động vô hiệu hóa vì hóa đơn đã được thay thế +DescTaxAndDividendsArea=Khu vực này trình bày một bản tóm tắt của tất cả các khoản thanh toán cho các chi phí đặc biệt. Hồ sơ chỉ với thanh toán trong năm cố định được bao gồm ở đây. +NbOfPayments=Nb thanh toán +SplitDiscount=Tách chiết khấu trong hai +ConfirmSplitDiscount=Bạn có chắc chắn bạn muốn chia giảm giá này của% s% s thành 2 giảm giá thấp hơn? +TypeAmountOfEachNewDiscount=Số lượng đầu vào cho mỗi hai phần: +TotalOfTwoDiscountMustEqualsOriginal=Tổng của hai giảm giá mới phải bằng số tiền giảm giá ban đầu. +ConfirmRemoveDiscount=Bạn có chắc là bạn muốn loại bỏ giảm giá này? +RelatedBill=Hóa đơn liên quan +RelatedBills=Hoá đơn liên quan +LatestRelatedBill=Tất cả các hóa đơn +WarningBillExist=Cảnh báo, một hoặc nhiều hóa đơn đã tồn tại # PaymentConditions -PaymentConditionShortRECEP=Immediate -PaymentConditionRECEP=Immediate -PaymentConditionShort30D=30 days -PaymentCondition30D=30 days -PaymentConditionShort30DENDMONTH=30 days end of month -PaymentCondition30DENDMONTH=30 days end of month -PaymentConditionShort60D=60 days -PaymentCondition60D=60 days -PaymentConditionShort60DENDMONTH=60 days end of month -PaymentCondition60DENDMONTH=60 days end of month -PaymentConditionShortPT_DELIVERY=Delivery -PaymentConditionPT_DELIVERY=On delivery -PaymentConditionShortPT_ORDER=On order -PaymentConditionPT_ORDER=On order +PaymentConditionShortRECEP=Ngay lập tức +PaymentConditionRECEP=Ngay lập tức +PaymentConditionShort30D=30 ngày +PaymentCondition30D=30 ngày +PaymentConditionShort30DENDMONTH=30 ngày cuối tháng +PaymentCondition30DENDMONTH=30 ngày cuối tháng +PaymentConditionShort60D=60 ngày +PaymentCondition60D=60 ngày +PaymentConditionShort60DENDMONTH=60 ngày cuối tháng +PaymentCondition60DENDMONTH=60 ngày cuối tháng +PaymentConditionShortPT_DELIVERY=Giao hàng tận nơi +PaymentConditionPT_DELIVERY=Ngày giao hàng +PaymentConditionShortPT_ORDER=Theo lệnh +PaymentConditionPT_ORDER=Theo lệnh PaymentConditionShortPT_5050=50-50 -PaymentConditionPT_5050=50%% in advance, 50%% on delivery -FixAmount=Fix amount -VarAmount=Variable amount (%% tot.) +PaymentConditionPT_5050=50 %% trước, 50 %% khi giao hàng +FixAmount=Số tiền sửa chữa +VarAmount=Số lượng biến (%% tot.) # PaymentType -PaymentTypeVIR=Bank deposit -PaymentTypeShortVIR=Bank deposit -PaymentTypePRE=Bank's order -PaymentTypeShortPRE=Bank's order -PaymentTypeLIQ=Cash -PaymentTypeShortLIQ=Cash -PaymentTypeCB=Credit card -PaymentTypeShortCB=Credit card -PaymentTypeCHQ=Check -PaymentTypeShortCHQ=Check +PaymentTypeVIR=Tiền gửi ngân hàng +PaymentTypeShortVIR=Tiền gửi ngân hàng +PaymentTypePRE=Để Ngân hàng +PaymentTypeShortPRE=Để Ngân hàng +PaymentTypeLIQ=Tiền +PaymentTypeShortLIQ=Tiền +PaymentTypeCB=Thẻ tín dụng +PaymentTypeShortCB=Thẻ tín dụng +PaymentTypeCHQ=Kiểm tra +PaymentTypeShortCHQ=Kiểm tra PaymentTypeTIP=TIP PaymentTypeShortTIP=TIP -PaymentTypeVAD=On line payment -PaymentTypeShortVAD=On line payment -PaymentTypeTRA=Bill payment +PaymentTypeVAD=Thanh toán trực tuyến +PaymentTypeShortVAD=Thanh toán trực tuyến +PaymentTypeTRA=Thanh toán hóa đơn PaymentTypeShortTRA=Bill -BankDetails=Bank details -BankCode=Bank code -DeskCode=Desk code -BankAccountNumber=Account number -BankAccountNumberKey=Key +BankDetails=Chi tiết ngân hàng +BankCode=Mã ngân hàng +DeskCode=Đang bàn +BankAccountNumber=Số tài khoản +BankAccountNumberKey=Chính Residence=Domiciliation -IBANNumber=IBAN number +IBANNumber=Số IBAN IBAN=IBAN -BIC=BIC/SWIFT -BICNumber=BIC/SWIFT number -ExtraInfos=Extra infos -RegulatedOn=Regulated on -ChequeNumber=Check N° -ChequeOrTransferNumber=Check/Transfer N° -ChequeMaker=Check transmitter -ChequeBank=Bank of Check -NetToBePaid=Net to be paid -PhoneNumber=Tel -FullPhoneNumber=Telephone +BIC=BIC / SWIFT +BICNumber=BIC / SWIFT số +ExtraInfos=Infos thêm +RegulatedOn=Quy định về +ChequeNumber=Kiểm tra N ° +ChequeOrTransferNumber=Kiểm tra / Chuyển N ° +ChequeMaker=Kiểm tra máy phát +ChequeBank=Ngân hàng Kiểm tra +NetToBePaid=Net để được thanh toán +PhoneNumber=Điện thoại +FullPhoneNumber=Điện thoại TeleFax=Fax -PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration. -IntracommunityVATNumber=Intracommunity number of VAT -PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to -PaymentByChequeOrderedToShort=Check payment (including tax) are payable to -SendTo=sent to -PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account -VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI -LawApplicationPart1=By application of the law 80.335 of 12/05/80 -LawApplicationPart2=the goods remain the property of -LawApplicationPart3=the seller until the complete cashing of -LawApplicationPart4=their price. -LimitedLiabilityCompanyCapital=SARL with Capital of -UseLine=Apply -UseDiscount=Use discount -UseCredit=Use credit -UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit -MenuChequeDeposits=Checks deposits -MenuCheques=Checks -MenuChequesReceipts=Checks receipts -NewChequeDeposit=New deposit -ChequesReceipts=Checks receipts -ChequesArea=Checks deposits area -ChequeDeposits=Checks deposits -Cheques=Checks -CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s -UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices -ShowUnpaidAll=Show all unpaid invoices -ShowUnpaidLateOnly=Show late unpaid invoices only -PaymentInvoiceRef=Payment invoice %s -ValidateInvoice=Validate invoice -Cash=Cash -Reported=Delayed -DisabledBecausePayments=Not possible since there are some payments -CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid -ExpectedToPay=Expected payment -PayedByThisPayment=Paid by this payment -ClosePaidInvoicesAutomatically=Classify "Paid" all standard or replacement invoices entirely paid. -ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. -AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". -ToMakePayment=Pay -ToMakePaymentBack=Pay back -ListOfYourUnpaidInvoices=List of unpaid invoices -NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. -RevenueStamp=Revenue stamp -YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty -PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) -TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrettyLittleSentence=Chấp nhận tiền thanh toán bằng séc do ban hành trong tên của tôi là một thành viên của một hiệp hội kế toán được chấp thuận của Cục Quản lý tài chính. +IntracommunityVATNumber=Intracommunity số thuế GTGT +PaymentByChequeOrderedTo=Kiểm tra thanh toán (bao gồm thuế) được trả cho% s gửi đến +PaymentByChequeOrderedToShort=Kiểm tra thanh toán (bao gồm thuế) được trả cho +SendTo=gửi đến +PaymentByTransferOnThisBankAccount=Thanh toán bằng chuyển khoản vào tài khoản ngân hàng sau +VATIsNotUsedForInvoice=* Không áp dụng thuế GTGT nghệ thuật-293B của CGI +LawApplicationPart1=Bằng cách áp dụng pháp luật của 80,335 12/05/80 +LawApplicationPart2=hàng hóa là tài sản của +LawApplicationPart3=người bán cho đến khi đổi tiền mặt hoàn toàn +LawApplicationPart4=giá của họ. +LimitedLiabilityCompanyCapital=SARL có vốn đầu tư của +UseLine=Áp dụng +UseDiscount=Sử dụng giảm giá +UseCredit=Sử dụng tín dụng +UseCreditNoteInInvoicePayment=Giảm số tiền thanh toán bằng tín dụng này +MenuChequeDeposits=Tiền gửi kiểm tra +MenuCheques=Kiểm tra +MenuChequesReceipts=Kiểm tra biên lai +NewChequeDeposit=Huy động mới +ChequesReceipts=Kiểm tra biên lai +ChequesArea=Khu vực tiền gửi kiểm tra +ChequeDeposits=Tiền gửi kiểm tra +Cheques=Kiểm tra +CreditNoteConvertedIntoDiscount=Lưu ý tín dụng này hoặc hóa đơn tiền gửi đã được chuyển đổi thành% s +UsBillingContactAsIncoiveRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng thanh toán thay vì địa chỉ của bên thứ ba là người nhận hoá đơn +ShowUnpaidAll=Hiển thị tất cả các hoá đơn chưa thanh toán +ShowUnpaidLateOnly=Hiện hoá đơn chưa thanh toán cuối chỉ +PaymentInvoiceRef=Thanh toán hóa đơn% s +ValidateInvoice=Xác nhận hóa đơn +Cash=Tiền +Reported=Bị trì hoãn +DisabledBecausePayments=Không thể vì có một số khoản thanh toán +CantRemovePaymentWithOneInvoicePaid=Không thể loại bỏ thanh toán kể từ khi có ít nhất một hóa đơn thanh toán phân loại +ExpectedToPay=Thanh toán dự kiến +PayedByThisPayment=Thanh toán thanh toán này +ClosePaidInvoicesAutomatically=Phân loại "Đã thanh toán" tất cả các hóa đơn tiêu chuẩn hoặc thay thế hoàn toàn thanh toán. +ClosePaidCreditNotesAutomatically=Phân loại các "Đã thanh toán" tất cả các ghi chú tín dụng hoàn toàn trả lại. +AllCompletelyPayedInvoiceWillBeClosed=Tất cả hóa đơn không còn phải trả sẽ được tự động đóng cửa để trạng thái "Đã thanh toán". +ToMakePayment=Trả +ToMakePaymentBack=Trả lại +ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa thanh toán +NoteListOfYourUnpaidInvoices=Lưu ý: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn đang kết nối như là một đại diện bán hàng. +RevenueStamp=Đóng dấu doanh thu +YouMustCreateInvoiceFromThird=Tùy chọn này chỉ có sẵn khi tạo hóa đơn từ tab "khách hàng" của của bên thứ ba +PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị) +TerreNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn và% syymm-nnnn cho các ghi chú tín dụng mà yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0 +MarsNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn%,% syymm-nnnn cho hoá đơn thay thế,% syymm-nnnn cho các ghi chú tín dụng và% syymm-nnnn cho các ghi chú tín dụng mà yyyy là năm, mm là tháng và NNNN là một chuỗi không có phá vỡ và không trở về 0 +TerreNumRefModelError=Một dự luật bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này. ##### Types de contacts ##### -TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice -TypeContact_facture_external_BILLING=Customer invoice contact -TypeContact_facture_external_SHIPPING=Customer shipping contact -TypeContact_facture_external_SERVICE=Customer service contact -TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice -TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact -TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact -TypeContact_invoice_supplier_external_SERVICE=Supplier service contact +TypeContact_facture_internal_SALESREPFOLL=Đại diện sau lên hóa đơn của khách hàng +TypeContact_facture_external_BILLING=Hóa đơn của khách hàng liên lạc +TypeContact_facture_external_SHIPPING=Vận chuyển khách hàng liên hệ +TypeContact_facture_external_SERVICE=Liên hệ với dịch vụ khách hàng +TypeContact_invoice_supplier_internal_SALESREPFOLL=Đại diện theo dõi nhà cung cấp hóa đơn +TypeContact_invoice_supplier_external_BILLING=Nhà cung cấp hóa đơn liên lạc +TypeContact_invoice_supplier_external_SHIPPING=Nhà cung cấp vận chuyển liên lạc +TypeContact_invoice_supplier_external_SERVICE=Nhà cung cấp dịch vụ liên lạc diff --git a/htdocs/langs/vi_VN/bookmarks.lang b/htdocs/langs/vi_VN/bookmarks.lang index 7acb946bb62..5c2449cfbdb 100644 --- a/htdocs/langs/vi_VN/bookmarks.lang +++ b/htdocs/langs/vi_VN/bookmarks.lang @@ -1,19 +1,19 @@ # Dolibarr language file - Source file is en_US - marque pages -AddThisPageToBookmarks=Add this page to bookmarks +AddThisPageToBookmarks=Thêm trang này vào bookmark Bookmark=Bookmark -Bookmarks=Bookmarks -NewBookmark=New bookmark -ShowBookmark=Show bookmark -OpenANewWindow=Open a new window -ReplaceWindow=Replace current window -BookmarkTargetNewWindowShort=New window -BookmarkTargetReplaceWindowShort=Current window -BookmarkTitle=Bookmark title +Bookmarks=Đánh dấu +NewBookmark=Bookmark mới +ShowBookmark=Hiện dấu +OpenANewWindow=Mở cửa sổ mới +ReplaceWindow=Thay thế cửa sổ hiện tại +BookmarkTargetNewWindowShort=Cửa sổ mới +BookmarkTargetReplaceWindowShort=Cửa sổ hiện tại +BookmarkTitle=Bookmark tiêu đề UrlOrLink=URL -BehaviourOnClick=Behaviour when a URL is clicked -CreateBookmark=Create bookmark -SetHereATitleForLink=Set a title for the bookmark -UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL -ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window -BookmarksManagement=Bookmarks management -ListOfBookmarks=List of bookmarks +BehaviourOnClick=Hành vi khi một URL được nhấp +CreateBookmark=Tạo dấu +SetHereATitleForLink=Đặt tên cho bookmark +UseAnExternalHttpLinkOrRelativeDolibarrLink=Sử dụng một URL http bên ngoài hoặc một URL tương đối Dolibarr +ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Chọn nếu một trang mở liên kết phải xuất hiện trên cửa sổ hiện tại hoặc mới +BookmarksManagement=Quản lý bookmark +ListOfBookmarks=Danh sách bookmark diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang index e7e9da7dc1b..a734b1a3d69 100644 --- a/htdocs/langs/vi_VN/boxes.lang +++ b/htdocs/langs/vi_VN/boxes.lang @@ -1,91 +1,91 @@ # Dolibarr language file - Source file is en_US - boxes -BoxLastRssInfos=Rss information -BoxLastProducts=Last %s products/services -BoxProductsAlertStock=Products in stock alert -BoxLastProductsInContract=Last %s contracted products/services -BoxLastSupplierBills=Last supplier's invoices -BoxLastCustomerBills=Last customer's invoices -BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices -BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices -BoxLastProposals=Last commercial proposals -BoxLastProspects=Last modified prospects -BoxLastCustomers=Last modified customers -BoxLastSuppliers=Last modified suppliers -BoxLastCustomerOrders=Last customer orders -BoxLastBooks=Last books -BoxLastActions=Last actions -BoxLastContracts=Last contracts -BoxLastContacts=Last contacts/addresses -BoxLastMembers=Last members -BoxFicheInter=Last interventions -BoxCurrentAccounts=Opened accounts balance -BoxSalesTurnover=Sales turnover -BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices -BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices -BoxTitleLastBooks=Last %s recorded books -BoxTitleNbOfCustomers=Number of clients -BoxTitleLastRssInfos=Last %s news from %s -BoxTitleLastProducts=Last %s modified products/services -BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Last %s modified customer orders -BoxTitleLastSuppliers=Last %s recorded suppliers -BoxTitleLastCustomers=Last %s recorded customers -BoxTitleLastModifiedSuppliers=Last %s modified suppliers -BoxTitleLastModifiedCustomers=Last %s modified customers -BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects -BoxTitleLastPropals=Last %s recorded proposals -BoxTitleLastCustomerBills=Last %s customer's invoices -BoxTitleLastSupplierBills=Last %s supplier's invoices -BoxTitleLastProspects=Last %s recorded prospects -BoxTitleLastModifiedProspects=Last %s modified prospects -BoxTitleLastProductsInContract=Last %s products/services in a contract -BoxTitleLastModifiedMembers=Last %s modified members -BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices -BoxTitleCurrentAccounts=Opened account's balances -BoxTitleSalesTurnover=Sales turnover -BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices -BoxTitleLastModifiedContacts=Last %s modified contacts/addresses -BoxMyLastBookmarks=My last %s bookmarks -BoxOldestExpiredServices=Oldest active expired services -BoxLastExpiredServices=Last %s oldest contacts with active expired services -BoxTitleLastActionsToDo=Last %s actions to do -BoxTitleLastContracts=Last %s contracts -BoxTitleLastModifiedDonations=Last %s modified donations -BoxTitleLastModifiedExpenses=Last %s modified expenses -BoxGlobalActivity=Global activity (invoices, proposals, orders) -FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s -LastRefreshDate=Last refresh date -NoRecordedBookmarks=No bookmarks defined. -ClickToAdd=Click here to add. -NoRecordedCustomers=No recorded customers -NoRecordedContacts=No recorded contacts -NoActionsToDo=No actions to do -NoRecordedOrders=No recorded customer's orders -NoRecordedProposals=No recorded proposals -NoRecordedInvoices=No recorded customer's invoices -NoUnpaidCustomerBills=No unpaid customer's invoices -NoRecordedSupplierInvoices=No recorded supplier's invoices -NoUnpaidSupplierBills=No unpaid supplier's invoices -NoModifiedSupplierBills=No recorded supplier's invoices -NoRecordedProducts=No recorded products/services -NoRecordedProspects=No recorded prospects -NoContractedProducts=No products/services contracted -NoRecordedContracts=No recorded contracts -NoRecordedInterventions=No recorded interventions -BoxLatestSupplierOrders=Latest supplier orders -BoxTitleLatestSupplierOrders=%s latest supplier orders -NoSupplierOrder=No recorded supplier order -BoxCustomersInvoicesPerMonth=Customer invoices per month -BoxSuppliersInvoicesPerMonth=Supplier invoices per month -BoxCustomersOrdersPerMonth=Customer orders per month -BoxSuppliersOrdersPerMonth=Supplier orders per month -BoxProposalsPerMonth=Proposals per month -NoTooLowStockProducts=No product under the low stock limit -BoxProductDistribution=Products/Services distribution -BoxProductDistributionFor=Distribution of %s for %s -ForCustomersInvoices=Customers invoices -ForCustomersOrders=Customers orders -ForProposals=Proposals +BoxLastRssInfos=Thông tin Rss +BoxLastProducts=Cuối% của sản phẩm / dịch vụ +BoxProductsAlertStock=Sản phẩm trong kho cảnh báo +BoxLastProductsInContract=Cuối% s hợp đồng sản phẩm / dịch vụ +BoxLastSupplierBills=Nhà cung cấp hoá đơn cuối cùng của +BoxLastCustomerBills=Hoá đơn của khách hàng trước +BoxOldestUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng lâu đời nhất +BoxOldestUnpaidSupplierBills=Hoá đơn chưa thanh toán lâu đời nhất của nhà cung cấp +BoxLastProposals=Cuối cùng đề nghị thương mại +BoxLastProspects=Triển vọng biến đổi cuối cùng +BoxLastCustomers=Khách hàng biến đổi cuối cùng +BoxLastSuppliers=Các nhà cung cấp biến đổi cuối cùng +BoxLastCustomerOrders=Đơn đặt hàng cuối cùng +BoxLastBooks=Cuốn sách cuối cùng +BoxLastActions=Hành động cuối cùng +BoxLastContracts=Hợp đồng cuối cùng +BoxLastContacts=Địa chỉ liên lạc cuối cùng / địa chỉ +BoxLastMembers=Thành viên cuối cùng +BoxFicheInter=Can thiệp cuối cùng +BoxCurrentAccounts=Mở tài khoản ngoại +BoxSalesTurnover=Doanh thu bán hàng +BoxTotalUnpaidCustomerBills=Tổng số khách hàng chưa thanh toán hoá đơn của +BoxTotalUnpaidSuppliersBills=Tổng số nhà cung cấp hoá đơn chưa thanh toán của +BoxTitleLastBooks=Sách ghi cuối% s +BoxTitleNbOfCustomers=Số lượng khách hàng +BoxTitleLastRssInfos=Cuối% s tin tức từ% s +BoxTitleLastProducts=Cuối% s sửa đổi sản phẩm / dịch vụ +BoxTitleProductsAlertStock=Sản phẩm trong kho cảnh báo +BoxTitleLastCustomerOrders=Đơn đặt hàng của khách hàng biến đổi cuối cùng% s +BoxTitleLastSuppliers=Các nhà cung cấp ghi cuối% s +BoxTitleLastCustomers=Cuối% s ghi nhận khách hàng +BoxTitleLastModifiedSuppliers=Các nhà cung cấp biến đổi cuối cùng% s +BoxTitleLastModifiedCustomers=Khách hàng biến đổi cuối cùng% s +BoxTitleLastCustomersOrProspects=Cuối% s sửa đổi khách hàng hoặc khách hàng tiềm năng +BoxTitleLastPropals=Cuối% s ghi nhận đề xuất +BoxTitleLastCustomerBills=Hoá đơn cuối% s khách hàng +BoxTitleLastSupplierBills=Hoá đơn cuối% s nhà cung cấp +BoxTitleLastProspects=Cuối% s ghi nhận triển vọng +BoxTitleLastModifiedProspects=Triển vọng biến đổi cuối cùng% s +BoxTitleLastProductsInContract=Cuối% của sản phẩm / dịch vụ trong hợp đồng +BoxTitleLastModifiedMembers=Các thành viên biến đổi cuối cùng% s +BoxTitleLastFicheInter=Can thiệp biến đổi cuối cùng% s +BoxTitleOldestUnpaidCustomerBills=Hoá đơn lâu đời nhất% s chưa thanh toán của khách hàng +BoxTitleOldestUnpaidSupplierBills=Hoá đơn lâu đời nhất% s chưa thanh toán của nhà cung cấp +BoxTitleCurrentAccounts=Số dư tài khoản mở của +BoxTitleSalesTurnover=Doanh thu bán hàng +BoxTitleTotalUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng +BoxTitleTotalUnpaidSuppliersBills=Hoá đơn chưa thanh toán của nhà cung cấp +BoxTitleLastModifiedContacts=Cuối% s sửa đổi địa chỉ liên lạc / địa chỉ +BoxMyLastBookmarks=% Cuối cùng của tôi s bookmark +BoxOldestExpiredServices=Dịch vụ lâu đời nhất đã hết hạn hoạt động +BoxLastExpiredServices=Cuối% s liên hệ lâu đời nhất với các dịch vụ đã hết hạn hoạt động +BoxTitleLastActionsToDo=Hành động cuối% s để làm +BoxTitleLastContracts=Hợp đồng cuối% s +BoxTitleLastModifiedDonations=Cuối% s đóng góp sửa đổi +BoxTitleLastModifiedExpenses=Chi phí biến đổi cuối cùng% s +BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng) +FailedToRefreshDataInfoNotUpToDate=Không thể làm mới RSS thông. Cuối ngày làm mới thành công:% s +LastRefreshDate=Cuối ngày làm mới +NoRecordedBookmarks=Không có dấu xác định. +ClickToAdd=Nhấn vào đây để thêm. +NoRecordedCustomers=Không có khách hàng ghi nhận +NoRecordedContacts=Không có địa chỉ liên lạc ghi +NoActionsToDo=Không có hành động để làm +NoRecordedOrders=Đơn đặt hàng không có khách hàng ghi nhận của +NoRecordedProposals=Không có đề nghị ghi +NoRecordedInvoices=Hoá đơn không có khách hàng ghi nhận của +NoUnpaidCustomerBills=Không có hoá đơn chưa thanh toán của khách hàng +NoRecordedSupplierInvoices=Không có nhà cung cấp hoá đơn ghi nhận của +NoUnpaidSupplierBills=Không có hoá đơn chưa thanh toán của nhà cung cấp +NoModifiedSupplierBills=Không có nhà cung cấp hoá đơn ghi nhận của +NoRecordedProducts=Không ghi nhận sản phẩm / dịch vụ +NoRecordedProspects=Không có triển vọng ghi +NoContractedProducts=Không có sản phẩm / dịch vụ ký hợp đồng +NoRecordedContracts=Không có hợp đồng thu âm +NoRecordedInterventions=Không có biện pháp can thiệp ghi +BoxLatestSupplierOrders=Đơn đặt hàng nhà cung cấp mới nhất +BoxTitleLatestSupplierOrders=% Của các đơn đặt hàng nhà cung cấp mới nhất +NoSupplierOrder=Không có nhà cung cấp để ghi lại +BoxCustomersInvoicesPerMonth=Hoá đơn của khách hàng mỗi tháng +BoxSuppliersInvoicesPerMonth=Nhà cung cấp hoá đơn mỗi tháng +BoxCustomersOrdersPerMonth=Đơn đặt hàng của khách hàng mỗi tháng +BoxSuppliersOrdersPerMonth=Đơn đặt hàng nhà cung cấp mỗi tháng +BoxProposalsPerMonth=Đề xuất mỗi tháng +NoTooLowStockProducts=Không có sản phẩm trong giới hạn cổ phiếu thấp +BoxProductDistribution=Sản phẩm / Dịch vụ phân phối +BoxProductDistributionFor=Phân phối% s cho% s +ForCustomersInvoices=Khách hàng hoá đơn +ForCustomersOrders=Khách hàng đặt hàng +ForProposals=Đề xuất diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang index d3dcfb68e64..b26bf057ca2 100644 --- a/htdocs/langs/vi_VN/cashdesk.lang +++ b/htdocs/langs/vi_VN/cashdesk.lang @@ -1,40 +1,40 @@ # Language file - Source file is en_US - cashdesk -CashDeskMenu=Point of sale -CashDesk=Point of sale -CashDesks=Point of sales -CashDeskBank=Bank account -CashDeskBankCash=Bank account (cash) -CashDeskBankCB=Bank account (card) -CashDeskBankCheque=Bank account (cheque) -CashDeskWarehouse=Warehouse -CashdeskShowServices=Selling services -CashDeskProducts=Products -CashDeskStock=Stock -CashDeskOn=on -CashDeskThirdParty=Third party -CashdeskDashboard=Point of sale access -ShoppingCart=Shopping cart -NewSell=New sell -BackOffice=Back office -AddThisArticle=Add this article -RestartSelling=Go back on sell -SellFinished=Sell finished -PrintTicket=Print ticket -NoProductFound=No article found -ProductFound=product found -ProductsFound=products found -NoArticle=No article -Identification=Identification -Article=Article -Difference=Difference -TotalTicket=Total ticket -NoVAT=No VAT for this sale -Change=Excess received -CalTip=Click to view the calendar -CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse -BankToPay=Charge Account -ShowCompany=Show company -ShowStock=Show warehouse -DeleteArticle=Click to remove this article -FilterRefOrLabelOrBC=Search (Ref/Label) -UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. +CashDeskMenu=Điểm bán hàng +CashDesk=Điểm bán hàng +CashDesks=Điểm bán hàng +CashDeskBank=Tài khoản ngân hàng +CashDeskBankCash=Tài khoản ngân hàng (tiền mặt) +CashDeskBankCB=Tài khoản ngân hàng (thẻ) +CashDeskBankCheque=Tài khoản ngân hàng (kiểm tra) +CashDeskWarehouse=Kho +CashdeskShowServices=Dịch vụ bán hàng +CashDeskProducts=Sản phẩm +CashDeskStock=Cổ +CashDeskOn=trên +CashDeskThirdParty=Bên thứ ba +CashdeskDashboard=Điểm truy cập bán +ShoppingCart=Giỏ hàng +NewSell=Bán mới +BackOffice=Trở lại văn phòng +AddThisArticle=Thêm bài viết này +RestartSelling=Quay trở lại trên bán +SellFinished=Bán thành phẩm +PrintTicket=In vé +NoProductFound=Không có bài viết được tìm thấy +ProductFound=sản phẩm tìm thấy +ProductsFound=sản phẩm tìm thấy +NoArticle=Không có bài viết +Identification=Xác định +Article=Điều +Difference=Sự khác biệt +TotalTicket=Tổng số vé +NoVAT=Không có thuế GTGT đối với bán này +Change=Dư thừa đã nhận +CalTip=Nhấn vào đây để xem lịch +CashDeskSetupStock=Bạn yêu cầu để giảm chứng khoán vào việc tạo hóa đơn nhưng kho cho điều này là không được xác định
Thay đổi thiết lập mô-đun chứng khoán, hoặc chọn một nhà kho +BankToPay=Tài khoản phí +ShowCompany=Hiện công ty +ShowStock=Hiện kho +DeleteArticle=Nhấn vào đây để gỡ bỏ bài viết này +FilterRefOrLabelOrBC=Tìm kiếm (Ref / Label) +UserNeedPermissionToEditStockToUsePos=Bạn yêu cầu để giảm chứng khoán vào việc tạo ra hóa đơn, vì vậy người dùng có sử dụng POS cần phải có sự cho phép để chỉnh sửa chứng khoán. diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang index 27c4fc44394..6f08b8ab539 100644 --- a/htdocs/langs/vi_VN/categories.lang +++ b/htdocs/langs/vi_VN/categories.lang @@ -1,113 +1,114 @@ # Dolibarr language file - Source file is en_US - categories -Category=Category -Categories=Categories -Rubrique=Category -Rubriques=Categories -categories=categories -TheCategorie=The category -NoCategoryYet=No category of this type created -In=In -AddIn=Add in -modify=modify -Classify=Classify -CategoriesArea=Categories area -ProductsCategoriesArea=Products/Services categories area -SuppliersCategoriesArea=Suppliers categories area -CustomersCategoriesArea=Customers categories area -ThirdPartyCategoriesArea=Third parties categories area -MembersCategoriesArea=Members categories area -ContactsCategoriesArea=Contacts categories area -MainCats=Main categories -SubCats=Subcategories -CatStatistics=Statistics -CatList=List of categories -AllCats=All categories -ViewCat=View category -NewCat=Add category -NewCategory=New category -ModifCat=Modify category -CatCreated=Category created -CreateCat=Create category -CreateThisCat=Create this category -ValidateFields=Validate the fields -NoSubCat=No subcategory. -SubCatOf=Subcategory -FoundCats=Found categories -FoundCatsForName=Categories found for the name : -FoundSubCatsIn=Subcategories found in the category -ErrSameCatSelected=You selected the same category several times -ErrForgotCat=You forgot to choose the category -ErrForgotField=You forgot to inform the fields -ErrCatAlreadyExists=This name is already used -AddProductToCat=Add this product to a category? -ImpossibleAddCat=Impossible to add the category -ImpossibleAssociateCategory=Impossible to associate the category to -WasAddedSuccessfully=%s was added successfully. -ObjectAlreadyLinkedToCategory=Element is already linked to this category. -CategorySuccessfullyCreated=This category %s has been added with success. -ProductIsInCategories=Product/service owns to following categories -SupplierIsInCategories=Third party owns to following suppliers categories -CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -MemberIsInCategories=This member owns to following members categories -ContactIsInCategories=This contact owns to following contacts categories -ProductHasNoCategory=This product/service is not in any categories -SupplierHasNoCategory=This supplier is not in any categories -CompanyHasNoCategory=This company is not in any categories -MemberHasNoCategory=This member is not in any categories -ContactHasNoCategory=This contact is not in any categories -ClassifyInCategory=Classify in category -NoneCategory=None -NotCategorized=Without category -CategoryExistsAtSameLevel=This category already exists with this ref -ReturnInProduct=Back to product/service card -ReturnInSupplier=Back to supplier card -ReturnInCompany=Back to customer/prospect card -ContentsVisibleByAll=The contents will be visible by all -ContentsVisibleByAllShort=Contents visible by all -ContentsNotVisibleByAllShort=Contents not visible by all -CategoriesTree=Categories tree -DeleteCategory=Delete category -ConfirmDeleteCategory=Are you sure you want to delete this category ? -RemoveFromCategory=Remove link with categorie -RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -NoCategoriesDefined=No category defined -SuppliersCategoryShort=Suppliers category -CustomersCategoryShort=Customers category -ProductsCategoryShort=Products category -MembersCategoryShort=Members category -SuppliersCategoriesShort=Suppliers categories -CustomersCategoriesShort=Customers categories -CustomersProspectsCategoriesShort=Custo./Prosp. categories -ProductsCategoriesShort=Products categories -MembersCategoriesShort=Members categories -ContactCategoriesShort=Contacts categories -ThisCategoryHasNoProduct=This category does not contain any product. -ThisCategoryHasNoSupplier=This category does not contain any supplier. -ThisCategoryHasNoCustomer=This category does not contain any customer. -ThisCategoryHasNoMember=This category does not contain any member. -ThisCategoryHasNoContact=This category does not contain any contact. -AssignedToCustomer=Assigned to a customer -AssignedToTheCustomer=Assigned to the customer -InternalCategory=Internal category -CategoryContents=Category contents +Category=Danh mục +Categories=Loại +Rubrique=Danh mục +Rubriques=Loại +categories=loại +TheCategorie=Các thể loại +NoCategoryYet=Không có loại của loại hình này tạo ra +In=Trong +AddIn=Thêm vào +modify=sửa đổi +Classify=Phân loại +CategoriesArea=Loại khu vực +ProductsCategoriesArea=Khu vực sản phẩm / dịch vụ loại +SuppliersCategoriesArea=Khu vực Nhà cung cấp loại +CustomersCategoriesArea=Khu vực khách hàng mục +ThirdPartyCategoriesArea=Khu vực bên thứ ba loại +MembersCategoriesArea=Thành viên khu vực loại +ContactsCategoriesArea=Khu vực Liên hệ loại +MainCats=Loại chính +SubCats=Tiểu thể loại +CatStatistics=Thống kê +CatList=Danh sách các loại +AllCats=Tất cả thể loại +ViewCat=Xem thể loại +NewCat=Thêm thể loại +NewCategory=Thể loại mới +ModifCat=Sửa đổi thể loại +CatCreated=Loại tạo +CreateCat=Tạo ra thể loại +CreateThisCat=Tạo ra thể loại này +ValidateFields=Xác nhận các lĩnh vực +NoSubCat=Không có tiểu thể loại. +SubCatOf=Danh mục con +FoundCats=Tìm thấy loại +FoundCatsForName=Loại được tìm thấy cho tên: +FoundSubCatsIn=Tiểu thể tìm thấy trong các loại +ErrSameCatSelected=Bạn đã chọn cùng một loại nhiều lần +ErrForgotCat=Bạn quên chọn thể loại +ErrForgotField=Bạn quên thông báo cho các lĩnh vực +ErrCatAlreadyExists=Tên này đã được sử dụng +AddProductToCat=Thêm sản phẩm này vào một danh mục? +ImpossibleAddCat=Không thể thêm các loại +ImpossibleAssociateCategory=Không thể kết hợp các thể loại để +WasAddedSuccessfully=% S đã được thêm thành công. +ObjectAlreadyLinkedToCategory=Yếu tố đã được liên kết với thể loại này. +CategorySuccessfullyCreated=Thể loại này% s đã được thêm thành công. +ProductIsInCategories=Sản phẩm / dịch vụ để sở hữu loại sau +SupplierIsInCategories=Sở hữu của bên thứ ba để cung cấp các loại sau đây +CompanyIsInCustomersCategories=Bên thứ ba này sở hữu để sau khách hàng / khách hàng tiềm năng loại +CompanyIsInSuppliersCategories=Bên thứ ba này sở hữu để sau nhà cung cấp các loại +MemberIsInCategories=Thành viên này sở hữu để các thành viên sau đây loại +ContactIsInCategories=Liên hệ này sở hữu để liên lạc sau loại +ProductHasNoCategory=Đây sản phẩm / dịch vụ không có trong bất kỳ loại +SupplierHasNoCategory=Nhà cung cấp này không có trong bất kỳ loại +CompanyHasNoCategory=Công ty này không có trong bất kỳ loại +MemberHasNoCategory=Thành viên này không có trong bất kỳ loại +ContactHasNoCategory=Liên hệ này không có trong bất kỳ loại +ClassifyInCategory=Phân loại trong thể loại +NoneCategory=Không +NotCategorized=Nếu không có loại +CategoryExistsAtSameLevel=Thể loại này đã tồn tại với ref này +ReturnInProduct=Về sản phẩm / dịch vụ thẻ +ReturnInSupplier=Về thẻ nhà cung cấp +ReturnInCompany=Về khách hàng / thẻ tiềm năng +ContentsVisibleByAll=Các nội dung sẽ được hiển thị tất cả +ContentsVisibleByAllShort=Nội dung có thể nhìn thấy tất cả +ContentsNotVisibleByAllShort=Nội dung không thể nhìn thấy bởi tất cả +CategoriesTree=Loại cây +DeleteCategory=Xóa thể loại +ConfirmDeleteCategory=Bạn Bạn có chắc chắn muốn xóa thể loại này? +RemoveFromCategory=Hủy bỏ liên kết với categorie +RemoveFromCategoryConfirm=Bạn Bạn có chắc chắn muốn xóa liên kết giữa các giao dịch và danh mục? +NoCategoriesDefined=Không có loại được xác định +SuppliersCategoryShort=Loại nhà cung cấp +CustomersCategoryShort=Loại khách hàng +ProductsCategoryShort=Danh mục sản phẩm +MembersCategoryShort=Loại thành viên +SuppliersCategoriesShort=Nhà cung cấp các loại +CustomersCategoriesShort=Khách hàng mục +CustomersProspectsCategoriesShort=Custo. / Prosp. loại +ProductsCategoriesShort=Danh mục sản phẩm +MembersCategoriesShort=Thành viên loại +ContactCategoriesShort=Liên hệ loại +ThisCategoryHasNoProduct=Thể loại này không chứa bất kỳ sản phẩm. +ThisCategoryHasNoSupplier=Thể loại này không chứa bất kỳ nhà cung cấp. +ThisCategoryHasNoCustomer=Thể loại này không chứa bất kỳ khách hàng. +ThisCategoryHasNoMember=Thể loại này không chứa bất kỳ thành viên. +ThisCategoryHasNoContact=Thể loại này không chứa bất kỳ liên lạc. +AssignedToCustomer=Giao cho một khách hàng +AssignedToTheCustomer=Giao cho khách hàng +InternalCategory=Loại nội bộ +CategoryContents=Danh mục nội dung CategId=Category id -CatSupList=List of supplier categories -CatCusList=List of customer/prospect categories -CatProdList=List of products categories -CatMemberList=List of members categories -CatContactList=List of contact categories and contact -CatSupLinks=Links between suppliers and categories -CatCusLinks=Links between customers/prospects and categories -CatProdLinks=Links between products/services and categories -CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories -DeleteFromCat=Remove from category -DeletePicture=Picture delete -ConfirmDeletePicture=Confirm picture deletion? -ExtraFieldsCategories=Complementary attributes -CategoriesSetup=Categories setup -CategorieRecursiv=Link with parent category automatically -CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatSupList=Danh sách các loại nhà cung cấp +CatCusList=Danh sách khách hàng / loại khách hàng tiềm năng +CatProdList=Danh sách sản phẩm loại +CatMemberList=Danh sách thành viên loại +CatContactList=Danh sách các hạng mục liên lạc và tiếp xúc +CatSupLinks=Liên kết giữa nhà cung cấp và các loại +CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại +CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại +CatMemberLinks=Liên kết giữa các thành viên và các loại +CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại +CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại +CatSupLinks=Liên kết giữa nhà cung cấp và các loại +DeleteFromCat=Di chuyển từ mục +DeletePicture=Ảnh xóa +ConfirmDeletePicture=Xác nhận xoá hình ảnh? +ExtraFieldsCategories=Thuộc tính bổ sung +CategoriesSetup=Loại thiết lập +CategorieRecursiv=Liên kết với các chủ đề chính tự động +CategorieRecursivHelp=Nếu được kích hoạt, sản phẩm này cũng sẽ liên quan đến chủ đề chính khi thêm vào một tiểu thể loại +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang index e7d2de76503..46c7b8d170a 100644 --- a/htdocs/langs/vi_VN/commercial.lang +++ b/htdocs/langs/vi_VN/commercial.lang @@ -1,96 +1,96 @@ # Dolibarr language file - Source file is en_US - commercial -Commercial=Commercial -CommercialArea=Commercial area -CommercialCard=Commercial card -CustomerArea=Customers area -Customer=Customer -Customers=Customers -Prospect=Prospect -Prospects=Prospects -DeleteAction=Delete an event/task -NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +Commercial=Thương mại +CommercialArea=Khu vực thương mại +CommercialCard=Thẻ thương mại +CustomerArea=Khu vực khách hàng +Customer=Khách hàng +Customers=Khách hàng +Prospect=Triển vọng +Prospects=Triển vọng +DeleteAction=Xóa một sự kiện / nhiệm vụ +NewAction=Sự kiện mới / nhiệm vụ +AddAction=Thêm sự kiện / nhiệm vụ +AddAnAction=Thêm một sự kiện / nhiệm vụ +AddActionRendezVous=Thêm một sự kiện Rendez-vous Rendez-Vous=Rendezvous -ConfirmDeleteAction=Are you sure you want to delete this event/task ? -CardAction=Event card -PercentDone=Percentage complete -ActionOnCompany=Task about company -ActionOnContact=Task about contact -TaskRDV=Meetings -TaskRDVWith=Meeting with %s -ShowTask=Show task -ShowAction=Show event -ActionsReport=Events report -ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative -SalesRepresentative=Sales representative -SalesRepresentatives=Sales representatives -SalesRepresentativeFollowUp=Sales representative (follow-up) -SalesRepresentativeSignature=Sales representative (signature) -CommercialInterlocutor=Commercial interlocutor -ErrorWrongCode=Wrong code -NoSalesRepresentativeAffected=No particular sales representative assigned -ShowCustomer=Show customer -ShowProspect=Show prospect -ListOfProspects=List of prospects -ListOfCustomers=List of customers -LastDoneTasks=Last %s completed tasks -LastRecordedTasks=Last recorded tasks -LastActionsToDo=Last %s oldest actions not completed -DoneAndToDoActionsFor=Completed and To do events for %s -DoneAndToDoActions=Completed and To do events -DoneActions=Completed events -DoneActionsFor=Completed events for %s -ToDoActions=Incomplete events -ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s -StatusNotApplicable=Not applicable -StatusActionToDo=To do -StatusActionDone=Complete -MyActionsAsked=Events I have recorded -MyActionsToDo=Events I have to do -MyActionsDone=Events assigned to me -StatusActionInProcess=In process -TasksHistoryForThisContact=Events for this contact -LastProspectDoNotContact=Do not contact -LastProspectNeverContacted=Never contacted -LastProspectToContact=To contact -LastProspectContactInProcess=Contact in process -LastProspectContactDone=Contact done -DateActionPlanned=Date event planned for -DateActionDone=Date event done -ActionAskedBy=Event reported by -ActionAffectedTo=Event assigned to -ActionDoneBy=Event done by -ActionUserAsk=Reported by -ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. -ActionAC_TEL=Phone call -ActionAC_FAX=Send fax -ActionAC_PROP=Send proposal by mail -ActionAC_EMAIL=Send Email -ActionAC_RDV=Meetings -ActionAC_INT=Intervention on site -ActionAC_FAC=Send customer invoice by mail -ActionAC_REL=Send customer invoice by mail (reminder) -ActionAC_CLO=Close -ActionAC_EMAILING=Send mass email -ActionAC_COM=Send customer order by mail -ActionAC_SHIP=Send shipping by mail -ActionAC_SUP_ORD=Send supplier order by mail -ActionAC_SUP_INV=Send supplier invoice by mail -ActionAC_OTH=Other -ActionAC_OTH_AUTO=Other (automatically inserted events) -ActionAC_MANUAL=Manually inserted events -ActionAC_AUTO=Automatically inserted events -Stats=Sales statistics -CAOrder=Sales volume (validated orders) -FromTo=from %s to %s -MargeOrder=Margins (validated orders) -RecapAnnee=Summary of the year -NoData=There is no data -StatusProsp=Prospect status -DraftPropals=Draft commercial proposals -SearchPropal=Search a commercial proposal -CommercialDashboard=Commercial summary +ConfirmDeleteAction=Bạn có chắc chắn muốn xóa sự kiện này / nhiệm vụ? +CardAction=Thẻ sự kiện +PercentDone=Tỷ lệ hoàn thành +ActionOnCompany=Nhiệm vụ về công ty +ActionOnContact=Nhiệm vụ về liên hệ +TaskRDV=Các cuộc họp +TaskRDVWith=Gặp gỡ với% s +ShowTask=Hiện nhiệm vụ +ShowAction=Hiện sự kiện +ActionsReport=Sự kiện báo cáo +ThirdPartiesOfSaleRepresentative=Thirdparties với đại diện bán hàng +SalesRepresentative=Đại diện bán hàng +SalesRepresentatives=Đại diện bán hàng +SalesRepresentativeFollowUp=Đại diện bán hàng (theo dõi) +SalesRepresentativeSignature=Đại diện bán hàng (chữ ký) +CommercialInterlocutor=Đối thoại thương mại +ErrorWrongCode=Sai mã +NoSalesRepresentativeAffected=Không có đại diện bán hàng đặc biệt được chỉ định +ShowCustomer=Hiện khách hàng +ShowProspect=Hiện khách hàng tiềm năng +ListOfProspects=Danh sách khách hàng tiềm năng +ListOfCustomers=Danh sách khách hàng +LastDoneTasks=Hoàn thành nhiệm vụ cuối% s +LastRecordedTasks=Nhiệm vụ ghi lại cuối cùng +LastActionsToDo=Hoạt động lâu đời nhất cuối% s không hoàn thành +DoneAndToDoActionsFor=Sự kiện hoàn thành và Để làm cho% s +DoneAndToDoActions=Để hoàn thành và làm sự kiện +DoneActions=Sự kiện hoàn thành +DoneActionsFor=Sự kiện hoàn thành% s +ToDoActions=Sự kiện không đầy đủ +ToDoActionsFor=Sự kiện không đầy đủ cho% s +SendPropalRef=Nộp đề xuất thương mại% s +SendOrderRef=Trình tự% s +StatusNotApplicable=Không áp dụng +StatusActionToDo=Để làm +StatusActionDone=Hoàn thành +MyActionsAsked=Tôi đã ghi lại sự kiện +MyActionsToDo=Sự kiện tôi phải làm +MyActionsDone=Sự kiện được gán cho tôi +StatusActionInProcess=Trong quá trình +TasksHistoryForThisContact=Sự kiện cho liên hệ này +LastProspectDoNotContact=Không liên hệ +LastProspectNeverContacted=Không bao giờ liên lạc +LastProspectToContact=Để liên hệ +LastProspectContactInProcess=Liên hệ trong quá trình +LastProspectContactDone=Liên hệ với thực hiện +DateActionPlanned=Ngày lên kế hoạch cho sự kiện +DateActionDone=Ngày thực hiện sự kiện +ActionAskedBy=Tổ chức sự kiện báo cáo của +ActionAffectedTo=Tổ chức sự kiện thuộc sở hữu của +ActionDoneBy=Sự kiện được thực hiện bởi +ActionUserAsk=Báo cáo của +ErrorStatusCantBeZeroIfStarted=Nếu trường 'ngày thực hiện "được làm đầy, hành động được bắt đầu (hoặc hoàn thành), do đó lĩnh vực' Trạng thái 'không thể là 0 %%. +ActionAC_TEL=Gọi điện thoại +ActionAC_FAX=Gửi fax +ActionAC_PROP=Gửi đề nghị qua đường bưu điện +ActionAC_EMAIL=Gởi thư +ActionAC_RDV=Các cuộc họp +ActionAC_INT=Can thiệp trên trang web +ActionAC_FAC=Gửi hóa đơn của khách hàng qua đường bưu điện +ActionAC_REL=Gửi hóa đơn của khách hàng qua đường bưu điện (nhắc nhở) +ActionAC_CLO=Đóng +ActionAC_EMAILING=Gửi email hàng loạt +ActionAC_COM=Gửi đơn đặt hàng qua bưu điện +ActionAC_SHIP=Gửi vận chuyển qua đường bưu điện +ActionAC_SUP_ORD=Gửi đơn đặt hàng nhà cung cấp qua đường bưu điện +ActionAC_SUP_INV=Gửi tin nhà cung cấp hóa đơn qua đường bưu điện +ActionAC_OTH=Khác +ActionAC_OTH_AUTO=Khác (sự kiện tự động chèn vào) +ActionAC_MANUAL=Sự kiện chèn bằng tay +ActionAC_AUTO=Sự kiện tự động chèn +Stats=Thống kê doanh số bán hàng +CAOrder=Khối lượng bán hàng (đơn đặt hàng xác nhận) +FromTo=từ% s đến% s +MargeOrder=Tỷ suất lợi nhuận (đơn đặt hàng xác nhận) +RecapAnnee=Tóm tắt các năm +NoData=Không có dữ liệu +StatusProsp=Tình trạng khách hàng tiềm năng +DraftPropals=Dự thảo đề xuất thương mại +SearchPropal=Tìm kiếm một đề nghị thương mại +CommercialDashboard=Tóm tắt thương mại diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang index aa679d9da56..6717f473870 100644 --- a/htdocs/langs/vi_VN/companies.lang +++ b/htdocs/langs/vi_VN/companies.lang @@ -1,131 +1,131 @@ # Dolibarr language file - Source file is en_US - companies -ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. -ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. -ErrorSetACountryFirst=Set the country first -SelectThirdParty=Select a third party -DeleteThirdParty=Delete a third party -ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ? -DeleteContact=Delete a contact/address -ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ? -MenuNewThirdParty=New third party -MenuNewCompany=New company -MenuNewCustomer=New customer -MenuNewProspect=New prospect -MenuNewSupplier=New supplier -MenuNewPrivateIndividual=New private individual -MenuSocGroup=Groups -NewCompany=New company (prospect, customer, supplier) -NewThirdParty=New third party (prospect, customer, supplier) -NewSocGroup=New company group -NewPrivateIndividual=New private individual (prospect, customer, supplier) -CreateDolibarrThirdPartySupplier=Create a third party (supplier) -ProspectionArea=Prospection area -SocGroup=Group of companies -IdThirdParty=Id third party -IdCompany=Company Id -IdContact=Contact Id -Contacts=Contacts/Addresses -ThirdPartyContacts=Third party contacts -ThirdPartyContact=Third party contact/address -StatusContactValidated=Status of contact/address -Company=Company -CompanyName=Company name -Companies=Companies -CountryIsInEEC=Country is inside European Economic Community -ThirdPartyName=Third party name -ThirdParty=Third party -ThirdParties=Third parties -ThirdPartyAll=Third parties (all) -ThirdPartyProspects=Prospects -ThirdPartyProspectsStats=Prospects -ThirdPartyCustomers=Customers -ThirdPartyCustomersStats=Customers -ThirdPartyCustomersWithIdProf12=Customers with %s or %s -ThirdPartySuppliers=Suppliers -ThirdPartyType=Third party type -Company/Fundation=Company/Foundation -Individual=Private individual -ToCreateContactWithSameName=Will create automatically a physical contact with same informations -ParentCompany=Parent company -Subsidiary=Subsidiary -Subsidiaries=Subsidiaries -NoSubsidiary=No subsidiary -ReportByCustomers=Report by customers -ReportByQuarter=Report by rate -CivilityCode=Civility code -RegisteredOffice=Registered office -Name=Name -Lastname=Last name -Firstname=First name -PostOrFunction=Post/Function -UserTitle=Title -Surname=Surname/Pseudo -Address=Address -State=State/Province -Region=Region -Country=Country -CountryCode=Country code -CountryId=Country id -Phone=Phone +ErrorCompanyNameAlreadyExists=Tên công ty% s đã tồn tại. Chọn một số khác. +ErrorPrefixAlreadyExists=Tiền tố% s đã tồn tại. Chọn một số khác. +ErrorSetACountryFirst=Thiết lập đầu tiên của đất nước +SelectThirdParty=Chọn một bên thứ ba +DeleteThirdParty=Xóa một bên thứ ba +ConfirmDeleteCompany=Bạn có chắc chắn muốn xóa công ty này và tất cả các thông tin di truyền? +DeleteContact=Xóa một số liên lạc / địa chỉ +ConfirmDeleteContact=Bạn có chắc chắn muốn xóa liên hệ này và tất cả các thông tin di truyền? +MenuNewThirdParty=Bên thứ ba mới +MenuNewCompany=Công ty mới +MenuNewCustomer=Khách hàng mới +MenuNewProspect=Triển vọng mới +MenuNewSupplier=Nhà cung cấp mới +MenuNewPrivateIndividual=Cá nhân riêng tư mới +MenuSocGroup=Nhóm +NewCompany=Công ty mới (khách hàng tiềm năng, khách hàng, nhà cung cấp) +NewThirdParty=Bên thứ ba mới (khách hàng tiềm năng, khách hàng, nhà cung cấp) +NewSocGroup=Nhóm công ty mới +NewPrivateIndividual=Cá nhân riêng tư mới (khách hàng tiềm năng, khách hàng, nhà cung cấp) +CreateDolibarrThirdPartySupplier=Tạo một bên thứ ba (nhà cung cấp) +ProspectionArea=Khu vực thăm dò +SocGroup=Nhóm các công ty +IdThirdParty=Id của bên thứ ba +IdCompany=Mã công ty +IdContact=Id Liên hệ +Contacts=Liên hệ / địa chỉ +ThirdPartyContacts=Địa chỉ liên lạc của bên thứ ba +ThirdPartyContact=Bên thứ ba liên lạc / địa chỉ +StatusContactValidated=Tình hình liên lạc / địa chỉ +Company=Công ty +CompanyName=Tên công ty +Companies=Các công ty +CountryIsInEEC=Đất nước là bên trong Cộng đồng Kinh tế châu Âu +ThirdPartyName=Tên của bên thứ ba +ThirdParty=Bên thứ ba +ThirdParties=Các bên thứ ba +ThirdPartyAll=Các bên thứ ba (tất cả) +ThirdPartyProspects=Triển vọng +ThirdPartyProspectsStats=Triển vọng +ThirdPartyCustomers=Khách hàng +ThirdPartyCustomersStats=Khách hàng +ThirdPartyCustomersWithIdProf12=Khách hàng có% s hay% s +ThirdPartySuppliers=Nhà cung cấp +ThirdPartyType=Loại bên thứ ba +Company/Fundation=Công ty / cơ sở +Individual=Cá thể +ToCreateContactWithSameName=Sẽ tự động tạo ra một tiếp xúc vật lý với cùng một thông tin +ParentCompany=Công ty mẹ +Subsidiary=Công ty con +Subsidiaries=Các công ty con +NoSubsidiary=Không có công ty con +ReportByCustomers=Báo cáo của khách hàng +ReportByQuarter=Báo cáo của tỷ lệ +CivilityCode=Mã văn minh +RegisteredOffice=Trụ sở đăng ký +Name=Tên +Lastname=Họ +Firstname=Tên đầu tiên +PostOrFunction=Bài / Chức năng +UserTitle=Tiêu đề +Surname=Họ / Pseudo +Address=Địa chỉ +State=Tiểu bang / tỉnh +Region=Khu vực +Country=Đất nước +CountryCode=Mã quốc gia +CountryId=Country ID +Phone=Điện thoại Skype=Skype -Call=Call -Chat=Chat -PhonePro=Prof. phone -PhonePerso=Pers. phone -PhoneMobile=Mobile -No_Email=Don't send mass e-mailings +Call=Gọi +Chat=Trò chuyện +PhonePro=Giáo sư điện thoại +PhonePerso=Pers. điện thoại +PhoneMobile=Điện thoại di động +No_Email=Không gửi hàng loạt thư điện tử Fax=Fax Zip=Zip Code -Town=City +Town=Thành phố Web=Web -Poste= Position -DefaultLang=Language by default -VATIsUsed=VAT is used -VATIsNotUsed=VAT is not used -CopyAddressFromSoc=Fill address with thirdparty address -NoEmailDefined=There is no email defined +Poste= Chức vụ +DefaultLang=Ngôn ngữ mặc định +VATIsUsed=Thuế GTGT được sử dụng +VATIsNotUsed=Thuế GTGT không được sử dụng +CopyAddressFromSoc=Điền địa chỉ với địa chỉ của bên thứ ba +NoEmailDefined=Không có email được xác định ##### Local Taxes ##### -LocalTax1IsUsedES= RE is used -LocalTax1IsNotUsedES= RE is not used -LocalTax2IsUsedES= IRPF is used -LocalTax2IsNotUsedES= IRPF is not used +LocalTax1IsUsedES= RE được sử dụng +LocalTax1IsNotUsedES= RE không được sử dụng +LocalTax2IsUsedES= IRPF được sử dụng +LocalTax2IsNotUsedES= IRPF không được sử dụng LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type -TypeES=Type -ThirdPartyEMail=%s -WrongCustomerCode=Customer code invalid -WrongSupplierCode=Supplier code invalid -CustomerCodeModel=Customer code model -SupplierCodeModel=Supplier code model -Gencod=Bar code +TypeLocaltax1ES=Loại RE +TypeLocaltax2ES=IRPF Loại +TypeES=Loại +ThirdPartyEMail=% S +WrongCustomerCode=Mã khách hàng không hợp lệ +WrongSupplierCode=Mã nhà cung cấp không hợp lệ +CustomerCodeModel=Mô hình mã khách hàng +SupplierCodeModel=Nhà cung cấp mô hình mã +Gencod=Mã vạch ##### Professional ID ##### -ProfId1Short=Prof. id 1 -ProfId2Short=Prof. id 2 -ProfId3Short=Prof. id 3 -ProfId4Short=Prof. id 4 -ProfId5Short=Prof. id 5 -ProfId6Short=Prof. id 5 -ProfId1=Professional ID 1 -ProfId2=Professional ID 2 -ProfId3=Professional ID 3 -ProfId4=Professional ID 4 -ProfId5=Professional ID 5 -ProfId6=Professional ID 6 -ProfId1AR=Prof Id 1 (CUIT/CUIL) -ProfId2AR=Prof Id 2 (Revenu brutes) +ProfId1Short=Giáo sư id 1 +ProfId2Short=Giáo sư id 2 +ProfId3Short=Giáo sư id 3 +ProfId4Short=Giáo sư id 4 +ProfId5Short=Giáo sư id 5 +ProfId6Short=Giáo sư id 5 +ProfId1=ID chuyên nghiệp 1 +ProfId2=ID chuyên nghiệp 2 +ProfId3=ID chuyên nghiệp 3 +ProfId4=ID chuyên nghiệp 4 +ProfId5=ID chuyên nghiệp 5 +ProfId6=ID chuyên nghiệp 6 +ProfId1AR=Giáo sư Id 1 (CUIT / Cuil) +ProfId2AR=Giáo sư Id 2 (Revenu xử tàn bạo) ProfId3AR=- ProfId4AR=- ProfId5AR=- ProfId6AR=- -ProfId1AU=Prof Id 1 (ABN) +ProfId1AU=Giáo sư Id 1 (ABN) ProfId2AU=- ProfId3AU=- ProfId4AU=- ProfId5AU=- ProfId6AU=- -ProfId1BE=Prof Id 1 (Professional number) +ProfId1BE=Giáo sư Id 1 (số chuyên nghiệp) ProfId2BE=- ProfId3BE=- ProfId4BE=- @@ -133,47 +133,47 @@ ProfId5BE=- ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) -ProfId3BR=IM (Inscricao Municipal) +ProfId3BR=IM (Inscricao thành phố) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS ProfId1CH=- ProfId2CH=- -ProfId3CH=Prof Id 1 (Federal number) -ProfId4CH=Prof Id 2 (Commercial Record number) +ProfId3CH=Giáo sư Id 1 (số liên bang) +ProfId4CH=Giáo sư Id 2 (Ghi lại số thương mại) ProfId5CH=- ProfId6CH=- -ProfId1CL=Prof Id 1 (R.U.T.) +ProfId1CL=Giáo sư Id 1 (RUT) ProfId2CL=- ProfId3CL=- ProfId4CL=- ProfId5CL=- ProfId6CL=- -ProfId1CO=Prof Id 1 (R.U.T.) +ProfId1CO=Giáo sư Id 1 (RUT) ProfId2CO=- ProfId3CO=- ProfId4CO=- ProfId5CO=- ProfId6CO=- -ProfId1DE=Prof Id 1 (USt.-IdNr) -ProfId2DE=Prof Id 2 (USt.-Nr) -ProfId3DE=Prof Id 3 (Handelsregister-Nr.) +ProfId1DE=Giáo sư Id 1 (USt.-IdNr) +ProfId2DE=Giáo sư Id 2 (USt.-Nr) +ProfId3DE=Giáo sư Id 3 (Handelsregister-Nr.) ProfId4DE=- ProfId5DE=- ProfId6DE=- -ProfId1ES=Prof Id 1 (CIF/NIF) -ProfId2ES=Prof Id 2 (Social security number) -ProfId3ES=Prof Id 3 (CNAE) -ProfId4ES=Prof Id 4 (Collegiate number) +ProfId1ES=Giáo sư Id 1 (CIF / NIF) +ProfId2ES=Giáo sư Id 2 (số an sinh xã hội) +ProfId3ES=Giáo sư Id 3 (CNAE) +ProfId4ES=Giáo sư Id 4 (số Collegiate) ProfId5ES=- ProfId6ES=- -ProfId1FR=Prof Id 1 (SIREN) -ProfId2FR=Prof Id 2 (SIRET) -ProfId3FR=Prof Id 3 (NAF, old APE) -ProfId4FR=Prof Id 4 (RCS/RM) +ProfId1FR=Giáo sư Id 1 (SIREN) +ProfId2FR=Giáo sư Id 2 (SIRET) +ProfId3FR=Giáo sư Id 3 (NAF, APE cũ) +ProfId4FR=Giáo sư Id 4 (RCS / RM) ProfId5FR=- ProfId6FR=- -ProfId1GB=Registration Number +ProfId1GB=Số đăng ký ProfId2GB=- ProfId3GB=SIC ProfId4GB=- @@ -185,34 +185,34 @@ ProfId3HN=- ProfId4HN=- ProfId5HN=- ProfId6HN=- -ProfId1IN=Prof Id 1 (TIN) -ProfId2IN=Prof Id 2 (PAN) -ProfId3IN=Prof Id 3 (SRVC TAX) -ProfId4IN=Prof Id 4 -ProfId5IN=Prof Id 5 +ProfId1IN=Giáo sư Id 1 (TIN) +ProfId2IN=Giáo sư Id 2 (PAN) +ProfId3IN=Giáo sư Id 3 (thuế SRVC) +ProfId4IN=Giáo sư Id 4 +ProfId5IN=Giáo sư Id 5 ProfId6IN=- -ProfId1MA=Id prof. 1 (R.C.) +ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (Patente) -ProfId3MA=Id prof. 3 (I.F.) -ProfId4MA=Id prof. 4 (C.N.S.S.) +ProfId3MA=Id prof. 3 (IF) +ProfId4MA=Id prof. 4 (CNSS) ProfId5MA=- ProfId6MA=- -ProfId1MX=Prof Id 1 (R.F.C). -ProfId2MX=Prof Id 2 (R..P. IMSS) -ProfId3MX=Prof Id 3 (Profesional Charter) +ProfId1MX=Giáo sư Id 1 (RFC). +ProfId2MX=Giáo sư Id 2 (R..P. IMSS) +ProfId3MX=Giáo sư Id 3 (Profesional điều lệ) ProfId4MX=- ProfId5MX=- ProfId6MX=- -ProfId1NL=KVK nummer +ProfId1NL=KVK Nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) ProfId5NL=- ProfId6NL=- -ProfId1PT=Prof Id 1 (NIPC) -ProfId2PT=Prof Id 2 (Social security number) -ProfId3PT=Prof Id 3 (Commercial Record number) -ProfId4PT=Prof Id 4 (Conservatory) +ProfId1PT=Giáo sư Id 1 (NIPC) +ProfId2PT=Giáo sư Id 2 (số an sinh xã hội) +ProfId3PT=Giáo sư Id 3 (Ghi lại số thương mại) +ProfId4PT=Giáo sư Id 4 (viện) ProfId5PT=- ProfId6PT=- ProfId1SN=RC @@ -221,192 +221,194 @@ ProfId3SN=- ProfId4SN=- ProfId5SN=- ProfId6SN=- -ProfId1TN=Prof Id 1 (RC) -ProfId2TN=Prof Id 2 (Fiscal matricule) -ProfId3TN=Prof Id 3 (Douane code) -ProfId4TN=Prof Id 4 (BAN) +ProfId1TN=Giáo sư Id 1 (RC) +ProfId2TN=Giáo sư Id 2 (matricule tài chính) +ProfId3TN=Giáo sư Id 3 (mã Douane) +ProfId4TN=Giáo sư Id 4 (BAN) ProfId5TN=- ProfId6TN=- -ProfId1RU=Prof Id 1 (OGRN) -ProfId2RU=Prof Id 2 (INN) -ProfId3RU=Prof Id 3 (KPP) -ProfId4RU=Prof Id 4 (OKPO) +ProfId1RU=Giáo sư Id 1 (OGRN) +ProfId2RU=Giáo sư Id 2 (INN) +ProfId3RU=Giáo sư Id 3 (KPP) +ProfId4RU=Giáo sư Id 4 (OKPO) ProfId5RU=- ProfId6RU=- -VATIntra=VAT number -VATIntraShort=VAT number -VATIntraVeryShort=VAT -VATIntraSyntaxIsValid=Syntax is valid -VATIntraValueIsValid=Value is valid -ProspectCustomer=Prospect / Customer -Prospect=Prospect -CustomerCard=Customer Card -Customer=Customer -CustomerDiscount=Customer Discount -CustomerRelativeDiscount=Relative customer discount -CustomerAbsoluteDiscount=Absolute customer discount -CustomerRelativeDiscountShort=Relative discount -CustomerAbsoluteDiscountShort=Absolute discount -CompanyHasRelativeDiscount=This customer has a default discount of %s%% -CompanyHasNoRelativeDiscount=This customer has no relative discount by default -CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for %s %s -CompanyHasCreditNote=This customer still has credit notes for %s %s -CompanyHasNoAbsoluteDiscount=This customer has no discount credit available -CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users) -CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself) -DefaultDiscount=Default discount -AvailableGlobalDiscounts=Absolute discounts available -DiscountNone=None -Supplier=Supplier -CompanyList=Company's list -AddContact=Add contact -AddContactAddress=Add contact/address -EditContact=Edit contact -EditContactAddress=Edit contact/address -Contact=Contact -ContactsAddresses=Contacts/Addresses -NoContactDefinedForThirdParty=No contact defined for this third party -NoContactDefined=No contact defined -DefaultContact=Default contact/address -AddCompany=Add company -AddThirdParty=Add third party -DeleteACompany=Delete a company -PersonalInformations=Personal data -AccountancyCode=Accountancy code -CustomerCode=Customer code -SupplierCode=Supplier code -CustomerAccount=Customer account -SupplierAccount=Supplier account -CustomerCodeDesc=Customer code, unique for all customers -SupplierCodeDesc=Supplier code, unique for all suppliers -RequiredIfCustomer=Required if third party is a customer or prospect -RequiredIfSupplier=Required if third party is a supplier -ValidityControledByModule=Validity controled by module -ThisIsModuleRules=This is rules for this module -LastProspect=Last -ProspectToContact=Prospect to contact -CompanyDeleted=Company "%s" deleted from database. -ListOfContacts=List of contacts/addresses -ListOfContactsAddresses=List of contacts/adresses -ListOfProspectsContacts=List of prospect contacts -ListOfCustomersContacts=List of customer contacts -ListOfSuppliersContacts=List of supplier contacts -ListOfCompanies=List of companies -ListOfThirdParties=List of third parties -ShowCompany=Show company -ShowContact=Show contact -ContactsAllShort=All (No filter) -ContactType=Contact type -ContactForOrders=Order's contact -ContactForProposals=Proposal's contact -ContactForContracts=Contract's contact -ContactForInvoices=Invoice's contact -NoContactForAnyOrder=This contact is not a contact for any order -NoContactForAnyProposal=This contact is not a contact for any commercial proposal -NoContactForAnyContract=This contact is not a contact for any contract -NoContactForAnyInvoice=This contact is not a contact for any invoice -NewContact=New contact -NewContactAddress=New contact/address -LastContacts=Last contacts -MyContacts=My contacts -Phones=Phones -Capital=Capital -CapitalOf=Capital of %s -EditCompany=Edit company -EditDeliveryAddress=Edit delivery address -ThisUserIsNot=This user is not a prospect, customer nor supplier -VATIntraCheck=Check -VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work. +VATIntra=Số thuế GTGT +VATIntraShort=Số thuế GTGT +VATIntraVeryShort=Thuế GTGT +VATIntraSyntaxIsValid=Cú pháp là hợp lệ +VATIntraValueIsValid=Giá trị là hợp lệ +ProspectCustomer=Khách hàng tiềm năng / khách hàng +Prospect=Triển vọng +CustomerCard=Thẻ khách hàng +Customer=Khách hàng +CustomerDiscount=Giảm giá khách hàng +CustomerRelativeDiscount=Giảm giá của khách hàng liên quan +CustomerAbsoluteDiscount=Giảm giá khách hàng tuyệt đối +CustomerRelativeDiscountShort=Giảm tương đối +CustomerAbsoluteDiscountShort=Giảm giá tuyệt đối +CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định của% s %% +CompanyHasNoRelativeDiscount=Khách hàng này không có giảm giá tương đối theo mặc định +CompanyHasAbsoluteDiscount=Khách hàng này vẫn có các khoản tín dụng giảm giá hoặc tiền đặt cọc cho% s% s +CompanyHasCreditNote=Khách hàng này vẫn có giấy báo cho% s% s +CompanyHasNoAbsoluteDiscount=Khách hàng này không có tín dụng giảm giá có sẵn +CustomerAbsoluteDiscountAllUsers=Giảm giá tuyệt đối (do tất cả người dùng) +CustomerAbsoluteDiscountMy=Giảm giá tuyệt đối (do chính mình) +DefaultDiscount=Mặc định giảm giá +AvailableGlobalDiscounts=Giảm giá tuyệt đối có sẵn +DiscountNone=Không +Supplier=Nhà cung cấp +CompanyList=Danh sách của công ty +AddContact=Thêm số liên lạc +AddContactAddress=Thêm số liên lạc / địa chỉ +EditContact=Sửa liên lạc +EditContactAddress=Sửa liên lạc / địa chỉ +Contact=Liên hệ +ContactsAddresses=Liên hệ / địa chỉ +NoContactDefinedForThirdParty=Không liên lạc được xác định cho bên thứ ba này +NoContactDefined=Không liên lạc được xác định +DefaultContact=Mặc định liên lạc / địa chỉ +AddCompany=Thêm công ty +AddThirdParty=Thêm bên thứ ba +DeleteACompany=Xóa một công ty +PersonalInformations=Dữ liệu cá nhân +AccountancyCode=Đang kế toán +CustomerCode=Mã khách hàng +SupplierCode=Mã nhà cung cấp +CustomerAccount=Tài khoản của khách hàng +SupplierAccount=Tài khoản nhà cung cấp +CustomerCodeDesc=Mã số khách hàng, duy nhất cho tất cả khách hàng +SupplierCodeDesc=Mã nhà cung cấp, độc đáo cho tất cả các nhà cung cấp +RequiredIfCustomer=Yêu cầu nếu bên thứ ba là một khách hàng hoặc khách hàng tiềm năng +RequiredIfSupplier=Yêu cầu nếu bên thứ ba là nhà cung cấp +ValidityControledByModule=Hiệu lực điều khiển bởi mô-đun +ThisIsModuleRules=Đây là quy tắc cho các mô-đun này +LastProspect=Cuối +ProspectToContact=Khách hàng tiềm năng để liên hệ +CompanyDeleted=Công ty "% s" sẽ bị xóa khỏi cơ sở dữ liệu. +ListOfContacts=Danh sách địa chỉ liên lạc / địa chỉ +ListOfContactsAddresses=Danh sách địa chỉ liên lạc / adresses +ListOfProspectsContacts=Danh sách liên hệ khách hàng tiềm năng +ListOfCustomersContacts=Danh sách địa chỉ liên lạc của khách hàng +ListOfSuppliersContacts=Danh sách liên hệ nhà cung cấp +ListOfCompanies=Danh sách các công ty +ListOfThirdParties=Danh sách các bên thứ ba +ShowCompany=Hiện công ty +ShowContact=Hiện liên lạc +ContactsAllShort=Tất cả (không chọn lọc) +ContactType=Loại Liên hệ +ContactForOrders=Liên hệ với đơn đặt hàng của +ContactForProposals=Liên lạc đề nghị của +ContactForContracts=Hợp đồng liên lạc của +ContactForInvoices=Tiếp xúc của hóa đơn +NoContactForAnyOrder=Liên hệ này không phải là một số liên lạc cho bất kỳ thứ tự +NoContactForAnyProposal=Liên hệ này không phải là một số liên lạc cho bất kỳ đề xuất thương mại +NoContactForAnyContract=Liên hệ này không phải là một số liên lạc cho bất cứ hợp đồng +NoContactForAnyInvoice=Liên hệ này không phải là một số liên lạc cho bất kỳ hóa đơn +NewContact=Liên lạc mới +NewContactAddress=Liên lạc mới / địa chỉ +LastContacts=Địa chỉ liên lạc cuối cùng +MyContacts=Địa chỉ liên lạc của tôi +Phones=Điện thoại +Capital=Vốn +CapitalOf=Thủ đô của% s +EditCompany=Chỉnh sửa công ty +EditDeliveryAddress=Chỉnh sửa địa chỉ giao hàng +ThisUserIsNot=Thành viên này không phải là một khách hàng tiềm năng, khách hàng cũng không phải nhà cung cấp +VATIntraCheck=Kiểm tra +VATIntraCheckDesc=Các liên kết% s cho phép yêu cầu các dịch vụ kiểm tra thuế GTGT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do -VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site -VATIntraManualCheck=You can also check manually from european web site %s -ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). -NorProspectNorCustomer=Nor prospect, nor customer -JuridicalStatus=Juridical status -Staff=Staff -ProspectLevelShort=Potential -ProspectLevel=Prospect potential -ContactPrivate=Private -ContactPublic=Shared -ContactVisibility=Visibility -OthersNotLinkedToThirdParty=Others, not linked to a third party -ProspectStatus=Prospect status -PL_NONE=None +VATIntraCheckableOnEUSite=Kiểm tra Intracomunnautary thuế GTGT trên trang web của hoa hồng Châu Âu +VATIntraManualCheck=Bạn cũng có thể kiểm tra bằng tay từ châu Âu trang web % s +ErrorVATCheckMS_UNAVAILABLE=Kiểm tra không thể. Kiểm tra dịch vụ không được cung cấp bởi các quốc gia thành viên (% s). +NorProspectNorCustomer=Cũng không phải khách hàng tiềm năng, cũng không phải khách hàng +JuridicalStatus=Tư cách pháp nhân +Staff=Nhân viên +ProspectLevelShort=Tiềm năng +ProspectLevel=Triển vọng tiềm năng +ContactPrivate=Tin +ContactPublic=Chia sẻ +ContactVisibility=Tầm nhìn +OthersNotLinkedToThirdParty=Người khác, không liên kết với một bên thứ ba +ProspectStatus=Tình trạng khách hàng tiềm năng +PL_NONE=Không PL_UNKNOWN=Chưa rõ -PL_LOW=Low -PL_MEDIUM=Medium -PL_HIGH=High +PL_LOW=Thấp +PL_MEDIUM=Trung bình +PL_HIGH=Cao TE_UNKNOWN=- -TE_STARTUP=Startup -TE_GROUP=Large company -TE_MEDIUM=Medium company -TE_ADMIN=Governmental -TE_SMALL=Small company -TE_RETAIL=Retailer +TE_STARTUP=Khởi động +TE_GROUP=Công ty lớn +TE_MEDIUM=Công ty vừa +TE_ADMIN=Chính phủ +TE_SMALL=Công ty nhỏ +TE_RETAIL=Cửa hàng bán lẻ TE_WHOLE=Wholetailer -TE_PRIVATE=Private individual -TE_OTHER=Other -StatusProspect-1=Do not contact -StatusProspect0=Never contacted -StatusProspect1=To contact -StatusProspect2=Contact in process -StatusProspect3=Contact done -ChangeDoNotContact=Change status to 'Do not contact' -ChangeNeverContacted=Change status to 'Never contacted' -ChangeToContact=Change status to 'To contact' -ChangeContactInProcess=Change status to 'Contact in process' -ChangeContactDone=Change status to 'Contact done' -ProspectsByStatus=Prospects by status -BillingContact=Billing contact -NbOfAttachedFiles=Number of attached files -AttachANewFile=Attach a new file -NoRIB=No BAN defined -NoParentCompany=None -ExportImport=Import-Export -ExportCardToFormat=Export card to format -ContactNotLinkedToCompany=Contact not linked to any third party -DolibarrLogin=Dolibarr login -NoDolibarrAccess=No Dolibarr access -ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties -ExportDataset_company_2=Contacts and properties -ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties -ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes -ImportDataset_company_3=Bank details -PriceLevel=Price level -DeliveriesAddress=Delivery addresses -DeliveryAddress=Delivery address -DeliveryAddressLabel=Delivery address label -DeleteDeliveryAddress=Delete a delivery address -ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address? -NewDeliveryAddress=New delivery address -AddDeliveryAddress=Add address -AddAddress=Add address -NoOtherDeliveryAddress=No alternative delivery address defined -SupplierCategory=Supplier category -JuridicalStatus200=Independant -DeleteFile=Delete file -ConfirmDeleteFile=Are you sure you want to delete this file? -AllocateCommercial=Assigned to sale representative -SelectCountry=Select a country -SelectCompany=Select a third party -Organization=Organization -AutomaticallyGenerated=Automatically generated -FiscalYearInformation=Information on the fiscal year -FiscalMonthStart=Starting month of the fiscal year -YouMustCreateContactFirst=You must create emails contacts for third party first to be able to add emails notifications. -ListSuppliersShort=List of suppliers -ListProspectsShort=List of prospects -ListCustomersShort=List of customers -ThirdPartiesArea=Third parties area -LastModifiedThirdParties=Last %s modified third parties -UniqueThirdParties=Total of unique third parties -InActivity=Open -ActivityCeased=Closed -ActivityStateFilter=Activity status -ProductsIntoElements=List of products into %s -CurrentOutstandingBill=Current outstanding bill -OutstandingBill=Max. for outstanding bill -OutstandingBillReached=Reached max. for outstanding bill -MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. -LeopardNumRefModelDesc=The code is free. This code can be modified at any time. -ManagingDirectors=Manager(s) name (CEO, director, president...) +TE_PRIVATE=Cá thể +TE_OTHER=Khác +StatusProspect-1=Không liên hệ +StatusProspect0=Không bao giờ liên lạc +StatusProspect1=Để liên hệ +StatusProspect2=Liên hệ trong quá trình +StatusProspect3=Liên hệ với thực hiện +ChangeDoNotContact=Thay đổi trạng thái để 'Đừng liên lạc' +ChangeNeverContacted=Thay đổi trạng thái để 'Không bao giờ liên lạc' +ChangeToContact=Thay đổi trạng thái để 'Để liên hệ với' +ChangeContactInProcess=Thay đổi trạng thái để 'Liên hệ trong quá trình' +ChangeContactDone=Thay đổi trạng thái để 'Liên hệ với thực hiện' +ProspectsByStatus=Triển vọng bởi tình trạng +BillingContact=Liên hệ thanh toán +NbOfAttachedFiles=Số lượng hồ sơ đính kèm +AttachANewFile=Đính kèm một tập tin mới +NoRIB=Không có định nghĩa BAN +NoParentCompany=Không +ExportImport=Xuất nhập khẩu +ExportCardToFormat=Thẻ xuất khẩu sang các định dạng +ContactNotLinkedToCompany=Liên không liên quan đến bất kỳ bên thứ ba +DolibarrLogin=Đăng nhập Dolibarr +NoDolibarrAccess=Không truy cập Dolibarr +ExportDataset_company_1=Các bên thứ ba (công ty / cơ sở / người vật lý) và tài sản +ExportDataset_company_2=Liên hệ và tài sản +ImportDataset_company_1=Các bên thứ ba (công ty / cơ sở / người vật lý) và tài sản +ImportDataset_company_2=Liên hệ / địa chỉ (của thirdparties hay không) và các thuộc tính +ImportDataset_company_3=Chi tiết ngân hàng +PriceLevel=Mức giá +DeliveriesAddress=Địa chỉ giao hàng +DeliveryAddress=Địa chỉ giao hàng +DeliveryAddressLabel=Giao hàng tận nơi nhãn địa chỉ +DeleteDeliveryAddress=Xóa một địa chỉ giao hàng +ConfirmDeleteDeliveryAddress=Bạn Bạn có chắc chắn muốn xóa địa chỉ giao hàng này? +NewDeliveryAddress=Địa chỉ giao hàng mới +AddDeliveryAddress=Thêm địa chỉ +AddAddress=Thêm địa chỉ +NoOtherDeliveryAddress=Không có địa chỉ giao hàng thay thế được xác định +SupplierCategory=Loại nhà cung cấp +JuridicalStatus200=Độc lập +DeleteFile=Xóa tập tin +ConfirmDeleteFile=Bạn Bạn có chắc chắn muốn xóa ảnh này? +AllocateCommercial=Giao cho đại diện bán +SelectCountry=Chọn một quốc gia +SelectCompany=Chọn một bên thứ ba +Organization=Tổ chức +AutomaticallyGenerated=Tự động tạo ra +FiscalYearInformation=Thông tin về năm tài chính +FiscalMonthStart=Bắt đầu từ tháng của năm tài chính +YouMustCreateContactFirst=Bạn phải tạo ra các email liên lạc cho bên thứ ba đầu tiên để có thể thêm các email thông báo. +ListSuppliersShort=Danh sách nhà cung cấp +ListProspectsShort=Danh sách khách hàng tiềm năng +ListCustomersShort=Danh sách khách hàng +ThirdPartiesArea=Third parties and contact area +LastModifiedThirdParties=Các bên thứ ba cuối% s sửa đổi +UniqueThirdParties=Tổng số của bên thứ ba độc đáo +InActivity=Mở +ActivityCeased=Đóng +ActivityStateFilter=Tình trạng hoạt động +ProductsIntoElements=Danh sách sản phẩm vào% s +CurrentOutstandingBill=Hóa đơn đang lưu hành +OutstandingBill=Max. cho hóa đơn xuất sắc +OutstandingBillReached=Đạt tối đa. cho hóa đơn xuất sắc +MonkeyNumRefModelDesc=Quay trở lại với các định dạng numero syymm-nnnn cho mã khách hàng và% syymm-nnnn cho mã nhà cung cấp nơi yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0. +LeopardNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào. +ManagingDirectors=Quản lý (các) tên (Giám đốc điều hành, giám đốc, chủ tịch ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang index 996a4df1d34..b1b6319f082 100644 --- a/htdocs/langs/vi_VN/compta.lang +++ b/htdocs/langs/vi_VN/compta.lang @@ -1,201 +1,201 @@ # Dolibarr language file - Source file is en_US - compta -Accountancy=Accountancy -AccountancyCard=Accountancy card -Treasury=Treasury -MenuFinancial=Financial -TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation -TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation -OptionMode=Option for accountancy -OptionModeTrue=Option Incomes-Expenses -OptionModeVirtual=Option Claims-Debts -OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices. -OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. -FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration) -VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup. -LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. -Param=Cài đặt -RemainingAmountPayment=Amount payment remaining : -AmountToBeCharged=Total amount to pay : -AccountsGeneral=Accounts -Account=Account -Accounts=Accounts -Accountparent=Account parent -Accountsparent=Accounts parent -BillsForSuppliers=Bills for suppliers -Income=Income -Outcome=Expense -ReportInOut=Income / Expense -ReportTurnover=Turnover -PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party -PaymentsNotLinkedToUser=Payments not linked to any user -Profit=Profit -Balance=Balance -Debit=Debit -Credit=Credit -Piece=Accounting Doc. -Withdrawal=Withdrawal -Withdrawals=Withdrawals -AmountHTVATRealReceived=Net collected -AmountHTVATRealPaid=Net paid -VATToPay=VAT sells -VATReceived=VAT received -VATToCollect=VAT purchases -VATSummary=VAT Balance -LT2SummaryES=IRPF Balance -LT1SummaryES=RE Balance -VATPaid=VAT paid -SalaryPaid=Salary paid -LT2PaidES=IRPF Paid -LT1PaidES=RE Paid -LT2CustomerES=IRPF sales -LT2SupplierES=IRPF purchases -LT1CustomerES=RE sales -LT1SupplierES=RE purchases -VATCollected=VAT collected -ToPay=To pay -ToGet=To get back -SpecialExpensesArea=Area for all special payments -TaxAndDividendsArea=Tax, social contributions and dividends area -SocialContribution=Social contribution -SocialContributions=Social contributions -MenuSpecialExpenses=Special expenses -MenuTaxAndDividends=Taxes and dividends -MenuSalaries=Salaries -MenuSocialContributions=Social contributions -MenuNewSocialContribution=New contribution -NewSocialContribution=New social contribution -ContributionsToPay=Contributions to pay -AccountancyTreasuryArea=Accountancy/Treasury area -AccountancySetup=Accountancy setup -NewPayment=New payment -Payments=Payments -PaymentCustomerInvoice=Customer invoice payment -PaymentSupplierInvoice=Supplier invoice payment -PaymentSocialContribution=Social contribution payment -PaymentVat=VAT payment -PaymentSalary=Salary payment -ListPayment=List of payments -ListOfPayments=List of payments -ListOfCustomerPayments=List of customer payments -ListOfSupplierPayments=List of supplier payments -DatePayment=Payment date -DateStartPeriod=Date start period -DateEndPeriod=Date end period -NewVATPayment=New VAT payment -newLT2PaymentES=New IRPF payment -newLT1PaymentES=New RE payment -LT2PaymentES=IRPF Payment -LT2PaymentsES=IRPF Payments -LT1PaymentES=RE Payment -LT1PaymentsES=RE Payments -VATPayment=VAT Payment -VATPayments=VAT Payments -SocialContributionsPayments=Social contributions payments -ShowVatPayment=Show VAT payment -TotalToPay=Total to pay -TotalVATReceived=Total VAT received -CustomerAccountancyCode=Customer accountancy code -SupplierAccountancyCode=Supplier accountancy code -AccountNumberShort=Account number -AccountNumber=Account number -NewAccount=New account -SalesTurnover=Sales turnover -SalesTurnoverMinimum=Minimum sales turnover -ByThirdParties=By third parties -ByUserAuthorOfInvoice=By invoice author -AccountancyExport=Accountancy export -ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s -SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. -CheckReceipt=Check deposit -CheckReceiptShort=Check deposit -NewCheckReceipt=New discount -NewCheckDeposit=New check deposit -NewCheckDepositOn=Create receipt for deposit on account: %s -NoWaitingChecks=No checks waiting for deposit. -DateChequeReceived=Check reception date -NbOfCheques=Nb of checks -PaySocialContribution=Pay a social contribution -ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid? -DeleteSocialContribution=Delete a social contribution -ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution? -ExportDataset_tax_1=Social contributions and payments -CalcModeVATDebt=Mode %sVAT on commitment accounting%s. -CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. -CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. -CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting -CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s -CalcModeLT1Debt=Mode %sRE on customer invoices%s -CalcModeLT1Rec= Mode %sRE on suppliers invoices%s -CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s -CalcModeLT2Debt=Mode %sIRPF on customer invoices%s -CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s -AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary -AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary -AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode %sClaims-Debts%s said Commitment accounting. -AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode %sIncomes-Expenses%s said cash accounting. -SeeReportInInputOutputMode=See report %sIncomes-Expenses%s said cash accounting for a calculation on actual payments made -SeeReportInDueDebtMode=See report %sClaims-Debts%s said commitment accounting for a calculation on issued invoices -RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included -RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses. -RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. -RulesCADue=- It includes the client's due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
-RulesCAIn=- It includes all the effective payments of invoices received from clients.
- It is based on the payment date of these invoices
-DepositsAreNotIncluded=- Deposit invoices are nor included -DepositsAreIncluded=- Deposit invoices are included -LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF -LT1ReportByCustomersInInputOutputModeES=Report by third party RE -VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid -VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid -VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid -LT1ReportByQuartersInInputOutputMode=Report by RE rate -LT2ReportByQuartersInInputOutputMode=Report by IRPF rate -VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid -LT1ReportByQuartersInDueDebtMode=Report by RE rate -LT2ReportByQuartersInDueDebtMode=Report by IRPF rate -SeeVATReportInInputOutputMode=See report %sVAT encasement%s for a standard calculation -SeeVATReportInDueDebtMode=See report %sVAT on flow%s for a calculation with an option on the flow -RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment. -RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date. -RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date. -RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date. -OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair. -PercentOfInvoice=%%/invoice -NotUsedForGoods=Not used on goods -ProposalStats=Statistics on proposals -OrderStats=Statistics on orders -InvoiceStats=Statistics on bills -Dispatch=Dispatching -Dispatched=Dispatched -ToDispatch=To dispatch -ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer -SellsJournal=Sales Journal -PurchasesJournal=Purchases Journal -DescSellsJournal=Sales Journal -DescPurchasesJournal=Purchases Journal -InvoiceRef=Invoice ref. -CodeNotDef=Not defined -AddRemind=Dispatch available amount -RemainToDivide= Remain to dispatch : -WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module. -DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. -Pcg_version=Pcg version -Pcg_type=Pcg type -Pcg_subtype=Pcg subtype -InvoiceLinesToDispatch=Invoice lines to dispatch -InvoiceDispatched=Dispatched invoices -AccountancyDashboard=Accountancy summary -ByProductsAndServices=By products and services -RefExt=External ref -ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order -ReCalculate=Recalculate -Mode1=Method 1 -Mode2=Method 2 -CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. -CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. -TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). -CalculationMode=Calculation mode -AccountancyJournal=Accountancy code journal +Accountancy=Kế toán +AccountancyCard=Thẻ kế toán +Treasury=Kho bạc +MenuFinancial=Tài chính +TaxModuleSetupToModifyRules=Tới Thuế thiết lập mô-đun để sửa đổi quy định để tính +TaxModuleSetupToModifyRulesLT=Tới thiết lập Công ty để sửa đổi quy định để tính +OptionMode=Lựa chọn cho kế toán +OptionModeTrue=Lựa chọn Thu nhập-chi phí +OptionModeVirtual=Lựa chọn bố-Các khoản nợ +OptionModeTrueDesc=Trong bối cảnh này, doanh thu được tính toán trên các khoản thanh toán (ngày thanh toán). Tính hợp lệ của số liệu được đảm bảo chỉ khi sổ sách được xem xét kỹ lưỡng thông qua các đầu vào / đầu ra trên các tài khoản thông qua hoá đơn. +OptionModeVirtualDesc=Trong bối cảnh này, doanh thu được tính toán trên hoá đơn (ngày xác nhận). Khi các hóa đơn đến hạn, cho dù họ đã được trả tiền hay không, chúng được liệt kê trong đầu ra doanh thu. +FeatureIsSupportedInInOutModeOnly=Tính năng chỉ có sẵn trong chế độ kế toán TÍN-NỢ (Xem cấu hình mô-đun kế toán) +VATReportBuildWithOptionDefinedInModule=Lượng hiển thị ở đây được tính toán bằng cách sử dụng quy tắc được xác định bởi cài đặt mô-đun thuế. +LTReportBuildWithOptionDefinedInModule=Lượng hiển thị ở đây được tính toán bằng cách sử dụng quy tắc được xác định bởi thiết lập Công ty. +Param=Thiết lập +RemainingAmountPayment=Thanh toán số tiền còn lại: +AmountToBeCharged=Tổng số tiền phải trả: +AccountsGeneral=Tài khoản +Account=Tài khoản +Accounts=Tài khoản +Accountparent=Mẹ tài khoản +Accountsparent=Tài khoản mẹ +BillsForSuppliers=Hóa đơn cho các nhà cung cấp +Income=Thu nhập +Outcome=Chi phí +ReportInOut=Thu nhập / chi phí +ReportTurnover=Doanh thu +PaymentsNotLinkedToInvoice=Thanh toán không liên quan đến bất kỳ hóa đơn, do đó không liên quan đến bất kỳ bên thứ ba +PaymentsNotLinkedToUser=Thanh toán không liên quan đến bất kỳ người dùng +Profit=Lợi nhuận +Balance=Cân bằng +Debit=Nợ +Credit=Tín dụng +Piece=Kế toán Doc. +Withdrawal=Rút +Withdrawals=Tiền thu hồi +AmountHTVATRealReceived=Net thu +AmountHTVATRealPaid=Net trả +VATToPay=Bán VAT +VATReceived=Nhận thuế GTGT +VATToCollect=Mua VAT +VATSummary=Cân bằng thuế GTGT +LT2SummaryES=IRPF cân +LT1SummaryES=RE cân +VATPaid=Nộp thuế GTGT +SalaryPaid=Lương +LT2PaidES=IRPF trả tiền +LT1PaidES=RE trả tiền +LT2CustomerES=Bán hàng IRPF +LT2SupplierES=Mua IRPF +LT1CustomerES=RE bán hàng +LT1SupplierES=RE mua +VATCollected=Thu thuế GTGT +ToPay=Để trả +ToGet=Để quay trở lại +SpecialExpensesArea=Khu vực dành cho tất cả các khoản thanh toán đặc biệt +TaxAndDividendsArea=Thuế, xã hội đóng góp và cổ tức khu vực +SocialContribution=Đóng góp xã hội +SocialContributions=Đóng góp xã hội +MenuSpecialExpenses=Chi phí đặc biệt +MenuTaxAndDividends=Thuế và cổ tức +MenuSalaries=Tiền lương +MenuSocialContributions=Đóng góp xã hội +MenuNewSocialContribution=Đóng góp mới +NewSocialContribution=Đóng góp xã hội mới +ContributionsToPay=Đóng góp để trả tiền +AccountancyTreasuryArea=Kế toán / Tài chính khu vực +AccountancySetup=Thiết lập Kế toán +NewPayment=Thanh toán mới +Payments=Thanh toán +PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng +PaymentSupplierInvoice=Thanh toán hóa đơn nhà cung cấp +PaymentSocialContribution=Thanh toán đóng góp xã hội +PaymentVat=Nộp thuế GTGT +PaymentSalary=Thanh toán tiền lương +ListPayment=Danh sách thanh toán +ListOfPayments=Danh sách thanh toán +ListOfCustomerPayments=Danh sách các khoản thanh toán của khách hàng +ListOfSupplierPayments=Danh sách các khoản thanh toán nhà cung cấp +DatePayment=Ngày thanh toán +DateStartPeriod=Ngày giai đoạn bắt đầu +DateEndPeriod=Thời gian cuối ngày +NewVATPayment=Nộp thuế GTGT mới +newLT2PaymentES=Thanh toán IRPF mới +newLT1PaymentES=Thanh toán RE mới +LT2PaymentES=IRPF thanh toán +LT2PaymentsES=IRPF Thanh toán +LT1PaymentES=RE Thanh toán +LT1PaymentsES=RE Thanh toán +VATPayment=Thanh toán thuế GTGT +VATPayments=Thanh toán thuế GTGT +SocialContributionsPayments=Đóng góp xã hội thanh toán +ShowVatPayment=Hiện nộp thuế GTGT +TotalToPay=Tổng số trả +TotalVATReceived=Tổng số thuế GTGT được +CustomerAccountancyCode=Đang kế toán của khách hàng +SupplierAccountancyCode=Nhà cung cấp đang kế toán +AccountNumberShort=Số tài khoản +AccountNumber=Số tài khoản +NewAccount=Tài khoản mới +SalesTurnover=Doanh thu bán hàng +SalesTurnoverMinimum=Doanh thu bán hàng tối thiểu +ByThirdParties=Do các bên thứ ba +ByUserAuthorOfInvoice=Của tác giả hóa đơn +AccountancyExport=Kế toán xuất khẩu +ErrorWrongAccountancyCodeForCompany=Bad đang kế toán của khách hàng cho% s +SuppliersProductsSellSalesTurnover=Doanh thu được tạo ra bởi việc bán các sản phẩm của nhà cung cấp. +CheckReceipt=Kiểm tra tiền gửi +CheckReceiptShort=Kiểm tra tiền gửi +NewCheckReceipt=Giảm giá mới +NewCheckDeposit=Tiền gửi kiểm tra mới +NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản:% s +NoWaitingChecks=Không có kiểm tra chờ đợi tiền gửi. +DateChequeReceived=Kiểm tra ngày tiếp nhận +NbOfCheques=Nb kiểm tra +PaySocialContribution=Trả khoản đóng góp xã hội +ConfirmPaySocialContribution=Bạn có chắc chắn bạn muốn phân loại đóng góp xã hội này như thanh toán? +DeleteSocialContribution=Xóa một đóng góp xã hội +ConfirmDeleteSocialContribution=Bạn Bạn có chắc chắn muốn xóa đóng góp xã hội này? +ExportDataset_tax_1=Đóng góp xã hội và thanh toán +CalcModeVATDebt=Chế độ% sVAT về kế toán cam kết% s. +CalcModeVATEngagement=Chế độ sVAT% đối với thu nhập-chi phí% s. +CalcModeDebt=Chế độ% sClaims-Các khoản nợ% cho biết kế toán cam kết. +CalcModeEngagement=Chế độ% sIncomes-Chi% cho biết kế toán tiền mặt +CalcModeLT1= Chế độ SRE% trên hoá đơn của khách hàng - nhà cung cấp hoá đơn% s +CalcModeLT1Debt=Chế độ SRE% trên hóa đơn khách hàng% s +CalcModeLT1Rec= Chế độ% SRE các nhà cung cấp hoá đơn% s +CalcModeLT2= Chế độ sIRPF% trên hoá đơn của khách hàng - nhà cung cấp hóa đơn% s +CalcModeLT2Debt=Chế độ sIRPF% trên hóa đơn khách hàng% s +CalcModeLT2Rec= Chế độ% sIRPF các nhà cung cấp hóa đơn% s +AnnualSummaryDueDebtMode=Cán cân thu nhập và chi phí, tổng kết hàng năm +AnnualSummaryInputOutputMode=Cán cân thu nhập và chi phí, tổng kết hàng năm +AnnualByCompaniesDueDebtMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế độ% sClaims-Các khoản nợ% cho biết kế toán cam kết. +AnnualByCompaniesInputOutputMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế độ% sIncomes-Chi% cho biết kế toán tiền mặt. +SeeReportInInputOutputMode=Xem báo cáo% sIncomes-Chi% cho biết tiền mặt chiếm một tính toán thanh toán thực tế được thực hiện +SeeReportInDueDebtMode=Xem báo cáo% sClaims-Các khoản nợ% s cho biết cam kết chiếm một tính toán trên hoá đơn +RulesAmountWithTaxIncluded=- Các khoản hiển thị là với tất cả các loại thuế bao gồm +RulesResultDue=- Nó bao gồm hoá đơn xuất sắc, chi phí và thuế GTGT cho dù họ được trả tiền hay không.
- Đó là dựa vào ngày xác nhận hóa đơn, thuế GTGT và vào ngày đến hạn cho các chi phí. +RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được thực hiện trên hóa đơn, chi phí và thuế GTGT.
- Đó là dựa vào ngày thanh toán hoá đơn, chi phí và thuế GTGT. +RulesCADue=- Nó bao gồm hoá đơn do của khách hàng cho dù họ được trả tiền hay không.
- Đó là dựa vào ngày xác nhận các hóa đơn.
+RulesCAIn=- Nó bao gồm tất cả các khoản thanh toán có hiệu quả các hóa đơn nhận được từ khách hàng.
- Nó được dựa trên ngày thanh toán các hoá đơn
+DepositsAreNotIncluded=- Hóa đơn tiền gửi cũng không được bao gồm +DepositsAreIncluded=- Hóa đơn tiền gửi mới có +LT2ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba IRPF +LT1ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba RE +VATReportByCustomersInInputOutputMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả +VATReportByCustomersInDueDebtMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả +VATReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ thuế GTGT thu, nộp +LT1ReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ RE +LT2ReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ IRPF +VATReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ thuế GTGT thu, nộp +LT1ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ RE +LT2ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ IRPF +SeeVATReportInInputOutputMode=Xem báo cáo% sVAT vỏ bọc% s cho một tính toán tiêu chuẩn +SeeVATReportInDueDebtMode=Xem báo cáo% sVAT trên dòng% s cho một tính toán với một tùy chọn trên dòng chảy +RulesVATInServices=- Đối với dịch vụ, báo cáo bao gồm các quy định thuế GTGT thực sự nhận được hoặc ban hành trên cơ sở ngày thanh toán. +RulesVATInProducts=- Đối với tài sản vật chất, nó bao gồm các hoá đơn GTGT trên cơ sở ngày hóa đơn. +RulesVATDueServices=- Đối với dịch vụ, báo cáo bao gồm hóa đơn GTGT do, trả tiền hay không, dựa trên ngày hóa đơn. +RulesVATDueProducts=- Đối với tài sản vật chất, nó bao gồm các hoá đơn GTGT, dựa trên ngày hóa đơn. +OptionVatInfoModuleComptabilite=Lưu ý: Đối với tài sản vật chất, nó sẽ sử dụng ngày giao hàng để được công bằng hơn. +PercentOfInvoice=%% / Hóa đơn +NotUsedForGoods=Không được sử dụng đối với hàng hóa +ProposalStats=Thống kê về các đề xuất +OrderStats=Thống kê về đơn đặt hàng +InvoiceStats=Thống kê trên hóa đơn +Dispatch=Cử +Dispatched=Cử +ToDispatch=Cử +ThirdPartyMustBeEditAsCustomer=Bên thứ ba phải được định nghĩa là một khách hàng +SellsJournal=Tạp chí Kinh doanh +PurchasesJournal=Mua Tạp chí +DescSellsJournal=Tạp chí Kinh doanh +DescPurchasesJournal=Mua Tạp chí +InvoiceRef=Ref hóa đơn. +CodeNotDef=Không xác định +AddRemind=Công văn số tiền có sẵn +RemainToDivide= Vẫn giữ nguyên văn: +WarningDepositsNotIncluded=Tiền gửi hoá đơn không được bao gồm trong phiên bản này với các phân hệ kế toán này. +DatePaymentTermCantBeLowerThanObjectDate=Ngày thanh toán hạn không thể thấp hơn so với ngày đối tượng. +Pcg_version=Phiên bản PCG +Pcg_type=PCG loại +Pcg_subtype=PCG chủng +InvoiceLinesToDispatch=Dòng hoá đơn để gửi +InvoiceDispatched=Hoá đơn cử +AccountancyDashboard=Kế toán tổng hợp +ByProductsAndServices=Các sản phẩm và dịch vụ +RefExt=Ref bên ngoài +ToCreateAPredefinedInvoice=Để tạo ra một hóa đơn được xác định trước, tạo ra một hóa đơn tiêu chuẩn sau đó, mà không cần xác nhận nó, bấm vào nút vào "Chuyển đổi sang hóa đơn được xác định trước". +LinkedOrder=Link to order +ReCalculate=Tính toán lại +Mode1=Phương pháp 1 +Mode2=Phương pháp 2 +CalculationRuleDesc=Để tính tổng số thuế GTGT, có hai phương pháp:
Phương pháp 1 đang đi ngang vat trên mỗi dòng, sau đó tổng hợp chúng.
Cách 2 là cách tổng hợp tất cả vat trên mỗi dòng, sau đó làm tròn kết quả.
Kết quả cuối cùng có thể khác với vài xu. Chế độ mặc định là chế độ% s. +CalculationRuleDescSupplier=theo nhà cung cấp, lựa chọn phương pháp thích hợp để áp dụng quy tắc tính toán tương tự và nhận được cùng một kết quả mong đợi của nhà cung cấp của bạn. +TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ kế toán tiền mặt là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ kế toán tham gia (xem thiết lập của module kế toán). +CalculationMode=Chế độ tính toán +AccountancyJournal=Đang kế toán tạp chí ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang index e5ad112b222..b073df38243 100644 --- a/htdocs/langs/vi_VN/contracts.lang +++ b/htdocs/langs/vi_VN/contracts.lang @@ -1,101 +1,101 @@ # Dolibarr language file - Source file is en_US - contracts -ContractsArea=Contracts area -ListOfContracts=List of contracts -LastContracts=Last %s modified contracts -AllContracts=All contracts -ContractCard=Contract card -ContractStatus=Contract status -ContractStatusNotRunning=Not running -ContractStatusRunning=Running -ContractStatusDraft=Draft -ContractStatusValidated=Validated -ContractStatusClosed=Closed -ServiceStatusInitial=Not running -ServiceStatusRunning=Running -ServiceStatusNotLate=Running, not expired -ServiceStatusNotLateShort=Not expired -ServiceStatusLate=Running, expired -ServiceStatusLateShort=Expired -ServiceStatusClosed=Closed -ServicesLegend=Services legend -Contracts=Contracts -Contract=Contract -NoContracts=No contracts -MenuServices=Services -MenuInactiveServices=Services not active -MenuRunningServices=Running services -MenuExpiredServices=Expired services -MenuClosedServices=Closed services -NewContract=New contract -AddContract=Add contract -SearchAContract=Search a contract -DeleteAContract=Delete a contract -CloseAContract=Close a contract -ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ? -ConfirmValidateContract=Are you sure you want to validate this contract under name %s ? -ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ? -ConfirmCloseService=Are you sure you want to close this service with date %s ? -ValidateAContract=Validate a contract -ActivateService=Activate service -ConfirmActivateService=Are you sure you want to activate this service with date %s ? -RefContract=Contract reference -DateContract=Contract date -DateServiceActivate=Service activation date -DateServiceUnactivate=Service deactivation date -DateServiceStart=Date for beginning of service -DateServiceEnd=Date for end of service -ShowContract=Show contract -ListOfServices=List of services -ListOfInactiveServices=List of not active services -ListOfExpiredServices=List of expired active services -ListOfClosedServices=List of closed services -ListOfRunningContractsLines=List of running contract lines -ListOfRunningServices=List of running services -NotActivatedServices=Inactive services (among validated contracts) -BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last %s modified contracts -LastActivatedServices=Last %s activated services -LastModifiedServices=Last %s modified services -EditServiceLine=Edit service line -ContractStartDate=Start date -ContractEndDate=End date -DateStartPlanned=Planned start date -DateStartPlannedShort=Planned start date -DateEndPlanned=Planned end date -DateEndPlannedShort=Planned end date -DateStartReal=Real start date -DateStartRealShort=Real start date -DateEndReal=Real end date -DateEndRealShort=Real end date -NbOfServices=Nb of services -CloseService=Close service -ServicesNomberShort=%s service(s) -RunningServices=Running services -BoardRunningServices=Expired running services -ServiceStatus=Status of service -DraftContracts=Drafts contracts -CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it -CloseAllContracts=Close all contract lines -DeleteContractLine=Delete a contract line -ConfirmDeleteContractLine=Are you sure you want to delete this contract line ? -MoveToAnotherContract=Move service into another contract. -ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract. -ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ? -PaymentRenewContractId=Renew contract line (number %s) -ExpiredSince=Expiration date -RelatedContracts=Related contracts -NoExpiredServices=No expired active services -ListOfServicesToExpireWithDuration=List of Services to expire in %s days -ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days -ListOfServicesToExpire=List of Services to expire -NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. -StandardContractsTemplate=Standard contracts template -ContactNameAndSignature=For %s, name and signature: +ContractsArea=Diện tích hợp đồng +ListOfContracts=Danh sách các hợp đồng +LastContracts=Hợp đồng đổi cuối cùng% s +AllContracts=Tất cả các hợp +ContractCard=Thẻ đồng +ContractStatus=Tình trạng hợp đồng +ContractStatusNotRunning=Không chạy +ContractStatusRunning=Chạy +ContractStatusDraft=Dự thảo +ContractStatusValidated=Xác nhận +ContractStatusClosed=Đóng +ServiceStatusInitial=Không chạy +ServiceStatusRunning=Chạy +ServiceStatusNotLate=Chạy, chưa hết hạn +ServiceStatusNotLateShort=Không hết hạn +ServiceStatusLate=Chạy, hết hạn +ServiceStatusLateShort=Hết hạn +ServiceStatusClosed=Đóng +ServicesLegend=Dịch vụ truyền thuyết +Contracts=Hợp đồng +Contract=Hợp đồng +NoContracts=Không có hợp đồng +MenuServices=Dịch vụ +MenuInactiveServices=Dịch vụ không hoạt động +MenuRunningServices=Dịch vụ đang chạy +MenuExpiredServices=Dịch vụ hết hạn +MenuClosedServices=Dịch vụ khép kín +NewContract=Hợp đồng mới +AddContract=Thêm hợp đồng +SearchAContract=Tìm kiếm một hợp đồng +DeleteAContract=Xóa một hợp đồng +CloseAContract=Đóng một hợp đồng +ConfirmDeleteAContract=Bạn Bạn có chắc chắn muốn xóa hợp đồng này và tất cả các dịch vụ của mình? +ConfirmValidateContract=Bạn có chắc chắn bạn muốn xác nhận hợp đồng này dưới tên% s? +ConfirmCloseContract=Điều này sẽ đóng tất cả các dịch vụ (hoạt động hay không). Bạn có chắc là bạn muốn đóng hợp đồng này? +ConfirmCloseService=Bạn có chắc bạn muốn đóng dịch vụ này với ngày% s? +ValidateAContract=Xác nhận hợp đồng +ActivateService=Kích hoạt dịch vụ +ConfirmActivateService=Bạn có chắc chắn bạn muốn kích hoạt dịch vụ này với ngày% s? +RefContract=Tài liệu tham khảo Hợp đồng +DateContract=Ngày ký hợp đồng +DateServiceActivate=Dịch vụ của ngày kích hoạt +DateServiceUnactivate=Dịch vụ ngày Chấm dứt hoạt +DateServiceStart=Ngày đầu cho dịch vụ +DateServiceEnd=Ngày đăng ký cuối cùng của dịch vụ +ShowContract=Hiện hợp đồng +ListOfServices=Danh sách dịch vụ +ListOfInactiveServices=Danh sách các dịch vụ không hoạt động +ListOfExpiredServices=Danh sách các dịch vụ đang hoạt động đã hết hạn +ListOfClosedServices=Danh sách các dịch vụ khép kín +ListOfRunningContractsLines=Danh sách các đường chạy hợp đồng +ListOfRunningServices=Danh sách các dịch vụ đang chạy +NotActivatedServices=Dịch vụ không hoạt động (trong hợp đồng xác nhận) +BoardNotActivatedServices=Dịch vụ để kích hoạt các hợp đồng xác nhận +LastContracts=Hợp đồng đổi cuối cùng% s +LastActivatedServices=Dịch vụ kích hoạt cuối% s +LastModifiedServices=Dịch vụ biến đổi cuối cùng% s +EditServiceLine=Dòng Chỉnh sửa dịch vụ +ContractStartDate=Ngày bắt đầu +ContractEndDate=Ngày kết thúc +DateStartPlanned=Ngày bắt đầu lên kế hoạch +DateStartPlannedShort=Ngày bắt đầu lên kế hoạch +DateEndPlanned=Ngày kết thúc kế hoạch +DateEndPlannedShort=Ngày kết thúc kế hoạch +DateStartReal=Ngày bắt đầu thực +DateStartRealShort=Ngày bắt đầu thực +DateEndReal=Bất ngày cuối +DateEndRealShort=Bất ngày cuối +NbOfServices=Nb dịch vụ +CloseService=Đóng cửa dịch vụ +ServicesNomberShort=Dịch vụ% s (s) +RunningServices=Dịch vụ đang chạy +BoardRunningServices=Dịch vụ chạy hết hạn +ServiceStatus=Trạng thái dịch vụ +DraftContracts=Dự thảo hợp đồng +CloseRefusedBecauseOneServiceActive=Hợp đồng không thể đóng cửa là phát sinh ít nhất một dịch vụ mở vào nó +CloseAllContracts=Đóng tất cả các dòng đồng +DeleteContractLine=Xóa một dòng đồng +ConfirmDeleteContractLine=Bạn Bạn có chắc chắn muốn xóa dòng hợp đồng này? +MoveToAnotherContract=Di chuyển dịch vụ vào hợp đồng khác. +ConfirmMoveToAnotherContract=Tôi chọn lựa hợp đồng mục tiêu mới và xác nhận tôi muốn chuyển dịch vụ này vào hợp đồng này. +ConfirmMoveToAnotherContractQuestion=Chọn trong đó hợp đồng (của cùng một bên thứ ba) hiện có, bạn muốn di chuyển dịch vụ này để? +PaymentRenewContractId=Gia hạn hợp đồng đường (số% s) +ExpiredSince=Ngày hết hạn +RelatedContracts=Hợp đồng liên quan +NoExpiredServices=Không có dịch vụ hoạt động đã hết hạn +ListOfServicesToExpireWithDuration=Danh sách Dịch vụ hết hạn trong% s ngày +ListOfServicesToExpireWithDurationNeg=Danh sách Dịch vụ hết hạn từ hơn% s ngày +ListOfServicesToExpire=Danh sách Dịch vụ hết hạn +NoteListOfYourExpiredServices=Danh sách này chỉ bao gồm các dịch vụ hợp đồng cho các bên thứ ba mà bạn đang kết nối như là một đại diện bán hàng. +StandardContractsTemplate=Hợp đồng tiêu chuẩn mẫu +ContactNameAndSignature=Đối với% s, tên, chữ ký: ##### Types de contacts ##### -TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract -TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract -TypeContact_contrat_external_BILLING=Billing customer contact -TypeContact_contrat_external_CUSTOMER=Follow-up customer contact -TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact -Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined +TypeContact_contrat_internal_SALESREPSIGN=Bán hàng ký kết hợp đồng đại diện +TypeContact_contrat_internal_SALESREPFOLL=Đại diện bán hàng theo dõi hợp đồng +TypeContact_contrat_external_BILLING=Thanh toán liên lạc của khách hàng +TypeContact_contrat_external_CUSTOMER=Theo dõi liên lạc của khách hàng +TypeContact_contrat_external_SALESREPSIGN=Ký kết hợp đồng liên hệ khách hàng +Error_CONTRACT_ADDON_NotDefined=CONTRACT_ADDON liên tục không được xác định diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang index 768cd012384..bcece4045b0 100644 --- a/htdocs/langs/vi_VN/cron.lang +++ b/htdocs/langs/vi_VN/cron.lang @@ -1,89 +1,87 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -About = About -CronAbout = About Cron -CronAboutPage = Cron about page - +About = Về +CronAbout = Về Cron +CronAboutPage = Định kỳ về trang web # Right -Permission23101 = Read Scheduled task -Permission23102 = Create/update Scheduled task -Permission23103 = Delete Scheduled task -Permission23104 = Execute Scheduled task +Permission23101 = Đọc nhiệm vụ theo lịch trình +Permission23102 = Tạo / cập nhật theo lịch trình công việc +Permission23103 = Xóa nhiệm vụ theo lịch trình +Permission23104 = Thực hiện nhiệm vụ theo lịch trình # Admin -CronSetup= Scheduled job management setup -URLToLaunchCronJobs=URL to check and launch cron jobs if required -OrToLaunchASpecificJob=Or to check and launch a specific job -KeyForCronAccess=Security key for URL to launch cron jobs -FileToLaunchCronJobs=Command line to launch cron jobs -CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes +CronSetup= Theo lịch trình thiết lập quản lý công việc +URLToLaunchCronJobs=URL để kiểm tra và khởi động công việc cron nếu được yêu cầu +OrToLaunchASpecificJob=Hoặc để kiểm tra và khởi động một công việc cụ thể +KeyForCronAccess=Khóa bảo mật cho URL để khởi động công việc cron +FileToLaunchCronJobs=Dòng lệnh để khởi động công việc cron +CronExplainHowToRunUnix=Về môi trường Unix bạn nên sử dụng crontab để chạy dòng lệnh mỗi phút +CronExplainHowToRunWin=Trên Microsoft (tm) Windows environement bạn có thể sử dụng công cụ nhiệm vụ theo lịch trình để chạy dòng lệnh mỗi phút # Menu -CronJobs=Scheduled jobs -CronListActive= List of active jobs -CronListInactive= List of disabled jobs -CronListActive= List of active jobs +CronJobs=Việc theo lịch trình +CronListActive= Danh sách các công việc mới +CronListInactive= Danh sách việc làm người khuyết tật +CronListActive= Danh sách các công việc mới # Page list -CronDateLastRun=Last run -CronLastOutput=Last run output -CronLastResult=Last result code -CronListOfCronJobs=List of scheduled jobs -CronCommand=Command -CronList=Jobs list -CronDelete= Delete cron jobs -CronConfirmDelete= Are you sure you want to delete this cron job ? -CronExecute=Launch job -CronConfirmExecute= Are you sure to execute this job now -CronInfo= Jobs allow to execute task that have been planned -CronWaitingJobs=Wainting jobs -CronTask=Job -CronNone= None -CronDtStart=Start date -CronDtEnd=End date -CronDtNextLaunch=Next execution -CronDtLastLaunch=Last execution +CronDateLastRun=Chạy cuối +CronLastOutput=Bài đầu ra chạy +CronLastResult=Cuối mã kết quả +CronListOfCronJobs=Danh sách công việc dự kiến +CronCommand=Lệnh +CronList=Danh sách công việc +CronDelete= Xóa công việc cron +CronConfirmDelete= Bạn Bạn có chắc chắn muốn xóa công việc định kỳ này? +CronExecute=Việc ra mắt +CronConfirmExecute= Bạn có chắc chắn để thực hiện công việc này ngay bây giờ +CronInfo= Việc cho phép để thực hiện nhiệm vụ đã được lên kế hoạch +CronWaitingJobs=Wainting việc làm +CronTask=Công việc +CronNone= Không +CronDtStart=Ngày bắt đầu +CronDtEnd=Ngày kết thúc +CronDtNextLaunch=Thực hiện tiếp theo +CronDtLastLaunch=Thực hiện cuối CronFrequency=Frequancy CronClass=Classe -CronMethod=Method -CronModule=Module -CronAction=Action -CronStatus=Status -CronStatusActive=Enabled -CronStatusInactive=Disabled -CronNoJobs=No jobs registered -CronPriority=Priority -CronLabel=Description -CronNbRun=Nb. launch -CronEach=Every -JobFinished=Job launched and finished +CronMethod=Phương pháp +CronModule=Mô-đun +CronAction=Hành động +CronStatus=Tình trạng +CronStatusActive=Bật +CronStatusInactive=Người khuyết tật +CronNoJobs=Không có công ăn việc làm đăng ký +CronPriority=Ưu tiên +CronLabel=Mô tả +CronNbRun=Nb. ra mắt +CronEach=Mỗi +JobFinished=Việc đưa ra và hoàn thành #Page card -CronAdd= Add jobs -CronHourStart= Start Hour and date of task -CronEvery= And execute task each -CronObject= Instance/Object to create -CronArgs=Parameters -CronSaveSucess=Save succesfully -CronNote=Comment -CronFieldMandatory=Fields %s is mandatory -CronErrEndDateStartDt=End date cannot be before start date -CronStatusActiveBtn=Enable -CronStatusInactiveBtn=Disable -CronTaskInactive=This job is disabled -CronDtLastResult=Last result date +CronAdd= Thêm công việc +CronHourStart= Bắt đầu giờ và ngày nhiệm vụ +CronEvery= Và thực hiện nhiệm vụ mỗi +CronObject= Ví dụ / đối tượng để tạo ra +CronArgs=Các thông số +CronSaveSucess=Lưu thành công +CronNote=Nhận xét +CronFieldMandatory=Fields% s là bắt buộc +CronErrEndDateStartDt=Ngày kết thúc không thể trước ngày bắt đầu +CronStatusActiveBtn=Kích hoạt +CronStatusInactiveBtn=Vô hiệu hoá +CronTaskInactive=Công việc này bị vô hiệu hóa +CronDtLastResult=Cuối ngày kết quả CronId=Id -CronClassFile=Classes (filename.class.php) -CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -CronClassFileHelp=The file name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -CronObjectHelp=The object name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -CronCommandHelp=The system command line to execute. +CronClassFile=Lớp học (filename.class.php) +CronModuleHelp=Tên của thư mục module Dolibarr (cũng làm việc với mô-đun Dolibarr bên ngoài).
Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm / htdocs / sản phẩm /class/product.class.php lấy, giá trị của mô-đun là sản phẩm +CronClassFileHelp=Tên tập tin để tải.
Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm / htdocs / sản phẩm / lớp / product.class.php lấy, giá trị của tên tập tin lớp học là product.class.php +CronObjectHelp=Tên đối tượng để tải.
Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của tên tập tin lớp học là sản phẩm +CronMethodHelp=Phương pháp đối tượng để khởi động.
Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của phương pháp là fecth +CronArgsHelp=Các đối số phương pháp.
Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của paramters có thể là 0, ProductRef +CronCommandHelp=Các dòng lệnh hệ thống để thực thi. # Info -CronInfoPage=Information +CronInfoPage=Thông tin # Common -CronType=Task type -CronType_method=Call method of a Dolibarr Class -CronType_command=Shell command +CronType=Loại nhiệm vụ +CronType_method=Gọi phương thức của một lớp Dolibarr +CronType_command=Shell lệnh CronMenu=Cron -CronCannotLoadClass=Cannot load class %s or object %s -UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronCannotLoadClass=Không thể tải lớp% s hoặc đối tượng% s +UseMenuModuleToolsToAddCronJobs=Đi vào menu "Trang chủ - module công cụ - danh sách công việc" để xem và chỉnh sửa các công việc theo lịch trình. diff --git a/htdocs/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang index bb78c5ac7c2..c61a321ab88 100644 --- a/htdocs/langs/vi_VN/deliveries.lang +++ b/htdocs/langs/vi_VN/deliveries.lang @@ -1,26 +1,26 @@ # Dolibarr language file - Source file is en_US - deliveries -Delivery=Delivery -Deliveries=Deliveries -DeliveryCard=Delivery card -DeliveryOrder=Delivery order -DeliveryOrders=Delivery orders -DeliveryDate=Delivery date -DeliveryDateShort=Deliv. date -CreateDeliveryOrder=Generate delivery order -QtyDelivered=Qty delivered -SetDeliveryDate=Set shipping date -ValidateDeliveryReceipt=Validate delivery receipt -ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ? -DeleteDeliveryReceipt=Delete delivery receipt -DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt %s ? -DeliveryMethod=Delivery method -TrackingNumber=Tracking number -DeliveryNotValidated=Delivery not validated +Delivery=Giao hàng tận nơi +Deliveries=Việc giao hàng +DeliveryCard=Thẻ Giao hàng tận nơi +DeliveryOrder=Lệnh giao hàng +DeliveryOrders=Lệnh giao hàng +DeliveryDate=Ngày giao hàng +DeliveryDateShort=Deliv. ngày +CreateDeliveryOrder=Tạo lệnh giao hàng +QtyDelivered=Số lượng giao +SetDeliveryDate=Thiết lập ngày vận chuyển +ValidateDeliveryReceipt=Xác nhận giao hàng +ValidateDeliveryReceiptConfirm=Bạn có chắc chắn bạn muốn xác nhận giao hàng này? +DeleteDeliveryReceipt=Xóa nhận giao hàng +DeleteDeliveryReceiptConfirm=Bạn Bạn có chắc chắn muốn xóa nhận giao hàng% s? +DeliveryMethod=Phương thức vận chuyển +TrackingNumber=Số theo dõi +DeliveryNotValidated=Giao hàng tận nơi không xác nhận # merou PDF model -NameAndSignature=Name and Signature : -ToAndDate=To___________________________________ on ____/_____/__________ -GoodStatusDeclaration=Have received the goods above in good condition, -Deliverer=Deliverer : -Sender=Sender -Recipient=Recipient -ErrorStockIsNotEnough=There's not enough stock +NameAndSignature=Tên và chữ ký: +ToAndDate=To___________________________________ vào ____ / _____ / __________ +GoodStatusDeclaration=Đã nhận được hàng hoá trên trong tình trạng tốt, +Deliverer=Giao: +Sender=Tên người gửi +Recipient=Người nhận +ErrorStockIsNotEnough=Không có đủ chứng khoán diff --git a/htdocs/langs/vi_VN/dict.lang b/htdocs/langs/vi_VN/dict.lang index 4b724056147..a9218c84d34 100644 --- a/htdocs/langs/vi_VN/dict.lang +++ b/htdocs/langs/vi_VN/dict.lang @@ -1,46 +1,46 @@ # Dolibarr language file - Source file is en_US - dict -CountryFR=France -CountryBE=Belgium -CountryIT=Italy -CountryES=Spain -CountryDE=Germany -CountryCH=Switzerland -CountryGB=Great Britain -CountryUK=United Kingdom +CountryFR=Pháp +CountryBE=Bỉ +CountryIT=Ý +CountryES=Tây Ban Nha +CountryDE=Đức +CountryCH=Thụy Sĩ +CountryGB=Vương quốc Anh +CountryUK=Vương quốc Anh CountryIE=Ireland -CountryCN=China +CountryCN=Trung Quốc CountryTN=Tunisia -CountryUS=United States +CountryUS=Hoa Kỳ CountryMA=Morocco CountryDZ=Algeria CountryCA=Canada CountryTG=Togo CountryGA=Gabon -CountryNL=Netherlands +CountryNL=Hà Lan CountryHU=Hungary -CountryRU=Russia -CountrySE=Sweden +CountryRU=Nga +CountrySE=Thụy Điển CountryCI=Ivoiry Coast CountrySN=Senegal CountryAR=Argentina CountryCM=Cameroon -CountryPT=Portugal -CountrySA=Saudi Arabia +CountryPT=Bồ Đào Nha +CountrySA=Ả Rập Saudi CountryMC=Monaco -CountryAU=Australia +CountryAU=Úc CountrySG=Singapore CountryAF=Afghanistan -CountryAX=Åland Islands +CountryAX=Quần đảo Åland CountryAL=Albania -CountryAS=American Samoa +CountryAS=Samoa thuộc Mỹ CountryAD=Andorra CountryAO=Angola CountryAI=Anguilla -CountryAQ=Antarctica -CountryAG=Antigua and Barbuda +CountryAQ=Nam Cực +CountryAG=Antigua và Barbuda CountryAM=Armenia CountryAW=Aruba -CountryAT=Austria +CountryAT=Áo CountryAZ=Azerbaijan CountryBS=Bahamas CountryBH=Bahrain @@ -52,56 +52,56 @@ CountryBJ=Benin CountryBM=Bermuda CountryBT=Bhutan CountryBO=Bolivia -CountryBA=Bosnia and Herzegovina +CountryBA=Bosnia và Herzegovina CountryBW=Botswana -CountryBV=Bouvet Island +CountryBV=Đảo Bouvet CountryBR=Brazil -CountryIO=British Indian Ocean Territory +CountryIO=Argentina CountryBN=Brunei Darussalam CountryBG=Bulgaria CountryBF=Burkina Faso CountryBI=Burundi -CountryKH=Cambodia +CountryKH=Campuchia CountryCV=Cape Verde -CountryKY=Cayman Islands -CountryCF=Central African Republic +CountryKY=Quần đảo Cayman +CountryCF=Cộng hòa Trung Phi CountryTD=Chad CountryCL=Chile -CountryCX=Christmas Island -CountryCC=Cocos (Keeling) Islands +CountryCX=Đảo Christmas +CountryCC=Quần đảo Cocos (Keeling) CountryCO=Colombia CountryKM=Comoros CountryCG=Congo -CountryCD=Congo, The Democratic Republic of the -CountryCK=Cook Islands +CountryCD=Congo, Cộng hòa Dân chủ +CountryCK=Quần đảo Cook CountryCR=Costa Rica CountryHR=Croatia CountryCU=Cuba -CountryCY=Cyprus -CountryCZ=Czech Republic -CountryDK=Denmark +CountryCY=Síp +CountryCZ=Cộng hòa Séc +CountryDK=Đan Mạch CountryDJ=Djibouti CountryDM=Dominica -CountryDO=Dominican Republic +CountryDO=Cộng hòa Dominica CountryEC=Ecuador -CountryEG=Egypt +CountryEG=Ai Cập CountrySV=El Salvador -CountryGQ=Equatorial Guinea +CountryGQ=Guinea Xích Đạo CountryER=Eritrea CountryEE=Estonia CountryET=Ethiopia -CountryFK=Falkland Islands -CountryFO=Faroe Islands -CountryFJ=Fiji Islands -CountryFI=Finland -CountryGF=French Guiana +CountryFK=Quần đảo Falkland +CountryFO=Quần đảo Faroe +CountryFJ=Quần đảo Fiji +CountryFI=Phần Lan +CountryGF=Guiana thuộc Pháp CountryPF=French Polynesia -CountryTF=French Southern Territories +CountryTF=Gà tây CountryGM=Gambia CountryGE=Georgia CountryGH=Ghana CountryGI=Gibraltar -CountryGR=Greece +CountryGR=Hy Lạp CountryGL=Greenland CountryGD=Grenada CountryGP=Guadeloupe @@ -110,133 +110,133 @@ CountryGT=Guatemala CountryGN=Guinea CountryGW=Guinea-Bissau CountryGY=Guyana -CountryHT=Haïti -CountryHM=Heard Island and McDonald -CountryVA=Holy See (Vatican City State) +CountryHT=Haiti +CountryHM=Đảo Heard và McDonald +CountryVA=Tòa Thánh (Vatican City State) CountryHN=Honduras -CountryHK=Hong Kong +CountryHK=Hồng Kông CountryIS=Icelande -CountryIN=India +CountryIN=Ấn Độ CountryID=Indonesia CountryIR=Iran CountryIQ=Iraq CountryIL=Israel CountryJM=Jamaica -CountryJP=Japan +CountryJP=Nhật Bản CountryJO=Jordan CountryKZ=Kazakhstan CountryKE=Kenya CountryKI=Kiribati -CountryKP=North Korea -CountryKR=South Korea +CountryKP=Bắc Triều Tiên +CountryKR=Hàn Quốc CountryKW=Kuwait CountryKG=Kyrghyztan -CountryLA=Lao +CountryLA=Lào CountryLV=Latvia CountryLB=Lebanon CountryLS=Lesotho CountryLR=Liberia -CountryLY=Libyan +CountryLY=Libya CountryLI=Liechtenstein CountryLT=Lituania CountryLU=Luxembourg CountryMO=Macao -CountryMK=Macedonia, the former Yugoslav of +CountryMK=Macedonia, cựu Nam Tư của CountryMG=Madagascar CountryMW=Malawi CountryMY=Malaysia CountryMV=Maldives CountryML=Mali CountryMT=Malta -CountryMH=Marshall Islands +CountryMH=Quần đảo Marshall CountryMQ=Martinique CountryMR=Mauritania CountryMU=Mauritius CountryYT=Mayotte CountryMX=Mexico -CountryFM=Micronesia +CountryFM=Liên bang Micronesia CountryMD=Moldova -CountryMN=Mongolia +CountryMN=Mông Cổ CountryMS=Monserrat CountryMZ=Mozambique CountryMM=Birmania (Myanmar) CountryNA=Namibia CountryNR=Nauru CountryNP=Nepal -CountryAN=Netherlands Antilles +CountryAN=Antille thuộc Hà Lan CountryNC=New Caledonia CountryNZ=New Zealand CountryNI=Nicaragua CountryNE=Niger CountryNG=Nigeria CountryNU=Niue -CountryNF=Norfolk Island -CountryMP=Northern Mariana Islands -CountryNO=Norway +CountryNF=Đảo Norfolk +CountryMP=Quần đảo Bắc Mariana +CountryNO=Na Uy CountryOM=Oman CountryPK=Pakistan CountryPW=Palau -CountryPS=Palestinian Territory, Occupied +CountryPS=Lãnh thổ Palestine bị chiếm đóng CountryPA=Panama CountryPG=Papua New Guinea CountryPY=Paraguay CountryPE=Peru CountryPH=Philippines -CountryPN=Pitcairn Islands -CountryPL=Poland +CountryPN=Quần đảo Pitcairn +CountryPL=Ba Lan CountryPR=Puerto Rico CountryQA=Qatar CountryRE=Reunion CountryRO=Romania CountryRW=Rwanda CountrySH=Saint Helena -CountryKN=Saint Kitts and Nevis +CountryKN=Saint Kitts và Nevis CountryLC=Saint Lucia -CountryPM=Saint Pierre and Miquelon -CountryVC=Saint Vincent and Grenadines +CountryPM=Saint Pierre và Miquelon +CountryVC=Saint Vincent và Grenadines CountryWS=Samoa CountrySM=San Marino -CountryST=Sao Tome and Principe +CountryST=Sao Tome và Principe CountryRS=Serbia CountrySC=Seychelles CountrySL=Sierra Leone CountrySK=Slovakia CountrySI=Slovenia -CountrySB=Solomon Islands +CountrySB=Quần đảo Solomon CountrySO=Somalia -CountryZA=South Africa -CountryGS=South Georgia and the South Sandwich Islands +CountryZA=Nam Phi +CountryGS=Quần đảo Nam Sandwich Nam Georgia và CountryLK=Sri Lanka CountrySD=Sudan CountrySR=Suriname -CountrySJ=Svalbard and Jan Mayen +CountrySJ=Quần đảo Svalbard và Jan Mayen CountrySZ=Swaziland -CountrySY=Syrian -CountryTW=Taiwan +CountrySY=Syria +CountryTW=Đài Loan CountryTJ=Tajikistan CountryTZ=Tanzania -CountryTH=Thailand -CountryTL=Timor-Leste +CountryTH=Thái Lan +CountryTL=Đông Timor CountryTK=Tokelau CountryTO=Tonga -CountryTT=Trinidad and Tobago -CountryTR=Turkey +CountryTT=Trinidad và Tobago +CountryTR=Thổ Nhĩ Kỳ CountryTM=Turkmenistan -CountryTC=Turks and Cailos Islands +CountryTC=Quần đảo Turks và Cailos CountryTV=Tuvalu CountryUG=Uganda -CountryUA=Ukraine -CountryAE=United Arab Emirates -CountryUM=United States Minor Outlying Islands +CountryUA=Ukraina +CountryAE=Tiểu Vương Quốc Ả Rập Thống Nhất +CountryUM=Hoa Kỳ Ma-rốc CountryUY=Uruguay CountryUZ=Uzbekistan CountryVU=Vanuatu CountryVE=Venezuela -CountryVN=Viet Nam -CountryVG=Virgin Islands, British -CountryVI=Virgin Islands, U.S. -CountryWF=Wallis and Futuna -CountryEH=Western Sahara +CountryVN=Việt Nam +CountryVG=Quần đảo Virgin, Anh +CountryVI=Quần đảo Virgin, Mỹ +CountryWF=Wallis và Futuna +CountryEH=Tây Sahara CountryYE=Yemen CountryZM=Zambia CountryZW=Zimbabwe @@ -248,78 +248,80 @@ CountryBL=Saint Barthelemy CountryMF=Saint Martin ##### Civilities ##### -CivilityMME=Mrs. -CivilityMR=Mr. -CivilityMLE=Ms. -CivilityMTRE=Master -CivilityDR=Doctor +CivilityMME=Bà +CivilityMR=Ông +CivilityMLE=Cô +CivilityMTRE=Thạc sĩ +CivilityDR=Tiến sĩ ##### Currencies ##### -Currencyeuros=Euros -CurrencyAUD=AU Dollars -CurrencySingAUD=AU Dollar -CurrencyCAD=CAN Dollars -CurrencySingCAD=CAN Dollar -CurrencyCHF=Swiss Francs -CurrencySingCHF=Swiss Franc -CurrencyEUR=Euros +Currencyeuros=Euro +CurrencyAUD=Đô Úc +CurrencySingAUD=Đô Úc +CurrencyCAD=Đô Canada +CurrencySingCAD=Đô Canada +CurrencyCHF=Francs Thụy Sĩ +CurrencySingCHF=Franc Thụy Sĩ +CurrencyEUR=Euro CurrencySingEUR=Euro -CurrencyFRF=French Francs -CurrencySingFRF=French Franc -CurrencyGBP=GB Pounds -CurrencySingGBP=GB Pound -CurrencyINR=Indian rupees -CurrencySingINR=Indian rupee +CurrencyFRF=Francs Pháp +CurrencySingFRF=Franc Pháp +CurrencyGBP=Bảng Anh +CurrencySingGBP=Bảng Anh +CurrencyINR=Rupee Ấn Độ +CurrencySingINR=Rupee Ấn Độ CurrencyMAD=Dirham CurrencySingMAD=Dirham CurrencyMGA=Ariary CurrencySingMGA=Ariary -CurrencyMUR=Mauritius rupees +CurrencyMUR=Rupee Mauritius CurrencySingMUR=Mauritius rupee -CurrencyNOK=Norwegian krones -CurrencySingNOK=Norwegian krone -CurrencyTND=Tunisian dinars -CurrencySingTND=Tunisian dinar -CurrencyUSD=US Dollars -CurrencySingUSD=US Dollar +CurrencyNOK=Krones Na Uy +CurrencySingNOK=Krone Na Uy +CurrencyTND=Dinar Tunisia +CurrencySingTND=Dinar Tunisia +CurrencyUSD=Đô la Mỹ +CurrencySingUSD=Đô la Mỹ CurrencyUAH=Hryvnia CurrencySingUAH=Hryvnia CurrencyXAF=CFA Francs BEAC CurrencySingXAF=CFA Franc BEAC -CurrencyXOF=CFA Francs BCEAO +CurrencyXOF=CFA Franc BCEAO CurrencySingXOF=CFA Franc BCEAO CurrencyXPF=CFP Francs CurrencySingXPF=CFP Franc -CurrencyCentSingEUR=cent -CurrencyThousandthSingTND=thousandth +CurrencyCentSingEUR=phần trăm +CurrencyCentINR=paisa +CurrencyCentSingINR=paise +CurrencyThousandthSingTND=nghìn #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet -DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign -DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign -DemandReasonTypeSRC_CAMP_PHO=Phone campaign -DemandReasonTypeSRC_CAMP_FAX=Fax campaign -DemandReasonTypeSRC_COMM=Commercial contact -DemandReasonTypeSRC_SHOP=Shop contact -DemandReasonTypeSRC_WOM=Word of mouth -DemandReasonTypeSRC_PARTNER=Partner -DemandReasonTypeSRC_EMPLOYEE=Employee -DemandReasonTypeSRC_SPONSORING=Sponsorship +DemandReasonTypeSRC_CAMP_MAIL=Chiến dịch gửi thư tay +DemandReasonTypeSRC_CAMP_EMAIL=Chiến dịch gửi thư điện tử +DemandReasonTypeSRC_CAMP_PHO=Chiến dịch gọi Điện thoại +DemandReasonTypeSRC_CAMP_FAX=Chiến dịch gửi Fax +DemandReasonTypeSRC_COMM=Liên lạc thương mại +DemandReasonTypeSRC_SHOP=Cửa hàng liên lạc +DemandReasonTypeSRC_WOM=Truyền miệng +DemandReasonTypeSRC_PARTNER=Đối tác +DemandReasonTypeSRC_EMPLOYEE=Nhân viên +DemandReasonTypeSRC_SPONSORING=Tài trợ #### Paper formats #### -PaperFormatEU4A0=Format 4A0 -PaperFormatEU2A0=Format 2A0 -PaperFormatEUA0=Format A0 -PaperFormatEUA1=Format A1 -PaperFormatEUA2=Format A2 -PaperFormatEUA3=Format A3 -PaperFormatEUA4=Format A4 -PaperFormatEUA5=Format A5 -PaperFormatEUA6=Format A6 -PaperFormatUSLETTER=Format Letter US -PaperFormatUSLEGAL=Format Legal US -PaperFormatUSEXECUTIVE=Format Executive US -PaperFormatUSLEDGER=Format Ledger/Tabloid -PaperFormatCAP1=Format P1 Canada -PaperFormatCAP2=Format P2 Canada -PaperFormatCAP3=Format P3 Canada -PaperFormatCAP4=Format P4 Canada -PaperFormatCAP5=Format P5 Canada -PaperFormatCAP6=Format P6 Canada +PaperFormatEU4A0=Định dạng 4A0 +PaperFormatEU2A0=Định dạng 2A0 +PaperFormatEUA0=Định dạng A0 +PaperFormatEUA1=Định dạng A1 +PaperFormatEUA2=Định dạng A2 +PaperFormatEUA3=Định dạng A3 +PaperFormatEUA4=Định dạng A4 +PaperFormatEUA5=Định dạng A5 +PaperFormatEUA6=Định dạng A6 +PaperFormatUSLETTER=Định dạng Letter Mỹ +PaperFormatUSLEGAL=Định dạng Legal Mỹ +PaperFormatUSEXECUTIVE=Định dạng Executive Mỹ +PaperFormatUSLEDGER=Định dạng Ledger / Tabloid +PaperFormatCAP1=Định dạng P1 Canada +PaperFormatCAP2=Định dạng P2 Canada +PaperFormatCAP3=Định dạng P3 Canada +PaperFormatCAP4=Định dạng P4 Canada +PaperFormatCAP5=Định dạng P5 Canada +PaperFormatCAP6=Định dạng P6 Canada diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang index 728661dfa04..2a0e4670460 100644 --- a/htdocs/langs/vi_VN/donations.lang +++ b/htdocs/langs/vi_VN/donations.lang @@ -1,32 +1,33 @@ # Dolibarr language file - Source file is en_US - donations -Donation=Donation -Donations=Donations -DonationRef=Donation ref. -Donor=Donor -Donors=Donors -AddDonation=Add a donation -NewDonation=New donation -ShowDonation=Show donation -DonationPromise=Gift promise -PromisesNotValid=Not validated promises -PromisesValid=Validated promises -DonationsPaid=Donations paid -DonationsReceived=Donations received -PublicDonation=Public donation -DonationsNumber=Donation number -DonationsArea=Donations area -DonationStatusPromiseNotValidated=Draft promise -DonationStatusPromiseValidated=Validated promise -DonationStatusPaid=Donation received -DonationStatusPromiseNotValidatedShort=Draft -DonationStatusPromiseValidatedShort=Validated -DonationStatusPaidShort=Received -ValidPromess=Validate promise -DonationReceipt=Donation receipt -BuildDonationReceipt=Build receipt -DonationsModels=Documents models for donation receipts -LastModifiedDonations=Last %s modified donations -SearchADonation=Search a donation -DonationRecipient=Donation recipient -ThankYou=Thank You -IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +Donation=Tài trợ +Donations=Tài trợ +DonationRef=Mã tài trợ +Donor=Nhà tài trợ +Donors=Các nhà tài trợ +AddDonation=Thêm tài trợ +NewDonation=Thêm tài trợ mới +ShowDonation=Hiển thị tài trợ +DonationPromise=Hứa tài trợ +PromisesNotValid=Chưa xác nhận khoản tài trợ +PromisesValid=Đã xác nhận khoản tài trợ +DonationsPaid=Khoản tài trợ đã thanh toán +DonationsReceived=Đã nhận được khoản tài trợ +PublicDonation=Hiển thị công khai +DonationsNumber=Số tài trợ +DonationsArea=Khu vực tài trợ +DonationStatusPromiseNotValidated=Khoản tài trợ dự kiến +DonationStatusPromiseValidated=Đã xác nhận khoản tài trợ +DonationStatusPaid=Đã nhận được khoản tài trợ +DonationStatusPromiseNotValidatedShort=Dự thảo +DonationStatusPromiseValidatedShort=Đã xác nhận +DonationStatusPaidShort=Đã nhận +ValidPromess=Xác nhận tài trợ +DonationReceipt=Nhận tài trợ +BuildDonationReceipt=Tạo Phiếu thu tài trợ +DonationsModels=Mẫu Phiếu thu tài trợ +LastModifiedDonations=%s khoản tài trợ mới được điều chỉnh +SearchADonation=Tìm kiếm tài trợ +DonationRecipient=Người nhận tài trợ +ThankYou=Trân trọng Cảm ơn! +IConfirmDonationReception=Người nhận tuyên bố tiếp nhận, như là một đóng góp, số tiền sau +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang index 90ace355500..8f3f349ff81 100644 --- a/htdocs/langs/vi_VN/ecm.lang +++ b/htdocs/langs/vi_VN/ecm.lang @@ -1,55 +1,55 @@ # Dolibarr language file - Source file is en_US - ecm -MenuECM=Documents -DocsMine=My documents -DocsGenerated=Generated documents -DocsElements=Elements documents -DocsThirdParties=Documents third parties -DocsContracts=Documents contracts -DocsProposals=Documents proposals -DocsOrders=Documents orders -DocsInvoices=Documents invoices -ECMNbOfDocs=Nb of documents in directory -ECMNbOfDocsSmall=Nb of doc. -ECMSection=Directory -ECMSectionManual=Manual directory -ECMSectionAuto=Automatic directory -ECMSectionsManual=Manual tree -ECMSectionsAuto=Automatic tree -ECMSections=Directories -ECMRoot=Root -ECMNewSection=New directory -ECMAddSection=Add directory -ECMNewDocument=New document -ECMCreationDate=Creation date -ECMNbOfFilesInDir=Number of files in directory -ECMNbOfSubDir=Number of sub-directories -ECMNbOfFilesInSubDir=Number of files in sub-directories -ECMCreationUser=Creator -ECMArea=EDM area -ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. -ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element. -ECMSectionWasRemoved=Directory %s has been deleted. -ECMDocumentsSection=Document of directory -ECMSearchByKeywords=Search by keywords -ECMSearchByEntity=Search by object -ECMSectionOfDocuments=Directories of documents -ECMTypeManual=Manual -ECMTypeAuto=Automatic -ECMDocsBySocialContributions=Documents linked to social contributions -ECMDocsByThirdParties=Documents linked to third parties -ECMDocsByProposals=Documents linked to proposals -ECMDocsByOrders=Documents linked to customers orders -ECMDocsByContracts=Documents linked to contracts -ECMDocsByInvoices=Documents linked to customers invoices -ECMDocsByProducts=Documents linked to products -ECMDocsByProjects=Documents linked to projects -ECMNoDirectoryYet=No directory created -ShowECMSection=Show directory -DeleteSection=Remove directory -ConfirmDeleteSection=Can you confirm you want to delete the directory %s ? -ECMDirectoryForFiles=Relative directory for files -CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files -ECMFileManager=File manager -ECMSelectASection=Select a directory on left tree... -DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory. +MenuECM=Tài liệu +DocsMine=Tài liệu của tôi +DocsGenerated=Các tài liệu được tạo ra +DocsElements=Các yếu tố văn bản +DocsThirdParties=Tài liệu các bên thứ ba +DocsContracts=Hợp đồng văn bản +DocsProposals=Văn bản đề nghị +DocsOrders=Các tài liệu đơn đặt hàng +DocsInvoices=Tài liệu hoá đơn +ECMNbOfDocs=Nb các tài liệu trong thư mục +ECMNbOfDocsSmall=Nb của doc. +ECMSection=Thư mục +ECMSectionManual=Hướng dẫn sử dụng thư mục +ECMSectionAuto=Thư mục tự động +ECMSectionsManual=Hướng dẫn sử dụng cây +ECMSectionsAuto=Cây tự động +ECMSections=Thư mục +ECMRoot=Gốc +ECMNewSection=Thư mục mới +ECMAddSection=Thêm thư mục +ECMNewDocument=Tài liệu mới +ECMCreationDate=Ngày tạo +ECMNbOfFilesInDir=Số lượng hồ sơ trong thư mục +ECMNbOfSubDir=Số thư mục con +ECMNbOfFilesInSubDir=Số ảnh trong thư mục con +ECMCreationUser=Đấng Tạo Hóa +ECMArea=Khu vực EDM +ECMAreaDesc=Các (quản lý tài liệu điện tử) khu vực EDM cho phép bạn lưu, chia sẻ và tìm kiếm một cách nhanh chóng tất cả các loại tài liệu trong Dolibarr. +ECMAreaDesc2=* Thư mục tự động được điền tự động khi thêm tài liệu từ thẻ của một phần tử.
* Hướng dẫn sử dụng các thư mục có thể được sử dụng để lưu các tài liệu không liên quan đến một yếu tố cụ thể. +ECMSectionWasRemoved=Thư mục% s đã bị xóa. +ECMDocumentsSection=Tài liệu của thư mục +ECMSearchByKeywords=Tìm kiếm theo từ khóa +ECMSearchByEntity=Tìm kiếm theo đối tượng +ECMSectionOfDocuments=Thư mục tài liệu +ECMTypeManual=Hướng dẫn sử dụng +ECMTypeAuto=Tự động +ECMDocsBySocialContributions=Các tài liệu liên quan đến các khoản đóng góp xã hội +ECMDocsByThirdParties=Các tài liệu liên quan đến các bên thứ ba +ECMDocsByProposals=Các tài liệu liên quan đến đề xuất +ECMDocsByOrders=Các tài liệu liên quan đến khách hàng các đơn đặt hàng +ECMDocsByContracts=Các tài liệu liên quan đến hợp đồng +ECMDocsByInvoices=Các tài liệu liên quan đến hoá đơn cho khách hàng +ECMDocsByProducts=Các tài liệu liên quan đến sản phẩm +ECMDocsByProjects=Các tài liệu liên quan đến dự án +ECMNoDirectoryYet=Không có thư mục được tạo ra +ShowECMSection=Hiện thư mục +DeleteSection=Hủy bỏ thư mục +ConfirmDeleteSection=Bạn có thể xác nhận bạn muốn xóa các thư mục% s? +ECMDirectoryForFiles=Thư mục cho các tập tin tương đối +CannotRemoveDirectoryContainsFiles=Loại bỏ không thể vì nó có chứa một số tập tin +ECMFileManager=Quản lý tập tin +ECMSelectASection=Chọn một thư mục trên cây trái ... +DirNotSynchronizedSyncFirst=Thư mục này dường như được tạo ra hoặc sửa đổi bên ngoài mô-đun ECM. Bạn phải nhấp vào nút "Refresh" đầu tiên để đồng bộ hóa cơ sở dữ liệu và đĩa để có được nội dung của thư mục này. diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang index 7a20fdb7e41..2d435e1bd08 100644 --- a/htdocs/langs/vi_VN/errors.lang +++ b/htdocs/langs/vi_VN/errors.lang @@ -1,156 +1,159 @@ # Dolibarr language file - Source file is en_US - errors # No errors -NoErrorCommitIsDone=No error, we commit +NoErrorCommitIsDone=Không có lỗi, chúng tôi cam kết # Errors Error=Lỗi -Errors=Errors -ErrorButCommitIsDone=Errors found but we validate despite this -ErrorBadEMail=EMail %s is wrong -ErrorBadUrl=Url %s is wrong -ErrorLoginAlreadyExists=Login %s already exists. -ErrorGroupAlreadyExists=Group %s already exists. -ErrorRecordNotFound=Record not found. -ErrorFailToCopyFile=Failed to copy file '%s' into '%s'. -ErrorFailToRenameFile=Failed to rename file '%s' into '%s'. -ErrorFailToDeleteFile=Failed to remove file '%s'. -ErrorFailToCreateFile=Failed to create file '%s'. -ErrorFailToRenameDir=Failed to rename directory '%s' into '%s'. -ErrorFailToCreateDir=Failed to create directory '%s'. -ErrorFailToDeleteDir=Failed to delete directory '%s'. -ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first. -ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type. -ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only. -ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different. -ErrorBadThirdPartyName=Bad value for third party name -ErrorProdIdIsMandatory=The %s is mandatory -ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code -ErrorCustomerCodeRequired=Customer code required -ErrorBarCodeRequired=Bar code required -ErrorCustomerCodeAlreadyUsed=Customer code already used -ErrorBarCodeAlreadyUsed=Bar code already used -ErrorPrefixRequired=Prefix required -ErrorUrlNotValid=The website address is incorrect -ErrorBadSupplierCodeSyntax=Bad syntax for supplier code -ErrorSupplierCodeRequired=Supplier code required -ErrorSupplierCodeAlreadyUsed=Supplier code already used -ErrorBadParameters=Bad parameters -ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format -ErrorBadDateFormat=Value '%s' has wrong date format -ErrorWrongDate=Date is not correct! -ErrorFailedToWriteInDir=Failed to write in directory %s -ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s) -ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities. -ErrorFieldsRequired=Some required fields were not filled. -ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). -ErrorNoMailDefinedForThisUser=No mail defined for this user -ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display. -ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. -ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. -ErrorFileNotFound=File %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) -ErrorDirNotFound=Directory %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) -ErrorFunctionNotAvailableInPHP=Function %s is required for this feature but is not available in this version/setup of PHP. -ErrorDirAlreadyExists=A directory with this name already exists. -ErrorFileAlreadyExists=A file with this name already exists. -ErrorPartialFile=File not received completely by server. -ErrorNoTmpDir=Temporary directy %s does not exists. -ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin. -ErrorFileSizeTooLarge=File size is too large. -ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum) -ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum) -ErrorNoValueForSelectType=Please fill value for select list -ErrorNoValueForCheckBoxType=Please fill value for checkbox list -ErrorNoValueForRadioType=Please fill value for radio list -ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores -ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters. -ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. -ErrorNoAccountancyModuleLoaded=No accountancy module activated -ErrorExportDuplicateProfil=This profile name already exists for this export set. -ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete. -ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors. -ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. -ErrorRefAlreadyExists=Ref used for creation already exists. -ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD) -ErrorRecordHasChildren=Failed to delete records since it has some childs. -ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. -ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display. -ErrorPasswordsMustMatch=Both typed passwords must match each other -ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. -ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) -ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) -ErrorsOnXLines=Errors on %s source record(s) -ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) -ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" -ErrorDatabaseParameterWrong=Database setup parameter '%s' has a value not compatible to use Dolibarr (must have value '%s'). -ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. -ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete. -ErrorBadMask=Error on mask -ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number -ErrorBadMaskBadRazMonth=Error, bad reset value -ErrorSelectAtLeastOne=Error. Select at least one entry. -ErrorProductWithRefNotExist=Product with reference '%s' don't exist -ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated -ErrorProdIdAlreadyExist=%s is assigned to another third -ErrorFailedToSendPassword=Failed to send password -ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. -ErrorPasswordDiffers=Passwords differs, please type them again. -ErrorForbidden=Access denied.
You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user. -ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. -ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). -ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display. -ErrorRecordAlreadyExists=Record already exists -ErrorCantReadFile=Failed to read file '%s' -ErrorCantReadDir=Failed to read directory '%s' -ErrorFailedToFindEntity=Failed to read environment '%s' -ErrorBadLoginPassword=Bad value for login or password -ErrorLoginDisabled=Your account has been disabled -ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir. -ErrorFailedToChangePassword=Failed to change password -ErrorLoginDoesNotExists=User with login %s could not be found. -ErrorLoginHasNoEmail=This user has no email address. Process aborted. -ErrorBadValueForCode=Bad value for security code. Try again with new value... -ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative -ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that -ErrorNoActivatedBarcode=No barcode type activated -ErrUnzipFails=Failed to unzip %s with ZipArchive -ErrNoZipEngine=No engine to unzip %s file in this PHP -ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package -ErrorFileRequired=It takes a package Dolibarr file -ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal -ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base -ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base -ErrorNewValueCantMatchOldValue=New value can't be equal to old one -ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process. -ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start'). -ErrorFailedToAddContact=Failed to add contact -ErrorDateMustBeBeforeToday=The date can not be greater than today -ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode. -ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. -ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s -ErrorWarehouseMustDiffers=Source and target warehouses must differs -ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. -ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. -ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +Errors=Lỗi +ErrorButCommitIsDone=Lỗi được tìm thấy nhưng chúng tôi xác nhận mặc dù điều này +ErrorBadEMail=Thư điện tử của% s là sai +ErrorBadUrl=Url% s là sai +ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại. +ErrorGroupAlreadyExists=Nhóm% s đã tồn tại. +ErrorRecordNotFound=Ghi lại không tìm thấy. +ErrorFailToCopyFile=Không thể sao chép tập tin '% s' vào '% s'. +ErrorFailToRenameFile=Không thể đổi tên tập tin '% s' vào '% s'. +ErrorFailToDeleteFile=Không thể loại bỏ các tập tin '% s'. +ErrorFailToCreateFile=Không thể tạo tập tin '% s'. +ErrorFailToRenameDir=Không thể đổi tên thư mục '% s' vào '% s'. +ErrorFailToCreateDir=Không thể tạo thư mục '% s'. +ErrorFailToDeleteDir=Không thể xóa thư mục '% s'. +ErrorFailedToDeleteJoinedFiles=Không thể xóa môi trường bởi vì có một số tác phẩm tham gia. Hủy bỏ các tập tin đầu tiên tham gia. +ErrorThisContactIsAlreadyDefinedAsThisType=Liên hệ này đã được xác định là liên lạc cho loại hình này. +ErrorCashAccountAcceptsOnlyCashMoney=Tài khoản ngân hàng Đây là một tài khoản tiền mặt, vì vậy nó chấp nhận thanh toán các loại chỉ tiền mặt. +ErrorFromToAccountsMustDiffers=Nguồn tài khoản ngân hàng và các mục tiêu phải khác. +ErrorBadThirdPartyName=Bad giá trị so với tên của bên thứ ba +ErrorProdIdIsMandatory=% S là bắt buộc +ErrorBadCustomerCodeSyntax=Bad cú pháp cho mã khách hàng +ErrorBadBarCodeSyntax=Bad cú pháp mã vạch +ErrorCustomerCodeRequired=Mã khách hàng yêu cầu +ErrorBarCodeRequired=Mã vạch yêu cầu +ErrorCustomerCodeAlreadyUsed=Mã số khách hàng đã sử dụng +ErrorBarCodeAlreadyUsed=Mã vạch đã được sử dụng +ErrorPrefixRequired=Tiền tố cần thiết +ErrorUrlNotValid=Địa chỉ trang web là không chính xác +ErrorBadSupplierCodeSyntax=Bad cú pháp mã nhà cung cấp +ErrorSupplierCodeRequired=Mã nhà cung cấp yêu cầu +ErrorSupplierCodeAlreadyUsed=Mã nhà cung cấp đã được sử dụng +ErrorBadParameters=Thông số xấu +ErrorBadValueForParameter=Sai giá trị '% s' cho tham số không chính xác '% s' +ErrorBadImageFormat=Tập tin hình ảnh đã không phải là một định dạng được hỗ trợ +ErrorBadDateFormat=Giá trị '% s' có định dạng sai ngày +ErrorWrongDate=Ngày là không đúng! +ErrorFailedToWriteInDir=Không thể viết trong thư mục% s +ErrorFoundBadEmailInFile=Tìm thấy cú pháp email không chính xác cho% s dòng trong tập tin (ví dụ dòng% s với email =% s) +ErrorUserCannotBeDelete=Người dùng không thể bị xóa. Có thể nó được kết hợp vào các đơn vị Dolibarr. +ErrorFieldsRequired=Một số trường yêu cầu không được lấp đầy. +ErrorFailedToCreateDir=Không thể tạo một thư mục. Kiểm tra xem người sử dụng máy chủ web có quyền ghi vào thư mục tài liệu Dolibarr. Nếu tham số safe_mode được kích hoạt trên PHP này, hãy kiểm tra các tập tin php Dolibarr sở hữu cho người sử dụng máy chủ web (hoặc một nhóm). +ErrorNoMailDefinedForThisUser=Không có thư xác định cho người dùng này +ErrorFeatureNeedJavascript=Tính năng này cần javascript để được kích hoạt để làm việc. Thay đổi điều này trong thiết lập - hiển thị. +ErrorTopMenuMustHaveAParentWithId0=Một thực đơn của loại 'Top' không thể có một trình đơn phụ huynh. Đặt 0 trong trình đơn phụ huynh hoặc chọn một trình đơn của loại 'trái'. +ErrorLeftMenuMustHaveAParentId=Một thực đơn của loại 'trái' phải có một id cha mẹ. +ErrorFileNotFound=Tập tin% s không tìm thấy (đường dẫn không hợp, cho phép sai hoặc truy cập bị từ chối bởi PHP openbasedir hoặc tham số safe_mode) +ErrorDirNotFound=Thư mục% s không tìm thấy (con đường xấu, cho phép sai hoặc truy cập bị từ chối bởi PHP openbasedir hoặc tham số safe_mode) +ErrorFunctionNotAvailableInPHP=Chức năng% s là cần thiết cho tính năng này nhưng không có sẵn trong phiên bản này / thiết lập PHP. +ErrorDirAlreadyExists=Một thư mục với tên này đã tồn tại. +ErrorFileAlreadyExists=Một tập tin với tên này đã tồn tại. +ErrorPartialFile=File không nhận được hoàn toàn bởi máy chủ. +ErrorNoTmpDir=Directy tạm thời% s không tồn tại. +ErrorUploadBlockedByAddon=Tải bị chặn bởi một plugin PHP / Apache. +ErrorFileSizeTooLarge=Kích thước quá lớn. +ErrorSizeTooLongForIntType=Kích thước quá dài cho kiểu int (tối đa số% s) +ErrorSizeTooLongForVarcharType=Kích thước quá dài cho kiểu chuỗi (ký tự tối đa% s) +ErrorNoValueForSelectType=Xin vui lòng điền giá trị so với danh sách lựa chọn +ErrorNoValueForCheckBoxType=Xin vui lòng điền giá trị so với danh sách hộp +ErrorNoValueForRadioType=Xin vui lòng điền giá trị so với danh sách phát thanh +ErrorBadFormatValueList=Giá trị danh sách không thể có nhiều hơn một đến:% s, nhưng cần ít nhất một: Llave, Valores +ErrorFieldCanNotContainSpecialCharacters=Dòng% s không được chứa các ký tự đặc biệt. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Dòng% s không được chứa các ký tự đặc biệt, cũng không phải ký tự trường hợp trên. +ErrorNoAccountancyModuleLoaded=Không có mô-đun kế toán kích hoạt +ErrorExportDuplicateProfil=Tên hồ sơ này đã tồn tại cho bộ xuất khẩu này. +ErrorLDAPSetupNotComplete=Dolibarr-LDAP phù hợp là không đầy đủ. +ErrorLDAPMakeManualTest=Một tập tin .ldif đã được tạo ra trong thư mục% s. Hãy thử để tải nó bằng tay từ dòng lệnh để có thêm thông tin về lỗi. +ErrorCantSaveADoneUserWithZeroPercentage=Không thể lưu một hành động với "statut không bắt đầu" nếu trường "được thực hiện bởi" cũng được làm đầy. +ErrorRefAlreadyExists=Tài liệu tham khảo dùng để tạo đã tồn tại. +ErrorPleaseTypeBankTransactionReportName=Vui lòng nhập tên ngân hàng nhận nơi giao dịch được báo cáo (Định dạng YYYYMM hoặc YYYYMMDD) +ErrorRecordHasChildren=Không thể xóa các bản ghi vì nó có một số Childs. +ErrorRecordIsUsedCantDelete=Không thể xóa kỷ lục. Nó đã được sử dụng hoặc đưa vào đối tượng khác. +ErrorModuleRequireJavascript=Javascript không được vô hiệu hóa để làm việc có tính năng này. Để kích hoạt / vô hiệu hóa Javascript, bạn vào menu chủ-> Setup-> Display. +ErrorPasswordsMustMatch=Cả hai mật khẩu gõ phải phù hợp với nhau +ErrorContactEMail=Một lỗi kỹ thuật xảy ra. Xin vui lòng liên hệ với quản trị viên để sau email% s en cung cấp các mã lỗi% s trong thông điệp của bạn, hoặc thậm chí tốt hơn bằng cách thêm một bản sao màn hình của trang này. +ErrorWrongValueForField=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phù hợp với quy tắc regex% s) +ErrorFieldValueNotIn=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phải là một giá trị có sẵn vào lĩnh vực% s của bảng% s) +ErrorFieldRefNotIn=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phải là ref hiện% s) +ErrorsOnXLines=Lỗi được ghi nhận nguồn% s (s) +ErrorFileIsInfectedWithAVirus=Các chương trình chống virus đã không thể xác nhận các tập tin (tập tin có thể bị nhiễm bởi một loại virus) +ErrorSpecialCharNotAllowedForField=Ký tự đặc biệt không được phép cho lĩnh vực "% s" +ErrorDatabaseParameterWrong=Thiết lập cơ sở dữ liệu tham số '% s' có một giá trị không tương thích để sử dụng Dolibarr (phải có giá trị '% s'). +ErrorNumRefModel=Một tham chiếu tồn tại vào cơ sở dữ liệu (% s) và không tương thích với quy tắc đánh số này. Di chuyển hồ sơ hoặc tài liệu tham khảo đổi tên để kích hoạt module này. +ErrorQtyTooLowForThisSupplier=Số lượng quá thấp đối với nhà cung cấp hoặc không có giá quy định về sản phẩm này cho nhà cung cấp này +ErrorModuleSetupNotComplete=Thiết lập các mô-đun có vẻ là uncomplete. Đi vào Setup - module để hoàn thành. +ErrorBadMask=Lỗi trên mặt nạ +ErrorBadMaskFailedToLocatePosOfSequence=Lỗi, mặt nạ mà không có số thứ tự +ErrorBadMaskBadRazMonth=Lỗi, giá trị thiết lập lại xấu +ErrorSelectAtLeastOne=Lỗi. Chọn ít nhất một mục. +ErrorProductWithRefNotExist=Sản phẩm có sự tham khảo '% s' không tồn tại +ErrorDeleteNotPossibleLineIsConsolidated=Xóa không thể vì hồ sơ được liên kết với một ngân hàng transation được hoà giải +ErrorProdIdAlreadyExist=% S được gán cho một phần ba +ErrorFailedToSendPassword=Không gửi mật khẩu +ErrorFailedToLoadRSSFile=Không có nguồn cấp dữ liệu RSS. Cố gắng thêm MAIN_SIMPLEXMLLOAD_DEBUG liên tục nếu các thông báo lỗi không cung cấp đủ thông tin. +ErrorPasswordDiffers=Mật khẩu có khác nhau, vui lòng nhập lại. +ErrorForbidden=Truy cập bị từ chối.
Bạn cố gắng truy cập vào một trang, khu vực hoặc tính năng mà không cần là một phiên chứng thực hoặc không được phép sử dụng của bạn. +ErrorForbidden2=Cho phép đăng nhập này có thể được xác định bởi người quản trị Dolibarr của bạn từ trình đơn% s ->% s. +ErrorForbidden3=Dường như Dolibarr không được sử dụng thông qua một phiên chứng thực. Hãy xem tài liệu hướng dẫn thiết lập Dolibarr biết làm thế nào để quản lý xác thực (htaccess, mod_auth hay khác ...). +ErrorNoImagickReadimage=Lớp Imagick không tìm thấy trong PHP này. Không có xem trước có thể có sẵn. Quản trị có thể vô hiệu hóa tab này từ menu Setup - Hiển thị. +ErrorRecordAlreadyExists=Kỷ lục đã tồn tại +ErrorCantReadFile=Không thể đọc tập tin '% s' +ErrorCantReadDir=Không thể đọc thư mục '% s' +ErrorFailedToFindEntity=Không thể đọc môi trường '% s' +ErrorBadLoginPassword=Bad giá trị để đăng nhập hoặc mật khẩu +ErrorLoginDisabled=Tài khoản của bạn đã bị vô hiệu +ErrorFailedToRunExternalCommand=Không thể chạy lệnh bên ngoài. Kiểm tra xem nó có sẵn và Runnable bởi máy chủ PHP của bạn. Nếu PHP Safe Mode được kích hoạt, kiểm tra lệnh đó là bên trong một thư mục được xác định bởi tham số safe_mode_exec_dir. +ErrorFailedToChangePassword=Không thể thay đổi mật khẩu +ErrorLoginDoesNotExists=Người sử dụng có đăng nhập% s không thể được tìm thấy. +ErrorLoginHasNoEmail=Thành viên này không có địa chỉ email. Quá trình hủy bỏ. +ErrorBadValueForCode=Bad giá trị so với mã bảo vệ. Hãy thử lại với giá trị mới ... +ErrorBothFieldCantBeNegative=Fields% s và% s không thể được cả hai tiêu cực +ErrorWebServerUserHasNotPermission=Tài khoản người dùng% s được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó +ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt +ErrUnzipFails=Không thể giải nén% s với ZipArchive +ErrNoZipEngine=Không có công cụ để giải nén tập tin% s trong PHP này +ErrorFileMustBeADolibarrPackage=Các tập tin% s phải là một gói zip Dolibarr +ErrorFileRequired=Phải mất một tập tin gói Dolibarr +ErrorPhpCurlNotInstalled=PHP CURL không được cài đặt, điều này là cần thiết để nói chuyện với Paypal +ErrorFailedToAddToMailmanList=Không thể để thêm biểu ghi% s vào danh sách Mailman% s hoặc cơ sở SPIP +ErrorFailedToRemoveToMailmanList=Không thể loại bỏ kỷ lục% s vào danh sách Mailman% s hoặc cơ sở SPIP +ErrorNewValueCantMatchOldValue=Giá trị mới không thể bằng cũ +ErrorFailedToValidatePasswordReset=Không thể reinit mật khẩu. Có thể là reinit đã được thực hiện (liên kết này có thể được sử dụng một lần duy nhất). Nếu không, hãy thử khởi động lại quá trình reinit. +ErrorToConnectToMysqlCheckInstance=Kết nối với cơ sở dữ liệu bị lỗi. Kiểm tra Mysql máy chủ đang chạy (trong hầu hết trường hợp, bạn có thể khởi chạy nó từ dòng lệnh với 'sudo /etc/init.d/mysql bắt đầu'). +ErrorFailedToAddContact=Không thể thêm số điện thoại +ErrorDateMustBeBeforeToday=Ngày không có thể lớn hơn ngày hôm nay +ErrorPaymentModeDefinedToWithoutSetup=Một phương thức thanh toán đã được thiết lập để gõ% s nhưng thiết lập các mô-đun hóa đơn không được hoàn thành để xác định thông tin để hiển thị cho phương thức thanh toán này. +ErrorPHPNeedModule=Lỗi, PHP của bạn phải có mô-đun% s được cài đặt để sử dụng tính năng này. +ErrorOpenIDSetupNotComplete=Bạn thiết lập Dolibarr tập tin cấu hình để cho phép xác thực OpenID, nhưng URL của dịch vụ OpenID không được xác định vào liên tục% s +ErrorWarehouseMustDiffers=Nguồn và đích kho phải có khác nhau +ErrorBadFormat=Bad định dạng! +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Lỗi, thành viên này chưa được liên kết với bất kỳ của bên thứ ba. Liên kết thành viên với một bên thứ ba hiện có hoặc tạo mới của bên thứ ba trước khi tạo đăng ký với hóa đơn. +ErrorThereIsSomeDeliveries=Lỗi, có một số việc giao hàng có liên quan đến lô hàng này. Xóa từ chối. +ErrorCantDeletePaymentReconciliated=Không thể xóa một khoản thanh toán đã tạo ra một giao dịch ngân hàng đã được hoà giải +ErrorCantDeletePaymentSharedWithPayedInvoice=Không thể xóa một khoản thanh toán được chia sẻ bởi ít nhất một hóa đơn với tình trạng payed # Warnings -WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined -WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. -WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. You must modify this file manually. -WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show. -WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists. -WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. -WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe. -WarningsOnXLines=Warnings on %s source record(s) -WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup. -WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole. -WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup). -WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. -WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box. -WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). -WarningNotRelevant=Irrelevant operation for this dataset -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định +WarningSafeModeOnCheckExecDir=Cảnh báo, PHP safe_mode lựa chọn là do đó, lệnh phải được lưu trữ bên trong một thư mục tuyên bố tham số php safe_mode_exec_dir. +WarningAllowUrlFopenMustBeOn=Thông số allow_url_fopen phải được đặt vào trong filer php.ini để có mô-đun này làm việc hoàn toàn. Bạn phải thay đổi tập tin này bằng tay. +WarningBuildScriptNotRunned=Script% s vẫn chưa chạy để xây dựng đồ họa, hoặc không có dữ liệu để hiển thị. +WarningBookmarkAlreadyExists=Dấu trang với danh hiệu này hay mục tiêu này (URL) đã tồn tại. +WarningPassIsEmpty=Cảnh báo, mật khẩu cơ sở dữ liệu rỗng. Đây là một lỗ hổng bảo mật. Bạn nên thêm một mật khẩu để cơ sở dữ liệu của bạn và thay đổi tập tin conf.php của bạn để phản ánh điều này. +WarningConfFileMustBeReadOnly=Cảnh báo, tập tin cấu hình của bạn (htdocs / conf / conf.php) có thể được ghi đè bởi các máy chủ web. Đây là một lỗ hổng bảo mật nghiêm trọng. Sửa đổi quyền của tập tin được trong chế độ chỉ đọc cho người sử dụng hệ điều hành được sử dụng bởi máy chủ Web. Nếu bạn sử dụng Windows và định dạng FAT cho đĩa cứng của bạn, bạn phải biết rằng hệ thống tập tin này không cho phép để thêm quyền truy cập vào tập tin, vì vậy không thể hoàn toàn an toàn. +WarningsOnXLines=Cảnh báo trên hồ sơ nguồn% s (s) +WarningNoDocumentModelActivated=Không có mô hình, để phát tài liệu, đã được kích hoạt. Một mô hình sẽ được chọn lựa theo mặc định cho đến khi bạn kiểm tra cài đặt module của bạn. +WarningLockFileDoesNotExists=Cảnh báo, một khi cài đặt xong, bạn phải vô hiệu hóa cài đặt / di chuyển các công cụ bằng cách thêm một install.lock tập tin vào thư mục% s. Thiếu tập tin này là một lỗ hổng bảo mật. +WarningUntilDirRemoved=Tất cả các cảnh báo bảo mật (có thể nhìn thấy bằng cách chỉ sử dụng admin) sẽ vẫn hoạt động miễn là dễ bị tổn thương có mặt (hoặc MAIN_REMOVE_INSTALL_WARNING liên tục được thêm vào trong Setup-> thiết lập khác). +WarningCloseAlways=Cảnh báo, đóng cửa được thực hiện ngay cả khi số lượng khác nhau giữa các nguồn và đích yếu tố. Bật tính năng này một cách thận trọng. +WarningUsingThisBoxSlowDown=Cảnh báo, sử dụng hộp này làm chậm nghiêm túc tất cả các trang hiển thị hộp. +WarningClickToDialUserSetupNotComplete=Thiết lập các thông tin ClickToDial cho người dùng của bạn không hoàn thành (xem tab ClickToDial vào thẻ người dùng của bạn). +WarningNotRelevant=Hoạt động không thích hợp cho dữ liệu này +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Tính năng bị vô hiệu hóa khi thiết lập hiển thị được tối ưu hóa cho người mù hoặc văn bản trình duyệt. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang index 996f0d63347..b940d63b5a0 100644 --- a/htdocs/langs/vi_VN/exports.lang +++ b/htdocs/langs/vi_VN/exports.lang @@ -1,134 +1,134 @@ # Dolibarr language file - Source file is en_US - exports -ExportsArea=Exports area -ImportArea=Import area -NewExport=New export -NewImport=New import -ExportableDatas=Exportable dataset -ImportableDatas=Importable dataset -SelectExportDataSet=Choose dataset you want to export... -SelectImportDataSet=Choose dataset you want to import... -SelectExportFields=Choose fields you want to export, or select a predefined export profile -SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: -NotImportedFields=Fields of source file not imported -SaveExportModel=Save this export profile if you plan to reuse it later... -SaveImportModel=Save this import profile if you plan to reuse it later... -ExportModelName=Export profile name -ExportModelSaved=Export profile saved under name %s. -ExportableFields=Exportable fields -ExportedFields=Exported fields -ImportModelName=Import profile name -ImportModelSaved=Import profile saved under name %s. -ImportableFields=Importable fields -ImportedFields=Imported fields -DatasetToExport=Dataset to export -DatasetToImport=Import file into dataset -NoDiscardedFields=No fields in source file are discarded +ExportsArea=Khu vực xuất khẩu +ImportArea=Khu vực nhập khẩu +NewExport=Xuất khẩu mới +NewImport=Nhập khẩu mới +ExportableDatas=Số liệu xuất khẩu +ImportableDatas=Dữ liệu nhập cảng +SelectExportDataSet=Chọn dữ liệu bạn muốn xuất khẩu ... +SelectImportDataSet=Chọn dữ liệu bạn muốn nhập khẩu ... +SelectExportFields=Chọn lĩnh vực bạn muốn xuất khẩu, hoặc chọn một hồ sơ xuất khẩu được xác định trước +SelectImportFields=Chọn lĩnh vực nguồn tập tin bạn muốn nhập khẩu và lĩnh vực mục tiêu của họ trong cơ sở dữ liệu bằng cách kéo lên và xuống với neo% s, hoặc chọn một hồ sơ nhập khẩu được xác định trước: +NotImportedFields=Các lĩnh vực của tập tin nguồn không nhập khẩu +SaveExportModel=Lưu hồ sơ xuất khẩu này nếu bạn có kế hoạch để sử dụng lại sau ... +SaveImportModel=Lưu hồ sơ nhập khẩu này nếu bạn có kế hoạch để sử dụng lại sau ... +ExportModelName=Tên hồ sơ xuất khẩu +ExportModelSaved=Hồ sơ xuất khẩu được lưu dưới tên% s. +ExportableFields=Lĩnh vực xuất khẩu +ExportedFields=Lĩnh vực xuất khẩu +ImportModelName=Tên hồ sơ nhập khẩu +ImportModelSaved=Hồ sơ nhập khẩu lưu dưới tên% s. +ImportableFields=Lĩnh vực nhập cảng +ImportedFields=Lĩnh vực nhập khẩu +DatasetToExport=Số liệu để xuất khẩu +DatasetToImport=Nhập tập tin vào bộ dữ liệu +NoDiscardedFields=Không có lĩnh vực trong tập tin nguồn sẽ bị loại bỏ Dataset=Dataset -ChooseFieldsOrdersAndTitle=Choose fields order... -FieldsOrder=Fields order -FieldsTitle=Fields title -FieldOrder=Field order -FieldTitle=Field title -ChooseExportFormat=Choose export format -NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file... -AvailableFormats=Available formats -LibraryShort=Library -LibraryUsed=Library used +ChooseFieldsOrdersAndTitle=Chọn lĩnh vực đặt hàng ... +FieldsOrder=Lĩnh vực trật tự +FieldsTitle=Các lĩnh vực tiêu đề +FieldOrder=Để lĩnh vực +FieldTitle=Dòng tiêu đề +ChooseExportFormat=Chọn định dạng xuất +NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tập tin trong combo box và click vào nút "Tạo" để xây dựng tập tin xuất khẩu ... +AvailableFormats=Định dạng có sẵn +LibraryShort=Thư viện +LibraryUsed=Thư viện sử dụng LibraryVersion=Phiên bản -Step=Step -FormatedImport=Import assistant -FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge. -FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load. -FormatedExport=Export assistant -FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge. -FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. -FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. -Sheet=Sheet -NoImportableData=No importable data (no module with definitions to allow data imports) -FileSuccessfullyBuilt=Export file generated -SQLUsedForExport=SQL Request used to build export file -LineId=Id of line -LineDescription=Description of line -LineUnitPrice=Unit price of line -LineVATRate=VAT Rate of line -LineQty=Quantity for line -LineTotalHT=Amount net of tax for line -LineTotalTTC=Amount with tax for line -LineTotalVAT=Amount of VAT for line -TypeOfLineServiceOrProduct=Type of line (0=product, 1=service) -FileWithDataToImport=File with data to import -FileToImport=Source file to import -FileMustHaveOneOfFollowingFormat=File to import must have one of following format -DownloadEmptyExample=Download example of empty source file -ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it... -ChooseFileToImport=Upload file then click on picto %s to select file as source import file... -SourceFileFormat=Source file format -FieldsInSourceFile=Fields in source file -FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) -Field=Field -NoFields=No fields -MoveField=Move field column number %s +Step=Bước +FormatedImport=Trợ lý nhập khẩu +FormatedImportDesc1=Khu vực này cho phép nhập dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến ​​thức kỹ thuật. +FormatedImportDesc2=Bước đầu tiên là chọn một vị vua dữ liệu mà bạn muốn tải, sau đó tập tin để tải, sau đó lựa chọn các lĩnh vực mà bạn muốn tải. +FormatedExport=Trợ xuất khẩu +FormatedExportDesc1=Khu vực này cho phép xuất khẩu dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến ​​thức kỹ thuật. +FormatedExportDesc2=Bước đầu tiên là chọn một bộ dữ liệu được xác định trước, sau đó lựa chọn các lĩnh vực mà bạn muốn trong các tập tin kết quả của bạn, và có trật tự. +FormatedExportDesc3=Khi dữ liệu để xuất khẩu được lựa chọn, bạn có thể xác định các định dạng tập tin đầu ra bạn muốn xuất khẩu dữ liệu của bạn. +Sheet=Bảng +NoImportableData=Không có dữ liệu nhập cảng (không có mô-đun với các định nghĩa để cho phép nhập khẩu dữ liệu) +FileSuccessfullyBuilt=Xuất khẩu tập tin được tạo ra +SQLUsedForExport=SQL Yêu cầu sử dụng để xây dựng các tập tin xuất khẩu +LineId=Id của dòng +LineDescription=Mô tả dòng +LineUnitPrice=Đơn giá đường +LineVATRate=Thuế GTGT Tỷ giá đường +LineQty=Số lượng cho dòng +LineTotalHT=Số tiền đã trừ thuế cho các dòng +LineTotalTTC=Số tiền có thuế đối với dòng +LineTotalVAT=Số tiền thuế GTGT đối với dòng +TypeOfLineServiceOrProduct=Loại đường (0 = sản phẩm, dịch vụ = 1) +FileWithDataToImport=Tập tin với dữ liệu nhập khẩu +FileToImport=Tập tin nguồn để nhập khẩu +FileMustHaveOneOfFollowingFormat=File để nhập khẩu phải có một trong những định dạng sau +DownloadEmptyExample=Tải về ví dụ về tập tin mã nguồn trống +ChooseFormatOfFileToImport=Chọn định dạng tập tin để sử dụng như là định dạng tập tin nhập khẩu bằng cách nhấp vào Picto% s để chọn nó ... +ChooseFileToImport=Tải lên tập tin sau đó nhấn vào Picto% s để chọn tập tin như tập tin nguồn nhập khẩu ... +SourceFileFormat=Định dạng tập tin nguồn +FieldsInSourceFile=Lĩnh vực trong tập tin nguồn +FieldsInTargetDatabase=Lĩnh vực mục tiêu trong cơ sở dữ liệu Dolibarr (đậm = bắt buộc) +Field=Dòng +NoFields=Không có lĩnh vực +MoveField=Số cột lĩnh vực di chuyển% s ExampleOfImportFile=Example_of_import_file -SaveImportProfile=Save this import profile -ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name. -ImportSummary=Import setup summary -TablesTarget=Targeted tables -FieldsTarget=Targeted fields -TableTarget=Targeted table -FieldTarget=Targeted field -FieldSource=Source field -DoNotImportFirstLine=Do not import first line of source file -NbOfSourceLines=Number of lines in source file -NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)... -RunSimulateImportFile=Launch the import simulation -FieldNeedSource=This field requires data from the source file -SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file -InformationOnSourceFile=Information on source file -InformationOnTargetTables=Information on target fields -SelectAtLeastOneField=Switch at least one source field in the column of fields to export -SelectFormat=Choose this import file format -RunImportFile=Launch import file -NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import. -DataLoadedWithId=All data will be loaded with the following import id: %s -ErrorMissingMandatoryValue=Mandatory data is empty in source file for field %s. -TooMuchErrors=There is still %s other source lines with errors but output has been limited. -TooMuchWarnings=There is still %s other source lines with warnings but output has been limited. -EmptyLine=Empty line (will be discarded) -CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import. -FileWasImported=File was imported with number %s. -YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field import_key='%s'. -NbOfLinesOK=Number of lines with no errors and no warnings: %s. -NbOfLinesImported=Number of lines successfully imported: %s. -DataComeFromNoWhere=Value to insert comes from nowhere in source file. -DataComeFromFileFieldNb=Value to insert comes from field number %s in source file. -DataComeFromIdFoundFromRef=Value that comes from field number %s of source file will be used to find id of parent object to use (So the objet %s that has the ref. from source file must exists into Dolibarr). -DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases. -DataIsInsertedInto=Data coming from source file will be inserted into the following field: -DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field: -DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field: -SourceRequired=Data value is mandatory -SourceExample=Example of possible data value -ExampleAnyRefFoundIntoElement=Any ref found for element %s -ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s -CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. -Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5). -Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML). -TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab]. -ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ). -CsvOptions=Csv Options +SaveImportProfile=Lưu hồ sơ nhập khẩu này +ErrorImportDuplicateProfil=Không thể lưu hồ sơ nhập khẩu này với tên này. Một hồ sơ hiện tại đã tồn tại với tên này. +ImportSummary=Nhập khẩu tóm tắt thiết lập +TablesTarget=Bảng mục tiêu +FieldsTarget=Lĩnh vực mục tiêu +TableTarget=Bảng mục tiêu +FieldTarget=Trường mục tiêu +FieldSource=Lĩnh vực nguồn +DoNotImportFirstLine=Không nhập dòng đầu tiên của tập tin nguồn +NbOfSourceLines=Số dòng trong tập tin nguồn +NowClickToTestTheImport=Kiểm tra các thông số nhập khẩu bạn đã xác định. Nếu đúng, hãy nhấp vào nút "% s" để khởi động một mô phỏng của quá trình nhập khẩu (không có dữ liệu sẽ được thay đổi trong cơ sở dữ liệu của bạn, nó chỉ là một mô phỏng cho thời điểm này) ... +RunSimulateImportFile=Khởi động mô phỏng nhập khẩu +FieldNeedSource=Trường này yêu cầu dữ liệu từ tập tin nguồn +SomeMandatoryFieldHaveNoSource=Một số thông tin bắt buộc không có nguồn từ tập tin dữ liệu +InformationOnSourceFile=Thông tin về các tập tin nguồn +InformationOnTargetTables=Thông tin về các lĩnh vực mục tiêu +SelectAtLeastOneField=Chuyển ít nhất một lĩnh vực nguồn trong cột của lĩnh vực xuất khẩu +SelectFormat=Chọn định dạng tập tin nhập khẩu này +RunImportFile=Nhập khẩu tập tin khởi động +NowClickToRunTheImport=Kiểm tra kết quả của mô phỏng nhập khẩu. Nếu mọi thứ đều ổn, khởi động nhập khẩu dứt khoát. +DataLoadedWithId=Tất cả dữ liệu sẽ được nạp với id nhập khẩu sau đây:% s +ErrorMissingMandatoryValue=Dữ liệu bắt buộc có sản phẩm nào trong tập tin nguồn cho trường% s. +TooMuchErrors=Hiện vẫn còn% s dòng nguồn khác với các lỗi nhưng sản lượng còn hạn chế. +TooMuchWarnings=Hiện vẫn còn% s dòng nguồn khác với các cảnh báo nhưng sản lượng còn hạn chế. +EmptyLine=Dòng trống (sẽ bị loại bỏ) +CorrectErrorBeforeRunningImport=Trước tiên, bạn phải sửa chữa tất cả các lỗi trước khi chạy nhập khẩu dứt khoát. +FileWasImported=Tập tin được nhập khẩu với số% s. +YouCanUseImportIdToFindRecord=Bạn có thể tìm thấy tất cả hồ sơ nhập khẩu trong cơ sở dữ liệu của bạn bằng cách lọc trên sân import_key = '% s'. +NbOfLinesOK=Số dòng không có lỗi và không có cảnh báo:% s. +NbOfLinesImported=Số dòng nhập thành công:% s. +DataComeFromNoWhere=Giá trị để chèn đến từ hư không trong tập tin nguồn. +DataComeFromFileFieldNb=Giá trị để chèn đến từ số lĩnh vực% s trong tập tin nguồn. +DataComeFromIdFoundFromRef=Giá trị xuất phát từ số lĩnh vực% s của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các Objet% s có ref. Từ tập tin nguồn phải tồn tại vào Dolibarr). +DataComeFromIdFoundFromCodeId=Mã số đó xuất phát từ số lĩnh vực% s của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các mã từ file nguồn phải tồn tại vào từ điển% s). Lưu ý rằng nếu bạn biết id, bạn cũng có thể sử dụng nó vào tập tin nguồn thay vì mã. Nhập khẩu nên hoạt động trong cả hai trường hợp. +DataIsInsertedInto=Dữ liệu từ tập tin nguồn sẽ được chèn vào các lĩnh vực sau đây: +DataIDSourceIsInsertedInto=Id của đối tượng phụ huynh tìm thấy bằng cách sử dụng dữ liệu trong tập tin nguồn, sẽ được chèn vào các lĩnh vực sau đây: +DataCodeIDSourceIsInsertedInto=Id của dòng mẹ tìm thấy từ mã, sẽ được đưa vào lĩnh vực sau đây: +SourceRequired=Giá trị dữ liệu là bắt buộc +SourceExample=Ví dụ về giá trị dữ liệu có thể +ExampleAnyRefFoundIntoElement=Bất kỳ ref tìm thấy cho các phần tử% s +ExampleAnyCodeOrIdFoundIntoDictionary=Bất kỳ mã (hoặc id) được tìm thấy vào từ điển% s +CSVFormatDesc=Comma định dạng tập tin Giá trị Ly (csv).
Đây là một định dạng tập tin văn bản mà các lĩnh vực được phân cách bằng dấu phân cách [% s]. Nếu tách được tìm thấy bên trong một lĩnh vực nội dung, lĩnh vực được làm tròn bằng cách nhân vật tròn [% s]. Thoát khỏi nhân vật để thoát khỏi nhân vật tròn là [% s]. +Excel95FormatDesc=Định dạng tập tin Excel (xls)
Đây là nguồn gốc Excel 95 định dạng (BIFF5). +Excel2007FormatDesc=Định dạng tập tin Excel (xlsx)
Đây là nguồn gốc định dạng Excel 2007 (SpreadsheetML). +TsvFormatDesc=Tab Ly định dạng tập tin Giá trị (.tsv)
Đây là một định dạng tập tin văn bản mà các lĩnh vực được phân cách bởi một lập bảng [tab]. +ExportFieldAutomaticallyAdded=Dòng% s đã được tự động thêm vào. Nó sẽ tránh bạn phải có dòng tương tự như được coi là bản sao hồ sơ (với lĩnh vực này nói thêm, tất cả các dòng sẽ sở hữu id của riêng mình và sẽ khác nhau). +CsvOptions=Csv Tùy chọn Separator=Separator -Enclosure=Enclosure -SuppliersProducts=Suppliers Products -BankCode=Bank code -DeskCode=Desk code -BankAccountNumber=Account number -BankAccountNumberKey=Key -SpecialCode=Special code -ExportStringFilter=%% allows replacing one or more characters in the text -ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days -ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values +Enclosure=Bao vây +SuppliersProducts=Nhà cung cấp sản phẩm +BankCode=Mã ngân hàng +DeskCode=Đang bàn +BankAccountNumber=Số tài khoản +BankAccountNumberKey=Chính +SpecialCode=Mã số đặc biệt +ExportStringFilter=%% Cho phép thay thế một hay nhiều ký tự trong văn bản +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: bộ lọc một năm / tháng / ngày
YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: bộ lọc trên một loạt các năm / tháng / ngày
> YYYY,> YYYYMM,> YYYYMMDD: bộ lọc trên tất cả các năm / tháng / ngày sau
Bộ lọc 'nnnnn + nnnnn "trên một loạt các giá trị
'> Nnnnn "bộ lọc các giá trị thấp
'> Nnnnn "bộ lọc các giá trị cao hơn ## filters -SelectFilterFields=If you want to filter on some values, just input values here. +SelectFilterFields=Nếu bạn muốn lọc vào một số giá trị, giá trị chỉ vào đây. FilterableFields=Champs Filtrables -FilteredFields=Filtered fields -FilteredFieldsValues=Value for filter +FilteredFields=Lĩnh vực lọc +FilteredFieldsValues=Giá trị bộ lọc diff --git a/htdocs/langs/vi_VN/ftp.lang b/htdocs/langs/vi_VN/ftp.lang index 9984ce689ee..a7979993609 100644 --- a/htdocs/langs/vi_VN/ftp.lang +++ b/htdocs/langs/vi_VN/ftp.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - ftp -FTPClientSetup=FTP Client module setup -NewFTPClient=New FTP connection setup -FTPArea=FTP Area -FTPAreaDesc=This screen show you content of a FTP server view -SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete -FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions -FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) -FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password -FTPFailedToRemoveFile=Failed to remove file %s. -FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). -FTPPassiveMode=Passive mode +FTPClientSetup=FTP thiết lập mô-đun Khách hàng +NewFTPClient=Mới thiết lập kết nối FTP +FTPArea=FTP Diện tích +FTPAreaDesc=Màn hình này hiển thị cho bạn xem nội dung của một máy chủ FTP +SetupOfFTPClientModuleNotComplete=Thiết lập các mô-đun FTP client có vẻ là không hoàn thành +FTPFeatureNotSupportedByYourPHP=PHP của bạn không hỗ trợ chức năng FTP +FailedToConnectToFTPServer=Không thể kết nối đến máy chủ FTP (máy chủ% s, cổng% s) +FailedToConnectToFTPServerWithCredentials=Không thể đăng nhập vào máy chủ FTP với quy định đăng nhập / mật khẩu +FTPFailedToRemoveFile=Không thể loại bỏ các tập tin% s. +FTPFailedToRemoveDir=Không thể loại bỏ thư mục% s (Kiểm tra quyền truy cập và thư mục mà là trống). +FTPPassiveMode=Chế độ thụ động diff --git a/htdocs/langs/vi_VN/help.lang b/htdocs/langs/vi_VN/help.lang index 1bbd6e94f03..6cdf113d588 100644 --- a/htdocs/langs/vi_VN/help.lang +++ b/htdocs/langs/vi_VN/help.lang @@ -1,28 +1,28 @@ # Dolibarr language file - Source file is en_US - help -CommunitySupport=Forum/Wiki support -EMailSupport=Emails support -RemoteControlSupport=Online real time / remote support -OtherSupport=Other support -ToSeeListOfAvailableRessources=To contact/see available resources: -ClickHere=Click here -HelpCenter=Help center -DolibarrHelpCenter=Dolibarr help and support center -ToGoBackToDolibarr=Otherwise, click here to use Dolibarr -TypeOfSupport=Source of support -TypeSupportCommunauty=Community (free) -TypeSupportCommercial=Commercial -TypeOfHelp=Type -NeedHelpCenter=Need help or support ? -Efficiency=Efficiency -TypeHelpOnly=Help only -TypeHelpDev=Help+Development -TypeHelpDevForm=Help+Development+Formation -ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on %s web site: -ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button -ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests. -BackToHelpCenter=Otherwise, click here to go back to help center home page. -LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): -PossibleLanguages=Supported languages -MakeADonation=Help Dolibarr project, make a donation -SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation -SeeOfficalSupport=For official Dolibarr support in your language:
%s +CommunitySupport=Diễn đàn / hỗ trợ Wiki +EMailSupport=Email hỗ trợ +RemoteControlSupport=Trực tuyến thời gian thực / hỗ trợ từ xa +OtherSupport=Hỗ trợ khác +ToSeeListOfAvailableRessources=Để liên hệ / xem các nguồn lực có sẵn: +ClickHere=Click vào đây +HelpCenter=Trung tâm trợ giúp +DolibarrHelpCenter=Dolibarr trợ giúp và trung tâm hỗ trợ +ToGoBackToDolibarr=Nếu không, bấm vào đây để sử dụng Dolibarr +TypeOfSupport=Nguồn hỗ trợ +TypeSupportCommunauty=Cộng đồng (miễn phí) +TypeSupportCommercial=Thương mại +TypeOfHelp=Loại +NeedHelpCenter=Cần giúp đỡ hoặc hỗ trợ? +Efficiency=Hiệu quả +TypeHelpOnly=Chỉ giúp +TypeHelpDev=Trợ giúp + Phát triển +TypeHelpDevForm=Trợ giúp phát triển + + hình thành +ToGetHelpGoOnSparkAngels1=Một số công ty có thể cung cấp một hỗ trợ trực tuyến nhanh chóng (đôi khi ngay lập tức) và hiệu quả hơn bằng cách kiểm soát máy tính của bạn. Giúp đỡ này có thể được tìm thấy trên trang web% s: +ToGetHelpGoOnSparkAngels3=Bạn cũng có thể vào danh sách của tất cả các huấn luyện viên cho Dolibarr, cho điều này bấm vào nút +ToGetHelpGoOnSparkAngels2=Đôi khi, không có công ty có sẵn tại thời điểm bạn thực hiện tìm kiếm của bạn, vì vậy suy nghĩ để thay đổi bộ lọc để tìm kiếm "tất cả sẵn sàng". Bạn sẽ có thể gửi nhiều yêu cầu. +BackToHelpCenter=Nếu không, bấm vào đây để đi lại để giúp trang chủ trung tâm . +LinkToGoldMember=Bạn có thể gọi một trong những huấn luyện viên chọn trước bởi Dolibarr cho ngôn ngữ (% s) bằng cách nhấp vào Widget của mình (tình trạng và giá tối đa sẽ được tự động cập nhật): +PossibleLanguages=Ngôn ngữ được hỗ trợ +MakeADonation=Giúp dự án Dolibarr, thực hiện một hiến +SubscribeToFoundation=Giúp dự án Dolibarr, đăng ký với cơ sở +SeeOfficalSupport=Để được hỗ trợ Dolibarr chính thức ngôn ngữ của bạn:
% S diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang index da03299e0da..f77cc564473 100644 --- a/htdocs/langs/vi_VN/holiday.lang +++ b/htdocs/langs/vi_VN/holiday.lang @@ -1,149 +1,149 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays -MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays -Employe=Employee -DateDebCP=Start date -DateFinCP=End date -DateCreateCP=Creation date -DraftCP=Draft -ToReviewCP=Awaiting approval -ApprovedCP=Approved -CancelCP=Canceled -RefuseCP=Refused +Holidays=Leaves +CPTitreMenu=Leaves +MenuReportMonth=Báo cáo hàng tháng +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request +Employe=Nhân viên +DateDebCP=Ngày bắt đầu +DateFinCP=Ngày kết thúc +DateCreateCP=Ngày tạo +DraftCP=Dự thảo +ToReviewCP=Đang chờ phê duyệt +ApprovedCP=Đã được phê duyệt +CancelCP=Hủy bỏ +RefuseCP=Từ chối ValidatorCP=Approbator -ListeCP=List of holidays -ReviewedByCP=Will be reviewed by -DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. -ErrorEndDateCP=You must select an end date greater than the start date. -ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. -ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays -InfosWorkflowCP=Information Workflow -RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed -EditCP=Edit -DeleteCP=Delete -ActionValidCP=Validate -ActionRefuseCP=Refuse -ActionCancelCP=Cancel -StatutCP=Status -SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. -UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. -NoDateDebut=You must select a start date. -NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? -DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? -TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? -NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? -DetailRefusCP=Reason for refusal -DateRefusCP=Date of refusal -DateCancelCP=Date of cancellation -DefineEventUserCP=Assign an exceptional leave for a user -addEventToUserCP=Assign leave -MotifCP=Reason -UserCP=User -ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. -AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays -ActionByCP=Performed by -UserUpdateCP=For the user -PrevSoldeCP=Previous Balance +ListeCP=List of leaves +ReviewedByCP=Sẽ được xem xét bởi +DescCP=Mô tả +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. +ErrorEndDateCP=Bạn phải chọn ngày kết thúc lớn hơn ngày bắt đầu. +ErrorSQLCreateCP=Đã xảy ra lỗi SQL trong quá trình tạo: +ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ReturnCP=Trở lại trang trước +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request +InfosWorkflowCP=Thông tin Quy trình làm việc +RequestByCP=Theo yêu cầu của +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed +EditCP=Chỉnh sửa +DeleteCP=Xóa +ActionValidCP=Xác nhận +ActionRefuseCP=Từ chối +ActionCancelCP=Hủy bỏ +StatutCP=Tình trạng +SendToValidationCP=Gửi cho xác nhận +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. +UpdateButtonCP=Cập nhật +CantUpdate=You cannot update this leave request. +NoDateDebut=Bạn phải chọn một ngày bắt đầu. +NoDateFin=Bạn phải chọn ngày kết thúc. +ErrorDureeCP=Yêu cầu của bạn cho các ngày nghỉ không có ngày làm việc. +TitleValidCP=Thông qua những ngày nghỉ theo yêu cầu +ConfirmValidCP=Are you sure you want to approve the leave request? +DateValidCP=Ngày phê duyệt +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? +TitleRefuseCP=Từ chối các yêu cầu ngày lễ +ConfirmRefuseCP=Are you sure you want to refuse the leave request? +NoMotifRefuseCP=Bạn phải chọn một lý do để từ chối yêu cầu. +TitleCancelCP=Hủy bỏ những ngày nghỉ theo yêu cầu +ConfirmCancelCP=Are you sure you want to cancel the leave request? +DetailRefusCP=Lý do từ chối +DateRefusCP=Ngày từ chối +DateCancelCP=Ngày hủy +DefineEventUserCP=Chỉ định một nghỉ phép đặc biệt cho người sử dụng +addEventToUserCP=Chỉ định nghỉ +MotifCP=Lý do +UserCP=Người sử dụng +ErrorAddEventToUserCP=Đã xảy ra lỗi khi thêm ngày nghỉ đặc biệt. +AddEventToUserOkCP=Việc bổ sung nghỉ đặc biệt đã được hoàn thành. +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days +ActionByCP=Thực hiện bởi +UserUpdateCP=Đối với người sử dụng +PrevSoldeCP=Cân bằng trước NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. -UserName=Name -Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday -HolidaysMonthlyUpdate=Monthly update -ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +alreadyCPexist=Một yêu cầu cho các ngày nghỉ đã được thực hiện vào thời kỳ này. +UserName=Tên +Employee=Nhân viên +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation +HolidaysMonthlyUpdate=Cập nhật hàng tháng +ManualUpdate=Cập nhật thủ công +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module -DescOptionCP=Description of the option -ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays -ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays -UpdateConfCPOK=Updated successfully. -ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events -ValidEventCP=Validate -UpdateEventCP=Update events -CreateEventCP=Create -NameEventCP=Event name -OkCreateEventCP=The addition of the event went well. -ErrorCreateEventCP=Error creating the event. -UpdateEventOkCP=The update of the event went well. -ErrorUpdateEventCP=Error while updating the event. -DeleteEventCP=Delete Event -DeleteEventOkCP=The event has been deleted. -ErrorDeleteEventCP=Error while deleting the event. -TitleDeleteEventCP=Delete a exceptional leave -TitleCreateEventCP=Create a exceptional leave -TitleUpdateEventCP=Edit or delete a exceptional leave -DeleteEventOptionCP=Delete -UpdateEventOptionCP=Update -ErrorMailNotSend=An error occurred while sending email: -NoCPforMonth=No leave this month. -nbJours=Number days -TitleAdminCP=Configuration of Holidays +ConfCP=Cấu hình của mô-đun lễ +DescOptionCP=Mô tả các tùy chọn +ValueOptionCP=Giá trị +GroupToValidateCP=Group with the ability to approve vacation +ConfirmConfigCP=Xác nhận cấu hình +LastUpdateCP=Last automatic update of vacation +UpdateConfCPOK=Cập nhật thành công. +ErrorUpdateConfCP=Đã xảy ra lỗi trong quá trình cập nhật, vui lòng thử lại. +AddCPforUsers=Xin vui lòng thêm số dư của ngày lễ của người sử dụng bằng cách nhấn vào đây . +DelayForSubmitCP=Hạn chót nộp hồ cho ngày lễ +AlertapprobatortorDelayCP=Ngăn chặn các approbator nếu yêu cầu kỳ nghỉ không phù hợp với thời hạn +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events +ValidEventCP=Xác nhận +UpdateEventCP=Cập nhật các sự kiện +CreateEventCP=Tạo +NameEventCP=Tên sự kiện +OkCreateEventCP=Việc bổ sung các sự kiện diễn ra tốt đẹp. +ErrorCreateEventCP=Lỗi tạo sự kiện. +UpdateEventOkCP=Bản cập nhật của sự kiện diễn ra tốt đẹp. +ErrorUpdateEventCP=Lỗi khi cập nhật sự kiện này. +DeleteEventCP=Xóa sự kiện +DeleteEventOkCP=Sự kiện này đã bị xóa. +ErrorDeleteEventCP=Lỗi khi xóa sự kiện này. +TitleDeleteEventCP=Xóa nghỉ đặc biệt +TitleCreateEventCP=Tạo nghỉ đặc biệt +TitleUpdateEventCP=Chỉnh sửa hoặc xóa nghỉ đặc biệt +DeleteEventOptionCP=Xóa +UpdateEventOptionCP=Cập nhật +ErrorMailNotSend=Đã xảy ra lỗi trong khi gửi email: +NoCPforMonth=Không để trong tháng này. +nbJours=Số ngày +TitleAdminCP=Configuration of Leaves #Messages -Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +Hello=Xin chào +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang index aa37bf920ae..d238f2485f2 100644 --- a/htdocs/langs/vi_VN/install.lang +++ b/htdocs/langs/vi_VN/install.lang @@ -1,211 +1,211 @@ # Dolibarr language file - Source file is en_US - install -InstallEasy=Just follow the instructions step by step. -MiscellaneousChecks=Prerequisites check -DolibarrWelcome=Welcome to Dolibarr -ConfFileExists=Configuration file %s exists. -ConfFileDoesNotExists=Configuration file %s does not exist ! -ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! -ConfFileCouldBeCreated=Configuration file %s could be created. -ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). -ConfFileIsWritable=Configuration file %s is writable. -ConfFileReload=Reload all information from configuration file. -PHPSupportSessions=This PHP supports sessions. -PHPSupportPOSTGETOk=This PHP supports variables POST and GET. -PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter variables_order in php.ini. -PHPSupportGD=This PHP support GD graphical functions. -PHPSupportUTF8=This PHP support UTF8 functions. -PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough. -PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This should be too low. Change your php.ini to set memory_limit parameter to at least %s bytes. -Recheck=Click here for a more significative test -ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup. -ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available. -ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr. -ErrorDirDoesNotExists=Directory %s does not exist. -ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. -ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. -ErrorFailedToCreateDatabase=Failed to create database '%s'. -ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. -ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. -ErrorPHPVersionTooLow=PHP version too old. Version %s is required. -WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. -ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. -ErrorDatabaseAlreadyExists=Database '%s' already exists. -IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". -IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. -WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. -PHPVersion=PHP Version -YouCanContinue=You can continue... -PleaseBePatient=Please be patient... -License=Using license -ConfigurationFile=Configuration file -WebPagesDirectory=Directory where web pages are stored -DocumentsDirectory=Directory to store uploaded and generated documents -URLRoot=URL Root -ForceHttps=Force secure connections (https) -CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate. -DolibarrDatabase=Dolibarr Database -DatabaseChoice=Database choice -DatabaseType=Database type -DriverType=Driver type -Server=Server -ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server -ServerPortDescription=Database server port. Keep empty if unknown. -DatabaseServer=Database server -DatabaseName=Database name -DatabasePrefix=Database prefix table -Login=Login -AdminLogin=Login for Dolibarr database owner. -Password=Password -PasswordAgain=Retype password a second time -AdminPassword=Password for Dolibarr database owner. -CreateDatabase=Create database -CreateUser=Create owner -DatabaseSuperUserAccess=Database server - Superuser access -CheckToCreateDatabase=Check box if database does not exist and must be created.
In this case, you must fill the login/password for superuser account at the bottom of this page. -CheckToCreateUser=Check box if database owner does not exist and must be created.
In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. -Experimental=(experimental) -DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. -KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) -SaveConfigurationFile=Save values -ConfigurationSaving=Saving configuration file -ServerConnection=Server connection +InstallEasy=Chỉ cần làm theo các hướng dẫn từng bước. +MiscellaneousChecks=Điều kiện tiên quyết kiểm tra +DolibarrWelcome=Chào mừng bạn đến Dolibarr +ConfFileExists=Cấu hình tập tin% s tồn tại. +ConfFileDoesNotExists=Cấu hình tập tin% s không tồn tại! +ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập tin% s không tồn tại và không thể được tạo ra! +ConfFileCouldBeCreated=Cấu hình tập tin% s có thể được tạo ra. +ConfFileIsNotWritable=Tập tin cấu hình% s là không thể ghi. Kiểm tra quyền truy cập. Đối với lần đầu tiên cài đặt, máy chủ web của bạn phải được cấp để có thể viết vào tập tin này trong quá trình cấu hình ("chmod 666" ví dụ trên Unix như hệ điều hành). +ConfFileIsWritable=Tập tin cấu hình% s có thể ghi. +ConfFileReload=Cập nhật lại thông tin từ tập tin cấu hình. +PHPSupportSessions=PHP này hỗ trợ phiên. +PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET. +PHPSupportPOSTGETKo=Có thể thiết lập PHP của bạn không hỗ trợ các biến POST và / hoặc GET. Kiểm tra variables_order tham số của bạn trong php.ini. +PHPSupportGD=Điều này hỗ trợ PHP GD chức năng đồ họa. +PHPSupportUTF8=PHP hỗ trợ chức năng này UTF8. +PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập để% s. Điều này là đủ. +PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập để% s byte. Điều này cần được quá thấp. Thay đổi php.ini của bạn để thiết lập thông số memory_limit ít nhất% s byte. +Recheck=Nhấn vào đây để kiểm tra significative hơn +ErrorPHPDoesNotSupportSessions=Cài đặt PHP của bạn không hỗ trợ phiên. Tính năng này là cần thiết để làm cho Dolibarr làm việc. Kiểm tra thiết lập PHP của bạn. +ErrorPHPDoesNotSupportGD=Cài đặt PHP của bạn không hỗ trợ chức năng đồ họa GD. Không có đồ thị sẽ có sẵn. +ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ chức năng UTF8. Dolibarr không thể làm việc một cách chính xác. Giải quyết này trước khi cài đặt Dolibarr. +ErrorDirDoesNotExists=Thư mục% s không tồn tại. +ErrorGoBackAndCorrectParameters=Tới lạc hậu và chính xác các thông số sai. +ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham số '% s'. +ErrorFailedToCreateDatabase=Không thể tạo cơ sở dữ liệu '% s'. +ErrorFailedToConnectToDatabase=Không thể kết nối với cơ sở dữ liệu '% s'. +ErrorDatabaseVersionTooLow=Phiên bản cơ sở dữ liệu (% s) quá già. Phiên bản% s hoặc cao hơn là cần thiết. +ErrorPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản% s là bắt buộc. +WarningPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản% s hoặc nhiều hơn dự kiến. Phiên bản này sẽ cho phép cài đặt nhưng không được hỗ trợ. +ErrorConnectedButDatabaseNotFound=Kết nối với máy chủ thành công nhưng không tìm thấy cơ sở dữ liệu '% s'. +ErrorDatabaseAlreadyExists=Cơ sở dữ liệu '% s' đã tồn tại. +IfDatabaseNotExistsGoBackAndUncheckCreate=Nếu cơ sở dữ liệu không tồn tại, quay trở lại và kiểm tra tùy chọn "Tạo cơ sở dữ liệu". +IfDatabaseExistsGoBackAndCheckCreate=Nếu cơ sở dữ liệu đã tồn tại, quay trở lại và bỏ chọn "Tạo cơ sở dữ liệu" tùy chọn. +WarningBrowserTooOld=Quá phiên bản cũ của trình duyệt. Nâng cấp trình duyệt của bạn đến một phiên bản mới của trình duyệt Firefox, Chrome hay Opera là rất recommanded. +PHPVersion=Phiên bản PHP +YouCanContinue=Bạn có thể tiếp tục ... +PleaseBePatient=Xin hãy kiên nhẫn ... +License=Sử dụng giấy phép +ConfigurationFile=Tập tin cấu hình +WebPagesDirectory=Thư mục các trang web được lưu trữ +DocumentsDirectory=Thư mục để lưu trữ các tài liệu được tải lên và tạo ra +URLRoot=Gốc URL +ForceHttps=Lực lượng kết nối an toàn (https) +CheckToForceHttps=Chọn tùy chọn này để buộc kết nối an toàn (https).
Điều này đòi hỏi các máy chủ web được cấu hình với một chứng chỉ SSL. +DolibarrDatabase=Cơ sở dữ liệu Dolibarr +DatabaseChoice=Lựa chọn cơ sở dữ liệu +DatabaseType=Loại cơ sở dữ liệu +DriverType=Loại điều khiển +Server=Máy chủ +ServerAddressDescription=Tên tài khoản hoặc địa chỉ ip cho máy chủ cơ sở dữ liệu, thường là 'localhost' khi máy chủ cơ sở dữ liệu được lưu trữ trên cùng một máy chủ hơn so với máy chủ web +ServerPortDescription=Cổng máy chủ cơ sở dữ liệu. Giữ sản phẩm nào nếu chưa biết. +DatabaseServer=Máy chủ cơ sở dữ liệu +DatabaseName=Tên cơ sở dữ liệu +DatabasePrefix=Bảng cơ sở dữ liệu tiền tố +Login=Đăng nhập +AdminLogin=Đăng nhập cho chủ sở hữu cơ sở dữ liệu Dolibarr. +Password=Mật khẩu +PasswordAgain=Nhập lại mật khẩu một lần thứ hai +AdminPassword=Mật khẩu cho chủ sở hữu cơ sở dữ liệu Dolibarr. +CreateDatabase=Tạo cơ sở dữ liệu +CreateUser=Tạo chủ sở hữu +DatabaseSuperUserAccess=Máy chủ cơ sở dữ liệu - truy cập superuser +CheckToCreateDatabase=Kiểm tra hộp nếu cơ sở dữ liệu không tồn tại và phải được tạo ra.
Trong trường hợp này, bạn phải điền tên đăng nhập / mật khẩu cho tài khoản superuser ở dưới cùng của trang này. +CheckToCreateUser=Kiểm tra hộp nếu chủ sở hữu cơ sở dữ liệu không tồn tại và phải được tạo ra.
Trong trường hợp này, bạn phải chọn tên đăng nhập và mật khẩu của mình và cũng có thể điền tên đăng nhập / mật khẩu cho tài khoản superuser ở dưới cùng của trang này. Nếu hộp này được đánh dấu, cơ sở dữ liệu và mật khẩu chủ sở hữu của nó phải tồn tại. +Experimental=(Thử nghiệm) +DatabaseRootLoginDescription=Đăng nhập của người dùng được phép để tạo ra cơ sở dữ liệu mới hoặc người dùng mới, bắt buộc nếu cơ sở dữ liệu của bạn hoặc chủ sở hữu của nó không đã tồn tại. +KeepEmptyIfNoPassword=Để trống nếu người dùng không có mật khẩu (tránh điều này) +SaveConfigurationFile=Lưu giá trị +ConfigurationSaving=Lưu file cấu hình +ServerConnection=Kết nối máy chủ DatabaseConnection=Liên kết dữ liệu -DatabaseCreation=Database creation -UserCreation=User creation -CreateDatabaseObjects=Database objects creation -ReferenceDataLoading=Reference data loading -TablesAndPrimaryKeysCreation=Tables and Primary keys creation -CreateTableAndPrimaryKey=Create table %s -CreateOtherKeysForTable=Create foreign keys and indexes for table %s -OtherKeysCreation=Foreign keys and indexes creation -FunctionsCreation=Functions creation -AdminAccountCreation=Administrator login creation -PleaseTypePassword=Please type a password, empty passwords are not allowed ! -PleaseTypeALogin=Please type a login ! -PasswordsMismatch=Passwords differs, please try again ! -SetupEnd=End of setup -SystemIsInstalled=This installation is complete. -SystemIsUpgraded=Dolibarr has been upgraded successfully. -YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below: -AdminLoginCreatedSuccessfuly=Dolibarr administrator login '%s' created successfuly. -GoToDolibarr=Go to Dolibarr -GoToSetupArea=Go to Dolibarr (setup area) -MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again. -GoToUpgradePage=Go to upgrade page again -Examples=Examples -WithNoSlashAtTheEnd=Without the slash "/" at the end -DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages. -LoginAlreadyExists=Already exists -DolibarrAdminLogin=Dolibarr admin login -AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. -WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. -ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s -FunctionNotAvailableInThisPHP=Not available on this PHP -MigrateScript=Migration script -ChoosedMigrateScript=Choose migration script -DataMigration=Data migration -DatabaseMigration=Structure database migration -ProcessMigrateScript=Script processing -ChooseYourSetupMode=Choose your setup mode and click "Start"... -FreshInstall=Fresh install -FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode. -Upgrade=Upgrade -UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data. -Start=Start -InstallNotAllowed=Setup not allowed by conf.php permissions -NotAvailable=Not available -YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process. -CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page. -AlreadyDone=Already migrated -DatabaseVersion=Database version -ServerVersion=Database server version -YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. -CharsetChoice=Character set choice -CharacterSetClient=Character set used for generated HTML web pages -CharacterSetClientComment=Choose character set for web display.
Default proposed character set is the one of your database. -DBSortingCollation=Character sorting order -DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.
This parameter can't be defined if database already exists. -CharacterSetDatabase=Character set for database -CharacterSetDatabaseComment=Choose character set wanted for database creation.
This parameter can't be defined if database already exists. -YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. -YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. -BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. -OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s -RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue. -KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do. -KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do. -KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do. -KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do. -FieldRenamed=Field renamed -IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user" -ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. -InstallChoiceRecommanded=Recommended choice to install version %s from your current version %s -InstallChoiceSuggested=Install choice suggested by installer. -MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished. -CheckThatDatabasenameIsCorrect=Check that database name "%s" is correct. -IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". -OpenBaseDir=PHP openbasedir parameter -YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form). -YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form). -NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing. -MigrationCustomerOrderShipping=Migrate shipping for customer orders storage -MigrationShippingDelivery=Upgrade storage of shipping -MigrationShippingDelivery2=Upgrade storage of shipping 2 -MigrationFinished=Migration finished -LastStepDesc=Last step: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others. -ActivateModule=Activate module %s -ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) +DatabaseCreation=Tạo ra cơ sở dữ liệu +UserCreation=Người dùng tạo ra +CreateDatabaseObjects=Cơ sở dữ liệu đối tượng sáng tạo +ReferenceDataLoading=Tài liệu tham khảo dữ liệu tải +TablesAndPrimaryKeysCreation=Bàn phím chính tạo +CreateTableAndPrimaryKey=Tạo bảng% s +CreateOtherKeysForTable=Tạo các phím nước ngoài và các chỉ số cho bảng% s +OtherKeysCreation=Phím và chỉ số nước ngoài tạo +FunctionsCreation=Chức năng sáng tạo +AdminAccountCreation=Tạo đăng nhập quản trị +PleaseTypePassword=Xin vui lòng nhập một mật khẩu, mật khẩu rỗng không được phép! +PleaseTypeALogin=Xin vui lòng nhập một tên đăng nhập! +PasswordsMismatch=Có khác nhau mật khẩu, hãy thử lại! +SetupEnd=Kết thúc cài đặt +SystemIsInstalled=Cài đặt này hoàn tất. +SystemIsUpgraded=Dolibarr đã được nâng cấp thành công. +YouNeedToPersonalizeSetup=Bạn cần phải cấu hình cho phù hợp với nhu cầu Dolibarr của bạn (ngoại hình, tính năng, ...). Để làm điều này, hãy làm theo các liên kết dưới đây: +AdminLoginCreatedSuccessfuly=Dolibarr quản trị viên đăng nhập '% s' tạo ra successfuly. +GoToDolibarr=Tới Dolibarr +GoToSetupArea=Tới Dolibarr (setup) +MigrationNotFinished=Phiên bản cơ sở dữ liệu của bạn không phải là hoàn toàn cập nhật, vì vậy bạn sẽ phải chạy quá trình nâng cấp một lần nữa. +GoToUpgradePage=Tới nâng cấp trang lại +Examples=Ví dụ +WithNoSlashAtTheEnd=Nếu không có các dấu gạch chéo "/" ở cuối +DirectoryRecommendation=Nó được recommanded sử dụng một thư mục bên ngoài thư mục của bạn của trang web của bạn. +LoginAlreadyExists=Đã tồn tại +DolibarrAdminLogin=Dolibarr quản trị đăng nhập +AdminLoginAlreadyExists=Dolibarr tài khoản quản trị '% s' đã tồn tại. Quay trở lại, nếu bạn muốn tạo một số khác. +WarningRemoveInstallDir=Cảnh báo, vì lý do bảo mật, một khi cài đặt hoặc nâng cấp hoàn thành, để tránh sử dụng các công cụ cài đặt một lần nữa, bạn nên thêm một tập tin gọi là install.lock vào thư mục tài liệu Dolibarr, để tránh việc sử dụng độc hại của nó. +ThisPHPDoesNotSupportTypeBase=Hệ thống PHP này không hỗ trợ bất kỳ giao diện để truy cập cơ sở dữ liệu loại% s +FunctionNotAvailableInThisPHP=Không có sẵn trên PHP này +MigrateScript=Kịch bản di chuyển +ChoosedMigrateScript=Chọn kịch bản di cư +DataMigration=Di chuyển dữ liệu +DatabaseMigration=Di chuyển cơ sở dữ liệu cấu trúc +ProcessMigrateScript=Xử lý kịch bản +ChooseYourSetupMode=Chọn chế độ cài đặt của bạn và bấm vào nút "Bắt đầu" ... +FreshInstall=Cài đặt mới +FreshInstallDesc=Sử dụng chế độ này nếu điều này là cài đặt đầu tiên của bạn. Nếu không, chế độ này có thể sửa chữa cài đặt trước đó không đầy đủ, nhưng nếu bạn muốn nâng cấp phiên bản của bạn, chọn "Nâng cấp" chế độ. +Upgrade=Nâng cấp +UpgradeDesc=Sử dụng chế độ này nếu bạn đã thay thế các tập tin Dolibarr cũ với các tập tin từ một phiên bản mới hơn. Điều này sẽ nâng cấp cơ sở dữ liệu và dữ liệu của bạn. +Start=Bắt đầu +InstallNotAllowed=Thiết lập không cho phép quyền conf.php +NotAvailable=Không có sẵn +YouMustCreateWithPermission=Bạn phải tạo tập tin% s và cho phép ghi vào nó cho máy chủ web trong quá trình cài đặt. +CorrectProblemAndReloadPage=Hãy khắc phục vấn đề và bấm F5 để tải lại trang. +AlreadyDone=Đã di cư +DatabaseVersion=Phiên bản cơ sở dữ liệu +ServerVersion=Phiên bản máy chủ cơ sở dữ liệu +YouMustCreateItAndAllowServerToWrite=Bạn phải tạo thư mục này và cho phép các máy chủ web để viết vào đó. +CharsetChoice=Ký tự lựa chọn +CharacterSetClient=Ký tự được sử dụng để tạo ra các trang web HTML +CharacterSetClientComment=Chọn bộ ký tự để hiển thị web.
Mặc định đề xuất ký tự là một trong những cơ sở dữ liệu của bạn. +DBSortingCollation=Nhân vật thứ tự sắp xếp +DBSortingCollationComment=Chọn mã trang xác định thứ tự sắp xếp của nhân vật được sử dụng bởi cơ sở dữ liệu. Thông số này cũng được gọi là "đối chiếu" của một số cơ sở dữ liệu.
Thông số này không thể xác định nếu cơ sở dữ liệu đã tồn tại. +CharacterSetDatabase=Ký tự đặt cho cơ sở dữ liệu +CharacterSetDatabaseComment=Chọn bộ ký tự muốn để tạo cơ sở dữ liệu.
Thông số này không thể xác định nếu cơ sở dữ liệu đã tồn tại. +YouAskDatabaseCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu% s, nhưng cho điều này, Dolibarr cần kết nối với máy chủ% s với các điều khoản sử dụng siêu% s. +YouAskLoginCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu đăng nhập% s, nhưng cho điều này, Dolibarr cần kết nối với máy chủ% s với các điều khoản sử dụng siêu% s. +BecauseConnectionFailedParametersMayBeWrong=Khi kết nối thành công, máy chủ hoặc người sử dụng siêu thông số phải là sai. +OrphelinsPaymentsDetectedByMethod=Trẻ em mồ côi thanh toán được phát hiện bằng phương pháp% s +RemoveItManuallyAndPressF5ToContinue=Loại bỏ nó bằng tay và bấm F5 để tiếp tục. +KeepDefaultValuesWamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ DoliWamp, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm. +KeepDefaultValuesDeb=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ một gói phần mềm Linux (Ubuntu, Debian, Fedora ...), do đó giá trị đề xuất ở đây đã được tối ưu hóa. Chỉ có mật khẩu của chủ sở hữu cơ sở dữ liệu để tạo ra phải được hoàn tất. Thay đổi các thông số khác chỉ khi bạn biết những gì bạn làm. +KeepDefaultValuesMamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ DoliMamp, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm. +KeepDefaultValuesProxmox=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ một thiết bị ảo Proxmox, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm. +FieldRenamed=Dòng đổi tên +IfLoginDoesNotExistsCheckCreateUser=Nếu đăng nhập không tồn tại được nêu ra, bạn phải kiểm tra tùy chọn "Tạo người dùng" +ErrorConnection=Server "% s", tên cơ sở dữ liệu "% s", đăng nhập "% s", hoặc mật khẩu cơ sở dữ liệu có thể sai hoặc phiên bản client PHP có thể là quá cũ so với phiên bản cơ sở dữ liệu. +InstallChoiceRecommanded=Đề nghị lựa chọn để cài đặt phiên bản% s từ phiên bản hiện tại của bạn% s +InstallChoiceSuggested=Cài đặt lựa chọn được đề xuất bởi trình cài đặt. +MigrateIsDoneStepByStep=Phiên bản mục tiêu (% s) có một khoảng cách của một số phiên bản, vì vậy cài đặt chương trình sẽ trở lại với đề nghị di chuyển tiếp theo lần này sẽ được hoàn thành. +CheckThatDatabasenameIsCorrect=Kiểm tra xem tên "% s" cơ sở dữ liệu là chính xác. +IfAlreadyExistsCheckOption=Nếu tên này là chính xác và cơ sở dữ liệu chưa tồn tại, bạn phải kiểm tra tùy chọn "Tạo cơ sở dữ liệu". +OpenBaseDir=PHP openbasedir tham số +YouAskToCreateDatabaseSoRootRequired=Bạn đã chọn hộp "Tạo cơ sở dữ liệu". Đối với điều này, bạn cần cung cấp tên đăng nhập / mật khẩu của siêu người dùng (dưới cùng của mẫu). +YouAskToCreateDatabaseUserSoRootRequired=Bạn đã chọn hộp "Tạo chủ sở hữu cơ sở dữ liệu". Đối với điều này, bạn cần cung cấp tên đăng nhập / mật khẩu của siêu người dùng (dưới cùng của mẫu). +NextStepMightLastALongTime=Bước hiện tại có thể kéo dài vài phút. Hãy đợi cho đến khi màn hình tiếp theo được thể hiện hoàn toàn trước khi tiếp tục. +MigrationCustomerOrderShipping=Di chuyển vận chuyển cho các đơn đặt hàng của khách hàng lưu trữ +MigrationShippingDelivery=Nâng cấp lưu trữ vận chuyển +MigrationShippingDelivery2=Nâng cấp lưu trữ vận chuyển 2 +MigrationFinished=Di cư đã hoàn thành +LastStepDesc=Bước cuối cùng: Xác định đây đăng nhập và mật khẩu bạn có kế hoạch sử dụng để kết nối với phần mềm. Đừng mất này vì nó là tài khoản để quản lý tất cả những người khác. +ActivateModule=Kích hoạt module% s +ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn) ######### # upgrade -MigrationFixData=Fix for denormalized data -MigrationOrder=Data migration for customer's orders -MigrationSupplierOrder=Data migration for supplier's orders -MigrationProposal=Data migration for commercial proposals -MigrationInvoice=Data migration for customer's invoices -MigrationContract=Data migration for contracts -MigrationSuccessfullUpdate=Upgrade successful -MigrationUpdateFailed=Failed upgrade process -MigrationRelationshipTables=Data migration for relationship tables (%s) -MigrationPaymentsUpdate=Payment data correction -MigrationPaymentsNumberToUpdate=%s payment(s) to update -MigrationProcessPaymentUpdate=Update payment(s) %s -MigrationPaymentsNothingToUpdate=No more things to do -MigrationPaymentsNothingUpdatable=No more payments that can be corrected -MigrationContractsUpdate=Contract data correction -MigrationContractsNumberToUpdate=%s contract(s) to update -MigrationContractsLineCreation=Create contract line for contract ref %s -MigrationContractsNothingToUpdate=No more things to do -MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do. -MigrationContractsEmptyDatesUpdate=Contract empty date correction -MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly -MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct -MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct -MigrationContractsInvalidDatesUpdate=Bad value date contract correction -MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s) -MigrationContractsInvalidDatesNumber=%s contracts modified -MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct -MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction -MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly -MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct -MigrationReopeningContracts=Open contract closed by error -MigrationReopenThisContract=Reopen contract %s -MigrationReopenedContractsNumber=%s contracts modified -MigrationReopeningContractsNothingToUpdate=No closed contract to open -MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer -MigrationBankTransfertsNothingToUpdate=All links are up to date -MigrationShipmentOrderMatching=Sendings receipt update -MigrationDeliveryOrderMatching=Delivery receipt update -MigrationDeliveryDetail=Delivery update -MigrationStockDetail=Update stock value of products -MigrationMenusDetail=Update dynamic menus tables -MigrationDeliveryAddress=Update delivery address in shipments -MigrationProjectTaskActors=Data migration for llx_projet_task_actors table -MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact -MigrationProjectTaskTime=Update time spent in seconds -MigrationActioncommElement=Update data on actions -MigrationPaymentMode=Data migration for payment mode -MigrationCategorieAssociation=Migration of categories +MigrationFixData=Sửa chữa cho các dữ liệu denormalized +MigrationOrder=Di chuyển dữ liệu cho các đơn hàng của khách hàng +MigrationSupplierOrder=Di chuyển dữ liệu cho các đơn đặt hàng của nhà cung cấp +MigrationProposal=Di chuyển dữ liệu cho đề xuất thương mại +MigrationInvoice=Di chuyển dữ liệu cho hóa đơn của khách hàng +MigrationContract=Di chuyển dữ liệu cho các hợp đồng +MigrationSuccessfullUpdate=Nâng cấp thành công +MigrationUpdateFailed=Quá trình nâng cấp thất bại +MigrationRelationshipTables=Di chuyển dữ liệu cho các bảng mối quan hệ (% s) +MigrationPaymentsUpdate=Chỉnh sửa dữ liệu thanh toán +MigrationPaymentsNumberToUpdate=Thanh toán% s (s) để cập nhật +MigrationProcessPaymentUpdate=Thanh toán Cập nhật (s)% s +MigrationPaymentsNothingToUpdate=Không có những thứ nhiều hơn để làm +MigrationPaymentsNothingUpdatable=Không thanh toán có thể được sửa chữa +MigrationContractsUpdate=Hợp đồng sửa chữa dữ liệu +MigrationContractsNumberToUpdate=Hợp đồng% s (s) để cập nhật +MigrationContractsLineCreation=Tạo dòng hợp đồng cho hợp đồng ref% s +MigrationContractsNothingToUpdate=Không có những thứ nhiều hơn để làm +MigrationContractsFieldDontExist=Dòng fk_facture không tồn tại nữa. Không có gì để làm. +MigrationContractsEmptyDatesUpdate=Hợp đồng sửa chữa ngày rỗng +MigrationContractsEmptyDatesUpdateSuccess=Hợp đồng sửa chữa ngày emtpy thực hiện successfuly +MigrationContractsEmptyDatesNothingToUpdate=Không có hợp đồng ngày trống để sửa chữa +MigrationContractsEmptyCreationDatesNothingToUpdate=Không có ngày tạo lập hợp đồng để sửa chữa +MigrationContractsInvalidDatesUpdate=Điều chỉnh hợp đồng ngày giá trị xấu +MigrationContractsInvalidDateFix=Đúng hợp đồng% s (ngày hợp đồng =% s, Bắt đầu từ ngày dịch vụ này min =% s) +MigrationContractsInvalidDatesNumber=Hợp đồng sửa đổi% s +MigrationContractsInvalidDatesNothingToUpdate=Không có ngày có giá trị xấu để sửa chữa +MigrationContractsIncoherentCreationDateUpdate=Giá trị Bad chỉnh ngày tạo lập hợp đồng +MigrationContractsIncoherentCreationDateUpdateSuccess=Giá trị Bad chỉnh ngày tạo lập hợp đồng thực hiện succesfuly +MigrationContractsIncoherentCreationDateNothingToUpdate=Không có giá trị tốt cho ngày tạo lập hợp đồng để sửa chữa +MigrationReopeningContracts=Mở hợp đồng đóng cửa do lỗi +MigrationReopenThisContract=Mở lại hợp đồng% s +MigrationReopenedContractsNumber=Hợp đồng sửa đổi% s +MigrationReopeningContractsNothingToUpdate=Không có hợp đồng đóng mở +MigrationBankTransfertsUpdate=Cập nhật liên kết giữa các giao dịch ngân hàng và chuyển khoản ngân hàng +MigrationBankTransfertsNothingToUpdate=Tất cả các liên kết được cập nhật +MigrationShipmentOrderMatching=Sendings cập nhật nhận +MigrationDeliveryOrderMatching=Cập nhật nhận giao hàng +MigrationDeliveryDetail=Cập nhật Giao hàng tận nơi +MigrationStockDetail=Cập nhật giá trị cổ phiếu của sản phẩm +MigrationMenusDetail=Cập nhật bảng menu động +MigrationDeliveryAddress=Cập nhật địa chỉ giao hàng trong lô hàng +MigrationProjectTaskActors=Di chuyển dữ liệu cho bảng llx_projet_task_actors +MigrationProjectUserResp=Di chuyển dữ liệu lĩnh vực fk_user_resp của llx_projet để llx_element_contact +MigrationProjectTaskTime=Cập nhật dành thời gian trong vài giây +MigrationActioncommElement=Cập nhật dữ liệu về các hoạt động +MigrationPaymentMode=Di chuyển dữ liệu cho phương thức thanh toán +MigrationCategorieAssociation=Di chuyển các loại -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Hiển thị tùy chọn không có sẵn +HideNotAvailableOptions=Ẩn các tùy chọn không có sẵn diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang index 58579a74276..7e905bcf958 100644 --- a/htdocs/langs/vi_VN/interventions.lang +++ b/htdocs/langs/vi_VN/interventions.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - interventions -Intervention=Intervention -Interventions=Interventions -InterventionCard=Intervention card -NewIntervention=New intervention -AddIntervention=Add intervention -ListOfInterventions=List of interventions -EditIntervention=Edit intervention -ActionsOnFicheInter=Actions on intervention -LastInterventions=Last %s interventions -AllInterventions=All interventions -CreateDraftIntervention=Create draft -CustomerDoesNotHavePrefix=Customer does not have a prefix -InterventionContact=Intervention contact -DeleteIntervention=Delete intervention -ValidateIntervention=Validate intervention -ModifyIntervention=Modify intervention -DeleteInterventionLine=Delete intervention line -ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? -ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? -ConfirmModifyIntervention=Are you sure you want to modify this intervention ? -ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? -NameAndSignatureOfInternalContact=Name and signature of intervening : -NameAndSignatureOfExternalContact=Name and signature of customer : -DocumentModelStandard=Standard document model for interventions -InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=Classify "Billed" -StatusInterInvoiced=Billed -RelatedInterventions=Related interventions -ShowIntervention=Show intervention +Intervention=Can thiệp +Interventions=Các can thiệp +InterventionCard=Thẻ can thiệp +NewIntervention=Can thiệp mới +AddIntervention=Thêm can thiệp +ListOfInterventions=Danh sách can thiệp +EditIntervention=Sửa can thiệp +ActionsOnFicheInter=Hành động can thiệp vào +LastInterventions=Can thiệp cuối% s +AllInterventions=Tất cả các can thiệp +CreateDraftIntervention=Tạo dự thảo +CustomerDoesNotHavePrefix=Khách hàng không có một tiền tố +InterventionContact=Liên lạc can thiệp +DeleteIntervention=Xóa can thiệp +ValidateIntervention=Xác nhận can thiệp +ModifyIntervention=Sửa can thiệp +DeleteInterventionLine=Xóa đường can thiệp +ConfirmDeleteIntervention=Bạn Bạn có chắc chắn muốn xóa can thiệp này? +ConfirmValidateIntervention=Bạn có chắc chắn bạn muốn xác nhận can thiệp này dưới tên% s? +ConfirmModifyIntervention=Bạn có chắc là bạn muốn thay đổi can thiệp này? +ConfirmDeleteInterventionLine=Bạn Bạn có chắc chắn muốn xóa dòng can thiệp này? +NameAndSignatureOfInternalContact=Tên và chữ ký của can thiệp: +NameAndSignatureOfExternalContact=Tên và chữ ký của khách hàng: +DocumentModelStandard=Mô hình tài liệu chuẩn cho các can thiệp +InterventionCardsAndInterventionLines=Can thiệp và dòng của các can thiệp +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Hóa đơn +RelatedInterventions=Can thiệp liên quan +ShowIntervention=Hiện can thiệp +SendInterventionRef=Nộp can thiệp% s ##### Types de contacts ##### -TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -TypeContact_fichinter_internal_INTERVENING=Intervening -TypeContact_fichinter_external_BILLING=Billing customer contact -TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +TypeContact_fichinter_internal_INTERREPFOLL=Đại diện theo dõi can thiệp +TypeContact_fichinter_internal_INTERVENING=Can thiệp +TypeContact_fichinter_external_BILLING=Thanh toán liên lạc của khách hàng +TypeContact_fichinter_external_CUSTOMER=Theo dõi liên lạc của khách hàng # Modele numérotation -ArcticNumRefModelDesc1=Generic number model -ArcticNumRefModelError=Failed to activate -PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +ArcticNumRefModelDesc1=Mô hình số chung +ArcticNumRefModelError=Không thể kích hoạt +PacificNumRefModelDesc1=Quay trở lại với các định dạng numero% syymm-nnnn nơi yyyy là năm, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0 +PacificNumRefModelError=Thẻ can thiệp bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này. +PrintProductsOnFichinter=Sản phẩm in trên thẻ can thiệp +PrintProductsOnFichinterDetails=forinterventions tạo ra từ các đơn đặt hàng diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang index 3e11d70449e..46ef6c6678e 100644 --- a/htdocs/langs/vi_VN/languages.lang +++ b/htdocs/langs/vi_VN/languages.lang @@ -1,28 +1,28 @@ # Dolibarr language file - Source file is en_US - languages -Language_ar_AR=Tiếng Ả Rập -Language_ar_SA=Tiếng Ả Rập +Language_ar_AR=Ả Rập +Language_ar_SA=Ả Rập Language_bg_BG=Bungari -Language_bs_BA=Tiếng Bosnia +Language_bs_BA=Bosnia Language_ca_ES=Catalan -Language_cs_CZ=Séc +Language_cs_CZ=Cộng hòa Séc Language_da_DA=Đan Mạch Language_da_DK=Đan Mạch Language_de_DE=Đức Language_de_AT=Đức (Áo) -Language_de_CH=German (Switzerland) +Language_de_CH=Đức (Thụy Sĩ) Language_el_GR=Hy Lạp -Language_en_AU=Tiếng Anh (Úc) -Language_en_GB=English (United Kingdom) -Language_en_IN=Tiếng Anh (Ấn Độ) -Language_en_NZ=Tiếng Anh (New Zealand) -Language_en_SA=Tiếng Anh (Saudi Arabia) -Language_en_US=English (United States) -Language_en_ZA=Tiếng Anh (Nam Phi) +Language_en_AU=Anh (Úc) +Language_en_GB=Anh (Vương quốc Anh) +Language_en_IN=Anh (Ấn Độ) +Language_en_NZ=Anh (New Zealand) +Language_en_SA=Anh (Ả rập Saudi) +Language_en_US=Anh (Hoa Kỳ) +Language_en_ZA=Anh (Nam Phi) Language_es_ES=Tây Ban Nha -Language_es_DO=Spanish (Dominican Republic) +Language_es_DO=Tây Ban Nha (Cộng hòa Dominica) Language_es_AR=Tây Ban Nha (Argentina) -Language_es_CL=Spanish (Chile) +Language_es_CL=Tây Ban Nha (Chile) Language_es_HN=Tây Ban Nha (Honduras) Language_es_MX=Tây Ban Nha (Mexico) Language_es_PY=Tây Ban Nha (Paraguay) @@ -30,24 +30,24 @@ Language_es_PE=Tây Ban Nha (Peru) Language_es_PR=Tây Ban Nha (Puerto Rico) Language_et_EE=Estonia Language_eu_ES=Basque -Language_fa_IR=Tiếng Ba Tư -Language_fi_FI=Vây +Language_fa_IR=Ba Tư +Language_fi_FI=Fins Language_fr_BE=Pháp (Bỉ) -Language_fr_CA=Tiếng Pháp (Canada) +Language_fr_CA=Pháp (Canada) Language_fr_CH=Pháp (Thụy Sĩ) Language_fr_FR=Pháp Language_fr_NC=Pháp (New Caledonia) -Language_he_IL=Tiếng Do Thái +Language_he_IL=Do Thái Language_hr_HR=Croatia Language_hu_HU=Hungary -Language_id_ID=Indonesian +Language_id_ID=Indonesia Language_is_IS=Iceland Language_it_IT=Ý Language_ja_JP=Nhật Bản Language_ko_KR=Hàn Quốc Language_lt_LT=Lithuania Language_lv_LV=Latvia -Language_mk_MK=Người mang đầu trượng +Language_mk_MK=Macedonian Language_nb_NO=Na Uy (Bokmål) Language_nl_BE=Hà Lan (Bỉ) Language_nl_NL=Hà Lan (Hà Lan) @@ -61,11 +61,11 @@ Language_tr_TR=Thổ Nhĩ Kỳ Language_sl_SI=Slovenia Language_sv_SV=Thụy Điển Language_sv_SE=Thụy Điển -Language_sq_AL=Albanian +Language_sq_AL=Albania Language_sk_SK=Slovakia Language_th_TH=Thái Lan Language_uk_UA=Ukraina -Language_uz_UZ=Tiếng Uzbek +Language_uz_UZ=Uzbek Language_vi_VN=Việt Language_zh_CN=Trung Quốc Language_zh_TW=Trung Quốc (truyền thống) diff --git a/htdocs/langs/vi_VN/ldap.lang b/htdocs/langs/vi_VN/ldap.lang index 02e457446a6..3cf778b41e8 100644 --- a/htdocs/langs/vi_VN/ldap.lang +++ b/htdocs/langs/vi_VN/ldap.lang @@ -1,29 +1,29 @@ # Dolibarr language file - Source file is en_US - ldap -DomainPassword=Password for domain -YouMustChangePassNextLogon=Password for user %s on the domain %s must be changed. -UserMustChangePassNextLogon=User must change password on the domain %s -LdapUacf_NORMAL_ACCOUNT=User account -LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires -LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s -LDAPInformationsForThisContact=Information in LDAP database for this contact -LDAPInformationsForThisUser=Information in LDAP database for this user -LDAPInformationsForThisGroup=Information in LDAP database for this group -LDAPInformationsForThisMember=Information in LDAP database for this member -LDAPAttribute=LDAP attribute -LDAPAttributes=LDAP attributes -LDAPCard=LDAP card -LDAPRecordNotFound=Record not found in LDAP database -LDAPUsers=Users in LDAP database -LDAPGroups=Groups in LDAP database -LDAPFieldStatus=Status -LDAPFieldFirstSubscriptionDate=First subscription date -LDAPFieldFirstSubscriptionAmount=First subscription amount -LDAPFieldLastSubscriptionDate=Last subscription date -LDAPFieldLastSubscriptionAmount=Last subscription amount -SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP) -UserSynchronized=User synchronized -GroupSynchronized=Group synchronized -MemberSynchronized=Member synchronized -ContactSynchronized=Contact synchronized -ForceSynchronize=Force synchronizing Dolibarr -> LDAP -ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility. +DomainPassword=Mật khẩu cho tên miền +YouMustChangePassNextLogon=Mật khẩu cho người dùng% s trên miền% s phải được thay đổi. +UserMustChangePassNextLogon=Người dùng phải thay đổi mật khẩu trên các tên miền% s +LdapUacf_NORMAL_ACCOUNT=Tài khoản người dùng +LdapUacf_DONT_EXPIRE_PASSWORD=Mật khẩu không bao giờ hết hạn +LdapUacf_ACCOUNTDISABLE=Tài khoản bị vô hiệu hóa trong miền% s +LDAPInformationsForThisContact=Thông tin trong cơ sở dữ liệu LDAP cho liên hệ này +LDAPInformationsForThisUser=Thông tin trong cơ sở dữ liệu LDAP cho người dùng này +LDAPInformationsForThisGroup=Thông tin trong cơ sở dữ liệu LDAP cho nhóm này +LDAPInformationsForThisMember=Thông tin trong cơ sở dữ liệu LDAP của thành viên này +LDAPAttribute=Thuộc tính LDAP +LDAPAttributes=Thuộc tính LDAP +LDAPCard=Thẻ LDAP +LDAPRecordNotFound=Ghi lại không có trong cơ sở dữ liệu LDAP +LDAPUsers=Người sử dụng trong cơ sở dữ liệu LDAP +LDAPGroups=Nhóm trong cơ sở dữ liệu LDAP +LDAPFieldStatus=Tình trạng +LDAPFieldFirstSubscriptionDate=Ngày đăng ký đầu tiên +LDAPFieldFirstSubscriptionAmount=Số lượng thuê bao đầu tiên +LDAPFieldLastSubscriptionDate=Cuối ngày đăng ký +LDAPFieldLastSubscriptionAmount=Số lượng đăng ký cuối cùng +SynchronizeDolibarr2Ldap=Đồng bộ hóa sử dụng (Dolibarr -> LDAP) +UserSynchronized=Sử dụng đồng bộ +GroupSynchronized=Nhóm đồng bộ +MemberSynchronized=Thành viên đồng bộ +ContactSynchronized=Liên hệ đồng bộ +ForceSynchronize=Lực lượng đồng bộ hóa Dolibarr -> LDAP +ErrorFailedToReadLDAP=Không thể đọc cơ sở dữ liệu LDAP. Kiểm tra thiết lập mô-đun LDAP và khả năng tiếp cận cơ sở dữ liệu. diff --git a/htdocs/langs/vi_VN/mailmanspip.lang b/htdocs/langs/vi_VN/mailmanspip.lang index c85b3d60db2..da985d73ee5 100644 --- a/htdocs/langs/vi_VN/mailmanspip.lang +++ b/htdocs/langs/vi_VN/mailmanspip.lang @@ -1,27 +1,27 @@ # Dolibarr language file - Source file is en_US - mailmanspip -MailmanSpipSetup=Mailman and SPIP module Setup -MailmanTitle=Mailman mailing list system -TestSubscribe=To test subscription to Mailman lists -TestUnSubscribe=To test unsubscribe from Mailman lists -MailmanCreationSuccess=Subscription test was executed succesfully -MailmanDeletionSuccess=Unsubscription test was executed succesfully -SynchroMailManEnabled=A Mailman update will be performed -SynchroSpipEnabled=A Spip update will be performed -DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password -DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions -DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions -DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) -SPIPTitle=SPIP Content Management System -DescADHERENT_SPIP_SERVEUR=SPIP Server -DescADHERENT_SPIP_DB=SPIP database name -DescADHERENT_SPIP_USER=SPIP database login -DescADHERENT_SPIP_PASS=SPIP database password -AddIntoSpip=Add into SPIP -AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? -AddIntoSpipError=Failed to add the user in SPIP -DeleteIntoSpip=Remove from SPIP -DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? -DeleteIntoSpipError=Failed to suppress the user from SPIP -SPIPConnectionFailed=Failed to connect to SPIP -SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done -SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done +MailmanSpipSetup=Mailman và mô-đun cài đặt SPIP +MailmanTitle=Gửi thư Mailman hệ thống danh sách +TestSubscribe=Để kiểm tra đăng ký vào danh sách Mailman +TestUnSubscribe=Để kiểm tra hủy đăng ký từ danh sách Mailman +MailmanCreationSuccess=Kiểm tra đăng ký đã được thực hiện thành công +MailmanDeletionSuccess=Huỷ đăng ký thử nghiệm đã được thực hiện thành công +SynchroMailManEnabled=Một bản cập nhật Mailman sẽ được thực hiện +SynchroSpipEnabled=Một bản cập nhật Spip sẽ được thực hiện +DescADHERENT_MAILMAN_ADMINPW=Mật khẩu quản trị Mailman +DescADHERENT_MAILMAN_URL=URL cho đăng ký Mailman +DescADHERENT_MAILMAN_UNSUB_URL=URL cho unsubscriptions Mailman +DescADHERENT_MAILMAN_LISTS=Danh sách (s) để tự động ghi các thành viên mới (cách nhau bằng dấu phẩy) +SPIPTitle=SPIP hệ thống quản trị nội dung +DescADHERENT_SPIP_SERVEUR=SPIP máy chủ +DescADHERENT_SPIP_DB=Tên cơ sở dữ liệu SPIP +DescADHERENT_SPIP_USER=Đăng nhập cơ sở dữ liệu SPIP +DescADHERENT_SPIP_PASS=SPIP mật khẩu cơ sở dữ liệu +AddIntoSpip=Thêm vào SPIP +AddIntoSpipConfirmation=Bạn có chắc bạn muốn thêm thành viên này vào SPIP? +AddIntoSpipError=Không thể thêm người sử dụng trong SPIP +DeleteIntoSpip=Gỡ bỏ khỏi SPIP +DeleteIntoSpipConfirmation=Bạn có chắc là bạn muốn loại bỏ thành viên này từ SPIP? +DeleteIntoSpipError=Không thể ngăn chặn người dùng từ SPIP +SPIPConnectionFailed=Không thể kết nối với SPIP +SuccessToAddToMailmanList=Thêm% s vào danh sách đưa thư% s hoặc cơ sở dữ liệu SPIP làm +SuccessToRemoveToMailmanList=Loại bỏ% s trong danh sách đưa thư% s hoặc cơ sở dữ liệu SPIP làm diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang index 0130de1547b..1183ab80854 100644 --- a/htdocs/langs/vi_VN/mails.lang +++ b/htdocs/langs/vi_VN/mails.lang @@ -1,138 +1,138 @@ # Dolibarr language file - Source file is en_US - mails -Mailing=EMailing -EMailing=EMailing +Mailing=Gửi email +EMailing=Gửi email Mailings=EMailings EMailings=EMailings -AllEMailings=All eMailings -MailCard=EMailing card -MailTargets=Targets -MailRecipients=Recipients -MailRecipient=Recipient -MailTitle=Description -MailFrom=Sender -MailErrorsTo=Errors to -MailReply=Reply to -MailTo=Receiver(s) -MailCC=Copy to -MailCCC=Cached copy to -MailTopic=EMail topic -MailText=Message -MailFile=Attached files -MailMessage=EMail body -ShowEMailing=Show emailing -ListOfEMailings=List of emailings -NewMailing=New emailing -EditMailing=Edit emailing -ResetMailing=Resend emailing -DeleteMailing=Delete emailing -DeleteAMailing=Delete an emailing -PreviewMailing=Preview emailing -PrepareMailing=Prepare emailing -CreateMailing=Create emailing -MailingDesc=This page allows you to send emailings to a group of people. -MailingResult=Sending emails result -TestMailing=Test email -ValidMailing=Valid emailing -ApproveMailing=Approve emailing -MailingStatusDraft=Draft -MailingStatusValidated=Validated -MailingStatusApproved=Approved -MailingStatusSent=Sent -MailingStatusSentPartialy=Sent partialy -MailingStatusSentCompletely=Sent completely +AllEMailings=Tất cả eMailings +MailCard=Gửi email thẻ +MailTargets=Mục tiêu +MailRecipients=Người nhận +MailRecipient=Người nhận +MailTitle=Mô tả +MailFrom=Tên người gửi +MailErrorsTo=Lỗi để +MailReply=Trả lời +MailTo=Thu (s) +MailCC=Sao chép vào +MailCCC=Bản cache để +MailTopic=Thư điện tử chủ đề +MailText=Tin nhắn +MailFile=File đính kèm +MailMessage=Thư điện tử của cơ thể +ShowEMailing=Hiện gửi email +ListOfEMailings=Danh sách emailings +NewMailing=Gửi email mới +EditMailing=Sửa gửi email +ResetMailing=Gửi lại email +DeleteMailing=Xóa email +DeleteAMailing=Xóa một thư điện tử theo +PreviewMailing=Xem trước gửi email +PrepareMailing=Chuẩn bị gửi email +CreateMailing=Tạo email +MailingDesc=Trang này cho phép bạn gửi emailings cho một nhóm người. +MailingResult=Gửi email kết quả +TestMailing=Kiểm tra email +ValidMailing=Gửi email hợp lệ +ApproveMailing=Phê duyệt email +MailingStatusDraft=Dự thảo +MailingStatusValidated=Xác nhận +MailingStatusApproved=Đã được phê duyệt +MailingStatusSent=Gửi +MailingStatusSentPartialy=Gửi partialy +MailingStatusSentCompletely=Gửi hoàn toàn MailingStatusError=Lỗi -MailingStatusNotSent=Not sent -MailSuccessfulySent=Email successfully sent (from %s to %s) -MailingSuccessfullyValidated=EMailing successfully validated -MailUnsubcribe=Unsubscribe -Unsuscribe=Unsubscribe -MailingStatusNotContact=Don't contact anymore -ErrorMailRecipientIsEmpty=Email recipient is empty -WarningNoEMailsAdded=No new Email to add to recipient's list. -ConfirmValidMailing=Are you sure you want to validate this emailing ? -ConfirmResetMailing=Warning, by reinitializing emailing %s, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ? -ConfirmDeleteMailing=Are you sure you want to delete this emailling ? -NbOfRecipients=Number of recipients -NbOfUniqueEMails=Nb of unique emails -NbOfEMails=Nb of EMails -TotalNbOfDistinctRecipients=Number of distinct recipients -NoTargetYet=No recipients defined yet (Go on tab 'Recipients') -AddRecipients=Add recipients -RemoveRecipient=Remove recipient -CommonSubstitutions=Common substitutions -YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. -EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values -MailingAddFile=Attach this file -NoAttachedFiles=No attached files -BadEMail=Bad value for EMail -CloneEMailing=Clone Emailing -ConfirmCloneEMailing=Are you sure you want to clone this emailing ? -CloneContent=Clone message -CloneReceivers=Cloner recipients -DateLastSend=Date of last sending -DateSending=Date sending -SentTo=Sent to %s -MailingStatusRead=Read -CheckRead=Read Receipt -YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list -MailtoEMail=Hyper link to email -ActivateCheckRead=Allow to use the "Unsubcribe" link -ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature -EMailSentToNRecipients=EMail sent to %s recipients. -XTargetsAdded=%s recipients added into target list -EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. -MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) -SendRemind=Send reminder by EMails -RemindSent=%s reminder(s) sent -AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) -NoRemindSent=No EMail reminder sent -ResultOfMassSending=Result of mass EMail reminders sending +MailingStatusNotSent=Không gửi +MailSuccessfulySent=Email đã được gửi thành công (từ% s đến% s) +MailingSuccessfullyValidated=Gửi email xác nhận thành công +MailUnsubcribe=Hủy đăng ký +Unsuscribe=Hủy đăng ký +MailingStatusNotContact=Không liên hệ nữa +ErrorMailRecipientIsEmpty=Email người nhận có sản phẩm nào +WarningNoEMailsAdded=Không có Email mới để thêm vào danh sách người nhận. +ConfirmValidMailing=Bạn có chắc chắn bạn muốn gửi email để xác nhận điều này? +ConfirmResetMailing=Cảnh báo, bằng cách gửi email reinitializing% s, bạn cho phép để thực hiện một khối lượng gửi email này lúc khác. Bạn có chắc bạn này là những gì bạn muốn làm gì? +ConfirmDeleteMailing=Bạn Bạn có chắc chắn muốn xóa emailling này? +NbOfRecipients=Số người nhận +NbOfUniqueEMails=Nb email độc đáo +NbOfEMails=Nb email +TotalNbOfDistinctRecipients=Số người nhận khác biệt +NoTargetYet=Không có người nhận định chưa (Đi vào tab 'nhận') +AddRecipients=Thêm người nhận +RemoveRecipient=Di chuyển người nhận +CommonSubstitutions=Thay thế phổ biến +YouCanAddYourOwnPredefindedListHere=Để tạo mô-đun bạn chọn email, xem htdocs / core / modules / thư / README. +EMailTestSubstitutionReplacedByGenericValues=Khi sử dụng chế độ kiểm tra, thay thế các biến được thay thế bằng các giá trị chung +MailingAddFile=Đính kèm tập tin này +NoAttachedFiles=Không có tập tin đính kèm +BadEMail=Bad giá trị so với thư điện tử +CloneEMailing=Clone gửi email +ConfirmCloneEMailing=Bạn có chắc chắn bạn muốn sao chép các thư điện tử này? +CloneContent=Nhắn Clone +CloneReceivers=Người nhận Cloner +DateLastSend=Ngày cuối cùng gửi +DateSending=Ngày gửi +SentTo=Gửi đến% s +MailingStatusRead=Đọc +CheckRead=Đọc nhận +YourMailUnsubcribeOK=Email% s là đúng unsubcribe từ danh sách gửi thư +MailtoEMail=Siêu liên kết email +ActivateCheckRead=Cho phép sử dụng "Unsubcribe" liên kết +ActivateCheckReadKey=Sử dụng chìa khóa để sử dụng mã hóa URL cho "Đọc Tiếp nhận" và "Unsubcribe" tính năng +EMailSentToNRecipients=Thư điện tử gửi đến người nhận% s. +XTargetsAdded=Người nhận% s thêm vào danh sách mục tiêu +EachInvoiceWillBeAttachedToEmail=Một tài liệu mặc định sử dụng hóa đơn mẫu tài liệu sẽ được tạo ra và gắn liền với mỗi email. +MailTopicSendRemindUnpaidInvoices=Nhắc nhở các hóa đơn% s (% s) +SendRemind=Gửi lời nhắc nhở bằng email +RemindSent=Nhắc nhở% s (s) gửi +AllRecipientSelectedForRemind=Tất cả thirdparties chọn, và nếu một email được thiết lập (lưu ý rằng một email cho mỗi hóa đơn sẽ được gửi) +NoRemindSent=Không có lời nhắc nhở gửi thư điện tử +ResultOfMassSending=Kết quả của khối lượng thư điện tử gửi nhắc nhở # Libelle des modules de liste de destinataires mailing -MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...) -MailingModuleDescDolibarrUsers=Dolibarr users -MailingModuleDescFundationMembers=Foundation members with emails -MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other) -MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) -MailingModuleDescContactsCategories=Third parties (by category) -MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines -MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category) -MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category -MailingModuleDescMembersCategories=Foundation members (by categories) -MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function) -LineInFile=Line %s in file -RecipientSelectionModules=Defined requests for recipient's selection -MailSelectedRecipients=Selected recipients -MailingArea=EMailings area -LastMailings=Last %s emailings -TargetsStatistics=Targets statistics -NbOfCompaniesContacts=Unique contacts/addresses -MailNoChangePossible=Recipients for validated emailing can't be changed -SearchAMailing=Search mailing -SendMailing=Send emailing -SendMail=Send email -SentBy=Sent by -MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: -MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. -ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. -TargetsReset=Clear list -ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing -ToAddRecipientsChooseHere=Add recipients by choosing from the lists -NbOfEMailingsReceived=Mass emailings received -NbOfEMailingsSend=Mass emailings sent -IdRecord=ID record -DeliveryReceipt=Delivery Receipt -YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients. -TagCheckMail=Track mail opening -TagUnsubscribe=Unsubscribe link -TagSignature=Signature sending user -TagMailtoEmail=Recipient EMail +MailingModuleDescContactCompanies=Liên hệ / địa chỉ của tất cả các bên thứ ba (khách hàng, khách hàng tiềm năng, nhà cung cấp, ...) +MailingModuleDescDolibarrUsers=Người sử dụng Dolibarr +MailingModuleDescFundationMembers=Thành viên sáng lập với các email +MailingModuleDescEmailsFromFile=Email từ một tập tin văn bản (email, LastName, FirstName, khác) +MailingModuleDescEmailsFromUser=Email từ người dùng nhập vào (email, LastName, FirstName, khác) +MailingModuleDescContactsCategories=Các bên thứ ba (theo thể loại) +MailingModuleDescDolibarrContractsLinesExpired=Các bên thứ ba với những đường nét hết hạn hợp đồng của +MailingModuleDescContactsByCompanyCategory=Liên hệ / địa chỉ của các bên thứ ba (theo thể loại bên thứ ba) +MailingModuleDescContactsByCategory=Liên hệ / địa chỉ của các bên thứ ba theo thể loại +MailingModuleDescMembersCategories=Thành viên sáng lập (theo loại) +MailingModuleDescContactsByFunction=Liên hệ / địa chỉ của các bên thứ ba (bởi vị trí / chức năng) +LineInFile=Dòng% s trong tập tin +RecipientSelectionModules=Yêu cầu xác định cho lựa chọn của người nhận +MailSelectedRecipients=Người nhận lựa chọn +MailingArea=Khu vực EMailings +LastMailings=Cuối% s emailings +TargetsStatistics=Mục tiêu thống kê +NbOfCompaniesContacts=Địa chỉ liên lạc duy nhất / địa chỉ +MailNoChangePossible=Người nhận các thư điện tử xác nhận không thể thay đổi +SearchAMailing=Tìm kiếm chỉ gửi thư +SendMailing=Gửi email +SendMail=Gửi email +SentBy=Gửi +MailingNeedCommand=Vì lý do an ninh, gửi các thư điện tử là tốt hơn khi thực hiện từ dòng lệnh. Nếu bạn có một, yêu cầu quản trị máy chủ của bạn để khởi động các lệnh sau đây để gửi các thư điện tử cho tất cả người nhận: +MailingNeedCommand2=Tuy nhiên bạn có thể gửi trực tuyến bằng cách thêm tham số MAILING_LIMIT_SENDBYWEB với giá trị của số lượng tối đa của các email mà bạn muốn gửi bởi phiên. Đối với điều này, hãy vào Trang chủ - Cài đặt - Loại khác. +ConfirmSendingEmailing=Nếu bạn không thể hoặc muốn gởi kèm với trình duyệt www của bạn, vui lòng xác nhận bạn có chắc bạn muốn gửi email tại từ trình duyệt của bạn? +LimitSendingEmailing=Lưu ý: Trên dòng gửi emailings được giới hạn vì lý do an ninh và thời gian chờ đến người nhận% s bằng cách gửi phiên. +TargetsReset=Xóa danh sách +ToClearAllRecipientsClickHere=Click vào đây để xóa danh sách người nhận các thư điện tử này +ToAddRecipientsChooseHere=Thêm người nhận bằng cách chọn từ danh sách +NbOfEMailingsReceived=Emailings Thánh Lễ nhận +NbOfEMailingsSend=Emailings hàng loạt gửi +IdRecord=Ghi lại ID +DeliveryReceipt=Giao hàng tận nơi nhận +YouCanUseCommaSeparatorForSeveralRecipients=Bạn có thể sử dụng dấu phân cách nhau bởi dấu phẩy để chỉ định nhiều người nhận. +TagCheckMail=Ca khúc mở đầu email +TagUnsubscribe=Liên kết Hủy đăng ký +TagSignature=Chữ ký gửi người sử dụng +TagMailtoEmail=Người nhận thư điện tử # Module Notifications -Notifications=Notifications -NoNotificationsWillBeSent=No email notifications are planned for this event and company -ANotificationsWillBeSent=1 notification will be sent by email -SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests -ListOfNotificationsDone=List all email notifications sent +Notifications=Thông báo +NoNotificationsWillBeSent=Không có thông báo email được lên kế hoạch cho sự kiện này và công ty +ANotificationsWillBeSent=1 thông báo sẽ được gửi qua email +SomeNotificationsWillBeSent=Thông báo% s sẽ được gửi qua email +AddNewNotification=Kích hoạt một yêu cầu thông báo email mới +ListOfActiveNotifications=Liệt kê tất cả các yêu cầu hoạt động thông báo qua email +ListOfNotificationsDone=Liệt kê tất cả các thông báo email gửi diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index d46a4fad93c..34c16792033 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -1,706 +1,707 @@ # Dolibarr language file - Source file is en_US - main -DIRECTION=ltr +DIRECTION=lít # Note for Chinese: # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) # stsongstdlight or cid0cs are for simplified Chinese # To read Chinese pdf with Linux: sudo apt-get install poppler-data -FONTFORPDF=DejaVuSans +FONTFORPDF=Helvetica FONTSIZEFORPDF=10 SeparatorDecimal=. -SeparatorThousand=None -FormatDateShort=%m/%d/%Y -FormatDateShortInput=%m/%d/%Y -FormatDateShortJava=MM/dd/yyyy -FormatDateShortJavaInput=MM/dd/yyyy -FormatDateShortJQuery=mm/dd/yy -FormatDateShortJQueryInput=mm/dd/yy -FormatHourShort=%I:%M %p -FormatHourShortDuration=%H:%M -FormatDateTextShort=%b %d, %Y -FormatDateText=%B %d, %Y -FormatDateHourShort=%m/%d/%Y %I:%M %p -FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p -FormatDateHourTextShort=%b %d, %Y, %I:%M %p -FormatDateHourText=%B %d, %Y, %I:%M %p -DatabaseConnection=Liên kết dữ liệu -NoTranslation=Chưa được dịch -NoRecordFound=No record found +SeparatorThousand=, +FormatDateShort=% M /% d /% Y +FormatDateShortInput=% M /% d /% Y +FormatDateShortJava=MM / dd / yyyy +FormatDateShortJavaInput=MM / dd / yyyy +FormatDateShortJQuery=dd / mm / yyyy +FormatDateShortJQueryInput=dd / mm / yyyy +FormatHourShort=% I:% M% p +FormatHourShortDuration=% H:% M +FormatDateTextShort=% B% d,% Y +FormatDateText=% B% d,% Y +FormatDateHourShort=% M /% d /% Y% I:% M% p +FormatDateHourSecShort=% M /% d /% Y% I:% M:% S% p +FormatDateHourTextShort=% B% d,% Y,% I:% M% p +FormatDateHourText=% B% d,% Y,% I:% M% p +DatabaseConnection=Kết nối cơ sở dữ liệu +NoTranslation=Không có bản dịch +NoRecordFound=Không có hồ sơ tìm thấy NoError=Không có lỗi Error=Lỗi -ErrorFieldRequired=Cần khai báo trường '%s' -ErrorFieldFormat=Trường '%s' có giá trị sai -ErrorFileDoesNotExists=Tệp %s không tồn tại -ErrorFailedToOpenFile=Lỗi mở tệp %s -ErrorCanNotCreateDir=Không thể tạo thư mục %s -ErrorCanNotReadDir=Không thể đọc thư mục %s -ErrorConstantNotDefined=Thông số %s chưa được khai báo -ErrorUnknown=Unknown error +ErrorFieldRequired=Dòng '% s' được yêu cầu +ErrorFieldFormat=Dòng '% s' có một giá trị xấu +ErrorFileDoesNotExists=Tập tin% s không tồn tại +ErrorFailedToOpenFile=Không thể mở tập tin% s +ErrorCanNotCreateDir=Không thể tạo thư mục% s +ErrorCanNotReadDir=Không thể đọc thư mục% s +ErrorConstantNotDefined=Thông số% s chưa được xác định +ErrorUnknown=Lỗi không xác định ErrorSQL=Lỗi SQL -ErrorLogoFileNotFound=Không tìm thấy tệp logo '%s' -ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this -ErrorGoToModuleSetup=Go to Module setup to fix this -ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) -ErrorAttachedFilesDisabled=File attaching is disabled on this server -ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory. -ErrorInternalErrorDetected=Error detected -ErrorNoRequestRan=No request ran -ErrorWrongHostParameter=Wrong host parameter -ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. -ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records. -ErrorWrongValue=Wrong value -ErrorWrongValueForParameterX=Wrong value for parameter %s -ErrorNoRequestInError=No request in error -ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later. -ErrorDuplicateField=Duplicate value in a unique field -ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes. -ErrorConfigParameterNotDefined=Parameter %s is not defined inside Dolibarr config file conf.php. -ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr database. -ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. -ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. -ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. -SetDate=Set date -SelectDate=Select a date -SeeAlso=See also %s -BackgroundColorByDefault=Default background color -FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. -NbOfEntries=Nb of entries -GoToWikiHelpPage=Read online help (need Internet access) -GoToHelpPage=Read help -RecordSaved=Record saved -RecordDeleted=Record deleted -LevelOfFeature=Level of features -NotDefined=Not defined -DefinedAndHasThisValue=Defined and value to -IsNotDefined=undefined -DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. -Administrator=Administrator -Undefined=Undefined -PasswordForgotten=Password forgotten ? -SeeAbove=See above -HomeArea=Home area -LastConnexion=Last connection -PreviousConnexion=Previous connection -ConnectedOnMultiCompany=Connected on environment -ConnectedSince=Connected since -AuthenticationMode=Authentification mode -RequestedUrl=Requested Url -DatabaseTypeManager=Database type manager -RequestLastAccess=Request for last database access -RequestLastAccessInError=Request for last database access in error -ReturnCodeLastAccessInError=Return code for last database access in error -InformationLastAccessInError=Information for last database access in error -DolibarrHasDetectedError=Dolibarr has detected a technical error -InformationToHelpDiagnose=This is information that can help diagnostic -MoreInformation=More information -TechnicalInformation=Technical information -NotePublic=Note (public) -NotePrivate=Note (private) -PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. -DoTest=Test -ToFilter=Filter -WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. -yes=yes -Yes=Yes -no=no -No=No +ErrorLogoFileNotFound=Logo tập tin '% s' không được tìm thấy +ErrorGoToGlobalSetup=Đi đến 'Công ty / cơ sở "thiết lập để sửa lỗi này +ErrorGoToModuleSetup=Tới Học phần thiết lập để sửa lỗi này +ErrorFailedToSendMail=Không thể gửi thư (người gửi =% s, thu =% s) +ErrorAttachedFilesDisabled=Tập tin đính bị vô hiệu hóa trên máy chủ này +ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có đã là một tập tin có cùng tên trong thư mục này. +ErrorInternalErrorDetected=Lỗi được phát hiện +ErrorNoRequestRan=Không có yêu cầu chạy +ErrorWrongHostParameter=Tham số máy chủ sai +ErrorYourCountryIsNotDefined=Đất nước các bạn không được xác định. Đi đến Trang chủ-Setup-Chỉnh sửa và đăng lại hình thức. +ErrorRecordIsUsedByChild=Không thể xóa hồ sơ này. Kỷ lục này được sử dụng bởi ít nhất một hồ sơ trẻ em. +ErrorWrongValue=Giá trị sai +ErrorWrongValueForParameterX=Giá trị sai cho tham số% s +ErrorNoRequestInError=Không yêu cầu trong báo lỗi +ErrorServiceUnavailableTryLater=Dịch vụ không sẵn sàng cho thời điểm này. Hãy thử lại sau. +ErrorDuplicateField=Giá trị nhân bản trong một lĩnh vực duy nhất +ErrorSomeErrorWereFoundRollbackIsDone=Một số lỗi đã được tìm thấy. Chúng tôi rollback thay đổi. +ErrorConfigParameterNotDefined=Thông số% s không được định nghĩa trong tập tin cấu hình Dolibarr conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Không thể tìm thấy người dùng% s trong cơ sở dữ liệu Dolibarr. +ErrorNoVATRateDefinedForSellerCountry=Lỗi, không có giá vat xác định cho đất nước '% s'. +ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại đóng góp xã hội được xác định cho đất nước '% s'. +ErrorFailedToSaveFile=Lỗi, không lưu tập tin. +ErrorOnlyPngJpgSupported=Lỗi, chỉ Png và .jpg tập tin định dạng hình ảnh được hỗ trợ. +ErrorImageFormatNotSupported=PHP của bạn không hỗ trợ chức năng để chuyển đổi hình ảnh của định dạng này. +SetDate=Thiết lập ngày +SelectDate=Chọn một ngày +SeeAlso=Xem thêm% s +BackgroundColorByDefault=Màu mặc định nền +FileWasNotUploaded=Một tập tin được lựa chọn để đính kèm nhưng vẫn chưa được tải lên. Bấm vào nút "Đính kèm tập tin" cho việc này. +NbOfEntries=Nb các mục +GoToWikiHelpPage=Đọc trợ giúp trực tuyến (cần truy cập Internet) +GoToHelpPage=Đọc giúp đỡ +RecordSaved=Ghi lưu +RecordDeleted=Ghi lại bị xóa +LevelOfFeature=Mức độ tính năng +NotDefined=Không xác định +DefinedAndHasThisValue=Xác định và giá trị +IsNotDefined=không xác định +DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập để% s trong tập tin cấu hình conf.php.
Điều này có nghĩa rằng cơ sở dữ liệu mật khẩu là ở ngoài để Dolibarr, vì vậy thay đổi lĩnh vực này có thể không có tác dụng. +Administrator=Quản trị viên +Undefined=Không xác định +PasswordForgotten=Mật khẩu đã quên? +SeeAbove=Xem ở trên +HomeArea=Khu vực nhà +LastConnexion=Kết nối cuối +PreviousConnexion=Kết nối trước +ConnectedOnMultiCompany=Kết nối trên môi trường +ConnectedSince=Kết nối từ +AuthenticationMode=Chế độ xác thực +RequestedUrl=Url yêu cầu +DatabaseTypeManager=Loại cơ sở dữ liệu quản lý +RequestLastAccess=Yêu cầu truy cập cơ sở dữ liệu mới nhất +RequestLastAccessInError=Yêu cầu cuối cùng truy cập cơ sở dữ liệu lỗi +ReturnCodeLastAccessInError=Quay trở lại mã cho cuối cùng truy cập cơ sở dữ liệu lỗi +InformationLastAccessInError=Thông tin cho cơ sở dữ liệu truy cập cuối cùng lỗi +DolibarrHasDetectedError=Dolibarr đã phát hiện một lỗi kỹ thuật +InformationToHelpDiagnose=Đây là thông tin có thể giúp chẩn đoán +MoreInformation=Thông tin chi tiết +TechnicalInformation=Thông tin kỹ thuật +NotePublic=Lưu ý (công cộng) +NotePrivate=Lưu ý (tư nhân) +PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để hạn chế độ chính xác của các đơn giá cho% s thập phân. +DoTest=Kiểm tra +ToFilter=Lọc +WarningYouHaveAtLeastOneTaskLate=Cảnh báo, bạn có ít nhất một yếu tố đó đã vượt quá sự chậm trễ khoan dung. +yes=có +Yes=Có +no=không có +No=Không có All=Tất cả -Home=Home -Help=Help -OnlineHelp=Online help -PageWiki=Wiki page -Always=Always -Never=Never -Under=under -Period=Period -PeriodEndDate=End date for period -Activate=Activate -Activated=Activated -Closed=Closed -Closed2=Closed -Enabled=Enabled -Deprecated=Deprecated -Disable=Disable -Disabled=Disabled -Add=Add -AddLink=Add link -Update=Update -AddActionToDo=Add event to do -AddActionDone=Add event done -Close=Close -Close2=Close -Confirm=Confirm -ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s ? -Delete=Delete -Remove=Remove +Home=Trang chủ +Help=Trợ giúp +OnlineHelp=Hỗ trợ trực tuyến +PageWiki=Trang wiki +Always=Luôn luôn +Never=Không bao giờ +Under=dưới +Period=Thời gian +PeriodEndDate=Ngày kết thúc trong khoảng thời gian +Activate=Kích hoạt +Activated=Kích hoạt +Closed=Đóng +Closed2=Đóng +Enabled=Bật +Deprecated=Phản đối +Disable=Vô hiệu hoá +Disabled=Người khuyết tật +Add=Thêm +AddLink=Thêm liên kết +Update=Cập nhật +AddActionToDo=Thêm sự kiện vào làm +AddActionDone=Thêm sự kiện thực hiện +Close=Đóng +Close2=Đóng +Confirm=Xác nhận +ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này qua đường bưu điện đến% s? +Delete=Xóa +Remove=Hủy bỏ Resiliate=Resiliate -Cancel=Cancel -Modify=Modify -Edit=Edit -Validate=Validate -ToValidate=To validate -Save=Save +Cancel=Hủy bỏ +Modify=Sửa đổi +Edit=Chỉnh sửa +Validate=Xác nhận +ToValidate=Để xác nhận +Save=Lưu SaveAs=Save As -TestConnection=Test connection +TestConnection=Kết nối thử nghiệm ToClone=Clone -ConfirmClone=Choose data you want to clone : -NoCloneOptionsSpecified=No data to clone defined. -Of=of -Go=Go +ConfirmClone=Chọn dữ liệu bạn muốn sao chép: +NoCloneOptionsSpecified=Không có dữ liệu để sao lưu được xác định. +Of=của +Go=Tới Run=Run -CopyOf=Copy of -Show=Show -ShowCardHere=Show card -Search=Search -SearchOf=Search -Valid=Valid -Approve=Approve +CopyOf=Bản sao +Show=Hiện +ShowCardHere=Hiện thẻ +Search=Tìm kiếm +SearchOf=Tìm kiếm +Valid=Hợp lệ +Approve=Phê duyệt ReOpen=Re-Open -Upload=Send file -ToLink=Link -Select=Select -Choose=Choose -ChooseLangage=Please choose your language -Resize=Resize +Upload=Gửi tập tin +ToLink=Liên kết +Select=Chọn +Choose=Chọn +ChooseLangage=Vui lòng chọn ngôn ngữ của bạn +Resize=Thay đổi kích thước Recenter=Recenter -Author=Author -User=User -Users=Users -Group=Group -Groups=Groups -Password=Password -PasswordRetype=Retype your password -NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. -Name=Name -Person=Person -Parameter=Parameter -Parameters=Parameters -Value=Value -GlobalValue=Global value -PersonalValue=Personal value -NewValue=New value -CurrentValue=Current value -Code=Code -Type=Type -Language=Language -MultiLanguage=Multi-language -Note=Note -CurrentNote=Current note -Title=Title -Label=Label -RefOrLabel=Ref. or label -Info=Log -Family=Family -Description=Description -Designation=Description -Model=Model -DefaultModel=Default model -Action=Event -About=About -Number=Number -NumberByMonth=Number by month -AmountByMonth=Amount by month -Numero=Number -Limit=Limit -Limits=Limits -DevelopmentTeam=Development Team -Logout=Logout -NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s -Connection=Connection -Setup=Cài đặt -Alert=Alert -Previous=Previous -Next=Next -Cards=Cards -Card=Card -Now=Now -Date=Date -DateStart=Date start -DateEnd=Date end -DateCreation=Creation date -DateModification=Modification date -DateModificationShort=Modif. date -DateLastModification=Last modification date -DateValidation=Validation date -DateClosing=Closing date -DateDue=Due date -DateValue=Value date -DateValueShort=Value date -DateOperation=Operation date -DateOperationShort=Oper. Date -DateLimit=Limit date -DateRequest=Request date -DateProcess=Process date -DatePlanShort=Date planed -DateRealShort=Date real. -DateBuild=Report build date -DatePayment=Date of payment -DurationYear=year -DurationMonth=month -DurationWeek=week -DurationDay=day -DurationYears=years -DurationMonths=months -DurationWeeks=weeks -DurationDays=days -Year=Year -Month=Month -Week=Week -Day=Day -Hour=Hour -Minute=Minute -Second=Second -Years=Years -Months=Months -Days=Days -days=days -Hours=Hours -Minutes=Minutes -Seconds=Seconds -Today=Today -Yesterday=Yesterday -Tomorrow=Tomorrow -Morning=Morning -Afternoon=Afternoon +Author=Tác giả +User=Người sử dụng +Users=Người sử dụng +Group=Nhóm +Groups=Nhóm +Password=Mật khẩu +PasswordRetype=Nhập lại mật khẩu của bạn +NoteSomeFeaturesAreDisabled=Lưu ý rằng rất nhiều tính năng / modules bị vô hiệu hóa trong trình diễn này. +Name=Tên +Person=Người +Parameter=Thông số +Parameters=Các thông số +Value=Giá trị +GlobalValue=Giá trị toàn cầu +PersonalValue=Giá trị cá nhân +NewValue=Giá trị mới +CurrentValue=Giá trị hiện tại +Code=Mã +Type=Loại +Language=Ngôn ngữ +MultiLanguage=Đa ngôn ngữ +Note=Lưu ý +CurrentNote=Lưu ý hiện tại +Title=Tiêu đề +Label=Nhãn +RefOrLabel=Tài liệu tham khảo. hay nhãn hiệu +Info=Đăng nhập +Family=Gia đình +Description=Mô tả +Designation=Mô tả +Model=Mô hình +DefaultModel=Mô hình mặc định +Action=Sự kiện +About=Về +Number=Số +NumberByMonth=Số theo tháng +AmountByMonth=Số tiền theo tháng +Numero=Số +Limit=Giới hạn +Limits=Giới hạn +DevelopmentTeam=Nhóm phát triển +Logout=Đăng xuất +NoLogoutProcessWithAuthMode=Không có tính năng ngắt kết nối applicative với chế độ xác thực% s +Connection=Kết nối +Setup=Thiết lập +Alert=Báo +Previous=Trước +Next=Tiếp theo +Cards=Thẻ +Card=Thẻ +Now=Bây giờ +Date=Ngày +DateStart=Ngày bắt đầu +DateEnd=Ngày kết thúc +DateCreation=Ngày tạo +DateModification=Ngày sửa đổi +DateModificationShort=Modif. ngày +DateLastModification=Cuối ngày sửa đổi +DateValidation=Ngày xác nhận +DateClosing=Ngày kết thúc +DateDue=Ngày đáo hạn +DateValue=Giá trị ngày +DateValueShort=Giá trị ngày +DateOperation=Ngày hoạt động +DateOperationShort=Oper. Ngày +DateLimit=Giới hạn ngày +DateRequest=Ngày yêu cầu +DateProcess=Ngày quá trình +DatePlanShort=Ngày bào +DateRealShort=Ngày thực. +DateBuild=Báo cáo xây dựng ngày +DatePayment=Ngày thanh toán +DurationYear=năm +DurationMonth=tháng +DurationWeek=tuần +DurationDay=ngày +DurationYears=năm +DurationMonths=tháng +DurationWeeks=tuần +DurationDays=ngày +Year=Năm +Month=Tháng +Week=Tuần +Day=Ngày +Hour=Giờ +Minute=Phút +Second=Thứ hai +Years=Năm +Months=Tháng +Days=Ngày +days=ngày +Hours=Giờ +Minutes=Phút +Seconds=Giây +Today=Hôm nay +Yesterday=Hôm qua +Tomorrow=Ngày mai +Morning=Buổi sáng +Afternoon=Chiều Quadri=Quadri -MonthOfDay=Month of the day +MonthOfDay=Tháng ngày HourShort=H -Rate=Rate -UseLocalTax=Include tax +Rate=Tỷ giá +UseLocalTax=Bao gồm thuế Bytes=Bytes -KiloBytes=Kilobytes -MegaBytes=Megabytes -GigaBytes=Gigabytes -TeraBytes=Terabytes +KiloBytes=Kilobyte +MegaBytes=MB +GigaBytes=Gigabyte +TeraBytes=Terabyte b=b. Kb=Kb Mb=Mb Gb=Gb Tb=Tb Cut=Cut -Copy=Copy -Paste=Paste -Default=Default -DefaultValue=Default value -DefaultGlobalValue=Global value -Price=Price -UnitPrice=Unit price -UnitPriceHT=Unit price (net) -UnitPriceTTC=Unit price -PriceU=U.P. -PriceUHT=U.P. (net) -PriceUTTC=U.P. -Amount=Amount -AmountInvoice=Invoice amount -AmountPayment=Payment amount -AmountHTShort=Amount (net) -AmountTTCShort=Amount (inc. tax) -AmountHT=Amount (net of tax) -AmountTTC=Amount (inc. tax) -AmountVAT=Amount tax -AmountLT1=Amount tax 2 -AmountLT2=Amount tax 3 -AmountLT1ES=Amount RE -AmountLT2ES=Amount IRPF -AmountTotal=Total amount -AmountAverage=Average amount -PriceQtyHT=Price for this quantity (net of tax) -PriceQtyMinHT=Price quantity min. (net of tax) -PriceQtyTTC=Price for this quantity (inc. tax) -PriceQtyMinTTC=Price quantity min. (inc. of tax) -Percentage=Percentage -Total=Total -SubTotal=Subtotal -TotalHTShort=Total (net) -TotalTTCShort=Total (inc. tax) -TotalHT=Total (net of tax) -TotalHTforthispage=Total (net of tax) for this page -TotalTTC=Total (inc. tax) -TotalTTCToYourCredit=Total (inc. tax) to your credit -TotalVAT=Total tax -TotalLT1=Total tax 2 -TotalLT2=Total tax 3 -TotalLT1ES=Total RE -TotalLT2ES=Total IRPF -IncludedVAT=Included tax -HT=Net of tax -TTC=Inc. tax -VAT=Sales tax +Copy=Sao chép +Paste=Dán +Default=Mặc định +DefaultValue=Giá trị mặc định +DefaultGlobalValue=Giá trị toàn cầu +Price=Giá +UnitPrice=Đơn giá +UnitPriceHT=Đơn giá (net) +UnitPriceTTC=Đơn giá +PriceU=UP +PriceUHT=UP (net) +PriceUTTC=UP +Amount=Số tiền +AmountInvoice=Lượng hóa đơn +AmountPayment=Số tiền thanh toán +AmountHTShort=Số tiền (ròng) +AmountTTCShort=(Bao gồm thuế). Số tiền +AmountHT=Số tiền (đã trừ thuế) +AmountTTC=(Bao gồm thuế). Số tiền +AmountVAT=Số tiền thuế +AmountLT1=Số tiền thuế 2 +AmountLT2=Số tiền thuế 3 +AmountLT1ES=Số tiền RE +AmountLT2ES=Số tiền IRPF +AmountTotal=Tổng số tiền +AmountAverage=Số tiền trung bình +PriceQtyHT=Giá cho số lượng này (đã trừ thuế) +PriceQtyMinHT=Giá số lượng phút. (Đã trừ thuế) +PriceQtyTTC=Giá cho số lượng (bao thuế). Này +PriceQtyMinTTC=Giá số lượng phút. (Inc. Thuế) +Percentage=Tỷ lệ phần trăm +Total=Tổng số +SubTotal=Tổng số tiền +TotalHTShort=Tổng số (net) +TotalTTCShort=(Bao gồm thuế). Tổng số +TotalHT=Tổng số (đã trừ thuế) +TotalHTforthispage=Tổng số (đã trừ thuế) cho trang này +TotalTTC=(Bao gồm thuế). Tổng số +TotalTTCToYourCredit=Tổng số (inc. Thuế) để tín dụng của bạn +TotalVAT=Tổng số thuế +TotalLT1=Tổng số thuế 2 +TotalLT2=Tổng số thuế 3 +TotalLT1ES=Tổng RE +TotalLT2ES=Tổng số IRPF +IncludedVAT=Đã bao gồm thuế +HT=Sau thuế +TTC=Inc thuế +VAT=Thuế bán hàng LT1ES=RE LT2ES=IRPF -VATRate=Tax Rate -Average=Average +VATRate=Thuế suất +Average=Trung bình Sum=Sum Delta=Delta -Module=Module -Option=Option -List=List -FullList=Full list -Statistics=Statistics -OtherStatistics=Other statistics -Status=Status -ShortInfo=Info. -Ref=Ref. -RefSupplier=Ref. supplier -RefPayment=Ref. payment -CommercialProposalsShort=Commercial proposals -Comment=Comment -Comments=Comments -ActionsToDo=Events to do -ActionsDone=Events done -ActionsToDoShort=To do -ActionsRunningshort=Started -ActionsDoneShort=Done -ActionNotApplicable=Not applicable -ActionRunningNotStarted=To start -ActionRunningShort=Started -ActionDoneShort=Finished +Module=Mô-đun +Option=Lựa chọn +List=Danh sách +FullList=Danh mục đầy đủ +Statistics=Thống kê +OtherStatistics=Số liệu thống kê khác +Status=Tình trạng +ShortInfo=Thông tin. +Ref=Tài liệu tham khảo. +RefSupplier=Tài liệu tham khảo. nhà cung cấp +RefPayment=Tài liệu tham khảo. thanh toán +CommercialProposalsShort=Đề nghị thương mại +Comment=Nhận xét +Comments=Bình luận +ActionsToDo=Sự kiện làm +ActionsDone=Sự kiện thực hiện +ActionsToDoShort=Để làm +ActionsRunningshort=Bắt đầu +ActionsDoneShort=Xong +ActionNotApplicable=Không áp dụng +ActionRunningNotStarted=Để bắt đầu +ActionRunningShort=Bắt đầu +ActionDoneShort=Hoàn thành ActionUncomplete=Uncomplete -CompanyFoundation=Company/Foundation -ContactsForCompany=Contacts for this third party -ContactsAddressesForCompany=Contacts/addresses for this third party -AddressesForCompany=Addresses for this third party -ActionsOnCompany=Events about this third party -ActionsOnMember=Events about this member -NActions=%s events -NActionsLate=%s late -Filter=Filter -RemoveFilter=Remove filter -ChartGenerated=Chart generated -ChartNotGenerated=Chart not generated -GeneratedOn=Build on %s -Generate=Generate -Duration=Duration -TotalDuration=Total duration -Summary=Summary -MyBookmarks=My bookmarks -OtherInformationsBoxes=Other information boxes -DolibarrBoard=Dolibarr board -DolibarrStateBoard=Statistics -DolibarrWorkBoard=Work tasks board -Available=Available -NotYetAvailable=Not yet available -NotAvailable=Not available -Popularity=Popularity -Categories=Categories -Category=Category +CompanyFoundation=Công ty / cơ sở +ContactsForCompany=Liên hệ với bên thứ ba này +ContactsAddressesForCompany=Liên hệ / địa chỉ cho các bên thứ ba này +AddressesForCompany=Địa chỉ cho các bên thứ ba này +ActionsOnCompany=Sự kiện về bên thứ ba này +ActionsOnMember=Sự kiện về thành viên này +NActions=Sự kiện% s +NActionsLate=% S cuối +Filter=Lọc +RemoveFilter=Bỏ bộ lọc +ChartGenerated=Biểu đồ được tạo ra +ChartNotGenerated=Biểu đồ không được tạo ra +GeneratedOn=Xây dựng trên% s +Generate=Tạo +Duration=Thời gian +TotalDuration=Tổng thời gian +Summary=Tóm tắt +MyBookmarks=Dấu trang của tôi +OtherInformationsBoxes=Hộp thông tin khác +DolibarrBoard=Ban Dolibarr +DolibarrStateBoard=Thống kê +DolibarrWorkBoard=Nhiệm vụ công việc của hội đồng quản trị +Available=Có sẵn +NotYetAvailable=Chưa có +NotAvailable=Không có sẵn +Popularity=Phổ biến +Categories=Loại +Category=Danh mục By=By -From=From -to=to -and=and -or=or -Other=Other -Others=Others -OtherInformations=Other informations -Quantity=Quantity -Qty=Qty -ChangedBy=Changed by -ReCalculate=Recalculate -ResultOk=Success -ResultKo=Failure -Reporting=Reporting -Reportings=Reporting -Draft=Draft -Drafts=Drafts -Validated=Validated -Opened=Opened -New=New -Discount=Discount -Unknown=Chưa rõ -General=General -Size=Size -Received=Received -Paid=Paid +From=Từ +to=để +and=và +or=hoặc +Other=Khác +Others=Loại khác +OtherInformations=Thông tin khác +Quantity=Số lượng +Qty=Số lượng +ChangedBy=Thay đổi bằng cách +ReCalculate=Tính toán lại +ResultOk=Thành công +ResultKo=Không +Reporting=Báo cáo +Reportings=Báo cáo +Draft=Dự thảo +Drafts=Dự thảo +Validated=Xác nhận +Opened=Mở +New=Mới +Discount=Giảm giá +Unknown=Không biết +General=Chung +Size=Kích thước +Received=Nhận +Paid=Trả Topic=Sujet -ByCompanies=By third parties -ByUsers=By users -Links=Links -Link=Link -Receipts=Receipts +ByCompanies=Do các bên thứ ba +ByUsers=Người sử dụng +Links=Liên kết +Link=Liên kết +Receipts=Tiền thu Rejects=Rejects -Preview=Preview -NextStep=Next step -PreviousStep=Previous step -Datas=Data -None=None -NoneF=None -Late=Late -Photo=Picture -Photos=Pictures -AddPhoto=Add picture -Login=Login -CurrentLogin=Current login -January=January -February=February -March=March -April=April +Preview=Xem trước +NextStep=Bước tiếp theo +PreviousStep=Bước trước +Datas=Dữ liệu +None=Không +NoneF=Không +Late=Cuối +Photo=Hình ảnh +Photos=Hình ảnh +AddPhoto=Thêm hình ảnh +Login=Đăng nhập +CurrentLogin=Đăng nhập hiện tại +January=Tháng một +February=Tháng Hai +March=Tháng +April=Tháng Tư May=May -June=June -July=July -August=August -September=September -October=October -November=November -December=December +June=Tháng Sáu +July=Tháng Bảy +August=Tháng Tám +September=Tháng Chín +October=Tháng Mười +November=Tháng mười một +December=Tháng Mười Hai JanuaryMin=Jan -FebruaryMin=Feb +FebruaryMin=Tháng Hai MarchMin=Mar -AprilMin=Apr +AprilMin=Tháng Tư MayMin=May -JuneMin=Jun -JulyMin=Jul -AugustMin=Aug -SeptemberMin=Sep -OctoberMin=Oct -NovemberMin=Nov -DecemberMin=Dec -Month01=January -Month02=February -Month03=March -Month04=April +JuneMin=Tháng Sáu +JulyMin=Tháng Bảy +AugustMin=Tháng Tám +SeptemberMin=Tháng Chín +OctoberMin=Tháng Mười +NovemberMin=Tháng mười một +DecemberMin=Tháng Mười Hai +Month01=Tháng một +Month02=Tháng Hai +Month03=Tháng +Month04=Tháng Tư Month05=May -Month06=June -Month07=July -Month08=August -Month09=September -Month10=October -Month11=November -Month12=December +Month06=Tháng Sáu +Month07=Tháng Bảy +Month08=Tháng Tám +Month09=Tháng Chín +Month10=Tháng Mười +Month11=Tháng mười một +Month12=Tháng Mười Hai MonthShort01=Jan -MonthShort02=Feb +MonthShort02=Tháng Hai MonthShort03=Mar -MonthShort04=Apr +MonthShort04=Tháng Tư MonthShort05=May -MonthShort06=Jun -MonthShort07=Jul -MonthShort08=Aug -MonthShort09=Sep -MonthShort10=Oct -MonthShort11=Nov -MonthShort12=Dec -AttachedFiles=Attached files and documents -FileTransferComplete=File was uploaded successfuly +MonthShort06=Tháng Sáu +MonthShort07=Tháng Bảy +MonthShort08=Tháng Tám +MonthShort09=Tháng Chín +MonthShort10=Tháng Mười +MonthShort11=Tháng mười một +MonthShort12=Tháng Mười Hai +AttachedFiles=Tập tin và tài liệu kèm theo +FileTransferComplete=Tập tin đã được tải lên successfuly DateFormatYYYYMM=YYYY-MM DateFormatYYYYMMDD=YYYY-MM-DD -DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS -ReportName=Report name -ReportPeriod=Report period -ReportDescription=Description -Report=Report -Keyword=Mot clé -Legend=Legend -FillTownFromZip=Fill city from zip -Fill=Fill -Reset=Reset -ShowLog=Show log -File=File -Files=Files -NotAllowed=Not allowed -ReadPermissionNotAllowed=Read permission not allowed -AmountInCurrency=Amount in %s currency -Example=Example -Examples=Examples -NoExample=No example -FindBug=Report a bug -NbOfThirdParties=Number of third parties -NbOfCustomers=Number of customers -NbOfLines=Number of lines -NbOfObjects=Number of objects -NbOfReferers=Number of referrers -Referers=Refering objects -TotalQuantity=Total quantity -DateFromTo=From %s to %s -DateFrom=From %s -DateUntil=Until %s -Check=Check -Internal=Internal -External=External -Internals=Internal -Externals=External -Warning=Warning -Warnings=Warnings -BuildPDF=Build PDF -RebuildPDF=Rebuild PDF -BuildDoc=Build Doc -RebuildDoc=Rebuild Doc -Entity=Environment -Entities=Entities -EventLogs=Logs -CustomerPreview=Customer preview -SupplierPreview=Supplier preview -AccountancyPreview=Accountancy preview -ShowCustomerPreview=Show customer preview -ShowSupplierPreview=Show supplier preview -ShowAccountancyPreview=Show accountancy preview -ShowProspectPreview=Show prospect preview -RefCustomer=Ref. customer -Currency=Currency -InfoAdmin=Information for administrators -Undo=Undo -Redo=Redo -ExpandAll=Expand all -UndoExpandAll=Undo expand -Reason=Reason -FeatureNotYetSupported=Feature not yet supported -CloseWindow=Close window -Question=Question -Response=Response -Priority=Priority -SendByMail=Send by EMail -MailSentBy=Email sent by -TextUsedInTheMessageBody=Email body -SendAcknowledgementByMail=Send Ack. by email -NoEMail=No email -NoMobilePhone=No mobile phone -Owner=Owner -DetectedVersion=Detected version -FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. -Refresh=Refresh -BackToList=Back to list -GoBack=Go back -CanBeModifiedIfOk=Can be modified if valid -CanBeModifiedIfKo=Can be modified if not valid -RecordModifiedSuccessfully=Record modified successfully -RecordsModified=%s records modified -AutomaticCode=Automatic code -NotManaged=Not managed -FeatureDisabled=Feature disabled -MoveBox=Move box %s -Offered=Offered -NotEnoughPermissions=You don't have permission for this action -SessionName=Session name -Method=Method -Receive=Receive -PartialWoman=Partial -PartialMan=Partial -TotalWoman=Total -TotalMan=Total -NeverReceived=Never received -Canceled=Canceled -YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary -Color=Color -Documents=Linked files -DocumentsNb=Linked files (%s) -Documents2=Documents -BuildDocuments=Generated documents -UploadDisabled=Upload disabled -MenuECM=Documents +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS +ReportName=Tên báo cáo +ReportPeriod=Kỳ báo cáo +ReportDescription=Mô tả +Report=Báo cáo +Keyword=Một Clé +Legend=Huyền thoại +FillTownFromZip=Điền vào thành phố từ zip +Fill=Điền +Reset=Thiết lập lại +ShowLog=Hiển thị bản ghi +File=Tập tin +Files=Tập tin +NotAllowed=Không được phép +ReadPermissionNotAllowed=Cho phép đọc không được phép +AmountInCurrency=Số tiền tệ trong% s +Example=Ví dụ +Examples=Ví dụ +NoExample=Không có ví dụ +FindBug=Thông báo lỗi +NbOfThirdParties=Số của bên thứ ba +NbOfCustomers=Số lượng khách hàng +NbOfLines=Số dòng +NbOfObjects=Số đối tượng +NbOfReferers=Số referrers +Referers=Đề cập đối tượng +TotalQuantity=Tổng số lượng +DateFromTo=Từ% s đến% s +DateFrom=Từ% s +DateUntil=Cho đến% s +Check=Kiểm tra +Internal=Nội bộ +External=Bên ngoài +Internals=Nội bộ +Externals=Bên ngoài +Warning=Cảnh báo +Warnings=Cảnh báo +BuildPDF=Xây dựng PDF +RebuildPDF=Xây dựng lại định dạng file pdf +BuildDoc=Xây dựng Doc +RebuildDoc=Xây dựng lại Doc +Entity=Môi trường +Entities=Các đối tượng +EventLogs=Bản ghi +CustomerPreview=Xem trước của khách hàng +SupplierPreview=Nhà cung cấp bản xem trước +AccountancyPreview=Kế toán xem trước +ShowCustomerPreview=Hiện khách hàng xem trước +ShowSupplierPreview=Hiện nhà cung cấp xem trước +ShowAccountancyPreview=Hiện kế toán xem trước +ShowProspectPreview=Hiện khách hàng tiềm năng xem trước +RefCustomer=Tài liệu tham khảo. khách hàng +Currency=Ngoại tệ +InfoAdmin=Thông tin dành cho quản trị viên +Undo=Hoàn tác +Redo=Làm lại +ExpandAll=Mở rộng tất cả +UndoExpandAll=Hoàn tác mở rộng +Reason=Lý do +FeatureNotYetSupported=Tính năng chưa được hỗ trợ +CloseWindow=Đóng cửa sổ +Question=Câu hỏi +Response=Phản ứng +Priority=Ưu tiên +SendByMail=Gửi bởi Thư điện tử +MailSentBy=Email gửi +TextUsedInTheMessageBody=Email cơ thể +SendAcknowledgementByMail=Gửi Ack. qua email +NoEMail=Không có email +NoMobilePhone=Không có điện thoại di động +Owner=Chủ sở hữu +DetectedVersion=Phiên bản phát hiện +FollowingConstantsWillBeSubstituted=Các hằng số sau đây sẽ được thay thế bằng giá trị tương ứng. +Refresh=Làm mới +BackToList=Trở lại danh sách +GoBack=Quay trở lại +CanBeModifiedIfOk=Có thể được sửa đổi nếu hợp lệ +CanBeModifiedIfKo=Có thể được sửa đổi nếu không hợp lệ +RecordModifiedSuccessfully=Ghi lại đổi thành công +RecordsModified=Hồ sơ% s sửa đổi +AutomaticCode=Mã tự động +NotManaged=Không quản lý +FeatureDisabled=Tính năng bị vô hiệu hóa +MoveBox=Di chuyển hộp% s +Offered=Cung cấp +NotEnoughPermissions=Bạn không có quyền cho hành động này +SessionName=Tên phiên +Method=Phương pháp +Receive=Nhận +PartialWoman=Một phần +PartialMan=Một phần +TotalWoman=Tổng số +TotalMan=Tổng số +NeverReceived=Không bao giờ nhận được +Canceled=Hủy bỏ +YouCanChangeValuesForThisListFromDictionarySetup=Bạn có thể thay đổi giá trị cho danh sách này từ trình đơn thiết lập - từ điển +Color=Màu +Documents=Tập tin liên kết +DocumentsNb=Các tập tin liên kết (% s) +Documents2=Tài liệu +BuildDocuments=Các tài liệu được tạo ra +UploadDisabled=Tải khuyết tật +MenuECM=Tài liệu MenuAWStats=AWStats -MenuMembers=Members -MenuAgendaGoogle=Google agenda -ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb -NoFileFound=No documents saved in this directory -CurrentUserLanguage=Current language -CurrentTheme=Current theme -CurrentMenuManager=Current menu manager -DisabledModules=Disabled modules -For=For -ForCustomer=For customer -Signature=Signature -HidePassword=Show command with password hidden -UnHidePassword=Show real command with clear password -Root=Root -Informations=Informations -Page=Page -Notes=Notes -AddNewLine=Add new line -AddFile=Add file -ListOfFiles=List of available files -FreeZone=Free entry -FreeLineOfType=Free entry of type -CloneMainAttributes=Clone object with its main attributes +MenuMembers=Thành viên +MenuAgendaGoogle=Chương trình nghị sự của Google +ThisLimitIsDefinedInSetup=Hạn Dolibarr (Menu nhà thiết lập bảo mật):% s Kb, PHP giới hạn:% s Kb +NoFileFound=Không có tài liệu được lưu trong thư mục này +CurrentUserLanguage=Ngôn ngữ hiện tại +CurrentTheme=Chủ đề hiện tại +CurrentMenuManager=Quản lý trình đơn hiện tại +DisabledModules=Module khuyết tật +For=Đối với +ForCustomer=Đối với khách hàng +Signature=Chữ ký +HidePassword=Hiện lệnh với mật khẩu ẩn +UnHidePassword=Hiển thị lệnh thực với mật khẩu rõ ràng +Root=Gốc +Informations=Thông tin +Page=Trang +Notes=Ghi chú +AddNewLine=Thêm dòng mới +AddFile=Thêm tập tin +ListOfFiles=Danh sách các tập tin có sẵn +FreeZone=Vào cửa miễn phí +FreeLineOfType=Nhập miễn phí các loại +CloneMainAttributes=Clone đối tượng với các thuộc tính chính của nó PDFMerge=PDF Merge -Merge=Merge -PrintContentArea=Show page to print main content area -MenuManager=Menu manager -NoMenu=No sub-menu -WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. -CoreErrorTitle=System error -CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator. -CreditCard=Credit card -FieldsWithAreMandatory=Fields with %s are mandatory -FieldsWithIsForPublic=Fields with %s are shown on public list of members. If you don't want this, check off the "public" box. -AccordingToGeoIPDatabase=(according to GeoIP convertion) -Line=Line -NotSupported=Not supported -RequiredField=Required field -Result=Result -ToTest=Test -ValidateBefore=Card must be validated before using this feature -Visibility=Visibility -Private=Private -Hidden=Hidden -Resources=Resources -Source=Source -Prefix=Prefix -Before=Before -After=After -IPAddress=IP address -Frequency=Frequency -IM=Instant messaging -NewAttribute=New attribute -AttributeCode=Attribute code -OptionalFieldsSetup=Extra attributes setup -URLPhoto=URL of photo/logo -SetLinkToThirdParty=Link to another third party -CreateDraft=Create draft -ClickToEdit=Click to edit -ObjectDeleted=Object %s deleted -ByCountry=By country -ByTown=By town -ByDate=By date -ByMonthYear=By month/year -ByYear=By year -ByMonth=By month -ByDay=By day -BySalesRepresentative=By sales representative -LinkedToSpecificUsers=Linked to a particular user contact -DeleteAFile=Delete a file -ConfirmDeleteAFile=Are you sure you want to delete file -NoResults=No results -ModulesSystemTools=Modules tools -Test=Test -Element=Element -NoPhotoYet=No pictures available yet -HomeDashboard=Home summary -Deductible=Deductible -from=from -toward=toward -Access=Access -HelpCopyToClipboard=Use Ctrl+C to copy to clipboard -SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") -OriginFileName=Original filename -SetDemandReason=Set source -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency -ViewPrivateNote=View notes -XMoreLines=%s line(s) hidden -PublicUrl=Public URL -AddBox=Add box +Merge=Hợp nhất +PrintContentArea=Hiển thị trang in khu vực nội dung chính +MenuManager=Quản lý đơn +NoMenu=Không có trình đơn phụ +WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang ở trong một chế độ bảo trì, vì vậy chỉ đăng nhập% s được phép sử dụng ứng dụng tại thời điểm này. +CoreErrorTitle=Lỗi hệ thống +CoreErrorMessage=Xin lỗi, đã xảy ra lỗi. Kiểm tra các bản ghi hoặc liên hệ với quản trị hệ thống của bạn. +CreditCard=Thẻ tín dụng +FieldsWithAreMandatory=Các lĩnh vực với% s là bắt buộc +FieldsWithIsForPublic=Các lĩnh vực với% s được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công cộng". +AccordingToGeoIPDatabase=(Theo GeoIP chuyển đổi) +Line=Dòng +NotSupported=Không được hỗ trợ +RequiredField=Dòng bắt buộc +Result=Kết quả +ToTest=Kiểm tra +ValidateBefore=Thẻ phải được xác nhận trước khi sử dụng tính năng này +Visibility=Tầm nhìn +Private=Tin +Hidden=Thành viên ẩn danh +Resources=Tài nguyên +Source=Nguồn +Prefix=Tiền tố +Before=Trước khi +After=Sau khi +IPAddress=Địa chỉ IP +Frequency=Tần số +IM=Nhắn tin tức thời +NewAttribute=Thuộc tính mới +AttributeCode=Mã thuộc tính +OptionalFieldsSetup=Thuộc tính thiết lập thêm +URLPhoto=URL của hình ảnh / logo +SetLinkToThirdParty=Liên kết đến một bên thứ ba +CreateDraft=Tạo dự thảo +SetToDraft=Về dự thảo +ClickToEdit=Nhấn vào đây để chỉnh sửa +ObjectDeleted=Đối tượng% s bị xóa +ByCountry=Theo quốc gia +ByTown=Bởi thị trấn +ByDate=Theo ngày +ByMonthYear=Theo tháng / năm +ByYear=Đến năm +ByMonth=Theo tháng +ByDay=Đến ngày +BySalesRepresentative=Đại diện bán hàng +LinkedToSpecificUsers=Liên kết với một số liên lạc người dùng cụ thể +DeleteAFile=Xóa một tập tin +ConfirmDeleteAFile=Bạn có chắc chắn muốn xóa tập tin +NoResults=Không có kết quả +ModulesSystemTools=Module công cụ +Test=Kiểm tra +Element=Yếu tố +NoPhotoYet=Chưa có ảnh chưa +HomeDashboard=Trang chủ tóm tắt +Deductible=Giảm trừ doanh thu +from=từ +toward=hướng +Access=Truy cập +HelpCopyToClipboard=Sử dụng tổ hợp phím Ctrl + C để copy vào clipboard +SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên "% s" (nếu không "% s") +OriginFileName=Tên tập tin gốc +SetDemandReason=Bộ nguồn +SetBankAccount=Xác định tài khoản ngân hàng +AccountCurrency=Tài khoản ngoại tệ +ViewPrivateNote=Xem ghi chú +XMoreLines=Dòng% s (s) ẩn +PublicUrl=URL công cộng +AddBox=Thêm vào hộp # Week day -Monday=Monday -Tuesday=Tuesday -Wednesday=Wednesday -Thursday=Thursday -Friday=Friday -Saturday=Saturday -Sunday=Sunday +Monday=Thứ hai +Tuesday=Thứ ba +Wednesday=Thứ tư +Thursday=Thứ năm +Friday=Thứ sáu +Saturday=Thứ bảy +Sunday=Chủ Nhật MondayMin=Mo TuesdayMin=Tu -WednesdayMin=We +WednesdayMin=Chúng tôi ThursdayMin=Th -FridayMin=Fr +FridayMin=Cha SaturdayMin=Sa SundayMin=Su -Day1=Monday -Day2=Tuesday -Day3=Wednesday -Day4=Thursday -Day5=Friday -Day6=Saturday -Day0=Sunday +Day1=Thứ hai +Day2=Thứ ba +Day3=Thứ tư +Day4=Thứ năm +Day5=Thứ sáu +Day6=Thứ bảy +Day0=Chủ Nhật ShortMonday=M ShortTuesday=T ShortWednesday=W diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang index 3fca6d7a644..1b5d917f82f 100644 --- a/htdocs/langs/vi_VN/margins.lang +++ b/htdocs/langs/vi_VN/margins.lang @@ -1,41 +1,41 @@ # Dolibarr language file - Source file is en_US - marges Margin=Margin -Margins=Margins -TotalMargin=Total Margin -MarginOnProducts=Margin / Products -MarginOnServices=Margin / Services -MarginRate=Margin rate -MarkRate=Mark rate -DisplayMarginRates=Display margin rates -DisplayMarkRates=Display mark rates -InputPrice=Input price -margin=Profit margins management -margesSetup=Profit margins management setup -MarginDetails=Margin details -ProductMargins=Product margins -CustomerMargins=Customer margins -SalesRepresentativeMargins=Sales representative margins -ProductService=Product or Service -AllProducts=All products and services -ChooseProduct/Service=Choose product or service -StartDate=Start date -EndDate=End date -Launch=Start -ForceBuyingPriceIfNull=Force buying price if null -ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) -MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts -UseDiscountAsProduct=As a product -UseDiscountAsService=As a service -UseDiscountOnTotal=On subtotal -MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. -MARGIN_TYPE=Margin type -MargeBrute=Raw margin -MargeNette=Net margin -MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price -CostPrice=Cost price -BuyingCost=Cost price -UnitCharges=Unit charges -Charges=Charges -AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +Margins=Lợi nhuận +TotalMargin=Tổng biên +MarginOnProducts=Tỷ suất lợi nhuận / Sản phẩm +MarginOnServices=Tỷ suất lợi nhuận / Dịch vụ +MarginRate=Tỷ lệ Margin +MarkRate=Đánh dấu tỷ lệ +DisplayMarginRates=Tỷ lệ lợi nhuận hiển thị +DisplayMarkRates=Giá đánh dấu hiển thị +InputPrice=Giá đầu vào +margin=Quản lý lợi nhuận +margesSetup=Lợi nhuận thiết lập quản lý +MarginDetails=Chi tiết Margin +ProductMargins=Lợi nhuận sản phẩm +CustomerMargins=Lợi nhuận của khách hàng +SalesRepresentativeMargins=Lợi nhuận đại diện bán hàng +ProductService=Sản phẩm hoặc dịch vụ +AllProducts=Tất cả các sản phẩm và dịch vụ +ChooseProduct/Service=Chọn sản phẩm hoặc dịch vụ +StartDate=Ngày bắt đầu +EndDate=Ngày kết thúc +Launch=Bắt đầu +ForceBuyingPriceIfNull=Giá mua vũ lực nếu rỗng +ForceBuyingPriceIfNullDetails=nếu "ON", lợi nhuận sẽ bằng không trên đường (giá mua = giá bán), nếu không ("OFF"), Marge sẽ bằng giá bán (giá mua = 0) +MARGIN_METHODE_FOR_DISCOUNT=Phương pháp biên giảm giá toàn cầu +UseDiscountAsProduct=Là một sản phẩm +UseDiscountAsService=Là một dịch vụ +UseDiscountOnTotal=Trên tổng số phụ +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Xác định nếu giảm giá toàn cầu được coi là một sản phẩm, một dịch vụ, hoặc chỉ trên tổng số phụ để tính tỷ suất lợi nhuận. +MARGIN_TYPE=Loại biên +MargeBrute=Biên liệu +MargeNette=Tỷ suất lợi nhuận +MARGIN_TYPE_DETAILS=Biên liệu: Giá bán - giá mua
Tỷ suất lợi nhuận: Giá bán - Giá vốn +CostPrice=Giá thành +BuyingCost=Giá thành +UnitCharges=Chi phí đơn vị +Charges=Phí +AgentContactType=Loại liên hệ đại lý thương mại +AgentContactTypeDetails=Xác định những gì liên lạc loại (liên kết trên hóa đơn) sẽ được sử dụng cho báo cáo lợi nhuận của các đại lý thương mại diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang index eb2063c629c..7f11e9e529b 100644 --- a/htdocs/langs/vi_VN/members.lang +++ b/htdocs/langs/vi_VN/members.lang @@ -1,205 +1,205 @@ # Dolibarr language file - Source file is en_US - members -MembersArea=Members area -PublicMembersArea=Public members area -MemberCard=Member card -SubscriptionCard=Subscription card -Member=Member -Members=Members -MemberAccount=Member login -ShowMember=Show member card -UserNotLinkedToMember=User not linked to a member -ThirdpartyNotLinkedToMember=Third-party not linked to a member -MembersTickets=Members Tickets -FundationMembers=Foundation members -Attributs=Attributes -ErrorMemberTypeNotDefined=Member type not defined -ListOfPublicMembers=List of public members -ListOfValidatedPublicMembers=List of validated public members -ErrorThisMemberIsNotPublic=This member is not public -ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -ThisIsContentOfYourCard=This is details of your card -CardContent=Content of your member card -SetLinkToUser=Link to a Dolibarr user -SetLinkToThirdParty=Link to a Dolibarr third party -MembersCards=Members business cards -MembersList=List of members -MembersListToValid=List of draft members (to be validated) -MembersListValid=List of valid members -MembersListUpToDate=List of valid members with up to date subscription -MembersListNotUpToDate=List of valid members with subscription out of date -MembersListResiliated=List of resiliated members -MembersListQualified=List of qualified members -MenuMembersToValidate=Draft members -MenuMembersValidated=Validated members -MenuMembersUpToDate=Up to date members -MenuMembersNotUpToDate=Out of date members -MenuMembersResiliated=Resiliated members -MembersWithSubscriptionToReceive=Members with subscription to receive -DateAbonment=Subscription date -DateSubscription=Subscription date -DateNextSubscription=Next subscription -DateEndSubscription=Subscription end date -EndSubscription=End subscription -SubscriptionId=Subscription id -MemberId=Member id -NewMember=New member -NewType=New member type -MemberType=Member type -MemberTypeId=Member type id -MemberTypeLabel=Member type label -MembersTypes=Members types -MembersAttributes=Members attributes -SearchAMember=Search a member -MemberStatusDraft=Draft (needs to be validated) -MemberStatusDraftShort=Draft -MemberStatusActive=Validated (waiting subscription) -MemberStatusActiveShort=Validated -MemberStatusActiveLate=subscription expired -MemberStatusActiveLateShort=Expired -MemberStatusPaid=Subscription up to date -MemberStatusPaidShort=Up to date -MemberStatusResiliated=Resiliated member +MembersArea=Khu vực thành viên +PublicMembersArea=Thành viên khu vực công cộng +MemberCard=Thẻ thành viên +SubscriptionCard=Thẻ đăng ký +Member=Thành viên +Members=Thành viên +MemberAccount=Thành viên đăng nhập +ShowMember=Hiện thẻ thành viên +UserNotLinkedToMember=Người sử dụng không liên quan đến một thành viên +ThirdpartyNotLinkedToMember=Của bên thứ ba không liên quan đến một thành viên +MembersTickets=Thành viên Vé +FundationMembers=Thành viên sáng lập +Attributs=Thuộc tính +ErrorMemberTypeNotDefined=Thành viên gõ không được xác định +ListOfPublicMembers=Danh sách thành viên công cộng +ListOfValidatedPublicMembers=Danh sách xác nhận thành viên công cộng +ErrorThisMemberIsNotPublic=Thành viên này không được công khai +ErrorMemberIsAlreadyLinkedToThisThirdParty=Một thành viên khác (tên:% s, đăng nhập:% s) đã được liên kết với một bên thứ ba% s. Hủy bỏ liên kết này đầu tiên bởi vì một bên thứ ba không thể được liên kết với chỉ một thành viên (và ngược lại). +ErrorUserPermissionAllowsToLinksToItselfOnly=Vì lý do bảo mật, bạn phải được cấp phép để chỉnh sửa tất cả người dùng để có thể liên kết một thành viên cho một người dùng mà không phải là của bạn. +ThisIsContentOfYourCard=Đây là chi tiết thẻ của bạn +CardContent=Nội dung của thẻ thành viên của bạn +SetLinkToUser=Liên kết đến một người sử dụng Dolibarr +SetLinkToThirdParty=Liên kết đến một Dolibarr bên thứ ba +MembersCards=Thành viên danh thiếp +MembersList=Danh sách thành viên +MembersListToValid=Danh sách thành viên dự thảo (được xác nhận) +MembersListValid=Danh sách thành viên hợp lệ +MembersListUpToDate=Danh sách thành viên hợp lệ lên đến thuê bao ngày +MembersListNotUpToDate=Danh sách thành viên hợp lệ với các thuê bao trong ngày +MembersListResiliated=Danh sách thành viên resiliated +MembersListQualified=Danh sách các thành viên đủ điều kiện +MenuMembersToValidate=Dự thảo các thành viên +MenuMembersValidated=Các thành viên xác nhận +MenuMembersUpToDate=Lên đến các thành viên ngày +MenuMembersNotUpToDate=Trong số các thành viên ngày +MenuMembersResiliated=Thành viên Resiliated +MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận được +DateAbonment=Ngày đăng ký +DateSubscription=Ngày đăng ký +DateNextSubscription=Thuê bao tiếp theo +DateEndSubscription=Ngày kết thúc đăng ký +EndSubscription=Kết thúc đăng ký +SubscriptionId=Id đăng ký +MemberId=Thành viên id +NewMember=Thành viên mới +NewType=Loại thành viên mới +MemberType=Kiểu thành viên +MemberTypeId=Kiểu thành viên id +MemberTypeLabel=Kiểu thành viên nhãn +MembersTypes=Loại thành viên +MembersAttributes=Thuộc tính thành viên +SearchAMember=Tìm kiếm thành viên +MemberStatusDraft=Dự thảo (cần phải được xác nhận) +MemberStatusDraftShort=Dự thảo +MemberStatusActive=Xác nhận (đăng ký chờ đợi) +MemberStatusActiveShort=Xác nhận +MemberStatusActiveLate=thuê bao hết hạn +MemberStatusActiveLateShort=Hết hạn +MemberStatusPaid=Đăng ký cập nhật +MemberStatusPaidShort=Cho đến nay +MemberStatusResiliated=Thành viên Resiliated MemberStatusResiliatedShort=Resiliated -MembersStatusToValid=Draft members -MembersStatusToValidShort=Draft members -MembersStatusValidated=Validated members -MembersStatusPaid=Subscription up to date -MembersStatusPaidShort=Up to date -MembersStatusNotPaid=Subscription out of date -MembersStatusNotPaidShort=Out of date -MembersStatusResiliated=Resiliated members -MembersStatusResiliatedShort=Resiliated members -NewCotisation=New contribution -PaymentSubscription=New contribution payment -EditMember=Edit member -SubscriptionEndDate=Subscription's end date -MembersTypeSetup=Members type setup -NewSubscription=New subscription -NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -Subscription=Subscription -Subscriptions=Subscriptions -SubscriptionLate=Late -SubscriptionNotReceived=Subscription never received -SubscriptionLateShort=Late -SubscriptionNotReceivedShort=Never received -ListOfSubscriptions=List of subscriptions -SendCardByMail=Send card by Email -AddMember=Add member -NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -NewMemberType=New member type -WelcomeEMail=Welcome e-mail -SubscriptionRequired=Subscription required -EditType=Edit member type -DeleteType=Delete -VoteAllowed=Vote allowed -Physical=Physical -Moral=Moral -MorPhy=Moral/Physical -Reenable=Reenable -ResiliateMember=Resiliate a member -ConfirmResiliateMember=Are you sure you want to resiliate this member ? -DeleteMember=Delete a member -ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -DeleteSubscription=Delete a subscription -ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -Filehtpasswd=htpasswd file -ValidateMember=Validate a member -ConfirmValidateMember=Are you sure you want to validate this member ? -FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -PublicMemberList=Public member list -BlankSubscriptionForm=Public auto-subscription form -BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -EnablePublicSubscriptionForm=Enable the public auto-subscription form -MemberPublicLinks=Public links/pages -ExportDataset_member_1=Members and subscriptions -ImportDataset_member_1=Members -LastMembers=Last %s members -LastMembersModified=Last %s modified members -LastSubscriptionsModified=Last %s modified subscriptions -AttributeName=Attribute name -String=String -Text=Text +MembersStatusToValid=Dự thảo các thành viên +MembersStatusToValidShort=Dự thảo các thành viên +MembersStatusValidated=Các thành viên xác nhận +MembersStatusPaid=Đăng ký cập nhật +MembersStatusPaidShort=Cho đến nay +MembersStatusNotPaid=Đăng ký trong ngày +MembersStatusNotPaidShort=Trong ngày +MembersStatusResiliated=Thành viên Resiliated +MembersStatusResiliatedShort=Thành viên Resiliated +NewCotisation=Đóng góp mới +PaymentSubscription=Thanh toán khoản đóng góp mới +EditMember=Chỉnh sửa thành viên +SubscriptionEndDate=Ngày kết thúc đăng ký của +MembersTypeSetup=Loại thành viên thiết lập +NewSubscription=Thuê bao mới +NewSubscriptionDesc=Hình thức này cho phép bạn ghi lại các thuê bao của bạn như là một thành viên mới của nền tảng. Nếu bạn muốn gia hạn thuê bao của bạn (nếu đã là thành viên), xin liên lạc với hội đồng quản trị nền tảng thay vì qua email% s. +Subscription=Đăng ký +Subscriptions=Đăng ký +SubscriptionLate=Cuối +SubscriptionNotReceived=Thuê bao không bao giờ nhận được +SubscriptionLateShort=Cuối +SubscriptionNotReceivedShort=Không bao giờ nhận được +ListOfSubscriptions=Danh sách đăng ký +SendCardByMail=Gửi thẻ qua Email +AddMember=Thêm thành viên +NoTypeDefinedGoToSetup=Không có loại thành viên được xác định. Tới menu "Thành viên loại" +NewMemberType=Loại thành viên mới +WelcomeEMail=Chào mừng e-mail +SubscriptionRequired=Yêu cầu đăng ký +EditType=Chỉnh sửa loại thành viên +DeleteType=Xóa +VoteAllowed=Vote cho phép +Physical=Vật lý +Moral=Đạo đức +MorPhy=Đạo đức / Vật lý +Reenable=Bật lại +ResiliateMember=Resiliate thành viên +ConfirmResiliateMember=Bạn Bạn có chắc chắn muốn resiliate thành viên này? +DeleteMember=Xóa thành viên +ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả các thuê bao của mình)? +DeleteSubscription=Xóa một thuê bao +ConfirmDeleteSubscription=Bạn Bạn có chắc chắn muốn xóa đăng ký này? +Filehtpasswd=tập tin htpasswd +ValidateMember=Xác nhận thành viên +ConfirmValidateMember=Bạn có chắc chắn bạn muốn xác nhận thành viên này? +FollowingLinksArePublic=Các liên kết sau đây là các trang mở không được bảo vệ bởi bất kỳ sự cho phép Dolibarr. Họ không formated trang, cung cấp như ví dụ cho thấy làm thế nào để liệt kê các cơ sở dữ liệu thành viên. +PublicMemberList=Danh sách thành viên công cộng +BlankSubscriptionForm=Hình thức công lập tự động đăng ký +BlankSubscriptionFormDesc=Dolibarr có thể cung cấp cho bạn một URL nào để cho phép khách tham quan bên ngoài để yêu cầu đăng ký vào các nền tảng. Nếu một module thanh toán trực tuyến được kích hoạt, một hình thức thanh toán cũng sẽ được tự động cung cấp. +EnablePublicSubscriptionForm=Kích hoạt tính năng đăng ký tự động, hình thức công lập +MemberPublicLinks=Liên kết công cộng / trang +ExportDataset_member_1=Thành viên và đăng ký +ImportDataset_member_1=Thành viên +LastMembers=Thành viên cuối% s +LastMembersModified=Các thành viên biến đổi cuối cùng% s +LastSubscriptionsModified=Cuối% s đăng ký sửa đổi +AttributeName=Tên thuộc tính +String=Chuỗi +Text=Văn bản Int=Int -Date=Date -DateAndTime=Date and time -PublicMemberCard=Member public card -MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -AddSubscription=Add subscription -ShowSubscription=Show subscription -MemberModifiedInDolibarr=Member modified in Dolibarr -SendAnEMailToMember=Send information email to member -DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -DescADHERENT_MAIL_VALID=EMail for member validation -DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -DescADHERENT_MAIL_COTIS=EMail for subscription -DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -DescADHERENT_MAIL_RESIL=EMail for member resiliation -DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -DescADHERENT_ETIQUETTE_TYPE=Format of labels page -DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -DescADHERENT_CARD_TYPE=Format of cards page -DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -MayBeOverwrited=This text can be overwrited by value defined for member's type -ShowTypeCard=Show type '%s' -HTPasswordExport=htpassword file generation -NoThirdPartyAssociatedToMember=No third party associated to this member -ThirdPartyDolibarr=Dolibarr third party -MembersAndSubscriptions= Members and Subscriptions -MoreActions=Complementary action on recording -MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -MoreActionBankDirect=Create a direct transaction record on account -MoreActionBankViaInvoice=Create an invoice and payment on account -MoreActionInvoiceOnly=Create an invoice with no payment -LinkToGeneratedPages=Generate visit cards -LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -DocForAllMembersCards=Generate business cards for all members -DocForOneMemberCards=Generate business cards for a particular member -DocForLabels=Generate address sheets -SubscriptionPayment=Subscription payment -LastSubscriptionDate=Last subscription date -LastSubscriptionAmount=Last subscription amount -MembersStatisticsByCountries=Members statistics by country -MembersStatisticsByState=Members statistics by state/province -MembersStatisticsByTown=Members statistics by town -MembersStatisticsByRegion=Members statistics by region -MemberByRegion=Members by region -NbOfMembers=Number of members -NoValidatedMemberYet=No validated members found -MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -MembersByTownDesc=This screen show you statistics on members by town. -MembersStatisticsDesc=Choose statistics you want to read... -MenuMembersStats=Statistics -LastMemberDate=Last member date -Nature=Nature -Public=Information are public -Exports=Exports -NewMemberbyWeb=New member added. Awaiting approval -NewMemberForm=New member form -SubscriptionsStatistics=Statistics on subscriptions -NbOfSubscriptions=Number of subscriptions -AmountOfSubscriptions=Amount of subscriptions -TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -DefaultAmount=Default amount of subscription -CanEditAmount=Visitor can choose/edit amount of its subscription -MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -Associations=Foundations -Collectivités=Organizations -Particuliers=Personal -Entreprises=Companies -DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-ByProperties=By characteristics -MembersStatisticsByProperties=Members statistics by characteristics -MembersByNature=Members by nature -VATToUseForSubscriptions=VAT rate to use for subscriptions -NoVatOnSubscription=No TVA for subscriptions -MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +Date=Ngày +DateAndTime=Ngày và thời gian +PublicMemberCard=Thẻ thành viên công cộng +MemberNotOrNoMoreExpectedToSubscribe=Thành viên không hoặc không mong đợi để đăng ký +AddSubscription=Thêm thuê bao +ShowSubscription=Hiện thuê bao +MemberModifiedInDolibarr=Thành viên sửa đổi trong Dolibarr +SendAnEMailToMember=Gửi email thông tin cho các thành viên +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Chủ đề của e-mail nhận được trong trường hợp tự động ghi của khách +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail nhận được trong trường hợp tự động ghi của khách +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Tiêu đề thư điện tử cho thành viên autosubscription +DescADHERENT_AUTOREGISTER_MAIL=Thư điện tử của thành viên autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=Tiêu đề thư điện tử để xác nhận thành viên +DescADHERENT_MAIL_VALID=Thư điện tử để xác nhận thành viên +DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho thuê bao +DescADHERENT_MAIL_COTIS=Thư điện tử cho thuê bao +DescADHERENT_MAIL_RESIL_SUBJECT=Tiêu đề thư điện tử cho thành viên resiliation +DescADHERENT_MAIL_RESIL=Thư điện tử của thành viên resiliation +DescADHERENT_MAIL_FROM=Tên người gửi thư điện tử cho email tự động +DescADHERENT_ETIQUETTE_TYPE=Định dạng của trang nhãn +DescADHERENT_ETIQUETTE_TEXT=Văn bản in trên tờ địa chỉ thành viên +DescADHERENT_CARD_TYPE=Định dạng của trang thẻ +DescADHERENT_CARD_HEADER_TEXT=Văn bản in trên thẻ thành viên +DescADHERENT_CARD_TEXT=Văn bản in trên thẻ thành viên (sắp xếp bên trái) +DescADHERENT_CARD_TEXT_RIGHT=Văn bản in trên thẻ thành viên (sắp xếp ở bên phải) +DescADHERENT_CARD_FOOTER_TEXT=Văn bản in trên dưới cùng của thẻ thành viên +GlobalConfigUsedIfNotDefined=Văn bản quy định tại thiết lập mô-đun Quỹ sẽ được sử dụng nếu không được định nghĩa ở đây +MayBeOverwrited=Văn bản này có thể được xác định theo giá trị overwrited cho loại thành viên này +ShowTypeCard=Hiển thị loại '% s' +HTPasswordExport=thế hệ tập tin htpassword +NoThirdPartyAssociatedToMember=Không có bên thứ ba liên quan đến thành viên này +ThirdPartyDolibarr=Bên thứ ba Dolibarr +MembersAndSubscriptions= Thành viên và theo dõi +MoreActions=Hành động bổ sung vào thu +MoreActionsOnSubscription=Hành động bổ sung, đề nghị theo mặc định khi ghi âm một thuê bao +MoreActionBankDirect=Tạo một bản ghi giao dịch trực tiếp trên tài khoản +MoreActionBankViaInvoice=Tạo hóa đơn và thanh toán trên tài khoản +MoreActionInvoiceOnly=Tạo hóa đơn không có thanh toán +LinkToGeneratedPages=Tạo danh thiếp +LinkToGeneratedPagesDesc=Màn hình này cho phép bạn tạo ra các tập tin PDF với thẻ kinh doanh cho tất cả các thành viên của bạn hoặc một thành viên đặc biệt. +DocForAllMembersCards=Tạo danh thiếp cho tất cả các thành viên +DocForOneMemberCards=Tạo danh thiếp cho một thành viên đặc biệt +DocForLabels=Tạo tờ địa chỉ +SubscriptionPayment=Thanh toán thuê bao +LastSubscriptionDate=Cuối ngày đăng ký +LastSubscriptionAmount=Số lượng đăng ký cuối cùng +MembersStatisticsByCountries=Thành viên thống kê của đất nước +MembersStatisticsByState=Thành viên thống kê của tiểu bang / tỉnh +MembersStatisticsByTown=Thành viên thống kê của thị trấn +MembersStatisticsByRegion=Thành viên thống kê theo vùng +MemberByRegion=Thành viên theo vùng +NbOfMembers=Số lượng thành viên +NoValidatedMemberYet=Không có thành viên xác nhận tìm thấy +MembersByCountryDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của các nước. Tuy nhiên đồ họa phụ thuộc vào dịch vụ Google đồ thị trực tuyến và chỉ có nếu một kết nối internet là được làm việc. +MembersByStateDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của tiểu bang / tỉnh / bang. +MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của thị trấn. +MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ... +MenuMembersStats=Thống kê +LastMemberDate=Ngày thành viên cuối cùng +Nature=Thiên nhiên +Public=Thông tin được công khai +Exports=Xuất khẩu +NewMemberbyWeb=Thành viên mới được bổ sung. Đang chờ phê duyệt +NewMemberForm=Hình thức thành viên mới +SubscriptionsStatistics=Thống kê về thuê bao +NbOfSubscriptions=Số đăng ký +AmountOfSubscriptions=Số tiền thuê bao +TurnoverOrBudget=Doanh thu (cho một công ty) hay Ngân sách nhà nước (đối với một nền tảng) +DefaultAmount=Số lượng mặc định của thuê bao +CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng thuê bao của mình +MEMBER_NEWFORM_PAYONLINE=Nhảy vào trang tích hợp thanh toán trực tuyến +Associations=Cơ sở +Collectivités=Tổ chức +Particuliers=Cá nhân +Entreprises=Các công ty +DOLIBARRFOUNDATION_PAYMENT_FORM=Để thực hiện thanh toán đăng ký của bạn bằng cách sử dụng chuyển khoản ngân hàng, xem trang http://wiki.dolibarr.org/index.php/Subscribe .
Để thanh toán bằng cách sử dụng thẻ tín dụng hoặc Paypal, bấm vào nút ở dưới cùng của trang này.
+ByProperties=Bởi đặc điểm +MembersStatisticsByProperties=Thành viên thống kê theo các đặc điểm +MembersByNature=Thành viên của thiên nhiên +VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho thuê bao +NoVatOnSubscription=Không TVA cho thuê bao +MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho thuê bao diff --git a/htdocs/langs/vi_VN/opensurvey.lang b/htdocs/langs/vi_VN/opensurvey.lang index 0b191e426ec..615eba24e2f 100644 --- a/htdocs/langs/vi_VN/opensurvey.lang +++ b/htdocs/langs/vi_VN/opensurvey.lang @@ -1,66 +1,66 @@ # Dolibarr language file - Source file is en_US - opensurvey -Survey=Poll -Surveys=Polls -OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... -NewSurvey=New poll -NoSurveysInDatabase=%s poll(s) into database. -OpenSurveyArea=Polls area -AddACommentForPoll=You can add a comment into poll... -AddComment=Add comment -CreatePoll=Create poll -PollTitle=Poll title -ToReceiveEMailForEachVote=Receive an email for each vote -TypeDate=Type date -TypeClassic=Type standard -OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it -RemoveAllDays=Remove all days -CopyHoursOfFirstDay=Copy hours of first day -RemoveAllHours=Remove all hours -SelectedDays=Selected days -TheBestChoice=The best choice currently is -TheBestChoices=The best choices currently are -with=with -OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. -CommentsOfVoters=Comments of voters -ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) -RemovePoll=Remove poll -UrlForSurvey=URL to communicate to get a direct access to poll -PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: -CreateSurveyDate=Create a date poll -CreateSurveyStandard=Create a standard poll -CheckBox=Simple checkbox -YesNoList=List (empty/yes/no) -PourContreList=List (empty/for/against) -AddNewColumn=Add new column -TitleChoice=Choice label -ExportSpreadsheet=Export result spreadsheet -ExpireDate=Limit date -NbOfSurveys=Number of polls -NbOfVoters=Nb of voters -SurveyResults=Results -PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. -5MoreChoices=5 more choices -Abstention=Abstention -Against=Against -YouAreInivitedToVote=You are invited to vote for this poll -VoteNameAlreadyExists=This name was already used for this poll -ErrorPollDoesNotExists=Error, poll %s does not exists. -OpenSurveyNothingToSetup=There is no specific setup to do. -PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. -AddADate=Add a date -AddStartHour=Add start hour -AddEndHour=Add end hour -votes=vote(s) -NoCommentYet=No comments have been posted for this poll yet -CanEditVotes=Can change vote of others -CanComment=Voters can comment in the poll -CanSeeOthersVote=Voters can see other people's vote -SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. -BackToCurrentMonth=Back to current month -ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation -ErrorOpenSurveyOneChoice=Enter at least one choice -ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD -ErrorInsertingComment=There was an error while inserting your comment -MoreChoices=Enter more choices for the voters -SurveyExpiredInfo=The voting time of this poll has expired. -EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s +Survey=Thăm dò ý kiến +Surveys=Bình chọn +OrganizeYourMeetingEasily=Tổ chức các cuộc họp và các cuộc thăm dò của bạn dễ dàng. Đầu tiên chọn loại của cuộc bình chọn ... +NewSurvey=Thăm dò ý kiến ​​mới +NoSurveysInDatabase=% S bình chọn (s) vào cơ sở dữ liệu. +OpenSurveyArea=Khu vực thăm dò ý kiến +AddACommentForPoll=Bạn có thể thêm một bình luận vào cuộc thăm dò ... +AddComment=Thêm bình luận +CreatePoll=Tạo cuộc thăm dò +PollTitle=Tiêu đề cuộc thăm dò +ToReceiveEMailForEachVote=Nhận được một email cho mỗi phiếu bầu +TypeDate=Ngày loại +TypeClassic=Loại tiêu chuẩn +OpenSurveyStep2=Chọn số ngày của bạn amoung những ngày miễn phí (màu xám). Những ngày đã chọn là màu xanh lá cây. Bạn có thể bỏ chọn một ngày đã chọn trước đó bằng cách nhấn vào nó một lần nữa +RemoveAllDays=Hủy bỏ tất cả các ngày +CopyHoursOfFirstDay=Giờ bản sao của ngày đầu tiên +RemoveAllHours=Hủy bỏ tất cả các giờ +SelectedDays=Ngày đã chọn +TheBestChoice=Sự lựa chọn tốt nhất hiện nay là +TheBestChoices=Các lựa chọn tốt nhất hiện nay là +with=với +OpenSurveyHowTo=Nếu bạn đồng ý bỏ phiếu trong cuộc bình chọn này, bạn phải cung cấp tên của bạn, chọn các giá trị phù hợp nhất cho bạn và xác nhận với các nút dấu cộng ở cuối dòng. +CommentsOfVoters=Ý kiến ​​của cử tri +ConfirmRemovalOfPoll=Bạn Bạn có chắc chắn muốn xóa bình chọn này (và tất cả các phiếu) +RemovePoll=Hủy bỏ thăm dò ý kiến +UrlForSurvey=URL để giao tiếp để có được một truy cập trực tiếp thăm dò ý kiến +PollOnChoice=Bạn đang tạo ra một cuộc bình chọn để thực hiện một sự lựa chọn đa cho một cuộc thăm dò. Đầu tiên nhập tất cả các lựa chọn có thể cho thăm dò ý kiến ​​của bạn: +CreateSurveyDate=Tạo một cuộc thăm dò ngày +CreateSurveyStandard=Tạo một cuộc thăm dò ý +CheckBox=Hộp đơn giản +YesNoList=Danh sách (trống / có / không) +PourContreList=Danh sách (trống / cho / chống) +AddNewColumn=Thêm cột mới +TitleChoice=Nhãn lựa chọn +ExportSpreadsheet=Kết quả xuất khẩu bảng tính +ExpireDate=Giới hạn ngày +NbOfSurveys=Số các cuộc thăm dò +NbOfVoters=Nb của cử tri +SurveyResults=Kết quả +PollAdminDesc=Bạn được phép thay đổi tất cả các dòng bỏ phiếu trong bầu chọn này với nút "Edit". Bạn có thể, cũng như, loại bỏ một cột hoặc một dòng với% s. Bạn cũng có thể thêm một cột mới với% s. +5MoreChoices=Hơn 5 lựa chọn +Abstention=Bỏ phiếu trắng +Against=Chống lại +YouAreInivitedToVote=Bạn được mời bỏ phiếu cho cuộc bình chọn này +VoteNameAlreadyExists=Tên này đã được sử dụng cho cuộc bình chọn này +ErrorPollDoesNotExists=Lỗi, cuộc thăm dò% s không tồn tại. +OpenSurveyNothingToSetup=Không có thiết lập cụ thể để làm. +PollWillExpire=Thăm dò ý kiến của bạn sẽ tự động hết hạn% s ngày kể từ ngày cuối cùng của cuộc bình chọn của bạn. +AddADate=Thêm một ngày +AddStartHour=Thêm bắt đầu giờ +AddEndHour=Thêm vào cuối giờ +votes=vote (s) +NoCommentYet=Không có ý kiến ​​đã được đưa lên thăm dò ý kiến ​​này được nêu ra +CanEditVotes=Có thể thay đổi phiếu bầu của người khác +CanComment=Cử tri có thể bình luận trong cuộc thăm dò +CanSeeOthersVote=Cử tri có thể nhìn thấy bầu của người khác +SelectDayDesc=Đối với mỗi ngày đã chọn, bạn có thể chọn, hoặc không, giờ đáp ứng theo định dạng sau:
- Trống,
- "8h", "8H" hoặc "08:00" để cung cấp cho đầu giờ của cuộc họp,
- "8-11", "8h-11h", "8H-11H" hoặc "8: 00-11: 00" để cho đầu và cuối giờ của cuộc họp,
- "8h15-11h15", "8H15-11H15" hoặc "8: 15-11: 15" cho điều tương tự nhưng ở phút. +BackToCurrentMonth=Về tháng hiện tại +ErrorOpenSurveyFillFirstSection=Bạn chưa điền phần đầu tiên của việc tạo ra cuộc thăm dò +ErrorOpenSurveyOneChoice=Nhập ít nhất một lựa chọn +ErrorOpenSurveyDateFormat=Ngày phải có định dạng YYYY-MM-DD +ErrorInsertingComment=Có một lỗi trong khi chèn bình luận của bạn +MoreChoices=Nhập nhiều lựa chọn hơn cho các cử tri +SurveyExpiredInfo=Thời gian biểu quyết của cuộc thăm dò này đã hết hạn. +EmailSomeoneVoted=% S đã lấp đầy một đường thẳng. Bạn có thể tìm thăm dò ý kiến ​​của bạn tại liên kết:% s diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang index 62ffad34f77..98b00ee5c6d 100644 --- a/htdocs/langs/vi_VN/orders.lang +++ b/htdocs/langs/vi_VN/orders.lang @@ -1,163 +1,163 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Customers orders area -SuppliersOrdersArea=Suppliers orders area -OrderCard=Order card -OrderId=Order Id +OrdersArea=Khách hàng đặt hàng khu vực +SuppliersOrdersArea=Nhà cung cấp đơn đặt hàng khu vực +OrderCard=Thẻ thứ tự +OrderId=Id thứ tự Order=Trật tự -Orders=Orders -OrderLine=Order line -OrderFollow=Follow up -OrderDate=Order date -OrderToProcess=Order to process -NewOrder=New order -ToOrder=Make order -MakeOrder=Make order -SupplierOrder=Supplier order -SuppliersOrders=Suppliers orders -SuppliersOrdersRunning=Current suppliers orders -CustomerOrder=Customer order -CustomersOrders=Customer's orders -CustomersOrdersRunning=Current customer's orders -CustomersOrdersAndOrdersLines=Customer orders and order's lines -OrdersToValid=Customer's orders to validate -OrdersToBill=Customer's orders delivered -OrdersInProcess=Customer's orders in process -OrdersToProcess=Customer's orders to process -SuppliersOrdersToProcess=Supplier's orders to process -StatusOrderCanceledShort=Canceled -StatusOrderDraftShort=Draft -StatusOrderValidatedShort=Validated -StatusOrderSentShort=In process -StatusOrderSent=Shipment in process -StatusOrderOnProcessShort=Reception -StatusOrderProcessedShort=Processed -StatusOrderToBillShort=Delivered -StatusOrderToBill2Short=To bill -StatusOrderApprovedShort=Approved -StatusOrderRefusedShort=Refused -StatusOrderToProcessShort=To process -StatusOrderReceivedPartiallyShort=Partially received -StatusOrderReceivedAllShort=Everything received -StatusOrderCanceled=Canceled -StatusOrderDraft=Draft (needs to be validated) -StatusOrderValidated=Validated -StatusOrderOnProcess=Waiting to receive -StatusOrderProcessed=Processed -StatusOrderToBill=Delivered -StatusOrderToBill2=To bill -StatusOrderApproved=Approved -StatusOrderRefused=Refused -StatusOrderReceivedPartially=Partially received -StatusOrderReceivedAll=Everything received -ShippingExist=A shipment exists -DraftOrWaitingApproved=Draft or approved not yet ordered -DraftOrWaitingShipped=Draft or validated not yet shipped -MenuOrdersToBill=Orders delivered -MenuOrdersToBill2=Orders to bill -SearchOrder=Search order -SearchACustomerOrder=Search a customer order -ShipProduct=Ship product -Discount=Discount -CreateOrder=Create Order -RefuseOrder=Refuse order -ApproveOrder=Accept order -ValidateOrder=Validate order -UnvalidateOrder=Unvalidate order -DeleteOrder=Delete order -CancelOrder=Cancel order -AddOrder=Add order -AddToMyOrders=Add to my orders -AddToOtherOrders=Add to other orders -AddToDraftOrders=Add to draft order -ShowOrder=Show order -NoOpenedOrders=No opened orders -NoOtherOpenedOrders=No other opened orders -NoDraftOrders=No draft orders -OtherOrders=Other orders -LastOrders=Last %s orders -LastModifiedOrders=Last %s modified orders -LastClosedOrders=Last %s closed orders -AllOrders=All orders -NbOfOrders=Number of orders -OrdersStatistics=Order's statistics -OrdersStatisticsSuppliers=Supplier order's statistics -NumberOfOrdersByMonth=Number of orders by month -AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) -ListOfOrders=List of orders -CloseOrder=Close order -ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -ConfirmDeleteOrder=Are you sure you want to delete this order ? -ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -ConfirmCancelOrder=Are you sure you want to cancel this order ? -ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? -GenerateBill=Generate invoice -ClassifyShipped=Classify delivered -ClassifyBilled=Classify billed -ComptaCard=Accountancy card -DraftOrders=Draft orders -RelatedOrders=Related orders -OnProcessOrders=In process orders -RefOrder=Ref. order -RefCustomerOrder=Ref. customer order -RefCustomerOrderShort=Ref. cust. order -SendOrderByMail=Send order by mail -ActionsOnOrder=Events on order -NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -OrderMode=Order method -AuthorRequest=Request author -UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -RunningOrders=Orders on process -UserWithApproveOrderGrant=Users granted with "approve orders" permission. -PaymentOrderRef=Payment of order %s -CloneOrder=Clone order -ConfirmCloneOrder=Are you sure you want to clone this order %s ? -DispatchSupplierOrder=Receiving supplier order %s +Orders=Đơn đặt hàng +OrderLine=Dòng thứ tự +OrderFollow=Theo dõi +OrderDate=Ngày đặt hàng +OrderToProcess=Để xử lý +NewOrder=Trật tự mới +ToOrder=Làm cho trật tự +MakeOrder=Làm cho trật tự +SupplierOrder=Để nhà cung cấp +SuppliersOrders=Nhà cung cấp đơn đặt hàng +SuppliersOrdersRunning=Các nhà cung cấp hiện tại đơn đặt hàng +CustomerOrder=Đơn đặt hàng +CustomersOrders=Đơn đặt hàng của khách hàng +CustomersOrdersRunning=Đơn đặt hàng của khách hàng hiện tại của +CustomersOrdersAndOrdersLines=Đơn đặt hàng của khách hàng và đơn đặt hàng của dòng +OrdersToValid=Đơn đặt hàng của khách hàng để xác nhận +OrdersToBill=Đơn đặt hàng của khách hàng cung cấp +OrdersInProcess=Đơn đặt hàng của khách hàng trong quá trình +OrdersToProcess=Đơn đặt hàng của khách hàng để quá trình +SuppliersOrdersToProcess=Đơn đặt hàng của nhà cung cấp cho quá trình +StatusOrderCanceledShort=Hủy bỏ +StatusOrderDraftShort=Dự thảo +StatusOrderValidatedShort=Xác nhận +StatusOrderSentShort=Trong quá trình +StatusOrderSent=Lô hàng trong quá trình +StatusOrderOnProcessShort=Tiếp nhận +StatusOrderProcessedShort=Xử lý +StatusOrderToBillShort=Giao +StatusOrderToBill2Short=Vào hóa đơn +StatusOrderApprovedShort=Đã được phê duyệt +StatusOrderRefusedShort=Từ chối +StatusOrderToProcessShort=Để xử lý +StatusOrderReceivedPartiallyShort=Một phần nhận +StatusOrderReceivedAllShort=Tất cả mọi thứ được +StatusOrderCanceled=Hủy bỏ +StatusOrderDraft=Dự thảo (cần phải được xác nhận) +StatusOrderValidated=Xác nhận +StatusOrderOnProcess=Chờ đợi để nhận được +StatusOrderProcessed=Xử lý +StatusOrderToBill=Giao +StatusOrderToBill2=Vào hóa đơn +StatusOrderApproved=Đã được phê duyệt +StatusOrderRefused=Từ chối +StatusOrderReceivedPartially=Một phần nhận +StatusOrderReceivedAll=Tất cả mọi thứ được +ShippingExist=Một lô hàng tồn +DraftOrWaitingApproved=Dự thảo đã được phê duyệt chưa đặt hàng +DraftOrWaitingShipped=Dự thảo hoặc xác nhận chưa vận chuyển +MenuOrdersToBill=Đơn đặt hàng cung cấp +MenuOrdersToBill2=Đơn đặt hàng vào hóa đơn +SearchOrder=Để tìm kiếm +SearchACustomerOrder=Tìm kiếm một đơn đặt hàng +ShipProduct=Sản phẩm tàu +Discount=Giảm giá +CreateOrder=Tạo thứ tự +RefuseOrder=Từ chối để +ApproveOrder=Chấp nhận đặt hàng +ValidateOrder=Xác nhận đặt hàng +UnvalidateOrder=Để Unvalidate +DeleteOrder=Xóa để +CancelOrder=Hủy lệnh +AddOrder=Thêm để +AddToMyOrders=Thêm vào đơn đặt hàng của tôi +AddToOtherOrders=Thêm vào đơn đặt hàng khác +AddToDraftOrders=Thêm vào dự thảo để +ShowOrder=Hiển thị thứ tự +NoOpenedOrders=Không có đơn đặt hàng mở +NoOtherOpenedOrders=Không có đơn đặt hàng mở khác +NoDraftOrders=Không có đơn hàng nháp +OtherOrders=Đơn đặt hàng khác +LastOrders=Đơn đặt hàng cuối% s +LastModifiedOrders=Đơn đặt hàng biến đổi cuối cùng% s +LastClosedOrders=Cuối% s đóng đơn đặt hàng +AllOrders=Mọi đơn đặt hàng +NbOfOrders=Số đơn đặt hàng +OrdersStatistics=Thống kê thứ tự của +OrdersStatisticsSuppliers=Số liệu thống kê để nhà cung cấp +NumberOfOrdersByMonth=Số đơn đặt hàng theo tháng +AmountOfOrdersByMonthHT=Số lượng đơn đặt hàng theo tháng (sau thuế) +ListOfOrders=Danh sách đơn đặt hàng +CloseOrder=Đóng cửa để +ConfirmCloseOrder=Bạn có chắc là bạn muốn thiết lập trật tự này để deliverd? Khi một đơn hàng được giao, nó có thể được thiết lập để tính tiền. +ConfirmCloseOrderIfSending=Bạn có chắc là bạn muốn đóng theo thứ tự này? Bạn phải đóng lệnh chỉ khi tất cả vận chuyển được thực hiện. +ConfirmDeleteOrder=Bạn Bạn có chắc chắn muốn xóa lệnh này? +ConfirmValidateOrder=Bạn có chắc chắn bạn muốn xác nhận thứ tự này dưới tên% s? +ConfirmUnvalidateOrder=Bạn Bạn có chắc chắn muốn lập lại trật tự% s để soạn thảo trạng thái? +ConfirmCancelOrder=Bạn có chắc chắn bạn muốn hủy bỏ lệnh này? +ConfirmMakeOrder=Bạn có chắc chắn bạn muốn xác nhận bạn đã thực hiện lệnh này vào% s? +GenerateBill=Tạo hóa đơn +ClassifyShipped=Phân loại giao +ClassifyBilled=Phân loại hóa đơn +ComptaCard=Thẻ kế toán +DraftOrders=Dự thảo đơn đặt hàng +RelatedOrders=Đơn đặt hàng liên quan +OnProcessOrders=Trong quá trình các đơn đặt hàng +RefOrder=Tài liệu tham khảo. để +RefCustomerOrder=Tài liệu tham khảo. đơn đặt hàng +RefCustomerOrderShort=Tài liệu tham khảo. cust. để +SendOrderByMail=Gửi đơn qua đường bưu điện +ActionsOnOrder=Sự kiện về trật tự +NoArticleOfTypeProduct=Không có bài viết của loại 'sản phẩm' như vậy không có bài viết shippable về đơn hàng này +OrderMode=Phương pháp thứ tự +AuthorRequest=Yêu cầu tác giả +UseCustomerContactAsOrderRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ để người nhận +RunningOrders=Đơn đặt hàng về quy trình +UserWithApproveOrderGrant=Người dùng được cấp "thông qua các đơn đặt hàng" cho phép. +PaymentOrderRef=Thanh toán tự% s +CloneOrder=Để Clone +ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép lệnh này% s? +DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp% s ##### Types de contacts ##### -TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -TypeContact_commande_internal_SHIPPING=Representative following-up shipping -TypeContact_commande_external_BILLING=Customer invoice contact -TypeContact_commande_external_SHIPPING=Customer shipping contact -TypeContact_commande_external_CUSTOMER=Customer contact following-up order -TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -TypeContact_order_supplier_external_BILLING=Supplier invoice contact -TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +TypeContact_commande_internal_SALESREPFOLL=Đại diện sau-up đơn đặt hàng +TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển +TypeContact_commande_external_BILLING=Hóa đơn của khách hàng liên lạc +TypeContact_commande_external_SHIPPING=Vận chuyển khách hàng liên hệ +TypeContact_commande_external_CUSTOMER=Liên hệ với khách hàng theo thứ tự sau-up +TypeContact_order_supplier_internal_SALESREPFOLL=Đại diện theo dõi để cung cấp +TypeContact_order_supplier_internal_SHIPPING=Đại diện theo dõi vận chuyển +TypeContact_order_supplier_external_BILLING=Nhà cung cấp hóa đơn liên lạc +TypeContact_order_supplier_external_SHIPPING=Nhà cung cấp vận chuyển liên lạc +TypeContact_order_supplier_external_CUSTOMER=Nhà cung cấp liên lạc theo thứ tự sau-up -Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -Error_OrderNotChecked=No orders to invoice selected +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON liên tục không được xác định +Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON liên tục không được xác định +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Không thể tải tập tin mô-đun '% s' +Error_FailedToLoad_COMMANDE_ADDON_File=Không thể tải tập tin mô-đun '% s' +Error_OrderNotChecked=Không có đơn đặt hàng cho hóa đơn được lựa chọn # Sources -OrderSource0=Commercial proposal +OrderSource0=Đề nghị thương mại OrderSource1=Internet -OrderSource2=Mail campaign -OrderSource3=Phone compaign -OrderSource4=Fax campaign -OrderSource5=Commercial -OrderSource6=Store -QtyOrdered=Qty ordered -AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order +OrderSource2=Chiến dịch gửi thư +OrderSource3=Điện thoại compaign +OrderSource4=Chiến dịch Fax +OrderSource5=Thương mại +OrderSource6=Cửa hàng +QtyOrdered=Số lượng đặt hàng +AddDeliveryCostLine=Thêm một dòng chi phí giao hàng cho thấy trọng lượng của thứ tự # Documents models -PDFEinsteinDescription=A complete order model (logo...) -PDFEdisonDescription=A simple order model -PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=Một mô hình để đầy đủ (logo ...) +PDFEdisonDescription=Một mô hình đơn giản để +PDFProformaDescription=Hoá đơn chiếu lệ đầy đủ (logo ...) # Orders modes -OrderByMail=Mail +OrderByMail=Thư OrderByFax=Fax -OrderByEMail=EMail -OrderByWWW=Online -OrderByPhone=Phone -CreateInvoiceForThisCustomer=Bill orders -NoOrdersToInvoice=No orders billable -CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Orders to bill -OrderCreation=Order creation -Ordered=Ordered -OrderCreated=Your orders have been created -OrderFail=An error happened during your orders creation -CreateOrders=Create orders -ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByEMail=Thư điện tử +OrderByWWW=Trực tuyến +OrderByPhone=Điện thoại +CreateInvoiceForThisCustomer=Đơn đặt hàng Bill +NoOrdersToInvoice=Không có đơn đặt hàng có thể thanh toán +CloseProcessedOrdersAutomatically=Phân loại "chế biến" tất cả các đơn đặt hàng lựa chọn. +MenuOrdersToBill2=Đơn đặt hàng vào hóa đơn +OrderCreation=Tạo ra thứ tự +Ordered=Ra lệnh +OrderCreated=Đơn đặt hàng của bạn đã được tạo ra +OrderFail=Một lỗi đã xảy ra trong quá trình tạo đơn đặt hàng của bạn +CreateOrders=Tạo đơn đặt hàng +ToBillSeveralOrderSelectCustomer=Để tạo ra một hóa đơn cho một số đơn đặt hàng, kích đầu tiên vào khách hàng, sau đó chọn "% s". diff --git a/htdocs/langs/vi_VN/oscommerce.lang b/htdocs/langs/vi_VN/oscommerce.lang index 3ff9108ead4..648f546555f 100644 --- a/htdocs/langs/vi_VN/oscommerce.lang +++ b/htdocs/langs/vi_VN/oscommerce.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login +OSCommerce=Hệ điều hành thương mại +OSCommerceSetup=Thiết lập mô-đun hệ điều hành thương mại +OSCommerceSetupSaved=Thiết lập hệ điều hành thương mại lưu +OSCommerceServer=Hệ điều hành máy chủ lưu trữ thương mại / ip +OSCommerceDatabaseName=Tên cơ sở dữ liệu hệ điều hành thương mại +OSCommercePrefix=Hệ điều hành thương mại bảng tiền tố +OSCommerceUser=Đăng nhập cơ sở dữ liệu hệ điều hành thương mại diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index 000930d4421..60293670023 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -1,122 +1,132 @@ # Dolibarr language file - Source file is en_US - other -SecurityCode=Security code -Calendar=Calendar -AddTrip=Add trip -Tools=Tools -ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

Those tools can be reached from menu on the side. -Birthday=Birthday -BirthdayDate=Birthday -DateToBirth=Date of birth -BirthdayAlertOn= birthday alert active -BirthdayAlertOff= birthday alert inactive -Notify_FICHINTER_VALIDATE=Intervention validated -Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail -Notify_BILL_VALIDATE=Customer invoice validated -Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved -Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused -Notify_ORDER_VALIDATE=Customer order validated -Notify_PROPAL_VALIDATE=Customer proposal validated -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused -Notify_WITHDRAW_TRANSMIT=Transmission withdrawal -Notify_WITHDRAW_CREDIT=Credit withdrawal -Notify_WITHDRAW_EMIT=Perform withdrawal -Notify_ORDER_SENTBYMAIL=Customer order sent by mail -Notify_COMPANY_CREATE=Third party created -Notify_COMPANY_SENTBYMAIL=Mails sent from third party card -Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail -Notify_BILL_PAYED=Customer invoice payed -Notify_BILL_CANCEL=Customer invoice canceled -Notify_BILL_SENTBYMAIL=Customer invoice sent by mail -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated -Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail -Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated -Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed -Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail -Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled -Notify_CONTRACT_VALIDATE=Contract validated -Notify_FICHEINTER_VALIDATE=Intervention validated -Notify_SHIPPING_VALIDATE=Shipping validated -Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail -Notify_MEMBER_VALIDATE=Member validated -Notify_MEMBER_MODIFY=Member modified -Notify_MEMBER_SUBSCRIPTION=Member subscribed -Notify_MEMBER_RESILIATE=Member resiliated -Notify_MEMBER_DELETE=Member deleted -Notify_PROJECT_CREATE=Project creation -Notify_TASK_CREATE=Task created -Notify_TASK_MODIFY=Task modified -Notify_TASK_DELETE=Task deleted -NbOfAttachedFiles=Number of attached files/documents -TotalSizeOfAttachedFiles=Total size of attached files/documents -MaxSize=Maximum size -AttachANewFile=Attach a new file/document -LinkedObject=Linked object -Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications -PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ -PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ -PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ -DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available. -ChooseYourDemoProfil=Choose the demo profile that match your activity... -DemoFundation=Manage members of a foundation -DemoFundation2=Manage members and bank account of a foundation -DemoCompanyServiceOnly=Manage a freelance activity selling service only -DemoCompanyShopWithCashDesk=Manage a shop with a cash desk -DemoCompanyProductAndStocks=Manage a small or medium company selling products -DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules) -GoToDemo=Go to demo -CreatedBy=Created by %s -ModifiedBy=Modified by %s -ValidatedBy=Validated by %s -CanceledBy=Canceled by %s -ClosedBy=Closed by %s -FileWasRemoved=File %s was removed -DirWasRemoved=Directory %s was removed -FeatureNotYetAvailableShort=Available in a next version -FeatureNotYetAvailable=Feature not yet available in this version -FeatureExperimental=Experimental feature. Not stable in this version -FeatureDevelopment=Development feature. Not stable in this version -FeaturesSupported=Features supported -Width=Width -Height=Height -Depth=Depth -Top=Top -Bottom=Bottom -Left=Left -Right=Right -CalculatedWeight=Calculated weight -CalculatedVolume=Calculated volume -Weight=Weight -TotalWeight=Total weight -WeightUnitton=tonnes +SecurityCode=Mã bảo vệ +Calendar=Lịch +AddTrip=Thêm chuyến đi +Tools=Công cụ +ToolsDesc=Khu vực này được dành riêng cho nhóm dụng cụ khác không có sẵn vào mục trình đơn khác.

Các công cụ này có thể đạt được từ menu bên cạnh. +Birthday=Sinh nhật +BirthdayDate=Sinh nhật +DateToBirth=Ngày tháng năm sinh +BirthdayAlertOn= sinh nhật cảnh báo hoạt động +BirthdayAlertOff= sinh nhật không hoạt động cảnh báo +Notify_FICHINTER_VALIDATE=Can thiệp xác nhận +Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện +Notify_BILL_VALIDATE=Hóa đơn khách hàng xác nhận +Notify_BILL_UNVALIDATE=Hóa đơn của khách hàng unvalidated +Notify_ORDER_SUPPLIER_APPROVE=Để nhà cung cấp đã được phê duyệt +Notify_ORDER_SUPPLIER_REFUSE=Để nhà cung cấp từ chối +Notify_ORDER_VALIDATE=Đơn đặt hàng được xác nhận +Notify_PROPAL_VALIDATE=Đề nghị khách hàng xác nhận +Notify_PROPAL_CLOSE_SIGNED=Propal khách hàng đóng cửa ký +Notify_PROPAL_CLOSE_REFUSED=Propal khách hàng Mỹ đóng cửa từ chối +Notify_WITHDRAW_TRANSMIT=Rút truyền +Notify_WITHDRAW_CREDIT=Rút tín dụng +Notify_WITHDRAW_EMIT=Thực hiện thu hồi +Notify_ORDER_SENTBYMAIL=Đơn đặt hàng được gửi qua đường bưu điện +Notify_COMPANY_CREATE=Bên thứ ba tạo ra +Notify_COMPANY_SENTBYMAIL=Mail được gửi từ thẻ của bên thứ ba +Notify_PROPAL_SENTBYMAIL=Đề nghị thương mại gửi qua đường bưu điện +Notify_BILL_PAYED=Hóa đơn của khách hàng payed +Notify_BILL_CANCEL=Hóa đơn của khách hàng bị hủy bỏ +Notify_BILL_SENTBYMAIL=Hóa đơn của khách hàng gửi qua đường bưu điện +Notify_ORDER_SUPPLIER_VALIDATE=Nhà cung cấp để xác nhận +Notify_ORDER_SUPPLIER_SENTBYMAIL=Để nhà cung cấp gửi qua đường bưu điện +Notify_BILL_SUPPLIER_VALIDATE=Nhà cung cấp hóa đơn xác nhận +Notify_BILL_SUPPLIER_PAYED=Nhà cung cấp hóa đơn payed +Notify_BILL_SUPPLIER_SENTBYMAIL=Nhà cung cấp hóa đơn gửi qua đường bưu điện +Notify_BILL_SUPPLIER_CANCELED=Nhà cung cấp hóa đơn hủy bỏ +Notify_CONTRACT_VALIDATE=Hợp đồng xác nhận +Notify_FICHEINTER_VALIDATE=Can thiệp xác nhận +Notify_SHIPPING_VALIDATE=Vận chuyển xác nhận +Notify_SHIPPING_SENTBYMAIL=Vận Chuyển gửi qua đường bưu điện +Notify_MEMBER_VALIDATE=Thành viên được xác nhận +Notify_MEMBER_MODIFY=Thành viên sửa đổi +Notify_MEMBER_SUBSCRIPTION=Thành viên đã đăng ký +Notify_MEMBER_RESILIATE=Thành viên resiliated +Notify_MEMBER_DELETE=Thành viên bị xóa +Notify_PROJECT_CREATE=Dự án sáng tạo +Notify_TASK_CREATE=Nhiệm vụ tạo +Notify_TASK_MODIFY=Nhiệm vụ sửa đổi +Notify_TASK_DELETE=Công tác xóa +NbOfAttachedFiles=Số đính kèm tập tin / tài liệu +TotalSizeOfAttachedFiles=Tổng dung lượng của các file đính kèm / tài liệu +MaxSize=Kích thước tối đa +AttachANewFile=Đính kèm một tập tin mới / tài liệu +LinkedObject=Đối tượng liên quan +Miscellaneous=Linh tinh +NbOfActiveNotifications=Số thông báo +PredefinedMailTest=Đây là một email thử nghiệm. Hai dòng được phân cách bằng một trở về vận chuyển. __SIGNATURE__ +PredefinedMailTestHtml=Đây là một thư kiểm tra (kiểm tra từ phải được in đậm).
Hai dòng được phân cách bằng một trở về vận chuyển.

__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chúng tôi muốn cảnh báo bạn rằng __FACREF__ hóa đơn dường như không được payed. Vì vậy, đây là hóa đơn kèm một lần nữa, như một lời nhắc nhở. __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây đề nghị thương mại __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây thứ tự __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây để chúng tôi __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây vận chuyển __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây sự can thiệp __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__ +DemoDesc=Dolibarr là một nhỏ gọn ERP / CRM sáng tác bởi một số module chức năng. Một bản demo bao gồm tất cả các mô-đun không có nghĩa là bất cứ điều gì như thế này không bao giờ xảy ra. Vì vậy, một số hồ sơ giới thiệu có sẵn. +ChooseYourDemoProfil=Chọn hồ sơ cá nhân giới thiệu phù hợp với hoạt động của bạn ... +DemoFundation=Quản lý thành viên của một nền tảng +DemoFundation2=Quản lý thành viên và tài khoản ngân hàng của một nền tảng +DemoCompanyServiceOnly=Quản lý dịch vụ bán hàng hoạt động tự do chỉ +DemoCompanyShopWithCashDesk=Quản lý một cửa hàng với một bàn bằng tiền mặt +DemoCompanyProductAndStocks=Quản lý một công ty bán các sản phẩm vừa và nhỏ +DemoCompanyAll=Quản lý một công ty vừa và nhỏ với nhiều hoạt động (tất cả các mô-đun chính) +GoToDemo=Tới để giới thiệu +CreatedBy=Được tạo ra bởi% s +ModifiedBy=Được thay đổi bởi% s +ValidatedBy=Xác nhận bởi% s +CanceledBy=Hủy bỏ bởi% s +ClosedBy=Đóng bởi% s +CreatedById=Id người dùng đã tạo ra +ModifiedById=Id người dùng những người làm thay đổi cuối cùng +ValidatedById=Sử dụng id người xác nhận +CanceledById=Sử dụng id người bị hủy bỏ +ClosedById=Sử dụng id người đóng +CreatedByLogin=Đăng nhập người dùng đã tạo ra +ModifiedByLogin=Người sử dụng đăng nhập người đã làm thay đổi cuối cùng +ValidatedByLogin=Người sử dụng đăng nhập người xác nhận +CanceledByLogin=Người sử dụng đăng nhập người hủy bỏ +ClosedByLogin=Người sử dụng đăng nhập người đóng +FileWasRemoved=Tập tin% s đã được gỡ bỏ +DirWasRemoved=Thư mục% s đã được gỡ bỏ +FeatureNotYetAvailableShort=Có sẵn trong một phiên bản tiếp theo +FeatureNotYetAvailable=Tính năng chưa có sẵn trong phiên bản này +FeatureExperimental=Tính năng thử nghiệm. Không ổn định trong phiên bản này +FeatureDevelopment=Tính năng phát triển. Không ổn định trong phiên bản này +FeaturesSupported=Các tính năng hỗ trợ +Width=Chiều rộng +Height=Chiều cao +Depth=Độ sâu +Top=Lên trên +Bottom=Dưới +Left=Còn lại +Right=Ngay +CalculatedWeight=Tính theo cân nặng +CalculatedVolume=Tính khối lượng +Weight=Trọng lượng +TotalWeight=Tổng trọng lượng +WeightUnitton=tấn WeightUnitkg=kg WeightUnitg=g WeightUnitmg=mg -WeightUnitpound=pound -Length=Length +WeightUnitpound=bảng +Length=Chiều dài LengthUnitm=m LengthUnitdm=dm LengthUnitcm=cm LengthUnitmm=mm -Surface=Area +Surface=Diện tích SurfaceUnitm2=m2 SurfaceUnitdm2=dm2 SurfaceUnitcm2=cm2 SurfaceUnitmm2=mm2 SurfaceUnitfoot2=ft2 SurfaceUnitinch2=in2 -Volume=Volume -TotalVolume=Total volume +Volume=Khối lượng +TotalVolume=Tổng khối lượng VolumeUnitm3=m3 VolumeUnitdm3=dm3 VolumeUnitcm3=cm3 @@ -124,103 +134,103 @@ VolumeUnitmm3=mm3 VolumeUnitfoot3=ft3 VolumeUnitinch3=in3 VolumeUnitounce=ounce -VolumeUnitlitre=litre +VolumeUnitlitre=lít VolumeUnitgallon=gallon -Size=size +Size=kích thước SizeUnitm=m SizeUnitdm=dm SizeUnitcm=cm SizeUnitmm=mm SizeUnitinch=inch -SizeUnitfoot=foot -SizeUnitpoint=point -BugTracker=Bug tracker -SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.
Change will be effective only after clicking on confirmation link inside this email.
Check your email reader software. -BackToLoginPage=Back to login page -AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
In this mode, Dolibarr can't know nor change your password.
Contact your system administrator if you want to change your password. -EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option. -EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) -ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. -DolibarrDemo=Dolibarr ERP/CRM demo -StatsByNumberOfUnits=Statistics in number of products/services units -StatsByNumberOfEntities=Statistics in number of referring entities -NumberOfProposals=Number of proposals on last 12 month -NumberOfCustomerOrders=Number of customer orders on last 12 month -NumberOfCustomerInvoices=Number of customer invoices on last 12 month -NumberOfSupplierOrders=Number of supplier orders on last 12 month -NumberOfSupplierInvoices=Number of supplier invoices on last 12 month -NumberOfUnitsProposals=Number of units on proposals on last 12 month -NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month -NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month -NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month -NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month -EMailTextInterventionValidated=The intervention %s has been validated. -EMailTextInvoiceValidated=The invoice %s has been validated. -EMailTextProposalValidated=The proposal %s has been validated. -EMailTextOrderValidated=The order %s has been validated. -EMailTextOrderApproved=The order %s has been approved. -EMailTextOrderApprovedBy=The order %s has been approved by %s. -EMailTextOrderRefused=The order %s has been refused. -EMailTextOrderRefusedBy=The order %s has been refused by %s. -EMailTextExpeditionValidated=The shipping %s has been validated. -ImportedWithSet=Importation data set -DolibarrNotification=Automatic notification -ResizeDesc=Enter new width OR new height. Ratio will be kept during resizing... -NewLength=New width -NewHeight=New height -NewSizeAfterCropping=New size after cropping -DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner) -CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image -ImageEditor=Image editor -YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s. -YouReceiveMailBecauseOfNotification2=This event is the following: -ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start". -ClickHere=Click here -UseAdvancedPerms=Use the advanced permissions of some modules -FileFormat=File format -SelectAColor=Choose a color +SizeUnitfoot=chân +SizeUnitpoint=điểm +BugTracker=Theo dõi lỗi +SendNewPasswordDesc=Hình thức này cho phép bạn yêu cầu một mật khẩu mới. Nó sẽ được gửi đến địa chỉ email của bạn.
Thay đổi sẽ có hiệu lực sau khi nhấp vào liên kết xác nhận trong email này.
Kiểm tra phần mềm đọc email của bạn. +BackToLoginPage=Trở lại trang đăng nhập +AuthenticationDoesNotAllowSendNewPassword=Chế độ xác thực là% s.
Trong chế độ này, Dolibarr không thể biết và cũng không thay đổi mật khẩu của bạn.
Liên hệ quản trị hệ thống của bạn nếu bạn muốn thay đổi mật khẩu của bạn. +EnableGDLibraryDesc=Cài đặt hoặc cho phép thư viện GD PHP của bạn để sử dụng tùy chọn này. +EnablePhpAVModuleDesc=Bạn cần phải cài đặt một module tương thích với chống virus của bạn. (Clamav: php4-clamavlib ou php5-clamavlib) +ProfIdShortDesc=Id Giáo sư% s là một thông tin phụ thuộc vào quốc gia của bên thứ ba.
Ví dụ, đối với đất nước% s, đó là mã% s. +DolibarrDemo=Giới thiệu Dolibarr ERP / CRM +StatsByNumberOfUnits=Thống kê về số lượng các sản phẩm / dịch vụ đơn vị +StatsByNumberOfEntities=Thống kê về số lượng của các đơn vị giới thiệu +NumberOfProposals=Số đề xuất vào ngày 12 tháng trước +NumberOfCustomerOrders=Số đơn đặt hàng của khách hàng vào ngày 12 tháng trước +NumberOfCustomerInvoices=Số hóa đơn của khách hàng vào ngày 12 tháng trước +NumberOfSupplierOrders=Số đơn đặt hàng nhà cung cấp vào ngày 12 tháng trước +NumberOfSupplierInvoices=Số hóa đơn nhà cung cấp vào ngày 12 tháng trước +NumberOfUnitsProposals=Số đơn vị về các đề xuất vào ngày 12 tháng trước +NumberOfUnitsCustomerOrders=Số đơn vị trên đơn đặt hàng của khách hàng vào ngày 12 tháng trước +NumberOfUnitsCustomerInvoices=Số đơn vị trên hoá đơn của khách hàng vào ngày 12 tháng trước +NumberOfUnitsSupplierOrders=Số đơn vị trên đơn đặt hàng nhà cung cấp vào ngày 12 tháng trước +NumberOfUnitsSupplierInvoices=Số đơn vị trên hóa đơn nhà cung cấp vào ngày 12 tháng trước +EMailTextInterventionValidated=Sự can thiệp% s đã được xác nhận. +EMailTextInvoiceValidated=Hóa đơn% s đã được xác nhận. +EMailTextProposalValidated=Đề nghị% s đã được xác nhận. +EMailTextOrderValidated=Trình tự% s đã được xác nhận. +EMailTextOrderApproved=Trình tự% s đã được phê duyệt. +EMailTextOrderApprovedBy=Trình tự% s đã được phê duyệt bởi% s. +EMailTextOrderRefused=Trình tự% s đã bị từ chối. +EMailTextOrderRefusedBy=Trình tự% s đã bị từ chối bởi% s. +EMailTextExpeditionValidated=Vận chuyển% s đã được xác nhận. +ImportedWithSet=Thiết lập dữ liệu nhập khẩu +DolibarrNotification=Tự động thông báo +ResizeDesc=Nhập chiều rộng mới hoặc tầm cao mới. Tỷ lệ sẽ được giữ trong thời gian thay đổi kích thước ... +NewLength=Chiều rộng mới +NewHeight=Tầm cao mới +NewSizeAfterCropping=Kích thước mới sau khi cắt xén +DefineNewAreaToPick=Xác định khu vực mới vào hình để chọn (nhấp chuột vào hình ảnh bên trái sau đó kéo cho đến khi bạn đạt đến góc đối diện) +CurrentInformationOnImage=Công cụ này được thiết kế để giúp bạn thay đổi kích thước hoặc cắt hình ảnh. Đây là thông tin về hình ảnh thay đổi nội dung hiện tại +ImageEditor=Biên tập hình ảnh +YouReceiveMailBecauseOfNotification=Bạn nhận được thông báo này vì email của bạn đã được thêm vào danh sách các mục tiêu được thông báo về sự kiện đặc biệt vào phần mềm% s% s. +YouReceiveMailBecauseOfNotification2=Sự kiện này là như sau: +ThisIsListOfModules=Đây là một danh sách các module chọn trước bởi hồ sơ demo này (chỉ có các mô-đun phổ biến nhất có thể nhìn thấy trong bản demo này). Chỉnh sửa này để có một bản giới thiệu cá nhân và click vào nút "Start". +ClickHere=Click vào đây +UseAdvancedPerms=Sử dụng các điều khoản của một số mô-đun tiên tiến +FileFormat=Định dạng file +SelectAColor=Chọn một màu sắc AddFiles=Add Files -StartUpload=Start upload -CancelUpload=Cancel upload -FileIsTooBig=Files is too big -PleaseBePatient=Please be patient... -RequestToResetPasswordReceived=A request to change your Dolibarr password has been received -NewKeyIs=This is your new keys to login -NewKeyWillBe=Your new key to login to software will be -ClickHereToGoTo=Click here to go to %s -YouMustClickToChange=You must however first click on the following link to validate this password change -ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. +StartUpload=Bắt đầu tải lên +CancelUpload=Hủy bỏ tải lên +FileIsTooBig=Tập tin là quá lớn +PleaseBePatient=Xin hãy kiên nhẫn ... +RequestToResetPasswordReceived=Một yêu cầu thay đổi mật khẩu Dolibarr của bạn đã được nhận +NewKeyIs=Đây là chìa khóa mới để đăng nhập +NewKeyWillBe=Khóa mới của bạn để đăng nhập vào phần mềm sẽ được +ClickHereToGoTo=Click vào đây để đi đến% s +YouMustClickToChange=Tuy nhiên, trước tiên bạn phải nhấp vào liên kết sau đây để xác nhận thay đổi mật khẩu này +ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quên email này. Thông tin của bạn được lưu giữ an toàn. ##### Calendar common ##### -AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +AddCalendarEntry=Thêm phần trong lịch% s +NewCompanyToDolibarr=Công ty% s thêm vào Dolibarr +ContractValidatedInDolibarr=Hợp đồng xác nhận trong% s Dolibarr +ContractCanceledInDolibarr=Hợp đồng bị hủy bỏ trong% s Dolibarr +ContractClosedInDolibarr=Hợp đồng% s đóng cửa Dolibarr +PropalClosedSignedInDolibarr=Đề xuất% s đã ký trong Dolibarr +PropalClosedRefusedInDolibarr=Đề xuất% s từ chối trong Dolibarr +PropalValidatedInDolibarr=Đề nghị xác nhận% s trong Dolibarr +InvoiceValidatedInDolibarr=Hoá đơn% s xác nhận trong Dolibarr +InvoicePaidInDolibarr=Hoá đơn% s thay đổi để trả Dolibarr +InvoiceCanceledInDolibarr=Hoá đơn% s hủy bỏ Dolibarr +PaymentDoneInDolibarr=Thanh toán% hoàn thành công việc trong Dolibarr +CustomerPaymentDoneInDolibarr=Khách hàng thanh toán% hoàn thành công việc trong Dolibarr +SupplierPaymentDoneInDolibarr=Nhà cung cấp thanh toán% hoàn thành công việc trong Dolibarr +MemberValidatedInDolibarr=Thành viên% s xác nhận trong Dolibarr +MemberResiliatedInDolibarr=Thành viên% s resiliated trong Dolibarr +MemberDeletedInDolibarr=Thành viên% s xóa từ Dolibarr +MemberSubscriptionAddedInDolibarr=Đăng ký cho thành viên được thêm vào trong% s Dolibarr +ShipmentValidatedInDolibarr=Lô hàng% s xác nhận trong Dolibarr +ShipmentDeletedInDolibarr=Lô hàng% s xóa từ Dolibarr ##### Export ##### -Export=Export -ExportsArea=Exports area -AvailableFormats=Available formats -LibraryUsed=Librairy used +Export=Xuất khẩu +ExportsArea=Khu vực xuất khẩu +AvailableFormats=Định dạng có sẵn +LibraryUsed=Librairy sử dụng LibraryVersion=Phiên bản -ExportableDatas=Exportable data -NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions) -ToExport=Export -NewExport=New export +ExportableDatas=Dữ liệu xuất khẩu +NoExportableData=Không có dữ liệu xuất khẩu (không có mô-đun với dữ liệu xuất khẩu nạp, hoặc cho phép mất tích) +ToExport=Xuất khẩu +NewExport=Xuất khẩu mới ##### External sites ##### -ExternalSites=External sites +ExternalSites=Các trang web bên ngoài diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang index cb88461602d..38a20e0037d 100644 --- a/htdocs/langs/vi_VN/products.lang +++ b/htdocs/langs/vi_VN/products.lang @@ -1,244 +1,244 @@ # Dolibarr language file - Source file is en_US - products -ProductRef=Product ref. -ProductLabel=Product label -ProductServiceCard=Products/Services card -Products=Products -Services=Services -Product=Product -Service=Service -ProductId=Product/service id -Create=Create -Reference=Reference -NewProduct=New product -NewService=New service -ProductCode=Product code -ServiceCode=Service code -ProductVatMassChange=Mass VAT change -ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. -MassBarcodeInit=Mass barcode init -MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. -ProductAccountancyBuyCode=Accountancy code (buy) -ProductAccountancySellCode=Accountancy code (sell) -ProductOrService=Product or Service -ProductsAndServices=Products and Services -ProductsOrServices=Products or Services -ProductsAndServicesOnSell=Available Products and Services -ProductsAndServicesNotOnSell=Obsolete Products and Services -ProductsAndServicesStatistics=Products and Services statistics -ProductsStatistics=Products statistics -ProductsOnSell=Available products -ProductsNotOnSell=Obsolete products -ProductsOnSellAndOnBuy=Products not for sale nor purchase -ServicesOnSell=Available services -ServicesNotOnSell=Obsolete services -ServicesOnSellAndOnBuy=Services not for sale nor purchase -InternalRef=Internal reference -LastRecorded=Last products/services on sell recorded -LastRecordedProductsAndServices=Last %s recorded products/services -LastModifiedProductsAndServices=Last %s modified products/services -LastRecordedProducts=Last %s products recorded -LastRecordedServices=Last %s services recorded -LastProducts=Last products -CardProduct0=Product card -CardProduct1=Service card -CardContract=Contract card -Warehouse=Warehouse -Warehouses=Warehouses -WarehouseOpened=Warehouse opened -WarehouseClosed=Warehouse closed -Stock=Stock -Stocks=Stocks -Movement=Movement -Movements=Movements -Sell=Sales -Buy=Purchases -OnSell=For sale -OnBuy=For purchase -NotOnSell=Not for sale -ProductStatusOnSell=For sale -ProductStatusNotOnSell=Not for sale -ProductStatusOnSellShort=For sale -ProductStatusNotOnSellShort=Not for sale -ProductStatusOnBuy=For purchase -ProductStatusNotOnBuy=Not for purchase -ProductStatusOnBuyShort=For purchase -ProductStatusNotOnBuyShort=Not for purchase -UpdatePrice=Update price -AppliedPricesFrom=Applied prices from -SellingPrice=Selling price -SellingPriceHT=Selling price (net of tax) -SellingPriceTTC=Selling price (inc. tax) -PublicPrice=Public price -CurrentPrice=Current price -NewPrice=New price -MinPrice=Minim. selling price -MinPriceHT=Minim. selling price (net of tax) -MinPriceTTC=Minim. selling price (inc. tax) -CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount. -ContractStatus=Contract status -ContractStatusClosed=Closed -ContractStatusRunning=Running -ContractStatusExpired=expired -ContractStatusOnHold=Not running -ContractStatusToRun=To get running -ContractNotRunning=This contract is not running -ErrorProductAlreadyExists=A product with reference %s already exists. -ErrorProductBadRefOrLabel=Wrong value for reference or label. -ErrorProductClone=There was a problem while trying to clone the product or service. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. -Suppliers=Suppliers -SupplierRef=Supplier's product ref. -ShowProduct=Show product -ShowService=Show service -ProductsAndServicesArea=Product and Services area -ProductsArea=Product area -ServicesArea=Services area -AddToMyProposals=Add to my proposals -AddToOtherProposals=Add to other proposals -AddToMyBills=Add to my bills -AddToOtherBills=Add to other bills -CorrectStock=Correct stock -AddPhoto=Add photo -ListOfStockMovements=List of stock movements -BuyingPrice=Buying price -SupplierCard=Supplier card -CommercialCard=Commercial card -AllWays=Path to find your product in stock -NoCat=Your product is not in any category -PrimaryWay=Primary path -PriceRemoved=Price removed -BarCode=Barcode -BarcodeType=Barcode type -SetDefaultBarcodeType=Set barcode type -BarcodeValue=Barcode value -NoteNotVisibleOnBill=Note (not visible on invoices, proposals...) -CreateCopy=Create copy -ServiceLimitedDuration=If product is a service with limited duration: -MultiPricesAbility=Several level of prices per product/service -MultiPricesNumPrices=Number of prices -MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product -EditAssociate=Associate -Translation=Translation -KeywordFilter=Keyword filter -CategoryFilter=Category filter -ProductToAddSearch=Search product to add -AddDel=Add/Delete -Quantity=Quantity -NoMatchFound=No match found -ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component -ErrorAssociationIsFatherOfThis=One of selected product is parent with current product -DeleteProduct=Delete a product/service -ConfirmDeleteProduct=Are you sure you want to delete this product/service? -ProductDeleted=Product/Service "%s" deleted from database. -DeletePicture=Delete a picture -ConfirmDeletePicture=Are you sure you want to delete this picture ? -ExportDataset_produit_1=Products -ExportDataset_service_1=Services -ImportDataset_produit_1=Products -ImportDataset_service_1=Services -DeleteProductLine=Delete product line -ConfirmDeleteProductLine=Are you sure you want to delete this product line? -NoProductMatching=No product/service match your criteria -MatchingProducts=Matching products/services -NoStockForThisProduct=No stock for this product -NoStock=No Stock -Restock=Restock -ProductSpecial=Special -QtyMin=Minimum Qty -PriceQty=Price for this quantity -PriceQtyMin=Price for this min. qty (w/o discount) -VATRateForSupplierProduct=VAT Rate (for this supplier/product) -DiscountQtyMin=Default discount for qty -NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product -NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product -RecordedProducts=Products recorded -RecordedServices=Services recorded -RecordedProductsAndServices=Products/services recorded -PredefinedProductsToSell=Predefined products to sell -PredefinedServicesToSell=Predefined services to sell -PredefinedProductsAndServicesToSell=Predefined products/services to sell -PredefinedProductsToPurchase=Predefined product to purchase -PredefinedServicesToPurchase=Predefined services to purchase -PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase -GenerateThumb=Generate thumb -ProductCanvasAbility=Use special "canvas" addons -ServiceNb=Service #%s -ListProductServiceByPopularity=List of products/services by popularity -ListProductByPopularity=List of products by popularity -ListServiceByPopularity=List of services by popularity -Finished=Manufactured product -RowMaterial=Raw Material -CloneProduct=Clone product or service -ConfirmCloneProduct=Are you sure you want to clone product or service %s ? -CloneContentProduct=Clone all main informations of product/service -ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services -ProductIsUsed=This product is used -NewRefForClone=Ref. of new product/service -CustomerPrices=Customers prices -SuppliersPrices=Suppliers prices -SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) -CustomCode=Customs code -CountryOrigin=Origin country -HiddenIntoCombo=Hidden into select lists -Nature=Nature -ProductCodeModel=Product ref template -ServiceCodeModel=Service ref template -AddThisProductCard=Create product card -HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. -AddThisServiceCard=Create service card -HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. -CurrentProductPrice=Current price -AlwaysUseNewPrice=Always use current price of product/service -AlwaysUseFixedPrice=Use the fixed price -PriceByQuantity=Price by quantity -PriceByQuantityRange=Quantity range -ProductsDashboard=Products/Services summary -UpdateOriginalProductLabel=Modify original label -HelpUpdateOriginalProductLabel=Allows to edit the name of the product +ProductRef=Ref sản phẩm. +ProductLabel=Nhãn sản phẩm +ProductServiceCard=Sản phẩm / dịch vụ thẻ +Products=Sản phẩm +Services=Dịch vụ +Product=Sản phẩm +Service=Dịch vụ +ProductId=Sản phẩm / dịch vụ id +Create=Tạo +Reference=Tài liệu tham khảo +NewProduct=Sản phẩm mới +NewService=Dịch vụ mới +ProductCode=Mã sản phẩm +ServiceCode=Mã dịch vụ +ProductVatMassChange=Thay đổi thuế GTGT hàng loạt +ProductVatMassChangeDesc=Trang này có thể được sử dụng để sửa đổi một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu. +MassBarcodeInit=Khối lượng mã vạch init +MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra trước đó thiết lập các mô-đun mã vạch hoàn tất. +ProductAccountancyBuyCode=Đang Toán (mua) +ProductAccountancySellCode=Đang kế toán (bán) +ProductOrService=Sản phẩm hoặc dịch vụ +ProductsAndServices=Sản phẩm và dịch vụ +ProductsOrServices=Sản phẩm hoặc dịch vụ +ProductsAndServicesOnSell=Sản phẩm có sẵn và dịch vụ +ProductsAndServicesNotOnSell=Sản phẩm cũ và Dịch vụ +ProductsAndServicesStatistics=Sản phẩm và dịch vụ thống kê +ProductsStatistics=Sản phẩm thống kê +ProductsOnSell=Sản phẩm có sẵn +ProductsNotOnSell=Sản phẩm lỗi thời +ProductsOnSellAndOnBuy=Sản phẩm không phải để bán cũng không mua +ServicesOnSell=Dịch vụ có sẵn +ServicesNotOnSell=Dịch vụ lỗi thời +ServicesOnSellAndOnBuy=Dịch vụ không phải để bán cũng không mua +InternalRef=Tham khảo nội bộ +LastRecorded=Sản phẩm cuối cùng / dịch vụ bán ghi +LastRecordedProductsAndServices=Cuối% s ghi nhận sản phẩm / dịch vụ +LastModifiedProductsAndServices=Cuối% s sửa đổi sản phẩm / dịch vụ +LastRecordedProducts=Cuối% của sản phẩm ghi +LastRecordedServices=Dịch vụ cuối% s ghi +LastProducts=Sản phẩm cuối cùng +CardProduct0=Sản phẩm thẻ +CardProduct1=Dịch vụ thẻ +CardContract=Thẻ đồng +Warehouse=Kho +Warehouses=Các kho hàng +WarehouseOpened=Kho mở +WarehouseClosed=Kho đóng +Stock=Cổ +Stocks=Cổ phiếu +Movement=Phong trào +Movements=Biến động +Sell=Bán hàng +Buy=Mua +OnSell=Bán +OnBuy=Mua +NotOnSell=Không phải để bán +ProductStatusOnSell=Bán +ProductStatusNotOnSell=Không phải để bán +ProductStatusOnSellShort=Bán +ProductStatusNotOnSellShort=Không phải để bán +ProductStatusOnBuy=Mua +ProductStatusNotOnBuy=Không mua +ProductStatusOnBuyShort=Mua +ProductStatusNotOnBuyShort=Không mua +UpdatePrice=Giá cập nhật +AppliedPricesFrom=Giá áp dụng từ +SellingPrice=Giá bán +SellingPriceHT=Giá bán (đã trừ thuế) +SellingPriceTTC=Giá bán (bao thuế.) +PublicPrice=Giá công +CurrentPrice=Giá hiện tại +NewPrice=Giá mới +MinPrice=Giọt. giá bán +MinPriceHT=Giọt. giá bán (đã trừ thuế) +MinPriceTTC=Giọt. giá bán (bao thuế.) +CantBeLessThanMinPrice=Giá bán không thấp hơn mức cho phép cho sản phẩm này (% s không có thuế) tối thiểu. Thông báo này cũng có thể xuất hiện khi bạn nhập một giảm quá quan trọng. +ContractStatus=Tình trạng hợp đồng +ContractStatusClosed=Đóng +ContractStatusRunning=Chạy +ContractStatusExpired=hết hạn +ContractStatusOnHold=Không chạy +ContractStatusToRun=Để có được chạy +ContractNotRunning=Hợp đồng này không hoạt động +ErrorProductAlreadyExists=Một sản phẩm có sự tham khảo% s đã tồn tại. +ErrorProductBadRefOrLabel=Giá trị sai để tham khảo hoặc nhãn. +ErrorProductClone=Có một vấn đề trong khi cố gắng để sao chép các sản phẩm hoặc dịch vụ. +ErrorPriceCantBeLowerThanMinPrice=Lỗi giá không thể thấp hơn giá tối thiểu. +Suppliers=Nhà cung cấp +SupplierRef=Ref sản phẩm của nhà cung cấp. +ShowProduct=Hiện sản phẩm +ShowService=Hiện dịch vụ +ProductsAndServicesArea=Sản phẩm và dịch vụ khu vực +ProductsArea=Khu vực sản phẩm +ServicesArea=Khu vực dịch vụ +AddToMyProposals=Thêm vào đề nghị của tôi +AddToOtherProposals=Thêm vào các đề xuất khác +AddToMyBills=Thêm vào hóa đơn của tôi +AddToOtherBills=Thêm vào hóa đơn khác +CorrectStock=Chứng khoán chính xác +AddPhoto=Thêm hình ảnh +ListOfStockMovements=Danh sách chuyển động chứng khoán +BuyingPrice=Giá mua +SupplierCard=Nhà cung cấp thẻ +CommercialCard=Thẻ thương mại +AllWays=Con đường để tìm sản phẩm của bạn trong kho +NoCat=Sản phẩm của bạn không có trong bất kỳ thể loại +PrimaryWay=Con đường chính +PriceRemoved=Giá loại bỏ +BarCode=Mã vạch +BarcodeType=Loại mã vạch +SetDefaultBarcodeType=Đặt mã vạch loại +BarcodeValue=Giá trị mã vạch +NoteNotVisibleOnBill=Lưu ý (không hiển thị trên hóa đơn, đề nghị ...) +CreateCopy=Tạo bản sao +ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ với thời gian hạn chế: +MultiPricesAbility=Một số mức giá cho mỗi sản phẩm / dịch vụ +MultiPricesNumPrices=Số giá +MultiPriceLevelsName=Loại giá +AssociatedProductsAbility=Kích hoạt tính năng sản phẩm ảo +AssociatedProducts=Sản phẩm ảo +AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm ảo này +ParentProductsNumber=Số phụ huynh sản phẩm ảo +IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm ảo +IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm ảo +EditAssociate=Phó +Translation=Dịch +KeywordFilter=Bộ lọc từ khóa +CategoryFilter=Bộ lọc danh mục +ProductToAddSearch=Tìm kiếm sản phẩm để thêm +AddDel=Thêm / Xóa +Quantity=Số lượng +NoMatchFound=Không có trận đấu được tìm thấy +ProductAssociationList=Danh sách sản phẩm / dịch vụ liên quan: tên của sản phẩm / dịch vụ (số lượng bị ảnh hưởng) +ProductParentList=Danh sách sản phẩm ảo / dịch vụ với sản phẩm này như một thành phần +ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là cha mẹ với sản phẩm hiện tại +DeleteProduct=Xóa một sản phẩm / dịch vụ +ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này / dịch vụ? +ProductDeleted=Sản phẩm / dịch vụ "% s" sẽ bị xóa khỏi cơ sở dữ liệu. +DeletePicture=Xóa một bức tranh +ConfirmDeletePicture=Bạn Bạn có chắc chắn muốn xóa ảnh này? +ExportDataset_produit_1=Sản phẩm +ExportDataset_service_1=Dịch vụ +ImportDataset_produit_1=Sản phẩm +ImportDataset_service_1=Dịch vụ +DeleteProductLine=Xóa dòng sản phẩm +ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản phẩm này? +NoProductMatching=Không có sản phẩm / dịch vụ phù hợp với tiêu chí của bạn +MatchingProducts=Phù hợp với sản phẩm / dịch vụ +NoStockForThisProduct=Không có cổ phiếu nào cho sản phẩm này +NoStock=Không Cổ +Restock=Trồng cây +ProductSpecial=Đặc biệt +QtyMin=Số lượng tối thiểu +PriceQty=Giá cho số lượng này +PriceQtyMin=Giá cho min này. SL (w / o giảm giá) +VATRateForSupplierProduct=Tỷ lệ thuế GTGT (đối với nhà cung cấp / sản phẩm) +DiscountQtyMin=Mặc định giảm giá cho SL +NoPriceDefinedForThisSupplier=Không có giá / SL xác định cho nhà cung cấp / sản phẩm +NoSupplierPriceDefinedForThisProduct=Không có giá nhà cung cấp / SL được xác định cho sản phẩm này +RecordedProducts=Sản phẩm được ghi lại +RecordedServices=Dịch vụ ghi +RecordedProductsAndServices=Sản phẩm / dịch vụ được ghi nhận +PredefinedProductsToSell=Sản phẩm được xác định trước để bán +PredefinedServicesToSell=Dịch vụ được xác định trước để bán +PredefinedProductsAndServicesToSell=Sản phẩm được xác định trước / dịch vụ để bán +PredefinedProductsToPurchase=Sản phẩm được xác định trước để mua hàng +PredefinedServicesToPurchase=Dịch vụ được xác định trước để mua hàng +PredefinedProductsAndServicesToPurchase=Sản phẩm được xác định trước / dịch vụ để puchase +GenerateThumb=Tạo ngón tay cái +ProductCanvasAbility=Sử dụng đặc biệt "vải" addons +ServiceNb=Dịch vụ #% s +ListProductServiceByPopularity=Danh sách sản phẩm / dịch vụ nổi tiếng +ListProductByPopularity=Danh sách sản phẩm nổi tiếng +ListServiceByPopularity=Danh sách các dịch vụ nổi tiếng +Finished=Sản phẩm sản xuất +RowMaterial=Nguyên liệu +CloneProduct=Sản phẩm hoặc dịch vụ Clone +ConfirmCloneProduct=Bạn có chắc chắn bạn muốn nhân bản sản phẩm hoặc dịch vụ% s? +CloneContentProduct=Sao lưu tất cả thông tin chính của sản phẩm / dịch vụ +ClonePricesProduct=Thông tin chính Clone và giá cả +CloneCompositionProduct=Ảo sản phẩm / dịch vụ Clone +ProductIsUsed=Sản phẩm này được sử dụng +NewRefForClone=Tài liệu tham khảo. các sản phẩm mới / dịch vụ +CustomerPrices=Giá khách hàng +SuppliersPrices=Giá nhà cung cấp +SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (các sản phẩm hoặc dịch vụ) +CustomCode=Luật hải quan +CountryOrigin=Nước xuất xứ +HiddenIntoCombo=Thành viên ẩn danh vào danh sách chọn +Nature=Thiên nhiên +ProductCodeModel=Ref sản phẩm mẫu +ServiceCodeModel=Dịch vụ ref mẫu +AddThisProductCard=Tạo ra sản phẩm thẻ +HelpAddThisProductCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một sản phẩm nếu nó không tồn tại. +AddThisServiceCard=Tạo dịch vụ thẻ +HelpAddThisServiceCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một dịch vụ nếu nó không tồn tại. +CurrentProductPrice=Giá hiện tại +AlwaysUseNewPrice=Luôn luôn sử dụng giá hiện tại của sản phẩm / dịch vụ +AlwaysUseFixedPrice=Sử dụng các mức giá cố định +PriceByQuantity=Giá bán của của số lượng +PriceByQuantityRange=Phạm vi số lượng +ProductsDashboard=Sản phẩm / dịch vụ tóm tắt +UpdateOriginalProductLabel=Sửa đổi nhãn gốc +HelpUpdateOriginalProductLabel=Cho phép chỉnh sửa tên của sản phẩm ### composition fabrication -Building=Production and items dispatchment -Build=Produce -BuildIt=Produce & Dispatch -BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) -QtyNeed=Qty -UnitPmp=Net unit VWAP -CostPmpHT=Net total VWAP -ProductUsedForBuild=Auto consumed by production -ProductBuilded=Production completed -ProductsMultiPrice=Product multi-price -ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) -ProductSellByQuarterHT=Products turnover quarterly VWAP -ServiceSellByQuarterHT=Services turnover quarterly VWAP -Quarter1=1st. Quarter -Quarter2=2nd. Quarter -Quarter3=3rd. Quarter -Quarter4=4th. Quarter -BarCodePrintsheet=Print bar code -PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. -NumberOfStickers=Number of stickers to print on page -PrintsheetForOneBarCode=Print several stickers for one barcode -BuildPageToPrint=Generate page to print -FillBarCodeTypeAndValueManually=Fill barcode type and value manually. -FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. -FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. -DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. -DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. -BarCodeDataForProduct=Barcode information of product %s : -BarCodeDataForThirdparty=Barcode information of thirdparty %s : -ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) -PriceByCustomer=Price by customer -PriceCatalogue=Unique price per product/service -PricingRule=Pricing Rules -AddCustomerPrice=Add price by customers -ForceUpdateChildPriceSoc=Set same price on customer subsidiaries -PriceByCustomerLog=Price by customer log -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +Building=Sản xuất và các mặt hàng dispatchment +Build=Sản xuất +BuildIt=Sản xuất & văn +BuildindListInfo=Số lượng có sẵn để sản xuất mỗi kho (đặt nó là 0 cho không có thêm hành động) +QtyNeed=Số lượng +UnitPmp=Đơn vị VWAP Net +CostPmpHT=Tổng VWAP Net +ProductUsedForBuild=Tự động tiêu thụ sản +ProductBuilded=Sản xuất hoàn thành +ProductsMultiPrice=Sản phẩm đa giá +ProductsOrServiceMultiPrice=Giá của khách hàng (những sản phẩm, dịch vụ, đa giá) +ProductSellByQuarterHT=Sản phẩm doanh thu quý VWAP +ServiceSellByQuarterHT=Dịch vụ doanh thu quý VWAP +Quarter1=1. Quý +Quarter2=2. Quý +Quarter3=3. Quý +Quarter4=4. Quý +BarCodePrintsheet=In mã vạch +PageToGenerateBarCodeSheets=Với công cụ này, bạn có thể in tờ dán mã vạch. Chọn định dạng của trang nhãn dán của bạn, loại mã vạch và giá trị của mã vạch, sau đó nhấn vào nút% s. +NumberOfStickers=Số nhãn in trên trang +PrintsheetForOneBarCode=In nhiều dán một mã vạch +BuildPageToPrint=Tạo trang in +FillBarCodeTypeAndValueManually=Điền loại mã vạch và giá trị bằng tay. +FillBarCodeTypeAndValueFromProduct=Điền loại mã vạch và giá trị từ mã vạch của sản phẩm. +FillBarCodeTypeAndValueFromThirdParty=Điền loại mã vạch và giá trị từ mã vạch của một của bên thứ ba. +DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho các sản phẩm% s. +DefinitionOfBarCodeForThirdpartyNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không hoàn chỉnh cho% s của bên thứ ba. +BarCodeDataForProduct=Thông tin mã vạch của sản phẩm% s: +BarCodeDataForThirdparty=Thông tin mã vạch của bên thứ ba của% s: +ResetBarcodeForAllRecords=Xác định giá trị mã vạch cho tất cả các hồ sơ (cũng sẽ thiết lập lại giá trị này đã được xác định mã vạch với các giá trị mới) +PriceByCustomer=Giá bán của khách hàng +PriceCatalogue=Giá duy nhất cho mỗi sản phẩm / dịch vụ +PricingRule=Quy định giá +AddCustomerPrice=Thêm giá của khách hàng +ForceUpdateChildPriceSoc=Đặt giá trên cùng một công ty con của khách hàng +PriceByCustomerLog=Giá bán của khách hàng đăng nhập +MinimumPriceLimit=Giá tối thiểu không thấp hơn% s +MinimumRecommendedPrice=Giá đề nghị tối thiểu là:% s diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang index 05b230ea1d7..53fbbdafe60 100644 --- a/htdocs/langs/vi_VN/projects.lang +++ b/htdocs/langs/vi_VN/projects.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Ref. project -ProjectId=Project Id +RefProject=Tài liệu tham khảo. dự án +ProjectId=Mã dự án Project=Dự án Projects=Các dự án SharedProject=Mọi người @@ -32,18 +32,18 @@ TimeSpent=Thời gian đã qua TimesSpent=Thời gian đã qua RefTask=Tác vụ tham chiếu LabelTask=Nhãn của tác vụ -TaskTimeSpent=Time spent on tasks -TaskTimeUser=User -TaskTimeNote=Note -TaskTimeDate=Date +TaskTimeSpent=Thời gian dành cho công việc +TaskTimeUser=Người sử dụng +TaskTimeNote=Lưu ý +TaskTimeDate=Ngày NewTimeSpent=Thời gian đã qua mới MyTimeSpent=Thời gian đã qua của tôi MyTasks=Tác vụ của tôi Tasks=Tác vụ Task=Tác vụ -TaskDateStart=Task start date -TaskDateEnd=Task end date -TaskDescription=Task description +TaskDateStart=Nhiệm vụ ngày bắt đầu +TaskDateEnd=Nhiệm vụ ngày kết thúc +TaskDescription=Mô tả công việc NewTask=Tác vụ mới AddTask=Thêm tác vụ AddDuration=Thêm độ dài thời gian @@ -54,8 +54,8 @@ MyActivities=Tác vụ/hoạt động của tôi MyProjects=Dự án của tôi DurationEffective=Độ dài thời gian hiệu quả Progress=Tiến độ -ProgressDeclared=Declared progress -ProgressCalculated=Calculated progress +ProgressDeclared=Tiến độ công bố +ProgressCalculated=Tính tiến bộ Time=Thời gian ListProposalsAssociatedProject=Danh sách các gợi ý thương mại được gắn với dự án ListOrdersAssociatedProject=Danh sách các đơn đặt hàng từ khách hàng được gắn với dự án @@ -85,13 +85,13 @@ ActionsOnProject=Các sự kiện liên quan đến dự án YouAreNotContactOfProject=Bạn không thuộc phần liên lạc đối với chủ đề thuộc phạm vi riêng tư này DeleteATimeSpent=Xóa thời gian đã bỏ ra ConfirmDeleteATimeSpent=Bạn có chắc muốn xóa thời gian đã bỏ ra? -DoNotShowMyTasksOnly=Xem thêm các tác vụ không được phân bổ cho tôi -ShowMyTasksOnly=Chỉ xem các tác vụ được phân bổ cho tôi +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=Các nguồn tài nguyên ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này NoTasks=Không có tác vụ nào cho dự án này LinkedToAnotherCompany=Được liên kết đến các bên thứ ba -TaskIsNotAffectedToYou=Tác vụ không được phân bổ dành cho bạn +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=Thời gian đã qua hiện đang rỗng ThisWillAlsoRemoveTasks=Thao tác này sẽ xóa toàn bộ các tác vụ của dự án (%s các tác vụ ở thời điểm hiện tại) và toàn bộ dữ liệu đã nhập vào trong suốt thời gian vừa qua. IfNeedToUseOhterObjectKeepEmpty=Nếu một số đối tượng (đơn hàng, đơn đặt hàng, ...), thuộc về một bên thứ ba khác, phải có đường liên kết đến dự án để tạo, duy trì phần này rỗng để dự án có thể có sự tham gia của nhiều bên thứ ba khác @@ -99,32 +99,34 @@ CloneProject=Nhân bản dự án CloneTasks=Nhân bản tác vụ CloneContacts=Nhân bản liên lạc CloneNotes=Nhân bản các ghi chú -CloneProjectFiles=Clone project joined files -CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) +CloneProjectFiles=Dự án Clone tham gia các tập tin +CloneTaskFiles=Clone nhiệm vụ (các) tập tin tham gia (nếu nhiệm vụ (các) nhân bản vô tính) ConfirmCloneProject=Bạn có chắc rằng bạn muốn nhân bản dự án này? ProjectReportDate=Thay đổi thời gian tác vụ theo thời gian bắt đầu dự án ErrorShiftTaskDate=Không thể dịch chuyển ngày của phần tác vụ dựa theo ngày bắt đầu của dự án mới ProjectsAndTasksLines=Các dự án và tác vụ ProjectCreatedInDolibarr=Đã tạo dự án %s -TaskCreatedInDolibarr=Task %s created -TaskModifiedInDolibarr=Task %s modified -TaskDeletedInDolibarr=Task %s deleted +TaskCreatedInDolibarr=Nhiệm vụ% s tạo +TaskModifiedInDolibarr=Nhiệm vụ% s sửa đổi +TaskDeletedInDolibarr=Nhiệm vụ% s bị xóa ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Người lãnh đạo dự án TypeContact_project_external_PROJECTLEADER=Người lãnh đạo dự án -TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor -TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_internal_PROJECTCONTRIBUTOR=Đóng góp +TypeContact_project_external_PROJECTCONTRIBUTOR=Đóng góp TypeContact_project_task_internal_TASKEXECUTIVE=Thi hành tác vụ TypeContact_project_task_external_TASKEXECUTIVE=Thi hành tác vụ -TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor -TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor -SelectElement=Select element -AddElement=Link to element +TypeContact_project_task_internal_TASKCONTRIBUTOR=Đóng góp +TypeContact_project_task_external_TASKCONTRIBUTOR=Đóng góp +SelectElement=Chọn phần +AddElement=Liên kết đến yếu tố +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Mô hình báo cáo hoàn chỉnh của dự án (lôgô...) PlannedWorkload = Tải tiến trình công việc đã dự định WorkloadOccupation= Sử dụng tiến trình công việc ProjectReferers=Các đối tượng tham chiếu -SearchAProject=Search a project -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects +SearchAProject=Tìm kiếm một dự án +ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên +ProjectDraft=Dự thảo dự án +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang index 8970d1eb2df..bb544bbfc61 100644 --- a/htdocs/langs/vi_VN/propal.lang +++ b/htdocs/langs/vi_VN/propal.lang @@ -1,102 +1,102 @@ # Dolibarr language file - Source file is en_US - propal -Proposals=Commercial proposals -Proposal=Commercial proposal -ProposalShort=Proposal -ProposalsDraft=Draft commercial proposals -ProposalDraft=Draft commercial proposal -ProposalsOpened=Opened commercial proposals -Prop=Commercial proposals -CommercialProposal=Commercial proposal -CommercialProposals=Commercial proposals -ProposalCard=Proposal card -NewProp=New commercial proposal -NewProposal=New commercial proposal -NewPropal=New proposal -Prospect=Prospect -ProspectList=Prospect list -DeleteProp=Delete commercial proposal -ValidateProp=Validate commercial proposal -AddProp=Add proposal -ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? -ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name %s ? -LastPropals=Last %s proposals -LastClosedProposals=Last %s closed proposals -LastModifiedProposals=Last %s modified proposals -AllPropals=All proposals -LastProposals=Last proposals -SearchAProposal=Search a proposal -ProposalsStatistics=Commercial proposal's statistics -NumberOfProposalsByMonth=Number by month -AmountOfProposalsByMonthHT=Amount by month (net of tax) -NbOfProposals=Number of commercial proposals -ShowPropal=Show proposal -PropalsDraft=Drafts -PropalsOpened=Opened -PropalsNotBilled=Closed not billed -PropalStatusDraft=Draft (needs to be validated) -PropalStatusValidated=Validated (proposal is open) -PropalStatusOpened=Validated (proposal is open) -PropalStatusClosed=Closed -PropalStatusSigned=Signed (needs billing) -PropalStatusNotSigned=Not signed (closed) -PropalStatusBilled=Billed -PropalStatusDraftShort=Draft -PropalStatusValidatedShort=Validated -PropalStatusOpenedShort=Opened -PropalStatusClosedShort=Closed -PropalStatusSignedShort=Signed -PropalStatusNotSignedShort=Not signed -PropalStatusBilledShort=Billed -PropalsToClose=Commercial proposals to close -PropalsToBill=Signed commercial proposals to bill -ListOfProposals=List of commercial proposals -ActionsOnPropal=Events on proposal -NoOpenedPropals=No opened commercial proposals -NoOtherOpenedPropals=No other opened commercial proposals -RefProposal=Commercial proposal ref -SendPropalByMail=Send commercial proposal by mail -FileNotUploaded=The file was not uploaded -FileUploaded=The file was successfully uploaded -AssociatedDocuments=Documents associated with the proposal: -ErrorCantOpenDir=Can't open directory -DatePropal=Date of proposal -DateEndPropal=Validity ending date -DateEndPropalShort=Date end -ValidityDuration=Validity duration -CloseAs=Close with status -ClassifyBilled=Classify billed -BuildBill=Build invoice -ErrorPropalNotFound=Propal %s not found -Estimate=Estimate : -EstimateShort=Estimate -OtherPropals=Other proposals -AddToDraftProposals=Add to draft proposal -NoDraftProposals=No draft proposals -CopyPropalFrom=Create commercial proposal by copying existing proposal -CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services -DefaultProposalDurationValidity=Default commercial proposal validity duration (in days) -UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address -ClonePropal=Clone commercial proposal -ConfirmClonePropal=Are you sure you want to clone the commercial proposal %s ? -ConfirmReOpenProp=Are you sure you want to open back the commercial proposal %s ? -ProposalsAndProposalsLines=Commercial proposal and lines -ProposalLine=Proposal line -AvailabilityPeriod=Availability delay -SetAvailability=Set availability delay -AfterOrder=after order +Proposals=Đề nghị thương mại +Proposal=Đề nghị thương mại +ProposalShort=Đề nghị +ProposalsDraft=Dự thảo đề xuất thương mại +ProposalDraft=Dự thảo đề xuất thương mại +ProposalsOpened=Đề nghị thương mại mở +Prop=Đề nghị thương mại +CommercialProposal=Đề nghị thương mại +CommercialProposals=Đề nghị thương mại +ProposalCard=Thẻ đề nghị +NewProp=Đề nghị thương mại mới +NewProposal=Đề nghị thương mại mới +NewPropal=Đề xuất mới +Prospect=Triển vọng +ProspectList=Danh sách khách hàng tiềm năng +DeleteProp=Xóa đề nghị thương mại +ValidateProp=Xác nhận đề nghị thương mại +AddProp=Thêm đề nghị +ConfirmDeleteProp=Bạn Bạn có chắc chắn muốn xóa đề nghị thương mại này? +ConfirmValidateProp=Bạn có chắc chắn bạn muốn xác nhận đề nghị thương mại này dưới tên% s? +LastPropals=Cuối% s đề xuất +LastClosedProposals=Cuối% s đề xuất khép kín +LastModifiedProposals=Đề xuất sửa đổi lần cuối% s +AllPropals=Tất cả các đề xuất +LastProposals=Đề nghị cuối cùng +SearchAProposal=Tìm kiếm một đề nghị +ProposalsStatistics=Số liệu thống kê thương mại đề nghị của +NumberOfProposalsByMonth=Số theo tháng +AmountOfProposalsByMonthHT=Số tiền theo tháng (sau thuế) +NbOfProposals=Số đề xuất thương mại +ShowPropal=Hiện đề nghị +PropalsDraft=Dự thảo +PropalsOpened=Mở +PropalsNotBilled=Đóng không phải lập hóa đơn +PropalStatusDraft=Dự thảo (cần phải được xác nhận) +PropalStatusValidated=Xác nhận (đề nghị được mở) +PropalStatusOpened=Xác nhận (đề nghị được mở) +PropalStatusClosed=Đóng +PropalStatusSigned=Ký (cần thanh toán) +PropalStatusNotSigned=Không đăng (đóng cửa) +PropalStatusBilled=Hóa đơn +PropalStatusDraftShort=Dự thảo +PropalStatusValidatedShort=Xác nhận +PropalStatusOpenedShort=Mở +PropalStatusClosedShort=Đóng +PropalStatusSignedShort=Ký +PropalStatusNotSignedShort=Không đăng +PropalStatusBilledShort=Hóa đơn +PropalsToClose=Đề nghị thương mại phải đóng cửa +PropalsToBill=Ký kết các đề xuất thương mại vào hóa đơn +ListOfProposals=Danh sách các đề xuất thương mại +ActionsOnPropal=Sự kiện về đề nghị +NoOpenedPropals=Không có đề xuất thương mại mở +NoOtherOpenedPropals=Không có đề xuất thương mại mở khác +RefProposal=Đề nghị ref thương mại +SendPropalByMail=Gửi đề nghị thương mại qua đường bưu điện +FileNotUploaded=Các tập tin không được tải lên +FileUploaded=Các tập tin được tải lên thành công +AssociatedDocuments=Các tài liệu liên quan đến đề nghị: +ErrorCantOpenDir=Không thể mở thư mục +DatePropal=Ngày đề nghị +DateEndPropal=Hiệu lực ngày kết thúc +DateEndPropalShort=Ngày kết thúc +ValidityDuration=Thời hạn hiệu lực +CloseAs=Chặt chẽ với tình trạng +ClassifyBilled=Phân loại hóa đơn +BuildBill=Xây dựng hóa đơn +ErrorPropalNotFound=Propal% s không tìm thấy +Estimate=Ước tính: +EstimateShort=Ước tính +OtherPropals=Các đề xuất khác +AddToDraftProposals=Thêm vào dự thảo đề xuất +NoDraftProposals=Không có đề xuất dự thảo +CopyPropalFrom=Tạo đề nghị thương mại bằng cách sao chép đề nghị hiện tại +CreateEmptyPropal=Tạo ra sản phẩm nào đề xuất thương mại Vierge hoặc từ danh sách các sản phẩm / dịch vụ +DefaultProposalDurationValidity=Mặc định thời hạn đề nghị thương mại (trong ngày) +UseCustomerContactAsPropalRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ đề nghị người nhận +ClonePropal=Đề nghị thương mại Clone +ConfirmClonePropal=Bạn có chắc chắn bạn muốn nhân bản đề nghị thương mại% s? +ConfirmReOpenProp=Bạn có chắc chắn bạn muốn mở lại đề nghị thương mại% s? +ProposalsAndProposalsLines=Đề nghị thương mại và dòng +ProposalLine=Nga đề xuất +AvailabilityPeriod=Sẵn sàng trì hoãn +SetAvailability=Set sẵn sàng trì hoãn +AfterOrder=sau động lệnh ##### Availability ##### -AvailabilityTypeAV_NOW=Immediate -AvailabilityTypeAV_1W=1 week -AvailabilityTypeAV_2W=2 weeks -AvailabilityTypeAV_3W=3 weeks -AvailabilityTypeAV_1M=1 month +AvailabilityTypeAV_NOW=Ngay lập tức +AvailabilityTypeAV_1W=1 tuần +AvailabilityTypeAV_2W=2 tuần +AvailabilityTypeAV_3W=3 tuần +AvailabilityTypeAV_1M=1 tháng ##### Types de contacts ##### -TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal -TypeContact_propal_external_BILLING=Customer invoice contact -TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal +TypeContact_propal_internal_SALESREPFOLL=Sau-up đề nghị đại diện +TypeContact_propal_external_BILLING=Hóa đơn của khách hàng liên lạc +TypeContact_propal_external_CUSTOMER=Liên hệ với khách hàng sau-up đề nghị # Document models -DocModelAzurDescription=A complete proposal model (logo...) -DocModelJauneDescription=Jaune proposal model -DefaultModelPropalCreate=Default model creation -DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) -DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) +DocModelAzurDescription=Một mô hình đề xuất đầy đủ (logo ...) +DocModelJauneDescription=Mô hình đề nghị Jaune +DefaultModelPropalCreate=Tạo mô hình mặc định +DefaultModelPropalToBill=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (được lập hoá đơn) +DefaultModelPropalClosed=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (chưa lập hoá đơn) diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang index edca71a1829..a709c52f7a5 100644 --- a/htdocs/langs/vi_VN/salaries.lang +++ b/htdocs/langs/vi_VN/salaries.lang @@ -1,8 +1,12 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries -Employee=Employee -NewSalaryPayment=New salary payment -SalaryPayment=Salary payment -SalariesPayments=Salaries payments -ShowSalaryPayment=Show salary payment +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Kế toán mã cho các khoản thanh toán tiền lương +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Kế toán mã cho phụ trách tài chính +Salary=Mức lương +Salaries=Tiền lương +Employee=Nhân viên +NewSalaryPayment=Thanh toán tiền lương mới +SalaryPayment=Thanh toán tiền lương +SalariesPayments=Lương thanh toán +ShowSalaryPayment=Hiện thanh toán tiền lương +THM=Giá trung bình theo giờ +TJM=Giá trung bình hàng ngày diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang index 039d47f6aa9..88e52a17a5f 100644 --- a/htdocs/langs/vi_VN/sendings.lang +++ b/htdocs/langs/vi_VN/sendings.lang @@ -1,74 +1,78 @@ # Dolibarr language file - Source file is en_US - sendings -RefSending=Ref. shipment -Sending=Shipment -Sendings=Shipments -Shipment=Shipment -Shipments=Shipments +RefSending=Tài liệu tham khảo. lô hàng +Sending=Lô hàng +Sendings=Lô hàng +Shipment=Lô hàng +Shipments=Lô hàng Receivings=Receivings -SendingsArea=Shipments area -ListOfSendings=List of shipments -SendingMethod=Shipping method -SendingReceipt=Shipping receipt -LastSendings=Last %s shipments -SearchASending=Search for shipment -StatisticsOfSendings=Statistics for shipments -NbOfSendings=Number of shipments -NumberOfShipmentsByMonth=Number of shipments by month -SendingCard=Shipping card -NewSending=New shipment -CreateASending=Create a shipment -CreateSending=Create shipment -QtyOrdered=Qty ordered -QtyShipped=Qty shipped -QtyToShip=Qty to ship -QtyReceived=Qty received -KeepToShip=Keep to ship -OtherSendingsForSameOrder=Other shipments for this order -DateSending=Date sending order -DateSendingShort=Date sending order -SendingsForSameOrder=Shipments for this order -SendingsAndReceivingForSameOrder=Shipments and receivings for this order -SendingsToValidate=Shipments to validate -StatusSendingCanceled=Canceled -StatusSendingDraft=Draft -StatusSendingValidated=Validated (products to ship or already shipped) -StatusSendingProcessed=Processed -StatusSendingCanceledShort=Canceled -StatusSendingDraftShort=Draft -StatusSendingValidatedShort=Validated -StatusSendingProcessedShort=Processed -SendingSheet=Sending sheet -Carriers=Carriers -Carrier=Carrier -CarriersArea=Carriers area -NewCarrier=New carrier -ConfirmDeleteSending=Are you sure you want to delete this shipment ? -ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? -ConfirmCancelSending=Are you sure you want to cancel this shipment ? -GenericTransport=Generic transport -Enlevement=Gotten by customer -DocumentModelSimple=Simple document model -DocumentModelMerou=Merou A5 model -WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. -StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -DateDeliveryPlanned=Planed date of delivery -DateReceived=Date delivery received -SendShippingByEMail=Send shipment by EMail -SendShippingRef=Send shipment %s -ActionsOnShipping=Events on shipment -LinkToTrackYourPackage=Link to track your package -ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -RelatedShippings=Related shippings -ShipmentLine=Shipment line -CarrierList=List of transporters +SendingsArea=Diện tích lô hàng +ListOfSendings=Danh sách các lô hàng +SendingMethod=Phương thức vận chuyển +SendingReceipt=Nhận vận chuyển +LastSendings=Cuối% của lô hàng +SearchASending=Tìm kiếm hàng +StatisticsOfSendings=Thống kê cho lô hàng +NbOfSendings=Số lô hàng +NumberOfShipmentsByMonth=Số lô hàng theo tháng +SendingCard=Thẻ vận chuyển +NewSending=Lô hàng mới +CreateASending=Tạo một lô hàng +CreateSending=Tạo lô hàng +QtyOrdered=Số lượng đặt hàng +QtyShipped=Số lượng vận chuyển +QtyToShip=Số lượng xuất xưởng +QtyReceived=Số lượng nhận được +KeepToShip=Giữ tàu +OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này +DateSending=Ngày gửi đơn đặt hàng +DateSendingShort=Ngày gửi đơn đặt hàng +SendingsForSameOrder=Các lô hàng về đơn hàng này +SendingsAndReceivingForSameOrder=Lô hàng và Receivings về đơn hàng này +SendingsToValidate=Lô hàng để xác nhận +StatusSendingCanceled=Hủy bỏ +StatusSendingDraft=Dự thảo +StatusSendingValidated=Xác nhận (sản phẩm để vận chuyển hoặc đã được vận chuyển) +StatusSendingProcessed=Xử lý +StatusSendingCanceledShort=Hủy bỏ +StatusSendingDraftShort=Dự thảo +StatusSendingValidatedShort=Xác nhận +StatusSendingProcessedShort=Xử lý +SendingSheet=Gửi tờ +Carriers=Các hãng tàu +Carrier=Nhà cung cấp +CarriersArea=Khu vực các tàu sân bay +NewCarrier=Tàu sân bay mới +ConfirmDeleteSending=Bạn Bạn có chắc chắn muốn xóa lô hàng này? +ConfirmValidateSending=Bạn có chắc chắn bạn muốn xác nhận lô hàng này có sự tham khảo% s? +ConfirmCancelSending=Bạn Bạn có chắc chắn muốn hủy lô hàng này? +GenericTransport=Chung vận chuyển +Enlevement=Nhận của khách hàng +DocumentModelSimple=Mô hình tài liệu đơn giản +DocumentModelMerou=Mô hình Merou A5 +WarningNoQtyLeftToSend=Cảnh báo, không có sản phẩm chờ đợi để được vận chuyển. +StatsOnShipmentsOnlyValidated=Thống kê tiến hành với các chuyến hàng chỉ xác nhận. Ngày sử dụng là ngày xác nhận giao hàng (dự ngày giao hàng không phải luôn luôn được biết đến). +DateDeliveryPlanned=Ngày quy hoạch giao hàng +DateReceived=Ngày giao nhận +SendShippingByEMail=Gửi hàng bằng thư điện tử +SendShippingRef=Nộp hàng% s +ActionsOnShipping=Các sự kiện trên lô hàng +LinkToTrackYourPackage=Liên kết để theo dõi gói của bạn +ShipmentCreationIsDoneFromOrder=Đối với thời điểm này, tạo ra một lô hàng mới được thực hiện từ thẻ thứ tự. +RelatedShippings=Shippings liên quan +ShipmentLine=Đường vận chuyển +CarrierList=Danh sách vận chuyển # Sending methods -SendingMethodCATCH=Catch by customer +SendingMethodCATCH=Catch của khách hàng SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo # ModelDocument -DocumentModelSirocco=Simple document model for delivery receipts -DocumentModelTyphon=More complete document model for delivery receipts (logo...) -Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined -SumOfProductVolumes=Sum of product volumes -SumOfProductWeights=Sum of product weights +DocumentModelSirocco=Tài liệu mô hình đơn giản để biên lai giao hàng +DocumentModelTyphon=Mô hình tài liệu đầy đủ hơn cho hóa đơn giao hàng (logo ...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER liên tục không được xác định +SumOfProductVolumes=Tổng khối lượng sản phẩm +SumOfProductWeights=Tổng trọng lượng sản phẩm + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/vi_VN/shop.lang b/htdocs/langs/vi_VN/shop.lang index 156af426bb0..bfc4e1a7d71 100644 --- a/htdocs/langs/vi_VN/shop.lang +++ b/htdocs/langs/vi_VN/shop.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online +FailedConnectDBCheckModuleSetup=Không thể kết nối với cơ sở dữ liệu osCommerce. Kiểm tra thiết lập module của bạn +Shop=Cửa hàng +ShopWeb=Web cửa hàng +LastOrders=Đơn đặt hàng cuối cùng +OnStandBy=Ở chế độ chờ +TreatmentInProgress=Điều trị cơ bản dở +LastCustomers=Khách hàng cuối +OSCommerceShop=OsCommerce cửa hàng +OSCommerce=OsCommerce +AddProd=Bán hàng trực tuyến diff --git a/htdocs/langs/vi_VN/sms.lang b/htdocs/langs/vi_VN/sms.lang index c710e9f39ff..a6a78549842 100644 --- a/htdocs/langs/vi_VN/sms.lang +++ b/htdocs/langs/vi_VN/sms.lang @@ -1,53 +1,53 @@ # Dolibarr language file - Source file is en_US - sms Sms=Sms -SmsSetup=Sms setup -SmsDesc=This page allows you to define globals options on SMS features -SmsCard=SMS Card -AllSms=All SMS campains -SmsTargets=Targets -SmsRecipients=Targets -SmsRecipient=Target -SmsTitle=Description -SmsFrom=Sender -SmsTo=Target -SmsTopic=Topic of SMS -SmsText=Message -SmsMessage=SMS Message -ShowSms=Show Sms -ListOfSms=List SMS campains -NewSms=New SMS campain -EditSms=Edit Sms -ResetSms=New sending -DeleteSms=Delete Sms campain -DeleteASms=Remove a Sms campain -PreviewSms=Previuw Sms -PrepareSms=Prepare Sms -CreateSms=Create Sms -SmsResult=Result of Sms sending -TestSms=Test Sms -ValidSms=Validate Sms -ApproveSms=Approve Sms -SmsStatusDraft=Draft -SmsStatusValidated=Validated -SmsStatusApproved=Approved -SmsStatusSent=Sent -SmsStatusSentPartialy=Sent partially -SmsStatusSentCompletely=Sent completely +SmsSetup=Thiết lập SMS +SmsDesc=Trang này cho phép bạn xác định các tùy chọn toàn cục về các tính năng tin nhắn SMS +SmsCard=SMS Thẻ +AllSms=Campains tất cả tin nhắn SMS +SmsTargets=Mục tiêu +SmsRecipients=Mục tiêu +SmsRecipient=Mục tiêu +SmsTitle=Mô tả +SmsFrom=Tên người gửi +SmsTo=Mục tiêu +SmsTopic=Chủ đề của tin nhắn SMS +SmsText=Tin nhắn +SmsMessage=SMS tin nhắn +ShowSms=Hiện SMS +ListOfSms=Campains Danh sách tin nhắn SMS +NewSms=SMS mới trong chiến dịch +EditSms=Chỉnh sửa SMS +ResetSms=Gửi mới +DeleteSms=Xóa SMS trong chiến dịch +DeleteASms=Loại bỏ một trong chiến dịch SMS +PreviewSms=Previuw SMS +PrepareSms=Chuẩn bị SMS +CreateSms=Tạo SMS +SmsResult=Kết quả SMS gửi +TestSms=Kiểm tra SMS +ValidSms=Xác nhận SMS +ApproveSms=Thông qua SMS +SmsStatusDraft=Dự thảo +SmsStatusValidated=Xác nhận +SmsStatusApproved=Đã được phê duyệt +SmsStatusSent=Gửi +SmsStatusSentPartialy=Gửi một phần +SmsStatusSentCompletely=Gửi hoàn toàn SmsStatusError=Lỗi -SmsStatusNotSent=Not sent -SmsSuccessfulySent=Sms correctly sent (from %s to %s) -ErrorSmsRecipientIsEmpty=Number of target is empty -WarningNoSmsAdded=No new phone number to add to target list -ConfirmValidSms=Do you confirm validation of this campain ? -ConfirmResetMailing=Warning, if you make a reinit of Sms campain %s, you will allow to make a mass sending of it a second time. Is it really what you wan to do ? -ConfirmDeleteMailing=Do you confirm removing of campain ? -NbOfRecipients=Number of targets -NbOfUniqueSms=Nb dof unique phone numbers -NbOfSms=Nbre of phon numbers -ThisIsATestMessage=This is a test message -SendSms=Send SMS -SmsInfoCharRemain=Nb of remaining characters -SmsInfoNumero= (format international ie : +33899701761) -DelayBeforeSending=Delay before sending (minutes) -SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider. +SmsStatusNotSent=Không gửi +SmsSuccessfulySent=Sms được gửi một cách chính xác (từ% s đến% s) +ErrorSmsRecipientIsEmpty=Số mục tiêu có sản phẩm nào +WarningNoSmsAdded=Không có số điện thoại mới để thêm vào danh sách mục tiêu +ConfirmValidSms=Bạn có xác nhận hợp lệ của trong chiến dịch này? +ConfirmResetMailing=Cảnh báo, nếu bạn thực hiện một reinit của SMS trong chiến dịch% s, bạn sẽ cho phép để thực hiện một khối lượng gửi nó một lần thứ hai. Nó thực sự là những gì bạn wan để làm gì? +ConfirmDeleteMailing=Bạn có xác nhận loại bỏ các trong chiến dịch? +NbOfRecipients=Số chỉ tiêu +NbOfUniqueSms=Nb DOF số điện thoại độc đáo +NbOfSms=Nbre số phon +ThisIsATestMessage=Đây là một thông báo +SendSms=Gửi tin nhắn SMS +SmsInfoCharRemain=Nb ký tự còn lại +SmsInfoNumero= (Tức là định dạng quốc tế: 33899701761) +DelayBeforeSending=Chậm trễ trước khi gửi (phút) +SmsNoPossibleRecipientFound=Không có mục tiêu có sẵn. Kiểm tra thiết lập của nhà cung cấp tin nhắn SMS của bạn. diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang index 5d11b0fd7a0..f5bfa524b6e 100644 --- a/htdocs/langs/vi_VN/stocks.lang +++ b/htdocs/langs/vi_VN/stocks.lang @@ -1,125 +1,125 @@ # Dolibarr language file - Source file is en_US - stocks -WarehouseCard=Warehouse card -Warehouse=Warehouse -Warehouses=Warehouses -NewWarehouse=New warehouse / Stock area -WarehouseEdit=Modify warehouse -MenuNewWarehouse=New warehouse -WarehouseOpened=Warehouse opened -WarehouseClosed=Warehouse closed -WarehouseSource=Source warehouse -WarehouseSourceNotDefined=No warehouse defined, -AddOne=Add one -WarehouseTarget=Target warehouse -ValidateSending=Delete sending -CancelSending=Cancel sending -DeleteSending=Delete sending -Stock=Stock -Stocks=Stocks -Movement=Movement -Movements=Movements -ErrorWarehouseRefRequired=Warehouse reference name is required -ErrorWarehouseLabelRequired=Warehouse label is required -CorrectStock=Correct stock -ListOfWarehouses=List of warehouses -ListOfStockMovements=List of stock movements -StocksArea=Stocks area -Location=Location -LocationSummary=Short name location -NumberOfDifferentProducts=Number of different products -NumberOfProducts=Total number of products -LastMovement=Last movement -LastMovements=Last movements -Units=Units -Unit=Unit -StockCorrection=Correct stock -StockTransfer=Stock transfer -StockMovement=Transfer -StockMovements=Stock transfers -LabelMovement=Movement label -NumberOfUnit=Number of units -UnitPurchaseValue=Unit purchase price -TotalStock=Total in stock -StockTooLow=Stock too low -StockLowerThanLimit=Stock lower than alert limit -EnhancedValue=Value -PMPValue=Weighted average price +WarehouseCard=Thẻ kho +Warehouse=Kho +Warehouses=Các kho hàng +NewWarehouse=Kho mới / khu vực chứng khoán +WarehouseEdit=Sửa kho +MenuNewWarehouse=Kho mới +WarehouseOpened=Kho mở +WarehouseClosed=Kho đóng +WarehouseSource=Nguồn kho +WarehouseSourceNotDefined=Không có kho được xác định, +AddOne=Thêm một +WarehouseTarget=Kho tiêu +ValidateSending=Xóa gửi +CancelSending=Hủy bỏ việc gửi +DeleteSending=Xóa gửi +Stock=Cổ +Stocks=Cổ phiếu +Movement=Phong trào +Movements=Biến động +ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết +ErrorWarehouseLabelRequired=Nhãn kho là cần thiết +CorrectStock=Chứng khoán chính xác +ListOfWarehouses=Danh sách kho +ListOfStockMovements=Danh sách chuyển động chứng khoán +StocksArea=Khu vực cổ phiếu +Location=Đến từ +LocationSummary=Ngắn vị trí tên +NumberOfDifferentProducts=Số lượng sản phẩm khác nhau +NumberOfProducts=Tổng số sản phẩm +LastMovement=Chuyển động mới +LastMovements=Phong trào cuối +Units=Đơn vị +Unit=Đơn vị +StockCorrection=Chứng khoán chính xác +StockTransfer=Chuyển nhượng chứng khoán +StockMovement=Chuyển +StockMovements=Chuyển nhượng chứng khoán +LabelMovement=Nhãn Phong trào +NumberOfUnit=Số đơn vị +UnitPurchaseValue=Giá mua đơn vị +TotalStock=Tổng kho +StockTooLow=Cổ phiếu quá thấp +StockLowerThanLimit=Cổ thấp hơn so với giới hạn cảnh báo +EnhancedValue=Giá trị +PMPValue=Giá bình quân gia quyền PMPValueShort=WAP -EnhancedValueOfWarehouses=Warehouses value -UserWarehouseAutoCreate=Create a warehouse automatically when creating a user -QtyDispatched=Quantity dispatched -OrderDispatch=Stock dispatching -RuleForStockManagementDecrease=Rule for stock management decrease -RuleForStockManagementIncrease=Rule for stock management increase -DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation -DeStockOnValidateOrder=Decrease real stocks on customers orders validation -DeStockOnShipment=Decrease real stocks on shipment validation -ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation -ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation -ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving -ReStockOnDeleteInvoice=Increase real stocks on invoice deletion -OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. -StockDiffPhysicTeoric=Reason for difference stock physical and theoretical -NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. -DispatchVerb=Dispatch -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert -PhysicalStock=Physical stock -RealStock=Real Stock -VirtualStock=Virtual stock -MininumStock=Minimum stock -StockUp=Stock up -MininumStockShort=Stock min -StockUpShort=Stock up -IdWarehouse=Id warehouse -DescWareHouse=Description warehouse -LieuWareHouse=Localisation warehouse -WarehousesAndProducts=Warehouses and products -AverageUnitPricePMPShort=Weighted average input price -AverageUnitPricePMP=Weighted average input price -SellPriceMin=Selling Unit Price -EstimatedStockValueSellShort=Value to sell -EstimatedStockValueSell=Value to Sell -EstimatedStockValueShort=Input stock value -EstimatedStockValue=Input stock value -DeleteAWarehouse=Delete a warehouse -ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse %s ? -PersonalStock=Personal stock %s -ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s -SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease -SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase -NoStockAction=No stock action -LastWaitingSupplierOrders=Orders waiting for receptions -DesiredStock=Desired stock -StockToBuy=To order -Replenishment=Replenishment -ReplenishmentOrders=Replenishment orders -VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs -UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature -UseVirtualStock=Use virtual stock -UsePhysicalStock=Use physical stock -CurentSelectionMode=Curent selection mode -CurentlyUsingVirtualStock=Virtual stock -CurentlyUsingPhysicalStock=Physical stock -RuleForStockReplenishment=Rule for stocks replenishment -SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier -AlertOnly= Alerts only -WarehouseForStockDecrease=The warehouse %s will be used for stock decrease -WarehouseForStockIncrease=The warehouse %s will be used for stock increase -ForThisWarehouse=For this warehouse -ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +EnhancedValueOfWarehouses=Các kho hàng giá trị +UserWarehouseAutoCreate=Tạo một kho tự động khi tạo một người sử dụng +QtyDispatched=Số lượng cử +OrderDispatch=Điều phối chứng khoán +RuleForStockManagementDecrease=Quy tắc cho quản lý chứng khoán giảm +RuleForStockManagementIncrease=Quy tắc cho tăng quản lý chứng khoán +DeStockOnBill=Giảm chứng khoán thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận +DeStockOnValidateOrder=Giảm cổ phiếu sản trên khách hàng xác nhận đơn đặt hàng +DeStockOnShipment=Giảm cổ phiếu sản trên xác nhận lô hàng +ReStockOnBill=Tăng cổ phiếu thực tế các nhà cung cấp hoá đơn tín dụng / ghi xác nhận +ReStockOnValidateOrder=Tăng cổ phiếu thực sự tán thành đơn đặt hàng các nhà cung cấp +ReStockOnDispatchOrder=Tăng cổ phiếu sản trên dẫn điều phối vào kho, sau khi tiếp nhận đơn đặt hàng nhà cung cấp +ReStockOnDeleteInvoice=Tăng cổ phiếu sản trên xóa hóa đơn +OrderStatusNotReadyToDispatch=Đặt hàng vẫn chưa hoặc không có thêm một trạng thái cho phép điều phối các sản phẩm trong kho chứng khoán. +StockDiffPhysicTeoric=Lý do cho cổ phiếu khác biệt về thể chất và lý thuyết +NoPredefinedProductToDispatch=Không có sản phẩm được xác định trước cho đối tượng này. Vì vậy, không có điều phối trong chứng khoán là bắt buộc. +DispatchVerb=Công văn +StockLimitShort=Hạn cảnh báo +StockLimit=Hạn cổ phiếu cho cảnh báo +PhysicalStock=Cổ vật lý +RealStock=Bất Cổ +VirtualStock=Chứng khoán ảo +MininumStock=Cổ phiếu tối thiểu +StockUp=Dự trữ +MininumStockShort=Cổ phút +StockUpShort=Dự trữ +IdWarehouse=Kho Id +DescWareHouse=Mô tả kho +LieuWareHouse=Địa phương hóa kho +WarehousesAndProducts=Các kho hàng và sản phẩm +AverageUnitPricePMPShort=Trọng giá đầu vào trung bình +AverageUnitPricePMP=Trọng giá đầu vào trung bình +SellPriceMin=Đơn giá bán +EstimatedStockValueSellShort=Giá trị bán +EstimatedStockValueSell=Giá trị bán +EstimatedStockValueShort=Giá trị cổ phiếu đầu vào +EstimatedStockValue=Giá trị cổ phiếu đầu vào +DeleteAWarehouse=Xóa một nhà kho +ConfirmDeleteWarehouse=Bạn có chắc chắn muốn xóa kho% s? +PersonalStock=Cổ phiếu cá nhân của% s +ThisWarehouseIsPersonalStock=Kho này đại diện cho cổ phiếu cá nhân của% s% s +SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho chứng khoán giảm +SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho chứng khoán tăng +NoStockAction=Không có hành động chứng khoán +LastWaitingSupplierOrders=Đơn đặt hàng chờ đợi để tiếp khách +DesiredStock=Chứng khoán mong muốn +StockToBuy=Để đặt hàng +Replenishment=Bổ sung +ReplenishmentOrders=Đơn đặt hàng bổ sung +VirtualDiffersFromPhysical=Theo để tăng / giảm lựa chọn cổ phiếu, chứng khoán vật chất và chứng khoán ảo (vật lý + đơn đặt hàng hiện tại) có thể có khác nhau +UseVirtualStockByDefault=Sử dụng chứng khoán ảo theo mặc định, thay vì cổ vật lý, cho các tính năng bổ sung +UseVirtualStock=Sử dụng chứng khoán ảo +UsePhysicalStock=Sử dụng vật lý cổ phiếu +CurentSelectionMode=Dòng định mức chế độ lựa chọn +CurentlyUsingVirtualStock=Chứng khoán ảo +CurentlyUsingPhysicalStock=Cổ vật lý +RuleForStockReplenishment=Quy tắc cho cổ phiếu bổ sung +SelectProductWithNotNullQty=Chọn ít nhất một sản phẩm với một SL không null và một nhà cung cấp +AlertOnly= Cảnh báo chỉ +WarehouseForStockDecrease=Kho% s sẽ được sử dụng cho chứng khoán giảm +WarehouseForStockIncrease=Kho% s sẽ được sử dụng cho chứng khoán tăng +ForThisWarehouse=Đối với kho này +ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một cổ phiếu thấp hơn so với cổ phiếu mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt. +ReplenishmentOrdersDesc=Đây là danh sách của tất cả các đơn đặt hàng nhà cung cấp mở Replenishments=Replenishments -NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) -NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) -MassMovement=Mass movement -MassStockMovement=Mass stock movement -SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". -RecordMovement=Record transfert -ReceivingForSameOrder=Receivings for this order -StockMovementRecorded=Stock movements recorded -RuleForStockAvailability=Rules on stock requirements -StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice -StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order -StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s) +NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s) +MassMovement=Phong trào quần chúng +MassStockMovement=Phong trào chứng khoán đại chúng +SelectProductInAndOutWareHouse=Chọn một sản phẩm, một số lượng lớn, kho nguồn và một kho hàng mục tiêu, sau đó nhấp vào "% s". Một khi điều này được thực hiện với mọi hoạt động cần thiết, kích vào "% s". +RecordMovement=Ghi transfert +ReceivingForSameOrder=Receivings về đơn hàng này +StockMovementRecorded=Chuyển động chứng khoán được ghi nhận +RuleForStockAvailability=Quy định về yêu cầu chứng khoán +StockMustBeEnoughForInvoice=Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào hóa đơn +StockMustBeEnoughForOrder=Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào nề nếp +StockMustBeEnoughForShipment= Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào lô hàng diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang index fdc0787646a..a8c8d228906 100644 --- a/htdocs/langs/vi_VN/suppliers.lang +++ b/htdocs/langs/vi_VN/suppliers.lang @@ -1,42 +1,44 @@ # Dolibarr language file - Source file is en_US - suppliers -Suppliers=Suppliers -Supplier=Supplier -AddSupplier=Add a supplier -SupplierRemoved=Supplier removed -SuppliersInvoice=Suppliers invoice -NewSupplier=New supplier -History=History -ListOfSuppliers=List of suppliers -ShowSupplier=Show supplier -OrderDate=Order date -BuyingPrice=Buying price -BuyingPriceMin=Minimum buying price -BuyingPriceMinShort=Min buying price -TotalBuyingPriceMin=Total of subproducts buying prices -SomeSubProductHaveNoPrices=Some sub-products have no price defined -AddSupplierPrice=Add supplier price -ChangeSupplierPrice=Change supplier price -ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. -ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier -ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -NoRecordedSuppliers=No suppliers recorded -SupplierPayment=Supplier payment -SuppliersArea=Suppliers area -RefSupplierShort=Ref. supplier -Availability=Availability -ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -ExportDataset_fournisseur_2=Supplier invoices and payments -ExportDataset_fournisseur_3=Supplier orders and order lines -ApproveThisOrder=Approve this order -ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order -ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? -ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -AddCustomerOrder=Create customer order -AddCustomerInvoice=Create customer invoice -AddSupplierOrder=Create supplier order -AddSupplierInvoice=Create supplier invoice -ListOfSupplierProductForSupplier=List of products and prices for supplier %s -NoneOrBatchFileNeverRan=None or batch %s not ran recently -SentToSuppliers=Sent to suppliers +Suppliers=Nhà cung cấp +Supplier=Nhà cung cấp +AddSupplier=Thêm một nhà cung cấp +SupplierRemoved=Nhà cung cấp loại bỏ +SuppliersInvoice=Nhà cung cấp hóa đơn +NewSupplier=Nhà cung cấp mới +History=Lịch sử +ListOfSuppliers=Danh sách nhà cung cấp +ShowSupplier=Hiện nhà cung cấp +OrderDate=Ngày đặt hàng +BuyingPrice=Giá mua +BuyingPriceMin=Giá mua tối thiểu +BuyingPriceMinShort=Min giá mua +TotalBuyingPriceMin=Tổng số subproducts giá mua +SomeSubProductHaveNoPrices=Một số phụ phẩm đã có giá quy định +AddSupplierPrice=Thêm giá nhà cung cấp +ChangeSupplierPrice=Thay đổi giá nhà cung cấp +ErrorQtyTooLowForThisSupplier=Số lượng quá thấp đối với nhà cung cấp hoặc không có giá quy định về sản phẩm này cho nhà cung cấp này +ErrorSupplierCountryIsNotDefined=Nước cho nhà cung cấp này không được xác định. Sửa điều này đầu tiên. +ProductHasAlreadyReferenceInThisSupplier=Sản phẩm này đã có một tham chiếu trong nhà cung cấp này +ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cung cấp thông tin này đã được liên kết với một tài liệu tham khảo:% s +NoRecordedSuppliers=Không có nhà cung cấp ghi +SupplierPayment=Thanh toán nhà cung cấp +SuppliersArea=Khu vực Nhà cung cấp +RefSupplierShort=Tài liệu tham khảo. nhà cung cấp +Availability=Sẵn có +ExportDataset_fournisseur_1=Danh sách nhà cung cấp hoá đơn và đường hóa đơn +ExportDataset_fournisseur_2=Hoá đơn và các khoản thanh toán nhà cung cấp +ExportDataset_fournisseur_3=Đơn đặt hàng nhà cung cấp và các dòng lệnh +ApproveThisOrder=Chấp thuận đơn hàng này +ConfirmApproveThisOrder=Bạn Bạn có chắc chắn muốn chấp nhận để% s? +DenyingThisOrder=Phủ nhận thứ tự này +ConfirmDenyingThisOrder=Bạn có chắc chắn bạn muốn từ chối lệnh này% s? +ConfirmCancelThisOrder=Bạn có chắc chắn bạn muốn hủy bỏ lệnh này% s? +AddCustomerOrder=Tạo đơn đặt hàng +AddCustomerInvoice=Tạo hóa đơn của khách hàng +AddSupplierOrder=Tạo ra để cung cấp +AddSupplierInvoice=Tạo nhà cung cấp hóa đơn +ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cả cho nhà cung cấp% s +NoneOrBatchFileNeverRan=Không có hoặc hàng loạt% s không chạy gần đây +SentToSuppliers=Gửi đến nhà cung cấp +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang index 4b0501a8346..98314aea027 100644 --- a/htdocs/langs/vi_VN/trips.lang +++ b/htdocs/langs/vi_VN/trips.lang @@ -1,22 +1,22 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips -ListOfFees=List of fees -NewTrip=New trip -CompanyVisited=Company/foundation visited -Kilometers=Kilometers -FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense -ClassifyRefunded=Classify 'Refunded' +Trip=Chuyến đi +Trips=Các chuyến đi +TripsAndExpenses=Các chuyến đi và các chi phí +TripsAndExpensesStatistics=Các chuyến đi và các chi phí thống kê +TripCard=Thẻ đi +AddTrip=Thêm chuyến đi +ListOfTrips=Danh sách các chuyến đi +ListOfFees=Danh sách phí +NewTrip=Chuyến đi mới +CompanyVisited=Công ty / cơ sở thăm +Kilometers=Km +FeesKilometersOrAmout=Số tiền hoặc km +DeleteTrip=Xóa đi +ConfirmDeleteTrip=Bạn Bạn có chắc chắn muốn xóa chuyến đi này? +TF_OTHER=Khác +TF_LUNCH=Ăn trưa +TF_TRIP=Chuyến đi +ListTripsAndExpenses=Danh sách các chuyến đi và các chi phí +ExpensesArea=Chi phí chuyến đi và khu vực +SearchATripAndExpense=Tìm kiếm một chuyến đi và chi phí +ClassifyRefunded=Phân loại 'hoàn trả' diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang index bef8e4b0be7..f3652dcb525 100644 --- a/htdocs/langs/vi_VN/users.lang +++ b/htdocs/langs/vi_VN/users.lang @@ -1,121 +1,122 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area -UserCard=User card -ContactCard=Contact card -GroupCard=Group card -NoContactCard=No card among contacts -Permission=Permission -Permissions=Permissions -EditPassword=Edit password -SendNewPassword=Regenerate and send password -ReinitPassword=Regenerate password -PasswordChangedTo=Password changed to: %s -SubjectNewPassword=Your new password for Dolibarr -AvailableRights=Available permissions -OwnedRights=Owned permissions -GroupRights=Group permissions -UserRights=User permissions -UserGUISetup=User display setup -DisableUser=Disable -DisableAUser=Disable a user -DeleteUser=Delete -DeleteAUser=Delete a user -DisableGroup=Disable -DisableAGroup=Disable a group -EnableAUser=Enable a user -EnableAGroup=Enable a group -DeleteGroup=Delete -DeleteAGroup=Delete a group -ConfirmDisableUser=Are you sure you want to disable user %s ? -ConfirmDisableGroup=Are you sure you want to disable group %s ? -ConfirmDeleteUser=Are you sure you want to delete user %s ? -ConfirmDeleteGroup=Are you sure you want to delete group %s ? -ConfirmEnableUser=Are you sure you want to enable user %s ? -ConfirmEnableGroup=Are you sure you want to enable group %s ? -ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ? -ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ? -NewUser=New user -CreateUser=Create user -SearchAGroup=Search a group -SearchAUser=Search a user -LoginNotDefined=Login is not defined. -NameNotDefined=Name is not defined. -ListOfUsers=List of users -Administrator=Administrator +HRMArea=Khu vực quản lý nhân sự +UserCard=Thẻ sử dụng +ContactCard=Thẻ liên lạc +GroupCard=Nhóm thẻ +NoContactCard=Không có thẻ giữa các địa chỉ liên lạc +Permission=Giấy phép +Permissions=Quyền +EditPassword=Chỉnh sửa mật khẩu +SendNewPassword=Tái tạo và gửi mật khẩu +ReinitPassword=Phục hồi mật khẩu +PasswordChangedTo=Mật khẩu thay đổi để:% s +SubjectNewPassword=Mật khẩu mới cho Dolibarr +AvailableRights=Quyền có sẵn +OwnedRights=Quyền sở hữu +GroupRights=Cho phép nhóm +UserRights=Cho phép người dùng +UserGUISetup=Thiết lập hiển thị người dùng +DisableUser=Vô hiệu hoá +DisableAUser=Vô hiệu hóa người dùng +DeleteUser=Xóa +DeleteAUser=Xóa một người dùng +DisableGroup=Vô hiệu hoá +DisableAGroup=Vô hiệu hóa một nhóm +EnableAUser=Cho phép một người sử dụng +EnableAGroup=Cho phép một nhóm +DeleteGroup=Xóa +DeleteAGroup=Xóa nhóm +ConfirmDisableUser=Bạn có chắc chắn bạn muốn vô hiệu hóa người dùng% s? +ConfirmDisableGroup=Bạn có chắc chắn bạn muốn vô hiệu hóa nhóm% s? +ConfirmDeleteUser=Bạn Bạn có chắc chắn muốn xóa người dùng% s? +ConfirmDeleteGroup=Bạn có chắc chắn muốn xóa nhóm% s? +ConfirmEnableUser=Bạn có chắc là bạn muốn cho phép người dùng% s? +ConfirmEnableGroup=Bạn có chắc chắn bạn muốn kích hoạt nhóm% s? +ConfirmReinitPassword=Bạn có chắc chắn bạn muốn tạo ra một mật khẩu mới cho người dùng% s? +ConfirmSendNewPassword=Bạn có chắc chắn bạn muốn tạo ra và gửi mật khẩu mới cho người dùng% s? +NewUser=Người dùng mới +CreateUser=Tạo người dùng +SearchAGroup=Tìm kiếm một nhóm +SearchAUser=Tìm kiếm một người sử dụng +LoginNotDefined=Đăng nhập không được xác định. +NameNotDefined=Tên không được xác định. +ListOfUsers=Danh sách người dùng +Administrator=Quản trị viên SuperAdministrator=Super Administrator -SuperAdministratorDesc=Global administrator -AdministratorDesc=Administrator's entity -DefaultRights=Default permissions -DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user). -DolibarrUsers=Dolibarr users -LastName=Name -FirstName=First name -ListOfGroups=List of groups -NewGroup=New group -CreateGroup=Create group -RemoveFromGroup=Remove from group -PasswordChangedAndSentTo=Password changed and sent to %s. -PasswordChangeRequestSent=Request to change password for %s sent to %s. -MenuUsersAndGroups=Users & Groups -LastGroupsCreated=Last %s created groups -LastUsersCreated=Last %s users created -ShowGroup=Show group -ShowUser=Show user -NonAffectedUsers=Non assigned users -UserModified=User modified successfully -GroupModified=Group modified successfully -PhotoFile=Photo file -UserWithDolibarrAccess=User with Dolibarr access -ListOfUsersInGroup=List of users in this group -ListOfGroupsForUser=List of groups for this user -UsersToAdd=Users to add to this group -GroupsToAdd=Groups to add to this user -NoLogin=No login -LinkToCompanyContact=Link to third party / contact -LinkedToDolibarrMember=Link to member -LinkedToDolibarrUser=Link to Dolibarr user -LinkedToDolibarrThirdParty=Link to Dolibarr third party -CreateDolibarrLogin=Create a user -CreateDolibarrThirdParty=Create a third party -LoginAccountDisable=Account disabled, put a new login to activate it. -LoginAccountDisableInDolibarr=Account disabled in Dolibarr. -LoginAccountDisableInLdap=Account disabled in the domain. -UsePersonalValue=Use personal value -GuiLanguage=Interface language +SuperAdministratorDesc=Quản trị toàn cầu +AdministratorDesc=Tổ chức quản trị của +DefaultRights=Quyền mặc định +DefaultRightsDesc=Xác định đây cho phép mặc định được tự động cấp cho người dùng tạo mới (Xem trên thẻ sử dụng để thay đổi sự cho phép của người dùng hiện tại). +DolibarrUsers=Người sử dụng Dolibarr +LastName=Tên +FirstName=Tên đầu tiên +ListOfGroups=Danh sách nhóm +NewGroup=Nhóm mới +CreateGroup=Tạo nhóm +RemoveFromGroup=Xóa khỏi nhóm +PasswordChangedAndSentTo=Mật khẩu thay đổi và gửi đến% s. +PasswordChangeRequestSent=Yêu cầu thay đổi mật khẩu cho% s gửi đến% s. +MenuUsersAndGroups=Người dùng & Nhóm +LastGroupsCreated=Nhóm tạo ra cuối% s +LastUsersCreated=Cuối% của người sử dụng tạo ra +ShowGroup=Hiện nhóm +ShowUser=Hiện người dùng +NonAffectedUsers=Người dùng không được giao +UserModified=Người sử dụng sửa đổi thành công +GroupModified=Nhóm đổi thành công +PhotoFile=Hình ảnh tập tin +UserWithDolibarrAccess=Người sử dụng truy cập Dolibarr +ListOfUsersInGroup=Danh sách các thành viên trong nhóm này +ListOfGroupsForUser=Danh sách nhóm cho người dùng này +UsersToAdd=Người sử dụng để thêm vào nhóm này +GroupsToAdd=Nhóm để thêm người sử dụng này +NoLogin=Không đăng nhập +LinkToCompanyContact=Liên kết với bên thứ ba / liên lạc +LinkedToDolibarrMember=Trao đổi liên kết thành viên +LinkedToDolibarrUser=Liên kết đến Dolibarr người dùng +LinkedToDolibarrThirdParty=Liên kết đến Dolibarr bên thứ ba +CreateDolibarrLogin=Tạo một người dùng +CreateDolibarrThirdParty=Tạo một bên thứ ba +LoginAccountDisable=Tài khoản bị vô hiệu hóa, đặt một đăng nhập mới để kích hoạt nó. +LoginAccountDisableInDolibarr=Tài khoản bị vô hiệu hóa trong Dolibarr. +LoginAccountDisableInLdap=Tài khoản bị vô hiệu hóa trong miền. +UsePersonalValue=Sử dụng giá trị cá nhân +GuiLanguage=Ngôn ngữ giao diện InternalUser=Người dùng bên trong -MyInformations=My data -ExportDataset_user_1=Dolibarr's users and properties -DomainUser=Domain user %s -Reactivate=Reactivate -CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. -InternalExternalDesc=An internal user is a user that is part of your company/foundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) -PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group. -Inherited=Inherited -UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party) -UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party) -IdPhoneCaller=Id phone caller -UserLogged=User %s login -UserLogoff=User %s logout -NewUserCreated=User %s created -NewUserPassword=Password change for %s -EventUserModified=User %s modified -UserDisabled=User %s disabled -UserEnabled=User %s activated -UserDeleted=User %s removed -NewGroupCreated=Group %s created -GroupModified=Group modified successfully -GroupDeleted=Group %s removed -ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? -ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? -ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ? -LoginToCreate=Login to create -NameToCreate=Name of third party to create -YourRole=Your roles -YourQuotaOfUsersIsReached=Your quota of active users is reached ! -NbOfUsers=Nb of users -DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible -HierarchicView=Hierarchical view -UseTypeFieldToChange=Use field Type to change +MyInformations=Dữ liệu của tôi +ExportDataset_user_1=Người sử dụng và các đặc tính của Dolibarr +DomainUser=Miền người dùng% s +Reactivate=Kích hoạt +CreateInternalUserDesc=Hình thức này cho phép bạn tạo ra một người dùng nội bộ cho công ty / tổ chức. Để tạo ra một người dùng bên ngoài (khách hàng, nhà cung cấp, ...), sử dụng nút 'Tạo Dolibarr người sử dụng từ thẻ liên lạc bên thứ ba. +InternalExternalDesc=Một người sử dụng nội bộ là một người sử dụng là một phần của công ty / tổ chức.
Một người sử dụng bên ngoài là một khách hàng, nhà cung cấp hoặc khác.

Trong cả hai trường hợp, cho phép xác định quyền trên Dolibarr, còn người dùng bên ngoài có thể có một người quản lý menu khác nhau hơn so với người dùng nội bộ (Xem chủ - Setup - Display) +PermissionInheritedFromAGroup=Giấy phép được cấp bởi vì thừa hưởng từ một trong những nhóm của người dùng. +Inherited=Kế thừa +UserWillBeInternalUser=Người dùng tạo ra sẽ là một người dùng nội bộ (vì không liên kết với một bên thứ ba cụ thể) +UserWillBeExternalUser=Người dùng tạo ra sẽ là một người dùng bên ngoài (vì liên quan đến một bên thứ ba cụ thể) +IdPhoneCaller=Id người gọi điện thoại +UserLogged=Người dùng đăng nhập% s +UserLogoff=Sử dụng% s đăng xuất +NewUserCreated=Sử dụng% s tạo +NewUserPassword=Thay đổi mật khẩu cho% s +EventUserModified=Sử dụng% s sửa đổi +UserDisabled=Sử dụng% s khuyết tật +UserEnabled=Sử dụng% s kích hoạt +UserDeleted=Sử dụng% s loại bỏ +NewGroupCreated=Nhóm% s tạo +GroupModified=Nhóm đổi thành công +GroupDeleted=Nhóm% s loại bỏ +ConfirmCreateContact=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr cho liên hệ này? +ConfirmCreateLogin=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr thành viên này? +ConfirmCreateThirdParty=Bạn có chắc chắn bạn muốn tạo ra một bên thứ ba của thành viên này? +LoginToCreate=Đăng nhập để tạo ra +NameToCreate=Tên của bên thứ ba để tạo ra +YourRole=Vai trò của bạn +YourQuotaOfUsersIsReached=Hạn ngạch của người dùng hoạt động đạt được! +NbOfUsers=Nb của người sử dụng +DontDowngradeSuperAdmin=Chỉ có một superadmin có thể hạ xuống một superadmin +HierarchicalResponsible=Giám sát +HierarchicView=Nhìn thứ bậc +UseTypeFieldToChange=Sử dụng Type để thay đổi OpenIDURL=OpenID URL -LoginUsingOpenID=Use OpenID to login +LoginUsingOpenID=Sử dụng OpenID để đăng nhập +WeeklyHours=Giờ hàng tuần diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang index fb2b85ef4da..85dce579a88 100644 --- a/htdocs/langs/vi_VN/withdrawals.lang +++ b/htdocs/langs/vi_VN/withdrawals.lang @@ -1,96 +1,96 @@ # Dolibarr language file - Source file is en_US - withdrawals -StandingOrdersArea=Standing orders area -CustomersStandingOrdersArea=Customers standing orders area -StandingOrders=Standing orders -StandingOrder=Standing orders -NewStandingOrder=New standing order -StandingOrderToProcess=To process -StandingOrderProcessed=Processed -Withdrawals=Withdrawals -Withdrawal=Withdrawal -WithdrawalsReceipts=Withdrawal receipts -WithdrawalReceipt=Withdrawal receipt -WithdrawalReceiptShort=Receipt -LastWithdrawalReceipts=Last %s withdrawal receipts -WithdrawedBills=Withdrawn invoices -WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated -CustomersStandingOrders=Customer standing orders -CustomerStandingOrder=Customer standing order -NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request -NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information -InvoiceWaitingWithdraw=Invoice waiting for withdraw -AmountToWithdraw=Amount to withdraw -WithdrawsRefused=Withdraws refused -NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request. -ResponsibleUser=Responsible user -WithdrawalsSetup=Withdrawal setup -WithdrawStatistics=Withdraw's statistics -WithdrawRejectStatistics=Withdraw reject's statistics -LastWithdrawalReceipt=Last %s withdrawing receipts -MakeWithdrawRequest=Make a withdraw request -ThirdPartyBankCode=Third party bank code -ThirdPartyDeskCode=Third party desk code -NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN. -ClassCredited=Classify credited -ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? -TransData=Transmission date -TransMetod=Transmission method -Send=Send -Lines=Lines -StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused -WithdrawalRefused=Withdrawal refused -WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society -RefusedData=Date of rejection -RefusedReason=Reason for rejection -RefusedInvoicing=Billing the rejection -NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused -Status=Status -StatusUnknown=Chưa rõ -StatusWaiting=Waiting -StatusTrans=Sent -StatusCredited=Credited -StatusRefused=Refused -StatusMotif0=Unspecified -StatusMotif1=Insufficient funds -StatusMotif2=Request contested -StatusMotif3=No Withdrawal order -StatusMotif4=Customer Order -StatusMotif5=RIB unusable -StatusMotif6=Account without balance -StatusMotif7=Judicial Decision -StatusMotif8=Other reason -CreateAll=Withdraw all -CreateGuichet=Only office -CreateBanque=Only bank -OrderWaiting=Waiting for treatment -NotifyTransmision=Withdrawal Transmission -NotifyEmision=Withdrawal Emission -NotifyCredit=Withdrawal Credit -NumeroNationalEmetter=National Transmitter Number -PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw -WithBankUsingRIB=For bank accounts using RIB -WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT -BankToReceiveWithdraw=Bank account to receive withdraws -CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country -ShowWithdraw=Show Withdraw -IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. -WithdrawalFile=Withdrawal file -SetToStatusSent=Set to status "File Sent" -ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StandingOrdersArea=Đơn đặt hàng thường trực khu vực +CustomersStandingOrdersArea=Khách hàng đứng đơn đặt hàng khu vực +StandingOrders=Đứng đơn đặt hàng +StandingOrder=Đứng đơn đặt hàng +NewStandingOrder=Để đứng mới +StandingOrderToProcess=Để xử lý +StandingOrderProcessed=Xử lý +Withdrawals=Tiền thu hồi +Withdrawal=Rút +WithdrawalsReceipts=Biên lai thu hồi +WithdrawalReceipt=Nhận thu hồi +WithdrawalReceiptShort=Nhận +LastWithdrawalReceipts=Biên lai thu hồi cuối% s +WithdrawedBills=Hoá đơn bị thu hồi +WithdrawalsLines=Đường rút +RequestStandingOrderToTreat=Yêu cầu đứng đơn đặt hàng để điều trị +RequestStandingOrderTreated=Yêu cầu đơn đặt hàng thường trực điều trị +CustomersStandingOrders=Đơn đặt hàng của khách hàng đứng +CustomerStandingOrder=Để đứng hàng +NbOfInvoiceToWithdraw=Nb. hóa đơn với rút lại yêu cầu +NbOfInvoiceToWithdrawWithInfo=Nb. hóa đơn với rút lại yêu cầu cho khách hàng có thông tin tài khoản ngân hàng được xác định +InvoiceWaitingWithdraw=Hóa đơn chờ rút +AmountToWithdraw=Số tiền rút +WithdrawsRefused=Rút từ chối +NoInvoiceToWithdraw=Không có hoá đơn thanh toán của khách hàng trong chế độ "rút" được chờ đợi. Đi vào tab 'Rút' trên thẻ hóa đơn để thực hiện một yêu cầu. +ResponsibleUser=Người sử dụng có trách nhiệm +WithdrawalsSetup=Thiết lập thu hồi +WithdrawStatistics=Số liệu thống kê thu hồi của +WithdrawRejectStatistics=Thu hồi số liệu thống kê từ chối của +LastWithdrawalReceipt=Biên lai thu hồi cuối% s +MakeWithdrawRequest=Thực hiện một rút lại yêu cầu +ThirdPartyBankCode=Mã ngân hàng của bên thứ ba +ThirdPartyDeskCode=Bên thứ ba đang bàn +NoInvoiceCouldBeWithdrawed=Không có hoá đơn Đã rút thành công. Kiểm tra hóa đơn được trên công ty với một BAN hợp lệ. +ClassCredited=Phân loại ghi +ClassCreditedConfirm=Bạn có chắc chắn bạn muốn phân loại nhận thu hồi này là ghi có vào tài khoản ngân hàng của bạn? +TransData=Ngày truyền +TransMetod=Phương pháp truyền +Send=Gửi +Lines=Dòng +StandingOrderReject=Ban hành từ chối +InvoiceRefused=Hoá đơn từ chối +WithdrawalRefused=Rút từ chối +WithdrawalRefusedConfirm=Bạn có chắc chắn bạn muốn nhập một từ chối thu hồi đối với xã hội +RefusedData=Ngày từ chối +RefusedReason=Lý do từ chối +RefusedInvoicing=Thanh toán từ chối +NoInvoiceRefused=Không sạc từ chối +InvoiceRefused=Hoá đơn từ chối +Status=Tình trạng +StatusUnknown=Không biết +StatusWaiting=Chờ +StatusTrans=Gửi +StatusCredited=Ghi +StatusRefused=Từ chối +StatusMotif0=Không quy định +StatusMotif1=Không đủ tiền +StatusMotif2=Yêu cầu tranh chấp +StatusMotif3=Không có lệnh thu hồi +StatusMotif4=Khách hàng tự +StatusMotif5=RIB không sử dụng được +StatusMotif6=Tài khoản mà không cân bằng +StatusMotif7=Quyết định tư pháp +StatusMotif8=Lý do khác +CreateAll=Rút tất cả +CreateGuichet=Chỉ có văn phòng +CreateBanque=Chỉ ngân hàng +OrderWaiting=Đang chờ xử lý +NotifyTransmision=Rút truyền +NotifyEmision=Thu hồi khí thải +NotifyCredit=Thu hồi tín dụng +NumeroNationalEmetter=Số quốc gia phát +PleaseSelectCustomerBankBANToWithdraw=Chọn các thông tin về tài khoản ngân hàng của khách hàng để thu hồi +WithBankUsingRIB=Đối với tài khoản ngân hàng sử dụng RIB +WithBankUsingBANBIC=Đối với tài khoản ngân hàng sử dụng IBAN / BIC / SWIFT +BankToReceiveWithdraw=Tài khoản ngân hàng để nhận Bỏ cuộc +CreditDate=Về tín dụng +WithdrawalFileNotCapable=Không thể tạo ra tập tin nhận thu hồi cho quốc gia của bạn +ShowWithdraw=Hiện Rút +IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước. +DoStandingOrdersBeforePayments=Thẻ này cho phép bạn yêu cầu để đứng. Sau khi hoàn tất, bạn có thể gõ thanh toán để đóng hóa đơn. +WithdrawalFile=Thu hồi tập tin +SetToStatusSent=Thiết lập để tình trạng "File gửi" +ThisWillAlsoAddPaymentOnInvoice=Điều này cũng sẽ áp dụng chi trả cho các hóa đơn và sẽ phân loại là "Đã thanh toán" ### Notifications -InfoCreditSubject=Payment of standing order %s by the bank -InfoCreditMessage=The standing order %s has been paid by the bank
Data of payment: %s -InfoTransSubject=Transmission of standing order %s to bank -InfoTransMessage=The standing order %s has been sent to bank by %s %s.

-InfoTransData=Amount: %s
Method: %s
Date: %s -InfoFoot=This is an automated message sent by Dolibarr -InfoRejectSubject=Standing order refused -InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s -ModeWarning=Option for real mode was not set, we stop after this simulation +InfoCreditSubject=Thanh toán đứng thứ tự% s của ngân hàng +InfoCreditMessage=Trình tự đứng% s đã được thanh toán của ngân hàng
Dữ liệu thanh toán:% s +InfoTransSubject=Truyền tải đứng thứ tự% s cho ngân hàng +InfoTransMessage=Trình tự đứng% s đã được gửi đến ngân hàng bởi% s% s.

+InfoTransData=Số tiền:% s
Phương pháp:% s
Ngày:% s +InfoFoot=Đây là một thông báo tự động gửi Dolibarr +InfoRejectSubject=Lệnh chuyển tiền định từ chối +InfoRejectMessage=Xin chào,

thứ tự đứng hóa đơn% s liên quan đến công ty% s, với số tiền% s đã bị từ chối bởi các ngân hàng.

-
% S +ModeWarning=Lựa chọn cho chế độ thực sự không được thiết lập, chúng tôi dừng lại sau khi mô phỏng này diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang index ed0b30ae89c..1e92c9c1396 100644 --- a/htdocs/langs/vi_VN/workflow.lang +++ b/htdocs/langs/vi_VN/workflow.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - admin -WorkflowSetup=Workflow module setup -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled automatic actions that you are interesting in. -ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. -descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed -descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed -descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated -descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated +WorkflowSetup=Thiết lập mô-đun công việc +WorkflowDesc=Module này được thiết kế để thay đổi hành vi của các hành động tự động vào ứng dụng. Theo mặc định, quy trình làm việc được mở ra (bạn thực hiện điều theo thứ tự bạn muốn). Bạn có thể kích hoạt các hành động tự động mà bạn là thú vị trong. +ThereIsNoWorkflowToModify=Không có công việc, bạn có thể thay đổi cho mô-đun bạn đã kích hoạt. +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tạo ra một đơn đặt hàng tự động sau một đề nghị thương mại được ký kết +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau một đề nghị thương mại được ký kết +descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau khi hợp đồng được xác nhận +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau khi một đơn đặt hàng bị đóng +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Phân loại đề xuất nguồn liên quan đến hóa đơn khi đơn đặt hàng được thiết lập để trả +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Phân loại đơn đặt hàng nguồn liên kết (s) để tính tiền khi hóa đơn khách hàng được thiết lập để trả +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Phân loại theo thứ tự liên kết nguồn khách hàng (s) để tính tiền khi hóa đơn của khách hàng được xác nhận diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang index 27a516d5a4f..ae7111d3c32 100644 --- a/htdocs/langs/zh_CN/accountancy.lang +++ b/htdocs/langs/zh_CN/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=发票行 VentilatedinAccount=在会计账户成功通风 NotVentilatedinAccount=不通风的会计账户 -ACCOUNTINGEX_SEPARATORCSV=CSV的”分隔符“ +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=待显示的一个页面的元素个数（最大推荐：50） -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=由最近的元素开始通气“有通风”页面的排序 -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=由最近的元素开始的通风“通风”的页面排序 +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=会计长度账户显示在的Dolibarr AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。 -ACCOUNTINGEX_LENGTH_GACCOUNT=一般账户的长度 -ACCOUNTINGEX_LENGTH_AACCOUNT=第三方账户的长度 +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=卖杂志 -ACCOUNTINGEX_PURCHASE_JOURNAL=购买杂志 -ACCOUNTINGEX_BANK_JOURNAL=银行的”日记账“ -ACCOUNTINGEX_CASH_JOURNAL=现金的”日记账“ -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=其他的”日记帐“ -ACCOUNTINGEX_SOCIAL_JOURNAL=社交的”日记帐“ +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=转让帐户 -ACCOUNTINGEX_ACCOUNT_SUSPENSE=等待的帐户 +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=会计帐户默认情况下，购买的产品（如果在产品表没有定义） -COMPTA_PRODUCT_SOLD_ACCOUNT=会计帐户默认为销售的产品（如果在产品表没有定义） -COMPTA_SERVICE_BUY_ACCOUNT=会计帐户默认情况下，该买的服务（如果服务表没有定义） -COMPTA_SERVICE_SOLD_ACCOUNT=会计帐户默认为卖服务（如果服务表没有定义） +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=文件类型 Docdate=日期 diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index c81842512b0..202c2232e0f 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=错误，此模块要求 Dolibarr 版本 %s ErrorDecimalLargerThanAreForbidden=错误，不支持超过 %s 的精度。 DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=类型值 'system' 与 'systemauto' 是系统保留值。不能以'user'为值添加您的记录 ErrorCodeCantContainZero=编码不能包含 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=自动，如果 JavaScript 被禁用 AvailableOnlyIfJavascriptNotDisabled=仅当 JavaScript 启用时可用 AvailableOnlyIfJavascriptAndAjaxNotDisabled=仅当 JavaScript 启用时可用 Required=必要 +UsedOnlyWithTypeOption=Used by some agenda option only Security=安全 Passwords=密码 DoNotStoreClearPassword=不在数据库中储存明文密码，只存储加密后的密码(建议启用) diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang index 10aa4d2a52b..2d25e6718cd 100644 --- a/htdocs/langs/zh_CN/agenda.lang +++ b/htdocs/langs/zh_CN/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=事件ID号 Actions=事件 ActionsArea=事件区域（事件和任务） -Agenda= 待办事项 -Agendas= 待办事项 -Calendar= 日历 -Calendars= 日历 -LocalAgenda=本地日历 +Agenda=待办事项 +Agendas=待办事项 +Calendar=日历 +Calendars=日历 +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=受影响 DoneBy=做的 Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=所有未完成的事件 MenuDoneActions=所有终止事件 MenuToDoMyActions=我的未完成事件 MenuDoneMyActions=我的已经终结的事件 -ListOfEvents=Dolibarr事件列表 +ListOfEvents=List of events (internal calendar) ActionsAskedBy=记录操作 ActionsToDoBy=受影响的行动 ActionsDoneBy=做的动作 @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL来访问。iCal文件 ExtSiteNoLabel=无说明 WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang index c7e98492348..1b9cf293eb9 100644 --- a/htdocs/langs/zh_CN/categories.lang +++ b/htdocs/langs/zh_CN/categories.lang @@ -66,7 +66,7 @@ ReturnInCompany=返回到客户/前景卡 ContentsVisibleByAll=内容将所有可见 ContentsVisibleByAllShort=所有内容可见 ContentsNotVisibleByAllShort=所有内容不可见 -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=删除类别 ConfirmDeleteCategory=你确定要删除这个分类？ RemoveFromCategory=删除连接的类别： @@ -105,9 +105,10 @@ CatProdLinks=产品/服务和类别之间的相关链接 CatCusLinks=客户/前景和类别之间的相关链接 CatSupLinks=供应商及个类别之间的相关链接 DeleteFromCat=从类别中删除 -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang index 9a9c4f2aa78..bef78d52342 100644 --- a/htdocs/langs/zh_CN/companies.lang +++ b/htdocs/langs/zh_CN/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=您必须创建电子邮件第三方接触首先可以 ListSuppliersShort=供应商名单 ListProspectsShort=名单前景 ListCustomersShort=客户名单 -ThirdPartiesArea=第三方区 +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=最后%s修改第三方 UniqueThirdParties=独特的第三方总计 InActivity=打开 @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=返回格式%syymm为客户代码以及%syymm -○○○○供应商代码其中YY是年numero，MM是月，nnnn是一个没有休息，没有为0返回序列。 LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随时修改。 ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang index 31c7f734728..d1e62ea5eea 100644 --- a/htdocs/langs/zh_CN/compta.lang +++ b/htdocs/langs/zh_CN/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=会计摘要 ByProductsAndServices=通过产品和服务 RefExt=外部编码 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=链接到订单 +LinkedOrder=Link to order ReCalculate=重新计算 Mode1=方法 1 Mode2=方法 2 @@ -196,11 +196,14 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=计算模式 AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=买产品的缺省会计模式 -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=卖产品的缺省会计模式 -ACCOUNTING_SERVICE_BUY_ACCOUNT=买服务的缺省会计模式 -ACCOUNTING_SERVICE_SOLD_ACCOUNT=卖服务的缺省会计模式 -ACCOUNTING_VAT_ACCOUNT=征收增值税的缺省会计模式 -ACCOUNTING_VAT_BUY_ACCOUNT=支付增值税的缺省会计模式 -ACCOUNTING_ACCOUNT_CUSTOMER=默认情况下，第三方客户的会计代码 -ACCOUNTING_ACCOUNT_SUPPLIER=默认情况下，第三方供应商的会计代码 +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang index 5e2cd5c8461..1dcb4689411 100644 --- a/htdocs/langs/zh_CN/donations.lang +++ b/htdocs/langs/zh_CN/donations.lang @@ -30,3 +30,4 @@ SearchADonation=搜索捐赠 DonationRecipient=受捐赠者 ThankYou=谢谢您 IConfirmDonationReception=接受者声明接收，捐款，数额如下 +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang index 5fc6a24f9e9..abbf725b3f9 100644 --- a/htdocs/langs/zh_CN/errors.lang +++ b/htdocs/langs/zh_CN/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=强制设置参数尚未定义 @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang index fed57183de2..7d37dc79414 100644 --- a/htdocs/langs/zh_CN/holiday.lang +++ b/htdocs/langs/zh_CN/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=人力资源管理（HRM） -Holidays=休假 -CPTitreMenu=休假 +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=申请假期 -NotActiveModCP=您必须启用假期模块，才能浏览这个页面。 -NotConfigModCP=查看此页面，您必须配置模块假期。请点击这里 -NoCPforUser=You don't have a demand for holidays. -AddCP=申请假期 +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=雇员 DateDebCP=开始日期 DateFinCP=结束日期 @@ -18,24 +18,24 @@ ApprovedCP=批准 CancelCP=取消 RefuseCP=拒绝 ValidatorCP=同意 -ListeCP=假期列表 +ListeCP=List of leaves ReviewedByCP=将审查 DescCP=描述 -SendRequestCP=创建请假条 -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=更新假期 -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=你必须选择结束日期大于起始日期。 ErrorSQLCreateCP=创建过程中发生了一个SQL错误： -ErrorIDFicheCP=发生了错误，请求节假日不存在。 +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=返回前一页 -ErrorUserViewCP=您无权阅读申请假期。 -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=假期表 -NbUseDaysCP=消耗的假期天数 +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=编辑 DeleteCP=删除 ActionValidCP=验证 @@ -43,26 +43,26 @@ ActionRefuseCP=拒绝 ActionCancelCP=取消 StatutCP=地位 SendToValidationCP=发送到验证 -TitleDeleteCP=删除请假请求 -ConfirmDeleteCP=您确定要删除该请假请求？ -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=您无权申请假期。 -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=更新 -CantUpdate=你不能更新这个申请的假期。 +CantUpdate=You cannot update this leave request. NoDateDebut=你必须选择开始日期。 NoDateFin=你必须选择结束日期。 ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=批准申请假期 -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=批准日期 -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=取消假期申请 -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=拒绝原因 DateRefusCP=拒绝日期 DateCancelCP=注销日期 @@ -72,8 +72,8 @@ MotifCP=雷森 UserCP=用户 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=查看假期日志 -LogCP=登录更新假期 +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=名称 Employee=雇员 -FirstDayOfHoliday=假期第一天 -LastDayOfHoliday=假期的最后一天 +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=每月更新 ManualUpdate=手动更新 -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=节假日模块的配置 DescOptionCP=选项​​描述 ValueOptionCP=值 -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=验证配置 -LastUpdateCP=假期最后自动更新 +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=更新成功。 ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=验证 UpdateEventCP=Update events CreateEventCP=创建 @@ -127,23 +127,23 @@ UpdateEventOptionCP=更新 ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=天数 -TitleAdminCP=配置假期 +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=验证假期 -HolidaysToValidateBody=下面是一个假期验证请求 -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=验证假期 -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=拒绝假期 -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=取消假期 -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang index d7f7321b8e0..df8ca7a572c 100644 --- a/htdocs/langs/zh_CN/interventions.lang +++ b/htdocs/langs/zh_CN/interventions.lang @@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=名称及干预签名： NameAndSignatureOfExternalContact=客户的姓名和签字： DocumentModelStandard=标准文档模型的干预 InterventionCardsAndInterventionLines=干预和干预行 -ClassifyBilled=分类“帐单” +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=帐单 RelatedInterventions=相关的干预措施 ShowIntervention=展干预 +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=代表随访干预 TypeContact_fichinter_internal_INTERVENING=干预 diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang index d6918c09c84..e9fd2afcaeb 100644 --- a/htdocs/langs/zh_CN/projects.lang +++ b/htdocs/langs/zh_CN/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=行动项目 YouAreNotContactOfProject=你是不是这个私人项目联系 DeleteATimeSpent=删除的时间 ConfirmDeleteATimeSpent=你确定要删除这个花的时间？ -DoNotShowMyTasksOnly=又见任务没有影响到我 -ShowMyTasksOnly=查看任务时，我只受影响 +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=资源的整合 ProjectsDedicatedToThisThirdParty=这个项目致力于第三方 NoTasks=该项目没有任务 LinkedToAnotherCompany=链接到其他第三方 -TaskIsNotAffectedToYou=任务不分配给你 +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=所花费的时间是空的 ThisWillAlsoRemoveTasks=这一行动也将删除所有项目任务（%s任务的时刻），花全部的时间都投入。 IfNeedToUseOhterObjectKeepEmpty=如果某些对象（发票，订单，...），属于其他第三方，必须与该项目以创建，保持这个空项目多的第三方。 @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=一个完整的项目报告模型（logo. ..） PlannedWorkload = 计划的工作量 @@ -128,3 +129,4 @@ ProjectReferers=参考对象 SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang index 3153ccef1a1..1665ecc8137 100644 --- a/htdocs/langs/zh_CN/sendings.lang +++ b/htdocs/langs/zh_CN/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=对货物进行统计验证。使用的数据的 DateDeliveryPlanned=刨交货日期 DateReceived=交货日期收到 SendShippingByEMail=通过电子邮件发送货物 -SendShippingRef=发送货物%s +SendShippingRef=Submission of shipment %s ActionsOnShipping=对装运的事件 LinkToTrackYourPackage=链接到追踪您的包裹 ShipmentCreationIsDoneFromOrder=就目前而言，建立一个新的装运完成从订单卡。 @@ -66,11 +66,13 @@ CarrierList=转运列表 SendingMethodCATCH=按客户捕捉 SendingMethodTRANS=运输车 SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=简单的送货单文档模型 DocumentModelTyphon=更多的送货单（logo. ..完整的文档模型） - Error_EXPEDITION_ADDON_NUMBER_NotDefined=没有定义的常数EXPEDITION_ADDON_NUMBER SumOfProductVolumes=产品总数 SumOfProductWeights=产品总重 + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang index 3f546c91d90..18940213370 100644 --- a/htdocs/langs/zh_CN/suppliers.lang +++ b/htdocs/langs/zh_CN/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=订购日期 BuyingPrice=买价 BuyingPriceMin=最低购买价格 BuyingPriceMinShort=最小买入价 -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=新增供应商的价格 ChangeSupplierPrice=供应商的价格变化 ErrorQtyTooLowForThisSupplier=数量过低，供应商或供应商在这此产品没有价格定义 @@ -40,3 +40,5 @@ AddSupplierInvoice=创建供应商发票 ListOfSupplierProductForSupplier=%产品供应商名单和价格的 S NoneOrBatchFileNeverRan=无或批处理%不是最近跑 SentToSuppliers=发送到供应商 +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang index f103efef589..8cab9d2b651 100644 --- a/htdocs/langs/zh_TW/accountancy.lang +++ b/htdocs/langs/zh_TW/accountancy.lang @@ -66,31 +66,31 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTINGEX_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTINGEX_SELL_JOURNAL=Sell journal -ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal -ACCOUNTINGEX_BANK_JOURNAL=Bank journal -ACCOUNTINGEX_CASH_JOURNAL=Cash journal -ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 8072eb8011e..8f2d2e92eb9 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要Dolibarr%s或更高 ErrorDecimalLargerThanAreForbidden=錯誤，1%的精度高於不支持。 DictionarySetup=Dictionary setup Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -217,6 +219,7 @@ AutomaticIfJavascriptDisabled=如果JavaScript被禁用自動 AvailableOnlyIfJavascriptNotDisabled=僅當禁用JavaScript是不 AvailableOnlyIfJavascriptAndAjaxNotDisabled=僅當禁用JavaScript是不 Required=需要 +UsedOnlyWithTypeOption=Used by some agenda option only Security=安全 Passwords=密碼 DoNotStoreClearPassword=難道沒有明確的密碼存儲在數據庫，但只存儲加密值（活性炭推薦） diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang index 7bbfe9b3974..7d9a577b157 100644 --- a/htdocs/langs/zh_TW/agenda.lang +++ b/htdocs/langs/zh_TW/agenda.lang @@ -2,11 +2,12 @@ IdAgenda=ID event Actions=事件 ActionsArea=事件區（事件和任務） -Agenda= 議程 -Agendas= 議程 -Calendar= 日歷 -Calendars= 日歷 -LocalAgenda=本地日歷 +Agenda=議程 +Agendas=議程 +Calendar=日歷 +Calendars=日歷 +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by AffectedTo=受影響 DoneBy=做的 Event=Event @@ -22,7 +23,7 @@ MenuToDoActions=所有不完整的行動 MenuDoneActions=所有終止行動 MenuToDoMyActions=我不完整的行動 MenuDoneMyActions=我的行動終止 -ListOfEvents=名單Dolibarr事件 +ListOfEvents=List of events (internal calendar) ActionsAskedBy=記錄操作 ActionsToDoBy=受影響的行動 ActionsDoneBy=做的動作 @@ -88,3 +89,5 @@ ExtSiteUrlAgenda=URL來訪問。iCal文件 ExtSiteNoLabel=無說明 WorkingTimeRange=Working time range WorkingDaysRange=Working days range +AddEvent=Add event +MyAvailability=My availability diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang index 94f3568ef2e..4642c5a954c 100644 --- a/htdocs/langs/zh_TW/categories.lang +++ b/htdocs/langs/zh_TW/categories.lang @@ -16,7 +16,7 @@ SuppliersCategoriesArea=供應商分類區 CustomersCategoriesArea=客戶分類區 ThirdPartyCategoriesArea=第三方分類區 MembersCategoriesArea=成員類別面積 -# ContactsCategoriesArea=Contacts categories area +ContactsCategoriesArea=Contacts categories area MainCats=主要類別 SubCats=子類別 CatStatistics=統計 @@ -50,15 +50,15 @@ SupplierIsInCategories=第三方擁有對以下類別的供應商 CompanyIsInCustomersCategories=這個客戶擁有下列客戶/潛在分類標籤 CompanyIsInSuppliersCategories=個供應商擁有下列供應商分類標籤 MemberIsInCategories=該成員擁有，以下列成員類別 -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=This contact owns to following contacts categories ProductHasNoCategory=此產品/服務是沒有任何類別 SupplierHasNoCategory=這個供應商是不以任何類別 CompanyHasNoCategory=這家公司沒有任何分類標籤 MemberHasNoCategory=該成員沒有任何類別 -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=This contact is not in any categories ClassifyInCategory=分類類別 NoneCategory=無 -# NotCategorized=Without category +NotCategorized=Without category CategoryExistsAtSameLevel=此類別已存在此號 ReturnInProduct=返回產品/服務卡 ReturnInSupplier=返回供應商卡 @@ -66,7 +66,7 @@ ReturnInCompany=返回到客戶/前景卡 ContentsVisibleByAll=內容將所有可見 ContentsVisibleByAllShort=所有內容可見 ContentsNotVisibleByAllShort=所有內容不可見 -# CategoriesTree=Categories tree +CategoriesTree=Categories tree DeleteCategory=刪除分類標籤 ConfirmDeleteCategory=你確定要刪除這個分類標籤？ RemoveFromCategory=刪除連接的分類標籤： @@ -81,12 +81,12 @@ CustomersCategoriesShort=客戶分類標籤 CustomersProspectsCategoriesShort=客戶/潛在分類標籤 ProductsCategoriesShort=產品分類標籤 MembersCategoriesShort=成員分類標籤 -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contacts categories ThisCategoryHasNoProduct=這個類別不含任何產品。 ThisCategoryHasNoSupplier=這個類別不含任何供應商。 ThisCategoryHasNoCustomer=這個類別不含任何客戶。 ThisCategoryHasNoMember=這個類別不含任何成員。 -# ThisCategoryHasNoContact=This category does not contain any contact. +ThisCategoryHasNoContact=This category does not contain any contact. AssignedToCustomer=分配給客戶 AssignedToTheCustomer=分配給客戶 InternalCategory=內部類 @@ -96,18 +96,19 @@ CatSupList=供應商分類列表 CatCusList=客戶名單/前景類別 CatProdList=產品類別列表 CatMemberList=類別的成員名單 -# CatContactList=List of contact categories and contact -# CatSupLinks=Links between suppliers and categories -# CatCusLinks=Links between customers/prospects and categories -# CatProdLinks=Links between products/services and categories -# CatMemberLinks=Links between members and categories -# CatProdLinks=Links between products/services and categories -# CatCusLinks=Links between customers/prospects and categories -# CatSupLinks=Links between suppliers and categories -# DeleteFromCat=Remove from category -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +CatProdLinks=Links between products/services and categories +CatCusLinks=Links between customers/prospects and categories +CatSupLinks=Links between suppliers and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang index 782043acc93..705df498d17 100644 --- a/htdocs/langs/zh_TW/companies.lang +++ b/htdocs/langs/zh_TW/companies.lang @@ -397,7 +397,7 @@ YouMustCreateContactFirst=您必須創建電子郵件第三方接觸首先可以 ListSuppliersShort=供應商名單 ListProspectsShort=潛在名單 ListCustomersShort=客戶名單 -ThirdPartiesArea=客戶/供應商資訊區 +ThirdPartiesArea=Third parties and contact area LastModifiedThirdParties=最後更新的客戶/供應商清單 UniqueThirdParties=客戶/供應商圖表種類數 InActivity=打開 @@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=用以下固定的方式回傳編號:
%syymm-nnnn 為客戶編號生成格式。
%syymm-nnnn 為供應商編號生成格式。
yy 是年、mm是月、nnnn是一個不為0的序號。 LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可以隨時修改。(可開啟Elephant or Monkey模組來設定編碼規則) ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang index 8d5b6d6e4f2..d083d28aaf8 100644 --- a/htdocs/langs/zh_TW/compta.lang +++ b/htdocs/langs/zh_TW/compta.lang @@ -187,7 +187,7 @@ AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=linked to order +LinkedOrder=Link to order ReCalculate=Recalculate Mode1=Method 1 Mode2=Method 2 @@ -204,3 +204,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang index f0a598844b6..fc7c7019e8e 100644 --- a/htdocs/langs/zh_TW/donations.lang +++ b/htdocs/langs/zh_TW/donations.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - donations Donation=捐款 Donations=捐贈 -# DonationRef=Donation ref. +DonationRef=Donation ref. Donor=捐贈者 Donors=捐助者 AddDonation=添加捐贈 NewDonation=新捐贈 -# ShowDonation=Show donation +ShowDonation=Show donation DonationPromise=禮品的承諾 PromisesNotValid=未驗證的承諾 PromisesValid=驗證承諾 @@ -22,11 +22,12 @@ DonationStatusPromiseNotValidatedShort=草案 DonationStatusPromiseValidatedShort=驗證 DonationStatusPaidShort=收稿 ValidPromess=驗證承諾 -# DonationReceipt=Donation receipt +DonationReceipt=Donation receipt BuildDonationReceipt=建立收據 DonationsModels=捐贈收據的文件模式 LastModifiedDonations=最後%s修改捐款 SearchADonation=搜索捐贈 -# DonationRecipient=Donation recipient -# ThankYou=Thank You -# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang index 0bb7cfb2648..8562dccaf35 100644 --- a/htdocs/langs/zh_TW/errors.lang +++ b/htdocs/langs/zh_TW/errors.lang @@ -133,9 +133,10 @@ ErrorPHPNeedModule=Error, your PHP must have module %s installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined @@ -154,3 +155,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang index 8eaba699e0a..a60a165a32b 100644 --- a/htdocs/langs/zh_TW/holiday.lang +++ b/htdocs/langs/zh_TW/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=開始日期 DateFinCP=結束日期 @@ -18,24 +18,24 @@ ApprovedCP=批準 CancelCP=取消 RefuseCP=拒絕 ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=描述 -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=編輯 DeleteCP=刪除 ActionValidCP=驗證 @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=取消 StatutCP=地位 SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=更新 -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=雷森 UserCP=用戶 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=名稱 Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=價值 -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=驗證 UpdateEventCP=Update events CreateEventCP=建立 @@ -127,23 +127,23 @@ UpdateEventOptionCP=更新 ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang index be6fe4c7c7f..a32490b2473 100644 --- a/htdocs/langs/zh_TW/interventions.lang +++ b/htdocs/langs/zh_TW/interventions.lang @@ -23,11 +23,13 @@ ConfirmDeleteInterventionLine=你確定要刪除此行的幹預？ NameAndSignatureOfInternalContact=名稱及幹預簽名： NameAndSignatureOfExternalContact=客戶的姓名和簽字： DocumentModelStandard=標準文檔模型的幹預 -# InterventionCardsAndInterventionLines=Interventions and lines of interventions -ClassifyBilled=分類“帳單” +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=帳單 RelatedInterventions=相關的幹預措施 ShowIntervention=展幹預 +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=代表隨訪幹預 TypeContact_fichinter_internal_INTERVENING=幹預 @@ -38,5 +40,5 @@ ArcticNumRefModelDesc1=通用數模型 ArcticNumRefModelError=無法啟動 PacificNumRefModelDesc1=用以下固定的方式回傳編號:
%syymm-nnnn
yy 是年、mm是月、nnnn是一個不為0的序號。 PacificNumRefModelError=錯誤編號一個以 $syymm 為起始的 intervention card 已經存在，且不相容於此序號模型。請刪除或重新命名以便啟用這個模塊。 -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang index 692cfcbc826..3f4b27b3793 100644 --- a/htdocs/langs/zh_TW/projects.lang +++ b/htdocs/langs/zh_TW/projects.lang @@ -85,13 +85,13 @@ ActionsOnProject=行動項目 YouAreNotContactOfProject=你是不是這個私人項目聯系 DeleteATimeSpent=刪除的時間 ConfirmDeleteATimeSpent=你確定要刪除這個花的時間？ -DoNotShowMyTasksOnly=又見任務沒有影響到我 -ShowMyTasksOnly=查看任務時，我只受影響 +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me TaskRessourceLinks=資源的整合 ProjectsDedicatedToThisThirdParty=這個項目致力於第三方 NoTasks=該項目沒有任務 LinkedToAnotherCompany=鏈接到其他第三方 -TaskIsNotAffectedToYou=任務不分配給你 +TaskIsNotAffectedToYou=Task not assigned to you ErrorTimeSpentIsEmpty=所花費的時間是空的 ThisWillAlsoRemoveTasks=這一行動也將刪除所有項目任務（%s任務的時刻），花全部的時間都投入。 IfNeedToUseOhterObjectKeepEmpty=如果某些對象（發票，訂單，...），屬於其他第三方，必須與該項目以創建，保持這個空項目多的第三方。 @@ -120,6 +120,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element +UnlinkElement=Unlink element # Documents models DocumentModelBaleine=一個完整的項目報告模型（logo. ..） PlannedWorkload = Planned workload @@ -128,3 +129,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang index 12037cfa158..ec32163c56e 100644 --- a/htdocs/langs/zh_TW/sendings.lang +++ b/htdocs/langs/zh_TW/sendings.lang @@ -13,7 +13,7 @@ LastSendings=有 %s 筆最新的出貨項目 SearchASending=搜尋出貨項目 StatisticsOfSendings=統計出貨量 NbOfSendings=出貨數量 -# NumberOfShipmentsByMonth=Number of shipments by month +NumberOfShipmentsByMonth=Number of shipments by month SendingCard=出貨卡 NewSending=建立出貨 CreateASending=建立一個新的出貨單 @@ -50,27 +50,29 @@ Enlevement=得到了客戶 DocumentModelSimple=簡單的文件範本 DocumentModelMerou=Merou A5 範本 WarningNoQtyLeftToSend=警告，沒有產品等待裝運。 -# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). DateDeliveryPlanned=預計交貨日期 DateReceived=交貨收到日期 SendShippingByEMail=通過電子郵件發送貨物 -SendShippingRef=發送貨物%s +SendShippingRef=Submission of shipment %s ActionsOnShipping=對裝運的事件 LinkToTrackYourPackage=鏈接到追蹤您的包裹 ShipmentCreationIsDoneFromOrder=就目前而言，從這個訂單而建立的出貨單已經完成。 RelatedShippings=相關出貨清單 -# ShipmentLine=Shipment line -# CarrierList=List of transporters +ShipmentLine=Shipment line +CarrierList=List of transporters # Sending methods SendingMethodCATCH=按客戶捕捉 SendingMethodTRANS=運輸車 SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=簡單的送貨單文檔模型 DocumentModelTyphon=更多的送貨單（logo. ..完整的文檔模型） - Error_EXPEDITION_ADDON_NUMBER_NotDefined=沒有定義的常數EXPEDITION_ADDON_NUMBER -# SumOfProductVolumes=Sum of product volumes -# SumOfProductWeights=Sum of product weights +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang index 9815c4e9b02..1be3e6d8bf4 100644 --- a/htdocs/langs/zh_TW/suppliers.lang +++ b/htdocs/langs/zh_TW/suppliers.lang @@ -12,8 +12,8 @@ OrderDate=訂購日期 BuyingPrice=買價 BuyingPriceMin=最低採購價格 BuyingPriceMinShort=最低採購價格 -# TotalBuyingPriceMin=Total of subproducts buying prices -# SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=新增供應商的價格 ChangeSupplierPrice=供應商的價格變化 ErrorQtyTooLowForThisSupplier=數量過低，供應商或供應商在這此產品沒有價格定義 @@ -27,7 +27,7 @@ RefSupplierShort=供應商訂單號 Availability=可用性 ExportDataset_fournisseur_1=供應商發票清單和發票的路線 ExportDataset_fournisseur_2=供應商發票和付款 -# ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=批準這個訂單 ConfirmApproveThisOrder=你確定要批準這個訂單？ DenyingThisOrder=否認這個訂單 @@ -39,4 +39,6 @@ AddSupplierOrder=建立供應商的訂單 AddSupplierInvoice=創建供應商發票 ListOfSupplierProductForSupplier=供應商 %s 的產品及價格清單 NoneOrBatchFileNeverRan=無或批處理%不是最近跑 -# SentToSuppliers=Sent to suppliers +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice From cd8936a224203ed71782b1259e4ff706e4ff541e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Oct 2014 15:04:42 +0200 Subject: [PATCH 0209/1190] Clean deprecated code. --- htdocs/comm/action/card.php | 39 ++++++------------- htdocs/comm/action/class/actioncomm.class.php | 18 +++------ htdocs/comm/action/document.php | 9 +++-- htdocs/comm/action/index.php | 5 +-- htdocs/comm/action/peruser.php | 1 - ...terface_50_modAgenda_ActionsAuto.class.php | 11 ++++-- htdocs/webservices/server_actioncomm.php | 20 +++++----- 7 files changed, 41 insertions(+), 62 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index a306ff202b4..63ea8fd6e04 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -218,13 +218,7 @@ if ($action == 'add') { if ($i == 0) // First entry { - $usertodo=new User($db); - if ($value['id'] > 0) - { - $usertodo->fetch($value['id']); - $object->userownerid = $usertodo->id; - } - $object->usertodo = $usertodo; + if ($value['id'] > 0) $usertodo->fetch($value['id']); $object->transparency = (GETPOST("transparency")=='on'?1:0); } @@ -236,13 +230,7 @@ if ($action == 'add') if (! $error && ! empty($conf->global->AGENDA_ENABLE_DONEBY)) { - $userdone=new User($db); - if ($_POST["doneby"] > 0) - { - $userdone->fetch($_POST["doneby"]); - $object->userdoneid = $userdone->id; - } - $object->userdone = $userdone; + if (GETPOST("doneby") > 0) $object->userdoneid = GETPOST("doneby","int"); } $object->note = trim($_POST["note"]); @@ -263,7 +251,7 @@ if ($action == 'add') if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $object->use_phenix=1; // Check parameters - if (empty($object->usertodo)) + if (empty($object->userownerid)) { $error++; $donotclearsession=1; $action = 'create'; @@ -409,12 +397,7 @@ if ($action == 'update') if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) { - $userdone=new User($db); - if ($_POST["doneby"]) - { - $userdone->fetch($_POST["doneby"]); - } - $object->userdone = $userdone; + if (GETPOST("doneby")) $object->userdoneid=GETPOST("doneby","int"); } // Check parameters @@ -428,7 +411,7 @@ if ($action == 'update') { $result=$cactioncomm->fetch(GETPOST('actioncode')); } - if (empty($object->usertodo)) + if (empty($object->userownerid)) { $error++; $donotclearsession=1; $action = 'edit'; @@ -812,9 +795,6 @@ if ($id > 0) if ($object->authorid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; } if ($object->usermodid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; } - if ($object->userownerid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->userownerid); $object->usertodo=$tmpuser; } - if ($object->userdoneid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->userdoneid); $object->userdone=$tmpuser; } - /* * Show tabs @@ -1088,7 +1068,7 @@ if ($id > 0) $listofuserid=array(); if (empty($donotclearsession)) { - if (is_object($object->usertodo)) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency); // Owner first + if (is_object($object->userownerid)) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency); // Owner first if (! empty($object->userassigned)) // Now concat assigned users { // Restore array with key with same value than param 'id' @@ -1115,7 +1095,12 @@ if ($id > 0) if ($conf->global->AGENDA_ENABLE_DONEBY) { print ''; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 14cacf60f6f..43bc2be4272 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -99,10 +99,6 @@ class ActionComm extends CommonObject $this->db = $db; - //$this->author = new stdClass(); - //$this->usermod = new stdClass(); - //$this->usertodo = new stdClass(); - //$this->userdone = new stdClass(); $this->societe = new stdClass(); // deprecated $this->contact = new stdClass(); // deprecated } @@ -142,8 +138,8 @@ class ActionComm extends CommonObject if ($this->elementtype=='commande') $this->elementtype='order'; if ($this->elementtype=='contrat') $this->elementtype='contract'; - $userownerid=isset($this->usertodo->id)?$this->usertodo->id:$this->userownerid; // For backward compatibility - $userdoneid=isset($this->userdone->id)?$this->userdone->id:$this->userdoneid; // For backward compatibility + $userownerid=$this->userownerid; + $userdoneid=$this->userdoneid; if (! $this->type_id || ! $this->type_code) { @@ -371,10 +367,6 @@ class ActionComm extends CommonObject $this->userownerid = $obj->fk_user_action; $this->userdoneid = $obj->fk_user_done; - if (!is_object($this->usertodo)) $this->usertodo = new stdClass(); // For avoid warning - $this->usertodo->id = $obj->fk_user_action; // deprecated - if (!is_object($this->userdone)) $this->userdone = new stdClass(); // For avoid warning - $this->userdone->id = $obj->fk_user_done; // deprecated $this->priority = $obj->priority; $this->fulldayevent = $obj->fulldayevent; $this->location = $obj->location; @@ -530,7 +522,7 @@ class ActionComm extends CommonObject if ($this->fk_project < 0) $this->fk_project = 0; // Check parameters - if ($this->percentage == 0 && $this->userdone->id > 0) + if ($this->percentage == 0 && $this->userdoneid > 0) { $this->error="ErrorCantSaveADoneUserWithZeroPercentage"; return -1; @@ -538,8 +530,8 @@ class ActionComm extends CommonObject $socid=($this->socid?$this->socid:((isset($this->societe->id) && $this->societe->id > 0) ? $this->societe->id : 0)); $contactid=($this->contactid?$this->contactid:((isset($this->contact->id) && $this->contact->id > 0) ? $this->contact->id : 0)); - $userownerid=($this->userownerid?$this->userownerid:((isset($this->usertodo->id) && $this->usertodo->id > 0) ? $this->usertodo->id : 0)); - $userdoneid=($this->userdoneid?$this->userdoneid:((isset($this->userdone->id) && $this->userdone->id > 0) ? $this->userdone->id : 0)); + $userownerid=($this->userownerid?$this->userownerid:0); + $userdoneid=($this->userdoneid?$this->userdoneid:0); $this->db->begin(); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 0556e532f35..5e180f66abb 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -100,8 +100,7 @@ if ($object->id > 0) $author->fetch($object->author->id); $object->author=$author; - if ($object->contact->id > 0) $object->fetch_contact($object->contact->id); - if ($object->usertodo->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usertodo->id); $object->usertodo=$tmpuser; } + $object->fetch_contact(); $head=actions_prepare_head($object); @@ -195,7 +194,11 @@ if ($object->id > 0) // Assigned to print ''; print '
'.$langs->trans("ActionDoneBy").''; - if ($object->userdoneid > 0) print $object->userdone->getNomUrl(1); + if ($object->userdoneid > 0) + { + $tmpuser=new User($db); + $tmpuser->fetch($object->userdoneid); + print $tmpuser->getNomUrl(1); + } print '
'.$langs->trans("ActionAffectedTo").''; - if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1); + if ($object->userownerid > 0) + { + $tmpuser=new User($object->userownerid); + print $tmpuser->getNomUrl(1); + } print '


'; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index f94ca7cf30a..e540e164d96 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -491,12 +491,9 @@ if ($resql) $event->type_code=$obj->code; $event->libelle=$obj->label; $event->percentage=$obj->percent; - //$event->author->id=$obj->fk_user_author; // user id of creator - $event->authorid=$obj->fk_user_author; // user id of creator + $event->authorid=$obj->fk_user_author; // user id of creator $event->userownerid=$obj->fk_user_action; // user id of owner $event->fetch_userassigned(); // This load $event->userassigned - //$event->usertodo->id=$obj->fk_user_action; // user id of owner - //$event->userdone->id=$obj->fk_user_done; // deprecated $event->priority=$obj->priority; $event->fulldayevent=$obj->fulldayevent; $event->location=$obj->location; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index a6a11d04a99..303ca3dc2a3 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -409,7 +409,6 @@ if ($resql) $event->authorid=$obj->fk_user_author; // user id of creator $event->userownerid=$obj->fk_user_action; // user id of owner $event->fetch_userassigned(); // This load $event->userassigned - //$event->userdone->id=$obj->fk_user_done; // deprecated $event->priority=$obj->priority; $event->fulldayevent=$obj->fulldayevent; $event->location=$obj->location; diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 43ea3357a7d..5e4e7b5a9fb 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -580,11 +580,14 @@ class InterfaceActionsAuto extends DolibarrTriggers $actioncomm->durationp = 0; $actioncomm->punctual = 1; $actioncomm->percentage = -1; // Not applicable - $actioncomm->contact = $contactforaction; $actioncomm->societe = $societeforaction; - $actioncomm->author = $user; // User saving action - $actioncomm->usertodo = $user; // User action is assigned to (owner of action) - //$actioncomm->userdone = $user; // User doing action (deprecated, not used anymore) + $actioncomm->contact = $contactforaction; + $actioncomm->socid = $societeforaction->id; + $actioncomm->contactid = $contactforaction->id; + $actioncomm->authorid = $user->id; // User saving action + $actioncomm->userownerid = $user->id; // Owner of action + //$actioncomm->userdone = $user; // User doing action (not used anymore) + //$actioncomm->userdoneid = $user->id; // User doing action (not used anymore) $actioncomm->fk_element = $object->id; $actioncomm->elementtype = $object->element; diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php index 2a41a769314..dc07bc156ec 100644 --- a/htdocs/webservices/server_actioncomm.php +++ b/htdocs/webservices/server_actioncomm.php @@ -289,15 +289,15 @@ function getActionComm($authentication,$id) 'datem'=> dol_print_date($actioncomm->datem,'dayhourrfc'), 'note'=> $actioncomm->note, 'percentage'=> $actioncomm->percentage, - 'author'=> $actioncomm->author->id, - 'usermod'=> $actioncomm->usermod->id, - 'usertodo'=> $actioncomm->usertodo->id, - 'userdone'=> $actioncomm->userdone->id, + 'author'=> $actioncomm->authorid, + 'usermod'=> $actioncomm->usermodid, + 'usertodo'=> $actioncomm->userownerid, + 'userdone'=> $actioncomm->userdoneid, 'priority'=> $actioncomm->priority, 'fulldayevent'=> $actioncomm->fulldayevent, 'location'=> $actioncomm->location, - 'socid'=> $actioncomm->societe->id, - 'contactid'=> $actioncomm->contact->id, + 'socid'=> $actioncomm->socid, + 'contactid'=> $actioncomm->contactid, 'projectid'=> $actioncomm->fk_project, 'fk_element'=> $actioncomm->fk_element, 'elementtype'=> $actioncomm->elementtype); @@ -437,8 +437,8 @@ function createActionComm($authentication,$actioncomm) $newobject->fk_project=$actioncomm['projectid']; $newobject->note=$actioncomm['note']; $newobject->contactid=$actioncomm['contactid']; - $newobject->usertodo->id=$actioncomm['usertodo']; - $newobject->userdone->id=$actioncomm['userdone']; + $newobject->userownerid=$actioncomm['usertodo']; + $newobject->userdoneid=$actioncomm['userdone']; $newobject->label=$actioncomm['label']; $newobject->percentage=$actioncomm['percentage']; $newobject->priority=$actioncomm['priority']; @@ -532,8 +532,8 @@ function updateActionComm($authentication,$actioncomm) $object->contactid=$actioncomm['contactid']; $object->fk_project=$actioncomm['projectid']; $object->note=$actioncomm['note']; - $object->usertodo->id=$actioncomm['usertodo']; - $object->userdone->id=$actioncomm['userdone']; + $object->userownerid=$actioncomm['usertodo']; + $object->userdoneid=$actioncomm['userdone']; $object->label=$actioncomm['label']; $object->percentage=$actioncomm['percentage']; $object->priority=$actioncomm['priority']; From a804fe62b4e36d4cdc369a42d59fff3e62ecbd6b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Oct 2014 15:46:37 +0200 Subject: [PATCH 0210/1190] Fix: translation for vi_VN --- htdocs/langs/vi_VN/main.lang | 32 ++++++++++++++++---------------- test/phpunit/LangTest.php | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index 34c16792033..aa14bfa53ee 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - main -DIRECTION=lít +DIRECTION=ltr # Note for Chinese: # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) # stsongstdlight or cid0cs are for simplified Chinese @@ -7,21 +7,21 @@ DIRECTION=lít FONTFORPDF=Helvetica FONTSIZEFORPDF=10 SeparatorDecimal=. -SeparatorThousand=, -FormatDateShort=% M /% d /% Y -FormatDateShortInput=% M /% d /% Y -FormatDateShortJava=MM / dd / yyyy -FormatDateShortJavaInput=MM / dd / yyyy -FormatDateShortJQuery=dd / mm / yyyy -FormatDateShortJQueryInput=dd / mm / yyyy -FormatHourShort=% I:% M% p -FormatHourShortDuration=% H:% M -FormatDateTextShort=% B% d,% Y -FormatDateText=% B% d,% Y -FormatDateHourShort=% M /% d /% Y% I:% M% p -FormatDateHourSecShort=% M /% d /% Y% I:% M:% S% p -FormatDateHourTextShort=% B% d,% Y,% I:% M% p -FormatDateHourText=% B% d,% Y,% I:% M% p +SeparatorThousand=None +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy +FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M +FormatDateTextShort=%b %d, %Y +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p DatabaseConnection=Kết nối cơ sở dữ liệu NoTranslation=Không có bản dịch NoRecordFound=Không có hồ sơ tìm thấy diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php index c0788feef8a..5f876c8740c 100755 --- a/test/phpunit/LangTest.php +++ b/test/phpunit/LangTest.php @@ -163,10 +163,10 @@ class LangTest extends PHPUnit_Framework_TestCase // Test java string contains only d,M,y,/,-,. and not m,... $result=$tmplangs->trans("FormatDateShortJava"); print __METHOD__." FormatDateShortJava=".$result."\n"; - $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava'); + $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava KO for lang code '.$code); $result=$tmplangs->trans("FormatDateShortJavaInput"); print __METHOD__." FormatDateShortJavaInput=".$result."\n"; - $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput'); + $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput KO for lang code '.$code); unset($tmplangs); } From 2800faffa8075fd6ad6f2459e9d69ceaace3a76b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Oct 2014 18:27:30 +0200 Subject: [PATCH 0211/1190] Fix: File names must be in lowercase. Fix: Missing includes. --- htdocs/core/class/interfaces.class.php | 4 ++-- ...olibarrTriggers.class.php => dolibarrtriggers.class.php} | 0 htdocs/core/triggers/interface_20_all_Logevents.class.php | 2 ++ .../interface_20_modPaypal_PaypalWorkflow.class.php | 2 ++ .../interface_20_modWorkflow_WorkflowManager.class.php | 2 ++ .../triggers/interface_50_modAgenda_ActionsAuto.class.php | 2 ++ .../triggers/interface_50_modLdap_Ldapsynchro.class.php | 6 ++++-- ...interface_50_modMailmanspip_Mailmanspipsynchro.class.php | 5 +++-- .../interface_50_modNotification_Notification.class.php | 1 + htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN | 1 + 10 files changed, 19 insertions(+), 6 deletions(-) rename htdocs/core/triggers/{DolibarrTriggers.class.php => dolibarrtriggers.class.php} (100%) diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index e441dbe5e96..407893021ef 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -23,12 +23,12 @@ * \brief Fichier de la classe de gestion des triggers */ -require_once DOL_DOCUMENT_ROOT.'/core/triggers/DolibarrTriggers.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; + /** * Class to manage triggers */ - class Interfaces { var $dir; // Directory with all core and external triggers files diff --git a/htdocs/core/triggers/DolibarrTriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php similarity index 100% rename from htdocs/core/triggers/DolibarrTriggers.class.php rename to htdocs/core/triggers/dolibarrtriggers.class.php diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 1b094790195..b73d01ec612 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -23,6 +23,8 @@ * \brief Trigger file for */ +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; + /** * Class of triggers for security events diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php index 13647814bb4..1d57f598d57 100644 --- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php +++ b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php @@ -22,6 +22,8 @@ * \brief Trigger file for paypal workflow */ +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; + /** * Class of triggers for paypal module diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index c1e3995afa8..d144f365533 100644 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -23,6 +23,8 @@ * \brief Trigger file for workflows */ +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; + /** * Class of triggers for workflow module diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 5e4e7b5a9fb..e7ccc31583c 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -25,6 +25,8 @@ * \brief Trigger file for agenda module */ +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; + /** * Class of triggered functions for agenda module diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php index ce3af92d30b..652a1ec8d6b 100644 --- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php +++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php @@ -21,8 +21,10 @@ * \ingroup core * \brief Fichier de gestion des triggers LDAP */ -require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once (DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); + +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"; /** diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php index d2c01f5f508..467cf678c07 100644 --- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php +++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php @@ -21,8 +21,9 @@ * \ingroup core * \brief File to manage triggers Mailman and Spip */ -require_once (DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php"); -require_once (DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; +require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"; /** diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php index c26ca4e33ef..368f7bdeeb8 100644 --- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php @@ -22,6 +22,7 @@ * \ingroup notification * \brief File of class of triggers for notification module */ +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; /** diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index 96401c77251..d3abf17501d 100644 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -28,6 +28,7 @@ * - Le nom de la classe doit etre InterfaceMytrigger * - Le nom de la propriete name doit etre Mytrigger */ +require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; /** From 52e1bd2ad1353c9acdce74e2a22ac2e4b6fe9fc4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Oct 2014 23:46:49 +0200 Subject: [PATCH 0212/1190] Merge --- htdocs/core/lib/functions2.lib.php | 82 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index ba1cc230258..e6f6228eec9 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -480,47 +480,47 @@ function clean_url($url,$http=1) } - -/** - * Returns an email value with obfuscated parts. - * - * @param string $mail Email - * @param string $replace Replacement character (defaul : *) - * @param int $nbreplace Number of replacement character (default : 8) - * @param int $nbdisplaymail Number of character unchanged (default: 4) - * @param int $nbdisplaydomain Number of character unchanged of domain (default: 3) - * @param bool $displaytld Display tld (default: true) - * @return string Return email with hidden parts or ''; - */ -function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true) -{ - if(!isValidEmail($mail))return ''; - $tab = explode('@', $mail); - $tab2 = explode('.',$tab[1]); - $string_replace = ''; - $mail_name = $tab[0]; - $mail_domaine = $tab2[0]; - $mail_tld = ''; - - for($i=1; $i < count($tab2) && $displaytld ;$i++) - { - $mail_tld .= '.'.$tab2[$i]; - } - - for($i=0; $i < $nbreplace; $i++){ - $string_replace .= $replace; - } - - if(strlen($mail_name) > $nbdisplaymail){ - $mail_name = substr($mail_name, 0, $nbdisplaymail); - } - - if(strlen($mail_domaine) > $nbdisplaydomain){ - $mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain); - } - - return $mail_name . $string_replace . $mail_domaine . $mail_tld; -} + +/** + * Returns an email value with obfuscated parts. + * + * @param string $mail Email + * @param string $replace Replacement character (defaul : *) + * @param int $nbreplace Number of replacement character (default : 8) + * @param int $nbdisplaymail Number of character unchanged (default: 4) + * @param int $nbdisplaydomain Number of character unchanged of domain (default: 3) + * @param bool $displaytld Display tld (default: true) + * @return string Return email with hidden parts or ''; + */ +function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true) +{ + if(!isValidEmail($mail))return ''; + $tab = explode('@', $mail); + $tab2 = explode('.',$tab[1]); + $string_replace = ''; + $mail_name = $tab[0]; + $mail_domaine = $tab2[0]; + $mail_tld = ''; + + for($i=1; $i < count($tab2) && $displaytld ;$i++) + { + $mail_tld .= '.'.$tab2[$i]; + } + + for($i=0; $i < $nbreplace; $i++){ + $string_replace .= $replace; + } + + if(strlen($mail_name) > $nbdisplaymail){ + $mail_name = substr($mail_name, 0, $nbdisplaymail); + } + + if(strlen($mail_domaine) > $nbdisplaydomain){ + $mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain); + } + + return $mail_name . $string_replace . $mail_domaine . $mail_tld; +} /** From fc63e8b9dca213abc65fc2055c89da0788fad069 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Oct 2014 23:55:10 +0200 Subject: [PATCH 0213/1190] Fix: ErrorBadValueForParamNotAString error message in price customer multiprice --- htdocs/product/price.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index b208cba1c7e..856a68face6 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -365,10 +365,14 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) { // Prix mini print ''; From c184253951cfa64952d5ee6399472611255ecf22 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Oct 2014 23:56:45 +0200 Subject: [PATCH 0214/1190] Update doc --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 294fc64ff5a..90067f92312 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ English Dolibarr ChangeLog -------------------------------------------------------------- + +***** ChangeLog for 3.6.2 compared to 3.6.1 ***** +- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice + + ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: - Fix: Can upload files on services. From f7a44347cb0e951982157b2a0006a5a3da81a60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 12 Oct 2014 00:23:19 +0200 Subject: [PATCH 0215/1190] Lowecased booleans to fit with PSR-2 specification. --- htdocs/accountancy/admin/account.php | 2 +- htdocs/accountancy/admin/export.php | 2 +- htdocs/accountancy/admin/importaccounts.php | 2 +- htdocs/accountancy/admin/index.php | 4 ++-- htdocs/accountancy/admin/productaccount.php | 2 +- htdocs/commande/customer.php | 2 +- htdocs/commande/index.php | 8 ++++---- htdocs/commande/orderstoinvoice.php | 2 +- htdocs/compta/clients.php | 2 +- htdocs/compta/facture/fiche-rec.php | 6 +++--- htdocs/compta/facture/impayees.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/compta/facture/prelevement.php | 2 +- htdocs/compta/index.php | 4 ++-- htdocs/compta/paiement.php | 4 ++-- htdocs/compta/paiement_charge.php | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 0c929ef5de5..3b20885b897 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -160,7 +160,7 @@ if ($result) { print ''; print ''; - $var = True; + $var = true; while ( $i < min($num, $limit) ) { $obj = $db->fetch_object($resql); diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index ca7e5f84e07..dc8f50241a1 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -99,7 +99,7 @@ print '' print ''; print '
' . $langs->trans("MinPrice") . ' ' . $i . ''; - if ($object->multiprices_base_type ["$i"] == 'TTC') { - print price($object->multiprices_min_ttc ["$i"]) . ' ' . $langs->trans($object->multiprices_base_type ["$i"]); - } else { - print price($object->multiprices_min ["$i"]) . ' ' . $langs->trans($object->multiprices_base_type ["$i"]); + if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT"; + if ($object->multiprices_base_type["$i"] == 'TTC') + { + print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); + } + else + { + print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); } print '
'; -$var = True; +$var = true; print ''; print ''; diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index b350aa8e590..9e5c59f4555 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -135,7 +135,7 @@ if ($result) { print '' . "\n"; print ''; - $var = True; + $var = true; while ( $i < min($num_lines, $limit) ) { $objp = $db->fetch_object($result); $var = ! $var; diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 8e548f8992e..e72df6a0431 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -191,7 +191,7 @@ print "
\n"; * Define Chart of accounts */ print '
' . $langs->trans("Modelcsv") . '
'; -$var = True; +$var = true; print ''; print ''; print ''; - $var = True; + $var = true; while ( $i < min($num, 250) ) { $obj = $db->fetch_object($resql); diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index f40277ea34a..333ce5f7908 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -146,7 +146,7 @@ if ($resql) print ''; print "\n"; - $var=True; + $var=true; while ($i < min($num,$conf->liste_limit)) { diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index b7d9be05529..0d2815a6d67 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -187,7 +187,7 @@ if (! empty($conf->commande->enabled)) if ($num) { $i = 0; - $var = True; + $var = true; while ($i < $num) { $var=!$var; @@ -238,7 +238,7 @@ if ($resql) if ($num) { $i = 0; - $var = True; + $var = true; while ($i < $num) { $var=!$var; @@ -308,7 +308,7 @@ if (! empty($conf->commande->enabled)) if ($num) { $i = 0; - $var = True; + $var = true; while ($i < $num) { $var=!$var; @@ -379,7 +379,7 @@ if (! empty($conf->commande->enabled)) if ($num) { $i = 0; - $var = True; + $var = true; while ($i < $num) { $var=!$var; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 49824a7f6cb..1009b030210 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -622,7 +622,7 @@ if (($action != 'create' && $action != 'add') || !$error) print ''; print ''; - $var=True; + $var=true; $generic_commande = new Commande($db); while ($i < $num) diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 528ed14e849..14751d308c4 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -177,7 +177,7 @@ if ($resql) print ''; print "\n"; - $var=True; + $var=true; while ($i < min($num,$conf->liste_limit)) { diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 02674b59745..55ef0a5ef80 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -228,7 +228,7 @@ if ($action == 'create') if (empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print "\n"; } - $var=True; + $var=true; while ($i < $num) { $objp = $db->fetch_object($result); @@ -447,7 +447,7 @@ else $num = count($object->lines); $i = 0; - $var=True; + $var=true; while ($i < $num) { $var=!$var; @@ -572,7 +572,7 @@ else if ($num > 0) { - $var=True; + $var=true; while ($i < min($num,$limit)) { $objp = $db->fetch_object($resql); diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index d3987bcbad8..ea0d896f5d1 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -600,7 +600,7 @@ if ($resql) if ($num > 0) { - $var=True; + $var=true; $total_ht=0; $total_tva=0; $total_ttc=0; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 39dcc6b6427..ba27f5659a9 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -333,7 +333,7 @@ if ($resql) if ($num > 0) { - $var=True; + $var=true; $total_ht=0; $total_tva=0; $total_ttc=0; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 4bfa4d81048..48ca10afd2d 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -491,7 +491,7 @@ if ($object->id > 0) print ''; print ''; print ''; - $var=True; + $var=true; if ($result_sql) { diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 1908b0670ff..fc2943f05e0 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -494,7 +494,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire) print ''; if ($num) { - $var = True; + $var = true; $total_ttc = $totalam = $total = 0; $var=true; @@ -908,7 +908,7 @@ if ($resql) print '
'; @@ -211,7 +211,7 @@ $sql .= " AND fk_pays = " . $mysoc->country_id; dol_syslog('accountancy/admin/index.php:: $sql=' . $sql); $resql = $db->query($sql); -$var = True; +$var = true; if ($resql) { $num = $db->num_rows($resql); diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 5c1cba946ee..402ff72ed84 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -89,7 +89,7 @@ if ($resql) { print '' . $langs->trans("Accountancy_code_sell") . '' . $langs->trans("Accountancy_code_sell_suggest") . '
'.$langs->trans("CurrentProductPrice").'
'.$langs->trans("WithdrawalReceipt").''.$langs->trans("User").'  
'; print ''; print "\n"; - $var = True; + $var = true; $i = 0; while ($i < $db->num_rows($resql)) { diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 21b2eb9e154..56278f15c5d 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -509,7 +509,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print "\n"; - $var=True; + $var=true; $total=0; $totalrecu=0; $totalrecucreditnote=0; @@ -687,7 +687,7 @@ if (! GETPOST('action')) { $num = $db->num_rows($resql); $i = 0; - $var=True; + $var=true; print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num); print '
'.$langs->trans("TasksToDo").'
 
'; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index a54a0bcd935..7e26fa5789f 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -253,7 +253,7 @@ if ($_GET["action"] == 'create') print ''; print "\n"; - $var=True; + $var=true; $total=0; $totalrecu=0; From 2b479aa0b42b28e9921e0510f65e38ecf7c7ceef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 01:04:34 +0200 Subject: [PATCH 0216/1190] Qual: Uniformize translated label of progress on all pages. Fix: Color of first line of documents. Fix: The calculated progress was not calculated. --- htdocs/core/class/html.form.class.php | 4 +- htdocs/core/class/html.formfile.class.php | 4 +- htdocs/core/lib/project.lib.php | 12 +++--- htdocs/langs/en_US/main.lang | 1 + htdocs/projet/activity/list.php | 2 +- htdocs/projet/class/task.class.php | 48 +++++++++++++++++++-- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/task.php | 20 ++++++--- htdocs/projet/tasks/time.php | 52 +++++++++++++++++------ 9 files changed, 112 insertions(+), 33 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 51b9c5eff46..d4effca3905 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3987,7 +3987,7 @@ class Form { print ''; } - print $langs->trans('Hours'); + print ' '.$langs->trans('HourShort'); if ($minunderhours) print '
'; else print " "; @@ -4000,7 +4000,7 @@ class Form print '>'.$min.''; } print ""; - print $langs->trans('Minutes'). " "; + print ' '.$langs->trans('MinuteShort'). " "; } diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index e473fdc3d98..8c53356fa67 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -629,7 +629,7 @@ class FormFile if (count($file_list) == 0 && $headershown) { - $out.=''; + $out.=''; } $this->numoffiles++; @@ -1150,7 +1150,7 @@ class FormFile $nboflinks = count($links); if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; - $var = true; + $var = false; foreach ($links as $link) { $var =! $var; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index d8ecc52f6d9..98a2b111c6f 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2006-2014 Laurent Destailleur * Copyright (C) 2010 Regis Houssin * Copyright (C) 2011 Juanjo Menent * @@ -455,12 +455,14 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t */ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; - global $db, $user, $bc, $langs; - global $form, $projectstatic, $taskstatic; + global $form, $formother, $projectstatic, $taskstatic; - $formother = new FormOther($db); + if (! is_object($formother)) + { + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; + $formother = new FormOther($db); + } $lastprojectid=0; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 1256dd533e3..7663f520667 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index e83fe30e865..0c2cebc2e27 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -179,7 +179,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print "\n"; diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index ad3736d3abe..2449d638405 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2008-2014 Laurent Destailleur * Copyright (C) 2010-2012 Regis Houssin * Copyright (C) 2014 Marcos García * @@ -141,8 +141,9 @@ class Task extends CommonObject } } - //Update extrafield - if (!$error) { + // Update extrafield + if (! $error) + { if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used { $result=$this->insertExtraFields(); @@ -816,6 +817,47 @@ class Task extends CommonObject return $ret; } + /** + * Calculate total of time spent for task + * + * @param int $id Id of object (here task) + * @return array Array of info for task array('min_date', 'max_date', 'total_duration') + */ + function getSummaryOfTimeSpent($id='') + { + global $langs; + + if (empty($id)) $id=$this->id; + + $result=array(); + + $sql = "SELECT"; + $sql.= " MIN(t.task_datehour) as min_date,"; + $sql.= " MAX(t.task_datehour) as max_date,"; + $sql.= " SUM(t.task_duration) as total_duration"; + $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t"; + $sql.= " WHERE t.fk_task = ".$id; + + dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $obj = $this->db->fetch_object($resql); + + $result['min_date'] = $obj->min_date; + $result['max_date'] = $obj->max_date; + $result['total_duration'] = $obj->total_duration; + + $this->db->free($resql); + return $result; + } + else + { + dol_print_error($this->db); + return $result; + } + } + /** * Load object in memory from database * diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 7aea9314e5a..eaec5ae0816 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -320,7 +320,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third print ''; // Progress - print ''; diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index da200d565b6..ac6c72ec44c 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -351,8 +351,8 @@ if ($id > 0 || ! empty($ref)) print $form->select_duration('planned_workload',$object->planned_workload,0,'text'); print ''; - // Progress - print ''; @@ -383,7 +383,7 @@ if ($id > 0 || ! empty($ref)) { /* * Fiche tache en mode visu - */ + */ $param=($withproject?'&withproject=1':''); $linkback=$withproject?''.$langs->trans("BackToList").'':''; @@ -440,14 +440,20 @@ if ($id > 0 || ! empty($ref)) print convertSecondToTime($object->planned_workload,'allhourmin'); print ''; - // Progress + // Progress declared print ''; - // Progress + // Progress calculated print ''; // Description @@ -504,7 +510,7 @@ if ($id > 0 || ! empty($ref)) /* * Documents generes - */ + */ $filename=dol_sanitizeFileName($projectstatic->ref). "/". dol_sanitizeFileName($object->ref); $filedir=$conf->projet->dir_output . "/" . dol_sanitizeFileName($projectstatic->ref). "/" .dol_sanitizeFileName($object->ref); $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index eff94d532e5..f7b9f28e16a 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2006-2014 Laurent Destailleur * Copyright (C) 2010-2012 Regis Houssin * Copyright (C) 2011 Juanjo Menent * @@ -181,7 +181,7 @@ if (! empty($project_ref) && ! empty($withproject)) /* * View -*/ + */ llxHeader("",$langs->trans("Task")); @@ -193,7 +193,7 @@ if ($id > 0 || ! empty($ref)) { /* * Fiche projet en mode visu - */ + */ if ($object->fetch($id) >= 0) { $result=$projectstatic->fetch($object->fk_project); @@ -292,9 +292,37 @@ if ($id > 0 || ! empty($ref)) // Label print ''; - // Planned workload - print ''; - + // Date start + print ''; + + // Date end + print ''; + + // Planned workload + print ''; + + // Progress declared + print ''; + + // Progress calculated + print ''; + // Project if (empty($withproject)) { @@ -316,7 +344,7 @@ if ($id > 0 || ! empty($ref)) /* * Add time spent - */ + */ if ($user->rights->projet->creer) { print '
'; @@ -333,7 +361,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print "\n"; @@ -363,14 +391,14 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - // Progress + // Progress declared print ''; // Duration print ''; print ''; } else @@ -492,7 +492,7 @@ class FormFile } // Language code (if multilang) - $out.= ''; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 7663f520667..fd2a7d94c76 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -680,7 +680,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index c6909aa7cae..e9e79d52130 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -2157,7 +2157,7 @@ else if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) { - print '
'; + print '
'; print ''; // ancre /* @@ -2172,7 +2172,7 @@ else $somethingshown=$formfile->show_documents('company',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang); - print '
'; + print '
'; print '
'; From 65f47f7d10c0eacedeb0c453284175238ed47f24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 12:22:45 +0200 Subject: [PATCH 0222/1190] New: Add number of active notification into tab title (like we do for notes and documents) --- ChangeLog | 1 + htdocs/core/lib/company.lib.php | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d531ec987b3..0526cd214a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Add number of active notification into tab title (like we do for notes and documents) - New: Can add product into category from category card. - New: PDF event report show project and status of event. - New: Can filter on status on interventions. diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index d897dc766e0..c5ba612b60f 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -37,7 +37,7 @@ */ function societe_prepare_head($object) { - global $langs, $conf, $user; + global $db, $langs, $conf, $user; $h = 0; $head = array(); @@ -109,8 +109,29 @@ function societe_prepare_head($object) // Notifications if (! empty($conf->notification->enabled)) { + $nbNote = 0; + $sql = "SELECT COUNT(n.rowid) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; + $sql.= " WHERE fk_soc = ".$object->id; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($resql); + $nbNote=$obj->nb; + $i++; + } + } + else { + dol_print_error($db); + } + $head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id; $head[$h][1] = $langs->trans("Notifications"); + if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; $head[$h][2] = 'notify'; $h++; } From bba6dc6398fc94c9dad8a7512f235d91c19a5018 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 14:11:16 +0200 Subject: [PATCH 0223/1190] Better contrast --- htdocs/theme/eldy/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 43aee0161af..d9ddc1c0a07 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1692,7 +1692,7 @@ table.noborder, table.formdoc, div.noborder { border-right-style: solid; border-left-width: 1px; - border-left-color: #CCCCCC; + border-left-color: #B0B0B0; border-left-style: solid; border-bottom-width: 1px; From e6e953b4d80f37862386eab294b205434d59c5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 14:20:49 +0200 Subject: [PATCH 0224/1190] Update ajax.lib.php --- htdocs/core/lib/ajax.lib.php | 92 ++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 9081fba5550..f657df7185b 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -459,3 +459,95 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, return $out; } +/** + * On/off button for product tosell or tobuy + * + * @param int $id Id product to set + * @param string $code Name of constant : status or status_buy + * @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid')) + * @param int $entity Entity to set + * @return void + */ +function ajax_productonoff($id, $code, $input=array(), $entity=null) +{ + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + global $conf, $langs, $db; + + $entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity); + $object = new Product($db); + $object->fetch($id); + + $out= ''; + if ($code=='status') { + $out.= ''.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').''; + $out.= ''.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').''; + } + if ($code=='status_buy') { + $out.= ''.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').''; + $out.= ''.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').''; + } + return $out; +} + From 77d77642154d1aeb15f544d58e3407cf9f3040d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 14:22:32 +0200 Subject: [PATCH 0225/1190] Create productonoff.php --- htdocs/core/ajax/productonoff.php | 65 +++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 htdocs/core/ajax/productonoff.php diff --git a/htdocs/core/ajax/productonoff.php b/htdocs/core/ajax/productonoff.php new file mode 100644 index 00000000000..4def2898c10 --- /dev/null +++ b/htdocs/core/ajax/productonoff.php @@ -0,0 +1,65 @@ +. + */ + +/** + * \file htdocs/core/ajax/productonoff.php + * \brief File to set tosell and tobuy for product + */ + +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + +$action=GETPOST('action','alpha'); +$name=GETPOST('name','alpha'); +$id=GETPOST('id', 'int'); + +/* + * View + */ + +top_httphead(); + +print ''."\n"; + +// Registering the location of boxes +if (! empty($action) && ! empty($name) &&! empty($id)) +{ + //$entity = GETPOST('entity','int'); + + if ($user->rights->produit->creer) { + if ($action == 'set' && $name== 'status') { + $sql = "UPDATE llx_product SET tosell=1 WHERE rowid=".$id; + $resql = $db->query($sql); + } else if ($action == 'set' && $name== 'status_buy') { + $sql = "UPDATE llx_product SET tobuy=1 WHERE rowid=".$id; + $resql = $db->query($sql); + } else if ($action == 'del' && $name== 'status') { + $sql = "UPDATE llx_product SET tosell=0 WHERE rowid=".$id; + $resql = $db->query($sql); + } else if ($action == 'del' && $name== 'status_buy') { + $sql = "UPDATE llx_product SET tobuy=0 WHERE rowid=".$id; + $resql = $db->query($sql); + } + + } +} From 633f01e5a2e1c8b3ca2f6bd5af04d249a57edb50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 14:26:51 +0200 Subject: [PATCH 0226/1190] Update card.php --- htdocs/product/card.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index a9f533ba40b..0f374dc2b3a 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1420,12 +1420,20 @@ else // Status (to sell) print '
'; // Status (to buy) print ''; // Batch number management (to batch) From cbbe909bc58f028ab3a76156171d2ff8202ca8a9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 15:22:07 +0200 Subject: [PATCH 0227/1190] Fix: Pb in management of "or" ("|") for permission check. --- htdocs/compta/charges/index.php | 10 +++++----- htdocs/core/lib/security.lib.php | 12 +++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index f38f7e72aa2..a3803e853ba 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -111,7 +111,7 @@ if ($conf->salaries->enabled) $total = 0 ; print '
'.$langs->trans("Amount").'
'.$langs->trans("None").'
'.$langs->trans("None").'
'.$langs->trans("LabelTask").''.$langs->trans("DateStart").''.$langs->trans("DateEnd").''.$langs->trans("PlannedWorkload").''.$langs->trans("Progress").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("AddDuration").'
'.$langs->trans("Progress").''; + print '
'.$langs->trans("ProgressDeclared").''; print $formother->select_percent($progress,'progress'); print '
'.$langs->trans("Progress").''; + // Progress declared + print '
'.$langs->trans("ProgressDeclared").''; print $formother->select_percent($object->progress,'progress'); print '
'.$langs->trans("ProgressDeclared").''; print $object->progress.' %'; print '
'.$langs->trans("ProgressCalculated").''; - print $object->progress.' %'; + if ($object->planned_workload) + { + $tmparray=$object->getSummaryOfTimeSpent(); + if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %'; + else print '0 %'; + } + else print ''; print '
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("PlannedWorkload").''.convertSecondToTime($object->planned_workload,'allhourmin').'
'.$langs->trans("DateStart").''; + print dol_print_date($object->date_start,'dayhour'); + print '
'.$langs->trans("DateEnd").''; + print dol_print_date($object->date_end,'dayhour'); + print '
'.$langs->trans("PlannedWorkload").''; + print convertSecondToTime($object->planned_workload,'allhourmin'); + print '
'.$langs->trans("ProgressDeclared").''; + print $object->progress.' %'; + print '
'.$langs->trans("ProgressCalculated").''; + if ($object->planned_workload) + { + $tmparray=$object->getSummaryOfTimeSpent(); + if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %'; + else print '0 %'; + } + else print ''; + print '
'.$langs->trans("Date").''.$langs->trans("By").''.$langs->trans("Note").''.$langs->trans("Progress").''.$langs->trans("ProgressDeclared").''.$langs->trans("Duration").' 
'; - print $formother->select_percent($object->progress,'progress'); + print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress'); print ''; - print $form->select_duration('timespent_duration',($_POST['timespent_duration']?$_POST['timespent_duration']:''),0,'text'); + print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text'); print ''; @@ -384,7 +412,7 @@ if ($id > 0 || ! empty($ref)) /* * List of time spent - */ + */ $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note"; $sql.= ", u.lastname, u.firstname"; $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t"; From 44e2cd21940b14092363f8f66c5903427ec4d24f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 01:20:03 +0200 Subject: [PATCH 0217/1190] Prepare code to manage task_datehour with task_date. --- htdocs/install/mysql/migration/repair.sql | 2 ++ htdocs/projet/class/task.class.php | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index fbc1572a2ab..57a89440343 100644 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -149,6 +149,8 @@ UPDATE llx_actioncomm set fk_user_action = fk_user_done where fk_user_done > 0 a UPDATE llx_actioncomm set fk_user_action = fk_user_author where fk_user_author > 0 and (fk_user_action is null or fk_user_action = 0); +UPDATE llx_projet_task_time set task_datehour = task_date where task_datehour IS NULL and task_date IS NOT NULL; + -- Requests to clean old tables or external modules tables diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 2449d638405..2f25e2f3c2c 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -60,6 +60,7 @@ class Task extends CommonObject var $timespent_duration; var $timespent_old_duration; var $timespent_date; + var $timespent_datehour; // More accurate start date (same than timespent_date but includes hours, minutes and seconds) var $timespent_fk_user; var $timespent_note; @@ -744,18 +745,21 @@ class Task extends CommonObject // Clean parameters if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note); - + if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date; + $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time ("; $sql.= "fk_task"; $sql.= ", task_date"; + $sql.= ", task_datehour"; $sql.= ", task_duration"; $sql.= ", fk_user"; $sql.= ", note"; $sql.= ") VALUES ("; $sql.= $this->id; $sql.= ", '".$this->db->idate($this->timespent_date)."'"; + $sql.= ", '".$this->db->idate($this->timespent_datehour)."'"; $sql.= ", ".$this->timespent_duration; $sql.= ", ".$this->timespent_fk_user; $sql.= ", ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null"); @@ -919,12 +923,14 @@ class Task extends CommonObject $ret = 0; // Clean parameters + if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date; if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note); - + $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET"; $sql.= " task_date = '".$this->db->idate($this->timespent_date)."',"; + $sql.= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',"; $sql.= " task_duration = ".$this->timespent_duration.","; $sql.= " fk_user = ".$this->timespent_fk_user.","; $sql.= " note = ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null"); From ac2ff5c6044ad1524579e986c8129e256f693385 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 01:40:18 +0200 Subject: [PATCH 0218/1190] Update logs --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 90067f92312..a4e7edc94dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice - +- Fix: bug 1588 : relative discount ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: From 591b40e67461e3ddb89b782267b067fb8dae25d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 01:59:21 +0200 Subject: [PATCH 0219/1190] Some fix with export definition. Works now with pgql too. --- htdocs/core/modules/modAgenda.class.php | 4 ++-- htdocs/core/modules/modBanque.class.php | 2 +- htdocs/core/modules/modContrat.class.php | 25 ++++++++++++------------ test/phpunit/ContratTest.php | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index 7533018373a..c633734b227 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2009-2011 Regis Houssin @@ -394,7 +394,7 @@ class modAgenda extends DolibarrModules $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid'; $this->export_sql_end[$r] .=' Where ac.entity = '.$conf->entity; - $this->export_sql_end[$r] .=' ORDER BY datep'; + $this->export_sql_end[$r] .=' ORDER BY ac.datep'; } diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index 43fbe916c47..0d383603a06 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -182,7 +182,7 @@ class modBanque extends DolibarrModules $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON f.rowid = pf.fk_facture'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON f.fk_soc = s.rowid'; $this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid'; - $this->export_sql_end[$r] .=' AND b.fk_type = "CHQ"'; + $this->export_sql_end[$r] .=" AND b.fk_type = 'CHQ'"; $this->export_sql_end[$r] .=' AND p.fk_paiement = 7'; $this->export_sql_end[$r] .=' AND ba.entity = '.$conf->entity; $this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve'; diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php index e77067fc25e..4906d9e3954 100644 --- a/htdocs/core/modules/modContrat.class.php +++ b/htdocs/core/modules/modContrat.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2011 Juanjo Menent * This program is free software; you can redistribute it and/or modify @@ -41,6 +41,8 @@ class modContrat extends DolibarrModules */ function __construct($db) { + global $conf; + $this->db = $db; $this->numero = 54; @@ -122,31 +124,31 @@ class modContrat extends DolibarrModules $this->export_label[$r]='ContractAndServices'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_icon[$r]='contract'; $this->export_permission[$r]=array(array("contrat","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','c.code'=>'CountryCode', - 's.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode', + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode', + 's.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra', 'co.rowid'=>"contractId",'co.ref'=>"contactRef",'co.datec'=>"contractDateCreation",'co.date_contrat'=>"DateContract",'co.mise_en_service'=>"DateMiseService", - 'co.fin_validite'=>"EndValidity",'co.date_cloture'=>"Cloture",'co.fk_statut'=>'ContractStatus','co.note'=>"NotePrivate",'co.note_public'=>"NotePublic", + 'co.fin_validite'=>"EndValidity",'co.date_cloture'=>"Cloture",'co.note_private'=>"NotePrivate",'co.note_public'=>"NotePublic", 'cod.rowid'=>'LineId','cod.label'=>"LineLabel",'cod.description'=>"LineDescription",'cod.price_ht'=>"LineUnitPrice",'cod.tva_tx'=>"LineVATRate", 'cod.qty'=>"LineQty",'cod.total_ht'=>"LineTotalHT",'cod.total_tva'=>"LineTotalVAT",'cod.total_ttc'=>"LineTotalTTC", 'cod.date_ouverture'=>"DateStart",'cod.date_ouverture_prevue'=>"DateStartPrevis",'cod.date_fin_validite'=>"EndValidity",'cod.date_cloture'=>"DateEnd", 'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); - $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company', - 's.ville'=>'company','c.code'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company', + $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company', + 's.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company', 's.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company', 'co.rowid'=>"Contract",'co.ref'=>"Contract",'co.datec'=>"Contract",'co.date_contrat'=>"Contract",'co.mise_en_service'=>"Contract", - 'co.fin_validite'=>"Contract",'co.date_cloture'=>"Contract",'co.fk_statut'=>'Contract','co.note'=>"Contract",'co.note_public'=>"Contract", + 'co.fin_validite'=>"Contract",'co.date_cloture'=>"Contract",'co.note_private'=>"Contract",'co.note_public'=>"Contract", 'cod.rowid'=>'contract_line','cod.label'=>"contract_line",'cod.description'=>"contract_line",'cod.price_ht'=>"contract_line",'cod.tva_tx'=>"contract_line", 'cod.qty'=>"contract_line",'cod.total_ht'=>"contract_line",'cod.total_tva'=>"contract_line",'cod.total_ttc'=>"contract_line", 'cod.date_ouverture'=>"contract_line",'cod.date_ouverture_prevue'=>"contract_line",'cod.date_fin_validite'=>"contract_line",'cod.date_cloture'=>"contract_line", 'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); - $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text', - 's.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text', + $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text', + 's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text', 'co.ref'=>"Text",'co.datec'=>"Date",'co.date_contrat'=>"Date",'co.mise_en_service'=>"Date", - 'co.fin_validite'=>"Date",'co.date_cloture'=>"Date",'co.fk_statut'=>'Statut','co.note'=>"Text",'co.note_public'=>"Text", + 'co.fin_validite'=>"Date",'co.date_cloture'=>"Date",'co.note_private'=>"Text",'co.note_public'=>"Text", 'cod.label'=>"Text",'cod.description'=>"Text",'cod.price_ht'=>"Numeric",'cod.tva_tx'=>"Numeric", 'cod.qty'=>"Numeric",'cod.total_ht'=>"Numeric",'cod.total_tva'=>"Numeric",'cod.total_ttc'=>"Numeric", 'cod.date_ouverture'=>"Date",'cod.date_ouverture_prevue'=>"Date",'cod.date_fin_validite'=>"Date",'cod.date_cloture'=>"Date", @@ -155,13 +157,12 @@ class modContrat extends DolibarrModules $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c on s.fk_pays = c.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contrat as co,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contratdet as cod'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cod.fk_product = p.rowid)'; $this->export_sql_end[$r] .=' WHERE co.fk_soc = s.rowid and co.rowid = cod.fk_contrat'; $this->export_sql_end[$r] .=' AND co.entity = '.$conf->entity; - } diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php index c42d62cd3b1..149d867135e 100644 --- a/test/phpunit/ContratTest.php +++ b/test/phpunit/ContratTest.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2014 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From c30f13a03d9f9bba6f390b8ab5bf583629379e89 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 02:07:50 +0200 Subject: [PATCH 0220/1190] Fix: label of input method not translated. --- ChangeLog | 1 + htdocs/fourn/class/fournisseur.commande.class.php | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4e7edc94dd..12694302fda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice - Fix: bug 1588 : relative discount +- Fix: label of input method not tranlated. ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 155c8111f81..3aa9d77f5de 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -2016,7 +2016,8 @@ class CommandeFournisseur extends CommonOrder } /** - * Returns the translated input method + * Returns the translated input method of object (defined if $this->methode_commande_id > 0). + * This function make a sql request to get translation. No cache yet, try to not use it inside a loop. * * @return string */ @@ -2026,21 +2027,19 @@ class CommandeFournisseur extends CommonOrder if ($this->methode_commande_id > 0) { - $sql = "SELECT rowid, code, libelle"; + $sql = "SELECT rowid, code, libelle as label"; $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method'; $sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id); $query = $db->query($sql); - if ($query && $db->num_rows($query)) { - $result = $db->fetch_object($query); + $obj = $db->fetch_object($query); - $string = $langs->trans($result->code); - - if ($string == $result->code) + $string = $langs->trans($obj->code); + if ($string == $obj->code) { - $string = $obj->libelle != '-' ? $obj->libelle : ''; + $string = $obj->label != '-' ? $obj->label : ''; } return $string; From f08759a17e5a06b670e48cad779d90bf1a3f7270 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 11:59:52 +0200 Subject: [PATCH 0221/1190] Fix: area to generate doc must use half size not onethird. Fix: Missing maxwidthonsmartphone. Fix: Missing backtopage Fix: Missing translation key --- htdocs/contact/card.php | 27 ++++++++++++++--------- htdocs/contact/class/contact.class.php | 7 +++--- htdocs/core/class/html.formfile.class.php | 8 +++---- htdocs/core/lib/company.lib.php | 2 +- htdocs/langs/en_US/main.lang | 2 +- htdocs/societe/soc.php | 4 ++-- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index f3abf9e2bfe..1ba775268a1 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -241,13 +241,20 @@ if (empty($reshook)) $result = $object->delete(); if ($result > 0) { - header("Location: ".DOL_URL_ROOT.'/contact/list.php'); - exit; + if ($backtopage) + { + header("Location: ".$backtopage); + exit; + } + else + { + header("Location: ".DOL_URL_ROOT.'/contact/list.php'); + exit; + } } else { - setEventMessage($object->error,'errors'); - setEventMessage($object->errors,'errors'); + setEventMessage($object->error,$object->errors,'errors'); } } @@ -360,7 +367,7 @@ else { if ($action == 'delete') { - print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteContact"),$langs->trans("ConfirmDeleteContact"),"confirm_delete",'',0,1); + print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage?'&backtopage='.$backtopage:''),$langs->trans("DeleteContact"),$langs->trans("ConfirmDeleteContact"),"confirm_delete",'',0,1); } } @@ -1082,27 +1089,27 @@ else { if ($user->rights->societe->contact->creer) { - print ''.$langs->trans('Modify').''; + print ''.$langs->trans('Modify').''; } if (! $object->user_id && $user->rights->user->user->creer) { - print ''.$langs->trans("CreateDolibarrLogin").''; + print ''.$langs->trans("CreateDolibarrLogin").''; } if ($user->rights->societe->contact->supprimer) { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } // Activer if ($object->statut == 0 && $user->rights->societe->contact->creer) { - print ''.$langs->trans("Reactivate").''; + print ''.$langs->trans("Reactivate").''; } // Desactiver if ($object->statut == 1 && $user->rights->societe->contact->creer) { - print ''.$langs->trans("DisableUser").''; + print ''.$langs->trans("DisableUser").''; } } diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 9e93523a654..3f81608c415 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -877,20 +877,21 @@ class Contact extends CommonObject * @param int $withpicto Include picto with link * @param string $option Where the link point to * @param int $maxlen Max length of + * @param string $moreparam Add more param into URL * @return string String with URL */ - function getNomUrl($withpicto=0,$option='',$maxlen=0) + function getNomUrl($withpicto=0,$option='',$maxlen=0,$moreparam='') { global $langs; $result=''; - $lien = ''; + $lien = ''; $lienfin=''; if ($option == 'xxx') { - $lien = ''; + $lien = ''; $lienfin=''; } diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 8c53356fa67..50c681d8366 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -474,14 +474,14 @@ class FormFile // Model if (! empty($modellist)) { - $out.= ''; + $out.= ''; $out.= ''.$langs->trans('Model').' '; if (is_array($modellist) && count($modellist) == 1) // If there is only one element { $arraykeys=array_keys($modellist); $modelselected=$arraykeys[0]; } - $out.= $form->selectarray('model',$modellist,$modelselected,$showempty,0,0); + $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', ''); $out.= ''; + $out.= ''; if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty)) { include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; @@ -508,7 +508,7 @@ class FormFile // Button $addcolumforpicto=($delallowed || $printer || $morepicto); - $out.= ''; + $out.= ''; $genbutton = 'lastname = $obj->lastname; $contactstatic->firstname = $obj->firstname; $contactstatic->civility_id = $obj->civility_id; - print $contactstatic->getNomUrl(1); + print $contactstatic->getNomUrl(1,'',0,'&backtopage='.urlencode($backtopage)); print ''; print ''.$obj->poste.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $object->getLibStatut(2,0); + if (! empty($conf->use_javascript_ajax)) { + print ajax_productonoff($object->id, 'status'); + } else { + print $object->getLibStatut(2,0); + } print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $object->getLibStatut(2,1); + if (! empty($conf->use_javascript_ajax)) { + print ajax_productonoff($object->id, 'status_buy'); + } else { + print $object->getLibStatut(2,1); + } print '
'; print ''; - print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.datev","",$param,'width="120"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.datev","",$param,'width="140px"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"s.rowid","",$param,'',$sortfield,$sortorder); @@ -144,7 +144,7 @@ if ($conf->salaries->enabled) $i++; } - print ''; + print ''; print '"; print ''; print ''; @@ -174,7 +174,7 @@ if ($conf->tax->enabled) print '
'.$langs->trans("Total").'
'.$langs->trans("Total").''.price($total)."  
'; print ''; - print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'width="120"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'width="140px"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"c.libelle","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"cs.fk_type","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder); @@ -304,7 +304,7 @@ if ($conf->tax->enabled) $total = 0 ; print '
'; print ''; - print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="120"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="140px"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder); @@ -337,7 +337,7 @@ if ($conf->tax->enabled) $i++; } - print ''; + print ''; print '"; print ''; print ''; diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 31e900f8e7e..7416d564a1a 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -174,11 +174,17 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature } else if (! empty($feature2)) // This should be used for future changes { + $tmpreadok=1; foreach($feature2 as $subfeature) { - if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $readok=0; $nbko++; } - else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $readok=0; $nbko++; } - else { $readok=1; break; } // Break is to bypass second test if the first is ok + if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; } + else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; } + else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok + } + if (! $tmpreadok) // We found a test on feature that is ko + { + $readok=0; // All tests are ko (we manage here the and, the or will be managed later using $nbko). + $nbko++; } } else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) // This is for old permissions From 71dafac03ce6fa79366a9f04d0b7f6b3c7add23c Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 12 Oct 2014 15:28:01 +0200 Subject: [PATCH 0228/1190] Add favorite button into country dictionary to put value on top select list --- ChangeLog | 10 +- htdocs/admin/dict.php | 61 ++- htdocs/core/class/html.form.class.php | 9 +- .../install/mysql/data/llx_00_c_country.sql | 489 +++++++++--------- .../install/mysql/migration/3.6.0-3.7.0.sql | 3 + htdocs/install/mysql/tables/llx_c_country.sql | 8 +- htdocs/langs/en_US/main.lang | 1 + 7 files changed, 323 insertions(+), 258 deletions(-) diff --git a/ChangeLog b/ChangeLog index d531ec987b3..3a6f5c34eda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,9 +60,12 @@ For users: - New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals. - New: Add more search field in list of cheque deposits. -- New: Add feature to order to invoice on supplier part +- New: Add feature to order to invoice on supplier part. +- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export. +- New: Direct invoice creation from predefined invoice. +- New: Add dunning into accountancy report. +- New: Add favorite button into country dictionary to put value on top select list - Upgrade phpexcel lib to 1.7.8 -- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action - Fix: [ bug #1470, #1472, #1473] User trigger problem - Fix: [ bug #1489, #1491 ] Intervention trigger problem @@ -80,8 +83,7 @@ For users: - Fix: [ bug #1506, #1507 ] ECM trigger error problem - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe. -- New: Direct invoice creation from predefined invoice -- New: Add dunning into accountancy report + For users, new experimental module: - New: Module Accounting Expert to manage accountancy Special Thanks to developpers : diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 7a84470b320..335716bc4c7 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -131,7 +131,7 @@ $tabsql=array(); $tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c WHERE f.fk_pays=c.rowid"; $tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1"; $tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_pays=c.rowid and c.active=1"; -$tabsql[4] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_country"; +$tabsql[4] = "SELECT rowid as rowid, code, label, active, favorite FROM ".MAIN_DB_PREFIX."c_country"; $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c"; $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a"; $tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1"; @@ -677,6 +677,46 @@ if ($action == $acts[1]) } } +// favorite +if ($action == $acts[0]) +{ + if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } + else { $rowidcol="rowid"; } + + if ($rowid) { + $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'"; + } + elseif ($_GET["code"]) { + $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$_GET["code"]."'"; + } + + $result = $db->query($sql); + if (!$result) + { + dol_print_error($db); + } +} + +// disable favorite +if ($action == $acts[1]) +{ + if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } + else { $rowidcol="rowid"; } + + if ($rowid) { + $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'"; + } + elseif ($_GET["code"]) { + $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$_GET["code"]."'"; + } + + $result = $db->query($sql); + if (!$result) + { + dol_print_error($db); + } +} + /* * View @@ -813,7 +853,7 @@ if ($id) } if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1; } - print ''; print ''; @@ -928,8 +968,11 @@ if ($id) print getTitleFieldOfList($valuetoshow,0,$_SERVER["PHP_SELF"],($sortable?$fieldlist[$field]:''),($page?'page='.$page.'&':'').'&id='.$id,"","align=".$align,$sortfield,$sortorder); } } - print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"active",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder); - print ''; + // Favorite - Only activated on country dictionary + if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"),0,$_SERVER["PHP_SELF"],"favorite",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder); + + print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"active",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder); + print ''; print ''; // Lines with values @@ -1141,6 +1184,16 @@ if ($id) if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $isdisable=0; $isdisable = 0; } $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?$obj->code:'').'&id='.$id.'&'; + + // Favorite + // Only activated on country dictionary + if ($id == 4) + { + print ''; + } // Active print '\n"; $usernames = array(); //init $usernamesid = array(); /* Use this to have list of users only if users have events */ -foreach ($eventarray as $daykey => $notused) +if (! empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW)) { - // Get all assigned users for each event - foreach ($eventarray[$daykey] as $index => $event) - { - $event->fetch_userassigned(); - $listofuserid=$event->userassigned; - foreach($listofuserid as $userid => $tmp) - { - if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid; - } - } + foreach ($eventarray as $daykey => $notused) + { + // Get all assigned users for each event + foreach ($eventarray[$daykey] as $index => $event) + { + $event->fetch_userassigned(); + $listofuserid=$event->userassigned; + foreach($listofuserid as $userid => $tmp) + { + if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid; + } + } + } } +/* Use this list to have for all users */ +else +{ + $sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity"; + $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; + if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user"; + $sql.= " WHERE u.entity IN (".getEntity('user').")"; + if ($usergroup > 0) $sql.= " AND ug.fk_usergroup = ".$usergroup; + if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3); + //print $sql; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + if ($num) + { + while ($i < $num) + { + $obj = $db->fetch_object($resql); + $usernamesid[$obj->rowid]=$obj->rowid; + $i++; + } + } + } + else dol_print_error($db); +} +//var_dump($usernamesid); foreach($usernamesid as $id) { $tmpuser=new User($db); @@ -608,11 +639,13 @@ else // Load array of colors by type $colorsbytype=array(); -$sql="SELECT code, color FROM ".MAIN_DB_PREFIX."c_actioncomm"; +$labelbytype=array(); +$sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm"; $resql=$db->query($sql); while ($obj = $db->fetch_object($resql)) { $colorsbytype[$obj->code]=$obj->color; + $labelbytype[$obj->code]=$obj->libelle; } // Loop on each user to show calendar @@ -658,6 +691,27 @@ foreach ($usernames as $username) echo "
'.$langs->trans("Total").'
'.$langs->trans("Total").''.price($total)."  '; + print ''; print ''; print ' 
  
'; + if ($iserasable) print ''.$actl[$obj->favorite].''; + else print $langs->trans("AlwaysActive"); + print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d4effca3905..9460477439b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -14,6 +14,7 @@ * Copyright (C) 2011 Herve Prot * Copyright (C) 2012 Marcos García * Copyright (C) 2013 Raphaël Doursenaud + * Copyright (C) 2014 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -477,9 +478,10 @@ class Form $out=''; $countryArray=array(); + $favorite=array(); $label=array(); - $sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label"; + $sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite"; $sql.= " FROM ".MAIN_DB_PREFIX."c_country"; $sql.= " WHERE active = 1"; //$sql.= " ORDER BY code ASC"; @@ -502,11 +504,12 @@ class Form $countryArray[$i]['code_iso'] = $obj->code_iso; $countryArray[$i]['code_iso3'] = $obj->code_iso3; $countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:'')); - $label[$i] = dol_string_unaccent($countryArray[$i]['label']); + $favorite[$i] = $obj->favorite; + $label[$i] = dol_string_unaccent($countryArray[$i]['label']); $i++; } - array_multisort($label, SORT_ASC, $countryArray); + array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray); foreach ($countryArray as $row) { diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql index 497b85d4059..a6c0efc77a6 100644 --- a/htdocs/install/mysql/data/llx_00_c_country.sql +++ b/htdocs/install/mysql/data/llx_00_c_country.sql @@ -5,6 +5,7 @@ -- Copyright (C) 2004 Guillaume Delecourt -- Copyright (C) 2005-2009 Regis Houssin -- Copyright (C) 2007 Patrick Raguin +-- Copyright (C) 2014 Alexandre Spangaro -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -26,247 +27,247 @@ -- -- delete from llx_c_country; -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (0,'',NULL,'-',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (1,'FR','FRA','France',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (2,'BE','BEL','Belgium',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (3,'IT','ITA','Italy',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (4,'ES','ESP','Spain',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (5,'DE','DEU','Germany',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (6,'CH','CHE','Switzerland',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (7,'GB','GBR','United Kingdom',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (8,'IE','IRL','Irland',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (9,'CN','CHN','China',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (10,'TN','TUN','Tunisia',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (11,'US','USA','United States',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (12,'MA','MAR','Maroc',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (13,'DZ','DZA','Algeria',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (14,'CA','CAN','Canada',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (15,'TG','TGO','Togo',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (16,'GA','GAB','Gabon',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (17,'NL','NLD','Nerderland',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (18,'HU','HUN','Hongrie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (19,'RU','RUS','Russia',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (20,'SE','SWE','Sweden',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (21,'CI','CIV','Côte d''Ivoire',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (22,'SN','SEN','Senegal',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (23,'AR','ARG','Argentine',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (24,'CM','CMR','Cameroun',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (25,'PT','PRT','Portugal',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (26,'SA','SAU','Saudi Arabia',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (27,'MC','MCO','Monaco',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (28,'AU','AUS','Australia',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (29,'SG','SGP','Singapour',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (30,'AF','AFG','Afghanistan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (31,'AX','ALA','Iles Aland',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (32,'AL','ALB','Albanie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (33,'AS','ASM','Samoa américaines',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (34,'AD','AND','Andorre',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (35,'AO','AGO','Angola',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (36,'AI','AIA','Anguilla',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (37,'AQ','ATA','Antarctique',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (39,'AM','ARM','Arménie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (40,'AW','ABW','Aruba',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (41,'AT','AUT','Autriche',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (42,'AZ','AZE','Azerbaïdjan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (43,'BS','BHS','Bahamas',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (44,'BH','BHR','Bahreïn',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (45,'BD','BGD','Bangladesh',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (46,'BB','BRB','Barbade',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (47,'BY','BLR','Biélorussie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (48,'BZ','BLZ','Belize',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (49,'BJ','BEN','Bénin',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (50,'BM','BMU','Bermudes',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (51,'BT','BTN','Bhoutan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (52,'BO','BOL','Bolivie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (53,'BA','BIH','Bosnie-Herzégovine',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (54,'BW','BWA','Botswana',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (55,'BV','BVT','Ile Bouvet',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (56,'BR','BRA','Brazil',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (57,'IO','IOT','Territoire britannique de l''Océan Indien',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (58,'BN','BRN','Brunei',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (59,'BG','BGR','Bulgarie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (60,'BF','BFA','Burkina Faso',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (61,'BI','BDI','Burundi',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (62,'KH','KHM','Cambodge',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (63,'CV','CPV','Cap-Vert',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (64,'KY','CYM','Iles Cayman',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (65,'CF','CAF','République centrafricaine',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (66,'TD','TCD','Tchad',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (67,'CL','CHL','Chili',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (68,'CX','CXR','Ile Christmas',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (69,'CC','CCK','Iles des Cocos (Keeling)',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (70,'CO','COL','Colombie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (71,'KM','COM','Comores',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (72,'CG','COG','Congo',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (73,'CD','COD','République démocratique du Congo',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (74,'CK','COK','Iles Cook',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (75,'CR','CRI','Costa Rica',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (76,'HR','HRV','Croatie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (77,'CU','CUB','Cuba',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (78,'CY','CYP','Chypre',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (79,'CZ','CZE','République Tchèque',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (80,'DK','DNK','Danemark',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (81,'DJ','DJI','Djibouti',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (82,'DM','DMA','Dominique',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (83,'DO','DOM','République Dominicaine',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (84,'EC','ECU','Equateur',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (85,'EG','EGY','Egypte',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (86,'SV','SLV','Salvador',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (87,'GQ','GNQ','Guinée Equatoriale',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (88,'ER','ERI','Erythrée',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (89,'EE','EST','Estonia',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (90,'ET','ETH','Ethiopie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (91,'FK','FLK','Iles Falkland',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (92,'FO','FRO','Iles Féroé',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (93,'FJ','FJI','Iles Fidji',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (94,'FI','FIN','Finlande',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (95,'GF','GUF','Guyane française',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (96,'PF','PYF','Polynésie française',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (97,'TF','ATF','Terres australes françaises',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (98,'GM','GMB','Gambie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (99,'GE','GEO','Georgia',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (100,'GH','GHA','Ghana',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (101,'GI','GIB','Gibraltar',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (102,'GR','GRC','Greece',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (103,'GL','GRL','Groenland',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (104,'GD','GRD','Grenade',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (106,'GU','GUM','Guam',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (107,'GT','GTM','Guatemala',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (108,'GN','GIN','Guinea',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (109,'GW','GNB','Guinea-Bissao',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (111,'HT','HTI','Haiti',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (112,'HM','HMD','Iles Heard et McDonald',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (113,'VA','VAT','Saint-Siège (Vatican)',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (114,'HN','HND','Honduras',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (115,'HK','HKG','Hong Kong',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (116,'IS','ISL','Islande',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (117,'IN','IND','India',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (118,'ID','IDN','Indonésie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (119,'IR','IRN','Iran',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (120,'IQ','IRQ','Iraq',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (121,'IL','ISR','Israel',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (122,'JM','JAM','Jamaïque',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (123,'JP','JPN','Japon',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (124,'JO','JOR','Jordanie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (125,'KZ','KAZ','Kazakhstan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (126,'KE','KEN','Kenya',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (127,'KI','KIR','Kiribati',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (128,'KP','PRK','North Corea',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (129,'KR','KOR','South Corea',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (130,'KW','KWT','Koweït',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (131,'KG','KGZ','Kirghizistan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (132,'LA','LAO','Laos',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (133,'LV','LVA','Lettonie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (134,'LB','LBN','Liban',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (135,'LS','LSO','Lesotho',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (136,'LR','LBR','Liberia',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (137,'LY','LBY','Libye',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (138,'LI','LIE','Liechtenstein',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (139,'LT','LTU','Lituanie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (140,'LU','LUX','Luxembourg',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (141,'MO','MAC','Macao',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (142,'MK','MKD','ex-République yougoslave de Macédoine',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (143,'MG','MDG','Madagascar',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (144,'MW','MWI','Malawi',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (145,'MY','MYS','Malaisie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (146,'MV','MDV','Maldives',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (147,'ML','MLI','Mali',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (148,'MT','MLT','Malte',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (149,'MH','MHL','Iles Marshall',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (151,'MR','MRT','Mauritanie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (152,'MU','MUS','Maurice',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (153,'YT','MYT','Mayotte',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (154,'MX','MEX','Mexique',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (155,'FM','FSM','Micronésie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (156,'MD','MDA','Moldavie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (157,'MN','MNG','Mongolie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (158,'MS','MSR','Monserrat',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (159,'MZ','MOZ','Mozambique',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (160,'MM','MMR','Birmanie (Myanmar)',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (161,'NA','NAM','Namibie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (162,'NR','NRU','Nauru',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (163,'NP','NPL','Népal',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (164,'AN',NULL,'Antilles néerlandaises',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (165,'NC','NCL','Nouvelle-Calédonie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (166,'NZ','NZL','Nouvelle-Zélande',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (167,'NI','NIC','Nicaragua',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (168,'NE','NER','Niger',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (169,'NG','NGA','Nigeria',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (170,'NU','NIU','Nioué',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (171,'NF','NFK','Ile Norfolk',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (172,'MP','MNP','Mariannes du Nord',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (173,'NO','NOR','Norvège',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (174,'OM','OMN','Oman',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (175,'PK','PAK','Pakistan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (176,'PW','PLW','Palaos',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (177,'PS','PSE','Territoire Palestinien Occupé',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (178,'PA','PAN','Panama',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (179,'PG','PNG','Papouasie-Nouvelle-Guinée',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (180,'PY','PRY','Paraguay',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (181,'PE','PER','Peru',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (182,'PH','PHL','Philippines',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (183,'PN','PCN','Iles Pitcairn',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (184,'PL','POL','Pologne',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (185,'PR','PRI','Porto Rico',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (186,'QA','QAT','Qatar',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (188,'RO','ROU','Roumanie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (189,'RW','RWA','Rwanda',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (190,'SH','SHN','Sainte-Hélène',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (191,'KN','KNA','Saint-Christophe-et-Niévès',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (192,'LC','LCA','Sainte-Lucie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (193,'PM','SPM','Saint-Pierre-et-Miquelon',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (195,'WS','WSM','Samoa',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (196,'SM','SMR','Saint-Marin',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (197,'ST','STP','Sao Tomé-et-Principe',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (198,'RS','SRB','Serbie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (199,'SC','SYC','Seychelles',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (200,'SL','SLE','Sierra Leone',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (201,'SK','SVK','Slovaquie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (202,'SI','SVN','Slovénie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (203,'SB','SLB','Iles Salomon',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (204,'SO','SOM','Somalie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (205,'ZA','ZAF','Afrique du Sud',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (207,'LK','LKA','Sri Lanka',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (208,'SD','SDN','Soudan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (209,'SR','SUR','Suriname',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (210,'SJ','SJM','Iles Svalbard et Jan Mayen',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (211,'SZ','SWZ','Swaziland',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (212,'SY','SYR','Syrie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (213,'TW','TWN','Taïwan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (214,'TJ','TJK','Tadjikistan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (215,'TZ','TZA','Tanzanie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (216,'TH','THA','Thaïlande',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (217,'TL','TLS','Timor Oriental',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (218,'TK','TKL','Tokélaou',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (219,'TO','TON','Tonga',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (220,'TT','TTO','Trinité-et-Tobago',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (221,'TR','TUR','Turquie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (222,'TM','TKM','Turkménistan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (223,'TC','TCA','Iles Turks-et-Caicos',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (224,'TV','TUV','Tuvalu',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (225,'UG','UGA','Ouganda',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (226,'UA','UKR','Ukraine',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (227,'AE','ARE','Émirats arabes unis',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (228,'UM','UMI','Iles mineures éloignées des États-Unis',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (229,'UY','URY','Uruguay',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (230,'UZ','UZB','Ouzbékistan',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (231,'VU','VUT','Vanuatu',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (232,'VE','VEN','Vénézuela',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (233,'VN','VNM','Viêt Nam',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (234,'VG','VGB','Iles Vierges britanniques',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (235,'VI','VIR','Iles Vierges américaines',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (236,'WF','WLF','Wallis-et-Futuna',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (237,'EH','ESH','Sahara occidental',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (238,'YE','YEM','Yémen',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (239,'ZM','ZMB','Zambie',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (240,'ZW','ZWE','Zimbabwe',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (241,'GG','GGY','Guernesey',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (242,'IM','IMN','Ile de Man',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (243,'JE','JEY','Jersey',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (244,'ME','MNE','Monténégro',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (245,'BL','BLM','Saint-Barthélemy',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (246,'MF','MAF','Saint-Martin',1); -INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (247,'BU', null, 'Burundi',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (0,'',NULL,'-',1,1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (1,'FR','FRA','France',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (2,'BE','BEL','Belgium',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (3,'IT','ITA','Italy',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (4,'ES','ESP','Spain',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (5,'DE','DEU','Germany',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (6,'CH','CHE','Switzerland',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (7,'GB','GBR','United Kingdom',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (8,'IE','IRL','Irland',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (9,'CN','CHN','China',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (10,'TN','TUN','Tunisia',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (11,'US','USA','United States',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (12,'MA','MAR','Maroc',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (13,'DZ','DZA','Algeria',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (14,'CA','CAN','Canada',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (15,'TG','TGO','Togo',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (16,'GA','GAB','Gabon',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (17,'NL','NLD','Nerderland',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (18,'HU','HUN','Hongrie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (19,'RU','RUS','Russia',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (20,'SE','SWE','Sweden',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (21,'CI','CIV','Côte d''Ivoire',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (22,'SN','SEN','Senegal',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (23,'AR','ARG','Argentine',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (24,'CM','CMR','Cameroun',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (25,'PT','PRT','Portugal',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (26,'SA','SAU','Saudi Arabia',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (27,'MC','MCO','Monaco',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (28,'AU','AUS','Australia',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (29,'SG','SGP','Singapour',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (30,'AF','AFG','Afghanistan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (31,'AX','ALA','Iles Aland',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (32,'AL','ALB','Albanie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (33,'AS','ASM','Samoa américaines',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (34,'AD','AND','Andorre',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (35,'AO','AGO','Angola',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (36,'AI','AIA','Anguilla',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (37,'AQ','ATA','Antarctique',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (39,'AM','ARM','Arménie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (40,'AW','ABW','Aruba',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (41,'AT','AUT','Autriche',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (42,'AZ','AZE','Azerbaïdjan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (43,'BS','BHS','Bahamas',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (44,'BH','BHR','Bahreïn',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (45,'BD','BGD','Bangladesh',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (46,'BB','BRB','Barbade',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (47,'BY','BLR','Biélorussie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (48,'BZ','BLZ','Belize',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (49,'BJ','BEN','Bénin',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (50,'BM','BMU','Bermudes',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (51,'BT','BTN','Bhoutan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (52,'BO','BOL','Bolivie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (53,'BA','BIH','Bosnie-Herzégovine',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (54,'BW','BWA','Botswana',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (55,'BV','BVT','Ile Bouvet',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (56,'BR','BRA','Brazil',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (57,'IO','IOT','Territoire britannique de l''Océan Indien',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (58,'BN','BRN','Brunei',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (59,'BG','BGR','Bulgarie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (60,'BF','BFA','Burkina Faso',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (61,'BI','BDI','Burundi',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (62,'KH','KHM','Cambodge',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (63,'CV','CPV','Cap-Vert',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (64,'KY','CYM','Iles Cayman',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (65,'CF','CAF','République centrafricaine',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (66,'TD','TCD','Tchad',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (67,'CL','CHL','Chili',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (68,'CX','CXR','Ile Christmas',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (69,'CC','CCK','Iles des Cocos (Keeling)',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (70,'CO','COL','Colombie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (71,'KM','COM','Comores',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (72,'CG','COG','Congo',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (73,'CD','COD','République démocratique du Congo',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (74,'CK','COK','Iles Cook',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (75,'CR','CRI','Costa Rica',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (76,'HR','HRV','Croatie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (77,'CU','CUB','Cuba',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (78,'CY','CYP','Chypre',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (79,'CZ','CZE','République Tchèque',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (80,'DK','DNK','Danemark',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (81,'DJ','DJI','Djibouti',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (82,'DM','DMA','Dominique',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (83,'DO','DOM','République Dominicaine',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (84,'EC','ECU','Equateur',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (85,'EG','EGY','Egypte',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (86,'SV','SLV','Salvador',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (87,'GQ','GNQ','Guinée Equatoriale',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (88,'ER','ERI','Erythrée',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (89,'EE','EST','Estonia',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (90,'ET','ETH','Ethiopie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (91,'FK','FLK','Iles Falkland',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (92,'FO','FRO','Iles Féroé',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (93,'FJ','FJI','Iles Fidji',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (94,'FI','FIN','Finlande',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (95,'GF','GUF','Guyane française',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (96,'PF','PYF','Polynésie française',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (97,'TF','ATF','Terres australes françaises',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (98,'GM','GMB','Gambie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (99,'GE','GEO','Georgia',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (100,'GH','GHA','Ghana',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (101,'GI','GIB','Gibraltar',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (102,'GR','GRC','Greece',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (103,'GL','GRL','Groenland',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (104,'GD','GRD','Grenade',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (106,'GU','GUM','Guam',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (107,'GT','GTM','Guatemala',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (108,'GN','GIN','Guinea',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (109,'GW','GNB','Guinea-Bissao',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (111,'HT','HTI','Haiti',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (112,'HM','HMD','Iles Heard et McDonald',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (113,'VA','VAT','Saint-Siège (Vatican)',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (114,'HN','HND','Honduras',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (115,'HK','HKG','Hong Kong',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (116,'IS','ISL','Islande',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (117,'IN','IND','India',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (118,'ID','IDN','Indonésie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (119,'IR','IRN','Iran',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (120,'IQ','IRQ','Iraq',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (121,'IL','ISR','Israel',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (122,'JM','JAM','Jamaïque',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (123,'JP','JPN','Japon',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (124,'JO','JOR','Jordanie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (125,'KZ','KAZ','Kazakhstan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (126,'KE','KEN','Kenya',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (127,'KI','KIR','Kiribati',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (128,'KP','PRK','North Corea',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (129,'KR','KOR','South Corea',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (130,'KW','KWT','Koweït',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (131,'KG','KGZ','Kirghizistan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (132,'LA','LAO','Laos',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (133,'LV','LVA','Lettonie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (134,'LB','LBN','Liban',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (135,'LS','LSO','Lesotho',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (136,'LR','LBR','Liberia',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (137,'LY','LBY','Libye',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (138,'LI','LIE','Liechtenstein',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (139,'LT','LTU','Lituanie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (140,'LU','LUX','Luxembourg',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (141,'MO','MAC','Macao',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (142,'MK','MKD','ex-République yougoslave de Macédoine',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (143,'MG','MDG','Madagascar',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (144,'MW','MWI','Malawi',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (145,'MY','MYS','Malaisie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (146,'MV','MDV','Maldives',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (147,'ML','MLI','Mali',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (148,'MT','MLT','Malte',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (149,'MH','MHL','Iles Marshall',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (151,'MR','MRT','Mauritanie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (152,'MU','MUS','Maurice',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (153,'YT','MYT','Mayotte',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (154,'MX','MEX','Mexique',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (155,'FM','FSM','Micronésie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (156,'MD','MDA','Moldavie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (157,'MN','MNG','Mongolie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (158,'MS','MSR','Monserrat',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (159,'MZ','MOZ','Mozambique',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (160,'MM','MMR','Birmanie (Myanmar)',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (161,'NA','NAM','Namibie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (162,'NR','NRU','Nauru',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (163,'NP','NPL','Népal',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (164,'AN',NULL,'Antilles néerlandaises',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (165,'NC','NCL','Nouvelle-Calédonie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (166,'NZ','NZL','Nouvelle-Zélande',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (167,'NI','NIC','Nicaragua',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (168,'NE','NER','Niger',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (169,'NG','NGA','Nigeria',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (170,'NU','NIU','Nioué',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (171,'NF','NFK','Ile Norfolk',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (172,'MP','MNP','Mariannes du Nord',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (173,'NO','NOR','Norvège',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (174,'OM','OMN','Oman',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (175,'PK','PAK','Pakistan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (176,'PW','PLW','Palaos',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (177,'PS','PSE','Territoire Palestinien Occupé',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (178,'PA','PAN','Panama',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (179,'PG','PNG','Papouasie-Nouvelle-Guinée',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (180,'PY','PRY','Paraguay',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (181,'PE','PER','Peru',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (182,'PH','PHL','Philippines',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (183,'PN','PCN','Iles Pitcairn',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (184,'PL','POL','Pologne',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (185,'PR','PRI','Porto Rico',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (186,'QA','QAT','Qatar',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (188,'RO','ROU','Roumanie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (189,'RW','RWA','Rwanda',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (190,'SH','SHN','Sainte-Hélène',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (191,'KN','KNA','Saint-Christophe-et-Niévès',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (192,'LC','LCA','Sainte-Lucie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (193,'PM','SPM','Saint-Pierre-et-Miquelon',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (195,'WS','WSM','Samoa',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (196,'SM','SMR','Saint-Marin',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (197,'ST','STP','Sao Tomé-et-Principe',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (198,'RS','SRB','Serbie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (199,'SC','SYC','Seychelles',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (200,'SL','SLE','Sierra Leone',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (201,'SK','SVK','Slovaquie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (202,'SI','SVN','Slovénie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (203,'SB','SLB','Iles Salomon',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (204,'SO','SOM','Somalie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (205,'ZA','ZAF','Afrique du Sud',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (207,'LK','LKA','Sri Lanka',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (208,'SD','SDN','Soudan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (209,'SR','SUR','Suriname',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (210,'SJ','SJM','Iles Svalbard et Jan Mayen',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (211,'SZ','SWZ','Swaziland',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (212,'SY','SYR','Syrie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (213,'TW','TWN','Taïwan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (214,'TJ','TJK','Tadjikistan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (215,'TZ','TZA','Tanzanie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (216,'TH','THA','Thaïlande',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (217,'TL','TLS','Timor Oriental',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (218,'TK','TKL','Tokélaou',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (219,'TO','TON','Tonga',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (220,'TT','TTO','Trinité-et-Tobago',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (221,'TR','TUR','Turquie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (222,'TM','TKM','Turkménistan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (223,'TC','TCA','Iles Turks-et-Caicos',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (224,'TV','TUV','Tuvalu',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (225,'UG','UGA','Ouganda',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (226,'UA','UKR','Ukraine',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (227,'AE','ARE','Émirats arabes unis',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (228,'UM','UMI','Iles mineures éloignées des États-Unis',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (229,'UY','URY','Uruguay',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (230,'UZ','UZB','Ouzbékistan',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (231,'VU','VUT','Vanuatu',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (232,'VE','VEN','Vénézuela',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (233,'VN','VNM','Viêt Nam',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (234,'VG','VGB','Iles Vierges britanniques',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (235,'VI','VIR','Iles Vierges américaines',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (236,'WF','WLF','Wallis-et-Futuna',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (237,'EH','ESH','Sahara occidental',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (238,'YE','YEM','Yémen',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (239,'ZM','ZMB','Zambie',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (240,'ZW','ZWE','Zimbabwe',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (241,'GG','GGY','Guernesey',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (242,'IM','IMN','Ile de Man',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (243,'JE','JEY','Jersey',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (244,'ME','MNE','Monténégro',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (245,'BL','BLM','Saint-Barthélemy',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (246,'MF','MAF','Saint-Martin',1,0); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (247,'BU', null, 'Burundi',1,0); diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 9f4291cd05f..6d6dea17da7 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1086,3 +1086,6 @@ CREATE TABLE llx_usergroup_extrafields ( ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public; + +ALTER TABLE llx_c_country ADD COLUMN favorite tinyint DEFAULT 0 AFTER active; +UPDATE llx_c_country SET favorite = '1' WHERE rowid = '0'; diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql index f9c69a5093b..503cc0eec06 100644 --- a/htdocs/install/mysql/tables/llx_c_country.sql +++ b/htdocs/install/mysql/tables/llx_c_country.sql @@ -1,6 +1,7 @@ -- ======================================================================== --- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville --- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2001-2004 Rodolphe Quiedeville +-- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2014 Alexandre Spangaro -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -23,5 +24,6 @@ create table llx_c_country code varchar(2) NOT NULL, code_iso varchar(3) , label varchar(50) NOT NULL, - active tinyint DEFAULT 1 NOT NULL + active tinyint DEFAULT 1 NOT NULL, + favorite tinyint DEFAULT 0 NOT NULL )ENGINE=innodb; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 7663f520667..89e6672f4fe 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -341,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier From 30e27014b887b21dfb33458512b8819bdcac3e6d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 15:49:14 +0200 Subject: [PATCH 0229/1190] Fix: box of customer and propsects were not correctly disabled. --- htdocs/core/boxes/box_clients.php | 18 +++++++++++++++++- htdocs/core/boxes/box_prospect.php | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index b2ad0a6b718..b65702b643f 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -37,12 +37,28 @@ class box_clients extends ModeleBoxes var $depends = array("societe"); var $db; - var $param; + var $enabled = 1; var $info_box_head = array(); var $info_box_contents = array(); + /** + * Constructor + * + * @param DoliDB $db Database handler + * @param string $param More parameters + */ + function __construct($db,$param='') + { + global $conf, $user; + + $this->db = $db; + + // disable box for such cases + if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0; // disabled by this option + } + /** * Load data for box to show them later * diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index 9c7a666bc4a..6d62989727b 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -39,11 +39,28 @@ class box_prospect extends ModeleBoxes var $depends = array("societe"); var $db; + var $enabled = 1; var $info_box_head = array(); var $info_box_contents = array(); + /** + * Constructor + * + * @param DoliDB $db Database handler + * @param string $param More parameters + */ + function __construct($db,$param='') + { + global $conf, $user; + + $this->db = $db; + + // disable box for such cases + if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled=0; // disabled by this option + } + /** * Load data into info_box_contents array to show array later. * From 455bae98ef41d67d402ad0e8f03183ccba4817c0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 15:49:29 +0200 Subject: [PATCH 0230/1190] Fix: box of customer and propsects were not correctly disabled. --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 12694302fda..42a8d6d6b28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ English Dolibarr ChangeLog - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice - Fix: bug 1588 : relative discount - Fix: label of input method not tranlated. +- Fix: box of customer and propsects were not correctly disabled. ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: From f25c4f18e693fe31d75fa7430db15b03a8c538b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 15:55:18 +0200 Subject: [PATCH 0231/1190] Update ajax.lib.php --- htdocs/core/lib/ajax.lib.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index f657df7185b..4a43c06ad36 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -468,12 +468,11 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, * @param int $entity Entity to set * @return void */ -function ajax_productonoff($id, $code, $input=array(), $entity=null) +function ajax_productonoff($id, $code, $input=array()) { require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; global $conf, $langs, $db; - $entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity); $object = new Product($db); $object->fetch($id); @@ -484,10 +483,9 @@ function ajax_productonoff($id, $code, $input=array(), $entity=null) // Set constant $("#set_'.$code.'").click(function() { $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", { - action: \'set\', - name: \''.$code.'\', - id: \''.$id.'\', - entity: \''.$entity.'\' + action: \'set'.$code.'\', + value: \'1\', + id: \''.$id.'\' }, function() { $("#set_'.$code.'").hide(); @@ -513,10 +511,9 @@ function ajax_productonoff($id, $code, $input=array(), $entity=null) // Del constant $("#del_'.$code.'").click(function() { $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", { - action: \'del\', - name: \''.$code.'\', - id: \''.$id.'\', - entity: \''.$entity.'\' + action: \'set'.$code.'\', + value: \'0\', + id: \''.$id.'\' }, function() { $("#del_'.$code.'").hide(); From 052e507271961c87b32b10d1197125b58f3db4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 15:56:04 +0200 Subject: [PATCH 0232/1190] Update productonoff.php --- htdocs/core/ajax/productonoff.php | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/htdocs/core/ajax/productonoff.php b/htdocs/core/ajax/productonoff.php index 4def2898c10..227a9ef9001 100644 --- a/htdocs/core/ajax/productonoff.php +++ b/htdocs/core/ajax/productonoff.php @@ -27,12 +27,14 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; $action=GETPOST('action','alpha'); $name=GETPOST('name','alpha'); $id=GETPOST('id', 'int'); +$value=GETPOST('value', 'int'); +$object = new GenericObject($db); /* * View */ @@ -42,24 +44,15 @@ top_httphead(); print ''."\n"; // Registering the location of boxes -if (! empty($action) && ! empty($name) &&! empty($id)) +if (! empty($action) && ! empty($id)) { //$entity = GETPOST('entity','int'); if ($user->rights->produit->creer) { - if ($action == 'set' && $name== 'status') { - $sql = "UPDATE llx_product SET tosell=1 WHERE rowid=".$id; - $resql = $db->query($sql); - } else if ($action == 'set' && $name== 'status_buy') { - $sql = "UPDATE llx_product SET tobuy=1 WHERE rowid=".$id; - $resql = $db->query($sql); - } else if ($action == 'del' && $name== 'status') { - $sql = "UPDATE llx_product SET tosell=0 WHERE rowid=".$id; - $resql = $db->query($sql); - } else if ($action == 'del' && $name== 'status_buy') { - $sql = "UPDATE llx_product SET tobuy=0 WHERE rowid=".$id; - $resql = $db->query($sql); - } + if ($action == 'setstatus') + $object->setValueFrom('tosell', $value, 'product', $id); + else if ($action == 'setstatus_buy') + $object->setValueFrom('tobuy', $value, 'product', $id); } } From f5f50045d6c63b01b1e3cc23901df7eda3cb7f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 16:09:42 +0200 Subject: [PATCH 0233/1190] Update ajax.lib.php --- htdocs/core/lib/ajax.lib.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 4a43c06ad36..4bc6da083aa 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -465,7 +465,6 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, * @param int $id Id product to set * @param string $code Name of constant : status or status_buy * @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid')) - * @param int $entity Entity to set * @return void */ function ajax_productonoff($id, $code, $input=array()) From 8df8fb2fe0ea888e9aff4d3356c7f9be13d3e570 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 16:19:00 +0200 Subject: [PATCH 0234/1190] Qual: Removed a lot of duplicate code New: extrafields for projects and tasks are exported to ODT documents. --- ChangeLog | 3 +- .../core/class/commondocgenerator.class.php | 7 +- .../doc/doc_generic_order_odt.modules.php | 72 ++-------------- .../doc/doc_generic_invoice_odt.modules.php | 4 +- .../doc/doc_generic_project_odt.modules.php | 85 +++++------------- .../task/doc/doc_generic_task_odt.modules.php | 86 +++++-------------- .../doc/doc_generic_proposal_odt.modules.php | 72 ++-------------- 7 files changed, 71 insertions(+), 258 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0526cd214a7..c81e0fa6646 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: extrafields for projects and tasks are exported to ODT documents. - New: Add number of active notification into tab title (like we do for notes and documents) - New: Can add product into category from category card. - New: PDF event report show project and status of event. @@ -83,7 +84,7 @@ For users: - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe. - New: Direct invoice creation from predefined invoice - New: Add dunning into accountancy report -For users, new experimental module: +For users, new experimental module (need to set feature level of instance to experimental to see them): - New: Module Accounting Expert to manage accountancy Special Thanks to developpers : Olivier Geffroy diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 256e9b074e4..a16b0cb16b6 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -290,6 +290,10 @@ abstract class CommonDocGenerator 'current_datehour'=>dol_print_date($now,'dayhour','tzuser'), 'current_server_date'=>dol_print_date($now,'day','tzserver'), 'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'), + 'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs), + 'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs), + 'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs), + 'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs), ); return $array_other; @@ -357,7 +361,8 @@ abstract class CommonDocGenerator $array_key.'_total_discount_ht' => price2num($object->getTotalDiscount()), $array_key.'_note_private'=>$object->note, - $array_key.'_note'=>$object->note_public, + $array_key.'_note_public'=>$object->note_public, + $array_key.'_note'=>$object->note_public, // For backward compatibility // Payments $array_key.'_already_payed_locale'=>price($alreadypayed, 0, $outputlangs), $array_key.'_remain_to_pay_locale'=>price($object->total_ttc - $sumpayed, 0, $outputlangs), diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index e95d40e0908..51a3a13ff58 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -329,73 +329,19 @@ class doc_generic_order_odt extends ModelePDFCommandes { } - // Make substitutions into odt of user info - $tmparray=$this->get_substitutionarray_user($user,$outputlangs); - //var_dump($tmparray); exit; - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Make substitutions into odt of mysoc - $tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); - //var_dump($tmparray); exit; - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Make substitutions into odt of thirdparty - $tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Replace tags of object + external modules - $tmparray=$this->get_substitutionarray_object($object,$outputlangs); + // Make substitutions into odt + $array_user=$this->get_substitutionarray_user($user,$outputlangs); + $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); + $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); + $array_objet=$this->get_substitutionarray_object($object,$outputlangs); + $array_other=$this->get_substitutionarray_other($user,$outputlangs); + + $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other); complete_substitutions_array($tmparray, $outputlangs, $object); // Call the ODTSubstitution hook $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray); $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + foreach($tmparray as $key=>$value) { try { diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 023978d0999..2ad6b87643a 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -337,7 +337,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures { } - // Make substitutions into odt of user info + // Make substitutions into odt $array_user=$this->get_substitutionarray_user($user,$outputlangs); $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); @@ -345,7 +345,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures $array_propal=is_object($propal_object)?$this->get_substitutionarray_object($propal_object,$outputlangs,'propal'):array(); $array_other=$this->get_substitutionarray_other($user,$outputlangs); - $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal); + $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal,$array_other); complete_substitutions_array($tmparray, $outputlangs, $object); // Call the ODTSubstitution hook $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray); diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 97e571c2972..93df313ad4c 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -113,7 +113,7 @@ class doc_generic_project_odt extends ModelePDFProjects { global $conf; - return array( + $resarray=array( 'object_id'=>$object->id, 'object_ref'=>$object->ref, 'object_title'=>$object->title, @@ -127,6 +127,21 @@ class doc_generic_project_odt extends ModelePDFProjects 'object_public'=>$object->public, 'object_statut'=>$object->getLibStatut() ); + + // Retrieve extrafields + if (is_array($object->array_options) && count($object->array_options)) + { + $extrafieldkey=$object->element; + + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + $extrafields = new ExtraFields($this->db); + $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true); + $object->fetch_optionals($object->id,$extralabels); + + $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs); + } + + return $resarray; } /** @@ -485,69 +500,13 @@ class doc_generic_project_odt extends ModelePDFProjects // Make substitutions into odt of user info - $tmparray=$this->get_substitutionarray_user($user,$outputlangs); - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Make substitutions into odt of mysoc - $tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); - //var_dump($tmparray); exit; - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } + $array_user=$this->get_substitutionarray_user($user,$outputlangs); + $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); + $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); + $array_objet=$this->get_substitutionarray_object($object,$outputlangs); + $array_other=$this->get_substitutionarray_other($user,$outputlangs); - // Make substitutions into odt of thirdparty - $tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - - // Replace tags of object + external modules - $tmparray=$this->get_substitutionarray_object($object,$outputlangs); + $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other); complete_substitutions_array($tmparray, $outputlangs, $object); // Call the ODTSubstitution hook $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray); diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index 28b458732ab..c5043857469 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -114,7 +114,7 @@ class doc_generic_task_odt extends ModelePDFTask { global $conf; - return array( + $resarray=array( 'object_id'=>$object->id, 'object_ref'=>$object->ref, 'object_title'=>$object->title, @@ -128,6 +128,21 @@ class doc_generic_task_odt extends ModelePDFTask 'object_public'=>$object->public, 'object_statut'=>$object->getLibStatut() ); + + // Retrieve extrafields + if (is_array($object->array_options) && count($object->array_options)) + { + $extrafieldkey=$object->element; + + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + $extrafields = new ExtraFields($this->db); + $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true); + $object->fetch_optionals($object->id,$extralabels); + + $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs); + } + + return $resarray; } /** @@ -471,70 +486,13 @@ class doc_generic_task_odt extends ModelePDFTask // Make substitutions into odt of user info - $tmparray=$this->get_substitutionarray_user($user,$outputlangs); - //var_dump($tmparray); exit; - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Make substitutions into odt of mysoc - $tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); - //var_dump($tmparray); exit; - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } + $array_user=$this->get_substitutionarray_user($user,$outputlangs); + $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); + $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); + $array_objet=$this->get_substitutionarray_object($project,$outputlangs); + $array_other=$this->get_substitutionarray_other($user,$outputlangs); - // Make substitutions into odt of thirdparty - $tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - - // Replace tags of object + external modules - $tmparray=$this->get_substitutionarray_object($project,$outputlangs); + $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other); complete_substitutions_array($tmparray, $outputlangs, $object); foreach($tmparray as $key=>$value) { diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index 4b662e19564..080c781b404 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -363,70 +363,14 @@ class doc_generic_proposal_odt extends ModelePDFPropales { } - // Make substitutions into odt of user info - $tmparray=$this->get_substitutionarray_user($user,$outputlangs); - //var_dump($tmparray); exit; - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Make substitutions into odt of mysoc - $tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); - //var_dump($tmparray); exit; - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - //var_dump($value);exit; - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Make substitutions into odt of thirdparty - $tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); - foreach($tmparray as $key=>$value) - { - try { - if (preg_match('/logo$/',$key)) // Image - { - if (file_exists($value)) $odfHandler->setImage($key, $value); - else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); - } - else // Text - { - $odfHandler->setVars($key, $value, true, 'UTF-8'); - } - } - catch(OdfException $e) - { - } - } - // Replace tags of object + external modules - $tmparray=$this->get_substitutionarray_object($object,$outputlangs); - //print_r($tmparray); exit; + // Make substitutions into odt + $array_user=$this->get_substitutionarray_user($user,$outputlangs); + $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); + $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); + $array_objet=$this->get_substitutionarray_object($object,$outputlangs); + $array_other=$this->get_substitutionarray_other($user,$outputlangs); + + $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other); complete_substitutions_array($tmparray, $outputlangs, $object); // Call the ODTSubstitution hook $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray); From 33bb150b440af67c70f5b10bd29e70d9ef25f127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 16:30:58 +0200 Subject: [PATCH 0235/1190] Update productonoff.php --- htdocs/core/ajax/productonoff.php | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/htdocs/core/ajax/productonoff.php b/htdocs/core/ajax/productonoff.php index 227a9ef9001..a6c63507f21 100644 --- a/htdocs/core/ajax/productonoff.php +++ b/htdocs/core/ajax/productonoff.php @@ -35,6 +35,7 @@ $id=GETPOST('id', 'int'); $value=GETPOST('value', 'int'); $object = new GenericObject($db); + /* * View */ @@ -43,16 +44,10 @@ top_httphead(); print ''."\n"; -// Registering the location of boxes -if (! empty($action) && ! empty($id)) -{ - //$entity = GETPOST('entity','int'); - - if ($user->rights->produit->creer) { - if ($action == 'setstatus') - $object->setValueFrom('tosell', $value, 'product', $id); - else if ($action == 'setstatus_buy') - $object->setValueFrom('tobuy', $value, 'product', $id); - - } +// Registering new values +if (! empty($action) && ! empty($id) && $user->rights->produit->creer) { + if ($action == 'setstatus') + $object->setValueFrom('tosell', $value, 'product', $id); + else if ($action == 'setstatus_buy') + $object->setValueFrom('tobuy', $value, 'product', $id); } From 3bac7c9e1173349b15a19b27697549790bf91837 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 16:31:56 +0200 Subject: [PATCH 0236/1190] Add index on new table llx_c_email_template --- .../install/mysql/migration/3.6.0-3.7.0.sql | 4 ++++ .../mysql/tables/llx_c_email_template.key.sql | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 htdocs/install/mysql/tables/llx_c_email_template.key.sql diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 9f4291cd05f..8ba2fa4ec1b 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -18,6 +18,7 @@ -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); + ALTER TABLE llx_bank_account ADD COLUMN fk_user_author integer; ALTER TABLE llx_c_actioncomm ADD COLUMN color varchar(9); @@ -1086,3 +1087,6 @@ CREATE TABLE llx_usergroup_extrafields ( ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public; + +ALTER TABLE llx_c_email_template ADD UNIQUE INDEX uk_c_email_template(label, lang); +ALTER TABLE llx_c_email_template ADD INDEX idx_type(type_template); diff --git a/htdocs/install/mysql/tables/llx_c_email_template.key.sql b/htdocs/install/mysql/tables/llx_c_email_template.key.sql new file mode 100644 index 00000000000..3543d7448d1 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_email_template.key.sql @@ -0,0 +1,22 @@ +-- =================================================================== +-- Copyright (C) 2014 Laurent Destailleur +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- Table with templates of emails +-- =================================================================== + +ALTER TABLE llx_c_email_template ADD UNIQUE INDEX uk_c_email_template(label, lang); +ALTER TABLE llx_c_email_template ADD INDEX idx_type(type_template); + From 7f308bf9b5af2a7dca78a1bc626b7148d4934317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 17:00:42 +0200 Subject: [PATCH 0237/1190] Update productonoff.php --- htdocs/core/ajax/productonoff.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/ajax/productonoff.php b/htdocs/core/ajax/productonoff.php index a6c63507f21..05eebc7a65f 100644 --- a/htdocs/core/ajax/productonoff.php +++ b/htdocs/core/ajax/productonoff.php @@ -30,7 +30,6 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; $action=GETPOST('action','alpha'); -$name=GETPOST('name','alpha'); $id=GETPOST('id', 'int'); $value=GETPOST('value', 'int'); From 104592b349bfe241907266a51361d48413b62f72 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 12 Oct 2014 19:08:34 +0200 Subject: [PATCH 0238/1190] Fix: wrong function name --- htdocs/core/class/translate.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 7a855eb9325..394dd4fad82 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -703,7 +703,7 @@ class Translate */ function getCurrencyAmount($currency_code, $amount) { - $symbol=$this->getCurrencSymbol($currency_code); + $symbol=$this->getCurrencySymbol($currency_code); if (in_array($currency_code, array('USD'))) return $symbol.$amount; else return $amount.$symbol; From 99dde1ad1e1c8c81842874978f7895fe230ae833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 12 Oct 2014 20:44:50 +0200 Subject: [PATCH 0239/1190] Update card.php --- htdocs/product/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 0f374dc2b3a..5644e41df1c 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1420,7 +1420,7 @@ else // Status (to sell) print '
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - if (! empty($conf->use_javascript_ajax)) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { print ajax_productonoff($object->id, 'status'); } else { print $object->getLibStatut(2,0); @@ -1429,7 +1429,7 @@ else // Status (to buy) print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - if (! empty($conf->use_javascript_ajax)) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { print ajax_productonoff($object->id, 'status_buy'); } else { print $object->getLibStatut(2,1); From e101bfceead59aa8f8d4b6b8f40c6180c00dad4f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Oct 2014 21:24:51 +0200 Subject: [PATCH 0240/1190] Use language to find template email. --- htdocs/core/class/html.formmail.class.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 6f70ba71673..6473a068672 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -692,22 +692,25 @@ class FormMail { $ret=array(); - $sql = "SELECT topic, content"; + $sql = "SELECT label, topic, content, lang"; $sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates'; $sql.= " WHERE type_template='".$db->escape($type_template)."'"; $sql.= " AND entity IN (".getEntity("c_email_templates").")"; $sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")"; - // TODO Add field and where filter on language code - //print $sql; + if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')"; + $sql.= $db->order("lang,label","ASC"); + print $sql; $resql = $db->query($sql); if ($resql) { - $obj = $db->fetch_object($resql); + $obj = $db->fetch_object($resql); // Get first found if ($obj) { + $ret['label']=$obj->label; $ret['topic']=$obj->topic; $ret['content']=$obj->content; + $ret['lang']=$obj->lang; } else { @@ -722,8 +725,10 @@ class FormMail elseif ($type_template=='fichinter_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template=='thirdparty') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); } + $ret['label']='default'; $ret['topic']=''; $ret['content']=$defaultmessage; + $ret['lang']=$outputlangs->defaultlang; } $db->free($resql); From 86d25146cc4949bbd4d4412c5045c7fa082cbe14 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 13 Oct 2014 00:17:37 +0200 Subject: [PATCH 0241/1190] Qual: Indentation muse be done with css and not using multiple   spaces. --- htdocs/core/menus/standard/auguria_menu.php | 2 -- htdocs/core/menus/standard/eldy_menu.php | 2 -- htdocs/theme/amarok/style.css.php | 8 ++++++++ htdocs/theme/auguria/style.css.php | 8 ++++++++ htdocs/theme/bureau2crea/style.css.php | 8 ++++++++ htdocs/theme/cameleo/style.css.php | 8 ++++++++ htdocs/theme/eldy/style.css.php | 8 ++++++++ 7 files changed, 40 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php index ddb28c58648..88052f380c0 100644 --- a/htdocs/core/menus/standard/auguria_menu.php +++ b/htdocs/core/menus/standard/auguria_menu.php @@ -211,7 +211,6 @@ class MenuManager // We add sub entry print str_pad('',1).'
  • '; // ui-btn to highlight on clic print ''; - print str_pad('',12,' '); if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") print $langs->trans("Access"); // No translation else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard"); print ''; @@ -228,7 +227,6 @@ class MenuManager if ($val2['level']==0) print str_pad('',$val2['level']+1).''; // ui-btn to highlight on clic else print str_pad('',$val2['level']+1).'
  • '; // ui-btn to highlight on clic if ($relurl2) print ''; - print str_pad('',($val2['level']+1)*12,' '); print $val2['titre']; if ($relurl2) print ''; print '
    • '."\n"; diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index e7e76ed7669..af85537d455 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -177,7 +177,6 @@ class MenuManager print ''; - print str_pad('',12,' '); if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") print $langs->trans("Access"); // No translation else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard"); print ''; @@ -199,7 +198,6 @@ class MenuManager //print ' data-ajax="false"'; print '>'; } - print str_pad('',($val2['level']+1)*12,' '); print $val2['titre']; if ($relurl2) print ''; print ''."\n"; diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 40d77cfd596..b971cbad338 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -2280,6 +2280,14 @@ ul.ulmenu { background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important; background-image: linear-gradient( #eee,#e1e1e1 ) !important; } +.lilevel2 +{ + padding-left: 22px; +} +.lilevel3 +{ + padding-left: 54px; +} close(); diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 0c7fa823f3e..be33c3484e8 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -2616,6 +2616,14 @@ ul.ulmenu { background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important; background-image: linear-gradient( #eee,#e1e1e1 ) !important; } +.lilevel2 +{ + padding-left: 22px; +} +.lilevel3 +{ + padding-left: 54px; +} close(); From e42ab9ea84d6c61f2fd2b1dfd85c1f07826793ca Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 13 Oct 2014 17:45:52 +0200 Subject: [PATCH 0242/1190] Add legend on peruser view. --- htdocs/comm/action/card.php | 10 +++-- htdocs/comm/action/peruser.php | 78 ++++++++++++++++++++++++++++----- htdocs/theme/eldy/style.css.php | 6 +-- 3 files changed, 75 insertions(+), 19 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 960cddfac27..1997423d3a8 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -287,19 +287,21 @@ if ($action == 'add') { unset($_SESSION['assignedtouser']); + if ($user->id != $object->ownerid) $moreparam="&usertodo=-1"; // We force to remove filter so created record is visible when going back to per user view. + $db->commit(); if (! empty($backtopage)) { - dol_syslog("Back to ".$backtopage); - header("Location: ".$backtopage); + dol_syslog("Back to ".$backtopage.$moreparam); + header("Location: ".$backtopage.$moreparam); } elseif($idaction) { - header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction); + header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.$moreparam); } else { - header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'); + header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam?'?'.$moreparam:'')); } exit; } diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 303ca3dc2a3..0e50e75451e 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -566,19 +566,50 @@ echo "
    \n"; + +if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) +{ + $langs->load("commercial"); + print '
    '.$langs->trans("Legend").':
    '; + foreach($colorsbytype as $code => $color) + { + if ($color) + { + print '
     
    '; + print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code]; + //print $code; + print '
    '; + } + } + //$color=sprintf("%02x%02x%02x",$theme_datacolor[0][0],$theme_datacolor[0][1],$theme_datacolor[0][2]); + print '
     
    '; + print $langs->trans("Other"); + print '
    '; +} + // Add js code to manage click on a box print ''; if ($code=='status') { - $out.= ''.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').''; - $out.= ''.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').''; + $out.= ''.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').''; + $out.= ''.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').''; } if ($code=='status_buy') { - $out.= ''.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').''; - $out.= ''.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').''; + $out.= ''.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').''; + $out.= ''.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').''; } return $out; } From 830ec9c9cb2f9d5684ac5f0cc7d6ec06e6ef3d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 16:36:28 +0200 Subject: [PATCH 0298/1190] Update list.php --- htdocs/product/list.php | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index ebcd3245e7d..7e817d69725 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -507,11 +507,25 @@ else } } - // Status (to buy) - print '    		'.$product_static->LibStatut($objp->tosell,5,0).''.$product_static->LibStatut($objp->tobuy,5,1).''; + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + print ajax_object_onoff($product_static, 'status'); + } else { + print $product_static->LibStatut($objp->tosell,5,0); + } + print ''; + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + print ajax_object_onoff($product_static, 'status_buy'); + } else { + print $product_static->LibStatut($objp->tobuy,5,1); + } + print ' 
    '.$langs->trans("Status").' ('.$langs->trans("Sell").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($object, 'status'); + print ajax_object_onoff($object, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $object->getLibStatut(2,0); } @@ -1430,7 +1430,7 @@ else // Status (to buy) print '
    '.$langs->trans("Status").' ('.$langs->trans("Buy").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($object, 'status_buy'); + print ajax_object_onoff($object, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $object->getLibStatut(2,1); } From 3ab8e13157008752c5a8c3a87ab01e2da3c8baba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 18:51:25 +0200 Subject: [PATCH 0305/1190] Update list.php --- htdocs/product/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 7e817d69725..e77115eb72f 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -512,7 +512,7 @@ else // Status (to sell) print ''; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product_static, 'status'); + print ajax_object_onoff($product_static, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $product_static->LibStatut($objp->tosell,5,0); } @@ -521,7 +521,7 @@ else // Status (to buy) print ''; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product_static, 'status_buy'); + print ajax_object_onoff($product_static, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $product_static->LibStatut($objp->tobuy,5,1); } From 3144fd6845a8e3b0d36759b2459babf9dcd66322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 18:52:16 +0200 Subject: [PATCH 0306/1190] Update product.php --- htdocs/product/stock/product.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 4938ec3e033..dd507883674 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -279,7 +279,7 @@ if ($id > 0 || $ref) // Status (to sell) print '
    '.$langs->trans("Status").' ('.$langs->trans("Sell").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product, 'status'); + print ajax_object_onoff($product, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $product->getLibStatut(2,0); } @@ -288,7 +288,7 @@ if ($id > 0 || $ref) // Status (to buy) print '
    '.$langs->trans("Status").' ('.$langs->trans("Buy").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product, 'status_buy'); + print ajax_object_onoff($product, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $product->getLibStatut(2,1); } From a1bedcc26351f0e8da140cf0ec16de7b4cb41a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 22:46:13 +0200 Subject: [PATCH 0307/1190] Update ajax.lib.php --- htdocs/core/lib/ajax.lib.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 84e1a536465..709911faaec 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -462,14 +462,15 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, /** * On/off button for object * - * @param int $object Object to set + * @param int $object Id product to set * @param string $code Name of constant : status or status_buy for product by example + * @param string $field Name of database field : tosell or tobuy for product by example * @param string $text_on Text if on * @param string $text_off Text if off * @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid')) * @return void */ -function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array()) +function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=array()) { global $langs; @@ -480,8 +481,10 @@ function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array()) // Set constant $("#set_'.$code.'_'.$object->id.'").click(function() { $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", { - action: \'set'.$code.'\', + action: \'set\', + field: \''.$field.'\', value: \'1\', + element: \''.$object->element.'\', id: \''.$object->id.'\' }, function() { @@ -508,8 +511,10 @@ function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array()) // Del constant $("#del_'.$code.'_'.$object->id.'").click(function() { $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", { - action: \'set'.$code.'\', + action: \'set\', + field: \''.$field.'\', value: \'0\', + element: \''.$object->element.'\', id: \''.$object->id.'\' }, function() { From 5b9a134d6970cdbe476d581de952ebbc78160651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 22:47:12 +0200 Subject: [PATCH 0308/1190] Update objectonoff.php --- htdocs/core/ajax/objectonoff.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php index 05eebc7a65f..6ac5abd3bbb 100644 --- a/htdocs/core/ajax/objectonoff.php +++ b/htdocs/core/ajax/objectonoff.php @@ -32,9 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; $action=GETPOST('action','alpha'); $id=GETPOST('id', 'int'); $value=GETPOST('value', 'int'); +$field=GETPOST('field', 'alpha'); +$element=GETPOST('element', 'alpha'); $object = new GenericObject($db); - /* * View */ @@ -44,9 +45,5 @@ top_httphead(); print ''."\n"; // Registering new values -if (! empty($action) && ! empty($id) && $user->rights->produit->creer) { - if ($action == 'setstatus') - $object->setValueFrom('tosell', $value, 'product', $id); - else if ($action == 'setstatus_buy') - $object->setValueFrom('tobuy', $value, 'product', $id); -} +if (($action == 'set') && ! empty($id)) + $object->setValueFrom($field, $value, $element, $id); From 5e946d646659e20d005aa8e6b4c35320f9f88a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 22:49:07 +0200 Subject: [PATCH 0309/1190] Update card.php --- htdocs/product/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index eadb701e4a8..889c782808b 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1421,7 +1421,7 @@ else // Status (to sell) print '
    '.$langs->trans("Status").' ('.$langs->trans("Sell").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($object, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); + print ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $object->getLibStatut(2,0); } @@ -1430,7 +1430,7 @@ else // Status (to buy) print '
    '.$langs->trans("Status").' ('.$langs->trans("Buy").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($object, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); + print ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $object->getLibStatut(2,1); } From 8133b67878ed7067b7af91ca5bba1c0d4f6741de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 22:50:17 +0200 Subject: [PATCH 0310/1190] Update product.php --- htdocs/product/stock/product.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index dd507883674..7885553095e 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -279,7 +279,7 @@ if ($id > 0 || $ref) // Status (to sell) print '
    '.$langs->trans("Status").' ('.$langs->trans("Sell").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); + print ajax_object_onoff($product, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $product->getLibStatut(2,0); } @@ -288,7 +288,7 @@ if ($id > 0 || $ref) // Status (to buy) print '
    '.$langs->trans("Status").' ('.$langs->trans("Buy").')'; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); + print ajax_object_onoff($product, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $product->getLibStatut(2,1); } From 761fc32cc1123cc11d8a24363ab3eaf4ca370741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 22:51:24 +0200 Subject: [PATCH 0311/1190] Update list.php --- htdocs/product/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index e77115eb72f..76049fd1ef3 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -512,7 +512,7 @@ else // Status (to sell) print ''; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product_static, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); + print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $product_static->LibStatut($objp->tosell,5,0); } @@ -521,7 +521,7 @@ else // Status (to buy) print ''; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { - print ajax_object_onoff($product_static, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); + print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $product_static->LibStatut($objp->tobuy,5,1); } From a14d07930a2f9acbf635e2008af0896d0e38ec07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 18 Oct 2014 22:52:54 +0200 Subject: [PATCH 0312/1190] Update soc.php --- htdocs/societe/soc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index a0b9bda1c8e..b49a1678b00 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1698,7 +1698,11 @@ else // Status print '
    '.$langs->trans("Status").''; - print $object->getLibStatut(2); + if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer) { + print ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased'); + } else { + print $object->getLibStatut(2); + } print '
    '; print ''; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 50c681d8366..674be61311d 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -73,12 +73,12 @@ class FormFile global $conf,$langs, $hookmanager; $hookmanager->initHooks(array('formfile')); - if (! empty($conf->browser->phone)) return 0; + if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') return 0; if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2)) { - // TODO: Cheeck this works with 2 forms on same page - // TODO: Cheeck this works with GED module, otherwise, force useajax to 0 + // TODO: Check this works with 2 forms on same page + // TODO: Check this works with GED module, otherwise, force useajax to 0 // TODO: This does not support option savingdocmask // TODO: This break feature to upload links too return $this->_formAjaxFileUpload($object); diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php index c39111d04be..0c7b742421a 100644 --- a/htdocs/core/class/mobiledetect.class.php +++ b/htdocs/core/class/mobiledetect.class.php @@ -155,7 +155,7 @@ class MobileDetect 'Asus' => 'Asus.*Galaxy|PadFone.*Mobile', // @ref: http://www.micromaxinfo.com/mobiles/smartphones // Added because the codes might conflict with Acer Tablets. - 'Micromax' => 'Micromax.*\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\b', + 'Micromax' => 'Micromax.*\b(A\d+)\b', 'Palm' => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ; @todo - complete the regex. 'Vertu' => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;) // @ref: http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA (PANTECH) @@ -179,7 +179,7 @@ class MobileDetect protected static $tabletDevices = array( 'iPad' => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic. 'NexusTablet' => 'Android.*Nexus[\s]+(7|10)|^.*Android.*Nexus(?:(?!Mobile).)*$', - 'SamsungTablet' => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-I9205|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705C|SM-T535|SM-T331', // SCH-P709|SCH-P729|SM-T2558 - Samsung Mega - treat them like a regular phone. + 'SamsungTablet' => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P\d+|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-N8000|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-N8010|GT-N8005|GT-N8020|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-I9205|SM-T\d+|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-P6000|SM-T3100|SGH-I467|XE500|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|XE500T1C|SM-P605V|SM-P905V|SM-P600X|SM-P900X|', // SCH-P709|SCH-P729|SM-T2558 - Samsung Mega - treat them like a regular phone. // @reference: http://www.labnol.org/software/kindle-user-agent-string/20378/ 'Kindle' => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE)\b', // Only the Surface tablets with Windows RT are considered mobile. @@ -963,10 +963,15 @@ class MobileDetect $this->setDetectionType(self::DETECTION_TYPE_MOBILE); - if ($this->checkHttpHeadersForMobile()) { + if ($this->checkHttpHeadersForMobile()) + { + //print "Found it's a mobile from http header"; return true; - } else { - return $this->matchDetectionRulesAgainstUA(); + } + else + { + //print "Check into user agent ".$this->getUserAgent(); + return $this->matchDetectionRulesAgainstUA(); } } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4be2583aa63..38e19eb31fd 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -148,6 +148,7 @@ function getBrowserInfo() $detectmobile=new MobileDetect(); $phone=$detectmobile->isMobile(); $tablet=$detectmobile->isTablet(); + unset($detectmobile); // free memory return array('browsername'=>$name, 'browserversion'=>$version, 'browseros'=>$os, 'browserfirefox'=>$firefox, 'layout'=> ($tablet?'tablet':($phone?'phone':'classic')), 'phone'=>$phone, 'tablet'=>$tablet); } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 657d48f32d3..cd1801ca275 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -131,12 +131,12 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_TEXT='50,50,130'; - if ($dol_use_jmobile) + /*if ($dol_use_jmobile) { $conf->global->THEME_ELDY_BACKTABCARD1='245,245,245'; // topmenu $conf->global->THEME_ELDY_BACKTABCARD2='245,245,245'; $conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245'; - } + }*/ } $colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1); From 3fe4c58e9585945a4fa528c48701f5559d503811 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Oct 2014 19:57:42 +0200 Subject: [PATCH 0314/1190] Use span class="badge" for notes. --- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/class/mobiledetect.class.php | 4 ++-- htdocs/core/lib/company.lib.php | 6 +++--- htdocs/core/lib/contract.lib.php | 4 ++-- htdocs/core/lib/fichinter.lib.php | 4 ++-- htdocs/core/lib/fourn.lib.php | 8 ++++---- htdocs/core/lib/invoice.lib.php | 2 +- htdocs/core/lib/member.lib.php | 4 ++-- htdocs/core/lib/order.lib.php | 4 ++-- htdocs/core/lib/project.lib.php | 8 ++++---- htdocs/core/lib/propal.lib.php | 4 ++-- htdocs/core/lib/usergroups.lib.php | 4 ++-- htdocs/main.inc.php | 10 ++++++---- htdocs/theme/amarok/style.css.php | 14 ++++++++++++++ htdocs/theme/auguria/style.css.php | 15 +++++++++++++++ htdocs/theme/bureau2crea/style.css.php | 14 ++++++++++++++ htdocs/theme/cameleo/style.css.php | 14 ++++++++++++++ htdocs/theme/eldy/style.css.php | 23 +++++++++++++++++++++-- 18 files changed, 111 insertions(+), 33 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index f41aaa5d19e..8848adea948 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -194,7 +194,7 @@ class Form { $ret.=''; } diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php index 0c7b742421a..72d192a7614 100644 --- a/htdocs/core/class/mobiledetect.class.php +++ b/htdocs/core/class/mobiledetect.class.php @@ -155,7 +155,7 @@ class MobileDetect 'Asus' => 'Asus.*Galaxy|PadFone.*Mobile', // @ref: http://www.micromaxinfo.com/mobiles/smartphones // Added because the codes might conflict with Acer Tablets. - 'Micromax' => 'Micromax.*\b(A\d+)\b', + 'Micromax' => 'Micromax.*\bA\d+\b', 'Palm' => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ; @todo - complete the regex. 'Vertu' => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;) // @ref: http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA (PANTECH) @@ -179,7 +179,7 @@ class MobileDetect protected static $tabletDevices = array( 'iPad' => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic. 'NexusTablet' => 'Android.*Nexus[\s]+(7|10)|^.*Android.*Nexus(?:(?!Mobile).)*$', - 'SamsungTablet' => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P\d+|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-N8000|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-N8010|GT-N8005|GT-N8020|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-I9205|SM-T\d+|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-P6000|SM-T3100|SGH-I467|XE500|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|XE500T1C|SM-P605V|SM-P905V|SM-P600X|SM-P900X|', // SCH-P709|SCH-P729|SM-T2558 - Samsung Mega - treat them like a regular phone. + 'SamsungTablet' => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P\d+|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-N8000|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-N8010|GT-N8005|GT-N8020|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-I9205|SM-T\d+|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-P6000|SM-T3100|SGH-I467|XE500|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|XE500T1C|SM-P605V|SM-P905V|SM-P600X|SM-P900X', // SCH-P709|SCH-P729|SM-T2558 - Samsung Mega - treat them like a regular phone. // @reference: http://www.labnol.org/software/kindle-user-agent-string/20378/ 'Kindle' => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE)\b', // Only the Surface tablets with Windows RT are considered mobile. diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index e5723b9e2d6..964dcfbb0c6 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -131,7 +131,7 @@ function societe_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id; $head[$h][1] = $langs->trans("Notifications"); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'notify'; $h++; } @@ -142,7 +142,7 @@ function societe_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; @@ -152,7 +152,7 @@ function societe_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id; $head[$h][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'document'; $h++; } diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php index 51dba11df23..b7e82c6dbf2 100644 --- a/htdocs/core/lib/contract.lib.php +++ b/htdocs/core/lib/contract.lib.php @@ -60,7 +60,7 @@ function contract_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Notes"); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; } @@ -70,7 +70,7 @@ function contract_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php index d231b767753..89f685590b3 100644 --- a/htdocs/core/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -72,7 +72,7 @@ function fichinter_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; } @@ -82,7 +82,7 @@ function fichinter_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php index cc14c5ca4aa..c1e37f3c485 100644 --- a/htdocs/core/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -63,7 +63,7 @@ function facturefourn_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; } @@ -73,7 +73,7 @@ function facturefourn_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id; $head[$h][1] = $langs->trans('Documents'); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; @@ -135,7 +135,7 @@ function ordersupplier_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Notes"); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; } @@ -145,7 +145,7 @@ function ordersupplier_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id; $head[$h][1] = $langs->trans('Documents'); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 2afb4686162..f7f22c69b97 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -79,7 +79,7 @@ function facture_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; $head[$h][2] = 'note'; $h++; } diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php index 20a05a701aa..879478daf8d 100644 --- a/htdocs/core/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -88,7 +88,7 @@ function member_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); $head[$h][2] = 'note'; - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $h++; $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id; @@ -174,7 +174,7 @@ function member_stats_prepare_head($object) $head[$h][1] = $langs->trans("Country"); $head[$h][2] = 'statscountry'; $h++; - + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion'; $head[$h][1] = $langs->trans("Region"); $head[$h][2] = 'statsregion'; diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index 0aa3c980911..ba3e8344f47 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -89,7 +89,7 @@ function commande_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; } @@ -99,7 +99,7 @@ function commande_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id; $head[$h][1] = $langs->trans('Documents'); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 98a2b111c6f..b384ccceabe 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -71,7 +71,7 @@ function project_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'notes'; $h++; } @@ -81,7 +81,7 @@ function project_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id; $head[$h][1] = $langs->trans('Documents'); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'document'; $h++; @@ -149,7 +149,7 @@ function task_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');; $head[$h][1] = $langs->trans('Notes'); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'task_notes'; $h++; } @@ -458,7 +458,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr global $db, $user, $bc, $langs; global $form, $formother, $projectstatic, $taskstatic; - if (! is_object($formother)) + if (! is_object($formother)) { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $formother = new FormOther($db); diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index bc0c7cae868..8a96b86c967 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -83,7 +83,7 @@ function propal_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; } @@ -93,7 +93,7 @@ function propal_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id; $head[$h][1] = $langs->trans('Documents'); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'document'; $h++; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 69cad2c856b..630d2ae5b13 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -101,7 +101,7 @@ function user_prepare_head($object) if(!empty($object->note)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); - if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; @@ -111,7 +111,7 @@ function user_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id; $head[$h][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'document'; $h++; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index b20d94164d6..efca5d4efba 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -214,6 +214,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) $conf->browser->layout=$tmp['layout']; $conf->browser->phone=$tmp['phone']; // deprecated, use layout $conf->browser->tablet=$tmp['tablet']; // deprecated, use layout + //var_dump($conf->browser); } @@ -715,14 +716,14 @@ if (! GETPOST('nojs')) // If javascript was not disabled on URL } else $conf->use_javascript_ajax=0; -// Set terminal output option +// Set terminal output option according to conf->browser. if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu'])) $conf->dol_hide_leftmenu=1; if (GETPOST('dol_hide_topmenu') || ! empty($_SESSION['dol_hide_topmenu'])) $conf->dol_hide_topmenu=1; if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1; if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover'])) $conf->dol_no_mouse_hover=1; if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile'])) $conf->dol_use_jmobile=1; -if (! empty($conf->browser->phone)) $conf->dol_no_mouse_hover=1; -if (! empty($conf->browser->phone) +if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1; +if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone') || (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) || (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400) ) @@ -731,12 +732,13 @@ if (! empty($conf->browser->phone) } // If we force to use jmobile, then we reenable javascript if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1; -// Disabled bugged themes +// Replace themes bugged with jmobile with eldy if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) { $conf->theme='eldy'; $conf->css = "/theme/".$conf->theme."/style.css.php"; } +//var_dump($conf->browser->phone); if (! defined('NOREQUIRETRAN')) { diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index b971cbad338..abfeef4aa2a 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -347,6 +347,20 @@ th .button { /* ! Message d'erreur lors du login : */ center .error { padding:8px !important; padding-left:26px !important; padding-right:20px; width:inherit; max-width:450px;color:#552323 !important; font-size:14px; border-radius:8px; text-align: left;} +.badge { + display: inline-block; + min-width: 10px; + padding: 2px 5px; + font-size: 10px; + font-weight: 700; + line-height: 0.9em; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #777; + border-radius: 10px; +} /* ============================================================================== */ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index e66c0d5623e..6e4ba602ade 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -228,6 +228,21 @@ div.inline-block .cursorpointer { cursor: pointer; } +.badge { + display: inline-block; + min-width: 10px; + padding: 2px 5px; + font-size: 10px; + font-weight: 700; + line-height: 0.9em; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #777; + border-radius: 10px; +} + /* ============================================================================== */ /* Styles to hide objects */ diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 3c4f7c8d712..b4573c1fc13 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -253,6 +253,20 @@ div.inline-block .cursorpointer { cursor: pointer; } +.badge { + display: inline-block; + min-width: 10px; + padding: 2px 5px; + font-size: 10px; + font-weight: 700; + line-height: 0.9em; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #777; + border-radius: 10px; +} /* ============================================================================== */ diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index be3403fabcb..096eab6c74d 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -229,6 +229,20 @@ div.inline-block .cursorpointer { cursor: pointer; } +.badge { + display: inline-block; + min-width: 10px; + padding: 2px 5px; + font-size: 10px; + font-weight: 700; + line-height: 0.9em; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #777; + border-radius: 10px; +} /* ============================================================================== */ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index cd1801ca275..3d2e138dd73 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -223,6 +223,7 @@ body { background-color: #FFFFFF; background: ; + /* background-image: url(""); */ color: #101010; font-size: px; @@ -409,6 +410,21 @@ th .button { .cursorpointer { cursor: pointer; } +.badge { + display: inline-block; + min-width: 10px; + padding: 2px 5px; + font-size: 10px; + font-weight: 700; + line-height: 0.9em; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #777; + border-radius: 10px; +} + /* ============================================================================== */ /* Styles to hide objects */ @@ -816,6 +832,9 @@ foreach($mainmenuusedarray as $val) .bodylogin { background: #f0f0f0; + -moz-box-shadow: inset 0 0 10px #000000; + -webkit-box-shadow: inset 0 0 10px #000000; + box-shadow: inset 0 0 10px #000000; } .login_vertical_align { padding: 10px; @@ -2962,9 +2981,9 @@ a.ui-link { } /* Warning: setting this may make screen not beeing refreshed after a combo selection */ -.ui-body-c { +/*.ui-body-c { background: #fff; -} +}*/ div.ui-radio, div.ui-checkbox { From 8d937d2d36ceafadfde049669ac3499ee1768234 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Oct 2014 20:37:46 +0200 Subject: [PATCH 0315/1190] Uniformize position of "Create link" on categories. --- htdocs/categories/categorie.php | 29 +++++++++++++---------------- htdocs/theme/eldy/style.css.php | 4 ++-- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 3200513d11d..e9e11b656b9 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -621,8 +621,17 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) if ($typeid == 3) $title = $langs->trans("MembersCategoriesShort"); if ($typeid == 4) $title = $langs->trans("ContactCategoriesShort"); + $linktocreate=''; + if ($showclassifyform && $user->rights->categorie->creer) + { + $linktocreate='id.'&type='.$typeid).'">'; + $linktocreate.=$langs->trans("CreateCat").' '; + $linktocreate.=img_picto($langs->trans("Create"),'filenew'); + $linktocreate.=""; + } + print '
    '; - print_fiche_titre($title,'',''); + print_fiche_titre($title,$linktocreate,''); // Form to add record into a category if ($showclassifyform) @@ -636,17 +645,8 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) print '    '; - if ($user->rights->categorie->creer) - { - print ''; - } + print ''; + print ''; print ''; print '
    '; - print $langs->trans("ClassifyInCategory").'  '; + print ''.$langs->trans("ClassifyInCategory").'  '; print $form->select_all_categories($typeid,'auto'); print ''; print ''; $ret.=''; - //$ret.='
    '."\n"; + if (preg_match('/ckeditor|textarea/',$typeofdata)) $ret.='
    '."\n"; $ret.=''; $ret.='
    '; print ''.$langs->trans("ClassifyInCategory").'  '; print $form->select_all_categories($typeid,'auto'); - print ''; - print ''; - print 'id.'&type='.$typeid).'">'; - print $langs->trans("CreateCat").' '; - print img_picto($langs->trans("Create"),'filenew'); - print ""; - print '
    '; print ''; @@ -679,10 +679,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) print ""; // Categorie - print ""; - //$c->id=; - //print $c->getNomUrl(1); - print img_object('','category').' '.$way.""; + print "".img_object('','category').' '.$way.""; // Link to delete from category print ''; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3d2e138dd73..8dde34aa105 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -832,9 +832,9 @@ foreach($mainmenuusedarray as $val) .bodylogin { background: #f0f0f0; - -moz-box-shadow: inset 0 0 10px #000000; + /*-moz-box-shadow: inset 0 0 10px #000000; -webkit-box-shadow: inset 0 0 10px #000000; - box-shadow: inset 0 0 10px #000000; + box-shadow: inset 0 0 10px #000000;*/ } .login_vertical_align { padding: 10px; From 718b3b19b45bb7df08bbccbe5518daab0ff237a4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 11:16:51 +0200 Subject: [PATCH 0316/1190] Fix: user and date modification not updated --- htdocs/admin/agenda.php | 2 +- ...terface_50_modAgenda_ActionsAuto.class.php | 42 +++++++++++++++++++ htdocs/fichinter/class/fichinter.class.php | 16 ++++++- .../mysql/data/llx_c_action_trigger.sql | 3 +- .../install/mysql/migration/3.6.0-3.7.0.sql | 4 ++ 5 files changed, 63 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index c7cb4258935..5ad9673a16f 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -154,7 +154,7 @@ print ''; print ''.$langs->trans("ActionsEvents").''; print ''.$langs->trans("All").'/'.$langs->trans("None").''; print ''."\n"; -// Show each trigger +// Show each trigger (list is in c_action_trigger) if (! empty($triggers)) { foreach ($triggers as $trigger) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index e7ccc31583c..9a6af993107 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -251,6 +251,20 @@ class InterfaceActionsAuto extends DolibarrTriggers $object->sendtoid=0; } + elseif ($action == 'FICHINTER_CREATE') + { + $langs->load("other"); + $langs->load("interventions"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref); + $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + + $object->sendtoid=0; + $object->fk_element=0; + $object->elementtype=''; + } elseif ($action == 'FICHINTER_VALIDATE') { $langs->load("other"); @@ -261,6 +275,20 @@ class InterfaceActionsAuto extends DolibarrTriggers $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + $object->sendtoid=0; + $object->fk_element=0; + $object->elementtype=''; + } + elseif ($action == 'FICHINTER_MODIFY') + { + $langs->load("other"); + $langs->load("interventions"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref); + $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + $object->sendtoid=0; $object->fk_element=0; $object->elementtype=''; @@ -290,6 +318,20 @@ class InterfaceActionsAuto extends DolibarrTriggers $object->sendtoid=0; } + elseif ($action == 'FICHINTER_DELETE') + { + $langs->load("other"); + $langs->load("interventions"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref); + $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + + $object->sendtoid=0; + $object->fk_element=0; + $object->elementtype=''; + } elseif ($action == 'SHIPPING_VALIDATE') { $langs->load("other"); diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 6f613dda5c8..783024df800 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -240,6 +240,7 @@ class Fichinter extends CommonObject $sql.= ", fk_projet = ".$this->fk_project; $sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); $sql.= ", note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null"); + $sql.= ", fk_user_modif = ".$user->id; $sql.= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::update", LOG_DEBUG); @@ -619,9 +620,11 @@ class Fichinter extends CommonObject global $conf; $sql = "SELECT f.rowid,"; - $sql.= " datec,"; + $sql.= " f.datec,"; + $sql.= " f.tms as date_modification,"; $sql.= " f.date_valid as datev,"; $sql.= " f.fk_user_author,"; + $sql.= " f.fk_user_modif as fk_user_modification,"; $sql.= " f.fk_user_valid"; $sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f"; $sql.= " WHERE f.rowid = ".$id; @@ -637,6 +640,7 @@ class Fichinter extends CommonObject $this->id = $obj->rowid; $this->date_creation = $this->db->jdate($obj->datec); + $this->date_modification = $this->db->jdate($obj->date_modification); $this->date_validation = $this->db->jdate($obj->datev); $cuser = new User($this->db); @@ -649,6 +653,13 @@ class Fichinter extends CommonObject $vuser->fetch($obj->fk_user_valid); $this->user_validation = $vuser; } + if ($obj->fk_user_modification) + { + $muser = new User($this->db); + $muser->fetch($obj->fk_user_modification); + $this->user_modification = $muser; + } + } $this->db->free($resql); } @@ -805,7 +816,8 @@ class Fichinter extends CommonObject if ($user->rights->ficheinter->creer) { $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter "; - $sql.= " SET description = '".$this->db->escape($description)."'"; + $sql.= " SET description = '".$this->db->escape($description)."',"; + $sql.= " fk_user_modif = ".$user->id; $sql.= " WHERE rowid = ".$this->id; $sql.= " AND entity = ".$conf->entity; diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 6eddd5883c8..36f8e3ad9c3 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -32,7 +32,6 @@ -- List of all managed triggered events (used for trigger agenda and for notification) -- delete from llx_c_action_trigger; -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13); @@ -58,6 +57,8 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',30); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2); diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index ee01ef4850c..89d017af12c 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -19,6 +19,10 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); +--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19); +--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention delete','Executed when a intervention is delete','ficheinter',19); + + ALTER TABLE llx_bank_account ADD COLUMN fk_user_author integer; ALTER TABLE llx_c_actioncomm ADD COLUMN color varchar(9); From 0fba70d4d19739952711856be5f73d69842684b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 11:35:34 +0200 Subject: [PATCH 0317/1190] Fix: Triggers sending email for intervention and classify billed --- htdocs/core/class/html.formmail.class.php | 2 +- .../triggers/interface_50_modAgenda_ActionsAuto.class.php | 5 ++--- htdocs/fichinter/card.php | 2 +- htdocs/install/mysql/data/llx_c_action_trigger.sql | 7 +++---- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++ htdocs/langs/en_US/interventions.lang | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 6242e4f7e3c..308534f3ebf 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -699,7 +699,7 @@ class FormMail $sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")"; if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')"; $sql.= $db->order("lang,label","ASC"); - print $sql; + //print $sql; $resql = $db->query($sql); if ($resql) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 9a6af993107..ffe539ff241 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -295,18 +295,17 @@ class InterfaceActionsAuto extends DolibarrTriggers } elseif ($action == 'FICHINTER_SENTBYMAIL') { - $langs->load("other"); + $langs->load("other"); $langs->load("interventions"); $object->actiontypecode='AC_OTH_AUTO'; if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref); $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; - // Parameters $object->sendtoid defined by caller //$object->sendtoid=0; } - elseif ($action == 'FICHINTER_CLASSIFY_BILLED') + elseif ($action == 'FICHINTER_CLASSIFYBILLED') { $langs->load("other"); $langs->load("interventions"); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 983293916b6..95d197f401d 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -752,7 +752,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n"; $actionmsg.=$message; } - $actionmsg2=$langs->transnoentities('Action'.$actiontypecode); + $actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref); } // Create form object diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 36f8e3ad9c3..67363b98c72 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -50,22 +50,21 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION','Member subscribed','Executed when a member is subscribed','member',23); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFYBILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',30); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',35); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',36); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Classify intervention as billed','Executed when a intervention is classified as billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19); diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 89d017af12c..80730138ab3 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -21,6 +21,8 @@ --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19); --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention delete','Executed when a intervention is delete','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFYBILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19); ALTER TABLE llx_bank_account ADD COLUMN fk_user_author integer; diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 70fcbf7f22d..7655616ffc5 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -30,6 +30,7 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening From 4df9fb38fbc527ade14e7e9a0176f836f4053e1e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 12:29:35 +0200 Subject: [PATCH 0318/1190] Add option AGENDA_ALWAYS_HIDE_AUTO --- htdocs/comm/action/index.php | 7 +++++++ htdocs/comm/action/listactions.php | 11 +++++++++-- htdocs/comm/action/peruser.php | 7 +++++++ htdocs/core/class/html.formactions.class.php | 2 ++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 2098a07d20b..2a425cf51f9 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -483,6 +483,13 @@ if ($resql) { $obj = $db->fetch_object($resql); + // Discard auto action if option is on + if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') + { + $i++; + continue; + } + // Create a new object action $event=new ActionComm($db); $event->id=$obj->id; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 4fc7386157b..4850394e557 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -156,7 +156,7 @@ if ($type) $param.="&type=".$type; $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; $sql.= " a.id, a.datep as dp, a.datep2 as dp2,"; $sql.= " a.fk_contact, a.note, a.label, a.percent as percent,"; -$sql.= " c.code as acode, c.libelle,"; +$sql.= " c.code as code, c.libelle,"; $sql.= " ua.login as loginauthor, ua.rowid as useridauthor,"; $sql.= " ut.login as logintodo, ut.rowid as useridtodo,"; //$sql.= " ud.login as logindone, ud.rowid as useriddone,"; @@ -292,6 +292,13 @@ if ($resql) { $obj = $db->fetch_object($resql); + // Discard auto action if option is on + if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') + { + $i++; + continue; + } + $var=!$var; print ""; @@ -299,7 +306,7 @@ if ($resql) // Action (type) print ''; $actionstatic->id=$obj->id; - $actionstatic->type_code=$obj->acode; + $actionstatic->type_code=$obj->code; $actionstatic->libelle=$obj->label; print $actionstatic->getNomUrl(1,28); print ''; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index dacc7c5ce00..da34983779a 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -395,6 +395,13 @@ if ($resql) { $obj = $db->fetch_object($resql); + // Discard auto action if option is on + if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') + { + $i++; + continue; + } + // Create a new object action $event=new ActionComm($db); $event->id=$obj->id; diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 696a70867cf..333969fc3b3 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -266,6 +266,8 @@ class FormActions if ($selected == 'manual') $selected='AC_OTH'; if ($selected == 'auto') $selected='AC_OTH_AUTO'; + if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']); + print $form->selectarray($htmlname, $arraylist, $selected); if ($user->admin && empty($onlyautoornot) && empty($hideinfohelp)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); } From 42a600412d3eb2d003537c5f4f423b6fa64acabf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 12:41:18 +0200 Subject: [PATCH 0319/1190] Fix: Regression with favorite. --- htdocs/admin/dict.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 4f600b49b91..d81f306be9e 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -680,7 +680,7 @@ if ($action == $acts[1]) } // favorite -if ($action == $acts[0]) +if ($action == 'activate_favorite') { if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } else { $rowidcol="rowid"; } @@ -700,7 +700,7 @@ if ($action == $acts[0]) } // disable favorite -if ($action == $acts[1]) +if ($action == 'disable_favorite') { if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } else { $rowidcol="rowid"; } @@ -973,7 +973,7 @@ if ($id) } // Favorite - Only activated on country dictionary if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"),0,$_SERVER["PHP_SELF"],"favorite",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder); - + print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"active",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder); print ' '; print ''; @@ -1187,13 +1187,13 @@ if ($id) if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $isdisable=0; $isdisable = 0; } $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?$obj->code:'').'&id='.$id.'&'; - + // Favorite // Only activated on country dictionary if ($id == 4) { print ''; - if ($iserasable) print ''.$actl[$obj->favorite].''; + if ($iserasable) print ''.$actl[$obj->favorite].''; else print $langs->trans("AlwaysActive"); print ''; } From 881d338fca05b9b45a92dd746638307672bfba72 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 13:07:54 +0200 Subject: [PATCH 0320/1190] Fix: label of events --- htdocs/comm/action/class/actioncomm.class.php | 23 ++++++++----------- htdocs/comm/action/index.php | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index b631160afde..a9c1b68470a 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -853,8 +853,8 @@ class ActionComm extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) - * Utilise $this->id, $this->code et $this->label + * Return URL of event + * Use $this->id, $this->type_code and $this->label * * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param int $maxlength Nombre de caracteres max dans libelle @@ -865,32 +865,27 @@ class ActionComm extends CommonObject */ function getNomUrl($withpicto=0,$maxlength=0,$classname='',$option='',$overwritepicto='') { - global $langs; + global $conf,$langs; $result=''; if ($option=='birthday') $lien = ''; else $lien = ''; $lienfin=''; $label=$this->label; - if (empty($label)) $label=$this->libelle; // Fro backward compatibility - //print 'rrr'.$this->libelle; + if (empty($label)) $label=$this->libelle; // For backward compatibility + //print 'rrr'.$this->libelle.'-'.$withpicto; if ($withpicto == 2) { $libelle=$label; - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->trans("Action".$this->type_code); + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code); $libelleshort=''; } - else if (empty($this->libelle)) - { - $libelle=$label; - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->trans("Action".$this->type_code); - $libelleshort=dol_trunc($label, $maxlength); - } else { - $libelle=$label; - $libelleshort=dol_trunc($label,$maxlength); + $libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:'')); + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=$langs->transnoentities("Action".$this->type_code); + $libelleshort=dol_trunc($libelle,$maxlength); } if ($withpicto) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 2a425cf51f9..a8ce45ea99a 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1316,7 +1316,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print "
    \n"; } else - { + { if ($showinfo) { print $langs->trans("EventOnFullDay")."
    \n"; From 866b2a7a88b4dab476aeff1f9d2ef798b9367dc4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 13:14:33 +0200 Subject: [PATCH 0321/1190] Fix: Label --- htdocs/comm/action/class/actioncomm.class.php | 8 ++++---- htdocs/comm/action/index.php | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index a9c1b68470a..b31f686c9fe 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -854,7 +854,7 @@ class ActionComm extends CommonObject /** * Return URL of event - * Use $this->id, $this->type_code and $this->label + * Use $this->id, $this->type_code, $this->label and $this->type_label * * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param int $maxlength Nombre de caracteres max dans libelle @@ -884,15 +884,15 @@ class ActionComm extends CommonObject else { $libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:'')); - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=$langs->transnoentities("Action".$this->type_code); + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label; $libelleshort=dol_trunc($libelle,$maxlength); } if ($withpicto) { - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // Add code into () { - $libelle.=(($this->type_code && $libelle!=$langs->trans("Action".$this->type_code) && $langs->trans("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->trans("Action".$this->type_code).')':''); + $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':''); } $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'action')).$lienfin; } diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index a8ce45ea99a..89933991b6a 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -414,7 +414,7 @@ $sql.= ' a.percent,'; $sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,'; $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,'; $sql.= ' a.fk_soc, a.fk_contact,'; -$sql.= ' ca.code'; +$sql.= ' ca.code, ca.libelle as type_label'; $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu"; @@ -496,6 +496,7 @@ if ($resql) $event->datep=$db->jdate($obj->datep); // datep and datef are GMT date $event->datef=$db->jdate($obj->datep2); $event->type_code=$obj->code; + $event->type_label=$obj->type_label; $event->libelle=$obj->label; $event->percentage=$obj->percent; $event->authorid=$obj->fk_user_author; // user id of creator From 1eba744e8be7e1c307cc107860d238600ace9433 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 20 Oct 2014 13:15:48 +0200 Subject: [PATCH 0322/1190] Add hook method to simply display child lines in order/invoice/propal --- htdocs/core/class/commonobject.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9996337736a..e7cf4dbb7ee 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2566,6 +2566,11 @@ abstract class CommonObject $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline); $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks } + else + { + $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline); + $reshook=$hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks + } } else { From e324df2cb999fe96d5bfd3586e5af6f6212fde24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 13:20:19 +0200 Subject: [PATCH 0323/1190] Some fix again into event list. --- htdocs/comm/action/index.php | 6 +++--- htdocs/comm/action/listactions.php | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 89933991b6a..4630d486ebf 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -414,7 +414,7 @@ $sql.= ' a.percent,'; $sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,'; $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,'; $sql.= ' a.fk_soc, a.fk_contact,'; -$sql.= ' ca.code, ca.libelle as type_label'; +$sql.= ' ca.code as type_code, ca.libelle as type_label'; $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu"; @@ -484,7 +484,7 @@ if ($resql) $obj = $db->fetch_object($resql); // Discard auto action if option is on - if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') + if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') { $i++; continue; @@ -495,7 +495,7 @@ if ($resql) $event->id=$obj->id; $event->datep=$db->jdate($obj->datep); // datep and datef are GMT date $event->datef=$db->jdate($obj->datep2); - $event->type_code=$obj->code; + $event->type_code=$obj->type_code; $event->type_label=$obj->type_label; $event->libelle=$obj->label; $event->percentage=$obj->percent; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 4850394e557..c330540cb03 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -156,7 +156,7 @@ if ($type) $param.="&type=".$type; $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; $sql.= " a.id, a.datep as dp, a.datep2 as dp2,"; $sql.= " a.fk_contact, a.note, a.label, a.percent as percent,"; -$sql.= " c.code as code, c.libelle,"; +$sql.= " c.code as type_code, c.libelle as type_label,"; $sql.= " ua.login as loginauthor, ua.rowid as useridauthor,"; $sql.= " ut.login as logintodo, ut.rowid as useridtodo,"; //$sql.= " ud.login as logindone, ud.rowid as useriddone,"; @@ -293,7 +293,7 @@ if ($resql) $obj = $db->fetch_object($resql); // Discard auto action if option is on - if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') + if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') { $i++; continue; @@ -306,7 +306,8 @@ if ($resql) // Action (type) print ''; $actionstatic->id=$obj->id; - $actionstatic->type_code=$obj->code; + $actionstatic->type_code=$obj->type_code; + $actionstatic->type_label=$obj->type_label; $actionstatic->libelle=$obj->label; print $actionstatic->getNomUrl(1,28); print ''; From 9278d210488cdb6919f55c0d6fe2d2c77fcc61e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 13:25:30 +0200 Subject: [PATCH 0324/1190] Add missing translation --- htdocs/langs/en_US/admin.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 28e19dd838d..9f87b945d71 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1535,6 +1535,7 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed +AlwaysEditable=Can always be edited Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type From c103a5927a9596cb34747556789b26d9c2854314 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Mon, 20 Oct 2014 22:28:08 +0200 Subject: [PATCH 0325/1190] Update commondocgenerator.class.php add : outstanding limit on ODT fix : only public note are display on ODT (private stay private) --- htdocs/core/class/commondocgenerator.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index a16b0cb16b6..d1048acbc23 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -118,8 +118,9 @@ abstract class CommonDocGenerator 'mycompany_idprof5'=>$mysoc->idprof5, 'mycompany_idprof6'=>$mysoc->idprof6, 'mycompany_vatnumber'=>$mysoc->tva_intra, + 'outstanding_limit'=>$mysoc->outstanding_limit, // Only private not exists for "mysoc" - 'mycompany_note'=>$mysoc->note_private + 'mycompany_note'=>$mysoc->note_public //'mycompany_note_private'=>$mysoc->note_private, //'mycompany_note_public'=>$mysoc->note_public, ); From 8e63f09764cb46e292c78b201eb478700b210d12 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Oct 2014 23:37:28 +0200 Subject: [PATCH 0326/1190] Fix: Confirm validate must be set on yes by default. --- htdocs/fichinter/card.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 95d197f401d..b5e874d03a6 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1165,13 +1165,13 @@ else if ($id > 0 || ! empty($ref)) $formconfirm=''; - // Confirmation de la suppression de la fiche d'intervention + // Confirm deletion of intervention if ($action == 'delete') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1); } - // Confirmation validation + // Confirm validation if ($action == 'validate') { // on verifie si l'objet est en numerotation provisoire @@ -1191,16 +1191,16 @@ else if ($id > 0 || ! empty($ref)) } $text=$langs->trans('ConfirmValidateIntervention',$numref); - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1); + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',1,1); } - // Confirmation de la validation de la fiche d'intervention + // Confirm back to draft if ($action == 'modify') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1); } - // Confirmation de la suppression d'une ligne d'intervention + // Confirm deletion of line if ($action == 'ask_deleteline') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1); @@ -1599,7 +1599,7 @@ else if ($id > 0 || ! empty($ref)) if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) { print '
    '.$langs->trans("Valid").'
    '; + print '>'.$langs->trans("Validate").'
    '; } // Modify From d267a788d0aa48b20cebba7ba2c3795720976087 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Oct 2014 20:02:16 +0200 Subject: [PATCH 0327/1190] Fix: use getpost --- htdocs/societe/ajaxcompanies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php index 8771c0219c7..b3565a2ca26 100644 --- a/htdocs/societe/ajaxcompanies.php +++ b/htdocs/societe/ajaxcompanies.php @@ -81,7 +81,7 @@ if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn')) if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'"; $sql.=")"; } - if (! empty($_GET["filter"])) $sql.= " AND ".$_GET["filter"]; // Add other filters + if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters $sql.= " ORDER BY nom ASC"; //dol_syslog("ajaxcompanies", LOG_DEBUG); From 639d4f03a0b43eba7f1e2a917c7091ad88d70889 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Oct 2014 17:47:12 +0200 Subject: [PATCH 0328/1190] Experimentation option PROJECT_SHOW_REF_INTO_LISTS --- htdocs/fourn/facture/list.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index e490c727a30..9439fc534bd 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; if (!$user->rights->fournisseur->facture->lire) accessforbidden(); @@ -109,8 +110,10 @@ llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:Factur $sql = "SELECT s.rowid as socid, s.nom as name, "; $sql.= " fac.rowid as facid, fac.ref, fac.ref_supplier, fac.datef, fac.date_lim_reglement as date_echeance,"; $sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle"; +if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) $sql.=", p.rowid as project_id, p.ref as project_ref"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as fac"; +if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = fac.fk_projet"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE fac.entity = ".$conf->entity; $sql.= " AND fac.fk_soc = s.rowid"; @@ -212,6 +215,7 @@ if ($resql) print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"fac.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"fac.libelle","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder); + if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"fac.total_ht","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"fac.total_ttc","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="center"',$sortfield,$sortorder); @@ -239,7 +243,13 @@ if ($resql) print ''; print ''; print ''; - print ''; + print ''; + if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) + { + print ''; + print ''; + } + print ''; print ''; print ''; print ''; @@ -252,6 +262,7 @@ if ($resql) $facturestatic=new FactureFournisseur($db); $supplierstatic=new Fournisseur($db); + $projectstatic=new Project($db); $var=true; $total=0; @@ -281,6 +292,15 @@ if ($resql) $supplierstatic->id=$obj->socid; $supplierstatic->name=$obj->name; print $supplierstatic->getNomUrl(1,'',12); + print ''; + if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) + { + $projectstatic->id=$obj->project_id; + $projectstatic->ref=$obj->project_ref; + print ''; + if ($obj->project_id > 0) print $projectstatic->getNomUrl(1); + print ''; + } print ''.price($obj->total_ht).''; print ''.price($obj->total_ttc).''; $total+=$obj->total_ht; @@ -301,6 +321,7 @@ if ($resql) // Print total print ''; print ''.$langs->trans("Total").''; + if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) print ''; print ''.price($total).''; print ''.price($total_ttc).''; print ' '; From d396c62499e5c251a14f9fa4069f7a0b5f48574c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Oct 2014 23:49:52 +0200 Subject: [PATCH 0329/1190] Fix: alignement --- htdocs/commande/card.php | 6 +++--- htdocs/holiday/index.php | 2 +- htdocs/langs/en_US/admin.lang | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 60e5d81e37a..8485ec05f96 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1148,7 +1148,7 @@ else if ($action == 'update_extras') { /* * Add file in email form -*/ + */ if (GETPOST('addfile')) { require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; @@ -1162,7 +1162,7 @@ if (GETPOST('addfile')) { /* * Remove file in email form -*/ + */ if (GETPOST('removedfile')) { require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; @@ -1177,7 +1177,7 @@ if (GETPOST('removedfile')) { /* * Send mail -*/ + */ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel')) { $langs->load('mails'); diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 9b0d1bbba62..04a96a7001d 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -257,7 +257,7 @@ print_liste_field_titre($langs->trans("Employe"),$_SERVER["PHP_SELF"],"cp.fk_use print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk_validator","",'','',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Duration")); +print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder); print ''; print "\n"; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9f87b945d71..fe28b967d67 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1382,7 +1382,7 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) ##### Sendings ##### From 29db45c76330900046cb456de645357f17f6a107 Mon Sep 17 00:00:00 2001 From: jfefe Date: Thu, 23 Oct 2014 01:15:05 +0200 Subject: [PATCH 0330/1190] Avoid missing class error for fetch_thirdparty method --- htdocs/core/class/commonobject.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 6439e3e003e..e363eda6e4a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -575,6 +575,9 @@ abstract class CommonObject global $conf; if (empty($this->socid)) return 0; + + if (!class_exists('Societe')) + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $thirdparty = new Societe($this->db); $result=$thirdparty->fetch($this->socid); From ba9d2c3690e4c5f65fc3ca35f9930200ea15ac46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 23 Oct 2014 11:02:16 +0200 Subject: [PATCH 0331/1190] Update card.php --- htdocs/product/card.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 889c782808b..9f2f0685beb 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1436,12 +1436,16 @@ else } print ''; - // Batch number management (to batch) - if ($conf->productbatch->enabled) { - print ''.$langs->trans("Status").' ('.$langs->trans("Lot").')'; - print $object->getLibStatut(2,2); - print ''; - } + // Batch number management (to batch) + if ($conf->productbatch->enabled) { + print ''.$langs->trans("Status").' ('.$langs->trans("Lot").')'; + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch'); + } else { + print $object->getLibStatut(2,2); + } + print ''; + } // Description print ''.$langs->trans("Description").''.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).''; From 19e194dd814aad0c4eb2d36074305f022f8d28d1 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 23 Oct 2014 12:01:15 +0200 Subject: [PATCH 0332/1190] encrease name length for societe --- htdocs/install/mysql/tables/llx_adherent.sql | 2 +- htdocs/install/mysql/tables/llx_societe.sql | 2 +- htdocs/societe/soc.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 9e4db2b604a..e7f9c246834 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -37,7 +37,7 @@ create table llx_adherent pass varchar(50), -- password fk_adherent_type integer NOT NULL, morphy varchar(3) NOT NULL, -- personne morale / personne physique - societe varchar(60), -- company name (should be same lenght than societe.name) + societe varchar(128), -- company name (should be same lenght than societe.name) fk_soc integer NULL, -- Link to third party linked to member address text, zip varchar(30), diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index bfe69b0d5f8..25629424037 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -22,7 +22,7 @@ create table llx_societe ( rowid integer AUTO_INCREMENT PRIMARY KEY, - nom varchar(60), -- company reference name (should be smae length than adherent.societe) + nom varchar(128), -- company reference name (should be same length than adherent.societe) entity integer DEFAULT 1 NOT NULL, -- multi company id ref_ext varchar(128), -- reference into an external system (not used by dolibarr) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index a0b9bda1c8e..65b1e4783d8 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -805,7 +805,7 @@ else print ''; } print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>'; - print ''; + print ''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { print ''.$langs->trans('Prefix').''; @@ -816,7 +816,7 @@ else if ($conf->use_javascript_ajax) { print ''; - print ''; + print ''; print ' '; print ''; print $formcompany->select_civility($object->civility_id).''; @@ -1266,7 +1266,7 @@ else // Name print ''; - print ''; + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field From 10f419e372102a7033f589c8f8c9190782f496bc Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Thu, 23 Oct 2014 13:08:39 +0200 Subject: [PATCH 0333/1190] error on adding fields (bad function --- htdocs/core/class/commondocgenerator.class.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index d1048acbc23..26f209ed107 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -118,11 +118,9 @@ abstract class CommonDocGenerator 'mycompany_idprof5'=>$mysoc->idprof5, 'mycompany_idprof6'=>$mysoc->idprof6, 'mycompany_vatnumber'=>$mysoc->tva_intra, - 'outstanding_limit'=>$mysoc->outstanding_limit, - // Only private not exists for "mysoc" - 'mycompany_note'=>$mysoc->note_public - //'mycompany_note_private'=>$mysoc->note_private, - //'mycompany_note_public'=>$mysoc->note_public, + // Only private not exists for "mysoc" + 'mycompany_note_private'=>$mysoc->note_private, + ); } @@ -167,6 +165,7 @@ abstract class CommonDocGenerator 'company_customeraccountancycode'=>$object->code_compta, 'company_supplieraccountancycode'=>$object->code_compta_fournisseur, 'company_juridicalstatus'=>$object->forme_juridique, + 'company_outstanding_limit'=>$object->outstanding_limit, 'company_capital'=>$object->capital, 'company_idprof1'=>$object->idprof1, 'company_idprof2'=>$object->idprof2, From 463904706bb545349cc9a37eea9c49921618b687 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 23 Oct 2014 15:02:49 +0200 Subject: [PATCH 0334/1190] better display margin infos --- htdocs/core/class/commonobject.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9996337736a..22d3c2ffc59 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3012,13 +3012,13 @@ abstract class CommonObject print ''; print ''; - print ''; - print ''; + print ''; + print ''; if ($conf->global->MARGIN_TYPE == "1") - print ''; + print ''; else - print ''; - print ''; + print ''; + print ''; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) print ''; if (! empty($conf->global->DISPLAY_MARK_RATES)) From 36ff576d1566377785c32c66a2c6df894aa93595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 23 Oct 2014 17:48:51 +0200 Subject: [PATCH 0335/1190] "Is Order shippable" icon --- htdocs/commande/list.php | 59 +++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index bd31a438b05..f7c56130c2d 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php'; $langs->load('orders'); $langs->load('deliveries'); @@ -325,22 +326,54 @@ if ($resql) $total=0; $subtotal=0; - $generic_commande = new Commande($db); - while ($i < min($num,$limit)) - { - $objp = $db->fetch_object($resql); - $var=!$var; - print ''; - print ''; + print ''; print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder); + //print_liste_field_titre($langs->trans("Object"),$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.daten",'',$param,'align="right"',$sortfield,$sortorder); print ''; // List - $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type, n.objet_id,"; - $sql.= " c.rowid as id, c.lastname, c.firstname, c.email,"; + $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type, n.objet_id as object_id, n.type,"; + $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,"; $sql.= " a.code, a.label"; $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,"; - $sql.= " ".MAIN_DB_PREFIX."notify as n, "; - $sql.= " ".MAIN_DB_PREFIX."socpeople as c"; + $sql.= " ".MAIN_DB_PREFIX."notify as n "; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid"; $sql.= " WHERE a.rowid = n.fk_action"; - $sql.= " AND c.rowid = n.fk_contact"; - $sql.= " AND c.fk_soc = ".$object->id; + $sql.= " AND n.fk_soc = ".$object->id; $resql=$db->query($sql); if ($resql) @@ -400,17 +399,37 @@ if ($result > 0) $obj = $db->fetch_object($resql); - $contactstatic->id=$obj->id; - $contactstatic->lastname=$obj->lastname; - $contactstatic->firstname=$obj->firstname; - print ''; print ''; - // TODO Add link to object here + print ''; + // TODO Add link to object here for other types + /*print '';*/ // print print''; print ''; @@ -427,7 +446,7 @@ if ($result > 0) } else dol_print_error('','RecordNotFound'); -$db->close(); llxFooter(); +$db->close(); From 68fa6cec70b4299aa88c6dec108132b73c5f86ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 25 Oct 2014 11:34:21 +0200 Subject: [PATCH 0348/1190] Update commande.php --- htdocs/admin/commande.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index e5b2e5e6b1d..89a78b5d6da 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -222,6 +222,18 @@ else if ($action == 'set_COMMANDE_FREE_TEXT') } } +//Activate Set Shippable Icon In List +else if ($action=="setshippableiconinlist") { + $setshippableiconinlist = GETPOST('value','int'); + $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist,'yesno',0,'',$conf->entity); + if (! $res > 0) $error++; + if (! $error) { + setEventMessage($langs->trans("SetupSaved")); + } else { + setEventMessage($langs->trans("Error"), 'errors'); + } +} + /* * View @@ -548,6 +560,22 @@ print '' print "\n"; print ''; +// Shippable Icon in List +$var=!$var; +print ""; +print ''; +print ''; +print ''; +print ''; + print '
    '.$langs->trans('Margins').''.$langs->trans('SellingPrice').''.$langs->trans('Margins').''.$langs->trans('SellingPrice').''.$langs->trans('BuyingPrice').''.$langs->trans('BuyingPrice').''.$langs->trans('CostPrice').''.$langs->trans('Margin').''.$langs->trans('CostPrice').''.$langs->trans('Margin').''.$langs->trans('MarginRate').'
    '; + $generic_commande = new Commande($db); + $generic_product = new Product($db); + while ($i < min($num,$limit)) { + $objp = $db->fetch_object($resql); + $var=!$var; + print '
    '; - $generic_commande->id=$objp->rowid; - $generic_commande->ref=$objp->ref; + $generic_commande->id=$objp->rowid; + $generic_commande->ref=$objp->ref; + $generic_commande->lines=array(); + $generic_commande->getLinesArray(); - print ''; - print ''; + print '
    '; - print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut)); - print '
    '; + print ''; + // Shippable Icon + if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) { + print ''; + } + + // warning late icon print ''; - // Shippable Icon + // Shipping Icon if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) { print ''; - // Shipping Icon + // Shippable Icon if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) { - print ''; + if ($nbprod>0) { + print ''; + } } // warning late icon From b2a9b48a78478dedaddb70293bf265db839355bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 24 Oct 2014 10:40:48 +0200 Subject: [PATCH 0343/1190] Update ajax.lib.php Add a delay before making request, may avoid multiple request to server when typing search request --- htdocs/core/lib/ajax.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 4bc6da083aa..d6cc1a287d7 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -173,6 +173,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt } $("#search_'.$htmlname.'").trigger("change"); // To tell that input text field was modified } + ,delay: 1000 }).data( "autocomplete" )._renderItem = function( ul, item ) { return $( "
  • " ) .data( "item.autocomplete", item ) From 4d515d660cfad3afe953f9180b4477bc780eff8a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Oct 2014 14:17:36 +0200 Subject: [PATCH 0344/1190] New: Feature to link manually an order to an invoice does not disappear once link has been done. --- ChangeLog | 2 ++ htdocs/compta/facture.php | 24 ++++++++++++------- htdocs/fourn/facture/card.php | 18 +++++++++----- .../facture/tpl/linkedobjectblock.tpl.php | 1 + 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c9c2b8a039..350f5ba7b6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Feature to link manually an order to an invoice does not disappear once + link has been done. - New: Can set a color on user card (visible into agenda view). - New: extrafields for projects and tasks are exported to ODT documents. - New: Add number of active notification into tab title (like we do for notes and documents) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index eb4ca29f022..27dbcc5c83c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3579,21 +3579,24 @@ if ($action == 'create') // Linked object block $somethingshown = $object->showLinkedObjectBlock(); - if (empty($somethingshown) && ! empty($conf->commande->enabled)) + $linktoelem=''; + + if (! empty($conf->commande->enabled)) { - print '
    ' . $langs->trans('LinkedOrder') . ''; + $linktoelem.=($linktoelem?'   ':'').'' . $langs->trans('LinkedOrder') . ''; print ' '; - print '
    '; + print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut)); + print ''; + $shippable=0; + $text_info=''; + for ($lig=0; $lig<(count($generic_commande->lines)); $lig++) { + if ($generic_commande->lines[$lig]->product_type==0) { + $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.' : '.dol_trunc($generic_commande->lines[$lig]->product_label, 28); + $generic_product->id = $generic_commande->lines[$lig]->fk_product; + $generic_product->load_stock(); + if ($generic_product->stock_reel<$generic_commande->lines[$lig]->qty) { + $shippable++; + $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; + } else { + $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; + } + } + } + if ($shippable==0) { + $text_icon = img_picto('', 'object_sending'); + $text_info = $langs->trans('Shippable').'
    '.$text_info; + } else { + $text_icon = img_picto('', 'error'); + $text_info = $langs->trans('NonShippable').'
    '.$text_info; + } + print $form->textwithtooltip('',$text_info,2,1,$text_icon,'',2); + print '    		'; if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning"); From 63e4275afbfc6c02f348a2e0c2503e7f166460b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 23 Oct 2014 18:32:29 +0200 Subject: [PATCH 0336/1190] Update list.php --- htdocs/commande/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index f7c56130c2d..9fbe7f24c7f 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -356,9 +356,9 @@ if ($resql) $generic_product->load_stock(); if ($generic_product->stock_reel<$generic_commande->lines[$lig]->qty) { $shippable++; - $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; + $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; } else { - $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; + $text_info.='
    "; } } } From 335b0b3c56a08e40739bbf164c60b205976d8f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 23 Oct 2014 18:33:52 +0200 Subject: [PATCH 0337/1190] Update list.php --- htdocs/commande/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 9fbe7f24c7f..21be169c823 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -358,7 +358,7 @@ if ($resql) $shippable++; $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; } else { - $text_info.='
    "; + $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; } } } From 48a9be28a18f322b060eb6506293329889fd2bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 23 Oct 2014 18:39:12 +0200 Subject: [PATCH 0338/1190] Update deliveries.lang --- htdocs/langs/en_US/deliveries.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index cabd31a3a32..b2407f610e1 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -24,3 +24,5 @@ Deliverer=Deliverer : Sender=Sender Recipient=Recipient ErrorStockIsNotEnough=There's not enough stock +Shippable=Shippable +NonShippable=Non Shippable From ccbaba79fb12be75f9108578dd8c1b5fb9885598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 23 Oct 2014 18:42:02 +0200 Subject: [PATCH 0339/1190] Update deliveries.lang --- htdocs/langs/en_US/deliveries.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index b2407f610e1..c96a506281d 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -25,4 +25,4 @@ Sender=Sender Recipient=Recipient ErrorStockIsNotEnough=There's not enough stock Shippable=Shippable -NonShippable=Non Shippable +NonShippable=Not Shippable From 1bbdd3798e373a1217d76b37c98775ff878e7991 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Oct 2014 00:53:41 +0200 Subject: [PATCH 0340/1190] Better contrast --- htdocs/theme/eldy/style.css.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 8dde34aa105..90826327b59 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1004,9 +1004,9 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks background-repeat:repeat-x; border-left: 1px solid #AAA; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - border-top: 1px solid #CCC; + border-right: 1px solid #BBB; + border-bottom: 1px solid #BBB; + border-top: 1px solid #BBB; border-radius: 5px; -moz-border-radius: 5px; -moz-box-shadow: 3px 3px 4px #DDD; @@ -1361,10 +1361,10 @@ div.tabBar { -moz-border-radius:6px; -webkit-border-radius: 6px; border-radius: 6px; - border-right: 1px solid #CCCCCC; - border-bottom: 1px solid #CCCCCC; - border-left: 1px solid #D0D0D0; - border-top: 1px solid #D8D8D8; + border-right: 1px solid #BBB; + border-bottom: 1px solid #BBB; + border-left: 1px solid #BBB; + border-top: 1px solid #CCC; width: auto; background-image: -o-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); @@ -1420,9 +1420,9 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { box-shadow: 0 -1px 4px rgba(0,0,0,.1); border-bottom: none; - border-right: 1px solid #CCCCCC; - border-left: 1px solid #D0D0D0; - border-top: 1px solid #D8D8D8; + border-right: 1px solid #BBB; + border-left: 1px solid #BBB; + border-top: 1px solid #CCC; background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); From 8b4706cacd9de06cd95a7cbcf6b57560d7d6ae5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 24 Oct 2014 08:55:30 +0200 Subject: [PATCH 0341/1190] Update list.php --- htdocs/commande/list.php | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 21be169c823..ece12a159c1 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -344,25 +344,44 @@ if ($resql) print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut)); print '    		'; - $shippable=0; + $notshippable=0; $text_info=''; for ($lig=0; $lig<(count($generic_commande->lines)); $lig++) { if ($generic_commande->lines[$lig]->product_type==0) { - $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.' : '.dol_trunc($generic_commande->lines[$lig]->product_label, 28); $generic_product->id = $generic_commande->lines[$lig]->fk_product; $generic_product->load_stock(); + // stock order and stock order_supplier + $stock_order=0; + $stock_order_supplier=0; + if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) { + if (! empty($conf->commande->enabled)) { + $generic_product->load_stats_commande(0,'1,2'); + $stock_order=$generic_product->stats_commande['qty']; + } + if (! empty($conf->fournisseur->enabled)) { + $generic_product->load_stats_commande_fournisseur(0,'3'); + $stock_order_supplier=$generic_product->stats_commande_fournisseur['qty']; + } + } + $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.' '.dol_trunc($generic_commande->lines[$lig]->product_label, 25); + $text_stock_reel = $generic_product->stock_reel.'/'.$stock_order; if ($generic_product->stock_reel<$generic_commande->lines[$lig]->qty) { - $shippable++; - $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; + $notshippable++; + $text_info.=''.$langs->trans('Available').' : '.$text_stock_reel.''; } else { - $text_info.=''.$langs->trans('Available').' : '.$generic_product->stock_reel."
    "; + $text_info.=''.$langs->trans('Available').' : '.$text_stock_reel.''; + } + if ($stock_order_supplier>0) { + $text_info.= ' '.$langs->trans('SupplierOrder').' : '.$stock_order_supplier.'
    '; + } else { + $text_info.= '
    '; } } } - if ($shippable==0) { + if ($notshippable==0) { $text_icon = img_picto('', 'object_sending'); $text_info = $langs->trans('Shippable').'
    '.$text_info; } else { From 6a1d5edf9d14d793499d5695c63d75ee6da38ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 24 Oct 2014 09:23:39 +0200 Subject: [PATCH 0342/1190] Update list.php --- htdocs/commande/list.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index ece12a159c1..802fe9e1f91 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -344,13 +344,14 @@ if ($resql) print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut)); print '    		'; $notshippable=0; $text_info=''; + $nbprod=0; for ($lig=0; $lig<(count($generic_commande->lines)); $lig++) { if ($generic_commande->lines[$lig]->product_type==0) { + $nbprod++; // order contains real products $generic_product->id = $generic_commande->lines[$lig]->fk_product; $generic_product->load_stock(); // stock order and stock order_supplier @@ -388,8 +389,11 @@ if ($resql) $text_icon = img_picto('', 'error'); $text_info = $langs->trans('NonShippable').'
    '.$text_info; } - print $form->textwithtooltip('',$text_info,2,1,$text_icon,'',2); - print '    		'; + print $form->textwithtooltip('',$text_info,2,1,$text_icon,'',2); + print '
    '; print ''; print ''; @@ -3614,7 +3618,8 @@ if ($action == 'create') print ''; print ''; print ''; - while ($i < $num) { + while ($i < $num) + { $objp = $db->fetch_object($resqlorderlist); if ($objp->socid == $soc->id) { $var = ! $var; @@ -3632,7 +3637,7 @@ if ($action == 'create') $i ++; } print '
    ' . $langs->trans("AmountHTShort") . '' . $langs->trans("Company") . '
    '; - print '
    '; + print '
     
    '; print ''; $db->free($resqlorderlist); } else { @@ -3642,6 +3647,9 @@ if ($action == 'create') print ''; } + // Show link to elements + if ($linktoelem) print '
    '.$linktoelem; + // Link for paypal payment if (! empty($conf->paypal->enabled) && $object->statut != 0) { include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php'; diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index c8db601a8d9..7f58e6ddd6e 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2288,21 +2288,24 @@ else */ $somethingshown=$object->showLinkedObjectBlock(); + $linktoelem=''; + if (empty($somethingshown) && ! empty($conf->fournisseur->enabled)) { - print '
    ' . $langs->trans('LinkedOrder') . ''; + $linktoelem.=($linktoelem?'   ':'').'' . $langs->trans('LinkedOrder') . ''; print ' '; - print '
    '; //print '
    		'; //print '
    '; diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index 211d6c4ad8f..a6d9164a91c 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -32,6 +32,7 @@ echo '
    '; if ($num > 1) print_titre($langs->trans("RelatedBills")); else print_titre($langs->trans("RelatedBill")); ?> + From 41f0920656a8eb26ee40f48a21cbed9362897d73 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Oct 2014 23:50:10 +0200 Subject: [PATCH 0345/1190] Fix for debian --- build/debian/control | 8 +++++--- build/debian/copyright | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/debian/control b/build/debian/control index fc0cee30319..164b919e066 100755 --- a/build/debian/control +++ b/build/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Laurent Destailleur (eldy) # Uploaders: Laurent Destailleur (eldy) # Only if differs from Maintainer -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://www.dolibarr.org Build-Depends: debhelper (>= 9), po-debconf # This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version @@ -16,7 +16,8 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip, # Required PHP libraries php-pear, php-mail-mime, -# php-tcpdf, libfpdi-php, libfpdf-tpl-php, php-fpdf, +# php-tcpdf, libfpdi-php, +# libfpdf-tpl-php, php-fpdf, # libphp-adodb, # libnusoap-php, # libphp-pclzip, @@ -26,9 +27,10 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | # fonts-dejavu-core | ttf-dejavu-core, xdg-utils, mysql-server, + mysql-client, ${misc:Depends}, ${perl:Depends} -Recommends: mysql-client, apache2 | lighttpd | httpd +Recommends: apache2 | lighttpd | httpd Suggests: www-browser Description: Web based software to manage a company or foundation Dolibarr ERP & CRM is an easy to use open source/free software for small diff --git a/build/debian/copyright b/build/debian/copyright index 73109152034..080965c31a3 100644 --- a/build/debian/copyright +++ b/build/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Dolibarr Upstream-Contact: Laurent Destailleur -Source: http://sourceforge.net/projects/dolibarr/files/ +Source: http://www.dolibarr.org/files/stable/standard/ Files: * Copyright: 2002-2009, Rodolphe Quiedeville From 0fc1c85b349859739ff557f0cace018bf8da6d7a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Oct 2014 00:42:52 +0200 Subject: [PATCH 0346/1190] New: Module notification has been enhanced: EMail use now language of target contact. Can also define a fixed email for notifications. Better error management --- ChangeLog | 3 + htdocs/admin/notification.php | 46 ++- htdocs/commande/card.php | 2 +- htdocs/core/class/notify.class.php | 348 +++++++++++++----- htdocs/core/lib/functions.lib.php | 2 + ..._50_modNotification_Notification.class.php | 62 +--- htdocs/langs/en_US/admin.lang | 7 +- htdocs/langs/en_US/other.lang | 1 + htdocs/societe/notify/card.php | 35 +- 9 files changed, 338 insertions(+), 168 deletions(-) diff --git a/ChangeLog b/ChangeLog index 350f5ba7b6d..36439c46288 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Module notification has been enhanced: + EMail use now language of target contact. + Can also define a fixed email for notifications. - New: Feature to link manually an order to an invoice does not disappear once link has been done. - New: Can set a color on user card (visible into agenda view). diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index ca68c54c805..14aeba65c29 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -32,6 +32,7 @@ $langs->load("other"); $langs->load("orders"); $langs->load("propal"); $langs->load("bills"); +$langs->load("errors"); // Security check if (!$user->admin) @@ -39,19 +40,32 @@ if (!$user->admin) $action = GETPOST("action"); + /* * Actions */ if ($action == 'setvalue' && $user->admin) { - $result=dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM",$_POST["email_from"],'chaine',0,'',$conf->entity); - if ($result >= 0) + $result=dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", $_POST["email_from"], 'chaine', 0, '', $conf->entity); + if ($result < 0) $error++; + + if (! $error) + { + foreach($_POST as $key => $val) + { + if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_/',$key)) continue; + //print $key.' - '.$val.'
    '; + $result=dolibarr_set_const($db, $key, $val, 'chaine', 0, '', $conf->entity); + } + } + + if (! $error) { setEventMessage($langs->trans("SetupSaved")); } else - { + { setEventMessage($langs->trans("Error"),'errors'); } } @@ -67,7 +81,7 @@ llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup'); -print $langs->trans("NotificationsDesc").'

    '; +print $langs->trans("NotificationsDesc").'

    '; print '
    '; print ''; @@ -83,19 +97,13 @@ print "    \n"; $var=!$var; print ''; print '
    trans("Ref"); ?>
    '; print $langs->trans("NotificationEMailFrom").''; -print ''; -if (! empty($conf->global->NOTIFICATION_EMAIL_FROM) && ! isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail")); +print ''; +if (! empty($conf->global->NOTIFICATION_EMAIL_FROM) && ! isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) print ' '.img_warning($langs->trans("ErrorBadEMail")); print '
    '; print '
    '; -print '
    '; - -print ''; -print '
    '; - - print_fiche_titre($langs->trans("ListOfAvailableNotifications"),'',''); print ''; @@ -103,6 +111,7 @@ print ''; print ''; print ''; print ''; +print ''; print "\n"; // Load array of available notifications @@ -123,10 +132,21 @@ foreach($listofnotifiedevents as $notifiedevent) print ''; print ''; print ''; + $param='NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code']; + print ''; print ''; } print '
    '.$langs->trans("Module").''.$langs->trans("Code").''.$langs->trans("Label").''.$langs->trans("FixedEmailTarget").'
    '.$elementLabel.''.$notifiedevent['code'].''.$label.''; + if (! empty($conf->global->$param) && ! isValidEmail($conf->global->$param)) print ' '.img_warning($langs->trans("ErrorBadEMail")); + print '
    '; -$db->close(); +print '
    '; + +print '
    '; + +print ''; + llxFooter(); + +$db->close(); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 8485ec05f96..82811287604 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2006 Andre Cianfarani diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 43a504fd04f..b7914be6e77 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -32,6 +32,7 @@ class Notify var $id; var $db; var $error; + var $errors=array(); var $author; var $ref; @@ -84,34 +85,50 @@ class Notify { global $conf; - $num=-1; + $error=0; + $num=0; - $sql = "SELECT n.rowid"; - $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,"; - $sql.= " ".MAIN_DB_PREFIX."socpeople as c,"; - $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,"; - $sql.= " ".MAIN_DB_PREFIX."societe as s"; - $sql.= " WHERE n.fk_contact = c.rowid"; - $sql.= " AND a.rowid = n.fk_action"; - $sql.= " AND n.fk_soc = s.rowid"; - if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action; // Old usage - else $sql.= " AND a.code = '".$action."'"; // New usage - $sql.= " AND s.entity IN (".getEntity('societe', 1).")"; - $sql.= " AND s.rowid = ".$socid; - - dol_syslog("Notify.class::countDefinedNotifications ".$action.", ".$socid."", LOG_DEBUG); - - $resql = $this->db->query($sql); - if ($resql) + if (! $error) { - $num = $this->db->num_rows($resql); - } - else + $sql = "SELECT n.rowid"; + $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,"; + $sql.= " ".MAIN_DB_PREFIX."socpeople as c,"; + $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,"; + $sql.= " ".MAIN_DB_PREFIX."societe as s"; + $sql.= " WHERE n.fk_contact = c.rowid"; + $sql.= " AND a.rowid = n.fk_action"; + $sql.= " AND n.fk_soc = s.rowid"; + if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action; // Old usage + else $sql.= " AND a.code = '".$action."'"; // New usage + $sql.= " AND s.entity IN (".getEntity('societe', 1).")"; + $sql.= " AND s.rowid = ".$socid; + + dol_syslog(get_class($this)."::countDefinedNotifications ".$action.", ".$socid."", LOG_DEBUG); + + $resql = $this->db->query($sql); + if ($resql) + { + $num = $this->db->num_rows($resql); + } + else + { + $error++; + $this->error=$this->db->error.' sql='.$sql; + } + } + + if (! $error) { - $this->error=$this->db->error.' sql='.$sql; - return -1; + // List of notifications enabled for fixed email + foreach($conf->global as $key => $val) + { + if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$action.'/', $key, $reg)) continue; + $num++; + } } + // TODO return array with list of email instead of number, + type of notification (contacts or fixed email) + if ($error) return -1; return $num; } @@ -120,22 +137,42 @@ class Notify * If yes, send mail and save trace into llx_notify. * * @param string $action Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage) - * @param int $socid Id of third party - * @param string $texte Message to send - * @param string $objet_type Type of object the notification deals on (facture, order, propal, order_supplier...). Just for log in llx_notify. - * @param int $objet_id Id of object the notification deals on - * @param string $file Attach a file + * @param Object $object Object the notification deals on * @return int <0 if KO, or number of changes if OK */ - function send($action, $socid, $texte, $objet_type, $objet_id, $file="") + function send($action, $object) { global $conf,$langs,$mysoc,$dolibarr_main_url_root; - $langs->load("other"); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_syslog(get_class($this)."::send action=".$action.", socid=".$socid.", texte=".$texte.", objet_type=".$objet_type.", objet_id=".$objet_id.", file=".$file); + dol_syslog(get_class($this)."::send action=".$action.", object=".$object->id); - $sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname,"; + $langs->load("other"); + + // Define $urlwithroot + $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); + $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current + + // Define some vars + $application = $mysoc->name; + //if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE; + $replyto = $conf->notification->email_from; + $filename = basename($file); + $mimefile = dol_mimetype($file); + $object_type = ''; + $link = ''; + $num = 0; + + if (! in_array($action, array('BILL_VALIDATE', 'ORDER_VALIDATE', 'PROPAL_VALIDATE', 'FICHINTER_VALIDATE', 'ORDER_SUPPLIER_APPROVE', 'ORDER_SUPPLIER_REFUSE', 'SHIPPING_VALIDATE'))) + { + return 0; + } + + + // Check notification per third party + $sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,"; $sql.= " a.rowid as adid, a.label, a.code, n.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,"; $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,"; @@ -145,7 +182,7 @@ class Notify $sql.= " AND n.fk_soc = s.rowid"; if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action; // Old usage else $sql.= " AND a.code = '".$action."'"; // New usage - $sql .= " AND s.rowid = ".$socid; + $sql .= " AND s.rowid = ".$object->socid; $result = $this->db->query($sql); if ($result) @@ -155,7 +192,7 @@ class Notify if ($num > 0) { $i = 0; - while ($i < $num) // For each notification couple defined (third party/actioncode) + while ($i < $num && ! $error) // For each notification couple defined (third party/actioncode) { $obj = $this->db->fetch_object($result); @@ -164,48 +201,80 @@ class Notify if (dol_strlen($obj->email)) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $application=($conf->global->MAIN_APPLICATION_TITLE?$conf->global->MAIN_APPLICATION_TITLE:'Dolibarr ERP/CRM'); + // Set output language + $outputlangs = $langs; + if ($obj->default_lang && $obj->default_lang != $langs->defaultlang) + { + $outputlangs = new Translate('', $conf); + $outputlangs->setDefaultLang($obj->default_lang); + } - $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); + switch ($action) { + case 'BILL_VALIDATE': + $link='/compta/facture.php?facid='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'facture'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); + break; + case 'ORDER_VALIDATE': + $link='/commande/card.php?id='.$object->id; + $dir_output = $conf->commande->dir_output; + $object_type = 'order'; + $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); + break; + case 'PROPAL_VALIDATE': + $link='/comm/propal.php?id='.$object->id; + $dir_output = $conf->propal->dir_output; + $object_type = 'propal'; + $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); + break; + case 'FICHINTER_VALIDATE': + $link='/fichinter/card.php?id='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'ficheinter'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); + break; + case 'ORDER_SUPPLIER_APPROVE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'ORDER_SUPPLIER_REFUSE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'SHIPPING_VALIDATE': + $dir_output = $conf->expedition->dir_output.'/sending/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); + break; + } + $ref = dol_sanitizeFileName($object->ref); + $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; + if (! dol_is_file($pdf_path)) + { + // We can't add PDF as it is not generated yet. + $filepdf = ''; + } + else + { + $filepdf = $pdf_path; + } - $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n"; - $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n"; + $subject = '['.$application.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification"); + + $message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n"; + $message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n"; $message.= "\n"; - $message.= $texte; - // Add link - $link=''; - switch($objet_type) - { - case 'ficheinter': - $link='/fichinter/card.php?id='.$objet_id; - break; - case 'propal': - $link='/comm/propal.php?id='.$objet_id; - break; - case 'facture': - $link='/compta/facture.php?facid='.$objet_id; - break; - case 'order': - $link='/commande/card.php?id='.$objet_id; - break; - case 'order_supplier': - $link='/fourn/commande/card.php?id='.$objet_id; - break; - } - // Define $urlwithroot - $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); - $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file - //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current - if ($link) $message.="\n".$urlwithroot.$link; - - $filename = basename($file); - - $mimefile=dol_mimetype($file); - - $msgishtml=0; - - $replyto = $conf->notification->email_from; + $message.= $mesg; + if ($link) $message=dol_concatdesc($message,$urlwithroot.$link); $mailfile = new CMailFile( $subject, @@ -218,26 +287,22 @@ class Notify '', '', 0, - $msgishtml + -1 ); if ($mailfile->sendfile()) { - $now=dol_now(); - $sendto = htmlentities($sendto); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_contact, objet_type, objet_id, email)"; - $sql.= " VALUES ('".$this->db->idate($now)."', ".$actiondefid.", ".$obj->cid.", '".$objet_type."', ".$objet_id.", '".$this->db->escape($obj->email)."')"; - dol_syslog("Notify::send", LOG_DEBUG); - if (! $this->db->query($sql) ) + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$obj->cid.", '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')"; + if (! $this->db->query($sql)) { dol_print_error($this->db); } } else - { - $this->error=$mailfile->error; - //dol_syslog("Notify::send ".$this->error, LOG_ERR); + { + $error++; + $this->errors[]=$mailfile->error; } } else @@ -246,20 +311,129 @@ class Notify } $i++; } - return $i; } else { - dol_syslog("No notification sent, nothing into notification setup for the thirdparty socid = ".$socid); - return 0; + dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid); } } else { - $this->error=$this->db->lasterror(); + $error++; + $this->errors[]=$this->db->lasterror(); return -1; } + // Check notification using fixed email + if (! $error) + { + $param='NOTIFICATION_FIXEDEMAIL_'.$action; + if (! empty($conf->global->$param)) + { + $object_type = ''; + $link = ''; + $num++; + + switch ($action) { + case 'BILL_VALIDATE': + $link='/compta/facture.php?facid='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'facture'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); + break; + case 'ORDER_VALIDATE': + $link='/commande/card.php?id='.$object->id; + $dir_output = $conf->commande->dir_output; + $object_type = 'order'; + $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); + break; + case 'PROPAL_VALIDATE': + $link='/comm/propal.php?id='.$object->id; + $dir_output = $conf->propal->dir_output; + $object_type = 'propal'; + $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); + break; + case 'FICHINTER_VALIDATE': + $link='/fichinter/card.php?id='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'ficheinter'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); + break; + case 'ORDER_SUPPLIER_APPROVE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'ORDER_SUPPLIER_REFUSE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'SHIPPING_VALIDATE': + $dir_output = $conf->expedition->dir_output.'/sending/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); + break; + } + $ref = dol_sanitizeFileName($object->ref); + $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; + if (! dol_is_file($pdf_path)) + { + // We can't add PDF as it is not generated yet. + $filepdf = ''; + } + else + { + $filepdf = $pdf_path; + } + + $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); + + $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n"; + $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n"; + $message.= "\n"; + $message.= $mesg; + if ($link) $message=dol_concatdesc($message,$urlwithroot.$link); + + $mailfile = new CMailFile( + $subject, + $sendto, + $replyto, + $message, + array($file), + array($mimefile), + array($filename[count($filename)-1]), + '', + '', + 0, + -1 + ); + + if ($mailfile->sendfile()) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_contact, objet_type, objet_id, email)"; + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$obj->cid.", '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')"; + if (! $this->db->query($sql)) + { + dol_print_error($this->db); + } + } + else + { + $error++; + $this->errors[]=$mailfile->error; + } + } + } + + if (! $error) return $num; + else return -1 * $error; } } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 38e19eb31fd..64e3e9675dc 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4559,6 +4559,8 @@ function picto_from_langcode($codelang) { global $langs; + if (empty($codelang)) return ''; + if ($codelang == 'auto') { return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png'); diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php index 368f7bdeeb8..940e3a1712d 100644 --- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php @@ -60,70 +60,12 @@ class InterfaceNotification extends DolibarrTriggers { if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing - require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; - - $langs->load("other"); - - switch ($action) { - case 'BILL_VALIDATE': - $dir_output = $conf->facture->dir_output; - $object_type = 'facture'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); - break; - case 'ORDER_VALIDATE': - $dir_output = $conf->commande->dir_output; - $object_type = 'order'; - $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); - break; - case 'PROPAL_VALIDATE': - $dir_output = $conf->propal->dir_output; - $object_type = 'propal'; - $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); - break; - case 'FICHINTER_VALIDATE': - $dir_output = $conf->facture->dir_output; - $object_type = 'ficheinter'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); - break; - case 'ORDER_SUPPLIER_APPROVE': - $dir_output = $conf->fournisseur->dir_output.'/commande/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); - $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; - break; - case 'ORDER_SUPPLIER_REFUSE': - $dir_output = $conf->fournisseur->dir_output.'/commande/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); - $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; - break; - case 'SHIPPING_VALIDATE': - $dir_output = $conf->expedition->dir_output.'/sending/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); - break; - - default: - return 0; - - } - dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); - $ref = dol_sanitizeFileName($object->ref); - $pdf_path = "$dir_output/$ref/$ref.pdf"; - - if (!file_exists($pdf_path)) { - // We can't add PDF as it is not generated yet. - $filepdf = ''; - } else { - $filepdf = $pdf_path; - } + require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify = new Notify($this->db); - $notify->send($action, $object->socid, $mesg, $object_type, $object->id, $filepdf); + $notify->send($action, $object); return 1; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index fe28b967d67..15bf8da0833 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on this page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1384,7 +1384,8 @@ MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 10e4403f4fb..1e74b72f635 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -47,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 8604b229134..12cdb64c790 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -212,7 +212,7 @@ if ($result > 0) // Line with titles print ''; print ''; - print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder); print_liste_field_titre(''); @@ -265,13 +265,40 @@ if ($result > 0) // Line with titles print '
    '; print ''; - print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder); print_liste_field_titre('','',''); print ''; - // List of notifications for contacts + // List of notifications enabled for fixed email + foreach($conf->global as $key => $val) + { + if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; + //print $key.' - '.$val.' - '.$reg[1].'
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + } + + // List of notifications enabled for contacts $sql = "SELECT n.rowid, n.type,"; $sql.= " a.code, a.label,"; $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email"; @@ -343,7 +370,7 @@ if ($result > 0) // Line with titles print '
    '.$val; + if (isValidEmail($val)) + { + print ' <'.$val.'>'; + } + else + { + $langs->load("errors"); + print '   '.img_warning().' '.$langs->trans("ErrorBadEMail",$val); + } + print ''; + $label=($langs->trans("Notify_".$reg[1])!="Notify_".$reg[1]?$langs->trans("Notify_".$reg[1]):$reg[1]); + print $label; + print ''; + print $langs->trans("Email"); + print ''.$langs->trans("SeeModuleSetup").'
    '; print ''; - print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.daten",'',$param,'align="right"',$sortfield,$sortorder); print ''; From a1a03a8061cee3381777f00c2f211fb4a3bab57d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Oct 2014 01:20:59 +0200 Subject: [PATCH 0347/1190] New: Module notification has been enhanced: EMail use now language of target contact. Can also define a fixed email for notifications. Better error management --- htdocs/core/class/notify.class.php | 12 ++-- .../install/mysql/migration/3.6.0-3.7.0.sql | 1 + htdocs/install/mysql/tables/llx_notify.sql | 1 + htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/en_US/mails.lang | 4 +- htdocs/societe/notify/card.php | 55 +++++++++++++------ 6 files changed, 50 insertions(+), 25 deletions(-) diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index b7914be6e77..26506360e66 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -292,8 +292,8 @@ class Notify if ($mailfile->sendfile()) { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_contact, objet_type, objet_id, email)"; - $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$obj->cid.", '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, objet_type, objet_id, email)"; + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", ".$obj->cid.", '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')"; if (! $this->db->query($sql)) { dol_print_error($this->db); @@ -330,6 +330,10 @@ class Notify $param='NOTIFICATION_FIXEDEMAIL_'.$action; if (! empty($conf->global->$param)) { + $sendto = $conf->global->$param; + $actiondefid = dol_getIdFromCode($this->db, $action, 'c_action_trigger', 'code', 'rowid'); + if ($actiondefid <= 0) dol_print_error($this->db, 'Failed to get id from code'); + $object_type = ''; $link = ''; $num++; @@ -417,8 +421,8 @@ class Notify if ($mailfile->sendfile()) { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_contact, objet_type, objet_id, email)"; - $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$obj->cid.", '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, objet_type, objet_id, email)"; + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", null, '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')"; if (! $this->db->query($sql)) { dol_print_error($this->db); diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 80730138ab3..c2e10543b7a 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -24,6 +24,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFYBILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19); +ALTER TABLE llx_notify ADD COLUMN fk_soc integer NULL after fk_action; ALTER TABLE llx_bank_account ADD COLUMN fk_user_author integer; diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index fa2936db0fb..21a7b833dec 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -23,6 +23,7 @@ create table llx_notify tms timestamp, daten datetime, -- date de la notification fk_action integer NOT NULL, + fk_soc integer NULL, fk_contact integer NULL, fk_user integer NULL, objet_type varchar(24) NOT NULL, diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 15bf8da0833..34f31092bfc 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on this page. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 0ad86123313..44027b4cc20 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -133,6 +133,6 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 12cdb64c790..542a2066e93 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2010-2012 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -191,12 +191,10 @@ if ($result > 0) print ''; print '
    '; - // Help - print '
    '.$langs->trans("NotificationsDesc").'
    '; - - dol_fiche_end(); + // Help + print $langs->trans("NotificationsDesc").'

    '; print "\n"; @@ -372,19 +370,20 @@ if ($result > 0) print '
    '.$contactstatic->getNomUrl(1); - print $obj->email?' <'.$obj->email.'>':$langs->trans("NoMail"); + print '
    '; + if ($obj->id > 0) + { + $contactstatic->id=$obj->id; + $contactstatic->lastname=$obj->lastname; + $contactstatic->firstname=$obj->firstname; + print $contactstatic->getNomUrl(1); + print $obj->email?' <'.$obj->email.'>':$langs->trans("NoMail"); + } + else + { + print $obj->email; + } print ''; $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label); print $label; print ''; + if ($obj->type == 'email') print $langs->trans("Email"); + if ($obj->type == 'sms') print $langs->trans("Sms"); + print ''; + if ($obj->object_type == 'order') + { + $orderstatic->id=$obj->object_id; + $orderstatic->ref=... + print $orderstatic->getNomUrl(1); + } + print ''.dol_print_date($db->jdate($obj->daten), 'dayhour').'
    '.$langs->trans("ShippableOrderIconInList").' '; +if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { + print ''; + print img_picto($langs->trans("Activated"),'switch_on'); +} else { + print ''; + print img_picto($langs->trans("Disabled"),'switch_off'); +} +print '
    '; print '
    '; From e08146d053f8793f7ca3dafa603f7568744ee6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 25 Oct 2014 11:37:39 +0200 Subject: [PATCH 0349/1190] Update list.php --- htdocs/commande/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 802fe9e1f91..84f8e455d11 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -345,7 +345,7 @@ if ($resql) print ''; // Shippable Icon - if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) { + if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && ! empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { $notshippable=0; $text_info=''; $nbprod=0; From 64a5a260dd76d2f923bf802aba21a99dba604026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 25 Oct 2014 11:54:38 +0200 Subject: [PATCH 0350/1190] Update admin.lang --- htdocs/langs/en_US/admin.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9f87b945d71..014229d62d5 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1146,6 +1146,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). From 3a626d850397f86c355d514e0feffd3b53e58557 Mon Sep 17 00:00:00 2001 From: MAxime Kohlhaas Date: Sat, 25 Oct 2014 17:22:03 +0200 Subject: [PATCH 0351/1190] Add : statistics on supplier orders and invoices on home page --- .../class/fournisseur.commande.class.php | 41 +++++++++++++++++ .../fourn/class/fournisseur.facture.class.php | 42 +++++++++++++++++ htdocs/index.php | 46 ++++++++++++------- 3 files changed, 113 insertions(+), 16 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 7983060490d..6c097cd6d5b 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1923,6 +1923,47 @@ class CommandeFournisseur extends CommonOrder } } + /** + * Charge indicateurs this->nb de tableau de bord + * + * @return int <0 si ko, >0 si ok + */ + function load_state_board() + { + global $conf, $user; + + $this->nb=array(); + $clause = "WHERE"; + + $sql = "SELECT count(co.rowid) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid"; + if (!$user->rights->societe->client->voir && !$user->societe_id) + { + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; + $sql.= " WHERE sc.fk_user = " .$user->id; + $clause = "AND"; + } + $sql.= " ".$clause." co.entity = ".$conf->entity; + + $resql=$this->db->query($sql); + if ($resql) + { + while ($obj=$this->db->fetch_object($resql)) + { + $this->nb["supplier_orders"]=$obj->nb; + } + $this->db->free($resql); + return 1; + } + else + { + dol_print_error($this->db); + $this->error=$this->db->error(); + return -1; + } + } + /** * Load indicators for dashboard (this->nbtodo and this->nbtodolate) * diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 9c72319f74f..c7067410c41 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1606,6 +1606,48 @@ class FactureFournisseur extends CommonInvoice $this->total_ttc = $xnbp*119.6; } + /** + * Load indicators for dashboard (this->nbtodo and this->nbtodolate) + * + * @return int <0 if KO, >0 if OK + */ + function load_state_board() + { + global $conf, $user; + + $this->nb=array(); + + $clause = "WHERE"; + + $sql = "SELECT count(f.rowid) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid"; + if (!$user->rights->societe->client->voir && !$user->societe_id) + { + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; + $sql.= " WHERE sc.fk_user = " .$user->id; + $clause = "AND"; + } + $sql.= " ".$clause." f.entity = ".$conf->entity; + + $resql=$this->db->query($sql); + if ($resql) + { + while ($obj=$this->db->fetch_object($resql)) + { + $this->nb["supplier_invoices"]=$obj->nb; + } + $this->db->free($resql); + return 1; + } + else + { + dol_print_error($this->db); + $this->error=$this->db->error(); + return -1; + } + } + /** * Load an object from its id and create a new one in database * diff --git a/htdocs/index.php b/htdocs/index.php index 138ddc4e3a9..ebc6760252c 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -154,7 +154,9 @@ if (empty($user->societe_id)) ! empty($conf->propal->enabled) && $user->rights->propale->lire, ! empty($conf->commande->enabled) && $user->rights->commande->lire, ! empty($conf->facture->enabled) && $user->rights->facture->lire, - ! empty($conf->contrat->enabled) && $user->rights->contrat->activer); + ! empty($conf->contrat->enabled) && $user->rights->contrat->activer, + ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire, + ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire); // Class file containing the method load_state_board for each line $includes=array(DOL_DOCUMENT_ROOT."/societe/class/client.class.php", DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php", @@ -165,7 +167,9 @@ if (empty($user->societe_id)) DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php", DOL_DOCUMENT_ROOT."/commande/class/commande.class.php", DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php", - DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); + DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php", + DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php", + DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); // Name class containing the method load_state_board for each line $classes=array('Client', 'Prospect', @@ -173,10 +177,12 @@ if (empty($user->societe_id)) 'Adherent', 'Product', 'Service', - 'Propal', - 'Commande', - 'Facture', - 'Contrat'); + 'Propal', + 'Commande', + 'Facture', + 'Contrat', + 'CommandeFournisseur', + 'FactureFournisseur'); // Cle array returned by the method load_state_board for each line $keys=array('customers', 'prospects', @@ -184,10 +190,12 @@ if (empty($user->societe_id)) 'members', 'products', 'services', - 'proposals', - 'orders', - 'invoices', - 'Contracts'); + 'proposals', + 'orders', + 'invoices', + 'Contracts', + 'supplier_orders', + 'supplier_invoices'); // Dashboard Icon lines $icons=array('company', 'company', @@ -195,10 +203,12 @@ if (empty($user->societe_id)) 'user', 'product', 'service', - 'propal', - 'order', - 'bill', - 'order'); + 'propal', + 'order', + 'bill', + 'order', + 'order', + 'bill'); // Translation keyword $titres=array("ThirdPartyCustomersStats", "ThirdPartyProspectsStats", @@ -209,7 +219,9 @@ if (empty($user->societe_id)) "CommercialProposalsShort", "CustomersOrders", "BillsCustomers", - "Contracts"); + "Contracts", + "SuppliersOrders", + "SuppliersInvoices"); // Dashboard Link lines $links=array(DOL_URL_ROOT.'/comm/list.php', DOL_URL_ROOT.'/comm/prospect/list.php', @@ -220,7 +232,9 @@ if (empty($user->societe_id)) DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial', DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial', DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy', - DOL_URL_ROOT.'/contrat/list.php'); + DOL_URL_ROOT.'/contrat/list.php', + DOL_URL_ROOT.'/fourn/commande/list.php', + DOL_URL_ROOT.'/fourn/facture/list.php'); // Translation lang files $langfile=array("companies", "prospects", From 26ccb79f24d6b1712672f8544e2b0585cc822502 Mon Sep 17 00:00:00 2001 From: MAxime Kohlhaas Date: Sat, 25 Oct 2014 19:13:13 +0200 Subject: [PATCH 0352/1190] Fix : product list was wrong on supplier invoice because fourn_id is not fetched --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index a51a6505416..353f053ebea 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -152,7 +152,7 @@ else { 'option_disabled' => 'addPredefinedProductButton', // html id to disable once select is done 'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'error' ); - $form->select_produits_fournisseurs($object->fourn_id, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1); + $form->select_produits_fournisseurs($object->fk_soc, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1); } echo ''; } From 374b761fdf3ad7013c671aa4c1c334da921597cf Mon Sep 17 00:00:00 2001 From: MAxime Kohlhaas Date: Sat, 25 Oct 2014 19:20:02 +0200 Subject: [PATCH 0353/1190] Fix : product list was wrong on supplier invoice because fourn_id is not fetched --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index a51a6505416..ed06bca8725 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -152,7 +152,7 @@ else { 'option_disabled' => 'addPredefinedProductButton', // html id to disable once select is done 'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'error' ); - $form->select_produits_fournisseurs($object->fourn_id, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1); + $form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1); } echo ''; } From 1405c03f7d78dc6b65d8c1880dcfde2900cf0d6d Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 26 Oct 2014 06:48:08 +0100 Subject: [PATCH 0354/1190] Fix: Civility & birthdate wasn't save into adherent module --- ChangeLog | 11 ++++++----- htdocs/adherents/class/adherent.class.php | 13 +++++++------ htdocs/adherents/fiche.php | 5 +++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1ec979f287..cc1c3c0de2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,17 +4,18 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** -- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice -- Fix: bug 1588 : relative discount +- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. +- Fix: bug 1588 : relative discount. - Fix: label of input method not tranlated. - Fix: box of customer and propsects were not correctly disabled. -- Fix: right and error management #1961 -- Fix: Fix Error when trying to clone an Order #1943 +- Fix: right and error management #1961. +- Fix: Fix Error when trying to clone an Order #1943. +- Fix: Civility & birthdate wasn't save into adherent module. ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: - Fix: Can upload files on services. -- Fix: sql errors on updat fichinter. +- Fix: sql errors on update fichinter. - Fix: debian script syntax error. - Fix: error "menu param is not inside list" into pos module. - Fix: Salary payments are not reflected on the reporting sheets. diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 04056e0bbb0..0fa60a0d421 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -5,6 +5,7 @@ * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2009-2012 Regis Houssin + * Copyright (C) 2014 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -124,7 +125,7 @@ class Adherent extends CommonObject /** - * Fonction envoyant un email a l'adherent avec le texte fourni en parametre. + * Function sending an email has the adherent with the text supplied in parameter. * * @param string $text Content of message (not html entities encoded) * @param string $subject Subject of message @@ -247,9 +248,9 @@ class Adherent extends CommonObject /** - * Renvoie le libelle traduit de la nature d'un adherent (physique ou morale) + * Return translated label by the nature of a adherent (physical or moral) * - * @param string $morphy Nature physique ou morale de l'adherent + * @param string $morphy Nature of the adherent (physical or moral) * @return string Label */ function getmorphylib($morphy='') @@ -348,12 +349,12 @@ class Adherent extends CommonObject if (! $notrigger) { - // Appel des triggers + // Call triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('MEMBER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End call triggers } if (count($this->errors)) @@ -1101,7 +1102,7 @@ class Adherent extends CommonObject $this->ref = $obj->rowid; $this->id = $obj->rowid; $this->ref_ext = $obj->ref_ext; - $this->civility_id = $obj->civility; + $this->civility_id = $obj->civility_id; $this->firstname = $obj->firstname; $this->lastname = $obj->lastname; $this->login = $obj->login; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index cd398c75859..ef04edeeb53 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Marcos García * Copyright (C) 2012-2013 Philippe Grand + * Copyright (C) 2014 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -707,7 +708,7 @@ else { /* ************************************************************************** */ /* */ - /* Fiche creation */ + /* Creation card */ /* */ /* ************************************************************************** */ $object->canvas=$canvas; @@ -870,7 +871,7 @@ else // Birthday print "".$langs->trans("Birthday")."\n"; - $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); + $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); print "\n"; // Profil public From 7bd27a13fab3e3bfe9121e0c1124f759f7ca10cf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Oct 2014 19:41:06 +0100 Subject: [PATCH 0355/1190] Fix: missing host and port into object --- htdocs/core/db/DoliDB.class.php | 4 ++++ htdocs/core/db/mssql.class.php | 2 ++ htdocs/core/db/mysql.class.php | 2 ++ htdocs/core/db/mysqli.class.php | 2 ++ htdocs/core/db/pgsql.class.php | 2 ++ htdocs/core/db/sqlite.class.php | 2 ++ 6 files changed, 14 insertions(+) diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index dc4b127ffaa..21f0001b7e7 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -46,6 +46,10 @@ abstract class DoliDB implements Database public $database_name; //! Database username public $database_user; + //! Database host + public $database_host; + //! Database port + public $database_port; //! >=1 if a transaction is opened, 0 otherwise public $transaction_opened; //! Last successful query diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index c823fdafe49..a8f9e9aff50 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -60,6 +60,8 @@ class DoliDBMssql extends DoliDB global $conf,$langs; $this->database_user=$user; + $this->database_host=$host; + $this->database_port=$port; $this->transaction_opened=0; if (! function_exists("mssql_connect")) diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index a52283ef32e..dc0cbb1cb1b 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -61,6 +61,8 @@ class DoliDBMysql extends DoliDB if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation; $this->database_user=$user; + $this->database_host=$host; + $this->database_port=$port; $this->transaction_opened=0; diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 4a2ded2d022..9ec495f7ca5 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -61,6 +61,8 @@ class DoliDBMysqli extends DoliDB if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation; $this->database_user=$user; + $this->database_host=$host; + $this->database_port=$port; $this->transaction_opened=0; diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 81b80a9f724..a7baf59783d 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -71,6 +71,8 @@ class DoliDBPgsql extends DoliDB if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation; $this->database_user=$user; + $this->database_host=$host; + $this->database_port=$port; $this->transaction_opened=0; diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index dc364081e24..53ecb880dce 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -61,6 +61,8 @@ class DoliDBSqlite extends DoliDB if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation; $this->database_user=$user; + $this->database_host=$host; + $this->database_port=$port; $this->transaction_opened=0; From 9619c0cdea6de62d3b56259bb7529d5220cc8f1b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 00:58:56 +0100 Subject: [PATCH 0356/1190] Fix: [ bug #1581 ] SQL injection possbile --- htdocs/compta/prelevement/demandes.php | 4 ++-- htdocs/compta/prelevement/list.php | 8 ++++---- htdocs/core/lib/functions.lib.php | 2 +- htdocs/core/lib/invoice.lib.php | 4 ++-- htdocs/langs/en_US/withdrawals.lang | 4 ++-- htdocs/product/stock/list.php | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 9b58f1e44c0..c99744f7430 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -112,8 +112,8 @@ if ($resql) print ''; print '
    '; - print ''; - print ''; + print ''; + print ''; print ''; print ''; print '
    '; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 7e0b818279f..10fb995c023 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -122,11 +122,11 @@ if ($result) print '
    '; print ''; - print ''; - print ''; + print ''; + print ''; print ' '; - print ''; - print ''; + print ''; + print ''; print ' '; print ' '; print ''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 64e3e9675dc..23092acfd0d 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -175,7 +175,7 @@ function dol_shutdown() * @param int $method Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie) * @param int $filter Filter to apply when $check is set to custom. (See http://php.net/manual/en/filter.filters.php for détails) * @param mixed $options Options to pass to filter_var when $check is set to custom - * @return string||string[] Value found, or '' if check fails + * @return string||string[] Value found (string or array), or '' if check fails */ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL) { diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index f7f22c69b97..b26326ae5e7 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -79,7 +79,7 @@ function facture_prepare_head($object) if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if ($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; $h++; } @@ -89,7 +89,7 @@ function facture_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id; $head[$h][1] = $langs->trans('Documents'); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index d3dd7c9ca7c..dccee9d0c8e 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -14,8 +14,8 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 85fb7c1896d..c55466ebdb1 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -31,9 +31,9 @@ $langs->load("stocks"); // Security check $result=restrictedArea($user,'stock'); -$sref=GETPOST("sref");; -$snom=GETPOST("snom"); -$sall=GETPOST("sall"); +$sref=GETPOST("sref","alpha"); +$snom=GETPOST("snom","alpha"); +$sall=GETPOST("sall","alpha"); $sortfield = GETPOST("sortfield"); $sortorder = GETPOST("sortorder"); From 2b08417b77eed7591a10f93e66d36753b20f3881 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 01:51:33 +0100 Subject: [PATCH 0357/1190] Fix: [ bug #1612 ] Adding free product line line with negative qty in credit notes, doesn't give error message --- htdocs/comm/propal.php | 116 ++++++++++++++++---------------- htdocs/compta/facture.php | 24 +++++-- htdocs/langs/en_US/bills.lang | 18 ++--- htdocs/langs/en_US/errors.lang | 1 + htdocs/langs/en_US/margins.lang | 4 +- 5 files changed, 89 insertions(+), 74 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 6cd70b273be..5d1db5cf7d1 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -186,7 +186,7 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr } else if ($action == 'setdate' && $user->rights->propal->creer) { - $datep = dol_mktime(12, 0, 0, $_POST ['remonth'], $_POST ['reday'], $_POST ['reyear']); + $datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); if (empty($datep)) { $error ++; @@ -199,18 +199,18 @@ else if ($action == 'setdate' && $user->rights->propal->creer) { dol_print_error($db, $object->error); } } else if ($action == 'setecheance' && $user->rights->propal->creer) { - $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST ['echmonth'], $_POST ['echday'], $_POST ['echyear'])); + $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear'])); if ($result < 0) dol_print_error($db, $object->error); } else if ($action == 'setdate_livraison' && $user->rights->propal->creer) { - $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST ['liv_month'], $_POST ['liv_day'], $_POST ['liv_year'])); + $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year'])); if ($result < 0) dol_print_error($db, $object->error); } // Positionne ref client else if ($action == 'set_ref_client' && $user->rights->propal->creer) { - $object->set_ref_client($user, $_POST ['ref_client']); + $object->set_ref_client($user, $_POST['ref_client']); } // Create proposal @@ -296,11 +296,11 @@ else if ($action == 'add' && $user->rights->propal->creer) { for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++) { - if ($_POST ['idprod' . $i]) { + if ($_POST['idprod' . $i]) { $xid = 'idprod' . $i; $xqty = 'qty' . $i; $xremise = 'remise' . $i; - $object->add_product($_POST [$xid], $_POST [$xqty], $_POST [$xremise]); + $object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]); } } @@ -544,7 +544,7 @@ if (GETPOST('removedfile')) { $upload_dir_tmp = $vardir . '/temp'; // TODO Delete only files that was uploaded from email form - dol_remove_file_process($_POST ['removedfile'], 0); + dol_remove_file_process($_POST['removedfile'], 0); $action = 'presend'; } @@ -555,35 +555,35 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $langs->load('mails'); if ($object->id > 0) { - if ($_POST ['sendto']) { + if ($_POST['sendto']) { // Le destinataire a ete fourni via le champ libre - $sendto = $_POST ['sendto']; + $sendto = $_POST['sendto']; $sendtoid = 0; - } elseif ($_POST ['receiver'] != '-1') { + } elseif ($_POST['receiver'] != '-1') { // Recipient was provided from combo list - if ($_POST ['receiver'] == 'thirdparty') // Id of third party + if ($_POST['receiver'] == 'thirdparty') // Id of third party { $sendto = $object->thirdparty->email; $sendtoid = 0; } else // Id du contact { - $sendto = $object->thirdparty->contact_get_property($_POST ['receiver'], 'email'); - $sendtoid = $_POST ['receiver']; + $sendto = $object->thirdparty->contact_get_property($_POST['receiver'], 'email'); + $sendtoid = $_POST['receiver']; } } if (dol_strlen($sendto)) { $langs->load("commercial"); - $from = $_POST ['fromname'] . ' <' . $_POST ['frommail'] . '>'; - $replyto = $_POST ['replytoname'] . ' <' . $_POST ['replytomail'] . '>'; - $message = $_POST ['message']; - $sendtocc = $_POST ['sendtocc']; + $from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>'; + $replyto = $_POST['replytoname'] . ' <' . $_POST['replytomail'] . '>'; + $message = $_POST['message']; + $sendtocc = $_POST['sendtocc']; $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO); - $deliveryreceipt = $_POST ['deliveryreceipt']; + $deliveryreceipt = $_POST['deliveryreceipt']; - if (dol_strlen($_POST ['subject'])) - $subject = $_POST ['subject']; + if (dol_strlen($_POST['subject'])) + $subject = $_POST['subject']; else $subject = $langs->transnoentities('Propal') . ' ' . $object->ref; $actiontypecode = 'AC_PROP'; @@ -683,9 +683,9 @@ if ($action == 'modif' && $user->rights->propal->creer) } else if ($action == "setabsolutediscount" && $user->rights->propal->creer) { - if ($_POST ["remise_id"]) { + if ($_POST["remise_id"]) { if ($object->id > 0) { - $result = $object->insert_discount($_POST ["remise_id"]); + $result = $object->insert_discount($_POST["remise_id"]); if ($result < 0) { setEventMessage($object->error, 'errors'); } @@ -723,7 +723,7 @@ else if ($action == 'addline' && $user->rights->propal->creer) { if (is_array($extralabelsline)) { // Get extra fields foreach ($extralabelsline as $key => $value) { - unset($_POST ["options_" . $key]); + unset($_POST["options_" . $key]); } } @@ -895,23 +895,23 @@ else if ($action == 'addline' && $user->rights->propal->creer) { $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } - unset($_POST ['prod_entry_mode']); + unset($_POST['prod_entry_mode']); - unset($_POST ['qty']); - unset($_POST ['type']); - unset($_POST ['remise_percent']); - unset($_POST ['price_ht']); - unset($_POST ['price_ttc']); - unset($_POST ['tva_tx']); - unset($_POST ['product_ref']); - unset($_POST ['product_label']); - unset($_POST ['product_desc']); - unset($_POST ['fournprice']); - unset($_POST ['buying_price']); - unset($_POST ['np_marginRate']); - unset($_POST ['np_markRate']); - unset($_POST ['dp_desc']); - unset($_POST ['idprod']); + unset($_POST['qty']); + unset($_POST['type']); + unset($_POST['remise_percent']); + unset($_POST['price_ht']); + unset($_POST['price_ttc']); + unset($_POST['tva_tx']); + unset($_POST['product_ref']); + unset($_POST['product_label']); + unset($_POST['product_desc']); + unset($_POST['fournprice']); + unset($_POST['buying_price']); + unset($_POST['np_marginRate']); + unset($_POST['np_markRate']); + unset($_POST['dp_desc']); + unset($_POST['idprod']); unset($_POST['date_starthour']); unset($_POST['date_startmin']); @@ -966,7 +966,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa if (is_array($extralabelsline)) { // Get extra fields foreach ($extralabelsline as $key => $value) { - unset($_POST ["options_" . $key]); + unset($_POST["options_" . $key]); } } @@ -1023,18 +1023,18 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } - unset($_POST ['qty']); - unset($_POST ['type']); - unset($_POST ['productid']); - unset($_POST ['remise_percent']); - unset($_POST ['price_ht']); - unset($_POST ['price_ttc']); - unset($_POST ['tva_tx']); - unset($_POST ['product_ref']); - unset($_POST ['product_label']); - unset($_POST ['product_desc']); - unset($_POST ['fournprice']); - unset($_POST ['buying_price']); + unset($_POST['qty']); + unset($_POST['type']); + unset($_POST['productid']); + unset($_POST['remise_percent']); + unset($_POST['price_ht']); + unset($_POST['price_ttc']); + unset($_POST['tva_tx']); + unset($_POST['product_ref']); + unset($_POST['product_label']); + unset($_POST['product_desc']); + unset($_POST['fournprice']); + unset($_POST['buying_price']); } else { $db->rollback(); @@ -1091,17 +1091,17 @@ else if ($action == 'remove_file' && $user->rights->propal->creer) { // Set project else if ($action == 'classin' && $user->rights->propal->creer) { - $object->setProject($_POST ['projectid']); + $object->setProject($_POST['projectid']); } // Delai de livraison else if ($action == 'setavailability' && $user->rights->propal->creer) { - $result = $object->availability($_POST ['availability_id']); + $result = $object->availability($_POST['availability_id']); } // Origine de la propale else if ($action == 'setdemandreason' && $user->rights->propal->creer) { - $result = $object->demand_reason($_POST ['demand_reason_id']); + $result = $object->demand_reason($_POST['demand_reason_id']); } // Conditions de reglement @@ -1110,11 +1110,11 @@ else if ($action == 'setconditions' && $user->rights->propal->creer) { } else if ($action == 'setremisepercent' && $user->rights->propal->creer) { - $result = $object->set_remise_percent($user, $_POST ['remise_percent']); + $result = $object->set_remise_percent($user, $_POST['remise_percent']); } else if ($action == 'setremiseabsolue' && $user->rights->propal->creer) { - $result = $object->set_remise_absolue($user, $_POST ['remise_absolue']); + $result = $object->set_remise_absolue($user, $_POST['remise_absolue']); } // Mode de reglement @@ -1206,7 +1206,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal-> { if ($object->id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST ["type"], $_POST ["source"]); + $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); } if ($result >= 0) { diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 27dbcc5c83c..1a67ffb2feb 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1158,7 +1158,11 @@ else if ($action == 'addline' && $user->rights->facture->creer) setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors'); $error ++; } - + if ($qty < 0) { + $langs->load("errors"); + setEventMessage($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), 'errors'); + $error ++; + } if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) { $ret = $object->fetch($id); if ($ret < 0) { @@ -1320,7 +1324,7 @@ else if ($action == 'addline' && $user->rights->facture->creer) $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } - unset($_POST ['prod_entry_mode']); + unset($_POST['prod_entry_mode']); unset($_POST['qty']); unset($_POST['type']); @@ -1359,9 +1363,9 @@ else if ($action == 'addline' && $user->rights->facture->creer) } } -elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('cancel')) { - if (! $object->fetch($id) > 0) - dol_print_error($db); +elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('cancel')) +{ + if (! $object->fetch($id) > 0) dol_print_error($db); $object->fetch_thirdparty(); // Clean parameters @@ -1372,6 +1376,7 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST(' $description = dol_htmlcleanlastbr(GETPOST('product_desc')); $pu_ht = GETPOST('price_ht'); $vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); + $qty = GETPOST('qty'); // Define info_bits $info_bits = 0; @@ -1428,10 +1433,15 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST(' $error ++; } } + if ($qty < 0) { + $langs->load("errors"); + setEventMessage($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), 'errors'); + $error ++; + } // Update line if (! $error) { - $result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option); + $result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option); if ($result >= 0) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { @@ -1463,6 +1473,8 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST(' unset($_POST['product_desc']); unset($_POST['fournprice']); unset($_POST['buying_price']); + unset($_POST['np_marginRate']); + unset($_POST['np_markRate']); } else { setEventMessage($object->error, 'errors'); } diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 177d82ef5b4..5c16e18e4cf 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -156,9 +156,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +191,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index a2757bf5332..0187c567eb6 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index 3fca6d7a644..38b6482a4f3 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -38,4 +38,6 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 From badf3794894bc81f3873fd53ec5f42b4e2751b56 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 01:56:06 +0100 Subject: [PATCH 0358/1190] Fix: [ bug #1618 ] PHP Error thrown when saving a barcode --- ChangeLog | 1 + htdocs/product/fiche.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a1ec979f287..c2ad4b7ecf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ English Dolibarr ChangeLog - Fix: box of customer and propsects were not correctly disabled. - Fix: right and error management #1961 - Fix: Fix Error when trying to clone an Order #1943 +- Fix: [ bug #1618 ] PHP Error thrown when saving a barcode ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 7e5b9b76c78..5498233e5b8 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -124,7 +124,7 @@ if (empty($reshook)) // Barcode value if ($action == 'setbarcode' && $createbarcode) { - $result=$object->check_barcode(GETPOST('barcode'),GETPOT('barcode_type_code')); + $result=$object->check_barcode(GETPOST('barcode'),GETPOST('barcode_type_code')); if ($result >= 0) { From 6f77dc83c414c0219debacb30381cd45093294fb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 03:24:45 +0100 Subject: [PATCH 0359/1190] Qual: Uniformize code and fix a ton of bugs. --- htdocs/comm/propal.php | 45 +++++--- htdocs/comm/propal/class/propal.class.php | 104 ++++++++++-------- htdocs/commande/class/commande.class.php | 52 +++++---- htdocs/compta/facture/class/facture.class.php | 49 +++++---- htdocs/contrat/class/contrat.class.php | 46 ++++---- htdocs/core/lib/files.lib.php | 2 + ...terface_50_modAgenda_ActionsAuto.class.php | 36 +++--- htdocs/expedition/class/expedition.class.php | 38 ++++--- htdocs/fichinter/class/fichinter.class.php | 46 ++++---- .../class/fournisseur.commande.class.php | 47 ++++---- .../fourn/class/fournisseur.facture.class.php | 76 +++++++------ htdocs/livraison/class/livraison.class.php | 81 ++++++++------ 12 files changed, 358 insertions(+), 264 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 5d1db5cf7d1..07cad40be7a 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -111,10 +111,14 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once // Action clone object -if ($action == 'confirm_clone' && $confirm == 'yes') { - if (1 == 0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers')) { +if ($action == 'confirm_clone' && $confirm == 'yes') +{ + if (1 == 0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers')) + { setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors'); - } else { + } + else + { if ($object->id > 0) { $result = $object->createFromClone($socid); if ($result > 0) { @@ -129,7 +133,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes') { } // Delete proposal -else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->propal->supprimer) { +else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->propal->supprimer) +{ $result = $object->delete($user); if ($result > 0) { header('Location: ' . DOL_URL_ROOT . '/comm/propal/list.php'); @@ -141,7 +146,8 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->prop } // Remove line -else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->propal->creer) { +else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->propal->creer) +{ $result = $object->deleteline($lineid); // reorder lines if ($result) @@ -164,13 +170,17 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> } // Validation -else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->propal->valider) { +else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->propal->valider) +{ $result = $object->valid($user); - if ($result >= 0) { - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + if ($result >= 0) + { + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { // Define output language $outputlangs = $langs; - if (! empty($conf->global->MAIN_MULTILANGS)) { + if (! empty($conf->global->MAIN_MULTILANGS)) + { $outputlangs = new Translate("", $conf); $newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang); $outputlangs->setDefaultLang($newlang); @@ -185,7 +195,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr } } -else if ($action == 'setdate' && $user->rights->propal->creer) { +else if ($action == 'setdate' && $user->rights->propal->creer) +{ $datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); if (empty($datep)) { @@ -198,23 +209,29 @@ else if ($action == 'setdate' && $user->rights->propal->creer) { if ($result < 0) dol_print_error($db, $object->error); } -} else if ($action == 'setecheance' && $user->rights->propal->creer) { +} +else if ($action == 'setecheance' && $user->rights->propal->creer) +{ $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear'])); if ($result < 0) dol_print_error($db, $object->error); -} else if ($action == 'setdate_livraison' && $user->rights->propal->creer) { +} +else if ($action == 'setdate_livraison' && $user->rights->propal->creer) +{ $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year'])); if ($result < 0) dol_print_error($db, $object->error); } // Positionne ref client -else if ($action == 'set_ref_client' && $user->rights->propal->creer) { +else if ($action == 'set_ref_client' && $user->rights->propal->creer) +{ $object->set_ref_client($user, $_POST['ref_client']); } // Create proposal -else if ($action == 'add' && $user->rights->propal->creer) { +else if ($action == 'add' && $user->rights->propal->creer) +{ $object->socid = $socid; $object->fetch_thirdparty(); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index cdd5618c6b7..c056e5aa1c5 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1326,67 +1326,77 @@ class Propal extends CommonObject { $num = $this->ref; } + $this->newref = $num; $sql = "UPDATE ".MAIN_DB_PREFIX."propal"; $sql.= " SET ref = '".$num."',"; $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id; $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; - dol_syslog(get_class($this).'::valid', LOG_DEBUG); - if ($this->db->query($sql)) + dol_syslog(get_class($this)."::valid", LOG_DEBUG); + $resql=$this->db->query($sql); + if (! $resql) + { + dol_print_error($this->db); + $error++; + } + + // Trigger calls + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('PROPAL_VALIDATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } + + if (! $error) { - if (! $notrigger) - { - // Call trigger - $result=$this->call_trigger('PROPAL_VALIDATE',$user); - if ($result < 0) { $error++; } - // End call triggers - } + $this->oldref = $this->ref; - if (! $error) - { - // Rename directory if dir was a temporary ref - if (preg_match('/^[\(]?PROV/i', $this->ref)) - { - // Rename of propal directory ($this->ref = old ref, $num = new ref) - // to not lose the linked files - $oldref = dol_sanitizeFileName($this->ref); - $newref = dol_sanitizeFileName($num); - $dirsource = $conf->propal->dir_output.'/'.$oldref; - $dirdest = $conf->propal->dir_output.'/'.$newref; - if (file_exists($dirsource)) - { - dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); + // Rename directory if dir was a temporary ref + if (preg_match('/^[\(]?PROV/i', $this->ref)) + { + // Rename of propal directory ($this->ref = old ref, $num = new ref) + // to not lose the linked files + $oldref = dol_sanitizeFileName($this->ref); + $newref = dol_sanitizeFileName($num); + $dirsource = $conf->propal->dir_output.'/'.$oldref; + $dirdest = $conf->propal->dir_output.'/'.$newref; - if (@rename($dirsource, $dirdest)) - { + if (file_exists($dirsource)) + { + dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); + if (@rename($dirsource, $dirdest)) + { + dol_syslog("Rename ok"); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->propal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } + } + } + } - dol_syslog("Rename ok"); - // Deleting old PDF in new rep - dol_delete_file($conf->propal->dir_output.'/'.$newref.'/'.$oldref.'*.*'); - } - } - } + $this->ref=$num; + $this->brouillon=0; + $this->statut = 1; + $this->user_valid_id=$user->id; + $this->datev=$now; - $this->ref=$num; - $this->brouillon=0; - $this->statut = 1; - $this->user_valid_id=$user->id; - $this->datev=$now; - - $this->db->commit(); - return 1; - } - else - { - $this->db->rollback(); - return -2; - } + $this->db->commit(); + return 1; } else { - $this->db->rollback(); - return -1; + $this->db->rollback(); + return -1; } } } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 6db8af5c2db..ce3ec431180 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -183,9 +183,10 @@ class Commande extends CommonOrder * * @param User $user User making status change * @param int $idwarehouse Id of warehouse to use for stock decrease + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <=0 if OK, >0 if KO */ - function valid($user, $idwarehouse=0) + function valid($user, $idwarehouse=0, $notrigger=0) { global $conf,$langs; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -223,9 +224,10 @@ class Commande extends CommonOrder $num = $this->getNextNumRef($soc); } else - { + { $num = $this->ref; } + $this->newref = $num; // Validate $sql = "UPDATE ".MAIN_DB_PREFIX."commande"; @@ -273,43 +275,49 @@ class Commande extends CommonOrder } } + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('ORDER_VALIDATE',$user); + if ($result < 0) $error++; + // End call triggers + } + if (! $error) { - $this->oldref=''; + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) { - // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) + // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) // in order not to lose the attachments - $comref = dol_sanitizeFileName($this->ref); - $snum = dol_sanitizeFileName($num); - $dirsource = $conf->commande->dir_output.'/'.$comref; - $dirdest = $conf->commande->dir_output.'/'.$snum; + $oldref = dol_sanitizeFileName($this->ref); + $newref = dol_sanitizeFileName($num); + $dirsource = $conf->commande->dir_output.'/'.$oldref; + $dirdest = $conf->commande->dir_output.'/'.$newref; if (file_exists($dirsource)) { dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest); if (@rename($dirsource, $dirdest)) { - $this->oldref = $comref; - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($conf->commande->dir_output.'/'.$snum.'/'.$comref.'*.*'); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->commande->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } } - if (! $error) - { - // Call trigger - $result=$this->call_trigger('ORDER_VALIDATE',$user); - if ($result < 0) $error++; - // End call triggers - } - // Set new ref and current status if (! $error) { @@ -323,7 +331,7 @@ class Commande extends CommonOrder return 1; } else - { + { $this->db->rollback(); return -1; } @@ -904,7 +912,7 @@ class Commande extends CommonOrder $modCommande = new $obj; $this->ref = $modCommande->getNextValue($objsoc,$this); - + // Create clone $result=$this->create($user); if ($result < 0) $error++; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index e07881d73db..605d4920669 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1589,9 +1589,10 @@ class Facture extends CommonInvoice * @param User $user Object user that validate * @param string $force_number Reference to force on invoice * @param int $idwarehouse Id of warehouse to use for stock decrease - * @return int <0 if KO, >0 if OK + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers + * @return int <0 if KO, >0 if OK */ - function validate($user, $force_number='', $idwarehouse=0) + function validate($user, $force_number='', $idwarehouse=0, $notrigger=0) { global $conf,$langs; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -1679,6 +1680,7 @@ class Facture extends CommonInvoice { $num = $this->ref; } + $this->newref = $num; if ($num) { @@ -1738,45 +1740,50 @@ class Facture extends CommonInvoice } } + // Trigger calls + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('BILL_VALIDATE',$user); + if ($result < 0) $error++; + // End call triggers + } + if (! $error) { - $this->oldref = ''; + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) { // Rename of object directory ($this->ref = old ref, $num = new ref) // to not lose the linked files - $facref = dol_sanitizeFileName($this->ref); - $snumfa = dol_sanitizeFileName($num); - $dirsource = $conf->facture->dir_output.'/'.$facref; - $dirdest = $conf->facture->dir_output.'/'.$snumfa; + $oldref = dol_sanitizeFileName($this->ref); + $newref = dol_sanitizeFileName($num); + $dirsource = $conf->facture->dir_output.'/'.$oldref; + $dirdest = $conf->facture->dir_output.'/'.$newref; if (file_exists($dirsource)) { dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); if (@rename($dirsource, $dirdest)) { - $this->oldref = $facref; - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($conf->facture->dir_output.'/'.$snumfa.'/'.$facref.'*.*'); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } } - // Trigger calls - if (! $error) - { - // Call trigger - $result=$this->call_trigger('BILL_VALIDATE',$user); - if ($result < 0) $error++; - //TODO: Restoring ref, facnumber, statut, brouillon to previous value if trigger fail - // End call triggers - } - // Set new ref and define current statut if (! $error) { diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 998ffada993..5626719d96d 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -278,9 +278,10 @@ class Contrat extends CommonObject * * @param User $user Objet User * @param string $force_number Reference to force on contract (not implemented yet) + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 if KO, >0 if OK */ - function validate($user, $force_number='') + function validate($user, $force_number='', $notrigger=0) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; global $langs, $conf; @@ -307,6 +308,7 @@ class Contrat extends CommonObject { $num = $this->ref; } + $this->newref = $num; if ($num) { @@ -323,30 +325,45 @@ class Contrat extends CommonObject $this->error=$this->db->lasterror(); } + // Trigger calls + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('CONTRACT_VALIDATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } + if (! $error) { - $this->oldref = ''; + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) { // Rename of object directory ($this->ref = old ref, $num = new ref) // to not lose the linked files - $facref = dol_sanitizeFileName($this->ref); - $snumfa = dol_sanitizeFileName($num); - $dirsource = $conf->contract->dir_output.'/'.$facref; - $dirdest = $conf->contract->dir_output.'/'.$snumfa; + $oldref = dol_sanitizeFileName($this->ref); + $newref = dol_sanitizeFileName($num); + $dirsource = $conf->contract->dir_output.'/'.$oldref; + $dirdest = $conf->contract->dir_output.'/'.$newref; if (file_exists($dirsource)) { dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); if (@rename($dirsource, $dirdest)) { - $this->oldref = $facref; - dol_syslog("Rename ok"); - // Deleting old PDF in new rep - dol_delete_file($conf->contract->dir_output.'/'.$snumfa.'/'.$facref.'*.*'); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } @@ -360,15 +377,6 @@ class Contrat extends CommonObject $this->brouillon=0; $this->date_validation=$now; } - - // Trigger calls - if (! $error) - { - // Call trigger - $result=$this->call_trigger('CONTRACT_VALIDATE',$user); - if ($result < 0) { $error++; } - // End call triggers - } } else { diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index f85d1c8f4af..4b9e7eb520f 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -139,6 +139,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil $level1name=(isset($reg[1])?$reg[1]:''); $file_list[] = array( "name" => $file, + "path" => $path, "level1name" => $level1name, "fullname" => $path.'/'.$file, "date" => $filedate, @@ -166,6 +167,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil $level1name=(isset($reg[1])?$reg[1]:''); $file_list[] = array( "name" => $file, + "path" => $path, "level1name" => $level1name, "fullname" => $path.'/'.$file, "date" => $filedate, diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index ffe539ff241..632acf71b0e 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -106,8 +106,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("contracts"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; $object->sendtoid=0; @@ -117,8 +117,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("propal"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; $object->sendtoid=0; @@ -165,8 +165,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("orders"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; $object->sendtoid=0; @@ -192,8 +192,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("bills"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; $object->sendtoid=0; @@ -271,8 +271,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("interventions"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; $object->sendtoid=0; @@ -337,10 +337,10 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("sendings"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref)); if (empty($object->actionmsg)) { - $object->actionmsg=$langs->transnoentities("ShippingValidated",$object->ref); + $object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; } @@ -368,8 +368,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("orders"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; $object->sendtoid=0; @@ -419,8 +419,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("bills"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; $object->sendtoid=0; @@ -474,8 +474,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("members"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); + $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref)); $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type; $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index c3d3d193bca..bb34f480d97 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -503,9 +503,10 @@ class Expedition extends CommonObject * Validate object and update stock if option enabled * * @param User $user Object user that validate + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 if OK, >0 if KO */ - function valid($user) + function valid($user, $notrigger=0) { global $conf, $langs; @@ -547,6 +548,7 @@ class Expedition extends CommonObject { $numref = "EXP".$this->id; } + $this->newref = $numref; $now=dol_now(); @@ -617,9 +619,17 @@ class Expedition extends CommonObject } } + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('SHIPPING_VALIDATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } + if (! $error) { - $this->oldref=''; + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) @@ -636,11 +646,17 @@ class Expedition extends CommonObject if (@rename($dirsource, $dirdest)) { - $this->oldref = $oldref; - - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($dirdest.'/'.$oldref.'*.*'); + dol_syslog("Rename ok"); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } @@ -653,14 +669,6 @@ class Expedition extends CommonObject $this->statut = 1; } - if (! $error) - { - // Call trigger - $result=$this->call_trigger('SHIPPING_VALIDATE',$user); - if ($result < 0) { $error++; } - // End call triggers - } - if (! $error) { $this->db->commit(); diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 783024df800..bc12821530f 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -374,9 +374,10 @@ class Fichinter extends CommonObject * Validate a intervention * * @param User $user User that validate - * @return int <0 if KO, >0 if OK + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers + * @return int <0 if KO, >0 if OK */ - function setValid($user) + function setValid($user, $notrigger=0) { global $conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -398,6 +399,7 @@ class Fichinter extends CommonObject { $num = $this->ref; } + $this->newref = $num; $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter"; $sql.= " SET fk_statut = 1"; @@ -416,9 +418,17 @@ class Fichinter extends CommonObject $error++; } + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('FICHINTER_VALIDATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } + if (! $error) { - $this->oldref = ''; + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) @@ -426,20 +436,26 @@ class Fichinter extends CommonObject // Rename of object directory ($this->ref = old ref, $num = new ref) // to not lose the linked files $oldref = dol_sanitizeFileName($this->ref); - $snum = dol_sanitizeFileName($num); + $newref = dol_sanitizeFileName($num); $dirsource = $conf->ficheinter->dir_output.'/'.$oldref; - $dirdest = $conf->ficheinter->dir_output.'/'.$snum; + $dirdest = $conf->ficheinter->dir_output.'/'.$newref; if (file_exists($dirsource)) { - dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); + dol_syslog(get_class($this)."::setValid rename dir ".$dirsource." into ".$dirdest); if (@rename($dirsource, $dirdest)) { - $this->oldref = $oldref; - - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($conf->ficheinter->dir_output.'/'.$snum.'/'.$oldref.'*.*'); + dol_syslog("Rename ok"); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } @@ -454,14 +470,6 @@ class Fichinter extends CommonObject $this->date_validation=$now; } - if (! $error) - { - // Call trigger - $result=$this->call_trigger('FICHINTER_VALIDATE',$user); - if ($result < 0) { $error++; } - // End call triggers - } - if (! $error) { $this->db->commit(); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 7983060490d..d5f4f400d5a 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -317,9 +317,10 @@ class CommandeFournisseur extends CommonOrder * * @param User $user Validator User * @param int $idwarehouse Id of warehouse to use for stock decrease + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 if KO, >0 if OK */ - function valid($user,$idwarehouse=0) + function valid($user,$idwarehouse=0,$notrigger=0) { global $langs,$conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -342,12 +343,13 @@ class CommandeFournisseur extends CommonOrder $num = $this->getNextNumRef($soc); } else - { + { $num = $this->ref; } + $this->newref = $num; $sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur"; - $sql.= " SET ref='".$num."',"; + $sql.= " SET ref='".$this->db->escape($num)."',"; $sql.= " fk_statut = 1,"; $sql.= " date_valid='".$this->db->idate(dol_now())."',"; $sql.= " fk_user_valid = ".$user->id; @@ -361,9 +363,17 @@ class CommandeFournisseur extends CommonOrder $error++; } + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('ORDER_SUPPLIER_VALIDATE',$user); + if ($result < 0) $error++; + // End call triggers + } + if (! $error) { - $this->oldref=''; + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) @@ -380,11 +390,17 @@ class CommandeFournisseur extends CommonOrder if (@rename($dirsource, $dirdest)) { - $this->oldref = $oldref; - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($dirdest.'/'.$oldref.'*.*'); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->fournisseur->dir_output.'/commande/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } @@ -397,18 +413,6 @@ class CommandeFournisseur extends CommonOrder $this->ref = $num; } - if (! $error) - { - // Call trigger - $result=$this->call_trigger('ORDER_SUPPLIER_VALIDATE',$user); - if ($result < 0) - { - $this->db->rollback(); - return -1; - } - // End call triggers - } - if (! $error) { $this->db->commit(); @@ -619,9 +623,10 @@ class CommandeFournisseur extends CommonOrder $num = $this->getNextNumRef($soc); } else - { + { $num = $this->ref; } + $this->newref = $num; $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur"; $sql.= " SET ref='".$this->db->escape($num)."',"; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 9c72319f74f..988ee0b6a96 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -257,7 +257,7 @@ class FactureFournisseur extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_SUPPLIER_CREATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers if (! $error) @@ -413,7 +413,7 @@ class FactureFournisseur extends CommonInvoice $this->socid = $obj->socid; $this->socnom = $obj->socnom; - + // Retreive all extrafield // fetch optionals attributes and labels require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); @@ -611,7 +611,7 @@ class FactureFournisseur extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_SUPPLIER_UPDATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } } @@ -682,9 +682,9 @@ class FactureFournisseur extends CommonInvoice // Call trigger $result=$this->call_trigger('BILL_SUPPLIER_DELETE',$user); if ($result < 0) - { + { $this->db->rollback(); - return -1; + return -1; } // Fin appel triggers } @@ -776,7 +776,7 @@ class FactureFournisseur extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_SUPPLIER_PAYED',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } else @@ -824,7 +824,7 @@ class FactureFournisseur extends CommonInvoice { // Call trigger $result=$this->call_trigger('BILL_SUPPLIER_UNPAYED',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } else @@ -852,9 +852,10 @@ class FactureFournisseur extends CommonInvoice * @param User $user Object user that validate * @param string $force_number Reference to force on invoice * @param int $idwarehouse Id of warehouse for stock change + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 if KO, =0 if nothing to do, >0 if OK */ - function validate($user, $force_number='', $idwarehouse=0) + function validate($user, $force_number='', $idwarehouse=0, $notrigger=0) { global $conf,$langs; @@ -886,9 +887,10 @@ class FactureFournisseur extends CommonInvoice $num = $this->getNextNumRef($this->client); } else - { + { $num = $this->ref; } + $this->newref = $num; $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn"; $sql.= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id; @@ -920,31 +922,46 @@ class FactureFournisseur extends CommonInvoice } } + // Triggers call + if (! $error && $notrigger) + { + // Call trigger + $result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user); + if ($result < 0) $error++; + // End call triggers + } + if (! $error) { - $this->oldref = ''; + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) { // On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref) // in order not to lose the attached files - $facref = dol_sanitizeFileName($this->ref); - $snumfa = dol_sanitizeFileName($num); + $oldref = dol_sanitizeFileName($this->ref); + $newref = dol_sanitizeFileName($num); - $dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$facref; - $dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$snumfa; + $dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$oldref; + $dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$newref; if (file_exists($dirsource)) { dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); if (@rename($dirsource, $dirdest)) { - $this->oldref = $facref; - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$snumfa.'/'.$facref.'*.*'); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } @@ -958,15 +975,6 @@ class FactureFournisseur extends CommonInvoice //$this->date_validation=$now; this is stored into log table } - // Triggers call - if (! $error) - { - // Call trigger - $result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user); - if ($result < 0) $error++; - // End call triggers - } - if (! $error) { $this->db->commit(); @@ -1128,8 +1136,8 @@ class FactureFournisseur extends CommonInvoice global $conf, $langs, $user; // Call trigger $result=$this->call_trigger('LINEBILL_SUPPLIER_CREATE',$user); - if ($result < 0) - { + if ($result < 0) + { $this->db->rollback(); return -1; } @@ -1224,7 +1232,7 @@ class FactureFournisseur extends CommonInvoice } $this->db->begin(); - + $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET"; $sql.= " description ='".$this->db->escape($desc)."'"; $sql.= ", pu_ht = ".price2num($pu_ht); @@ -1258,8 +1266,8 @@ class FactureFournisseur extends CommonInvoice global $conf, $langs, $user; // Call trigger $result=$this->call_trigger('LINEBILL_SUPPLIER_UPDATE',$user); - if ($result < 0) - { + if ($result < 0) + { $this->db->rollback(); return -1; } @@ -1270,7 +1278,7 @@ class FactureFournisseur extends CommonInvoice $result=$this->update_price('','auto'); $this->db->commit(); - + return $result; } else @@ -1303,7 +1311,7 @@ class FactureFournisseur extends CommonInvoice { // Call trigger $result=$this->call_trigger('LINEBILL_SUPPLIER_DELETE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index ebe46c78ac3..e95fac9f639 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -359,18 +359,21 @@ class Livraison extends CommonObject $soc = new Societe($this->db); $soc->fetch($this->socid); - // on verifie si le bon de livraison est en numerotation provisoire - $livref = substr($this->ref, 1, 4); - if ($livref == 'PROV') + if (preg_match('/^[\(]?PROV/i', $this->ref)) + { + $numref = $objMod->livraison_get_num($soc,$this); + } + else { - $numref = $objMod->livraison_get_num($soc,$this); - } + $numref = $this->ref; + } + $this->newref = $numref; // Tester si non deja au statut valide. Si oui, on arrete afin d'eviter // de decrementer 2 fois le stock. $sql = "SELECT ref"; $sql.= " FROM ".MAIN_DB_PREFIX."livraison"; - $sql.= " WHERE ref = '".$numref."'"; + $sql.= " WHERE ref = '".$this->db->escape($numref)."'"; $sql.= " AND fk_statut <> 0"; $sql.= " AND entity = ".$conf->entity; @@ -393,10 +396,24 @@ class Livraison extends CommonObject $sql.= " AND fk_statut = 0"; $resql=$this->db->query($sql); - if ($resql) - { + if (! $resql) + { + dol_print_error($this->db); + $this->error=$this->db->lasterror(); + $error++; + } - $this->oldref=''; + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('DELIVERY_VALIDATE',$user); + if ($result < 0) $error++; + // End call triggers + } + + if (! $error) + { + $this->oldref = $this->ref; // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) @@ -413,11 +430,17 @@ class Livraison extends CommonObject if (@rename($dirsource, $dirdest)) { - $this->oldref = $oldref; - - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($dirdest.'/'.$oldref.'*.*'); + dol_syslog("Rename ok"); + // Rename docs starting with $oldref with $newref + $listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + foreach($listoffiles as $fileentry) + { + $dirsource=$fileentry['name']; + $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource); + $dirsource=$fileentry['path'].'/'.$dirsource; + $dirdest=$fileentry['path'].'/'.$dirdest; + @rename($dirsource, $dirdest); + } } } } @@ -431,12 +454,17 @@ class Livraison extends CommonObject dol_syslog(get_class($this)."::valid ok"); } - else + + if (! $error) + { + $this->db->commit(); + return 1; + } + else { - $this->db->rollback(); - $this->error=$this->db->error()." - sql=$sql"; - return -1; - } + $this->db->rollback(); + return -1; + } } } } @@ -446,21 +474,6 @@ class Livraison extends CommonObject dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR); return -1; } - - // Call trigger - $result=$this->call_trigger('DELIVERY_VALIDATE',$user); - // End call triggers - if ($result < 0) - { - $this->db->rollback(); - dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR); - return -1; - } - else - { - $this->db->commit(); - return 1; - } } /** From efd99a6f44003a6f8d353b2e318572cb20b0e8bc Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 27 Oct 2014 10:20:35 +0100 Subject: [PATCH 0360/1190] Fix : extrafield errors --- htdocs/core/tpl/extrafields_view.tpl.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index 1591ce9fb6d..d344ef5eb82 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -48,7 +48,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print 'attribute_required [$key])) print ' class="fieldrequired"'; print '>' . $label . ''; - if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key]) && $user->rights->propal->creer && ($action != 'edit_extras' || GETPOST('attribute') != $key)) + if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key]) && $user->rights->{$object->element}->creer && ($action != 'edit_extras' || GETPOST('attribute') != $key)) print ''; print '
    ' . img_edit().'
    '; @@ -59,9 +59,9 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]); } - if ($action == 'edit_extras' && $user->rights->propal->creer && GETPOST('attribute') == $key) + if ($action == 'edit_extras' && $user->rights->{$object->element}->creer && GETPOST('attribute') == $key) { - print ''; + print ''; print ''; print ''; print ''; From 42008fcf98d7fa90dc685fad4fe3a50be637f588 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 27 Oct 2014 10:22:21 +0100 Subject: [PATCH 0361/1190] Fix : remove associated users when company is deleted --- htdocs/societe/class/societe.class.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 6d80189c7be..54e0edbf76a 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1316,6 +1316,19 @@ class Societe extends CommonObject } } + // Remove associated users + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_commerciaux"; + $sql.= " WHERE fk_soc = " . $id; + dol_syslog(get_class($this)."::Delete", LOG_DEBUG); + if (! $this->db->query($sql)) + { + $error++; + $this->error = $this->db->lasterror(); + } + } + // Removed extrafields if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used { From a5739c248ecdf19af7098582ba21641a8c8abd09 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 27 Oct 2014 10:23:33 +0100 Subject: [PATCH 0362/1190] Fix : Product supplier prices were not working anymore due to bad SQL --- htdocs/fourn/class/fournisseur.product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index eff9e7e4275..75ac674e877 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -467,7 +467,7 @@ class ProductFournisseur extends Product $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,"; $sql.= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,"; - $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges"; + $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, "; $sql.= " pfp.remise, pfp.remise_percent"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; From eebf107d5fb984ca92906706495771c8b5f22ead Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Mon, 27 Oct 2014 10:54:50 +0100 Subject: [PATCH 0363/1190] includes and show_documents --- htdocs/comm/action/card.php | 50 ++++++++++++++++++----- htdocs/core/class/html.formfile.class.php | 7 ++++ 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 607f8e14c4e..33e470d1445 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -28,19 +28,20 @@ */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; -require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; +dol_include_once('/core/lib/agenda.lib.php'); +dol_include_once('/core/lib/date.lib.php'); +dol_include_once('/contact/class/contact.class.php'); +dol_include_once('/user/class/user.class.php'); +dol_include_once('/comm/action/class/cactioncomm.class.php'); +dol_include_once('/comm/action/class/actioncomm.class.php'); +dol_include_once('/core/class/html.formactions.class.php'); +dol_include_once('/core/class/html.formfile.class.php'); if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; + dol_include_once('/projet/class/project.class.php'); + dol_include_once('/core/class/html.formprojet.class.php'); } -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +dol_include_once('/core/class/extrafields.class.php'); $langs->load("companies"); $langs->load("commercial"); @@ -74,6 +75,7 @@ $cactioncomm = new CActionComm($db); $object = new ActionComm($db); $contact = new Contact($db); $extrafields = new ExtraFields($db); +$formfile = new FormFile($db); // fetch optionals attributes and labels $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); @@ -1243,6 +1245,34 @@ if ($id > 0) if ($action != 'edit') { + + if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) { + print '
    '; + print ''; // ancre + + /* + * Documents generes + */ + + $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id; + $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id; + + $genallowed=$user->rights->agenda->myactions->create; + $delallowed=$user->rights->agenda->myactions->delete; + + $var=true; + + $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang); + + print '
    '; + + + print '
    '; + + print '
     
    '; + } + + // Link to agenda views print '
    '; print ''; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 674be61311d..2e316841696 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -301,6 +301,12 @@ class FormFile $modellist=ModeleThirdPartyDoc::liste_modeles($this->db); } } + + else if ($modulepart == 'agenda') + { + null; + } + else if ($modulepart == 'propal') { if (is_array($genallowed)) $modellist=$genallowed; @@ -433,6 +439,7 @@ class FormFile } else { + // For normalized standard modules $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0); if (file_exists($file)) From fda32f663886c1dbb47f49a27c0d0bd59039af06 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 27 Oct 2014 11:16:18 +0100 Subject: [PATCH 0364/1190] FixDosFiles --- htdocs/contact/card.php | 4 +-- htdocs/core/lib/company.lib.php | 36 ++++++++++++------------ htdocs/projet/tasks/time.php | 50 ++++++++++++++++----------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 1ba775268a1..db83554c7ae 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -243,12 +243,12 @@ if (empty($reshook)) { if ($backtopage) { - header("Location: ".$backtopage); + header("Location: ".$backtopage); exit; } else { - header("Location: ".DOL_URL_ROOT.'/contact/list.php'); + header("Location: ".DOL_URL_ROOT.'/contact/list.php'); exit; } } diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index c5ba612b60f..3dcfaff48ee 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -110,24 +110,24 @@ function societe_prepare_head($object) if (! empty($conf->notification->enabled)) { $nbNote = 0; - $sql = "SELECT COUNT(n.rowid) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; - $sql.= " WHERE fk_soc = ".$object->id; - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($resql); - $nbNote=$obj->nb; - $i++; - } - } - else { - dol_print_error($db); - } + $sql = "SELECT COUNT(n.rowid) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; + $sql.= " WHERE fk_soc = ".$object->id; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($resql); + $nbNote=$obj->nb; + $i++; + } + } + else { + dol_print_error($db); + } $head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id; $head[$h][1] = $langs->trans("Notifications"); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 13b1e48f477..676b17a5951 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -292,37 +292,37 @@ if ($id > 0 || ! empty($ref)) // Label print ''.$langs->trans("Label").''.$object->label.''; - // Date start - print ''.$langs->trans("DateStart").''; - print dol_print_date($object->date_start,'dayhour'); - print ''; - - // Date end - print ''.$langs->trans("DateEnd").''; - print dol_print_date($object->date_end,'dayhour'); - print ''; - - // Planned workload - print ''.$langs->trans("PlannedWorkload").''; - print convertSecondToTime($object->planned_workload,'allhourmin'); - print ''; - - // Progress declared - print ''.$langs->trans("ProgressDeclared").''; - print $object->progress.' %'; - print ''; - - // Progress calculated + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($object->date_start,'dayhour'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($object->date_end,'dayhour'); + print ''; + + // Planned workload + print ''.$langs->trans("PlannedWorkload").''; + print convertSecondToTime($object->planned_workload,'allhourmin'); + print ''; + + // Progress declared + print ''.$langs->trans("ProgressDeclared").''; + print $object->progress.' %'; + print ''; + + // Progress calculated print ''.$langs->trans("ProgressCalculated").''; if ($object->planned_workload) { - $tmparray=$object->getSummaryOfTimeSpent(); + $tmparray=$object->getSummaryOfTimeSpent(); if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %'; else print '0 %'; } - else print ''; - print ''; - + else print ''; + print ''; + // Project if (empty($withproject)) { From dd20d040022211c2e19ee5a86c16053590dd7711 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 12:59:19 +0100 Subject: [PATCH 0365/1190] Fix: Must use active tag of vat, not county table. --- htdocs/cashdesk/affContenu.php | 3 +++ htdocs/cashdesk/facturation.php | 4 ++-- htdocs/cashdesk/tpl/facturation1.tpl.php | 11 +++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index 543006baedf..08326e687e8 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -43,6 +43,9 @@ else $obj_facturation = new Facturation(); } + + +// Right area with selected articles (shopping cart) print '
    '; require ('tpl/liste_articles.tpl.php'); diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php index a168fba5b7b..dd722805eb6 100644 --- a/htdocs/cashdesk/facturation.php +++ b/htdocs/cashdesk/facturation.php @@ -158,9 +158,9 @@ $sql = "SELECT t.rowid, t.taux"; $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t"; $sql.= ", ".MAIN_DB_PREFIX."c_country as c"; $sql.= " WHERE t.fk_pays = c.rowid"; -$sql.= " AND c.active = 1"; +$sql.= " AND t.active = 1"; $sql.= " AND c.code = '".$mysoc->country_code."'"; -//print $request; +//print $sql; $resql = $db->query($sql); if ($resql) diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 1a009fcead0..f2258c6473e 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -111,8 +111,9 @@ $langs->load("cashdesk"); - - + + + currency; ?> @@ -122,9 +123,9 @@ $langs->load("cashdesk"); currency; ?> + From 31d8f792e53c70d763eff193fad0d5962521bafb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 13:21:33 +0100 Subject: [PATCH 0366/1190] Better responsive design POS --- htdocs/cashdesk/affContenu.php | 25 +++++++++++++++---------- htdocs/cashdesk/css/style.css | 27 ++++++++++++++------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index 08326e687e8..9940e70cc93 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -45,16 +45,7 @@ else -// Right area with selected articles (shopping cart) -print '
    '; - -require ('tpl/liste_articles.tpl.php'); - -$obj_facturation->prixTotalHt($lst_total_ht); -$obj_facturation->prixTotalTtc($lst_total_ttc); - -print '
    '; - +// Left area with selected articles (shopping cart) print '
    '; $page=GETPOST('menu','alpha'); @@ -78,4 +69,18 @@ else print '
    '; + + + + +// Right area with selected articles (shopping cart) +print '
    '; + +require ('tpl/liste_articles.tpl.php'); +$obj_facturation->prixTotalHt($lst_total_ht); +$obj_facturation->prixTotalTtc($lst_total_ttc); + +print '
    '; + + $_SESSION['serObjFacturation'] = serialize($obj_facturation); diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c71dd9b78bc..0972527a73b 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -30,23 +30,24 @@ p { .conteneur { background: #fff; text-align: left; - width: 770px; + max-width: 770px; margin: 10px auto; + border: 2px solid #000; } .conteneur_img_gauche { - background: url("../img/bg_conteneur_gauche.png") top left repeat-y; + /* background: url("../img/bg_conteneur_gauche.png") top left repeat-y; */ } .conteneur_img_droite { - background: url("../img/bg_conteneur_droite.png") top right repeat-y; + /* background: url("../img/bg_conteneur_droite.png") top right repeat-y; */ } /* ------------------- Header ------------------- */ .entete { height: 15px; margin: 0; - background: url('../img/bg_entete.png') no-repeat left top; + /* background: url('../img/bg_entete.png') no-repeat left top; */ } .entete span { @@ -57,7 +58,6 @@ p { .menu_principal { margin: 0 20px 20px 15px; font-size: 14px; - width: 735px; height: 84px; background: #CCCCCC; background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%); @@ -80,20 +80,21 @@ p { .menu li { float: left; + padding-right: 10px; } .menu_choix1,.menu_choix2 { font-size: 1.4em; text-align: left; - width: 180px; } .menu_choix1 a,.menu_choix2 a { display: block; color: #fff; text-decoration: none; - width: 100px; + padding-top: 18px; padding-left: 54px; + font-size: 14px; height: 48px; background: url('../img/new.png') top left no-repeat; } @@ -115,7 +116,6 @@ p { text-align: right; font-style: italic; font-weight: normal; - width: 340px; display: block; color: #333; text-decoration: none; @@ -126,11 +126,13 @@ p { font-weight: normal; text-decoration: none; } - +li.menu_choix0 { + float: right; +} /* ------------------- R�capitulatif des articles ------------------- */ .liste_articles { - width: 215px; + min-width: 215px; float: right; margin-top: 8px; margin-right: 20px; @@ -219,7 +221,7 @@ p.titre { float: left; margin: 0 15px; padding: 0; - width: 495px; + max-width: 500px; } .titre1 { @@ -237,7 +239,6 @@ p.titre { .cadre_facturation { border: 2px solid #ddd; margin-bottom: 15px; - padding: 10px 10px; } .principal p { @@ -374,7 +375,7 @@ p.titre { .pied { clear: both; height: 15px; - background: url('../img/bg_pied.png') no-repeat bottom left; + /* background: url('../img/bg_pied.png') no-repeat bottom left; */ } /* ------------------- Param�tres communs (messages d'erreur, informations, etc...) ------------------- */ From 8b179c0d2a4402a275d2337f69d126594fd07d66 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 27 Oct 2014 14:02:37 +0100 Subject: [PATCH 0367/1190] Fix : typo --- htdocs/contrat/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index af5f83cdbde..5e9179f342f 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -938,7 +938,7 @@ if ($action == 'create') // Ref Int print ''.$langs->trans('RefCustomer').''; - print ''; + print ''; // Customer print ''; From 0775744b3773f710fa0083c8586187071ce87734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 27 Oct 2014 18:27:46 +0100 Subject: [PATCH 0368/1190] No thirdparty name in contract list --- htdocs/contrat/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index d89c4c144c3..dcc1b83e6d8 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -74,7 +74,7 @@ $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,'; $sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; $sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,"; -$sql.= " s.nom, s.rowid as socid"; +$sql.= " s.nom as name, s.rowid as socid"; $sql.= " ,c.ref_supplier"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; From 132ddf65d6451fc8dd2035981087e5c21c88fb92 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 19:37:30 +0100 Subject: [PATCH 0369/1190] Fix: several bugs into document generation (default must be used in priority when not template defined). Fix: use first odt file when no odt file defined. Fix: Must use output translation. --- htdocs/comm/propal.php | 55 +++++++++------ htdocs/commande/card.php | 59 ++++++++-------- htdocs/compta/facture.php | 75 ++++++++++++--------- htdocs/contrat/card.php | 33 +++++---- htdocs/core/lib/functions2.lib.php | 1 + htdocs/expedition/card.php | 39 ++++++----- htdocs/fourn/commande/card.php | 104 +++++++++++++++++------------ htdocs/fourn/facture/card.php | 66 +++++++++--------- htdocs/livraison/card.php | 31 +++++---- 9 files changed, 258 insertions(+), 205 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 07cad40be7a..6281b1f25f4 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -177,16 +177,22 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - // Define output language - $outputlangs = $langs; - if (! empty($conf->global->MAIN_MULTILANGS)) + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $outputlangs = new Translate("", $conf); - $newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang); - $outputlangs->setDefaultLang($newlang); + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0]; } + $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } - $ret = $object->fetch($id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } } else { $langs->load("errors"); @@ -481,19 +487,26 @@ else if ($action == 'add' && $user->rights->propal->creer) { $db->commit(); - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - { - // Define output language - $outputlangs = $langs; - if (! empty($conf->global->MAIN_MULTILANGS)) - { - $outputlangs = new Translate("", $conf); - $newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang); - $outputlangs->setDefaultLang($newlang); - } - $ret = $object->fetch($id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - } + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0]; + } + + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); + } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id); exit(); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 82811287604..47dfb568c78 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -908,20 +908,23 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co if (! $error) { $result = $object->valid($user, $idwarehouse); - if ($result >= 0) { + if ($result >= 0) + { // Define output language - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) - $newlang = $_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) - $newlang = $object->thirdparty->default_lang; - if (! empty($newlang)) { - $outputlangs = new Translate("", $conf); - $outputlangs->setDefaultLang($newlang); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; } + $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } } @@ -954,21 +957,23 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) { if (! $error) { $result = $object->set_draft($user, $idwarehouse); - if ($result >= 0) { + if ($result >= 0) + { // Define output language - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) - $newlang = $_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) - $newlang = $object->thirdparty->default_lang; - if (! empty($newlang)) { - $outputlangs = new Translate("", $conf); - $outputlangs->setDefaultLang($newlang); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $ret = $object->fetch($object->id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; } + $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 1a67ffb2feb..58001d5c918 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -406,21 +406,25 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu if ($result >= 0) { // Define output language - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) - $newlang = $_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) - $newlang = $object->thirdparty->default_lang; - if (! empty($newlang)) { - $outputlangs = new Translate("", $conf); - $outputlangs->setDefaultLang($newlang); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); } - } else { + } + else + { if (count($object->errors)) setEventMessage($object->errors, 'errors'); else setEventMessage($object->error, 'errors'); } @@ -483,20 +487,22 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_ $result=$object->set_draft($user, $idwarehouse); if ($result<0) setEventMessage($object->error,'errors'); + // Define output language - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) - $newlang = $_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) - $newlang = $object->thirdparty->default_lang; - if (! empty($newlang)) { - $outputlangs = new Translate("", $conf); - $outputlangs->setDefaultLang($newlang); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } } @@ -1308,20 +1314,23 @@ else if ($action == 'addline' && $user->rights->facture->creer) // Insert line $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option); - if ($result > 0) { - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - // Define output language + if ($result > 0) + { + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { $outputlangs = $langs; - $newlang = GETPOST('lang_id', 'alpha'); - if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) - $newlang = $object->thirdparty->default_lang; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; if (! empty($newlang)) { $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - + $model=$object->modelpdf; + if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST['prod_entry_mode']); diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index af5f83cdbde..ef5a8a0b0ed 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -525,23 +525,22 @@ else if ($action == 'addline' && $user->rights->contrat->creer) if ($result > 0) { - /* - // Define output language - $outputlangs = $langs; - $newlang=''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; - if (! empty($newlang)) - { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang($newlang); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - { - $ret=$object->fetch($id); // Reload to get new records - contrat_pdf_create($db, $object->id, $object->modelpdf, $outputlangs); - } - */ + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { $tmp=getListOfModels($db, 'contract'); $keys=array_keys($tmp); $model=$keys[0]; } + $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + } unset($_POST ['prod_entry_mode']); diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index a2420624695..4702fe69e99 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1341,6 +1341,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0) $sql.= " FROM ".MAIN_DB_PREFIX."document_model"; $sql.= " WHERE type = '".$type."'"; $sql.= " AND entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")"; + $sql.= " ORDER BY description DESC"; dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG); $resql = $db->query($sql); diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 2510bfea086..7db0ecc56b1 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -250,26 +250,25 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped } else { - // Define output language - $outputlangs = $langs; - $newlang=''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha'); - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; - if (! empty($newlang)) - { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang($newlang); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - { - $ret=$object->fetch($id); // Reload to get new records - $result = $object->generateDocument($object->modelpdf, $outputlangs); - } - if ($result < 0) - { - dol_print_error($db,$result); - exit; - } + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'shipping'); $keys=array_keys($tmp); $model=$keys[0]; + } + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); + } } } diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 911a7a52159..da4f13e6d53 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -341,19 +341,24 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer) { $ret=$object->fetch($object->id); // Reload to get new records + // Define output language if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - // Define output language $outputlangs = $langs; - $newlang=GETPOST('lang_id','alpha'); - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; - if (! empty($newlang)) - { - $outputlangs = new Translate("",$conf); + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0]; + } + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); } unset($_POST ['prod_entry_mode']); @@ -438,19 +443,28 @@ else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer unset($_POST['date_end']); unset($localtax1_tx); unset($localtax2_tx); + if ($result >= 0) { - $outputlangs = $langs; - if (GETPOST('lang_id')) - { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang(GETPOST('lang_id')); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - { - $ret=$object->fetch($object->id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - } + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0]; + } + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); + } } else { @@ -496,17 +510,25 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn $result = $object->valid($user); if ($result >= 0) { - $outputlangs = $langs; - if (GETPOST('lang_id')) - { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang(GETPOST('lang_id')); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - { - $ret=$object->fetch($object->id); // Reload to get new records - $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - } + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0]; + } + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); + } } else { @@ -1760,7 +1782,7 @@ elseif (! empty($object->id)) if ($user->societe_id == 0 && $action != 'edit_line' && $action != 'delete') { print '
    '; - + // Validate if ($object->statut == 0 && $num > 0) { @@ -1770,7 +1792,7 @@ elseif (! empty($object->id)) print '>'.$langs->trans('Validate').''; } } - + // Modify if ($object->statut == 1) { @@ -1779,7 +1801,7 @@ elseif (! empty($object->id)) print ''.$langs->trans("Modify").''; } } - + // Approve if ($object->statut == 1) { @@ -1794,7 +1816,7 @@ elseif (! empty($object->id)) print ''.$langs->trans("RefuseOrder").''; } } - + // Send if (in_array($object->statut, array(2, 3, 4, 5))) { @@ -1803,7 +1825,7 @@ elseif (! empty($object->id)) print ''.$langs->trans('SendByMail').''; } } - + // Reopen if (in_array($object->statut, array(2, 5, 6, 7, 9))) { @@ -1812,7 +1834,7 @@ elseif (! empty($object->id)) print ''.$langs->trans("ReOpen").''; } } - + // Create bill if (! empty($conf->fournisseur->enabled) && $object->statut >= 2) // 2 means accepted { @@ -1820,13 +1842,13 @@ elseif (! empty($object->id)) { print ''.$langs->trans("CreateBill").''; } - + //if ($user->rights->fournisseur->commande->creer && $object->statut > 2) //{ // print ''.$langs->trans("ClassifyBilled").''; //} } - + // Cancel if ($object->statut == 2) { @@ -1835,19 +1857,19 @@ elseif (! empty($object->id)) print ''.$langs->trans("CancelOrder").''; } } - + // Clone if ($user->rights->fournisseur->commande->creer) { print ''.$langs->trans("ToClone").''; } - + // Delete if ($user->rights->fournisseur->commande->supprimer) { print ''.$langs->trans("Delete").''; } - + print "
    "; } } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 7f58e6ddd6e..e88b5a37945 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -693,24 +693,25 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer) { $db->commit(); - // Define output language - $outputlangs = $langs; - $newlang=GETPOST('lang_id','alpha'); - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; - if (! empty($newlang)) + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang($newlang); + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0]; + } + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - { - $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - if ($result <= 0) - { - dol_print_error($db,$result); - exit; - } - } unset($_POST ['prod_entry_mode']); @@ -774,20 +775,25 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer) { $object->set_draft($user); - $outputlangs = $langs; - if (! empty($_REQUEST['lang_id'])) - { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang($_REQUEST['lang_id']); - } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - if ($result <= 0) - { - dol_print_error($db,$result); - exit; - } - } + // Define output language + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0]; + } + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); + } $action=''; } diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 98f08803af4..2b6a74a519e 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -124,24 +124,23 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped $result = $object->valid($user); // Define output language - $outputlangs = $langs; - $newlang=''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; - if (! empty($newlang)) - { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang($newlang); - } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - $ret=$object->fetch($id); // Reload to get new records - $result= $object->generateDocument($_REQUEST['model'],$outputlangs); - } - if ($result < 0) - { - dol_print_error($db,$result); - exit; + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $model=$object->modelpdf; + if (empty($model)) { + $tmp=getListOfModels($db, 'delivery'); $keys=array_keys($tmp); $model=$keys[0]; + } + $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) dol_print_error($db,$result); } } From d846dd24316acf8f9fc6fce9680b700a013a7de5 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 27 Oct 2014 19:38:27 +0100 Subject: [PATCH 0370/1190] Fix extrafield from list feature where filter is provided --- htdocs/core/class/extrafields.class.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index c9e5d937a18..16583c0703c 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -743,15 +743,17 @@ class ExtraFields if (strpos($InfoFieldList[4], 'extra')!==false) { $sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra'; - $sqlwhere.= ' AND extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4]; + $sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4]; } else { - $sqlwhere.= ' AND '.$InfoFieldList[4]; + $sqlwhere.= ' WHERE '.$InfoFieldList[4]; } + }else { + $sqlwhere.= ' WHERE 1'; } if (in_array($InfoFieldList[0],array('tablewithentity'))) $sqlwhere.= ' AND entity = '.$conf->entity; // Some tables may have field, some other not. For the moment we disable it. - $sql.=preg_replace('/^ AND /','',$sqlwhere); + //$sql.=preg_replace('/^ AND /','',$sqlwhere); //print $sql; dol_syslog(get_class($this).'::showInputField type=sellist sql='.$sql); @@ -979,7 +981,10 @@ class ExtraFields { foreach ($fields_label as $field_toshow) { - $translabel=$langs->trans($obj->$field_toshow); + $translabel=''; + if (!empty($obj->$field_toshow)) { + $translabel=$langs->trans($obj->$field_toshow); + } if ($translabel!=$field_toshow) { $value.=dol_trunc($translabel,18).' '; }else { @@ -989,7 +994,10 @@ class ExtraFields } else { - $translabel=$langs->trans($obj->$InfoFieldList[1]); + $translabel=''; + if (!empty($obj->$InfoFieldList[1])) { + $translabel=$langs->trans($obj->$InfoFieldList[1]); + } if ($translabel!=$obj->$InfoFieldList[1]) { $value=dol_trunc($translabel,18); }else { From 0abeea059ebd0594a2d4a490a95122bcb7da1fbf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 21:48:28 +0100 Subject: [PATCH 0371/1190] Uniformize and clean boxes behaviour and translation. --- htdocs/admin/boxes.php | 12 +- htdocs/core/boxes/box_commandes.php | 41 +++++-- htdocs/core/boxes/box_factures.php | 18 ++- htdocs/core/boxes/box_factures_fourn.php | 12 +- htdocs/core/boxes/box_ficheinter.php | 7 +- htdocs/core/boxes/box_propales.php | 135 ++++++++++++---------- htdocs/core/boxes/box_supplier_orders.php | 12 +- htdocs/core/class/infobox.class.php | 30 ++--- htdocs/core/modules/modCommande.class.php | 6 +- htdocs/langs/en_US/boxes.lang | 25 ++-- htdocs/langs/fr_FR/boxes.lang | 31 ++--- htdocs/user/class/user.class.php | 2 +- 12 files changed, 189 insertions(+), 142 deletions(-) diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index c88d7717084..c12e913e9c1 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -65,8 +65,9 @@ if ($action == 'add') $sql.= " FROM ".MAIN_DB_PREFIX."user_param"; $sql.= " WHERE param = 'MAIN_BOXES_".$db->escape(GETPOST("pos","alpha"))."' AND value = '1'"; $sql.= " AND entity = ".$conf->entity; - $resql = $db->query($sql); + dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG); + $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); @@ -227,8 +228,8 @@ $actives = array(); $sql = "SELECT b.rowid, b.box_id, b.position, b.box_order,"; $sql.= " bd.rowid as boxid"; $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd"; -$sql.= " WHERE b.entity = ".$conf->entity; -$sql.= " AND b.box_id = bd.rowid"; +$sql.= " WHERE b.box_id = bd.rowid"; +$sql.= " AND b.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")"; $sql.= " AND b.fk_user=0"; $sql.= " ORDER by b.position, b.box_order"; @@ -237,6 +238,8 @@ $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); + + // Check record to know if we must recalculate sort order $i = 0; $decalage=0; $var=false; @@ -310,7 +313,6 @@ if ($resql) $db->free($resql); } - // Available boxes to activate $boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives); @@ -372,7 +374,7 @@ print ''; // Activated boxes $boxactivated=InfoBox::listBoxes($db,'activated',-1,null); - +//var_dump($boxactivated); print "
    \n\n"; print_titre($langs->trans("BoxesActivated")); diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index a89fca4acc0..1bb6fe9b27a 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -58,22 +58,25 @@ class box_commandes extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $commandestatic=new Commande($db); - $this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerOrders",$max)); + $userstatic = new User($db); + + $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerOrders",$max)); if ($user->rights->commande->lire) { - $sql = "SELECT s.nom as name, s.rowid as socid,"; - $sql.= " c.ref, c.tms, c.rowid,"; - $sql.= " c.fk_statut, c.facture"; + $sql.= " c.ref, c.tms, c.rowid, c.date_commande,"; + $sql.= " c.fk_statut, c.fk_user_valid, c.facture, c.total_ht"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."commande as c"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; $sql.= " AND c.entity = ".$conf->entity; + if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql.=" AND c.fk_statut = 1"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; - $sql.= " ORDER BY c.date_commande DESC, c.ref DESC "; + if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC "; + else $sql.= " ORDER BY c.tms DESC, c.ref DESC "; $sql.= $db->plimit($max, 0); $result = $db->query($sql); @@ -86,29 +89,43 @@ class box_commandes extends ModeleBoxes while ($i < $num) { $objp = $db->fetch_object($result); + $date=$db->jdate($objp->date_commande); $datem=$db->jdate($objp->tms); - $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', + $this->info_box_contents[$i][] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, 'url' => DOL_URL_ROOT."/commande/card.php?id=".$objp->rowid); - $this->info_box_contents[$i][1] = array('td' => 'align="left"', + $this->info_box_contents[$i][] = array('td' => 'align="left"', 'text' => $objp->ref, 'url' => DOL_URL_ROOT."/commande/card.php?id=".$objp->rowid); - $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', + $this->info_box_contents[$i][] = array('td' => 'align="left" width="16"', 'logo' => 'company', 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); - $this->info_box_contents[$i][3] = array('td' => 'align="left"', + $this->info_box_contents[$i][] = array('td' => 'align="left"', 'text' => $objp->name, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); - $this->info_box_contents[$i][4] = array('td' => 'align="right"', - 'text' => dol_print_date($datem,'day'), + $this->info_box_contents[$i][] = array('td' => 'align="right"', + 'text' => price($objp->total_ht), + ); + + if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) + { + if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid); + $this->info_box_contents[$i][] = array('td' => 'align="right"', + 'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''), + 'url' => (($objp->fk_user_valid > 0)?DOL_URL_ROOT.'/user/card.php?id='.$objp->fk_user_valid:'') + ); + } + + $this->info_box_contents[$i][] = array('td' => 'align="right"', + 'text' => dol_print_date($date,'day'), ); - $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"', + $this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $commandestatic->LibStatut($objp->fk_statut,$objp->facture,3)); $i++; diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index ee5326250b3..b0fdd6d9d09 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -56,7 +56,7 @@ class box_factures extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $facturestatic=new Facture($db); - $text = $langs->trans("BoxTitleLastCustomerBills",$max); + $text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills",$max); $this->info_box_head = array( 'text' => $text, 'limit'=> dol_strlen($text) @@ -64,7 +64,7 @@ class box_factures extends ModeleBoxes if ($user->rights->facture->lire) { - $sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.datef as df"; + $sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.total as total_ht, f.datef as df"; $sql.= ", f.paye, f.fk_statut, f.datec, f.tms"; $sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", f.date_lim_reglement as datelimite"; @@ -75,7 +75,8 @@ class box_factures extends ModeleBoxes $sql.= " AND f.entity = ".$conf->entity; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; - $sql.= " ORDER BY f.tms DESC"; + if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.facnumber DESC "; + else $sql.= " ORDER BY f.tms DESC, f.facnumber DESC "; $sql.= $db->plimit($max, 0); $result = $db->query($sql); @@ -91,7 +92,8 @@ class box_factures extends ModeleBoxes { $objp = $db->fetch_object($result); $datelimite=$db->jdate($objp->datelimite); - $datec=$db->jdate($objp->datec); + $date=$db->jdate($objp->df); + $datem=$db->jdate($objp->tms); $picto='bill'; if ($objp->type == 1) $picto.='r'; @@ -118,10 +120,14 @@ class box_factures extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', - 'text' => dol_print_date($datec,'day'), + 'text' => price($objp->total_ht), ); - $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"', + $this->info_box_contents[$i][5] = array('td' => 'align="right"', + 'text' => dol_print_date($date,'day'), + ); + + $this->info_box_contents[$i][6] = array('td' => 'align="right" width="18"', 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3)); $i++; diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 441c9f743fe..914f442bea4 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -58,13 +58,13 @@ class box_factures_fourn extends ModeleBoxes $facturestatic=new FactureFournisseur($db); $this->info_box_head = array( - 'text' => $langs->trans("BoxTitleLastSupplierBills",$max) + 'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max) ); if ($user->rights->fournisseur->facture->lire) { $sql = "SELECT s.nom as name, s.rowid as socid,"; - $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.amount,"; + $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.total_ht,"; $sql.= " f.paye, f.fk_statut,"; $sql.= ' f.datef as df,'; $sql.= ' f.datec as datec,'; @@ -76,7 +76,8 @@ class box_factures_fourn extends ModeleBoxes $sql.= " AND f.entity = ".$conf->entity; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; - $sql.= " ORDER BY f.tms DESC"; + if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC "; + else $sql.= " ORDER BY f.tms DESC, f.ref DESC "; $sql.= $db->plimit($max, 0); $result = $db->query($sql); @@ -92,7 +93,8 @@ class box_factures_fourn extends ModeleBoxes { $objp = $db->fetch_object($result); $datelimite=$db->jdate($objp->datelimite); - $datec=$db->jdate($objp->datec); + $date=$db->jdate($objp->df); + $datem=$db->jdate($objp->tms); $late = ''; if ($objp->paye == 0 && $datelimite && $datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day'))); @@ -119,7 +121,7 @@ class box_factures_fourn extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][5] = array('td' => 'align="right"', - 'text' => dol_print_date($datec,'day')); + 'text' => dol_print_date($date,'day')); $fac = new FactureFournisseur($db); $fac->fetch($objp->facid); diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index fdebad2f38a..9cce737eb9a 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -67,15 +67,12 @@ class box_ficheinter extends ModeleBoxes $sql.= " f.tms as datem,"; $sql.= " s.nom as name, s.rowid as socid, s.client"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; - if (! $user->rights->societe->client->voir) - $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."fichinter as f"; $sql.= " WHERE f.fk_soc = s.rowid "; $sql.= " AND f.entity = ".$conf->entity; - if (! $user->rights->societe->client->voir && !$user->societe_id) - $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; + if (! $user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; - $sql.= " ORDER BY f.tms DESC"; $sql.= $db->plimit($max, 0); diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index b548e90671b..e9bd47b2a9e 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -56,84 +56,93 @@ class box_propales extends ModeleBoxes $this->max=$max; include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; - $propalstatic=new Propal($db); + $propalstatic=new Propal($db); - $this->info_box_head = array('text' => $langs->trans("BoxTitleLastPropals",$max)); + $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."Propals",$max)); - if ($user->rights->propale->lire) - { - $sql = "SELECT s.nom as name, s.rowid as socid,"; - $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture"; - $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; - $sql.= ", ".MAIN_DB_PREFIX."propal as p"; - if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql.= " WHERE p.fk_soc = s.rowid"; - $sql.= " AND p.entity = ".$conf->entity; - if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; - if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; - $sql.= " ORDER BY p.datep DESC, p.ref DESC "; - $sql.= $db->plimit($max, 0); + if ($user->rights->propale->lire) + { + $sql = "SELECT s.nom as name, s.rowid as socid,"; + $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tms"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; + $sql.= ", ".MAIN_DB_PREFIX."propal as p"; + if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + $sql.= " WHERE p.fk_soc = s.rowid"; + $sql.= " AND p.entity = ".$conf->entity; + if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; + if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; + if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC "; + else $sql.= " ORDER BY p.tms DESC, p.ref DESC "; + $sql.= $db->plimit($max, 0); - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); - $now=dol_now(); + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + $now=dol_now(); - $i = 0; + $i = 0; - while ($i < $num) - { - $objp = $db->fetch_object($result); - $datec=$db->jdate($objp->datec); - $dateterm=$db->jdate($objp->fin_validite); - $dateclose=$db->jdate($objp->date_cloture); + while ($i < $num) + { + $objp = $db->fetch_object($result); + $date=$db->jdate($objp->dp); + $datec=$db->jdate($objp->datec); + $datem=$db->jdate($objp->tms); + $dateterm=$db->jdate($objp->fin_validite); + $dateclose=$db->jdate($objp->date_cloture); - $late = ''; - if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); } + $late = ''; + if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) { + $late = img_warning($langs->trans("Late")); + } - $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', - 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid); + $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', + 'logo' => $this->boximg, + 'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid); - $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => $objp->ref, - 'text2'=> $late, - 'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid); + $this->info_box_contents[$i][1] = array('td' => 'align="left"', + 'text' => $objp->ref, + 'text2'=> $late, + 'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid); - $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', - 'logo' => 'company', - 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); + $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', + 'logo' => 'company', + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); - $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->name,40), - 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); + $this->info_box_contents[$i][3] = array('td' => 'align="left"', + 'text' => dol_trunc($objp->name,40), + 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); - $this->info_box_contents[$i][4] = array('td' => 'align="right"', - 'text' => dol_print_date($datec,'day')); + $this->info_box_contents[$i][4] = array('td' => 'align="right"', + 'text' => price($objp->total_ht), + ); - $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"', - 'text' => $propalstatic->LibStatut($objp->fk_statut,3)); + $this->info_box_contents[$i][5] = array('td' => 'align="right"', + 'text' => dol_print_date($date,'day')); - $i++; - } + $this->info_box_contents[$i][6] = array('td' => 'align="right" width="18"', + 'text' => $propalstatic->LibStatut($objp->fk_statut,3)); - if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProposals")); + $i++; + } - $db->free($result); - } - else - { - $this->info_box_contents[0][0] = array( 'td' => 'align="left"', - 'maxlength'=>500, - 'text' => ($db->error().' sql='.$sql)); - } - } - else - { - $this->info_box_contents[0][0] = array('td' => 'align="left"', - 'text' => $langs->trans("ReadPermissionNotAllowed")); - } + if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProposals")); + + $db->free($result); + } + else + { + $this->info_box_contents[0][0] = array( 'td' => 'align="left"', + 'maxlength'=>500, + 'text' => ($db->error().' sql='.$sql)); + } + } + else + { + $this->info_box_contents[0][0] = array('td' => 'align="left"', + 'text' => $langs->trans("ReadPermissionNotAllowed")); + } } /** diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index 876b50c849f..d14bf1a539f 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -58,12 +58,12 @@ class box_supplier_orders extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $supplierorderstatic=new CommandeFournisseur($db); - $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestSupplierOrders", $max)); + $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierOrders", $max)); if ($user->rights->fournisseur->commande->lire) { $sql = "SELECT s.nom as name, s.rowid as socid,"; - $sql.= " c.ref, c.tms, c.rowid,"; + $sql.= " c.ref, c.tms, c.rowid, c.date_commande,"; $sql.= " c.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c"; @@ -72,7 +72,8 @@ class box_supplier_orders extends ModeleBoxes $sql.= " AND c.entity = ".$conf->entity; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; - $sql.= " ORDER BY c.date_commande DESC, c.ref DESC "; + if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC "; + else $sql.= " ORDER BY c.tms DESC, c.ref DESC "; $sql.= $db->plimit($max, 0); $result = $db->query($sql); @@ -84,7 +85,8 @@ class box_supplier_orders extends ModeleBoxes while ($i < $num) { $objp = $db->fetch_object($result); - $datem=$db->jdate($objp->tms); + $date=$db->jdate($objp->date_commande); + $datem=$db->jdate($objp->tms); $urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid; $urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid; @@ -106,7 +108,7 @@ class box_supplier_orders extends ModeleBoxes 'url' => $urls); $this->info_box_contents[$i][4] = array('td' => 'align="right"', - 'text' => dol_print_date($datem,'day'), + 'text' => dol_print_date($date,'day'), ); $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"', diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index 52d27f82523..ab26ee68317 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -54,7 +54,7 @@ class InfoBox $boxes=array(); $confuserzone='MAIN_BOXES_'.$zone; - if ($mode == 'activated') + if ($mode == 'activated') // activated { $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,"; $sql.= " d.rowid as box_id, d.file, d.note, d.tms"; @@ -66,18 +66,11 @@ class InfoBox else $sql.= " AND b.fk_user = 0"; $sql.= " ORDER BY b.box_order"; } - else + else // available { $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms"; $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d"; - if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) - { - $sql.= " WHERE entity IN (1,".$conf->entity.")"; // TODO add method for define another master entity - } - else - { - $sql.= " WHERE entity = ".$conf->entity; - } + $sql.= " WHERE d.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")"; } dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG); @@ -92,6 +85,7 @@ class InfoBox if (! in_array($obj->box_id, $excludelist)) { + if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs)) { $boxname = preg_replace('/\.php$/i','',$regs[1]); @@ -104,9 +98,11 @@ class InfoBox $relsourcefile = "/core/boxes/".$boxname.".php"; } + //print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'
    '; + // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then // the "enabled" condition for modules forbidden for external users and the depends condition can be done. - // Goal is to avoid making a new instance for each boxes returned by select. + // Goal is to avoid making a "new" done for each boxes returned by select. dol_include_once($relsourcefile); if (class_exists($boxname)) { @@ -161,15 +157,19 @@ class InfoBox //print 'xx module='.$module.' enabled='.$enabled; if ($enabled) $boxes[]=$box; else unset($box); - } + } + else + { + dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING); + } } $j++; } } else - { - //dol_print_error($db); - $error=$db->lasterror(); + { + dol_syslog($db->lasterror(),LOG_ERR); + return array('error'=>$db->lasterror()); } return $boxes; diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 545ae1b03a0..4a2f0bc20b4 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -98,8 +98,10 @@ class modCommande extends DolibarrModules $this->const[$r][4] = 0; // Boxes - $this->boxes = array(); - $this->boxes = array(0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'),2=>array('file'=>'box_graph_orders_permonth.php','enabledbydefaulton'=>'Home')); + $this->boxes = array( + 0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'), + 2=>array('file'=>'box_graph_orders_permonth.php','enabledbydefaulton'=>'Home') + ); // Permissions $this->rights = array(); diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index e7e9da7dc1b..bf118b9b88e 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Last modified prospects BoxLastCustomers=Last modified customers BoxLastSuppliers=Last modified suppliers BoxLastCustomerOrders=Last customer orders +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Last books BoxLastActions=Last actions BoxLastContracts=Last contracts @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Number of clients BoxTitleLastRssInfos=Last %s news from %s BoxTitleLastProducts=Last %s modified products/services BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Last %s modified customer orders +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Last %s recorded suppliers BoxTitleLastCustomers=Last %s recorded customers BoxTitleLastModifiedSuppliers=Last %s modified suppliers BoxTitleLastModifiedCustomers=Last %s modified customers -BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects -BoxTitleLastPropals=Last %s recorded proposals +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Last %s customer's invoices +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Last %s supplier's invoices -BoxTitleLastProspects=Last %s recorded prospects +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Last %s modified prospects BoxTitleLastProductsInContract=Last %s products/services in a contract -BoxTitleLastModifiedMembers=Last %s modified members +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=Sales turnover -BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Last %s modified contacts/addresses BoxMyLastBookmarks=My last %s bookmarks BoxOldestExpiredServices=Oldest active expired services @@ -76,7 +80,8 @@ NoContractedProducts=No products/services contracted NoRecordedContracts=No recorded contracts NoRecordedInterventions=No recorded interventions BoxLatestSupplierOrders=Latest supplier orders -BoxTitleLatestSupplierOrders=%s latest supplier orders +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=No recorded supplier order BoxCustomersInvoicesPerMonth=Customer invoices per month BoxSuppliersInvoicesPerMonth=Supplier invoices per month diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 252a379ffbc..63890aff6bb 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Derniers prospects modifiés BoxLastCustomers=Derniers clients modifiés BoxLastSuppliers=Derniers fournisseurs modifiés BoxLastCustomerOrders=Dernières commandes +BoxLastValidatedCustomerOrders=Dernières commandes clients validées BoxLastBooks=Derniers livres BoxLastActions=Derniers événements BoxLastContracts=Derniers contrats @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Nombre de clients BoxTitleLastRssInfos=Les %s dernières informations de %s BoxTitleLastProducts=Les %s derniers produits/services enregistrés BoxTitleProductsAlertStock=Produits en alerte stock -BoxTitleLastCustomerOrders=Les %s dernières commandes clients modifiées +BoxTitleLastCustomerOrders=Les %s dernières commandes clients +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistrés BoxTitleLastCustomers=Les %s derniers clients enregistrés BoxTitleLastModifiedSuppliers=Les %s derniers fournisseurs modifiés BoxTitleLastModifiedCustomers=Les %s derniers clients modifiés -BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects modifiés -BoxTitleLastPropals=Les %s dernières propositions enregistrées -BoxTitleLastCustomerBills=Les %s dernières factures clients modifiées -BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs modifiées -BoxTitleLastProspects=Les %s derniers prospects enregistrés +BoxTitleLastCustomersOrProspects=Les %s derniers prospects +BoxTitleLastPropals=Les %s dernières propales +BoxTitleLastModifiedPropals=Last %s modified proposals +BoxTitleLastCustomerBills=Les %s dernières factures clients +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices +BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Les %s derniers prospects modifiés BoxTitleLastProductsInContract=Les %s derniers produits/services contractés -BoxTitleLastModifiedMembers=Les %s derniers adhérents modifiés -BoxTitleLastFicheInter=Les %s dernières fiches d'intervention modifiées -BoxTitleOldestUnpaidCustomerBills=Les %s plus anciennes factures clients impayées -BoxTitleOldestUnpaidSupplierBills=Les %s plus anciennes factures fournisseurs impayées +BoxTitleLastModifiedMembers=Les %s derniers adhérents +BoxTitleLastFicheInter=Les %s dernières fiche d'intervention modifiée +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Soldes des comptes ouverts BoxTitleSalesTurnover=Le chiffre d'affaires réalisé -BoxTitleTotalUnpaidCustomerBills=Impayés clients -BoxTitleTotalUnpaidSuppliersBills=Impayés fournisseurs +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés BoxMyLastBookmarks=Mes %s derniers marque-pages BoxOldestExpiredServices=Plus anciens services expirés @@ -76,7 +80,8 @@ NoContractedProducts=Pas de produit/service contracté NoRecordedContracts=Pas de contrat enregistré NoRecordedInterventions=Pas fiche d'intervention enregistrée BoxLatestSupplierOrders=Dernières commandes fournisseur -BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées +BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseurs +BoxTitleLatestModifiedSupplierOrders=Les %s dernières commandes fournisseurs NoSupplierOrder=Pas de commande fournisseur enregistrée BoxCustomersInvoicesPerMonth=Factures clients par mois BoxSuppliersInvoicesPerMonth=Factures fournisseurs par mois diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index ffde48c2ada..6f15bf82faa 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1792,7 +1792,7 @@ class User extends CommonObject $result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin); if ($withpicto != 2) $result.=' '; } - $result.=$lien.$this->getFullName($langs).$lienfin; + $result.=$lien.$this->getFullName($langs,'','',16).$lienfin; return $result; } From 1669700148224f80a6a0c59c4ecd270ede88b908 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2014 21:49:51 +0100 Subject: [PATCH 0372/1190] Uniformize and clean boxes behaviour and translation. --- htdocs/langs/fr_FR/boxes.lang | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 63890aff6bb..a98fa367fbe 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -29,28 +29,28 @@ BoxTitleLastRssInfos=Les %s dernières informations de %s BoxTitleLastProducts=Les %s derniers produits/services enregistrés BoxTitleProductsAlertStock=Produits en alerte stock BoxTitleLastCustomerOrders=Les %s dernières commandes clients -BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders +BoxTitleLastModifiedCustomerOrders=Les %s dernières commandes clients modifiées BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistrés BoxTitleLastCustomers=Les %s derniers clients enregistrés BoxTitleLastModifiedSuppliers=Les %s derniers fournisseurs modifiés BoxTitleLastModifiedCustomers=Les %s derniers clients modifiés BoxTitleLastCustomersOrProspects=Les %s derniers prospects BoxTitleLastPropals=Les %s dernières propales -BoxTitleLastModifiedPropals=Last %s modified proposals +BoxTitleLastModifiedPropals=Les %s dernières propositions commerciales modifiées BoxTitleLastCustomerBills=Les %s dernières factures clients -BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices +BoxTitleLastModifiedCustomerBills=Les %s dernières factures clients modifiées BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs -BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices +BoxTitleLastModifiedSupplierBills=Les %s dernières factures fournisseurs modifiées BoxTitleLastModifiedProspects=Les %s derniers prospects modifiés BoxTitleLastProductsInContract=Les %s derniers produits/services contractés BoxTitleLastModifiedMembers=Les %s derniers adhérents BoxTitleLastFicheInter=Les %s dernières fiche d'intervention modifiée -BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices -BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleOldestUnpaidCustomerBills=Les %s plus anciennes factures clients impayées +BoxTitleOldestUnpaidSupplierBills=Les %s plus anciennes factures fournisseurs impayées BoxTitleCurrentAccounts=Soldes des comptes ouverts BoxTitleSalesTurnover=Le chiffre d'affaires réalisé -BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices -BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices +BoxTitleTotalUnpaidCustomerBills=Factures clients impayées +BoxTitleTotalUnpaidSuppliersBills=Factures fournisseurs impayées BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés BoxMyLastBookmarks=Mes %s derniers marque-pages BoxOldestExpiredServices=Plus anciens services expirés From 834a6dc2af74a4fc482171a8e3c352acb7a54e10 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 28 Oct 2014 16:50:44 +0100 Subject: [PATCH 0373/1190] webservice Thirdparty parameter lastname for invidual creation is now lastname and not ref --- ChangeLog | 1 + htdocs/webservices/server_thirdparty.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c2ad4b7ecf1..b75afb18be0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ English Dolibarr ChangeLog - Fix: right and error management #1961 - Fix: Fix Error when trying to clone an Order #1943 - Fix: [ bug #1618 ] PHP Error thrown when saving a barcode +- Fix: webservice Thirdparty parameter lastname for invidual creation is now lastname and not ref ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index c5ac0c8c686..4a295cd3bfa 100644 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -460,7 +460,7 @@ function createThirdParty($authentication,$thirdparty) $result=$newobject->create($fuser); if ($newobject->particulier && $result > 0) { $newobject->firstname = $thirdparty['firstname']; - $newobject->name_bis = $thirdparty['ref']; + $newobject->name_bis = $thirdparty['lastname']; $result = $newobject->create_individual($fuser); } if ($result <= 0) From a32817db9d0088e56be192bc76519f0b8214135f Mon Sep 17 00:00:00 2001 From: jfefe Date: Tue, 28 Oct 2014 23:49:54 +0100 Subject: [PATCH 0374/1190] Update makepack-dolibarr.pl : indentation --- build/makepack-dolibarr.pl | 1416 ++++++++++++++++++------------------ 1 file changed, 708 insertions(+), 708 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 0e8f2ea0fdd..3f637ef856e 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -63,19 +63,19 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr"; $PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/files"; if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"}) { - print "Error: Missing environment variables.\n"; + print "Error: Missing environment variables.\n"; print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n"; print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n"; print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n"; print "$PROG.$Extension aborted.\n"; - sleep 2; + sleep 2; exit 1; } if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"}) { - print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n"; + print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n"; print "$PROG.$Extension aborted.\n"; - sleep 2; + sleep 2; exit 1; } @@ -85,31 +85,31 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS=' elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; } elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; } if (! $OS) { - print "Error: Can't detect your OS.\n"; + print "Error: Can't detect your OS.\n"; print "Can't continue.\n"; print "$PROG.$Extension aborted.\n"; - sleep 2; + sleep 2; exit 1; } # Define buildroot # ---------------- if ($OS =~ /linux/) { - $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp"; + $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp"; } if ($OS =~ /macos/) { - $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp"; + $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp"; } if ($OS =~ /windows/) { - $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp"; - $PROGPATH=$ENV{"ProgramFiles"}; + $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp"; + $PROGPATH=$ENV{"ProgramFiles"}; } if (! $TEMP || ! -d $TEMP) { - print "Error: A temporary directory can not be find.\n"; - print "Check that TEMP or TMP environment variable is set correctly.\n"; + print "Error: A temporary directory can not be find.\n"; + print "Check that TEMP or TMP environment variable is set correctly.\n"; print "$PROG.$Extension aborted.\n"; - sleep 2; - exit 2; + sleep 2; + exit 2; } $BUILDROOT="$TEMP/buildroot"; @@ -169,10 +169,10 @@ my $batch=0; for (0..@ARGV-1) { if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; } if ($ARGV[$_] =~ /^-*desti=(.+)/i) { $DESTI=$1; } - if ($ARGV[$_] =~ /^-*prefix=(.+)/i) { - $PREFIX=$1; - $FILENAMESNAPSHOT.="-".$PREFIX; - } + if ($ARGV[$_] =~ /^-*prefix=(.+)/i) { + $PREFIX=$1; + $FILENAMESNAPSHOT.="-".$PREFIX; + } } if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i) { $DESTI = $ENV{"DESTIBETARC"}; } # Force output dir if env DESTIBETARC is defined if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; } # Force output dir if env DESTISTABLE is defined @@ -192,7 +192,7 @@ print "Target directory (DESTI) : $DESTI\n"; if ($target) { if ($target eq "ALL") { foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; } + if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; } } } if ($target ne "ALL" && $target ne "SF" && $target ne "ASSO") { $CHOOSEDTARGET{uc($target)}=1; } @@ -200,56 +200,56 @@ if ($target) { if ($target eq "ASSO") { $CHOOSEDPUBLISH{"ASSO"}=1; } } else { - my $found=0; - my $NUM_SCRIPT; - my $cpt=0; - while (! $found) { - printf(" %2d - %-14s (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET)); - foreach my $target (@LISTETARGET) { - $cpt++; - printf(" %2d - %-14s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); - } - $cpt=98; - printf(" %2d - %-14s (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH)); - $cpt=99; - printf(" %2d - %-14s (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH)); - - # Ask which target to build - print "Choose one package number or several separated with space (0 - ".$cpt."): "; - $NUM_SCRIPT=; - chomp($NUM_SCRIPT); - if ($NUM_SCRIPT !~ /^[0-9\s]+$/) - { - print "This is not a valid package number list.\n"; - $found = 0; - } - else - { - $found = 1; - } - } - print "\n"; - if ($NUM_SCRIPT eq "98") { - $CHOOSEDPUBLISH{"ASSO"}=1; - } - else - { - if ($NUM_SCRIPT eq "99") { - $CHOOSEDPUBLISH{"SF"}=1; - } - else { - if ($NUM_SCRIPT eq "0") { - foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; } - } - } - else { - foreach my $num (split(/\s+/,$NUM_SCRIPT)) { - $CHOOSEDTARGET{$LISTETARGET[$num-1]}=1; - } - } - } - } + my $found=0; + my $NUM_SCRIPT; + my $cpt=0; + while (! $found) { + printf(" %2d - %-14s (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET)); + foreach my $target (@LISTETARGET) { + $cpt++; + printf(" %2d - %-14s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); + } + $cpt=98; + printf(" %2d - %-14s (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH)); + $cpt=99; + printf(" %2d - %-14s (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH)); + + # Ask which target to build + print "Choose one package number or several separated with space (0 - ".$cpt."): "; + $NUM_SCRIPT=; + chomp($NUM_SCRIPT); + if ($NUM_SCRIPT !~ /^[0-9\s]+$/) + { + print "This is not a valid package number list.\n"; + $found = 0; + } + else + { + $found = 1; + } + } + print "\n"; + if ($NUM_SCRIPT eq "98") { + $CHOOSEDPUBLISH{"ASSO"}=1; + } + else + { + if ($NUM_SCRIPT eq "99") { + $CHOOSEDPUBLISH{"SF"}=1; + } + else { + if ($NUM_SCRIPT eq "0") { + foreach my $key (@LISTETARGET) { + if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; } + } + } + else { + foreach my $num (split(/\s+/,$NUM_SCRIPT)) { + $CHOOSEDTARGET{$LISTETARGET[$num-1]}=1; + } + } + } + } } # Test if requirement is ok @@ -265,34 +265,34 @@ foreach my $target (keys %CHOOSEDTARGET) { } $atleastonerpm=1; } - foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) - { - # Test - print "Test requirement for target $target: Search '$req'... "; - $newreq=$req; $newparam=''; - if ($newreq eq 'zip') { $newparam.='-h'; } - if ($newreq eq 'xz') { $newparam.='-h'; } - $cmd="\"$newreq\" $newparam 2>&1"; - print "Test command ".$cmd."... "; - $ret=`$cmd`; - $coderetour=$?; $coderetour2=$coderetour>>8; - if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { - # Not found error, we try in PROGPATH - $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`; - $coderetour=$?; $coderetour2=$coderetour>>8; - $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req"; - } + foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) + { + # Test + print "Test requirement for target $target: Search '$req'... "; + $newreq=$req; $newparam=''; + if ($newreq eq 'zip') { $newparam.='-h'; } + if ($newreq eq 'xz') { $newparam.='-h'; } + $cmd="\"$newreq\" $newparam 2>&1"; + print "Test command ".$cmd."... "; + $ret=`$cmd`; + $coderetour=$?; $coderetour2=$coderetour>>8; + if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { + # Not found error, we try in PROGPATH + $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`; + $coderetour=$?; $coderetour2=$coderetour>>8; + $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req"; + } - if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) { - # Not found error - print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n"; - $CHOOSEDTARGET{$target}=-1; - last; - } else { - # Pas erreur ou erreur autre que programme absent - print " Found ".$req."\n"; - } - } + if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) { + # Not found error + print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n"; + $CHOOSEDTARGET{$target}=-1; + last; + } else { + # Pas erreur ou erreur autre que programme absent + print " Found ".$req."\n"; + } + } } print "\n"; @@ -303,7 +303,7 @@ $nboftargetok=0; $nboftargetneedbuildroot=0; $nbofpublishneedtag=0; foreach my $target (keys %CHOOSEDTARGET) { - if ($CHOOSEDTARGET{$target} < 0) { next; } + if ($CHOOSEDTARGET{$target} < 0) { next; } if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') { $nboftargetneedbuildroot++; @@ -311,7 +311,7 @@ foreach my $target (keys %CHOOSEDTARGET) { $nboftargetok++; } foreach my $target (keys %CHOOSEDPUBLISH) { - if ($CHOOSEDPUBLISH{$target} < 0) { next; } + if ($CHOOSEDPUBLISH{$target} < 0) { next; } if ($target eq 'ASSO') { $nbofpublishneedtag++; } if ($target eq 'SF') { $nbofpublishneedtag++; } $nboftargetok++; @@ -319,714 +319,714 @@ foreach my $target (keys %CHOOSEDPUBLISH) { if ($nboftargetok) { - # Update CVS if required - #----------------------- - if ($nbofpublishneedtag) + # Update CVS if required + #----------------------- + if ($nbofpublishneedtag) { - print "Go to directory $SOURCE\n"; - $olddir=getcwd(); - chdir("$SOURCE"); - print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n"; - $ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`; - if ($ret =~ /already exists/) - { - print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? "; - $QUESTIONOVERWRITETAG=; - chomp($QUESTIONOVERWRITETAG); - if ($QUESTIONOVERWRITETAG =~ /(o|y)/) - { - print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n"; - $ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`; - } - } - print 'Run git push --tags'."\n"; - $ret=`git push --tags`; - chdir("$olddir"); + print "Go to directory $SOURCE\n"; + $olddir=getcwd(); + chdir("$SOURCE"); + print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n"; + $ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`; + if ($ret =~ /already exists/) + { + print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? "; + $QUESTIONOVERWRITETAG=; + chomp($QUESTIONOVERWRITETAG); + if ($QUESTIONOVERWRITETAG =~ /(o|y)/) + { + print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n"; + $ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`; + } + } + print 'Run git push --tags'."\n"; + $ret=`git push --tags`; + chdir("$olddir"); } - # Update buildroot if required - #----------------------------- - if ($nboftargetneedbuildroot) + # Update buildroot if required + #----------------------------- + if ($nboftargetneedbuildroot) { - if (! $copyalreadydone) { - print "Creation of a buildroot used for all packages\n"; + if (! $copyalreadydone) { + print "Creation of a buildroot used for all packages\n"; - print "Delete directory $BUILDROOT\n"; - $ret=`rm -fr "$BUILDROOT"`; - - mkdir "$BUILDROOT"; - mkdir "$BUILDROOT/$PROJECT"; - print "Copy $SOURCE into $BUILDROOT/$PROJECT\n"; - $ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`; + print "Delete directory $BUILDROOT\n"; + $ret=`rm -fr "$BUILDROOT"`; + + mkdir "$BUILDROOT"; + mkdir "$BUILDROOT/$PROJECT"; + print "Copy $SOURCE into $BUILDROOT/$PROJECT\n"; + $ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`; - #print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n"; - #$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`; - } - print "Clean $BUILDROOT\n"; - $ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.git*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.project`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.tx`; - $ret=`rm -f $BUILDROOT/$PROJECT/build.xml`; - $ret=`rm -f $BUILDROOT/$PROJECT/quickbuild.xml`; - $ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`; - - $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/Doli*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.xz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/cache.manifest`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; + #print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n"; + #$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`; + } + print "Clean $BUILDROOT\n"; + $ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.git*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.project`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.tx`; + $ret=`rm -f $BUILDROOT/$PROJECT/build.xml`; + $ret=`rm -f $BUILDROOT/$PROJECT/quickbuild.xml`; + $ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`; + + $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/Doli*-*`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.xz`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/cache.manifest`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`; - $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`; - $ret=`rm -f $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT/dev/README`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; - $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; - $ret=`rm -f $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`; # Avoid errors into rpmlint - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`; # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems. - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`; # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems. - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`; # Keep this removal in case we embed libraries - #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`; # _source must be kept into tarball - - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`; # Source of this flash is not available - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`; + $ret=`rm -fr $BUILDROOT/$PROJECT/document`; + $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; + $ret=`rm -f $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`; # Avoid errors into rpmlint + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`; # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems. + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`; # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems. + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`; # Keep this removal in case we embed libraries + #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`; # _source must be kept into tarball + + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`; # Source of this flash is not available + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`; } - # Build package for each target - #------------------------------ - foreach my $target (keys %CHOOSEDTARGET) - { - if ($CHOOSEDTARGET{$target} < 0) { next; } - - print "\nBuild package for target $target\n"; + # Build package for each target + #------------------------------ + foreach my $target (keys %CHOOSEDTARGET) + { + if ($CHOOSEDTARGET{$target} < 0) { next; } + + print "\nBuild package for target $target\n"; - if ($target eq 'SNAPSHOT') - { - $NEWDESTI=$DESTI; + if ($target eq 'SNAPSHOT') + { + $NEWDESTI=$DESTI; - print "Remove target $FILENAMESNAPSHOT.tgz...\n"; - unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz"); + print "Remove target $FILENAMESNAPSHOT.tgz...\n"; + unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz"); - #rmdir "$BUILDROOT/$FILENAMESNAPSHOT"; - $ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\""; - $ret=`$cmd`; + #rmdir "$BUILDROOT/$FILENAMESNAPSHOT"; + $ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\""; + $ret=`$cmd`; - print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n"; - $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT"; + print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n"; + $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT"; print $cmd."\n"; $ret=`$cmd`; - # Move to final dir - print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n"; - $ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`; - next; - } + # Move to final dir + print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n"; + $ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`; + next; + } - if ($target eq 'TGZ') - { - $NEWDESTI=$DESTI; - mkdir($DESTI.'/standard'); + if ($target eq 'TGZ') + { + $NEWDESTI=$DESTI; + mkdir($DESTI.'/standard'); if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } - print "Remove target $FILENAMETGZ.tgz...\n"; - unlink("$NEWDESTI/$FILENAMETGZ.tgz"); + print "Remove target $FILENAMETGZ.tgz...\n"; + unlink("$NEWDESTI/$FILENAMETGZ.tgz"); - #rmdir "$BUILDROOT/$FILENAMETGZ"; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ`; - print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\""; - $ret=`$cmd`; + #rmdir "$BUILDROOT/$FILENAMETGZ"; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ`; + print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\""; + $ret=`$cmd`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`; # We can't remove it with exclude file, we need it for some tarball packages - print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n"; - $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ"; - print "$cmd\n"; - $ret=`$cmd`; + print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n"; + $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ"; + print "$cmd\n"; + $ret=`$cmd`; - # Move to final dir - print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n"; - $ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`; - next; - } + # Move to final dir + print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n"; + $ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`; + next; + } - if ($target eq 'XZ') - { - $NEWDESTI=$DESTI; - mkdir($DESTI.'/standard'); + if ($target eq 'XZ') + { + $NEWDESTI=$DESTI; + mkdir($DESTI.'/standard'); if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } - print "Remove target $FILENAMEXZ.xz...\n"; - unlink("$NEWDESTI/$FILENAMEXZ.xz"); + print "Remove target $FILENAMEXZ.xz...\n"; + unlink("$NEWDESTI/$FILENAMEXZ.xz"); - #rmdir "$BUILDROOT/$FILENAMEXZ"; - $ret=`rm -fr $BUILDROOT/$FILENAMEXZ`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\""; - $ret=`$cmd`; + #rmdir "$BUILDROOT/$FILENAMEXZ"; + $ret=`rm -fr $BUILDROOT/$FILENAMEXZ`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\""; + $ret=`$cmd`; - $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`; # We can't remove it with exclude file, we need it for some tarball packages - print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n"; - - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - $cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*"; + print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n"; + + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + $cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*"; print $cmd."\n"; $ret= `$cmd`; - chdir("$olddir"); + chdir("$olddir"); - # Move to final dir - print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n"; - $ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`; - next; - } - - if ($target eq 'ZIP') - { - $NEWDESTI=$DESTI; - mkdir($DESTI.'/standard'); + # Move to final dir + print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n"; + $ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`; + next; + } + + if ($target eq 'ZIP') + { + $NEWDESTI=$DESTI; + mkdir($DESTI.'/standard'); if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } - print "Remove target $FILENAMEZIP.zip...\n"; - unlink("$NEWDESTI/$FILENAMEZIP.zip"); + print "Remove target $FILENAMEZIP.zip...\n"; + unlink("$NEWDESTI/$FILENAMEZIP.zip"); - #rmdir "$BUILDROOT/$FILENAMEZIP"; - $ret=`rm -fr $BUILDROOT/$FILENAMEZIP`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\""; - $ret=`$cmd`; + #rmdir "$BUILDROOT/$FILENAMEZIP"; + $ret=`rm -fr $BUILDROOT/$FILENAMEZIP`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\""; + $ret=`$cmd`; - $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`; # We can't remove it with exclude file, we need it for some tarball packages - print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n"; - - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - $cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*"; + print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n"; + + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + $cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*"; print $cmd."\n"; $ret= `$cmd`; - chdir("$olddir"); - - # Move to final dir - print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n"; - $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`; - next; - } - - if ($target =~ /RPM/) # Linux only - { - $NEWDESTI=$DESTI; - $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; } - if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; } - if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; } - mkdir($DESTI.'/'.$subdir); + chdir("$olddir"); + + # Move to final dir + print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n"; + $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`; + next; + } + + if ($target =~ /RPM/) # Linux only + { + $NEWDESTI=$DESTI; + $subdir="package_rpm_generic"; + if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; } + if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; } + if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; } + mkdir($DESTI.'/'.$subdir); if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } - print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; + print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; - print "Remove target ".$FILENAMERPM."...\n"; - unlink("$NEWDESTI/".$FILENAMERPM); - print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n"; - unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm"); + print "Remove target ".$FILENAMERPM."...\n"; + unlink("$NEWDESTI/".$FILENAMERPM); + print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n"; + unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm"); - print "Create directory $BUILDROOT/$FILENAMETGZ2\n"; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'"; - $ret=`$cmd`; + print "Create directory $BUILDROOT/$FILENAMETGZ2\n"; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; + + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'"; + $ret=`$cmd`; - # Removed files we don't need - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`; + # Removed files we don't need + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`; - print "Set permissions on files/dir\n"; - $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; - $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; - $ret=`$cmd`; + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; # Build tgz - print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; - $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; + print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; + $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; - print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n"; - $cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz"; - $ret=`$cmd`; + print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n"; + $cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz"; + $ret=`$cmd`; - $BUILDFIC="${FILENAME}.spec"; - $BUILDFICSRC="${FILENAME}_generic.spec"; - if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; } - if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; } - if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; } - - print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n"; - open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error"; - open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error"; - while () { - $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/; - $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/; - $_ =~ s/__RELEASE__/$RPMSUBVERSION/; - print SPECTO $_; - } - close SPECFROM; - close SPECTO; - - print "Copy patch file to $RPMDIR/SOURCES\n"; - $ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`; - $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`; + $BUILDFIC="${FILENAME}.spec"; + $BUILDFICSRC="${FILENAME}_generic.spec"; + if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; } + if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; } + if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; } + + print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n"; + open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error"; + open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error"; + while () { + $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/; + $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/; + $_ =~ s/__RELEASE__/$RPMSUBVERSION/; + print SPECTO $_; + } + close SPECFROM; + close SPECTO; + + print "Copy patch file to $RPMDIR/SOURCES\n"; + $ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`; + $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`; - print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n"; - #$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`; - $ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`; + print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n"; + #$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`; + $ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`; - # Move to final dir - print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n"; - $cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\""; - $ret=`$cmd`; - print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n"; - $cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\""; - $ret=`$cmd`; - print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n"; - $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\""; - $ret=`$cmd`; - next; - } + # Move to final dir + print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n"; + $cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\""; + $ret=`$cmd`; + print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n"; + $cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\""; + $ret=`$cmd`; + print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n"; + $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\""; + $ret=`$cmd`; + next; + } - if ($target eq 'DEB') - { - $NEWDESTI=$DESTI; - mkdir($DESTI.'/package_debian-ubuntu'); + if ($target eq 'DEB') + { + $NEWDESTI=$DESTI; + mkdir($DESTI.'/package_debian-ubuntu'); if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; } - $olddir=getcwd(); + $olddir=getcwd(); - print "Remove target ${FILENAMEDEB}_all.deb...\n"; - unlink("$NEWDESTI/${FILENAMEDEB}_all.deb"); - print "Remove target ${FILENAMEDEB}.dsc...\n"; - unlink("$NEWDESTI/${FILENAMEDEB}.dsc"); - print "Remove target ${FILENAMEDEB}.tar.gz...\n"; - unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz"); - print "Remove target ${FILENAMEDEB}.changes...\n"; - unlink("$NEWDESTI/${FILENAMEDEB}.changes"); - print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n"; - unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz"); - print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n"; - unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz"); + print "Remove target ${FILENAMEDEB}_all.deb...\n"; + unlink("$NEWDESTI/${FILENAMEDEB}_all.deb"); + print "Remove target ${FILENAMEDEB}.dsc...\n"; + unlink("$NEWDESTI/${FILENAMEDEB}.dsc"); + print "Remove target ${FILENAMEDEB}.tar.gz...\n"; + unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz"); + print "Remove target ${FILENAMEDEB}.changes...\n"; + unlink("$NEWDESTI/${FILENAMEDEB}.changes"); + print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n"; + unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz"); + print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n"; + unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz"); - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`; - + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; + $ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n"; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\""; $ret=`$cmd`; $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\""; $ret=`$cmd`; - print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/README-FR`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/pad/README`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/tgz/README`; - #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/changelog`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/compat`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/control*`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/copyright`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/rules`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/watch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`; - # Removed duplicate license files - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`; - # Removed files we don't need - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`; - - # Rename upstream changelog to match debian rules + print "Remove other files\n"; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/README-FR`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/pad/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/tgz/README`; + #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/changelog`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/compat`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/control*`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/copyright`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/rules`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/watch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`; + # Removed duplicate license files + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`; + # Removed files we don't need + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`; + + # Rename upstream changelog to match debian rules $ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`; - # Prepare source package (init debian dir) - print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; - $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; - print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; - # Add files for dpkg-source - $ret=`cp -f "$SOURCE/build/debian/changelog" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/compat" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/control" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/copyright" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.docs" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.install" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/rules" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/watch" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/patches" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/po" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/source" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/apache" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; - $ret=`cp -f "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; - $ret=`cp -fr "$SOURCE/build/debian/lighttpd" "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`; - # Add files also required to build binary package - $ret=`cp -f "$SOURCE/build/debian/dolibarr.config" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.templates" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/install.forced.php.install" "$BUILDROOT/$PROJECT.tmp/debian"`; - + # Prepare source package (init debian dir) + print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; + $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; + print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; + # Add files for dpkg-source + $ret=`cp -f "$SOURCE/build/debian/changelog" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/compat" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/control" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/copyright" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.docs" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.install" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/rules" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/watch" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/build/debian/patches" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/build/debian/po" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/build/debian/source" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/build/debian/apache" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; + $ret=`cp -f "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; + $ret=`cp -fr "$SOURCE/build/debian/lighttpd" "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`; + # Add files also required to build binary package + $ret=`cp -f "$SOURCE/build/debian/dolibarr.config" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.templates" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/install.forced.php.install" "$BUILDROOT/$PROJECT.tmp/debian"`; + # Set owners and permissions - #print "Set owners on files/dir\n"; - #$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; + #print "Set owners on files/dir\n"; + #$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; - print "Set permissions on files/dir\n"; - $ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`; - $cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`; - $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`; - $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - - - print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; - $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; - $ret=`$cmd`; + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`; + $cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`; + $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`; + $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + + print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; + $ret=`$cmd`; - print "Go into directory $BUILDROOT\n"; - chdir("$BUILDROOT"); + print "Go into directory $BUILDROOT\n"; + chdir("$BUILDROOT"); # We need a tarball to be able to build "quilt" debian package (not required for native but we need patch so it is not a native) - print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n"; - $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build"; - print $cmd."\n"; - $ret=`$cmd`; + print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n"; + $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build"; + print $cmd."\n"; + $ret=`$cmd`; # Creation of source package - print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; - chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); - #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; - $cmd="dpkg-buildpackage -us -uc"; - print "Launch DEB build ($cmd)\n"; - $ret=`$cmd 2>&1 3>&1`; - print $ret."\n"; + print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); + #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; + $cmd="dpkg-buildpackage -us -uc"; + print "Launch DEB build ($cmd)\n"; + $ret=`$cmd 2>&1 3>&1`; + print $ret."\n"; - chdir("$olddir"); - - print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n"; - print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n"; - - # Move to final dir - print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`; - $ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`; - $ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`; - next; - } - - if ($target eq 'APS') - { + chdir("$olddir"); + + print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n"; + print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n"; + + # Move to final dir + print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n"; + $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`; + $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`; + $ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`; + $ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`; + next; + } + + if ($target eq 'APS') + { $NEWDESTI=$DESTI; - mkdir($DESTI.'/package_aps'); + mkdir($DESTI.'/package_aps'); if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; } - $newbuild = $BUILD; - $newbuild =~ s/(dev|alpha)/0/gi; # dev - $newbuild =~ s/beta/1/gi; # beta - $newbuild =~ s/rc./2/gi; # rc - if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - # now newbuild is 0-0 or 0-3 for example - $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; - if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } - print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; - - print "Remove target $FILENAMEAPS.zip...\n"; - unlink "$NEWDESTI/$FILENAMEAPS.zip"; - - #rmdir "$BUILDROOT/$PROJECT.tmp"; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; - print "Create directory $BUILDROOT/$PROJECT.tmp\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\""; - $ret=`$cmd`; + $newbuild = $BUILD; + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc + if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example + $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; + if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } + print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; + + print "Remove target $FILENAMEAPS.zip...\n"; + unlink "$NEWDESTI/$FILENAMEAPS.zip"; - print "Remove other files\n"; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + #rmdir "$BUILDROOT/$PROJECT.tmp"; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; + print "Create directory $BUILDROOT/$PROJECT.tmp\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\""; + $ret=`$cmd`; - $APSVERSION="1.2"; - print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n"; - open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error"; - open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error"; - while () { - $newbuild = $BUILD; - $newbuild =~ s/(dev|alpha)/0/gi; # dev - $newbuild =~ s/beta/1/gi; # beta - $newbuild =~ s/rc./2/gi; # rc - if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - # now newbuild is 0-0 or 0-3 for example - $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/; - $_ =~ s/__RELEASE__/$RPMSUBVERSION/; - print SPECTO $_; - } - close SPECFROM; - close SPECTO; - print "Version set to $MAJOR.$MINOR.$newbuild\n"; - #$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\""; - #$ret=`$cmd`; - $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\""; - $ret=`$cmd`; - $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\""; - $ret=`$cmd`; - - print "Remove other files\n"; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`; - - print "Build APP-LIST.xml files\n"; - - print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n"; - - print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT"); - $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*"; - print $cmd."\n"; - $ret= `$cmd`; - chdir("$olddir"); - - # Move to final dir - print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n"; - $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`; - next; - } + print "Remove other files\n"; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - if ($target eq 'EXEDOLIWAMP') - { - $NEWDESTI=$DESTI; - mkdir($DESTI.'/package_windows'); + $APSVERSION="1.2"; + print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n"; + open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error"; + open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error"; + while () { + $newbuild = $BUILD; + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc + if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example + $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/; + $_ =~ s/__RELEASE__/$RPMSUBVERSION/; + print SPECTO $_; + } + close SPECFROM; + close SPECTO; + print "Version set to $MAJOR.$MINOR.$newbuild\n"; + #$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\""; + #$ret=`$cmd`; + $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\""; + $ret=`$cmd`; + $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\""; + $ret=`$cmd`; + + print "Remove other files\n"; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`; + + print "Build APP-LIST.xml files\n"; + + print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n"; + + print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT"); + $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*"; + print $cmd."\n"; + $ret= `$cmd`; + chdir("$olddir"); + + # Move to final dir + print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n"; + $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`; + next; + } + + if ($target eq 'EXEDOLIWAMP') + { + $NEWDESTI=$DESTI; + mkdir($DESTI.'/package_windows'); if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; } - - print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; - unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; - - $SOURCEBACK=$SOURCE; - $SOURCEBACK =~ s/\//\\/g; - print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; - $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\""; + + print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; + unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; + + $SOURCEBACK=$SOURCE; + $SOURCEBACK =~ s/\//\\/g; + print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; + $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\""; print "$cmd\n"; $ret= `$cmd`; #print "$ret\n"; - # Move to final dir + # Move to final dir print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; - rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); - print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; - $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; - next; - } - } + rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); + print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; + $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; + next; + } + } - # Publish package for each target - #-------------------------------- - foreach my $target (keys %CHOOSEDPUBLISH) - { - if ($CHOOSEDPUBLISH{$target} < 0) { next; } - + # Publish package for each target + #-------------------------------- + foreach my $target (keys %CHOOSEDPUBLISH) + { + if ($CHOOSEDPUBLISH{$target} < 0) { next; } + print "\nList of files to publish\n"; - %filestoscansf=( - "$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)', - "$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)', - "$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)', - "$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM', - "$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM' - ); - use POSIX qw/strftime/; - foreach my $file (sort keys %filestoscansf) - { - $found=0; - my $filesize = -s $file; - my $filedate = (stat $file)[9]; - print $file." ".($filesize?"(found)":"(not found)"); - print ($filesize?" - ".$filesize:""); - print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):""); - print "\n"; - } + %filestoscansf=( + "$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)', + "$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)', + "$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)', + "$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM', + "$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM' + ); + use POSIX qw/strftime/; + foreach my $file (sort keys %filestoscansf) + { + $found=0; + my $filesize = -s $file; + my $filedate = (stat $file)[9]; + print $file." ".($filesize?"(found)":"(not found)"); + print ($filesize?" - ".$filesize:""); + print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):""); + print "\n"; + } - if ($target eq 'SF' || $target eq 'ASSO') - { - print "\n"; - - if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; } + if ($target eq 'SF' || $target eq 'ASSO') + { + print "\n"; + + if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; } if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i) { $PUBLISH = $PUBLISHBETARC.'/lastbuild'; } if ($target eq 'ASSO' && $BUILD =~ /^[0-9]+$/) { $PUBLISH = $PUBLISHBETARC.'/stable'; } - $NEWPUBLISH=$PUBLISH; - print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n"; + $NEWPUBLISH=$PUBLISH; + print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n"; - # Ask which target to build - $NUM_SCRIPT=; - chomp($NUM_SCRIPT); + # Ask which target to build + $NUM_SCRIPT=; + chomp($NUM_SCRIPT); print "Create empty dir /tmp/emptydir. We need it to create target dir using rsync.\n"; - $ret=`mkdir -p "/tmp/emptydir/"`; - - %filestoscan=%filestoscansf; - - foreach my $file (sort keys %filestoscan) - { - $found=0; - my $filesize = -s $file; - if (! $filesize) { next; } + $ret=`mkdir -p "/tmp/emptydir/"`; + + %filestoscan=%filestoscansf; + + foreach my $file (sort keys %filestoscan) + { + $found=0; + my $filesize = -s $file; + if (! $filesize) { next; } print "\n"; - print "Publish file ".$file." to ".$filestoscan{$file}."\n"; - - $destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD; + print "Publish file ".$file." to ".$filestoscan{$file}."\n"; + + $destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD; # mkdir #my $ssh = Net::SSH::Perl->new("frs.sourceforge.net"); #$ssh->login("$user","$pass"); - #use String::ShellQuote qw( shell_quote ); + #use String::ShellQuote qw( shell_quote ); #$ssh->cmd('mkdir '.shell_quote($destFolder).' && exit'); #use Net::SFTP::Foreign; @@ -1045,23 +1045,23 @@ if ($nboftargetok) { print "$command\n"; my $ret=`$command 2>&1`; print "$ret\n"; - } - } - } + } + } + } } print "\n----- Summary -----\n"; foreach my $target (keys %CHOOSEDTARGET) { - if ($CHOOSEDTARGET{$target} < 0) { - print "Package $target not built (bad requirement).\n"; - } else { - print "Package $target built successfully in $DESTI\n"; - } + if ($CHOOSEDTARGET{$target} < 0) { + print "Package $target not built (bad requirement).\n"; + } else { + print "Package $target built successfully in $DESTI\n"; + } } if (! $batch) { - print "\nPress key to finish..."; - my $WAITKEY=; + print "\nPress key to finish..."; + my $WAITKEY=; } 0; From 4ff570571e46012f29c4bae291fdb2f985782b0b Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Wed, 29 Oct 2014 05:13:15 +0100 Subject: [PATCH 0375/1190] Added SOAP client for creating a client order in remote webservice that thirdparty might have. --- htdocs/fourn/commande/card.php | 507 ++++++++++++++++++++++++++------- 1 file changed, 400 insertions(+), 107 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index da4f13e6d53..72c091ff156 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -43,7 +43,9 @@ if (!empty($conf->produit->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +$langs->load('admin'); $langs->load('orders'); $langs->load('sendings'); $langs->load('companies'); @@ -1044,6 +1046,91 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } } +if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel')) +{ + $ws_host = GETPOST('ws_host','alpha'); + $ws_key = GETPOST('ws_key','alpha'); + $ws_user = GETPOST('ws_user','alpha'); + $ws_password = GETPOST('ws_password','alpha'); + $ws_entity = GETPOST('ws_entity','int'); + $ws_thirdparty = GETPOST('ws_thirdparty','int'); + + // NS and Authentication parameters + $ws_ns='http://www.dolibarr.org/ns/'; + $ws_authentication=array( + 'dolibarrkey'=>$ws_key, + 'sourceapplication'=>'DolibarrWebServiceClient', + 'login'=>$ws_user, + 'password'=>$ws_password, + 'entity'=>$ws_entity + ); + + //Is everything filled? + if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) { + setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); + } + else + { + //Create SOAP client and connect it to order + $soapclient_order = new nusoap_client($ws_host."/webservices/server_order.php"); + $soapclient_order->soap_defencoding='UTF-8'; + $soapclient_order->decodeUTF8(false); + + //Create SOAP client and connect it to product/service + $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php"); + $soapclient_product->soap_defencoding='UTF-8'; + $soapclient_product->decodeUTF8(false); + + //Prepare the order lines from order + $order_lines = array(); + foreach ($object->lines as $line) + { + $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $line->ref_supplier); + $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, ''); + + if ($result_product["result"]["result_code"] == "OK") + { + $order_lines[] = array( + 'desc' => $line->product_desc, + 'type' => $line->product_type, + 'product_id' => $result_product["product"]["id"], + 'vat_rate' => $line->tva_tx, + 'qty' => $line->qty, + 'price' => $line->price, + 'unitprice' => $line->subprice, + 'total_net' => $line->total_ht, + 'total_vat' => $line->total_tva, + 'total' => $line->total_ttc, + 'date_start' => $line->date_start, + 'date_end' => $line->date_end, + ); + } + } + + //Prepare the order header + $order = array( + 'thirdparty_id' => $ws_thirdparty, + 'date' => dol_print_date(dol_now(),'dayrfc'), + 'total_net' => $object->total_ht, + 'total_var' => $object->total_tva, + 'total' => $object->total_ttc, + 'lines' => $order_lines + ); + + $ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order); + $result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, ''); + + if ($result_order["result"]["result_code"] != "OK") + { + setEventMessage($langs->trans("SOAPError").$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors'); + } + else + { + setEventMessage($langs->trans("RemoteOrderRef").$result_order["ref"], 'mesgs'); + } + } +} + if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer) { if ($action == 'addcontact') @@ -1769,7 +1856,313 @@ elseif (! empty($object->id)) dol_fiche_end(); - if ($action != 'presend') + /* + * Action presend + */ + if ($action == 'presend') + { + $ref = dol_sanitizeFileName($object->ref); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/')); + $file=$fileparams['fullname']; + + // Define output language + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) + $newlang = $_REQUEST['lang_id']; + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) + $newlang = $object->client->default_lang; + + if (!empty($newlang)) + { + $outputlangs = new Translate('', $conf); + $outputlangs->setDefaultLang($newlang); + $outputlangs->load('commercial'); + } + + // Build document if it not exists + if (! $file || ! is_readable($file)) + { + $result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result <= 0) + { + dol_print_error($db,$result); + exit; + } + $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/')); + $file=$fileparams['fullname']; + } + + print '
    '; + + print_titre($langs->trans('SendOrderByMail')); + + // Cree l'objet formulaire mail + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; + $formmail = new FormMail($db); + $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang); + $formmail->fromtype = 'user'; + $formmail->fromid = $user->id; + $formmail->fromname = $user->getFullName($langs); + $formmail->frommail = $user->email; + $formmail->withfrom=1; + $liste=array(); + foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; + $formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste; + $formmail->withtocc=$liste; + $formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false); + $formmail->withtopic=$outputlangs->trans('SendOrderRef','__ORDERREF__'); + $formmail->withfile=2; + $formmail->withbody=1; + $formmail->withdeliveryreceipt=1; + $formmail->withcancel=1; + // Tableau des substitutions + $formmail->substit['__ORDERREF__']=$object->ref; + $formmail->substit['__SIGNATURE__']=$user->signature; + $formmail->substit['__PERSONALIZED__']=''; + $formmail->substit['__CONTACTCIVNAME__']=''; + + //Find the good contact adress + $custcontact=''; + $contactarr=array(); + $contactarr=$object->liste_contact(-1,'external'); + + if (is_array($contactarr) && count($contactarr)>0) { + foreach($contactarr as $contact) { + if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) { + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; + $contactstatic=new Contact($db); + $contactstatic->fetch($contact['id']); + $custcontact=$contactstatic->getFullName($langs,1); + } + } + + if (!empty($custcontact)) { + $formmail->substit['__CONTACTCIVNAME__']=$custcontact; + } + } + + // Tableau des parametres complementaires + $formmail->param['action']='send'; + $formmail->param['models']='order_supplier_send'; + $formmail->param['orderid']=$object->id; + $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id; + + // Init list of files + if (GETPOST("mode")=='init') + { + $formmail->clear_attached_files(); + $formmail->add_attached_files($file,basename($file),dol_mimetype($file)); + } + + // Show form + print $formmail->get_form(); + + print '
    '; + } + /* + * Action webservice + */ + elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel')) + { + $mode = GETPOST('mode', 'alpha'); + $ws_host = GETPOST('ws_host','alpha'); + $ws_key = GETPOST('ws_key','alpha'); + $ws_user = GETPOST('ws_user','alpha'); + $ws_password = GETPOST('ws_password','alpha'); + + // NS and Authentication parameters + $ws_ns = 'http://www.dolibarr.org/ns/'; + $ws_authentication = array( + 'dolibarrkey'=>$ws_key, + 'sourceapplication'=>'DolibarrWebServiceClient', + 'login'=>$ws_user, + 'password'=>$ws_password, + 'entity'=>'' + ); + + print_titre($langs->trans('CreateRemoteOrder')); + + //Is everything filled? + if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password))) { + setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); + $mode = "init"; + } + + if ($mode == "init") + { + //Table/form header + print ''; + print ''; + print ''; + print ''; + print ''; + $textinput_size = "50"; + + //Remote Host URL + print ''; + + //Remote Webservices key + print ''; + + //Remote User + print ''; + + //Remote Password + print ''; + + //Submit and cancel buttons + print ''; + + //End table/form + print ''; + print '
    '.$langs->trans("Host").'
    '.$langs->trans("KeyForWebServicesAccess").'
    '.$langs->trans("User").'
    '.$langs->trans("Password").'
    '; + print ''; + print '     '; + print ''; + print '
    '; + } + elseif ($mode == "check") + { + $ws_entity = ''; + $ws_thirdparty = ''; + $error_occurred = false; + + //Check if has transport, without any the soap client will give error + if (strpos($ws_host, "http") === false) + { + $ws_host = "http://".$ws_host; + } + + //Create SOAP client and connect it to user + $soapclient_user = new nusoap_client($ws_host."/webservices/server_user.php"); + $soapclient_user->soap_defencoding='UTF-8'; + $soapclient_user->decodeUTF8(false); + + //Get the thirdparty associated to user + $ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user); + $result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, ''); + $user_status_code = $result_user["result"]["result_code"]; + + if ($user_status_code == "OK") + { + //Fill the variables + $ws_entity = $result_user["user"]["entity"]; + $ws_authentication['entity'] = $ws_entity; + $ws_thirdparty = $result_user["user"]["fk_thirdparty"]; + if (empty($ws_thirdparty)) + { + setEventMessage($langs->trans("RemoteUserMissingAssociatedSoc"), 'errors'); + } + else + { + //Create SOAP client and connect it to product/service + $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php"); + $soapclient_product->soap_defencoding='UTF-8'; + $soapclient_product->decodeUTF8(false); + + // Iterate each line and get the reference that uses the supplier of that product/service + $i = 0; + foreach ($object->lines as $line) { + $i = $i + 1; + $ref_supplier = $line->ref_supplier; + $line_id = $i."º) ".$line->product_ref.": "; + if (empty($ref_supplier)) { + continue; + } + $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier); + $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, ''); + if (!$result_product) + { + setEventMessage($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, 'errors'); + $error_occurred = true; + break; + } + + // Check the result code + $status_code = $result_product["result"]["result_code"]; + if ($status_code != "OK") + { + if ($status_code == "NOT_FOUND") + { + setEventMessage($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", 'warnings'); + } + else + { + setEventMessage($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", 'errors'); + $error_occurred = true; + break; + } + } + + + // Ensure that price is equal and warn user if it's not + $supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr + $local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found + + $product_fourn = new ProductFournisseur($db); + $product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product); + if (count($product_fourn_list)>0) + { + foreach($product_fourn_list as $product_fourn_line) + { + //Only accept the line where the supplier is the same at this order and has the same ref + if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) { + $local_price = price($product_fourn_line->fourn_price); + } + } + } + + if ($local_price != NULL && $local_price != $supplier_price) { + setEventMessage($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, 'warnings'); + } + + // Check if is in sale + if (empty($result_product["product"]["status_tosell"])) { + setEventMessage($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", 'warnings'); + } + } + } + + } + elseif ($user_status_code == "PERMISSION_DENIED") + { + setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors'); + } + else + { + setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors'); + } + + //Form + print '
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + if ($error_occurred) + { + print "
    ".$langs->trans("ErrorOccurredReviseAndRetry")."
    "; //TODO: Translate + } + else + { + print ''; + print '     '; + } + print ''; + print '
    '; + } + } + /* + * Show buttons + */ + else { /** * Boutons actions @@ -1849,6 +2242,12 @@ elseif (! empty($object->id)) //} } + // Create a remote order using WebService + if ($object->statut >= 2) // 2 means accepted + { + print ''.$langs->trans('CreateRemoteOrder').''; + } + // Cancel if ($object->statut == 2) { @@ -1975,112 +2374,6 @@ elseif (! empty($object->id)) print '
    '; } - /* - * Action presend - */ - if ($action == 'presend') - { - $ref = dol_sanitizeFileName($object->ref); - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/')); - $file=$fileparams['fullname']; - - // Define output language - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) - $newlang = $_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) - $newlang = $object->client->default_lang; - - if (!empty($newlang)) - { - $outputlangs = new Translate('', $conf); - $outputlangs->setDefaultLang($newlang); - $outputlangs->load('commercial'); - } - - // Build document if it not exists - if (! $file || ! is_readable($file)) - { - $result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - if ($result <= 0) - { - dol_print_error($db,$result); - exit; - } - $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/')); - $file=$fileparams['fullname']; - } - - print '
    '; - - print_titre($langs->trans('SendOrderByMail')); - - // Cree l'objet formulaire mail - include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; - $formmail = new FormMail($db); - $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang); - $formmail->fromtype = 'user'; - $formmail->fromid = $user->id; - $formmail->fromname = $user->getFullName($langs); - $formmail->frommail = $user->email; - $formmail->withfrom=1; - $liste=array(); - foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; - $formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste; - $formmail->withtocc=$liste; - $formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false); - $formmail->withtopic=$outputlangs->trans('SendOrderRef','__ORDERREF__'); - $formmail->withfile=2; - $formmail->withbody=1; - $formmail->withdeliveryreceipt=1; - $formmail->withcancel=1; - // Tableau des substitutions - $formmail->substit['__ORDERREF__']=$object->ref; - $formmail->substit['__SIGNATURE__']=$user->signature; - $formmail->substit['__PERSONALIZED__']=''; - $formmail->substit['__CONTACTCIVNAME__']=''; - - //Find the good contact adress - $custcontact=''; - $contactarr=array(); - $contactarr=$object->liste_contact(-1,'external'); - - if (is_array($contactarr) && count($contactarr)>0) { - foreach($contactarr as $contact) { - if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) { - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - $contactstatic=new Contact($db); - $contactstatic->fetch($contact['id']); - $custcontact=$contactstatic->getFullName($langs,1); - } - } - - if (!empty($custcontact)) { - $formmail->substit['__CONTACTCIVNAME__']=$custcontact; - } - } - - // Tableau des parametres complementaires - $formmail->param['action']='send'; - $formmail->param['models']='order_supplier_send'; - $formmail->param['orderid']=$object->id; - $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id; - - // Init list of files - if (GETPOST("mode")=='init') - { - $formmail->clear_attached_files(); - $formmail->add_attached_files($file,basename($file),dol_mimetype($file)); - } - - // Show form - print $formmail->get_form(); - - print '
    '; - } - print ''; } From e875f0c2b8c402fd7f10a11f8b8e903f7380d6fb Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Wed, 29 Oct 2014 05:33:59 +0100 Subject: [PATCH 0376/1190] Fixed missing separator --- htdocs/fourn/commande/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 72c091ff156..b8d9d74e147 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1122,11 +1122,11 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST(' if ($result_order["result"]["result_code"] != "OK") { - setEventMessage($langs->trans("SOAPError").$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors'); + setEventMessage($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors'); } else { - setEventMessage($langs->trans("RemoteOrderRef").$result_order["ref"], 'mesgs'); + setEventMessage($langs->trans("RemoteOrderRef")." ".$result_order["ref"], 'mesgs'); } } } From fa61faec589d4c7b2033e240451461a67b92e304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacio=20Jos=C3=A9=20Lizar=C3=A1n=20Rus?= Date: Wed, 29 Oct 2014 17:43:01 +0100 Subject: [PATCH 0377/1190] Update server_invoice.php Create Facture with mode_reglement and cond_reglement using thirdparty information. --- htdocs/webservices/server_invoice.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index ef87beace53..9c5bd24b463 100644 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -525,7 +525,15 @@ function createInvoice($authentication,$invoice) $newobject->statut=0; // We start with status draft $newobject->fk_project=$invoice['project_id']; $newobject->date_creation=$now; - $newobject->mode_reglement_id = $invoice['payment_mode_id']; + + //take mode_reglement and cond_reglement from thirdparty + $soc = new Societe($db); + $res=$soc->fetch($newobject->socid); + if ($res > 0) { + $newobject->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id; + $newobject->cond_reglement_id = $soc->cond_reglement_id; + } + else $newobject->mode_reglement_id = $invoice['payment_mode_id']; // Trick because nusoap does not store data with same structure if there is one or several lines $arrayoflines=array(); From 3243958a7043be4820cf1ec0db815db1e1e75bc5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 29 Oct 2014 18:01:51 +0100 Subject: [PATCH 0378/1190] New: getNomUrl can point to different page for tasks --- htdocs/projet/class/task.class.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 25006a81047..7730abb77cc 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -143,7 +143,7 @@ class Task extends CommonObject } // Update extrafield - if (! $error) + if (! $error) { if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used { @@ -480,15 +480,16 @@ class Task extends CommonObject * * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param int $option Sur quoi pointe le lien + * @param int $mode Mode 'task', 'time', 'contact', 'note', document' define page to link to. * @return string Chaine avec URL */ - function getNomUrl($withpicto=0,$option='') + function getNomUrl($withpicto=0,$option='',$mode='task') { global $langs; $result=''; - $lien = ''; + $lien = ''; $lienfin=''; $picto='projecttask'; @@ -746,7 +747,7 @@ class Task extends CommonObject // Clean parameters if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note); if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date; - + $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time ("; @@ -832,9 +833,9 @@ class Task extends CommonObject global $langs; if (empty($id)) $id=$this->id; - + $result=array(); - + $sql = "SELECT"; $sql.= " MIN(t.task_datehour) as min_date,"; $sql.= " MAX(t.task_datehour) as max_date,"; @@ -925,7 +926,7 @@ class Task extends CommonObject // Clean parameters if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date; if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note); - + $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET"; From a0c9af2385727ed50082d83c7898b63458e566dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 29 Oct 2014 20:21:24 +0100 Subject: [PATCH 0379/1190] New: Can filter on date into tab "Referring object" of a project. --- ChangeLog | 1 + htdocs/core/class/html.formprojet.class.php | 29 ++++++--- htdocs/core/lib/date.lib.php | 6 +- htdocs/projet/class/project.class.php | 29 +++++++-- htdocs/projet/element.php | 68 +++++++++++++++++++-- 5 files changed, 112 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36439c46288..6d9cd5a0fef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Can filter on date into tab "Referring object" of a project. - New: Module notification has been enhanced: EMail use now language of target contact. Can also define a fixed email for notifications. diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index eafe9d9f166..1a40d938329 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -167,15 +167,15 @@ class FormProjets } /** - * Build Select List of element associable to a project + * Build a HTML select list of element of same thirdparty to suggest to link them to project * - * @param string $table_element Table of the element to update - * @param int $socid socid to filter - * @return string The HTML select list of element + * @param string $table_element Table of the element to update + * @param int $socid socid to filter + * @return string The HTML select list of element */ function select_element($table_element,$socid=0) { - global $conf; + global $conf, $langs; $projectkey="fk_projet"; switch ($table_element) @@ -184,7 +184,10 @@ class FormProjets $sql = "SELECT rowid, facnumber as ref"; break; case "facture_fourn": - $sql = "SELECT rowid, ref"; + $sql = "SELECT rowid, ref, ref_supplier"; + break; + case "commande_fourn": + $sql = "SELECT rowid, ref, ref_supplier"; break; case "facture_rec": $sql = "SELECT rowid, titre as ref"; @@ -219,14 +222,22 @@ class FormProjets while ($i < $num) { $obj = $this->db->fetch_object($resql); - $sellist .=''; + $ref=$obj->ref?$obj->ref:$obj->rowid; + if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')'; + $sellist .=''; $i++; } $sellist .=''; } - return $sellist ; - + /*else + { + $sellist = ''; + }*/ $this->db->free($resql); + + return $sellist ; }else { $this->error=$this->db->lasterror(); dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR); diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index eaf6b9e83dd..a95bbec6b72 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -443,10 +443,11 @@ function dol_get_next_week($day, $week, $month, $year) * @param mixed $gm False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date. * Exemple: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, after a dol_print_date will return 1970-01-01 00:00:00 * Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, after a dol_print_date will return 1970-01-01 00:00:00 - * @return int Date for first day + * @return int Date for first day, '' if error */ function dol_get_first_day($year,$month=1,$gm=false) { + if ($year > 9999) return ''; return dol_mktime(0,0,0,$month,1,$year,$gm); } @@ -456,10 +457,11 @@ function dol_get_first_day($year,$month=1,$gm=false) * @param int $year Year * @param int $month Month * @param boolean $gm False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date. - * @return int Date for first day + * @return int Date for first day, '' if error */ function dol_get_last_day($year,$month=12,$gm=false) { + if ($year > 9999) return ''; if ($month == 12) { $month = 1; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 9659eb2ffe8..f294fa560ac 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -388,19 +388,38 @@ class Project extends CommonObject /** * Return list of elements for type linked to project * - * @param string $type 'propal','order','invoice','order_supplier','invoice_supplier' - * @param string $tablename name of table associated of the type - * @return array List of orders linked to project, <0 if error + * @param string $type 'propal','order','invoice','order_supplier','invoice_supplier' + * @param string $tablename name of table associated of the type + * @param string $datefieldname name of table associated of the type + * @param string $dates Start date (at 00:00:00) + * @param string $datee End date (at 23:00:00) + * @return mixed List of orders linked to project, < 0 or string if error */ - function get_element_list($type, $tablename) + function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='') { $elements = array(); if ($type == 'agenda') + { $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id; + } else + { $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id; - if (! $sql) return -1; + } + if ($dates > 0) + { + if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date; + if (empty($datefieldname)) return 'Error this object has no date field defined'; + $sql.=" AND ".$datefieldname." >= '".$this->db->jdate($dates)."'"; + } + if ($datee > 0) + { + if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date; + if (empty($datefieldname)) return 'Error this object has no date field defined'; + $sql.=" AND ".$datefieldname." <= '".$this->db->jdate($datee)."'"; + } + if (! $sql) return -1; //print $sql; dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 67109c450b6..d7e56c2d295 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -28,6 +28,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'; @@ -50,7 +51,20 @@ if (! empty($conf->ficheinter->enabled)) $langs->load("interventions"); $projectid=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); $action=GETPOST('action','alpha'); - +$datesrfc=GETPOST('datesrfc'); +$dateerfc=GETPOST('dateerfc'); +$dates=dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear')); +$datee=dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear')); +if (empty($dates) && ! empty($datesrfc)) $dates=dol_stringtotime($datesrfc); +if (empty($datee) && ! empty($dateerfc)) $datee=dol_stringtotime($dateerfc); +if (! isset($_POST['datesrfc']) && ! isset($_POST['datesday'])) +{ + $new=dol_now(); + $tmp=dol_getdate($new); + //$datee=$now + //$dates=dol_time_plus_duree($datee, -1, 'y'); + $dates=dol_get_first_day($tmp['year'],1); +} if ($projectid == '' && $ref == '') { dol_print_error('','Bad parameter'); @@ -153,49 +167,58 @@ $listofreferent=array( 'title'=>"ListProposalsAssociatedProject", 'class'=>'Propal', 'table'=>'propal', + 'datefieldname'=>'datep', 'test'=>$conf->propal->enabled && $user->rights->propale->lire), 'order'=>array( 'title'=>"ListOrdersAssociatedProject", 'class'=>'Commande', 'table'=>'commande', + 'datefieldname'=>'date_commande', 'test'=>$conf->commande->enabled && $user->rights->commande->lire), 'invoice'=>array( 'title'=>"ListInvoicesAssociatedProject", 'class'=>'Facture', 'margin'=>'add', 'table'=>'facture', + 'datefieldname'=>'datef', 'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'invoice_predefined'=>array( 'title'=>"ListPredefinedInvoicesAssociatedProject", 'class'=>'FactureRec', 'table'=>'facture_rec', + 'datefieldname'=>'datec', 'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'order_supplier'=>array( 'title'=>"ListSupplierOrdersAssociatedProject", 'class'=>'CommandeFournisseur', 'table'=>'commande_fournisseur', + 'datefieldname'=>'date_commande', 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire), 'invoice_supplier'=>array( 'title'=>"ListSupplierInvoicesAssociatedProject", 'class'=>'FactureFournisseur', 'margin'=>'minus', 'table'=>'facture_fourn', + 'datefieldname'=>'datef', 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire), 'contract'=>array( 'title'=>"ListContractAssociatedProject", 'class'=>'Contrat', 'table'=>'contrat', + 'datefieldname'=>'date_contrat', 'test'=>$conf->contrat->enabled && $user->rights->contrat->lire), 'intervention'=>array( 'title'=>"ListFichinterAssociatedProject", 'class'=>'Fichinter', 'table'=>'fichinter', + 'datefieldname'=>'date_valid', 'disableamount'=>1, 'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire), 'trip'=>array( 'title'=>"ListTripAssociatedProject", 'class'=>'Deplacement', 'table'=>'deplacement', + 'datefieldname'=>'dated', 'margin'=>'minus', 'disableamount'=>1, 'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire), @@ -203,6 +226,7 @@ $listofreferent=array( 'title'=>"ListActionsAssociatedProject", 'class'=>'ActionComm', 'table'=>'actioncomm', + 'datefieldname'=>'datep', 'disableamount'=>1, 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire) ); @@ -216,25 +240,49 @@ if ($action=="addelement") setEventMessage($mailchimp->error,'errors'); } }elseif ($action == "unlink") { - + $tablename = GETPOST("tablename"); $elementselectid = GETPOST("elementselect"); - + $result = $project->remove_element($tablename, $elementselectid); if ($result < 0) { setEventMessage($project->error, 'errors'); } } +$showdatefilter=0; foreach ($listofreferent as $key => $value) { $title=$value['title']; $classname=$value['class']; $tablename=$value['table']; + $datefieldname=$value['datefieldname']; $qualified=$value['test']; if ($qualified) { + if (! $showdatefilter) + { + print '
    '; + print ''; + print ''; + print ''; + //print ''; + print ''; + print ''; + print ''; + print '
    '.$langs->trans("Filter").':'.$langs->trans("From").' '; + print $form->select_date($dates,'dates',0,0,1); + print ''.$langs->trans("to").' '; + print $form->select_date($datee,'datee',0,0,1); + print ''; + print ''; + print '
    '; + print '

    '; + + $showdatefilter++; + } + print '
    '; print_titre($langs->trans($title)); @@ -247,6 +295,8 @@ foreach ($listofreferent as $key => $value) print '
    '; print ''; print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -260,11 +310,13 @@ foreach ($listofreferent as $key => $value) print ''; print ''; if (empty($value['disableamount'])) print ''; + else print ''; if (empty($value['disableamount'])) print ''; + else print ''; print ''; print ''; - $elementarray = $project->get_element_list($key, $tablename); - if (count($elementarray)>0 && is_array($elementarray)) + $elementarray = $project->get_element_list($key, $tablename, $datefieldname, $dates, $datee); + if (is_array($elementarray) && count($elementarray)>0) { $var=true; $total_ht = 0; @@ -314,6 +366,7 @@ foreach ($listofreferent as $key => $value) if (! $qualifiedfortotal) print ''; print ''; } + else print ''; // Amount if (empty($value['disableamount'])) @@ -324,6 +377,7 @@ foreach ($listofreferent as $key => $value) if (! $qualifiedfortotal) print ''; print ''; } + else print ''; // Status print ''; @@ -343,6 +397,10 @@ foreach ($listofreferent as $key => $value) print ''; print ''; } + else // error + { + print $elementarray; + } print "
    '.$langs->trans("SelectElement").''.$selectList.''.$langs->trans("Date").''.$langs->trans("ThirdParty").''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("Status").'
    '.$element->getLibStatut(5).' 
    "; From 65b73ab778b5dcc4709867fb51b9d8e4ccdcb779 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 29 Oct 2014 20:24:33 +0100 Subject: [PATCH 0380/1190] Fix: td balance --- htdocs/projet/element.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index d7e56c2d295..c7f772ef93d 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -393,7 +393,9 @@ foreach ($listofreferent as $key => $value) print ''.$langs->trans("Number").': '.$i.''; if (empty($value['disableamount'])) print ''.$langs->trans("TotalHT").' : '.price($total_ht).''; + else print ''; if (empty($value['disableamount'])) print ''.$langs->trans("TotalTTC").' : '.price($total_ttc).''; + else print ''; print ' '; print ''; } From c5045a75d8884fe8ce871c3836137b57793be8d5 Mon Sep 17 00:00:00 2001 From: jfefe Date: Thu, 30 Oct 2014 01:16:37 +0100 Subject: [PATCH 0381/1190] Missing trans key into resource module --- htdocs/langs/en_US/resource.lang | 4 +++- htdocs/langs/fr_FR/resource.lang | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang index 502d328d7c3..b17cae82f29 100755 --- a/htdocs/langs/en_US/resource.lang +++ b/htdocs/langs/en_US/resource.lang @@ -32,4 +32,6 @@ ResourceLinkedWithSuccess=Resource linked with success TitleResourceCard=Resource card ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources \ No newline at end of file +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang index e4c8a6ade87..5059d628092 100755 --- a/htdocs/langs/fr_FR/resource.lang +++ b/htdocs/langs/fr_FR/resource.lang @@ -32,4 +32,6 @@ ResourceLinkedWithSuccess=Ressource liée avec succès TitleResourceCard=Fiche ressource ConfirmDeleteResource=Confirmer la suppression de cette ressource? RessourceSuccessfullyDeleted=Ressource effacée avec succès -DictionaryResourceType=Type de ressources \ No newline at end of file +DictionaryResourceType=Type de ressources + +SelectResource=Sélectionner la ressource From e370ffb2d44cdd453fde42e48e9955908f073330 Mon Sep 17 00:00:00 2001 From: jfefe Date: Thu, 30 Oct 2014 01:33:39 +0100 Subject: [PATCH 0382/1190] Bad function call --- htdocs/resource/class/resource.class.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 9cf6a83ef1d..d9ad13f83b1 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -23,8 +23,8 @@ */ // Put here all includes required by your class file -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); - +require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"; /** * DAO Resource object @@ -330,12 +330,12 @@ class Resource extends CommonObject function delete($rowid, $notrigger=0) { global $user,$langs,$conf; - + $error=0; - + $sql = "DELETE FROM ".MAIN_DB_PREFIX."resource"; $sql.= " WHERE rowid =".$rowid; - + dol_syslog(get_class($this)."::delete sql=".$sql); if ($this->db->query($sql)) { @@ -355,7 +355,7 @@ class Resource extends CommonObject } // End call triggers } - + return 1; } else { @@ -371,7 +371,7 @@ class Resource extends CommonObject return -1; } } - + /** * Load resource objects into $this->lines * @@ -507,9 +507,9 @@ class Resource extends CommonObject $line->fk_user_create = $obj->fk_user_create; if($obj->resource_id && $obj->resource_type) - $line->objresource = $this->fetchObjectByElement($obj->resource_id,$obj->resource_type); + $line->objresource = fetchObjectByElement($obj->resource_id,$obj->resource_type); if($obj->element_id && $obj->element_type) - $line->objelement = $this->fetchObjectByElement($obj->element_id,$obj->element_type); + $line->objelement = fetchObjectByElement($obj->element_id,$obj->element_type); $this->lines[$i] = $line; $i++; @@ -591,7 +591,7 @@ class Resource extends CommonObject $line->mandatory = $obj->mandatory; $line->fk_user_create = $obj->fk_user_create; - $this->lines[$i] = $this->fetchObjectByElement($obj->resource_id,$obj->resource_type); + $this->lines[$i] = fetchObjectByElement($obj->resource_id,$obj->resource_type); $i++; } @@ -814,7 +814,7 @@ class Resource extends CommonObject $i=0; foreach($resources as $nb => $resource) { - $this->lines[$i] = $this->fetchObjectByElement($resource['resource_id'],$resource['resource_type']); + $this->lines[$i] = fetchObjectByElement($resource['resource_id'],$resource['resource_type']); $i++; } return $i; From 106b4a669f203f2791ff1a607ca691d298e4b43d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 11:15:13 +0100 Subject: [PATCH 0383/1190] id_parent and id_children was not set. So introduce new method to return same with no risk to break current working code to address this. --- htdocs/user/class/user.class.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 6f59ac5eadf..afb53bb5a5e 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2220,8 +2220,6 @@ class User extends CommonObject * Reconstruit l'arborescence hierarchique des users sous la forme d'un tableau * Renvoi un tableau de tableau('id','id_parent',...) trie selon arbre et avec: * id = id du user - * id_parent = id du user parent - * id_children = tableau des id enfant * name = nom du user * fullname = nom avec chemin complet du user * fullpath = chemin complet compose des id @@ -2306,6 +2304,29 @@ class User extends CommonObject return $this->users; } + /** + * Return list of all childs users in herarchy. + * + * @return array Array of user id lower than user. This overwrite this->users. + */ + function getAllChildIds() + { + // Init this->users + $this->get_full_tree(); + + $idtoscan=$this->id; + $childids=array(); + + dol_syslog("Build childid for id = ".$idtoscan); + foreach($this->users as $id => $val) + { + //var_dump($val['fullpath']); + if (preg_match('/_'.$idtoscan.'_/', $val['fullpath'])) $childids[$val['id']]=$val['id']; + } + + return $childids; + } + /** * For user id_user and its childs available in this->users, define property fullpath and fullname * From 750944d7182aadc29ffe868b0af5286ea6acc44a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 11:16:01 +0100 Subject: [PATCH 0384/1190] Fix: var not initialised --- htdocs/core/class/html.form.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8848adea948..8e369151fd7 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1145,6 +1145,9 @@ class Form // If no preselected user defined, we take current user if ((is_numeric($selected) && ($selected < -1 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id; + $excludeUsers=null; + $includeUsers=null; + // Permettre l'exclusion d'utilisateurs if (is_array($exclude)) $excludeUsers = implode("','",$exclude); // Permettre l'inclusion d'utilisateurs From 8248ab4f9a49c180ccc69e5665b269c9f8655e20 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 11:16:45 +0100 Subject: [PATCH 0385/1190] Fix: doxygen --- htdocs/user/class/user.class.php | 17 ++++++++--------- htdocs/user/hierarchy.php | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 6f15bf82faa..3c3ab62e22f 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1941,7 +1941,7 @@ class User extends CommonObject if ($this->office_fax && ! empty($conf->global->LDAP_FIELD_FAX)) $info[$conf->global->LDAP_FIELD_FAX] = $this->office_fax; if ($this->note && ! empty($conf->global->LDAP_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_FIELD_DESCRIPTION] = $this->note; if ($this->email && ! empty($conf->global->LDAP_FIELD_MAIL)) $info[$conf->global->LDAP_FIELD_MAIL] = $this->email; - if ($this->skype && ! empty($conf->global->LDAP_FIELD_SKYPE)) $info[$conf->global->LDAP_FIELD_SKYPE] = $this->skype; + if ($this->skype && ! empty($conf->global->LDAP_FIELD_SKYPE)) $info[$conf->global->LDAP_FIELD_SKYPE] = $this->skype; if ($conf->global->LDAP_SERVER_TYPE == 'egroupware') { @@ -1994,7 +1994,7 @@ class User extends CommonObject $this->firstname='SPECIMEN'; $this->note='This is a note'; $this->email='email@specimen.com'; - $this->skype='tom.hanson'; + $this->skype='tom.hanson'; $this->office_phone='0999999999'; $this->office_fax='0999999998'; $this->user_mobile='0999999997'; @@ -2223,16 +2223,15 @@ class User extends CommonObject /** * Reconstruit l'arborescence hierarchique des users sous la forme d'un tableau - * Renvoi un tableau de tableau('id','id_parent',...) trie selon arbre et avec: - * id = id du user - * id_parent = id du user parent - * id_children = tableau des id enfant - * name = nom du user + * Set and return this->users that is an array sorted according to tree with arrays of: + * id = id user + * lastname + * firstname * fullname = nom avec chemin complet du user - * fullpath = chemin complet compose des id + * fullpath = chemin complet compose des id: "_grandparentid_parentid_id" * * @param int $deleteafterid Removed all users including the leaf $deleteafterid (and all its child) in user tree. - * @return array Array of users. this->users and this->parentof are set. + * @return array Array of users $this->users. Note: $this->parentof is also set. */ function get_full_tree($deleteafterid=0) { diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index 3c330f3a712..0d6c2f9a7b8 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -62,7 +62,7 @@ print_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicVi -// Charge tableau des categories +// Load hierarchy of users $user_arbo = $userstatic->get_full_tree(); // Define fulltree array From 47c2dc4fcf33f991e08f53b466ba758897642000 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 11:36:04 +0100 Subject: [PATCH 0386/1190] Fix: Can see only trip allowed. --- htdocs/compta/deplacement/index.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index bded8c261e2..156201ac26e 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -54,6 +54,9 @@ $limit = $conf->liste_limit; $tripandexpense_static=new Deplacement($db); +$childids = $user->getAllChildIds(); +$childids[]=$user->id; + //$help_url='EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones'; $help_url=''; llxHeader('',$langs->trans("ListOfFees"),$help_url); @@ -64,6 +67,7 @@ $totalnb=0; $sql = "SELECT count(d.rowid) as nb, sum(d.km) as km, d.type"; $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d"; $sql.= " WHERE d.entity = ".$conf->entity; +if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user_author IN ('.join(',',$childids).')'; $sql.= " GROUP BY d.type"; $sql.= " ORDER BY d.type"; @@ -134,6 +138,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE u.rowid = d.fk_user"; $sql.= " AND d.entity = ".$conf->entity; +if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user_author IN ('.join(',',$childids).')'; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND d.fk_soc = ".$socid; $sql.= $db->order("d.tms","DESC"); From 3ffd4432df399314f7287b4a657c64df8da7982d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 11:43:57 +0100 Subject: [PATCH 0387/1190] New: Add permissions to read all trips and expenses. --- ChangeLog | 1 + htdocs/core/modules/modDeplacement.class.php | 14 ++++++++++---- htdocs/langs/en_US/admin.lang | 9 +++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62311d4bef1..38a9d704f8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Add permissions to read all trips and expenses. - New: Can filter on date into tab "Referring object" of a project. - New: Module notification has been enhanced: EMail use now language of target contact. diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php index 24536bc5a68..75d3ab328c8 100644 --- a/htdocs/core/modules/modDeplacement.class.php +++ b/htdocs/core/modules/modDeplacement.class.php @@ -78,25 +78,31 @@ class modDeplacement extends DolibarrModules $this->rights_class = 'deplacement'; $this->rights[1][0] = 171; - $this->rights[1][1] = 'Lire les deplacements'; + $this->rights[1][1] = 'Lire ses notes de frais et deplacements et celles de sa hierarchy'; $this->rights[1][2] = 'r'; $this->rights[1][3] = 1; $this->rights[1][4] = 'lire'; $this->rights[2][0] = 172; - $this->rights[2][1] = 'Creer/modifier les deplacements'; + $this->rights[2][1] = 'Creer/modifier une note de frais et deplacements'; $this->rights[2][2] = 'w'; $this->rights[2][3] = 0; $this->rights[2][4] = 'creer'; $this->rights[3][0] = 173; - $this->rights[3][1] = 'Supprimer les deplacements'; + $this->rights[3][1] = 'Supprimer les notes de frais et deplacements'; $this->rights[3][2] = 'd'; $this->rights[3][3] = 0; $this->rights[3][4] = 'supprimer'; + $this->rights[3][0] = 174; + $this->rights[3][1] = 'Lire toutes les notes de frais'; + $this->rights[3][2] = 'd'; + $this->rights[3][3] = 0; + $this->rights[3][4] = 'readall'; + $this->rights[6][0] = 178; - $this->rights[6][1] = 'Exporter les deplacements'; + $this->rights[6][1] = 'Exporter les notes de frais et deplacements'; $this->rights[6][2] = 'd'; $this->rights[6][3] = 0; $this->rights[6][4] = 'export'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 34f31092bfc..de373163008 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -611,10 +611,11 @@ Permission162=Create/modify contracts Permission163=Activate a service of a contract Permission164=Disable a service of a contract Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders From 2dc1cb7c2756659b457f0c54020933e314331baa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 12:19:38 +0100 Subject: [PATCH 0388/1190] Fix: Use correct permission on correct field. --- .../class/deplacementstats.class.php | 5 ++-- htdocs/compta/deplacement/index.php | 4 +-- htdocs/compta/deplacement/list.php | 7 ++++- htdocs/compta/deplacement/stats/index.php | 26 +++++++++++++++++-- htdocs/compta/hrm.php | 3 +++ 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php index c87b4ea033f..cf5f7fda45a 100644 --- a/htdocs/compta/deplacement/class/deplacementstats.class.php +++ b/htdocs/compta/deplacement/class/deplacementstats.class.php @@ -45,7 +45,7 @@ class DeplacementStats extends Stats * * @param DoliDB $db Database handler * @param int $socid Id third party - * @param int $userid Id user for filter + * @param mixed $userid Id user for filter or array of user ids * @return void */ function __construct($db, $socid=0, $userid=0) @@ -66,7 +66,8 @@ class DeplacementStats extends Stats { $this->where.=" AND fk_soc = ".$this->socid; } - if ($this->userid > 0) $this->where.=' AND fk_user = '.$this->userid; + if (is_array($this->userid) && count($this->userid) > 0) $this->where.=' AND fk_user IN ('.join(',',$this->userid).')'; + else if ($this->userid > 0) $this->where.=' AND fk_user = '.$this->userid; } diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 156201ac26e..37a0f944bb3 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -67,7 +67,7 @@ $totalnb=0; $sql = "SELECT count(d.rowid) as nb, sum(d.km) as km, d.type"; $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d"; $sql.= " WHERE d.entity = ".$conf->entity; -if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user_author IN ('.join(',',$childids).')'; +if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')'; $sql.= " GROUP BY d.type"; $sql.= " ORDER BY d.type"; @@ -138,7 +138,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE u.rowid = d.fk_user"; $sql.= " AND d.entity = ".$conf->entity; -if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user_author IN ('.join(',',$childids).')'; +if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')'; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND d.fk_soc = ".$socid; $sql.= $db->order("d.tms","DESC"); diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index bc4406448df..bb2c50b42bf 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -58,6 +58,9 @@ $search_ref=GETPOST('search_ref','alpha'); $tripandexpense_static=new Deplacement($db); $userstatic = new User($db); +$childids = $user->getAllChildIds(); +$childids[]=$user->id; + llxHeader(); $sql = "SELECT s.nom, s.rowid as socid,"; // Ou @@ -70,6 +73,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; $sql.= " WHERE d.fk_user = u.rowid"; $sql.= " AND d.entity = ".$conf->entity; +if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')'; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; if (trim($search_ref) != '') @@ -167,6 +171,7 @@ else { dol_print_error($db); } -$db->close(); llxFooter(); + +$db->close(); diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 6e702002505..0d0a32a877c 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -45,6 +45,18 @@ if ($user->societe_id > 0) if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement', $id,''); +// Other security check +$childids = $user->getAllChildIds(); +$childids[]=$user->id; +if ($userid > 0) +{ + if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous) && ! in_array($userid, $childids)) + { + accessforbidden(); + exit; + } +} + $nowyear=strftime("%Y", dol_now()); $year = GETPOST('year')>0?GETPOST('year'):$nowyear; //$startyear=$year-2; @@ -60,6 +72,7 @@ $mode=GETPOST("mode")?GETPOST("mode"):'customer'; $form=new Form($db); + llxHeader(); $title=$langs->trans("TripsAndExpensesStatistics"); @@ -69,7 +82,14 @@ print_fiche_titre($title, $mesg); dol_mkdir($dir); -$stats = new DeplacementStats($db, $socid, $userid); +$useridtofilter=$userid; // Filter from parameters +if (empty($useridtofilter)) +{ + $useridtofilter=$childids; + if (! empty($user->rights->deplacement->readall) || ! empty($user->rights->deplacement->lire_tous)) $useridtofilter=0; +} + +$stats = new DeplacementStats($db, $socid, $useridtofilter); // Build graphic number of object @@ -220,7 +240,9 @@ print $form->select_company($socid,'socid',$filter,1,1); print ''; // User print ''.$langs->trans("User").''; -print $form->select_dolusers($userid,'userid',1); +$include=''; +if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $include='hierarchy'; +print $form->select_dolusers($userid,'userid',1,'',0,$include); print ''; // Year print ''.$langs->trans("Year").''; diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index dae4ce9aa7d..6252f0f6ef7 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -60,6 +60,8 @@ if ($user->societe_id > 0) accessforbidden(); $holiday = new Holiday($db); $holidaystatic=new Holiday($db); +$childids = $user->getAllChildIds(); +$childids[]=$user->id; llxHeader(array(),$langs->trans('HRMArea')); @@ -118,6 +120,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE u.rowid = d.fk_user"; $sql.= " AND d.entity = ".$conf->entity; +if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')'; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid; $sql.= $db->order("d.tms","DESC"); From a5700c8f44292d342a9dcf4c3feffbf7c91d134c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 12:20:48 +0100 Subject: [PATCH 0389/1190] Ajout log --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 38a9d704f8e..d6e412ec06e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,8 @@ For developers: WARNING: Following changes may create regression for some external modules, but was necessary to make Dolibarr better: +- If you can't see trips and expenses records, check that you have the new permission "read all + trips and expenses". - Deprecated module "oscommerce" were removed. - Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php - Some field into database were renamed from "libelle" to "label". From 38a939771c1dd1a403df94b6b7dad77472ec41f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 17:16:51 +0100 Subject: [PATCH 0390/1190] New: Add template of emails into dictionnary. --- htdocs/admin/dict.php | 61 ++++++++++++++++--- .../install/mysql/migration/3.6.0-3.7.0.sql | 1 + .../mysql/tables/llx_c_email_templates.sql | 1 + 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index d81f306be9e..4d33723a947 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -70,7 +70,7 @@ $hookmanager->initHooks(array('admin')); // Put here declaration of dictionaries properties // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this. -$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24); +$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,0,25); // Name of SQL tables of dictionaries $tabname=array(); @@ -98,6 +98,7 @@ $tabname[21]= MAIN_DB_PREFIX."c_availability"; $tabname[22]= MAIN_DB_PREFIX."c_input_reason"; $tabname[23]= MAIN_DB_PREFIX."c_revenuestamp"; $tabname[24]= MAIN_DB_PREFIX."c_type_resource"; +$tabname[25]= MAIN_DB_PREFIX."c_email_templates"; // Dictionary labels $tablib=array(); @@ -125,6 +126,7 @@ $tablib[21]= "DictionaryAvailability"; $tablib[22]= "DictionarySource"; $tablib[23]= "DictionaryRevenueStamp"; $tablib[24]= "DictionaryResourceType"; +$tablib[25]= "DictionaryEMailTemplates"; // Requests to extract data $tabsql=array(); @@ -152,6 +154,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX $tabsql[22]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason"; $tabsql[23]= "SELECT t.rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid"; $tabsql[24]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource"; +$tabsql[25]= "SELECT rowid as rowid, label, type_template, private, position, topic, content, active FROM ".MAIN_DB_PREFIX."c_email_templates"; // Criteria to sort dictionaries $tabsqlsort=array(); @@ -179,6 +182,7 @@ $tabsqlsort[21]="code ASC, label ASC"; $tabsqlsort[22]="code ASC, label ASC"; $tabsqlsort[23]="country ASC, taux ASC"; $tabsqlsort[24]="code ASC,label ASC"; +$tabsqlsort[25]="label ASC"; // Nom des champs en resultat de select pour affichage du dictionnaire $tabfield=array(); @@ -206,6 +210,7 @@ $tabfield[21]= "code,label"; $tabfield[22]= "code,label"; $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfield[24]= "code,label"; +$tabfield[25]= "label,type_template,private,position,topic,content"; // Nom des champs d'edition pour modification d'un enregistrement $tabfieldvalue=array(); @@ -233,6 +238,7 @@ $tabfieldvalue[21]= "code,label"; $tabfieldvalue[22]= "code,label"; $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfieldvalue[24]= "code,label"; +$tabfieldvalue[25]= "label,type_template,private,position,topic,content"; // Nom des champs dans la table pour insertion d'un enregistrement $tabfieldinsert=array(); @@ -260,6 +266,7 @@ $tabfieldinsert[21]= "code,label"; $tabfieldinsert[22]= "code,label"; $tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfieldinsert[24]= "code,label"; +$tabfieldinsert[25]= "label,type_template,private,position,topic,content"; // Nom du rowid si le champ n'est pas de type autoincrement // Example: "" if id field is "rowid" and has autoincrement on @@ -288,7 +295,8 @@ $tabrowid[20]= ""; $tabrowid[21]= "rowid"; $tabrowid[22]= "rowid"; $tabrowid[23]= ""; -$tabrowid[23]= ""; +$tabrowid[24]= ""; +$tabrowid[25]= ""; // Condition to show dictionary in setup page $tabcond=array(); @@ -316,6 +324,7 @@ $tabcond[21]= ! empty($conf->propal->enabled); $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled)); $tabcond[23]= true; $tabcond[24]= ! empty($conf->resource->enabled); +$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC); // List of help for fields $tabhelp=array(); @@ -343,6 +352,7 @@ $tabhelp[21] = array(); $tabhelp[22] = array(); $tabhelp[23] = array(); $tabhelp[24] = array(); +$tabhelp[25] = array(); // List of check for fields (NOT USED YET) $tabfieldcheck=array(); @@ -370,6 +380,7 @@ $tabfieldcheck[21] = array(); $tabfieldcheck[22] = array(); $tabfieldcheck[23] = array(); $tabfieldcheck[24] = array(); +$tabfieldcheck[25] = array(); // Complete all arrays with entries found into modules complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck); @@ -442,7 +453,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $ok=1; foreach ($listfield as $f => $value) { - if ($value == 'country' && in_array($tablib[$id],array('DictionaryRegion','DictionaryCompanyType'))) continue; // For some pages, country is not mandatory + if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType'))) continue; // For some pages, country is not mandatory if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryRegion','DictionaryCompanyType'))) continue; // For some pages, country is not mandatory if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue; if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue; @@ -489,7 +500,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'
    '; }*/ } - if (isset($_POST["country"]) && $_POST["country"]=='0') + if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2)) { if (in_array($tablib[$id],array('DictionaryCompanyType'))) { @@ -533,6 +544,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $sql.= $tabfieldinsert[$id]; $sql.=",active)"; $sql.= " VALUES("; + // List of values if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert)) $sql.= $newid.","; @@ -846,6 +858,13 @@ if ($id) if ($fieldlist[$field]=='pcg_type') { $valuetoshow=$langs->trans("Pcg_type"); } if ($fieldlist[$field]=='pcg_subtype') { $valuetoshow=$langs->trans("Pcg_subtype"); } if ($fieldlist[$field]=='sortorder') { $valuetoshow=$langs->trans("SortOrder"); } + + if ($id == 2) // Special cas for state page + { + if ($fieldlist[$field]=='region_id') { $valuetoshow=' '; $showfield=1; } + if ($fieldlist[$field]=='region') { $valuetoshow=$langs->trans("Country").'/'.$langs->trans("Region"); $showfield=1; } + } + if ($valuetoshow != '') { print ''; @@ -856,12 +875,14 @@ if ($id) } if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1; } + + if ($id == 4) print ''; print ''; print ''; print ' '; print ''; - // Line to type new values + // Line to enter new values print ""; $obj = new stdClass(); @@ -880,16 +901,25 @@ if ($id) $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks $error=$hookmanager->error; $errors=$hookmanager->errors; + if ($id == 3) + { + unset($fieldlist[2]); + } + if (empty($reshook)) fieldList($fieldlist,$obj); + if ($id == 4) print ''; print ''; print ""; + $colspan=count($fieldlist)+2; + if ($id == 4) $colspan++;; + if (! empty($alabelisused)) // Si un des champs est un libelle { - print '* '.$langs->trans("LabelUsedByDefault").'.'; + print '* '.$langs->trans("LabelUsedByDefault").'.'; } - print ' '; + print ' '; } print ''; @@ -965,6 +995,7 @@ if ($id) if ($fieldlist[$field]=='pcg_type') { $valuetoshow=$langs->trans("Pcg_type"); } if ($fieldlist[$field]=='pcg_subtype') { $valuetoshow=$langs->trans("Pcg_subtype"); } if ($fieldlist[$field]=='sortorder') { $valuetoshow=$langs->trans("SortOrder"); } + // Affiche nom du champ if ($showfield) { @@ -1302,7 +1333,7 @@ $db->close(); /** - * Show field + * Show fields in insert/edit mode * * @param array $fieldlist Array of fields * @param Object $obj If we show a particular record, obj is filled with record fields @@ -1322,14 +1353,22 @@ function fieldList($fieldlist,$obj='',$tabname='') foreach ($fieldlist as $field => $value) { if ($fieldlist[$field] == 'country') { - if (in_array('region_id',$fieldlist)) { print ''.join(',',$fieldlist).' '; continue; } // For state page, we do not show the country input (we link to region, not country) + if (in_array('region_id',$fieldlist)) + { + print ''; + //print join(',',$fieldlist); + print ''; + continue; + } // For state page, we do not show the country input (we link to region, not country) print ''; print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), 'country', '', 28); print ''; } elseif ($fieldlist[$field] == 'country_id') { $country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0); + print ''; print ''; + print ''; } elseif ($fieldlist[$field] == 'region') { print ''; @@ -1338,7 +1377,9 @@ function fieldList($fieldlist,$obj='',$tabname='') } elseif ($fieldlist[$field] == 'region_id') { $region_id = (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:0); + print ''; print ''; + print ''; } elseif ($fieldlist[$field] == 'lang') { print ''; @@ -1377,7 +1418,7 @@ function fieldList($fieldlist,$obj='',$tabname='') print ''; print ''; } - elseif ($fieldlist[$field] == 'libelle_facture') { + elseif (in_array($fieldlist[$field], array('libelle_facture','content'))) { print ''; } elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) { diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index c2e10543b7a..7156acc2ff2 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1026,6 +1026,7 @@ create table llx_c_email_templates tms timestamp, label varchar(255), -- Label of predefined email position smallint, -- Position + active tinyint DEFAULT 1 NOT NULL, topic text, -- Predefined topic content text -- Predefined text ) ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql index 3a72690fb11..b4d2f9a96cb 100644 --- a/htdocs/install/mysql/tables/llx_c_email_templates.sql +++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql @@ -30,6 +30,7 @@ create table llx_c_email_templates tms timestamp, label varchar(255), -- Label of predefined email position smallint, -- Position + active tinyint DEFAULT 1 NOT NULL, topic text, -- Predefined topic content text -- Predefined text )ENGINE=innodb; From f7552c83d2f3391a78e1a72d7ae5a49be6f0a74f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 17:50:34 +0100 Subject: [PATCH 0391/1190] Fix: Must ignore such fields --- test/phpunit/FactureTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php index 11795c08fe2..cce025a77eb 100644 --- a/test/phpunit/FactureTest.php +++ b/test/phpunit/FactureTest.php @@ -215,7 +215,7 @@ class FactureTest extends PHPUnit_Framework_TestCase $newlocalobject=new Facture($this->savdb); $newlocalobject->initAsSpecimen(); $this->changeProperties($newlocalobject); - $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc')), array()); // Actual, Expected + $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc')), array()); // Actual, Expected return $localobject; } From fb4858a5d32c850629f24fde1ac9f49077cb7365 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 18:07:09 +0100 Subject: [PATCH 0392/1190] Update changelog --- ChangeLog | 3 +++ htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index d6e412ec06e..6b3616e0d46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Increase length of thirdparty to 128 chars. +- New: "Is Order shippable" icon #1975. +- New: statistics on supplier orders and invoices on home page. - New: Add permissions to read all trips and expenses. - New: Can filter on date into tab "Referring object" of a project. - New: Module notification has been enhanced: diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 7156acc2ff2..aa940e4ff20 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1064,6 +1064,9 @@ ALTER TABLE llx_adherent CHANGE COLUMN civilite civility VARCHAR(6); ALTER TABLE llx_socpeople CHANGE COLUMN civilite civility VARCHAR(6); ALTER TABLE llx_user CHANGE COLUMN civilite civility VARCHAR(6); +ALTER TABLE llx_societe CHANGE COLUMN nom varchar(128); +ALTER TABLE llx_adherent CHANGE COLUMN societe varchar(128); + ALTER TABLE llx_c_type_fees CHANGE COLUMN libelle label VARCHAR(30); ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label; From e3041f45ee9f61dccfdfed370acbd97ce9364656 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 18:08:42 +0100 Subject: [PATCH 0393/1190] Update changelog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index cc36bf92412..bab2b804a5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ English Dolibarr ChangeLog -------------------------------------------------------------- + +***** ChangeLog for 3.5.6 compared to 3.5.5 ***** +Fix: Avoid missing class error for fetch_thirdparty method #1973 + ***** ChangeLog for 3.5.5 compared to 3.5.4 ***** Fix: Holiday module was broken. Initializaion of amount of holidays failed. Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas. From d5f21caca607b5e652981a4bf19bc40fa35e4309 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 18:19:41 +0100 Subject: [PATCH 0394/1190] Update doc --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 6b3616e0d46..c5aeb5874b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Agenda export by project #1967. - New: Increase length of thirdparty to 128 chars. - New: "Is Order shippable" icon #1975. - New: statistics on supplier orders and invoices on home page. From f18e513046cb3c6b00829d8318921cdbd7e0dc8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 30 Oct 2014 18:44:56 +0100 Subject: [PATCH 0395/1190] Update html.form.class.php --- htdocs/core/class/html.form.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8848adea948..7c7c280bef3 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1832,11 +1832,12 @@ class Form * @param string $filterkey Filtre des produits * @param int $statut -1=Return all products, 0=Products not on sell, 1=Products on sell * @param int $outputmode 0=HTML select string, 1=Array + * @param int $limit Limit of line number * @return array Array of keys for json */ - function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0) + function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0,$limit=100) { - global $langs,$conf; + global $langs,$conf,$db; $out=''; $outarray=array(); @@ -1874,6 +1875,7 @@ class Form $sql.=')'; } $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC"; + $sql.= $db->plimit($limit); // Build output string From 08e958152cbdbd66dc0805c55e179098aae7dc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 30 Oct 2014 18:45:47 +0100 Subject: [PATCH 0396/1190] Update ajax.lib.php --- htdocs/core/lib/ajax.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index d6cc1a287d7..93f23557c24 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -173,7 +173,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt } $("#search_'.$htmlname.'").trigger("change"); // To tell that input text field was modified } - ,delay: 1000 + ,delay: 500 }).data( "autocomplete" )._renderItem = function( ul, item ) { return $( "
  • " ) .data( "item.autocomplete", item ) From 2f5c7e5f9d9c29e51e9c915c7bc05ae09150ce98 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 19:28:22 +0100 Subject: [PATCH 0397/1190] Prepare version 3.7 beta --- build/debian/changelog | 29 ++++++++++++++++++----------- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-dolibarr.pl | 5 ++++- build/rpm/dolibarr_fedora.spec | 3 +++ build/rpm/dolibarr_generic.spec | 3 +++ build/rpm/dolibarr_mandriva.spec | 3 +++ build/rpm/dolibarr_opensuse.spec | 3 +++ htdocs/filefunc.inc.php | 2 +- 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 76e8ae3a2fc..d3772a76785 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,74 +1,81 @@ -dolibarr (3.6.1-3) unstable; urgency=low +dolibarr (3.7.0-3) UNRELEASED; urgency=low + + [ Laurent Destailleur (eldy) ] + * New upstream release. + + -- Laurent Destailleur (eldy) Tue, 21 Oct 2014 12:00:00 +0100 + +dolibarr (3.6.1-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Tue, 23 Sep 2014 12:00:00 +0100 -dolibarr (3.6.0-3) unstable; urgency=low +dolibarr (3.6.0-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Tue, 15 July 2014 12:00:00 +0100 -dolibarr (3.5.5-3) unstable; urgency=low +dolibarr (3.5.5-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Tue, 8 July 2014 12:00:00 +0100 -dolibarr (3.5.4-3) unstable; urgency=low +dolibarr (3.5.4-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Tue, 1 July 2014 12:00:00 +0100 -dolibarr (3.5.3-3) unstable; urgency=low +dolibarr (3.5.3-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Fri, 2 May 2014 12:00:00 +0100 -dolibarr (3.5.2-3) unstable; urgency=low +dolibarr (3.5.2-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Fri, 14 March 2014 12:00:00 +0100 -dolibarr (3.5.1-3) unstable; urgency=low +dolibarr (3.5.1-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Fri, 7 Feb 2014 12:00:00 +0100 -dolibarr (3.5.0-3) unstable; urgency=low +dolibarr (3.5.0-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. -- Laurent Destailleur (eldy) Fri, 31 Jan 2014 12:00:00 +0100 -dolibarr (3.4.2-3) unstable; urgency=low +dolibarr (3.4.2-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * Maintenance release. -- Laurent Destailleur (eldy) Mon, 30 Dec 2013 12:00:00 +0100 -dolibarr (3.4.1-3) unstable; urgency=low +dolibarr (3.4.1-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * Maintenance release. -- Laurent Destailleur (eldy) Mon, 27 Apr 2013 12:00:00 +0100 -dolibarr (3.4.0-3) unstable; urgency=low +dolibarr (3.4.0-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * Maintenance release. diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 1657ff1c7e7..3a43f7fe656 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -17,9 +17,9 @@ ; ----- Change this ----- AppName=DoliWamp ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -AppVerName=DoliWamp-3.6.1 +AppVerName=DoliWamp-3.7.0-beta ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -OutputBaseFilename=DoliWamp-3.6.1 +OutputBaseFilename=DoliWamp-3.7.0-beta ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log ; Define full path from which all relative path are defined diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 3f637ef856e..2a4af64f5fe 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -436,13 +436,16 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`; $ret=`rm -fr $BUILDROOT/$PROJECT/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -f $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; @@ -452,7 +455,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`; # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems. $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`; # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems. $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`; # Keep this removal in case we embed libraries - #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`; # _source must be kept into tarball + #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`; # _source must be kept into tarball due to debian policies $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`; # Source of this flash is not available $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 156f34bc066..1007c84eb96 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -332,6 +332,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 +- Upstream release + * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 - Upstream release diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 176cb07975d..5fd9a74f1a6 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -568,6 +568,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 +- Upstream release + * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 - Upstream release diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index d75c9a84dca..c6fda416db0 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -337,6 +337,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 +- Upstream release + * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 - Upstream release diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 41ea838f3fb..935ebf2e6df 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -348,6 +348,9 @@ fi # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog +* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 +- Upstream release + * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 - Upstream release diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 6f8a2bb9b2c..d69de2f1fae 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -29,7 +29,7 @@ * \brief File that include conf.php file and commons lib like functions.lib.php */ -if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0-alpha'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0-beta'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants From 57f49ec5d4ddcd4b30c24255eb8ac822aa110aad Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 30 Oct 2014 20:41:08 +0100 Subject: [PATCH 0398/1190] GPLv3 --- .../admin/adherent_type_extrafields.php | 3 +- htdocs/core/class/html.formcron.class.php | 3 +- htdocs/core/lib/invoice2.lib.php | 27 ++++++++-------- htdocs/install/mssql/functions/functions.sql | Bin 5088 -> 5010 bytes .../class/html.formresource.class.php | 29 +++++++++--------- 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php index dca8796b681..aa5e8cfa8d9 100644 --- a/htdocs/adherents/admin/adherent_type_extrafields.php +++ b/htdocs/adherents/admin/adherent_type_extrafields.php @@ -7,7 +7,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,6 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php index bce8d9f041e..4de88a7bfc9 100644 --- a/htdocs/core/class/html.formcron.class.php +++ b/htdocs/core/class/html.formcron.class.php @@ -4,7 +4,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php index 9309d083187..fb9d8f90f70 100644 --- a/htdocs/core/lib/invoice2.lib.php +++ b/htdocs/core/lib/invoice2.lib.php @@ -2,19 +2,20 @@ /* * Copyright (C) 2009-2013 Laurent Destailleur * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ /** * \file htdocs/core/lib/invoice2.lib.php diff --git a/htdocs/install/mssql/functions/functions.sql b/htdocs/install/mssql/functions/functions.sql index 93766a224064a3dc68cab3dc0878f1477af69f1d..1c2c76996dc312cc2440a2329d46530adb815d7c 100644 GIT binary patch delta 170 zcmaE$K1qE87c-;rW^QI(=6XE_1qM%sG$5JBkk3%UpaWzTGo%8c0)q`h22iAgp@6}P zK_3Xq!BCGO9jLaHK@X_D2*}oF$YIE2NCxW21M4gXir4{VxfpbTPywt8VJ4c1V%Uw` JEX{tD2LNb29=HGi delta 197 zcmbQF{y=>L7c-;LW^QI(W@T#z1%^z9G$5JBkk3%UpaW!;GZX>EN*Gds>=K6j$!nQZ zS-BW=8FVLKWD>6jsqh4H -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ /** * \file place/class/html.place.class.php From 24862d6314c66cffd6fa21d8a7a7984c8846e07b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 22:51:06 +0100 Subject: [PATCH 0399/1190] Corrections launchpad --- build/launchpad/README | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build/launchpad/README b/build/launchpad/README index 973509aa6d1..03ddc7fd4e6 100644 --- a/build/launchpad/README +++ b/build/launchpad/README @@ -61,13 +61,17 @@ If you want to build/test package locally: - List of series are visible here: https://launchpad.net/dolibarr/+series -# To update Dolibarr into launchpad (when repository for sources already exists) +# To update Dolibarr into launchpad (when remote repository for sources already exists) #---------------------------------- + # create local repository cd bzr - bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable] + bzr branch lp:~yourlogin/dolibarr/[develop|beta|stable] dolibarr-[dev|beta|stable] cd dolibarr-[dev|beta|stable] + # Update + bzr update + -- Update files here. Remove all and overwrite -- bzr status - -- Update files here -- + bzr add * bzr commit -m "Description of change" bzr push From 557cbaf3d7942e68b46e21dd24f18f8e4c78bcde Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Fri, 31 Oct 2014 04:59:57 +0100 Subject: [PATCH 0400/1190] Added module descriptor and activation checks Corrected 3 missing $error_occurred flags --- .../modSyncSupplierWebServices.class.php | 121 ++++++++++++++++++ htdocs/fourn/commande/card.php | 15 ++- 2 files changed, 132 insertions(+), 4 deletions(-) create mode 100755 htdocs/core/modules/modSyncSupplierWebServices.class.php diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php new file mode 100755 index 00000000000..088989f9de4 --- /dev/null +++ b/htdocs/core/modules/modSyncSupplierWebServices.class.php @@ -0,0 +1,121 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \defgroup webservices Module webservices + * \brief Module to enable client for supplier WebServices + * \file htdocs/core/modules/modSyncSupplierWebServices.class.php + * \ingroup webservices + * \brief File to describe client for supplier webservices module + */ +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; + +/** + * Class to describe a WebServices module + */ +class modSyncSupplierWebServices extends DolibarrModules +{ + + /** + * Constructor. Define names, constants, directories, boxes, permissions + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + $this->numero = 2650; + + $this->family = "technic"; + // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) + $this->name = preg_replace('/^mod/i','',get_class($this)); + $this->description = "Enable the client for external supplier web services"; + $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version + // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); + // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) + $this->special = 1; + // Name of image file used for this module. + $this->picto='technic'; + + // Data directories to create when module is enabled + $this->dirs = array(); + + // Config pages + //------------- + //$this->config_page_url = array("webservices.php@webservices"); + + // Dependancies + //------------- + $this->depends = array(); + $this->requiredby = array(); + $this->langfiles = array("other"); + + // Constantes + //----------- + $this->const = array(); + + // New pages on tabs + // ----------------- + $this->tabs = array(); + + // Boxes + //------ + $this->boxes = array(); + + // Permissions + //------------ + $this->rights = array(); + $this->rights_class = 'syncsupplierwebservices'; + $r=0; + } + + + /** + * Function called when module is enabled. + * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. + * It also creates data directories + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function init($options='') + { + // Prevent pb of modules not correctly disabled + //$this->remove($options); + + $sql = array(); + + return $this->_init($sql,$options); + } + + /** + * Function called when module is disabled. + * Remove from database constants, boxes and permissions from Dolibarr database. + * Data directories are not deleted + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function remove($options='') + { + $sql = array(); + + return $this->_remove($sql,$options); + } + +} diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index b8d9d74e147..263a96bdca4 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -7,6 +7,7 @@ * Copyright (C) 2011 Philippe Grand * Copyright (C) 2012 Marcos García * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Ion Agorria * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1065,8 +1066,10 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST(' 'entity'=>$ws_entity ); - //Is everything filled? - if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) { + //Is sync supplier web services module activated? and everything filled? + if (empty($conf->syncsupplierwebservices->enabled)) { + setEventMessage($langs->trans("WarningModuleNotActive",$langs->transnoentities("Module2650Name"))); + } else if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) { setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); } else @@ -2054,6 +2057,7 @@ elseif (! empty($object->id)) if (empty($ws_thirdparty)) { setEventMessage($langs->trans("RemoteUserMissingAssociatedSoc"), 'errors'); + $error_occurred = true; } else { @@ -2129,10 +2133,12 @@ elseif (! empty($object->id)) elseif ($user_status_code == "PERMISSION_DENIED") { setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors'); + $error_occurred = true; } else { setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors'); + $error_occurred = true; } //Form @@ -2242,8 +2248,9 @@ elseif (! empty($object->id)) //} } - // Create a remote order using WebService - if ($object->statut >= 2) // 2 means accepted + + // Create a remote order using WebService only if module is activated + if (! empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) // 2 means accepted { print ''.$langs->trans('CreateRemoteOrder').''; } From e43de8b815f46a690c62cc0284120cc34623be35 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 31 Oct 2014 07:37:59 +0100 Subject: [PATCH 0401/1190] Update module accounting --- htdocs/accountancy/admin/account.php | 60 ++++++++++++++------- htdocs/accountancy/admin/card.php | 5 -- htdocs/core/menus/standard/eldy.lib.php | 2 +- htdocs/core/modules/modAccounting.class.php | 8 +++ 4 files changed, 49 insertions(+), 26 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 60ff4b125c3..fbb8cf84baa 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -37,6 +37,12 @@ $mesg = ''; $action = GETPOST('action'); $id = GETPOST('id', 'int'); $rowid = GETPOST('rowid', 'int'); +$search= GETPOST("search"); +$search_account = GETPOST("search_account"); +$search_label = GETPOST("search_label"); +$search_accountparent = GETPOST("search_accountparent"); +$search_pcgtype = GETPOST("search_pcgtype"); +$search_pcgsubtype = GETPOST("search_pcgsubtype"); // Security check if (!$user->admin) @@ -83,6 +89,16 @@ if ($action == 'disable') { } } +if (GETPOST("button_removefilter")) +{ + $search=""; + $search_account=""; + $search_label=""; + $search_accountparent=""; + $search_pcgtype=""; + $search_pcgsubtype=""; +} + /* * View * @@ -96,20 +112,20 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "accountingaccount as aa, " . MAIN_DB_PREFIX $sql .= " WHERE aa.fk_pcg_version = asy.pcg_version"; $sql .= " AND asy.rowid = " . $pcgver; -if (strlen(trim($_GET["search_account"]))) { - $sql .= " AND aa.account_number like '%" . $_GET["search_account"] . "%'"; +if (strlen(trim($search_account))) { + $sql .= " AND aa.account_number like '%" . $search_account . "%'"; } -if (strlen(trim($_GET["search_label"]))) { - $sql .= " AND aa.label like '%" . $_GET["search_label"] . "%'"; +if (strlen(trim($search_label))) { + $sql .= " AND aa.label like '%" . $search_label . "%'"; } -if (strlen(trim($_GET["search_accountparent"]))) { - $sql .= " AND aa.account_parent like '%" . $_GET["search_accountparent"] . "%'"; +if (strlen(trim($search_accountparent))) { + $sql .= " AND aa.account_parent like '%" . $search_accountparent . "%'"; } -if (strlen(trim($_GET["search_pcgtype"]))) { - $sql .= " AND aa.pcg_type like '%" . $_GET["search_pcgtype"] . "%'"; +if (strlen(trim($search_pcgtype))) { + $sql .= " AND aa.pcg_type like '%" . $search_pcgtype . "%'"; } -if (strlen(trim($_GET["search_pcgsubtype"]))) { - $sql .= " AND aa.pcg_subtype like '%" . $_GET["search_pcgsubtype"] . "%'"; +if (strlen(trim($search_pcgsubtype))) { + $sql .= " AND aa.pcg_subtype like '%" . $search_pcgsubtype . "%'"; } $sql .= $db->order($sortfield, $sortorder); @@ -141,18 +157,20 @@ if ($result) { print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $param, "", $sortfield, $sortorder); print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $param, "", $sortfield, $sortorder); print_liste_field_titre($langs->trans("Active"), $_SERVER["PHP_SELF"], "aa.active", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre(" "); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder); print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ' '; - print ''; - print ''; + print ''; + print ''; + print '  '; + print ''; print ''; print ''; @@ -180,11 +198,13 @@ if ($result) { } print ''; - print ''; + // Action + print ''; if ($user->admin) { print ''; print img_edit(); - print ' '; + print ''; + print ' '; print ''; print img_delete(); print ''; diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 9ebdea5fefc..ad6ca01b6ca 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -181,11 +181,6 @@ else if ($id) if ($action == 'update') { - // WYSIWYG Editor - $htmlacc = new FormVentilation($db); - - require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; - $soc = new Societe($db); if ($object->socid) { $soc->fetch($object->socid); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 1d6e12b1357..71b6d29ea42 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -952,7 +952,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->accounting->enabled)) { $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy", $langs->trans("Fiscalyear"),0,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear'); - $newmenu->add("/accountancy/admin/account.php?mainmenu=home", $langs->trans("Chartofaccounts"),0,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear'); + $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy", $langs->trans("Chartofaccounts"),0,$user->rights->accounting->chartofaccount, '', $mainmenu, 'chartofaccount'); } } diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index 9a544b1ece0..e074bfe82f1 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -229,6 +229,14 @@ class modAccounting extends DolibarrModules $this->rights[$r][4] = 'fiscalyear'; $this->rights[$r][5] = ''; $r++; + + $this->rights[$r][0] = 50440; + $this->rights[$r][1] = 'Manage chart of accounts'; + $this->rights[$r][2] = 'r'; + $this->rights[$r][3] = 1; + $this->rights[$r][4] = 'chartofaccount'; + $this->rights[$r][5] = ''; + $r++; // Main menu entries $this->menus = array(); From 9c51effe5cbddf5a3ec01ca2999d433967d08d0f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 31 Oct 2014 15:41:58 +0100 Subject: [PATCH 0402/1190] Ajout plus d'info dans description audit. --- htdocs/admin/tools/listevents.php | 5 +++-- htdocs/core/class/events.class.php | 4 ++-- htdocs/core/triggers/interface_20_all_Logevents.class.php | 2 ++ htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 4 ++-- htdocs/main.inc.php | 4 +++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index c2671f698a4..fe577419eaf 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -229,10 +229,11 @@ if ($result) // Description print ''; $text=$langs->trans($obj->description); - if (preg_match('/\((.*)\)/i',$obj->description,$reg)) + if (preg_match('/\((.*)\)(.*)/i',$obj->description,$reg)) { $val=explode(',',$reg[1]); $text=$langs->trans($val[0], isset($val[1])?$val[1]:'', isset($val[2])?$val[2]:'', isset($val[3])?$val[3]:'', isset($val[4])?$val[4]:''); + if (! empty($reg[2])) $text.=$reg[2]; } print $text; print ''; diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index ba4dcfb94f6..e191773517b 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -111,7 +111,7 @@ class Events // extends CommonObject $this->description=trim($this->description); // Check parameters - if (! $this->description) { $this->error='ErrorBadValueForParameter'; return -1; } + if (empty($this->description)) { $this->error='ErrorBadValueForParameter'; return -1; } // Insert request $sql = "INSERT INTO ".MAIN_DB_PREFIX."events("; @@ -129,7 +129,7 @@ class Events // extends CommonObject $sql.= " ".($_SERVER['HTTP_USER_AGENT']?"'".dol_trunc($_SERVER['HTTP_USER_AGENT'],250)."'":'NULL').","; $sql.= " '".$this->db->idate($this->dateevent)."',"; $sql.= " ".($user->id?"'".$user->id."'":'NULL').","; - $sql.= " '".$this->db->escape($this->description)."'"; + $sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'"; $sql.= ")"; dol_syslog(get_class($this)."::create", LOG_DEBUG); diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index b73d01ec612..34bd187adbf 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -66,7 +66,9 @@ class InterfaceLogevents extends DolibarrTriggers // Initialisation donnees (date,duree,texte,desc) $text="(UserLogged,".$object->login.")"; + $text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg); $desc="(UserLogged,".$object->login.")"; + $desc.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg); } if ($action == 'USER_LOGIN_FAILED') { diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index aa940e4ff20..0cacdf1ffae 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1064,8 +1064,8 @@ ALTER TABLE llx_adherent CHANGE COLUMN civilite civility VARCHAR(6); ALTER TABLE llx_socpeople CHANGE COLUMN civilite civility VARCHAR(6); ALTER TABLE llx_user CHANGE COLUMN civilite civility VARCHAR(6); -ALTER TABLE llx_societe CHANGE COLUMN nom varchar(128); -ALTER TABLE llx_adherent CHANGE COLUMN societe varchar(128); +ALTER TABLE llx_societe MODIFY COLUMN nom varchar(128); +ALTER TABLE llx_adherent MODIFY COLUMN societe varchar(128); ALTER TABLE llx_c_type_fees CHANGE COLUMN libelle label VARCHAR(30); ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index efca5d4efba..fa6b503caa7 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -460,7 +460,7 @@ if (! defined('NOLOGIN')) $datesecond=dol_stringtotime($_POST["dst_second"]); if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1; } - //print $datefirst.'-'.$datesecond.'-'.$datenow; exit; + //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit; } if (! $login) @@ -621,6 +621,8 @@ if (! defined('NOLOGIN')) $user->update_last_login_date(); + $user->trigger_mesg = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"]; + // TODO We should use a hook here, not a trigger // Call triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; From ccddf0d1bee301e91b65128ff757dfbe997683ae Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 31 Oct 2014 16:56:14 +0100 Subject: [PATCH 0403/1190] Fix : actioncomme report was not filtering by entity... --- htdocs/core/modules/action/rapport.pdf.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php index d595dfe5579..ea92973101f 100644 --- a/htdocs/core/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -182,6 +182,7 @@ class CommActionRapport $sql.= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid"; $sql.= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year,$this->month,false))."'"; $sql.= " AND '".$this->db->idate(dol_get_last_day($this->year,$this->month,false))."'"; + $sql.= " AND a.entity = ".$conf->entity; $sql.= " ORDER BY a.datep DESC"; dol_syslog(get_class($this)."::_page sql=".$sql); From 82aa8458bf7d5f745bd21a6b7cc8d7924c236d0e Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Fri, 31 Oct 2014 17:46:11 +0100 Subject: [PATCH 0404/1190] Added ws url/key to thirdparty SQL table, class and info page --- htdocs/fourn/commande/card.php | 94 +++++++++++-------- .../install/mysql/migration/3.6.0-3.7.0.sql | 3 + htdocs/install/mysql/tables/llx_societe.sql | 2 + htdocs/societe/class/societe.class.php | 23 +++++ htdocs/societe/soc.php | 36 ++++++- 5 files changed, 117 insertions(+), 41 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 263a96bdca4..4ae8fb17754 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1049,8 +1049,8 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel')) { - $ws_host = GETPOST('ws_host','alpha'); - $ws_key = GETPOST('ws_key','alpha'); + $ws_url = $object->thirdparty->webservices_url; + $ws_key = $object->thirdparty->webservices_key; $ws_user = GETPOST('ws_user','alpha'); $ws_password = GETPOST('ws_password','alpha'); $ws_entity = GETPOST('ws_entity','int'); @@ -1069,18 +1069,20 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST(' //Is sync supplier web services module activated? and everything filled? if (empty($conf->syncsupplierwebservices->enabled)) { setEventMessage($langs->trans("WarningModuleNotActive",$langs->transnoentities("Module2650Name"))); - } else if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) { + } else if (empty($ws_url) || empty($ws_key)) { + setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors'); + } else if (empty($ws_user) || empty($ws_password) || empty($ws_thirdparty)) { setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); } else { //Create SOAP client and connect it to order - $soapclient_order = new nusoap_client($ws_host."/webservices/server_order.php"); + $soapclient_order = new nusoap_client($ws_url."/webservices/server_order.php"); $soapclient_order->soap_defencoding='UTF-8'; $soapclient_order->decodeUTF8(false); //Create SOAP client and connect it to product/service - $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php"); + $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php"); $soapclient_product->soap_defencoding='UTF-8'; $soapclient_product->decodeUTF8(false); @@ -1123,7 +1125,11 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST(' $ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order); $result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, ''); - if ($result_order["result"]["result_code"] != "OK") + if (empty($result_order["result"]["result_code"])) //No result, check error str + { + setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors'); + } + else if ($result_order["result"]["result_code"] != "OK") //Something went wrong { setEventMessage($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors'); } @@ -1970,8 +1976,8 @@ elseif (! empty($object->id)) elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel')) { $mode = GETPOST('mode', 'alpha'); - $ws_host = GETPOST('ws_host','alpha'); - $ws_key = GETPOST('ws_key','alpha'); + $ws_url = $object->thirdparty->webservices_url; + $ws_key = $object->thirdparty->webservices_key; $ws_user = GETPOST('ws_user','alpha'); $ws_password = GETPOST('ws_password','alpha'); @@ -1988,7 +1994,11 @@ elseif (! empty($object->id)) print_titre($langs->trans('CreateRemoteOrder')); //Is everything filled? - if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password))) { + if (empty($ws_url) || empty($ws_key)) { + setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors'); + $mode = "init"; + $error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled + } else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) { setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); $mode = "init"; } @@ -2001,26 +2011,29 @@ elseif (! empty($object->id)) print ''; print ''; print ''; - $textinput_size = "50"; - //Remote Host URL - print ''.$langs->trans("Host").''; - - //Remote Webservices key - print ''.$langs->trans("KeyForWebServicesAccess").''; - - //Remote User - print ''.$langs->trans("User").''; - - //Remote Password - print ''.$langs->trans("Password").''; - - //Submit and cancel buttons - print ''; - print ''; - print '     '; - print ''; - print ''; + if ($error_occurred) + { + print "
    ".$langs->trans("ErrorOccurredReviseAndRetry")."
    "; + print ''; + } + else + { + $textinput_size = "50"; + // Webservice url + print ''.$langs->trans("WebServiceURL").''.dol_print_url($ws_url).''; + //Remote User + print ''.$langs->trans("User").''; + //Remote Password + print ''.$langs->trans("Password").''; + //Submit button + print ''; + print ''; + print '     '; + //Cancel button + print ''; + print ''; + } //End table/form print ''; @@ -2032,14 +2045,8 @@ elseif (! empty($object->id)) $ws_thirdparty = ''; $error_occurred = false; - //Check if has transport, without any the soap client will give error - if (strpos($ws_host, "http") === false) - { - $ws_host = "http://".$ws_host; - } - //Create SOAP client and connect it to user - $soapclient_user = new nusoap_client($ws_host."/webservices/server_user.php"); + $soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php"); $soapclient_user->soap_defencoding='UTF-8'; $soapclient_user->decodeUTF8(false); @@ -2062,7 +2069,7 @@ elseif (! empty($object->id)) else { //Create SOAP client and connect it to product/service - $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php"); + $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php"); $soapclient_product->soap_defencoding='UTF-8'; $soapclient_product->decodeUTF8(false); @@ -2086,7 +2093,11 @@ elseif (! empty($object->id)) // Check the result code $status_code = $result_product["result"]["result_code"]; - if ($status_code != "OK") + if (empty($status_code)) //No result, check error str + { + setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors'); + } + else if ($status_code != "OK") //Something went wrong { if ($status_code == "NOT_FOUND") { @@ -2135,6 +2146,11 @@ elseif (! empty($object->id)) setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors'); $error_occurred = true; } + elseif ($user_status_code == "BAD_CREDENTIALS") + { + setEventMessage($langs->trans("RemoteUserBadCredentials"), 'errors'); + $error_occurred = true; + } else { setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors'); @@ -2146,15 +2162,13 @@ elseif (! empty($object->id)) print ''; print ''; print ''; - print ''; - print ''; print ''; print ''; print ''; print ''; if ($error_occurred) { - print "
    ".$langs->trans("ErrorOccurredReviseAndRetry")."
    "; //TODO: Translate + print "
    ".$langs->trans("ErrorOccurredReviseAndRetry")."
    "; } else { diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index c2e10543b7a..552563db677 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1110,3 +1110,6 @@ DELETE FROM llx_menu WHERE module = 'boutique'; -- Add option always editable on extrafield ALTER TABLE llx_extrafields ADD alwayseditable INTEGER DEFAULT 0 AFTER pos; +-- add supplier webservice fields +ALTER TABLE llx_societe ADD webservices_url varchar(255) DEFAULT NULL; +ALTER TABLE llx_societe ADD webservices_key varchar(128) DEFAULT NULL; diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index bfe69b0d5f8..b9327ba521c 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -92,4 +92,6 @@ create table llx_societe logo varchar(255), canvas varchar(32), -- type of canvas if used (null by default) import_key varchar(14) -- import key + webservices_url varchar(255), -- supplier webservice url + webservices_key varchar(128), -- supplier webservice key )ENGINE=innodb; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 6d80189c7be..79d24a8d917 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -334,6 +334,18 @@ class Societe extends CommonObject */ var $import_key; + /** + * Supplier WebServices URL + * @var string + */ + var $webservices_url; + + /** + * Supplier WebServices Key + * @var string + */ + var $webservices_key; + var $logo; var $logo_small; var $logo_mini; @@ -715,6 +727,10 @@ class Societe extends CommonObject $supplier=true; } + //Web services + $this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):''; + $this->webservices_key = trim($this->webservices_key); + $this->db->begin(); // Check name is required and codes are ok or unique. @@ -795,6 +811,9 @@ class Societe extends CommonObject $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->default_lang."'":"null"); $sql .= ",logo = ".(! empty($this->logo)?"'".$this->logo."'":"null"); + $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null"); + $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null"); + if ($customer) { $sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null"); @@ -951,6 +970,7 @@ class Societe extends CommonObject $sql .= ', s.fk_typent as typent_id'; $sql .= ', s.fk_effectif as effectif_id'; $sql .= ', s.fk_forme_juridique as forme_juridique_code'; + $sql .= ', s.webservices_url, s.webservices_key'; $sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode'; $sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.tva_assuj'; $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo'; @@ -1086,6 +1106,9 @@ class Societe extends CommonObject $this->default_lang = $obj->default_lang; $this->logo = $obj->logo; + $this->webservices_url = $obj->webservices_url; + $this->webservices_key = $obj->webservices_key; + $this->outstanding_limit = $obj->outstanding_limit; // multiprix diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index a0b9bda1c8e..8117de5f09b 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -119,7 +119,7 @@ if (empty($reshook)) $res=$object->setValueFrom('localtax2_value', $value); } - // Add new third party + // Add new or update third party if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode')) && ($action == 'add' || $action == 'update') && $user->rights->societe->creer) { @@ -189,6 +189,10 @@ if (empty($reshook)) $object->commercial_id = GETPOST('commercial_id', 'int'); $object->default_lang = GETPOST('default_lang'); + // Webservices url/key + $object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL); + $object->webservices_key = GETPOST('webservices_key', 'san_alpha'); + // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$object); @@ -217,6 +221,18 @@ if (empty($reshook)) $error++; $errors[] = $langs->trans("ErrorSupplierModuleNotEnabled"); $action = ($action=='add'?'create':'edit'); } + if (! empty($object->webservices_url)) { + //Check if has transport, without any the soap client will give error + if (strpos($object->webservices_url, "http") === false) + { + $object->webservices_url = "http://".$object->webservices_url; + } + if (! isValidUrl($object->webservices_url)) { + $langs->load("errors"); + $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url); + $action = ($action=='add'?'create':'edit'); + } + } // We set country_id, country_code and country for the selected country $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id; @@ -1179,6 +1195,10 @@ else $object->tva_intra = GETPOST('tva_intra', 'alpha'); $object->status = GETPOST('status', 'int'); + // Webservices url/key + $object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL); + $object->webservices_key = GETPOST('webservices_key', 'san_alpha'); + //Local Taxes $object->localtax1_assuj = GETPOST('localtax1assuj_value'); $object->localtax2_assuj = GETPOST('localtax2assuj_value'); @@ -1558,6 +1578,14 @@ else print $object->showOptionals($extrafields,'edit'); } + // Webservices url/key + if (!empty($conf->syncsupplierwebservices->enabled)) { + print ''; + print ''; + print ''; + print ''; + } + // Logo print ''; print ''; @@ -2014,6 +2042,12 @@ else print "\n"; } + // Webservices url/key + if (!empty($conf->syncsupplierwebservices->enabled)) { + print ''.$langs->trans("WebServiceURL").''.dol_print_url($object->webservices_url).''; + print ''.$langs->trans('WebServiceKey').''.$object->webservices_key.''; + } + print ''; dol_fiche_end(); From 4951feeb8f05cdbb21e8b4f5e30d91dd57f985a4 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 1 Nov 2014 07:59:52 +0100 Subject: [PATCH 0405/1190] Correct rights & presentation --- htdocs/accountancy/admin/account.php | 4 +- htdocs/accountancy/bookkeeping/card.php | 38 +++++----- htdocs/accountancy/bookkeeping/list.php | 70 ++++++++++++------- htdocs/accountancy/customer/card.php | 6 +- htdocs/accountancy/customer/index.php | 8 +-- htdocs/accountancy/journal/bankjournal.php | 2 - htdocs/accountancy/journal/cashjournal.php | 2 - htdocs/accountancy/journal/index.php | 2 - .../accountancy/journal/purchasesjournal.php | 2 - htdocs/accountancy/journal/sellsjournal.php | 2 - htdocs/accountancy/supplier/card.php | 7 +- htdocs/accountancy/supplier/index.php | 6 +- 12 files changed, 73 insertions(+), 76 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index fbb8cf84baa..36739254d06 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -37,7 +37,6 @@ $mesg = ''; $action = GETPOST('action'); $id = GETPOST('id', 'int'); $rowid = GETPOST('rowid', 'int'); -$search= GETPOST("search"); $search_account = GETPOST("search_account"); $search_label = GETPOST("search_label"); $search_accountparent = GETPOST("search_accountparent"); @@ -91,7 +90,6 @@ if ($action == 'disable') { if (GETPOST("button_removefilter")) { - $search=""; $search_account=""; $search_label=""; $search_accountparent=""; @@ -169,7 +167,7 @@ if ($result) { print ' '; print ''; print ''; - print '  '; + print ' '; print ''; print ''; print ''; diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 9e109c7feeb..608c62cf1d0 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -35,8 +35,6 @@ $langs->load("accounting"); $id = GETPOST('id', 'int'); if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->access) - accessforbidden(); $action = GETPOST('action'); $piece_num = GETPOST("piece_num"); @@ -238,7 +236,9 @@ if ($action == 'create') { print ''; print ''; -} else { +} +else +{ $book = new BookKeeping($db); $result = $book->fetch_per_mvt($piece_num); if ($result < 0) { @@ -309,14 +309,12 @@ if ($action == 'create') { print ''; print '' . $line->montant . ''; print '' . $line->sens . ''; - print ''; - if ($user->rights->accounting->access) { - print ''; - } + print ''; print ''; print ''; - } else { + } + else { print '' . $line->numero_compte . ''; print '' . $line->code_tiers . ''; print '' . $line->label_compte . ''; @@ -324,16 +322,15 @@ if ($action == 'create') { print '' . $line->credit . ''; print '' . $line->montant . ''; print '' . $line->sens . ''; - + print ''; - if ($user->rights->accouting->access) { - print ''; - print img_edit(); - print ' '; - print ''; - print img_delete(); - print ''; - } + print ''; + print img_edit(); + print ' '; + print ''; + print img_delete(); + print ''; + print ''; } print "\n"; @@ -342,7 +339,7 @@ if ($action == 'create') { if ($action == "" || $action == 'add') { $var = ! $var; print ""; - + print '
    '; print '' . "\n"; print '' . "\n"; @@ -359,14 +356,13 @@ if ($action == 'create') { print ''; print ''; print ''; - print ''; } - print ""; } } - } else { + } + else { print_fiche_titre($langs->trans("NoRecords")); } } diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index b0e5096699b..21da5bacbb9 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -36,6 +36,11 @@ $page = GETPOST("page"); $sortorder = GETPOST("sortorder"); $sortfield = GETPOST("sortfield"); $action = GETPOST('action', 'alpha'); +$search_doc_type = GETPOST("search_doc_type"); +$search_doc_ref = GETPOST("search_doc_ref"); +$search_account = GETPOST("search_account"); +$search_thirdparty = GETPOST("search_thirdparty"); +$search_journal = GETPOST("search_journal"); if ($sortorder == "") $sortorder = "ASC"; @@ -46,6 +51,15 @@ $offset = $conf->liste_limit * $page; $formventilation = new FormVentilation($db); +if (GETPOST("button_removefilter")) +{ + $search_doc_type=""; + $search_doc_ref=""; + $search_account=""; + $search_thirdparty=""; + $search_journal=""; +} + /* * Action */ @@ -100,25 +114,25 @@ else { $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num "; $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk"; - if (dol_strlen(trim(GETPOST("search_doc_type")))) { + if (dol_strlen(trim($search_doc_type))) { - $sql .= " WHERE bk.doc_type LIKE '%" . GETPOST("search_doc_type") . "%'"; + $sql .= " WHERE bk.doc_type LIKE '%" . $search_doc_type . "%'"; - if (dol_strlen(trim(GETPOST("search_doc_ref")))) { - $sql .= " AND bk.doc_ref LIKE '%" . GETPOST("search_doc_ref") . "%'"; + if (dol_strlen(trim($search_doc_ref))) { + $sql .= " AND bk.doc_ref LIKE '%" . $search_doc_ref . "%'"; } } - if (dol_strlen(trim(GETPOST("search_doc_ref")))) { - $sql .= " WHERE bk.doc_ref LIKE '%" . GETPOST("search_doc_ref") . "%'"; + if (dol_strlen(trim($search_doc_ref))) { + $sql .= " WHERE bk.doc_ref LIKE '%" . $search_doc_ref . "%'"; } - if (dol_strlen(trim(GETPOST("search_compte")))) { - $sql .= " WHERE bk.numero_compte LIKE '%" . GETPOST("search_compte") . "%'"; + if (dol_strlen(trim($search_account))) { + $sql .= " WHERE bk.numero_compte LIKE '%" . $search_account . "%'"; } - if (dol_strlen(trim(GETPOST("search_tiers")))) { - $sql .= " WHERE bk.code_tiers LIKE '%" . GETPOST("search_tiers") . "%'"; + if (dol_strlen(trim($search_thirdparty))) { + $sql .= " WHERE bk.code_tiers LIKE '%" . $search_thirdparty . "%'"; } - if (dol_strlen(trim(GETPOST("search_journal")))) { - $sql .= " WHERE bk.code_journal LIKE '%" . GETPOST("search_journal") . "%'"; + if (dol_strlen(trim($search_journal))) { + $sql .= " WHERE bk.code_journal LIKE '%" . $search_journal . "%'"; } $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit + 1, $offset); @@ -149,7 +163,7 @@ else { print ''; print '
    '; - print ""; + print '
    '; print ''; print_liste_field_titre($langs->trans("Doctype"), $_SERVER['PHP_SELF'], "bk.doc_type", "", "", "", $sortfield, $sortorder); print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "bk.doc_date", "", "", "", $sortfield, $sortorder); @@ -157,29 +171,31 @@ else { print_liste_field_titre($langs->trans("Numerocompte"), $_SERVER['PHP_SELF'], "bk.numero_compte", "", "", "", $sortfield, $sortorder); print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "bk.code_tiers", "", "", "", $sortfield, $sortorder); print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "bk_label_compte", "", "", "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "bk.debit", "", "", "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "bk.credit", "", "", "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "bk.montant", "", "", "", $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "bk.sens", "", "", "", $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "bk.debit", "", "", 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "bk.credit", "", "", 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "bk.montant", "", "", 'align="center"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "bk.sens", "", "", 'align="center"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "bk.code_journal", "", "", "", $sortfield, $sortorder); - print_liste_field_titre(" "); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder); print "\n"; print ''; print ''; - print ''; + print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; print ''; print ''; - print ''; - print ''; + print ''; print ''; print ''; @@ -201,9 +217,9 @@ else { print ''; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print "\n"; $i ++; } diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 91a0eb5df8b..28d3d0c1f79 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -40,14 +40,12 @@ $id = GETPOST('id'); // Security check if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->access) - accessforbidden(); /* * Actions */ -if ($action == 'ventil' && $user->rights->accounting->access) +if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) { if (! GETPOST('cancel', 'alpha')) { @@ -109,7 +107,7 @@ if (! empty($id)) { print ''; $linkback=''.$langs->trans("Back").''; - print_fiche_titre($langs->trans('AccountingVentilationCustomer'),$linkback,'setup'); + print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'setup'); print '
          '; - print ''; + print ''; + print ''; + print ' '; + print ''; print '
    ' . price($obj->debit) . '' . price($obj->credit) . '' . price($obj->montant) . '' . $obj->sens . '' . $obj->sens . '' . $obj->code_journal . '' . img_edit() . '' . img_edit() . '
    '; diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 9ae070c25e0..cb40b7b361b 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -93,8 +93,8 @@ if ($action == 'validatehistory') { */ llxHeader('', $langs->trans("CustomersVentilation")); -$textprevyear = "" . img_previous() . ""; -$textnextyear = " " . img_next() . ""; +$textprevyear = '' . img_previous() . ''; +$textnextyear = ' ' . img_next() . ''; print_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); @@ -197,7 +197,7 @@ print "
    \n"; print "
    \n"; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -212,7 +212,7 @@ print ''; print ''; print ''; -$sql = "SELECT '" . $langs->trans("Vide") . "' AS 'Total',"; +$sql = "SELECT '" . $langs->trans("TotalVente") . "' AS 'Total',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=1,fd.total_ht,0)),2) AS 'Janvier',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=2,fd.total_ht,0)),2) AS 'Fevrier',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=3,fd.total_ht,0)),2) AS 'Mars',"; diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index dcd8fca4d41..1f9b0549121 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -68,8 +68,6 @@ $action = GETPOST('action'); // Security check if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->access) - accessforbidden(); /* * View diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php index 8af84a9ed58..fb5a15a513c 100644 --- a/htdocs/accountancy/journal/cashjournal.php +++ b/htdocs/accountancy/journal/cashjournal.php @@ -62,8 +62,6 @@ $date_endyear = GETPOST('date_endyear'); // Security check if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->access) - accessforbidden(); $action = GETPOST('action'); diff --git a/htdocs/accountancy/journal/index.php b/htdocs/accountancy/journal/index.php index 272d76fa20f..36286ce265e 100644 --- a/htdocs/accountancy/journal/index.php +++ b/htdocs/accountancy/journal/index.php @@ -36,8 +36,6 @@ $langs->load("accountancy"); // Security check if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->access) - accessforbidden(); llxHeader('', 'Journaux', ''); diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 789aa1111af..97d52124c01 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -55,8 +55,6 @@ $date_endyear = GETPOST('date_endyear'); // Security check if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->access) - accessforbidden(); $action = GETPOST('action'); diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index a7c0266998f..5bb1f989a92 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -56,8 +56,6 @@ $date_endyear = GETPOST('date_endyear'); // Security check if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->access) - accessforbidden(); $action = GETPOST('action'); diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index b0078839b55..45c8de9b165 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -46,10 +46,9 @@ $codeventil = GETPOST('codeventil'); // Security check if ($user->societe_id > 0) accessforbidden(); -if (! $user->rights->accounting->ventilation->dispatch) - accessforbidden(); -if ($action == 'ventil' && $user->rights->accounting->access) { +if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) +{ $sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det"; $sql .= " SET fk_code_ventilation = " . $codeventil; $sql .= " WHERE rowid = " . $id; @@ -103,7 +102,7 @@ if ($_GET["id"]) { print ''; print ''; - print_fiche_titre($langs->trans("Ventilation")); + print_fiche_titre($langs->trans("SuppliersVentilation")); print '
    ' . $langs->trans("TotalVente") . '
    ' . $langs->trans("Total") . '' . $langs->trans("JanuaryMin") . '' . $langs->trans("FebruaryMin") . '' . $langs->trans("MarchMin") . '' . $langs->trans("NovemberMin") . '' . $langs->trans("DecemberMin") . '' . $langs->trans("Total") . '
    '; diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 7d633c575f1..edebcfd9d46 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -92,10 +92,10 @@ if ($action == 'validatehistory') { llxHeader('', $langs->trans("SuppliersVentilation")); -$textprevyear = "" . img_previous() . ""; -$textnextyear = " " . img_next() . ""; +$textprevyear = '' . img_previous() . ''; +$textnextyear = ' ' . img_next() . ''; -print_fiche_titre($langs->trans("AccountingVentilationSupplier") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); +print_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); print '' . $langs->trans("DescVentilSupplier") . ''; print '
    ' . $langs->trans("ValidateHistory") . '
    '; From abfa1a5fde9f4c73692343413a3ac54c35901200 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 1 Nov 2014 14:28:28 +0100 Subject: [PATCH 0406/1190] cheque list --- htdocs/compta/paiement/cheque/list.php | 32 ++++++++++++++++++-------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 1699656acb1..08284e2796e 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -38,6 +38,9 @@ $langs->load("bills"); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'banque', '',''); +$search_ref = GETPOST('search_ref','int'); +$search_account = GETPOST('search_account','int'); +$search_amount = GETPOST('search_amount','alpha'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -57,6 +60,16 @@ $formother = new FormOther($db); $checkdepositstatic=new RemiseCheque($db); $accountstatic=new Account($db); +// If click on purge search criteria ? +if (GETPOST("button_removefilter_x")) +{ + $search_ref=''; + $search_amount=''; + $search_account=''; + $year=''; + $month=''; +} + /* * View */ @@ -72,9 +85,9 @@ $sql.= " WHERE bc.fk_bank_account = ba.rowid"; $sql.= " AND bc.entity = ".$conf->entity; // Search criteria -if (GETPOST("search_ref")) $sql.=" AND bc.number=".GETPOST("search_ref",'int'); -if (GETPOST("search_account") > 0) $sql.=" AND bc.fk_bank_account=".GETPOST("search_account",'int'); -if (GETPOST("search_amount")) $sql.=" AND bc.amount=".price2num(GETPOST("search_amount")); +if ($search_ref) $sql.=" AND bc.number=".$search_ref; +if ($search_account > 0) $sql.=" AND bc.fk_bank_account=".$search_account; +if ($search_amount) $sql.=" AND bc.amount='".$db->escape(price2num(trim($search_amount)))."'"; if ($month > 0) { if ($year > 0 && empty($day)) @@ -117,7 +130,7 @@ if ($resql) // Lignes des champs de filtre print ''; print ''; print ''; print ''; print ''; print ''; - print ''; - print "\n"; + print '\n"; $var=true; while ($i < min($num,$limit)) From 9e07c3a7b690c263e2c3d0c92c9d8e7427fed7de Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 1 Nov 2014 14:51:52 +0100 Subject: [PATCH 0407/1190] Typo --- htdocs/compta/paiement/cheque/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 08284e2796e..63923d6a3ce 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -116,7 +116,7 @@ if ($resql) print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num); - print '
    '; + print ''; print '
    '; - print ''; + print ''; print ''; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; @@ -125,16 +138,15 @@ if ($resql) $formother->select_year($year?$year:-1,'year',1, 20, 5); print ''; - $form->select_comptes($_REQUEST["search_account"],'search_account',0,'',1); + $form->select_comptes($search_account,'search_account',0,'',1); print ' '; - print ''; + print ''; print ''; - print ''; - print '
    '; + print ''; + print "
    '; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.number","",$params,"",$sortfield,$sortorder); From a0d3dbd93ca0fdf7a2e0a496acf61d7065ad23a0 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 1 Nov 2014 14:52:05 +0100 Subject: [PATCH 0408/1190] Social Contrib list --- htdocs/compta/sociales/index.php | 43 ++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 022aaf14ff0..b280fbdc2c2 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -36,6 +36,9 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:''; if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'tax', '', '', 'charges'); +$search_ref = GETPOST('search_ref','int'); +$search_label = GETPOST('search_label','alpha'); +$search_amount = GETPOST('search_amount','alpha'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -65,6 +68,16 @@ else $typeid=$_REQUEST['typeid']; } +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_label=""; + $search_amount=""; + $typeid=""; + $year=""; + $month=""; + $filtre=""; +} /* * View @@ -85,7 +98,11 @@ $sql.= " ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid"; $sql.= " WHERE cs.fk_type = c.id"; $sql.= " AND cs.entity = ".$conf->entity; -if (GETPOST("search_label")) $sql.=" AND cs.libelle LIKE '%".$db->escape(GETPOST("search_label"))."%'"; + +// Search criteria +if ($search_ref) $sql.=" AND cs.rowid=".$search_ref; +if ($search_label) $sql.=" AND cs.libelle LIKE '%".$db->escape($search_label)."%'"; +if ($search_amount) $sql.=" AND cs.amount='".$db->escape(price2num(trim($search_amount)))."'"; if ($year > 0) { $sql .= " AND ("; @@ -139,10 +156,8 @@ if ($resql) { print ''; - - print "
    "; - - print ""; + print '
    '; + print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder); @@ -153,20 +168,26 @@ if ($resql) print "\n"; print ''; - print ''; - print ''; + // Ref + print ''; + // Label + print ''; // Type print ''; // Period end date print ''; - print ''; - print ''; + // Amount print ''; - print "\n"; + print ''; + print '\n"; while ($i < min($num,$limit)) { From 5122b32cccbc3ff9cdbb7de94e9659e408043420 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 1 Nov 2014 14:59:39 +0100 Subject: [PATCH 0409/1190] Salaries list --- htdocs/compta/salaries/index.php | 36 ++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index b2fc3e1b4a3..8382029aa56 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -33,6 +33,9 @@ $socid = GETPOST("socid","int"); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'salaries', '', '', ''); +$search_ref = GETPOST('search_ref','int'); +$search_label = GETPOST('search_label','alpha'); +$search_amount = GETPOST('search_amount','alpha'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -61,6 +64,14 @@ else $typeid=$_REQUEST['typeid']; } +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_label=""; + $search_amount=""; + $typeid=""; +} + /* * View */ @@ -78,8 +89,11 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst $sql.= " ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE u.rowid = s.fk_user"; $sql.= " AND s.entity = ".$conf->entity; -if (GETPOST("search_label")) $sql.=" AND s.label LIKE '%".$db->escape(GETPOST("search_label"))."%'"; -if (GETPOST("search_amount")) $sql.=" AND s.amount = ".price2num(GETPOST("search_amount")); + +// Search criteria +if ($search_ref) $sql.=" AND s.rowid=".$search_ref; +if ($search_label) $sql.=" AND s.label LIKE '%".$db->escape($search_label)."%'"; +if ($search_amount) $sql.=" AND s.amount='".$db->escape(price2num(trim($search_amount)))."'"; if ($filtre) { $filtre=str_replace(":","=",$filtre); $sql .= " AND ".$filtre; @@ -118,19 +132,23 @@ if ($result) print "\n"; print ''; + // Ref + print ''; print ''; - print ''; - print ''; + // Label + print ''; print ''; // Type print ''; - print ''; - print ''; - print "\n"; + // Amount + print ''; + print '\n"; while ($i < min($num,$limit)) { From 26c63f3ea48a4d75d54c9479c226416436d7e792 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 1 Nov 2014 15:06:46 +0100 Subject: [PATCH 0410/1190] donation list --- htdocs/compta/dons/list.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/htdocs/compta/dons/list.php b/htdocs/compta/dons/list.php index badc71c96e2..174b5357bb2 100644 --- a/htdocs/compta/dons/list.php +++ b/htdocs/compta/dons/list.php @@ -43,12 +43,20 @@ if (! $sortfield) $sortfield="d.datedon"; $limit = $conf->liste_limit; $statut=isset($_GET["statut"])?$_GET["statut"]:"-1"; -$search_ref=GETPOST('search_ref'); -$search_company=GETPOST('search_company'); -$search_name=GETPOST('search_name'); +$search_ref=GETPOST('search_ref','alpha'); +$search_company=GETPOST('search_company','alpha'); +$search_name=GETPOST('search_name','alpha'); +$search_amount = GETPOST('search_amount','alpha'); if (!$user->rights->don->lire) accessforbidden(); +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_company=""; + $search_name=""; + $search_amount=""; +} /* * View @@ -82,6 +90,8 @@ if (trim($search_name) != '') { $sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name); } +if ($search_amount) $sql.=" AND d.amount='".$db->escape(price2num(trim($search_amount)))."'"; + $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1, $offset); @@ -141,11 +151,10 @@ if ($resql) print ' '; print ''; } - print ''; + print ''; print '\n"; + print ''; + print "\n"; $var=True; while ($i < min($num,$limit)) From 53dfda1413069c1e8f4979a171be5a72053030fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Nov 2014 19:34:20 +0100 Subject: [PATCH 0411/1190] Fix: Chars - is no more allowed into value for code for extra fields. --- ChangeLog | 3 ++- htdocs/core/class/extrafields.class.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index abbe486707f..28d86310494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,8 @@ English Dolibarr ChangeLog - Fix: box of customer and propsects were not correctly disabled. - Fix: [ bug #1618 ] PHP Error thrown when saving a barcode - Fix: Civility & birthdate wasn't save into adherent module. -- Fix: webservice Thirdparty parameter lastname for invidual creation is now lastname and not ref +- Fix: webservice Thirdparty parameter lastname for invidual creation is now lastname and not ref +- Fix: Chars - is no more allowed into value for code for extra fields. ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 16583c0703c..8ce0a1b3b45 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -154,7 +154,7 @@ class ExtraFields { $table=$elementtype.'_extrafields'; - if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname)) + if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname)) { if ($type=='boolean') { $typedb='int'; From b8faed9fe80700c2be56ca3f7469277cf9a41352 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Nov 2014 19:50:56 +0100 Subject: [PATCH 0412/1190] Fix: translation --- htdocs/langs/en_US/admin.lang | 4 ++-- htdocs/langs/en_US/holiday.lang | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 59b31693b2b..82a80881fd0 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -514,8 +514,8 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +Module20000Name=Leave Requests management +Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch Module39000Desc=Batch number, eat-by and sell-by date management on products Module50000Name=PayBox diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index c25abf6449c..698d34eb539 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -52,16 +52,16 @@ UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +78,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +88,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events From 762eb1cd48ad07ee4512391f2ac3cc551ad41aed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Nov 2014 20:04:01 +0100 Subject: [PATCH 0413/1190] Style were lost --- htdocs/langs/en_US/admin.lang | 4 ++-- htdocs/theme/eldy/img/background.png | Bin 0 -> 25628 bytes htdocs/theme/eldy/style.css.php | 31 ++++++++++++++++----------- 3 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 htdocs/theme/eldy/img/background.png diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 82a80881fd0..00f7ae43737 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -522,8 +522,8 @@ Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP diff --git a/htdocs/theme/eldy/img/background.png b/htdocs/theme/eldy/img/background.png new file mode 100644 index 0000000000000000000000000000000000000000..fb63f12299c1e94af1bdccaf930065b210b834dc GIT binary patch literal 25628 zcmWKXc{~&TAIG~(emW>B-LA@2Um_4%8+qP{omUnO2ZQHi}-*Nl4 zeLMdR@K>it|Hke6_a5C|US6J`pP!qXTUl9|ot<4>U7eYknVz0rTU(o&nwp%P6bJ+p z6BB$spUGq{EG+!_^Jj5!k;mh)*=#PCyR@{#;c#{Z1`hnY@c6UaPR||&`#gg^3H9D~ z!zZA8iLbYv_Y<$kr=8x$+qQW^EN|U-6tR8R#P%xhv8r929B3Vrmv#1W>f4aQ zt^3{rpxy#x-~_nRe!svpjFkwuC{}gS%#0scB;~IzIir(4s;ZJ$gJ0FW(w8KDj<0)Q zCm65#(hFV(q@&R>X=j~<_4DAb^(LdNhd#50Q@~Z`Y!sXFb{s#_B)n-W6?u??64#~@ zr>W_XYM9CG9G;da>kCFuqB);wZ9X{UZiijeb-tFiBhnU8#Hk%?h|GJ=bVFE}P5ONG>Dpz0R2RAA4Zjaw#4u07xOc_-&5>?64 zf=jS*ISaI-gINJ=OKe%<$3EJbk7rN8$NoB87QJR7i=}+dSsJ%ES6_N(zx1{x#$taa z^Tt~fR4~Kcrqt3lJhKwQwvQw{yQ8NYMk*@^`~(_678`f^zDlo5C>OVtL7E7&KONY| z;R^OC^8LGZXCJ639gHn14~E!@fJc=lsIxFt-LMm9mlJR$zC{#J*=fd?)1rd03tW%aN8AjLUB2OX0vm|8fBJ9Enel<)`p8=QZey& zxLMXqNAlU_rz$$B0aPCml?dAIkw|EIq&{`0cxKHwKdli(Hn^T=FbB$5_jZ-V#Kd{I9%%srQ}Sf; zH+28oLQ+GLGHmLk)@<0R!uLk_?TE4-x4J5mjLP1`NRjJzqx<-Cw3P8Ic`tUA#@_uf zH^p+|OPa94J}CMT6g22iIhiOzoULS9%lz$+pnS5D*Z=tF?CwmCO5wtoQ6MW?*iaSu zo1YePAS-vXL*CGRFh1Nc8_5nizrNs(BiGm0P|Gf;+lkkHHF$TD!ogs!2TgUqKm_9+ z)VyWa96bJc@0~9Ql0rF-b5TzpoEh{ctzJrB?FkL~*-qvtsrlkM(#&OvX8mWM({Wev zO!73zsJgF*tkWs^ul{b!2zg0x4oB_rkBrd#&+Dz$IHGw0p@Pkuio zvUL+^(t?5}wd8P@`KXARn=1ah9Yrx$Vt(ivwg&<^)fGS-7moo56KGng7%FBZSPo#yayFc_nP@&)9+27h0Fd7nL06!DfbdO?|$4$pkp20yEtx2w_CbLt*RU&CFKQbp#&8+#B0j_w^Rp|mH?Nj;q8`(VMyr|c`t;0(nKj`k#DUmD zHM%ku)&v_%^Mi`-*)Q(>#wb$;zy`hLfHC#;;~<3MsC~ce}9p8 zjG%F7!q4cL5}>cCal)3<+|K;s^{z)F)Hv?Jz-a7`0-Tm3ENRV3z(400lOyLjK5`Pj zqhS6mtV9i#eWdb=S$9P|ywT@HEvdX$WkSIK$>WL# zHeoEP18^x?^eg0Ry@NA4TRr7n)Y@BnUhQ)2`(i2*?+T3s`xyH0`{VnSj;Nocx=i~# zx6(DSQ<%Ctt^GS{rRv?q@O>qE4!>NFBG!N6((5b7kp5jc;01q#<2ROHshiGfl8Fy2 zcm;FXnLFqi*=c(PJ!&-cBS9Q4I@QU|-SxOqyNJpp6$Sa_0G`d9ggU~9MK>$HP)d%R zm0ho_F*!yP+OWO)M?a;1FC!L+?200}+}@(fj_wDO@B1vPKT(+?VW$w88VFj-&@`Y0 zwG03AzOpU4nP2ZsYw4*yyu=<+GK0FaKYOC!p|DKbzAMfsRMD^gbPxc*u%>)D3 zDcF|2S9(UhHOLjOo!3qGu8JE++X1C~2NzPHBkJL+_Bznqz`I>_bpVi3y=WX9cFT1m zA2uBF`mTUH{d7jFxnR9{CiSf*?B}mK7E2f`udzK>xorPOhMHP!O}x5^e$=bk(!Jbx zW7Zq>%;;|gIm{5x;3V)#c{*i*)Ft6z4fTG6n)k>lu=g}}ou*_((x*%Jau$X1S4+PV#53uo2`JjZm} zv=I{?wj$%mbw2^l><8*)-5KW*_09{+UhZB`qJ6A_gc?w49B6D zd=iVteCKcYC5SF-LDvnSo!a4C^%s*jGR7}jmNw#XCW=kBdZs6Vfpt%x&^^ulY(Ej>T)gf zp=D``kS6mjJ7S_^)@iftM>+^RNT_wPulsc@-~7}3Bjv7YM@T6|u8Sh!*qrO@{i;i5 z@yzJs^vo~LpjR=K*FI4Q6d><|H{h>?!U)|@1V{5kFv2lIwfEU0I@*Aol)@(9z##n@ zE1;#3&Coq(Jv!WH-aA+gMnViLYd$KZ4xBz3c&R0*GQa2UrTopb9Q4L-^&UKXQ-Zi> zYy0h;z`jp??9#c-*UXDUJ|Y7srOgP=To)pBmSkmq>9FrbD=rN~!d8!xJQ)gA3Jhz$ z{6K7*h2fz9z`@3~H@XpbE&!TVk7;&f-X5n+k6s((Pa0a@lQGGFSdOnS_}*#D0Z{3D3SGDCo_c(L6{OTI{feDvRvZtn|c7O1t2(>%&!U-CUB{9SnWeoo$U;t|tyd`X)5w)BMw%)vo z@=_3@SQ5$i$+)%Irdi>R)yx7x6~T{BL-XGB*Gm-LyhqAfKLAxBHH6_cIv?@0krm$bPYwq&4NU zg!K~n+gW&Z_@=le>Y+W2fJAV4!NXZ%Z!2+gdN}vd4I#<@n^h~eIi|9bNKn1;+*2|U zro*4*;uKmwhu{BC7vEpSk957ZXgfuowNQk^+a43$FJ^(NeH#k<>>bSA{Dkf8w?& z@Z17LTViRV2V&$RkLbRlP||di8}Xu~*gf+beZpk+YVE}LlKTi4CinJHXd(J0s3|8j zwS6btJyRq+3hLDZy7=S4+2Na&?^+di0A}8nY)~>wF2m8`8U-D05*|;w;O+^V>!5vG z!o4k69KRdUys1IZObq@RuB&F5wsfj%?ajw=H&^uqYhtdFN)~A3Wn&kz_|=nDDTUru z$x{lCH2&NP?h-JaJwUevMo>XeS=zdO>4N>)lssz}w8QF_cuD`j74vOgC_+B@OustB zbtN2?CQZ{DX8YB)X(SB?Z;im*siFXH^o2 z{kTbFJpQGTK|OS@bJQdGIeNR3QEm?sLU9PAZljPCzVB}M&e2X7gZyA_8sTIQB2>_r z!rFwH2)tl`iQNkPOvmruy%aa7c8+e+n}ov_+Z(+9JjnJ$GjCRr$)ZKDKW#Y;3WYhU z3~s>RqZ`P9vS9NXIOk~;bo%&`mXwt3Uz1P>mI8CZOy;dv1 zS+mF3l%wW{ZvRk)*1tGP$3@;`yOqp8BI8|p1FNoUa9AkKd(|Au@p~iqhYJjHV~npi z40z+KU4>XR+WoZ#1u!`g`n~Ph#oKb@%33sBCH?O;sKpo%aCPxU)|5EQ3Bl>+Uvisy z^Unh;u40hM8ht4^G{%FW zoe(?A(KfvQ+RI!cU(Sh8+u2qSkv?-5EK-VjPJJYQMMS-`h$RmG5x@cFA2l8Bz8(5v z!lop^UiocN_zqgz_y6^i1gDO#8n)I!QOtRn<|z+^OYN1?$~aFYS@L(SIWCQBg)ny1 zk0n&x>A-$Xa2bpRf6c#Tzm3>Zala15^dN)D=P+Ys%N>+Vu$&6r67XvEWIgQD9U~Us z;iksPPImSd?zw(66* zdM}Vy4lzmmddTCQ=!n_hG8+y#7krYMGg>kQlxqohJYhnNPM{^zx56>i7<@|DJ(nXyvv-`LKZ#OR-UPaO0Df80p5zIm+9?dZ>u zLvI1{u6cDjD{F5~K_O4+%;s+Rps{Q@ppf z3K?%Mtt80!9?*msrx>+zqj>H1dY_Wo)#qPwoZU)4WqCmBJMAJTg=ZVxmUL1EMt^PnE= z*yFDy{m+uY+g&+hL0dvfiEKxZ3Qi^UowZ!8nMvum?KRg?;bv9UA-(f`!Si@;GqRuV z;f@VUHzSJbV2FH&3_8|26ZiH|836a{I-FQ?)7DY*Qj9)?x8lOR)ER??$UW<++ZDTb zYAq;8_RI_s`p_6xRLP*Xb#+B0hfi0;RggADynaG zxyi|Lj#i@!=%=)aw~9QT-h=_Y^gCY#VJ?HIr zybzU0vXWM!iSY3^B!iDloVYEkX{zshcSbzp7L8ez zq0jdb2%n&KX9e7wO5yUsjl`)Fb%Y;mq_4G}v&KG5ct8b*!l_bB%CAURK+>O+sl#lR zp7@f_AmKD+PrtND5{x>dkbPRLTGK}(Ubi;%4Xu1}v-TN^PYNs)KJb&=!g*48Mxq7VM* z7%MxuK#HL-`sk%&vdB)j%p7;+8d76@5cvLV=6XTTqiGvg6B9;Zs)T$TQ)q9=L;{3DJ1jn{1yIKYVQ%gOn{lr^rW9!%@SdZBpeGW{P* zF6qn~2;PM>t8IB#s(_ls!1S#?-5RVvShagoX#a7B%LDIf z=n{1mLopqU~-})p3=v(FekxqYKYlQve_H?IJQ|Rux)ZJg`TXbQED5OXJJU`Nx`v|d$SA@B$ z;BjiQWBIZhGTN*8=YEs7fGLEwH~PjKG*g#?jOoZ>3ew)i?~Uitj?695*j2TeGW~3T z2dy^T<)fN=uvi4M{0)|{PH{#Nj_;))tkaQfx^lWQOC zq9FW|kR+?MdXpFRth@R0w}K-%t6dB7~0Wx8n}tLjQ+>)rziME;{_Vj`Fy4x)p*2 z`yQ*qo&m}(*h9=cK_Iicr+;OXS%p4K6KVO)iRmCdQMG1lb(W2EPZA4Lju~5RKJN;8 zbDf(p;%6k9^4VBGq1L0|%#5aaG! zwA{5Cq%dovp*avp`feJ3zX=}38!R#*w(6NxfwBmPxLND4tcyA5Xqf_CA@V2;T70-F z^WEV1RHQziCk!SPni#&aoF2da=!N15p8F@0sZbJq2v-pu25~a}U-a25uEsKHPt)M(sE{_(K;TlT;Sag*eRJmp4>F9OVXUS$@zH6;6ff}|_1*57Qg-nMk^wk}c7BgtOvC<$vbUinABQF@`nXDXR_ z8cBp9mvW^w-~=ahxcE%BQbY1m53r3J~4*?~#hnZ;8umQ*?Ff44vt z&+PQB3BSR_S5m74m+aC4dd+3zrBn5s8%%qUJTM;nSNi%w=&Nw5-bH+@nzbdQ@(OX8 zKq4b6h@jfavv}E9A8J2bVurf80XS!QA@Aw57SPC)*MLVYK6<-3^Hn2QI?P7z1-{f% z^jY_7G!>K(o`U&&j5{W5o5)m`rO(C85M(d18L>m2n2Z5Lh3^ZM$=@t$}LZZEFF z`nKW?4xiI%<<-I_@kn;=9U^gfPD#bYbDvVi41sV0 z;SojNn^~+Yg>{^nUP260+;;d57@@$QN8=d*GL6CdCV?}x{-K(~SzMfMKqnBYNfA|M zB6C$pz2m$N$%rtUF|5-Rmy0zI>GlY&PwU8krxQt{BK@1Rmh57RmMDj?<&9gK!%ZNK zuB0Ro`(&WOs&$NR52r;6P(Aje5d;W->EW7&d7Ki_a?p1ls0Nyp`^^1*Z3&}0+bsnt z@)K&;J_Hq%s|a;pENI=k-3MF{6TIShxEpnTS1z8RtKv* znvkfxcEpf_j~5U;s$ZN2L+tJJU+n9E#pgZA&1~>;4}gTYEDS*%)7Ekg0qpJj2dv@F zOY_vf)g}k5k8q>p=N@uSJ(>ORsG1Bb!J0gA1q=jQ2jLfjuBFl^9%OGQ`MG@TIl2Ic z5r>X9ql-*Rvy?0$apH&xv|Fv>eZAnMMQ3~N1utFnM$Uotu&-2$gU;dmh)>#9NzJQw zexI$@)!EWYn0tT9g4=^5>(a&-CmHnA+OfJKGM`N3EmGht}+^`bE*C$3`=JtxDVmgKm-P2Ar!ozMF4*IJoRUeqd`x zcFP^(L15sFoXt)&ExYw6ehF~VEv1Ki5pWef_=}>CdpcC%-e6_XNDR!&F_PRRfsC%w z0u9Hq$xYq)k0lxnW?iPGQ1yhxMc4A*Lv^g7oFFo&(pof*(zMP&HKypA;O%;g=Hh{U zJ?-*C(gpciPu%O2cW5MGiD-gi!BP@nJpDh`$F4DyJLCAIee04d9xR@zWl7(5mw7uD zOQsSYrkNT?p_Ip&ZN7mD3M*-kT~nAC9ZHgY<|^NPhRxiPAR{sTIXj;OS=EVf&A3}1 ze7hI&WFp!4?JXN$hM3(MdvFDoG0BW|tqnM_m#+W8IYHlt|Xilc%+-6@|j- zK9I+g$eim5fT3;vou-#CC;nCm{=9+gamH|o>s0%PG(vGmAr;634B+}bH2djf%Ti}O zMsa-mN!O62Q%4)Dx=z5Up70wsXmo{^Vpt^y=bzK1pmz}R{^9kREs6BePkU%f!C<-O zTN!I^SvHj>yKG2p&A)!4+eE%w3_^spE4fzHw^I@k4AUoCK@e?!IsV!Q@5wsoyMcGG zBANJ{9hyb+lzd`PZCVeOBN?dntGNDh8M)eNTGRaIdPnffqxaus)SEx(C;r+KSy_45 zRqkwAC{U6~=m*W2QjLtiC7AZUcMp$5i;4e)LNyvr!yA|LR2nNFyzjrl0w=%hHWii= zZ5C>@FH)IHT|uefy(bh$$vk(+nEZnsgyjy^xFp91Xlr)Dd19B=1k8TJGngyCy3}8C zt&qcr+~Pf>_~Vt@6n+A4vckt$0d zs@M!)E8jhma}zvruNzGRtK4wK?5gZlK{@=pAoq~1^in)RE+gCBHrux+OYlqoNLb0A zQwLz#s*29mF~P1BlDm~HjCfI%Ao$htF|S!kKM=D2Ay~1L!m*)pDaRZdYHlP1)@=Y2 zf03dPRKlL#?`b$PSyLH*+RZF+KVoe3KdW`3a*#%<@sYd6zinJACqyLpE55|BOi_I- zt*bCVk$FaKRQz;`531YbCQ%8WRm#2@TVII$uKTSI^N4qMmH_G;GpKZ?g0nJMRc?sC zBAwEgg)c%p3in_18^%Fi* zjJ%=ZOsdgZR%~=`$HRr6asOow*J_Y9B;(g!x&&+e2|eO!dqRX9Z)1*%qQXK->QNIG zGj9;>!_)PMQ$LIp^-gwH3Chv* zy?c4_n0)AG<18VoK+ti!drY!};Oopy%W)^sJ5$ln;0D&K5uQ z4ch=%RJDa|)v<3lPvmZN)mSD*MpIsHnO2r}SJLUn4z^=kN%fBm+vE4Vr4D<~tthAh z1gQpx>#kz{=(0B+?u?$@7UajXQJjB7^G|yNUEq~~X5O@Bekc7V#l>{;$jY0=7URGN z|Fvhi-_+q=+Enb;=4h8sJI!_#3i~UI-#j$p^q=cMLZWSl)8BWDxb2>wPI-~%@x?Ll zJm!AZpauSpTzaAnKL9X-5d^|+*BeCfF}td7cWaSgy#CAYmJ-eXn*hM;<)sLd;h_u# zB^3bZ&htK6hj>QawD;~3&^3SL*6&Sk_a`A3(Gp?l?fB9eXfL~NUqL*^Nk?vj%qu>& zSFe^>3Gr0vA0U|HPB2iCImKk4=cQi25AK$i4qH5Kd>=SP}zo7`$8{_IxhA zlIU1{Dy{o{Q{aF0*4Sw3&bqb+@|IWJ0ZXamh#;`hvD`z)&*>pSg%iZ?Bq`m5v2JoN zSq3qT3o9$_Fw1W5Vt7m0@8J0+TvN3V-*Clxnd|u;UXR5iiz&MifL^Lf&`)gtPU5)Pj!Gm1Uy?xgmom7pIz`Zh^Jt7H0FouEf zqWp)GEyWNT`fH@t@KUe(ixB-g(HFN&{a{KUm9717sS1PCcuitqi~j(@gQA)#g5BNW z`*WnCYg}1W?#0@AdBQL|;tzlAfcnz_ZM>jD(PkrK*rs;V_GGOkZ$|WU2#a;3XhR_B z8wdpK%nJQXrR|F0UO@gGJ(=?OA9iUA!|QWwE!w~YF;}qh*yJ0Gh!pM2bA99{dtCv?YAQi?X~&F0Y)$c%tb@SVvGwNc=Ff>WpKy#vanue2ZUg8t*Dnsj)KUriXRzIRw*^QE&RIRj2zQa zP=@D$J@Vu|h?bZAA?+0DF$-PtwC3q}kY(&Q-m-@T)+&+zxPr4c0nu0`s|$!RMjl}U zfmzd9F!PLpfS}TOHSMbb6DjOrD!9JXZo$vq%??ybQ)~-V}?UWQ{y)sdK~;0$2mbO|B(AqTOQ)My-}w?qNJc zw3BWFRmuwwuDDL1Z56l&xC9m{d*?>=a$JE>)aApgipAwnb#gHvx;Jyg1+{-nIHV#U(Nw@;*1;h$i5Ph zMEKLS*79_F&}D$-z;PqTCZyEU2=H=plJ%_n=ieQ?Y(wIRPw(wc<_!~_&EJJHx#64^ zipkB-@5J7td1#iYrC{aSh&osMb5qglAE-hc#t7Nd-5jKT$Zg=#Ec0~U$d4l|)_T2r zDBLB7o=GkXH3n?_9{TbHg9i${Zdq!u2s|UXRtjh*#0EB@0suj0@)Hl0^Bmoy-IuCT z8u2c0{O&qSsm3;}1uc$j3EaNSfn!-VA( zq3XUnG*QnFU~geS^N{SI!O}f8%;m52hJ&)Y*|}(nKo-G~j6)U7;I}rVt$g-zC3goF zc}F$w_?6ybMzuMoDU&MQ(Wx6O8nfS~GakZe=x%aH9mK#oMxL*BzAX5yIVq{9@s_1h zLe)I7M00gk{=+?$Zp$R2K;E?3TeEZ8aVnq~?QwaEZMcz>VyDOF;uRfo-t^*>(6D67 z=|F`RV=!ZSCAU}@hnkxp@`nT~9a;jkXD2F%dC=$H^)J(?!d@n9ANV2}CQ-KE=jqqq zGIKMXUj%hqCVX~J>DC|o^J+_kI%CPiDPP4;+5fFQ46vMidQOM?R%R z{=V_W-y98cddX}i;{k!JMWDzvXoc3(4P?4^^N40_SL6OF9)jLI7E^>|r&ENoN3oS_ zHYVq~2pbID5Qy#aFQh^jkI(jC$kbdMkE!7>L|3TMEomLYW#3X*hLiNrjy9(D!>h{2 zZvP51A2H~-Ci(++{*m3osG$+m$>08lZ@tXCc?~HJB=<`@Y>JM8_5~*I1?w_}ysEvA zSK*wDY=2w7Iip<=iTqA2?S9RppY|6MjGG1#HyTzCLQ#dVzK(o%AO8i+Ao2DyYYA?1Z24oH6&gJk(+rs9=3G=?UNiJ^5D6QCKbs0 zbYb0~{7+Vi1=i7FL}~edqUimDD2sTpUpAMS#9g_xwBpL%p{W?O$d{d%wff4O(~fH! zaNf_#i%dy8&{^`S2y;iDeo|X^fy0~_o5iQxqaEu1te0mg#}g%!+^@GvFp9TU=NS60 zauvc|18=jK8k48i{lANHPYBE-BPB-GK~VcvD_w*Gg9y^$7&+%Qq83C(&>|8wAf`XT8N-5*DWal@+m)>-Vb z2;cY8Y8;^A0Xx_M^ItsDahXFy|$a}V~{_pX%6^DSMYr8gR z>O%-L_?oHZm0(7<*QqlvjMpQD^-Cj|g*JMz=}1s5NORc`=T%Xx8?yr7?ILEK4uK93 zT0C%wSB-y{k{m%NgZZ*rW%pdUB&D2|pk&=6bpiGZ(w4nJ6VLMyrsE}AZI2LOMkd=q}DqVw~1*wOG_{Q>F z)W6wOD^6Q5Ymd>mSVu_p8GUzs_{G_d+^@TMCyi+@)Q03di^Qq7oqe4Qz28-FeR^ zKiMq3>TLSD9*F@S>ucrJqwjiPNBe@D?Grhy&4Wl*E)l`0e|wz?NwMKn_U-x>bi+JPK!s7l-=3pD1VV7i|1{?q=^ zj9e^bpkTzv$ed4VNq8QsKc+G-tf9Y_*Yx?U#(`bvmi`Ct7fEhofxkyL8@fD5RD(tM z$64-qV(3!%TG8Ee2}Fars$tbfQ!NCe23LOkQ}YSM;1e_1#}RQWhTn$x`pC zo5*!Nm7^j|;`yR0w^DdpH85+!f_B-RTV7E2gO8fiKHxxzYbAc;v%6`^ql4xj;mk}T zdNDuJHCpRUW59mS#Rf-8sY#697|Jy)+P zZr!~)ll2sWa?rE&7(`do$;;=G6CkgjKt98$gSD?Vu+-XAKy_9&Fjy>EkLD~3o-)mV zTrFo7O5Da;;oWp!yhAKWW4CdNi7TR?V7XW3+c8Of7w6m(Gx*s+3*zb zOgBHxV(rRn*0H2mh=oTDwe3p5@HIhI+kV}?(WRPZQM?Syv^IF+HJ{x*W3o=-nF@v< zhpIlz1Q%Sq-plH3?9G|Lf?AJtZ-ln*36Pg5a&(y+4}eTj9s`2vJD)-f%ug@)|GmM> zcCI?l79KX#|BVMBy7AX!K06}%u$a-wkuwThc5ZYMkl`L9M8dXuGzsoJqcL}7P0*Ll z)71-7arMKEHGbm-1UA-(#Z0{CzG-sRz>l|N{jc;>;6P`YnwIG+!`7Y5E&s;xBo2-N z;U!cB+h0j##KFJ!D>%(==DfU@dK-4Z24B@VhR}5m95%S4b5^w4Q;TZDseHI1?O&S3 zAe8%N;pU?vBL-=I^>7S~$U*AyoL77nPV-2}sG3Jm`OnX7Gf&q{ez}gFz@BOZ1ouQE zVY{cqF^l>z=Aj-?wFmMBPhb%oMPIQlLs^zW3B;y3m>ExRHrTa&IvKnJ1KXEzdcNjT zQhF&BpVw8z8F)h|`>5~U^h&KKZ{PB0SNX+}x+sgEXT%sn>V17dMI8P*?*J4Wvz9x< z-Js-mp2`PRw=sSQHbkzk_RLyYNFsV_G&@-+7Fk4)QALp}rcGTu1}4v~t=Xh1XX>Gn zdm@hRKc};I5_ld+xRO8JNY~eh>8M zuP_A@VyN$4NcH_z0Gv2CxHPeoY!vRVIdo;BXojIR2Q497xpZshtWpGu5%Oe8 zVEjuWc2;8#|Fs=JHsFZSbAS>j0{JT@RNPOEU>{eyX5+V6YbN@nE0l7mmpj zHgzEBeR)~rJMuj$YKuNUK#-11B({)Pmtx8(mu`AWJuBhRqMuKczYjUPMdYz1AkQh& zh;!Zsi;Q86GOV3c*bz|SY1g0)s8(KBUOG>+eERKs@vDsi)t<;*`$`uz2me$XPA7oP z6}ox$Z>*M1Xmn$Eb?~8OQt*zX8-6|s>5@r{ST-aJg0Ih^?tbMqY z7i*~6$&6i`)QL_cbv{LDl0-Yv#zW& zc(Bd}BCJn7#s5?d;{b+?t@3VKKhi6W;N`!u?tg0s^isNtG6QJ97*sjyk@z9so^^hA zm#XSpx@w$9@RU5DI=j6Fsv#q~0O5@bEsVBA5;&}su=noit&)Mn_q*BYpLJ8Ho&hr{ zK%-UufKha4+EDJFFX3>K3OGryNtB)IG572}z{YF0{p)<7ryP5fVv``sH7Q%jc2fPX zS(|8ee=OInei(PU*YbY?!2=8o#&c|#s?)!{GbV24J?c=d%)^wE|2ufurpjx*-A4jE zNVbW5CQ2>(GnctRfq6|Gni!{%y-A`welW~n6D0EKPoi9D3h&ZER|VckTB(?2mM(OC z*P-ftFSFq10J@;|XA)C#;tlb*B$@xR8uP->13Q#oE$g1f9%{^S)tZ=`(1IEqMnH)z zuB3x^SF($VPxn8UQD4a4EY|nr=9UbyIaRvslH1ZRC<~yq6^r7cS&JhmkW19yWfPd zbF72itW$A#l(DsK18#xK-*Mwis;g%;L%~VirT6)kl%0S4{eQmxO)-{=v?7M&0*p7T6$uJkwX4IEN?M!>ajI zS36?*4nM8Y=yTheu2{EUYp;={tW zaG%;iVGc&`xUuI(=tAE{EkWERaf)KMei*9tuR^2$4P-t}N5 zLUA_S*=Lb#04-$(wcdgW$IimSN~)F@!}f$|ui1CV z6avKKkJXRs3?L7q>x6`I;;v~XZx(11ugt<{7Y0!7{Z6Hw+pDq4M1?n4WH$Xw*Rl?RF~vC&KEnlG?0W2T}1+ab6p@d)x3Tq*}FV~ z@-f%&^*ye#kI<5rvn=coSA>lPzZo@-eo_JqcH5E(vA9Zu)TB``gHRSsVv+HTq=a!g z&uKgU#M+2jpz4nZfk7b*vORvMKqx$eSHH=-5U2+TWrc+*^fLM2uw373gSwf`GPk6b zGEbw`FH;W{(mrxXW?)fF5=3%SB50$~feK$8^sMi}&jmjWUL*;}B&h|Xu{iri&?9WE zA*i=tDEKt&GjXI#`y*gFdsF-+Wa0ftpdd1Bp~%sZD3Zt!?|k{91-hkd^Ex~%0`W%B zcm+9Zv<}hYj~;5@)OzH`I5LnMuFw;mQXL-WZ$p7idLyKxJ(xm< zg@11&IM|*0eJYq|F4CTqy4f}C<@z`~3;9PT5e29vR9dL4dgs_?T1ywWoig#GJ<|fA zDKsDh3y4Mq&Q0&xsg2}cBEIPe`n1*4HiG#yw(ZZrSx1AUOouea!wV-@z6}pZE;v_3 zZ`=G(x^|*9t>?%Urj%CDd6C#`i!)L$k{>TWjiv)$6hTq~x*}iQ#oOZMq^C?_tV}IZ z_U%jWcQ3%Hc8C{H;gvxhs{j|8Mu3yCG5mGu;4cI_uVOEOO#k9hDD&UU9z7U&W>0YL z*+f_@L-4+;K6YkGL>*H>e=YeulT0UfDkUsFFfz~Aicp0NFkN}!tIX;Mm~^Kp{4q=$ zpqmf+awUtAM7=s~6Z&(uxKC^%rC<4>fU04E9MW0;=`ze{Xs&?z)OpFlBf#GnYO(x1 za|d9Rgs7+~F74em&d+yUry>;*1@r`%x991nJDnznIWxLNN)hp;+b0{qGV;2R8Xxx) zvc6Tr4k!5Y%%iYnortzwQMy+C>jf5f~g~LcZf<# z(&bDLugazQV?(6BN3UDT&Axf;$=TvDNbwl%>~=VeJMxW^QpI&=~vNcr-Hi#4N z=8Yy>k4|6kCFA0K8_o-y?%sWqo2+-quK|A4rMiclQuimcUxz|WKZsnB@Uz;(X^YF@SN`pz z7+a$QB^423rsPW4 zT-&fKAvrc8#%5c&XSO-F*067X!~2K#`|*0cp078u#8qu&=jDb|j*%Ctr_no?(Eqiv zjDLPz?WLU}<5NBrS{L2!j~QS`%0*)Z-sLO86Ab8lo))(-R$b)w0!o!;th{m0ZH>tar!y)63)qEjB zjpZHW;#`jx4rA6{07Thpzxv*yt~~a5g<}ZQ@X(x*$Gw(38D<4CDRg{-X%vUUjlfy@ z1k|S@H+T^v#p@%C0FR02HqE0%{PKz@4|?IMy43$OVT?l)Owt`vy?NL7YN;EWYFLG=Aqzc z$t!R4zp{hptp(2mWA&Kh#-3g z=ob;M1RFi>s0bU~Qy$4kuI9^ zwkcT(!^C!M)migw55EMnl#=^-!MPq-vi_54LxaLPYOq;YXaSNvt+N3*$Y-UOdorn- zUs$0B$!=(DsjeGJub>B)O#11_0pO~E>+8$`-?13_k>6c-*PAMS9{Z;;H_Wjr{Xfng z`)l>Ksg2|p08heDFW!@>qTG%tBG*eFq5jR= zB@zw;JRxT}RyL>(Kqd$bU-JpEqywEF@xiRLcma&Pb0sv;Y^`j7sLMHk@<Y~eRk>NDuQFUXT!0h{;gTAKhj3-TVo1(G#x_d(NL+Te2md<}Ggzu>SN zE1B@^exxkOF_ihlue`TJu?y}QHI={*K*MB<{f@FZ5_%z-5~CZ?&irR|EAsRiKi zx(q|fecJT;n@AE;YhwSu8FYm@qAd6}@ofQ>`V-V^xjjVxkgr~!?~u{a_!-EYw}g68 zGpI=joG!x$4=g&WN(OVFuhhIm*WugFIf1E?!YvrDo#3$kNqDI)U3(9fXPz8KkMZlc z<&v?cTr?R}-|58qco8?&R13|>|C<2(J0d;!w>J17csdTg$|SkjUe-phu9;^YArb{E z7u+Li)~j`;mez&0ACGmyw@l}IOXUxZ_HH6)Z3=^TFhToNEonf9)vcZ15(Eedy4tmh z`kw{m3*-a$z+$emeM~$5BXb7wcQEo`<#x4CXo}>Qr`zL$Cps4qoK$UnXeYNb;PWL0%I(#O%dsLyg`fQ>$1(Z&{g&%#ytfK?S|%;-!v5mM4s93a<&>wX$Zx2y-b%ocnk*G)Joq38$4+ zxjT)2`56Vpy%p;{C&r|udxyb#`O%-u&WaurrVm}C8JaU{FODA`Js}bprQfZ9{bm6paU>IMmgh&^ym- zCCEp{95buNkEoc?+D9r?x1GN34?w_%Pws!>@fU&LJGi=LeJ?b7`cl~Rc#Es7TVnKZ zTGrwSuiu&W0QW7bmjh;7#R+BY5H1*2{bmxaSN)faq5OJNa0jwt?e{lJW+TNL!;D_bE2;;jIFQyoZ{T$jp>U>)JV z**AAUg-_uYaI?+h|Ka4i%YU&D%u~)`s$aeY+DDadB;X-SVosr-dZLt;-=Slh~b;eG@VZO^Q7zdJXQR0ql}k(V`gQ}&V9*R6h*EGmF6 zHB+xTh96&LwVld={tpy6AcN3%aYSifUh4g&2J!HCMbw@CJ+&4vL6JzzOUi$ruSzvZ z?9|dis{P^pW?;3C%#hOwWfi9d`h?THU ze4iHmQ6R*PZf`jR3@;umca{blmUORgkAyulPp2gt7A+8IuRawnpGsa$nEbp^l3bld zB_$QYEI4@yD?(i|mO_Pz@!C`Fb>J}4`8}hY2Ndb2RwE%t!9=>&Y2wJXGaI&!2N3kt zLLSHwZcRiVgZrOz973_=Q{O>;`Z8I3mh;{L)|JM*oU7)VQ71CFy~ItM_isW+%7@B0 z4Ps*cOdQv~gKgp~(#d7;!x7y#XV}#uuMp~bCDBLB+#Gii1d6_w)7<@|J6$hokWZ3- zb3Lfy_A3xxykCa%O*QK@Oqu)VWGA_qo^e<(9IhoEo(xZrmp;?J|LGkVNx_|WE4?x> zpvpuZMZi-2l8OZl`L_k$P=7-iO%9C>>V0r~bRV#0X#Q3#?ip2e*-Eyared92rrwUS zjMOTdzEgAV;@J$Cu2&;JB1xzdH5Q~B_IaN;G7(Et5n>e11!NU;d1q3avp9OwB#cNx^oi#`Vpug07P=UDsm!5-Wvj8dzod+5-!r-X?25XqT^ro8EXQJ z*A}>o*8c_T_v%BFe>pN=AlhAf|4ZB?)K}I5a?bu!h zz0QU1z^l`AAK8LT`K6hWrn_P}kSb7jrP!z62 z{(%FK#AImn1>UZGAoMufr1}N-ndNV0}u$B3#N~3@pZ31{&dFUvZ+N)-G zcH7aj$BN6^3$$HW*mTa#4O%={c4I?D(himAvUigo#2~y}jr=1TtS++T5U9Q^(w|67 z-qyX(A+qk5V?Yzm3PuL+BSzfXvkx*#K0{CKh|aqH;rLB8Mk2;yG`pI}0RuO-DKw~H zBl=dlTm}QO0JliS_Oq^4gdPP?B35h$aSpf~3k?T^?P+*uTu=C`?!!*wF-`s?< z%3PDm?60f>=TzDu{XkFk?H+cR9({LlyW$th=jE z@iRW9s^eC@Su6|5!@z>DN(SDVs(KxV!;Z%mkF*w{SO%|9g@`M&|1CP) zxau-_vNQ96U!|EV;$vVWw-cFivIV^qGTWaMcFe(ejb0+$oLyk7X` zYRJCd3gBI1x$HlLW+^yy#{ZtWfxx37W9QQNo-5xDg&FO4oC_lC$C_BDT|@{E=4*iH zdYm`>evS}u7A7#AbVUk7fYX#B&JhUNt0p3uhhmzUeq{gf; zw}=i=-oB+GnO{ldp?FwGY zF(iDunf$}Vn&83?j=$;6f!Xh4tH=1RC8xF2d6VWD)gtg24YJn^V^e?|$v43zVMM2B zLL&US9yT4@QGQ!!32_qJp>Ubb$sw#@*>60jCs*g@ytf=53_J3Z=OZDA#($*!K%T6% z&Z0Xh(L`zo+;xh09w8?v6Dm7i^bv2F!f3MWN_NBl5b){4;4R+a2tOSvvO9bEujB;i z&plG2=#>JON%Vjr<~RN;eByPR0GZogkKfj8;ZLghkK271V3OuUt+1G$srU|#**TW^ z!uG_ADE|$c=LT<8#&-kknQXXS_UZG|qHN#2=QQHT`p+Ff? zTT|C^Ub25H|A%5FN0*gwgs|X2$=Yo!+m_19O^&)3KflEHfinpAvG4d!p84k6=bu_V z*WkNmzxcNmA>rC#o#<dC|#*5w2=mDY0$n=3fQv?lV4xVm6`tRB-;|`aZJRN%I zsGfcFG;Z7U#^ui~@9_ugvqfAs)cV~ThbS6$w}Ijk*O>hZzv|AMA+n>?_cO5Pm?{fU57BL;LC=3Oc z{>UHeCyHduDn+x^3wKioUy*;Eqyxz2vCuhCJ*KWAr_@v1>3W0POuU(a%U@bgcJ!M{ zXT%z&O{RO3UJIEXpuPDTDOqW#YnkgMoqsl+B-GVTjbTjX`e`LPmLKY*5ZxN9VC0m^ z2szBSs5(miM^}~;r{V&xjfDuWT^`OjVkk@r9%yn^Le34TTJ#T8q`{Va(9F}|DGKqx zW4gTTv)KDrH{M1nxW<%j8|k=!+z1ZAOe7yt?vb^0Q(zwwiwZuVKqiWOb{=kE84`tI zhCQU zQe`?~Jjom+DYso^T9Sx(U!7*B;%b<#gpD?#zd1=h*`5~;M54P5+3eXgo9!Wb+NI(u z-!~EYNjTBknz%^rgvdQ#e1Ei$vp}lyK7&5(6rwy`7+cs7Oc5%7# zW5G?f10Ra-pUwzeqqye)WqbI;!HJt*I&c$%j@_!v>=#Q4K!Ynak8 zR#IidX)ZbpswvJnaQI%3h;*UDC!pmKUN@4FX#5^j-gZgo4xbOHI=3-IdoMNC70j)B2KuNDDMRzv zNk#PxD`qg_S>LL}dT>VzEj+lsqM#5CNMT$^)eoV`ZKbDjXtFtjncDWN^G(-6PjGNl)covv(i(@x50HaM!E{u9D%NO|Te>v56J zE_f}>Jm-Vh%lLnQ=0J-J*|$mw;{f;{@_u?rol(uW&1=scLRx7R#0S;6|WpNA)uFEj-0gce|{rYu!%R4Wzw|8RK6PY;vxL zrQfYBIezn8JnuMnSQR_k65VIGdNzIy^Di6~{vgI%BEKspTVwfO4lx1Z&dMx0iGYzne>@lJmfsp= z5`Lc|qoNt%F$Rq?wfIsnu>ZiBI$!2w`44=MnZ&jJHCu4F^PR5Amxn}m`$f6zU6bcd z!GVrkW2gIFrW$ZQRS_J0`-5$urtz&S1J}ME)=8<~cxA*7sftxTalO`OMktQjiY;e^ zFHGGRuIJiYA;d(UTbVsF>b%mgyMq(XPhcXG=6&6{xH zh!33RLmW++b@T}@f=yU2pU|f}L~*y*#r)2SH;r*1wVxxj}OKmsWEx^0=p;M`HS%-yjp}6@A zwO7O?{4WyN!zZbqE&+3&s*qw|n=EuOmsY}6Ot;@f7W~6dV<`8ozEsc-xnY|bszG3- z;6jG{B3VQPxcGWTtbzWVqDlFE_%o!@QuLtBSnXpMRhjtQfuN)gHqPryiG=+T$koiw z-Cwhpuap`+&K_Lyk9gGvX7A3_YEz>=8K7@Ty<{5ScF06^cz$ROV&)eU)GD1PC2qTm zc~1V|z(F+GQf=Vil{ZJj;yuDmN0ZGYlFDRbu1*(ZJ=?+SD@U@l>!b95bj$nW<=`+? z%hC|EqwINn(@B-@woyl$TCXGI&X?2j)l!yUZnI6IUNpLIiZ=BW&Ze0?ZI{gysr2}a z_`StNH{VdF$MqAUTUET4=0v?OlA8GSt+H0)=IMv4$V!i!enetdY=mBe(l_Y`jkg?N zy^)S5wx;cPpT@G@IzR05U<&etK|^B`UM9O-elPg+R0Uh$uV|c`ms!0mOz8FT0||dt z4O%K@^i0Kh+Qp+KOYa{;C}%GOKa`hl5je?LRc4+KBF&*4c%AAKNq+!tOUzj#9ix#+ zdgYn_W|J#?&--9~&pnXGUMUH*JWiJ(Vsj)Y8@Z!_RE!wfm{9Z4NGTFW-@#S)0c9qMDYpdB2mrXJ~fc zPv#5{{f#9*Ew!6UGo#qSJ)(`>-Pmrx&I6cR#EO{QD%g$+B~PvMlh-p3>2s6I@O4Qv zq}kFC$X57OocJ#q_R(rN&b`m{Er8z-CBI14RbIDfRu})GL#s#k^|mLxPtB>ZxbRBb z+kZhge3W5H_@T9o8p5&l&5(k>`#@@TW&`f|#O=B*E5nw_G#@RGN`qwnUM8_pgqvKr zgj`SjrxH&KD@2r&H%jdAph1jkeRJKY@^hjcA7?aFHpjj;4f>j`LNKk=5#NQ(_6lmB1JgIPuv%T&36nHCVp!(xz*Ow?G?w=)Ei=O{aQY3dg-yCT z#~swkm`QV`Er2=`V3k!UrW`|Ng6^z@@5eOUTP!Yv^{=fXX&V;G?mNtR2AQ1(h@2`$9_#R6u4OhlnxHGzxXg-?QYbp;k zTY(YTnw$aK-frB@g9vxj<=&qJgK99;ZAPOl%J-wklN8pX?$T?4k|%u-$Q0wTaz4q~W~Vd!M{K*e)bF;fSF`I?a{RdW$S zMTQTyEUO!QHxOplfK`{kroc}CFY7HvVWz#YOm9ihPK6g&qBZzF2GaZGf`@bKZ^h>u znU!GeW%7YYuLi~^gJ^Ji@jr+u;qhf`9p^11>-Kzd&W-Wk-*jnk?v8h;r=R_+U|Y2B z-+SfRBa$v~_Vzy!*i&tdSc>VyACt*S>USRk=W+%s+S?P$3+8Of(HTUsB2M~_os8=5zMxRP4Dr%@RHWdiG$G*p;XZ3lJo%Y> zQ^7dp*scf*AJe16&0J?e9#U#}+{;Um*2ykS`bi8!R73XmaA5nG;=bP^Sczm1^y@Vh zHuck?V1WLBr!bsV2nb9&F$$>mUd`2Rx=#l6PHmXF@=13>LNJzC`^VS*F(Idq#>9aC zw!i9jyncObYIbI-Io@DpD!{Vzhl6z|ynMy^6L4Va_T~ckB=!B!gMysWHL_)dGFJVy zFEMn(RV$ra3kTEb%S>V!AZMYJHge3<$LQwM4N{TZSC&Tt?}hpx+D-p1Zo()SEe0Hc z%vVjW&?n0{CYv#v!hVwmw7KUehbLMITUB>iEF7<-Du-ZAxz8~I-ixTVkZ z7kiM9vn*6K;P}L-0cp1;%ff%#g34DVxxSidv3^~YLKt~zHpNGD%;t!W`15rveGrdU zEr&7KFNsDs2H7(Ofcb69>#mEk#I;1Zd`rujjjgA5ZmKdT=jfW2u5;5BIStBg3WlY U`K5o~IsRvV)%gm>_U@Da1L( background: ; - /* background-image: url(""); */ color: #101010; font-size: px; @@ -831,10 +830,10 @@ foreach($mainmenuusedarray as $val) .bodylogin { - background: #f0f0f0; - /*-moz-box-shadow: inset 0 0 10px #000000; + background: #fbfbfb; + /* -moz-box-shadow: inset 0 0 10px #000000; -webkit-box-shadow: inset 0 0 10px #000000; - box-shadow: inset 0 0 10px #000000;*/ + box-shadow: inset 0 0 10px #000000; */ } .login_vertical_align { padding: 10px; @@ -861,17 +860,23 @@ form#login { padding-top:12px; padding-bottom:12px; max-width: 540px; - border: 1px solid #A0A0A0; + + border: 1px solid #C0C0C0; + background-color: #E0E0E0; + + -moz-box-shadow: 3px 2px 20px #CCC; + -webkit-box-shadow: 3px 2px 20px #CCC; + box-shadow: 3px 2px 20px #CCC; border-radius: 8px; - border:solid 1px rgba(90,90,90,.4); - -moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); - -webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); - box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); - - background-color: #FFFFFF; - background: -webkit-gradient(linear, center top, center bottom, color-stop(0%, #fff), color-stop(100%, #f8f8f8)); - background: -moz-linear-gradient(top, #fff, #f8f8f8); + border:solid 1px rgba(128,128,128,.4); + border-top:solid 1px f8f8f8; + background-color: #f8f8f8; + background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); } div#login_left, div#login_right { display: inline-block; From 167ec6917a30e8362860229d49d974a1eed746f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Nov 2014 20:15:51 +0100 Subject: [PATCH 0414/1190] Can add prefix into generated filename. This will save time for script to build kit of files for book keeper. --- htdocs/core/lib/invoice2.lib.php | 18 ++++++------------ scripts/invoices/rebuild_merge_pdf.php | 11 ++++++++++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php index d5be39aff0f..ccc115b5b1d 100644 --- a/htdocs/core/lib/invoice2.lib.php +++ b/htdocs/core/lib/invoice2.lib.php @@ -41,12 +41,13 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); * @param date $paymentdatebefore Payment before date (must includes hour) * @param int $usestdout Add information onto standard output * @param int $regenerate ''=Use existing PDF files, 'nameofpdf'=Regenerate all PDF files using the template - * @param string $option Suffix to add into file name of generated PDF + * @param string $filesuffix Suffix to add into file name of generated PDF * @param string $paymentbankid Only if payment on this bank account id * @param array $thirdpartiesid List of thirdparties id when using filter excludethirdpartiesid or onlythirdpartiesid + * @param string $fileprefix Prefix to add into filename of generated PDF * @return int Error code */ -function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $option='', $paymentbankid='', $thirdpartiesid='') +function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf') { $sql = "SELECT DISTINCT f.rowid, f.facnumber"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; @@ -220,13 +221,6 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false); //$pdf->SetCompression(false); - - //$pdf->Open(); - //$pdf->AddPage(); - //$title=$langs->trans("BillsCustomersUnpaid"); - //if ($option=='late') $title=$langs->trans("BillsCustomersUnpaid"); - //$pdf->MultiCell(100, 3, $title, 0, 'J'); - // Add all others foreach($files as $file) { @@ -248,9 +242,9 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte dol_mkdir($diroutputpdf); // Save merged file - $filename='mergedpdf'; - - if (! empty($option)) $filename.='_'.$option; + $filename=$fileprefix; + if (empty($filename)) $filename='mergedpdf'; + if (! empty($filesuffix)) $filename.='_'.$filesuffix; $file=$diroutputpdf.'/'.$filename.'.pdf'; if (! $error && $pagecount) diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index 357a09ccdbe..6fbcdb59538 100755 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -71,6 +71,7 @@ $newlangid='en_EN'; // To force a new lang id $filter=array(); $regenerate=''; // Ask regenerate (contains name of model to use) $option=''; +$fileprefix='mergedpdf'; foreach ($argv as $key => $value) { @@ -84,6 +85,13 @@ foreach ($argv as $key => $value) $newlangid=$valarray[1]; print 'Use language '.$newlangid.".\n"; } + if (preg_match('/^prefix=/i',$value)) + { + $found=true; + $valarray=explode('=',$value); + $fileprefix=$valarray[1]; + print 'Use prefix for filename '.$fileprefix.".\n"; + } if (preg_match('/^regenerate=(.*)/i',$value,$reg)) { @@ -232,7 +240,7 @@ if (in_array('bank',$filter) && in_array('nopayment',$filter)) // Define SQL and SQL request to select invoices // Use $filter, $dateafterdate, datebeforedate, $paymentdateafter, $paymentdatebefore -$result=rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid); +$result=rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid, $fileprefix); @@ -283,6 +291,7 @@ function usage() print "To limit to some thirdparties, use filter=onlythirdparties id1,id2...\n"; print "To regenerate existing PDF, use regenerate=crabe\n"; print "To generate invoices in a language, use lang=xx_XX\n"; + print "To set prefix of generated file name, use prefix=myfileprefix\n"; print "\n"; print "Example: ".$script_file." filter=payments 20080101 20081231 lang=fr_FR regenerate=crabe\n"; print "Example: ".$script_file." filter=all lang=en_US\n"; From 5586893ca2ed4b6ad357f55edd1874fc7ec327b2 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sat, 1 Nov 2014 21:00:28 +0100 Subject: [PATCH 0415/1190] Update odf.php add new fonction getvalue (valuename) return value inside [valuename][/valuename] tag --- htdocs/includes/odtphp/odf.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php index 225466ca453..d4b79af8013 100644 --- a/htdocs/includes/odtphp/odf.php +++ b/htdocs/includes/odtphp/odf.php @@ -610,6 +610,21 @@ IMG; closedir($handle); } } + + /** + * return the value present on odt in [valuename][/valuename] + * @param string $value name balise in the template + * @return string the value inside the balise + * + */ + public function getvalue($valuename) + { + $searchreg="/\\[".$valuename."\\](.*)\\[\\/".$valuename."\\]/"; + preg_match($searchreg, $this->contentXml, $matches); + $this->contentXml = preg_replace($searchreg, "", $this->contentXml); + return $matches[1]; + } + } ?> From f23f16da861d128c7f1e2e355fbfd151a0c7b4ac Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sat, 1 Nov 2014 21:38:50 +0100 Subject: [PATCH 0416/1190] Try to improve stock display for all stock increase/decrease options --- htdocs/langs/en_US/sendings.lang | 2 + htdocs/langs/fr_FR/sendings.lang | 2 + htdocs/product/class/product.class.php | 78 ++++++++++++--------- htdocs/product/stock/product.php | 95 ++++++++++++++------------ 4 files changed, 100 insertions(+), 77 deletions(-) diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 2ae43f39766..855fced7310 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order alrady received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 47b359318e4..59c937c97b6 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle exp RelatedShippings=Expédition(s) associée(s) ShipmentLine=Ligne d'expédition CarrierList=Liste des transporteurs +SendingRunning=Produits de commandes clients déjà expédiés +SuppliersReceiptRunning=Produit de commandes fournisseurs déjà réceptionnés # Sending methods SendingMethodCATCH=Enlèvement par le client diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 226a3501652..98b5d155ba7 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -3032,42 +3032,56 @@ class Product extends CommonObject * * @return int < 0 if KO, > 0 if OK */ - function load_virtual_stock() - { - global $conf; + function load_virtual_stock() + { + global $conf; - if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) - { - $stock_commande_client=$stock_commande_fournisseur=0; - $stock_sending_client=$stock_reception_fournisseur=0; + $stock_commande_client=0; + $stock_commande_fournisseur=0; + $stock_sending_client=0; + $stock_reception_fournisseur=0; - if (! empty($conf->commande->enabled)) - { - $result=$this->load_stats_commande(0,'1,2'); - if ($result < 0) dol_print_error($db,$this->error); - $stock_commande_client=$this->stats_commande['qty']; - } - if (! empty($conf->expedition->enabled)) - { - $result=$this->load_stats_sending(0,'1,2'); - if ($result < 0) dol_print_error($db,$this->error); - $stock_sending_client=$this->stats_expedition['qty']; - } - if (! empty($conf->fournisseur->enabled)) - { - $result=$this->load_stats_commande_fournisseur(0,'3'); - if ($result < 0) dol_print_error($db,$this->error); - $stock_commande_fournisseur=$this->stats_commande_fournisseur['qty']; + if (! empty($conf->commande->enabled)) { + $result=$this->load_stats_commande(0,'1,2'); + if ($result < 0) dol_print_error($db,$this->error); + $stock_commande_client=$this->stats_commande['qty']; + } + if (! empty($conf->expedition->enabled)) { + $result=$this->load_stats_sending(0,'1,2'); + if ($result < 0) dol_print_error($db,$this->error); + $stock_sending_client=$this->stats_expedition['qty']; + } + if (! empty($conf->fournisseur->enabled)) { + $result=$this->load_stats_commande_fournisseur(0,'3,4'); + if ($result < 0) dol_print_error($db,$this->error); + $stock_commande_fournisseur=$this->stats_commande_fournisseur['qty']; - $result=$this->load_stats_reception(0,'3'); - if ($result < 0) dol_print_error($db,$this->error); - $stock_reception_fournisseur=$this->stats_reception['qty']; - } + $result=$this->load_stats_reception(0,'4'); + if ($result < 0) dol_print_error($db,$this->error); + $stock_reception_fournisseur=$this->stats_reception['qty']; + } - $this->stock_theorique=$this->stock_reel-($stock_commande_client-$stock_sending_client)+($stock_commande_fournisseur-$stock_reception_fournisseur); - //echo $this->stock_theorique.' = '.$this->stock_reel.' - ('.$stock_commande_client.' - '.$stock_sending_client.') + ('.$stock_commande_fournisseur.' - '.$stock_reception_fournisseur.')'; - } - } + // Stock decrease mode + if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) { + $this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client; + } + if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) { + $this->stock_theorique=$this->stock_reel; + } + if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) { + $this->stock_theorique=$this->stock_reel-$stock_commande_client; + } + // Stock Increase mode + if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) { + $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur; + } + if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) { + $this->stock_theorique-=$stock_reception_fournisseur; + } + if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) { + $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur; + } + } /** * Move an uploaded file described into $file array into target directory $sdir. diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 7885553095e..22dc080d6e2 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -39,6 +39,7 @@ $langs->load("products"); $langs->load("orders"); $langs->load("bills"); $langs->load("stocks"); +$langs->load("sendings"); if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); @@ -331,58 +332,62 @@ if ($id > 0 || $ref) print ''; print ''; - // Calculating a theorical value + // Calculating a theorical value + print ''; + print "'; + print ''; - // If stock if stock increment is done on real sending - if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) - { - // Stock theorique - print ''; - print "'; - print ''; + print ''; + print ''; - print ''; - } + // Number of supplier order running + if (! empty($conf->fournisseur->enabled)) { + if ($found) print '
    '; else $found=1; + $result=$product->load_stats_commande_fournisseur(0,'3,4'); + print $langs->trans("SuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty']; + $result=$product->load_stats_commande_fournisseur(0,'0,1,2'); + if ($result < 0) dol_print_error($db,$product->error); + print ' ('.$langs->trans("DraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')'; + } - // If stock if stock increment is done on - // TODO Add information when stock increment is done on other option - - // TODO Add also information on possible decrease stock accroding to stock decrease option + // Number of product from supplier order already received (partial receipt) + if (! empty($conf->fournisseur->enabled)) { + if ($found) print '
    '; else $found=1; + print $langs->trans("SuppliersReceiptRunning").': '.$product->stats_reception['qty']; + } + print ''; // Last movement $sql = "SELECT max(m.datem) as datem"; From 77f1e587e63f4bb4b34f64ff8c553e5f33eb0123 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sat, 1 Nov 2014 22:08:18 +0100 Subject: [PATCH 0417/1190] Some translations --- htdocs/langs/en_US/sendings.lang | 2 +- htdocs/langs/fr_FR/deliveries.lang | 2 ++ htdocs/langs/fr_FR/sendings.lang | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 855fced7310..f6111bac684 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -62,7 +62,7 @@ RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters SendingRunning=Product from customer order already sent -SuppliersReceiptRunning=Product from supplier order alrady received +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang index 4f61426e83c..02dd54275f6 100644 --- a/htdocs/langs/fr_FR/deliveries.lang +++ b/htdocs/langs/fr_FR/deliveries.lang @@ -24,3 +24,5 @@ Deliverer=Livreur(s) : Sender=Expéditeur Recipient=Destinataire ErrorStockIsNotEnough=Le stock est insuffisant +Shippable=Expédiable +NonShippable=Non Expédiable diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 59c937c97b6..3f839ba9416 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -62,7 +62,7 @@ RelatedShippings=Expédition(s) associée(s) ShipmentLine=Ligne d'expédition CarrierList=Liste des transporteurs SendingRunning=Produits de commandes clients déjà expédiés -SuppliersReceiptRunning=Produit de commandes fournisseurs déjà réceptionnés +SuppliersReceiptRunning=Produits de commandes fournisseurs déjà réceptionnés # Sending methods SendingMethodCATCH=Enlèvement par le client From 98299f88e8c26ae4841d0658157b5120c8a7e104 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 08:12:34 +0100 Subject: [PATCH 0418/1190] Suppliers list --- htdocs/fourn/facture/list.php | 89 ++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 34 deletions(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 9439fc534bd..7ce928caa06 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -64,8 +64,14 @@ $pagenext = $page + 1; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="fac.datef,fac.rowid"; -$month = GETPOST('month','int'); -$year = GETPOST('year','int'); +$search_ref = GETPOST("search_ref","int"); +$search_ref_supplier = GETPOST("search_ref_supplier","alpha"); +$search_label = GETPOST("search_label","alpha"); +$search_company = GETPOST("search_company","alpha"); +$search_amount_no_tax = GETPOST("search_amount_no_tax","alpha"); +$search_amount_all_tax = GETPOST("search_amount_all_tax","alpha"); +$month = GETPOST("month","int"); +$year = GETPOST("year","int"); /* @@ -93,8 +99,17 @@ if ($mode == 'search') } } - - +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_ref_supplier=""; + $search_label=""; + $search_company=""; + $search_amount_no_tax=""; + $search_amount_all_tax=""; + $year=""; + $month=""; +} /* * View @@ -132,14 +147,14 @@ if (GETPOST('filtre') && GETPOST('filtre') != -1) // GETPOST('filtre') may be a } } -if (GETPOST("search_ref")) +if ($search_ref) { - if (is_numeric(GETPOST("search_ref"))) $sql .= natural_search(array('fac.rowid', 'fac.ref'), GETPOST('search_ref'));// For backward compatibility - else $sql .= natural_search('fac.ref', GETPOST("search_ref")); + if (is_numeric($search_ref)) $sql .= natural_search(array('fac.rowid', 'fac.ref'), $search_ref);// For backward compatibility + else $sql .= natural_search('fac.ref', $search_ref); } -if (GETPOST("search_ref_supplier")) +if (search_ref_supplier) { - $sql .= natural_search('fac.ref_supplier', GETPOST('search_ref_supplier')); + $sql .= natural_search('fac.ref_supplier', $search_ref_supplier); } if ($month > 0) { @@ -152,24 +167,24 @@ else if ($year > 0) { $sql.= " AND fac.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; } -if (GETPOST("search_libelle")) +if ($search_label) { - $sql .= natural_search('fac.libelle', GETPOST('search_libelle')); + $sql .= natural_search('fac.libelle', $search_label); } -if (GETPOST("search_societe")) +if ($search_company) { - $sql .= natural_search('s.nom', GETPOST('search_societe')); + $sql .= natural_search('s.nom', $search_company); } -if (GETPOST("search_montant_ht")) +if ($search_amount_no_tax) { - $sql .= " AND fac.total_ht = '".$db->escape(price2num(GETPOST("search_montant_ht")))."'"; + $sql .= " AND fac.total_ht = '".$db->escape(price2num($search_amount_no_tax))."'"; } -if (GETPOST("search_montant_ttc")) +if ($search_amount_all_tax) { - $sql .= " AND fac.total_ttc = '".$db->escape(price2num(GETPOST("search_montant_ttc")))."'"; + $sql .= " AND fac.total_ttc = '".$db->escape(price2num($search_amount_all_tax))."'"; } $nbtotalofrecords = 0; @@ -195,14 +210,14 @@ if ($resql) } $param='&socid='.$socid; - if ($month) $param.='&month='.urlencode($month); - if ($year) $param.='&year=' .urlencode($year); - if (GETPOST("search_ref")) $param.='&search_ref='.urlencode(GETPOST("search_ref")); - if (GETPOST("search_ref_supplier")) $param.='&search_ref_supplier'.urlencode(GETPOST("search_ref_supplier")); - if (GETPOST("search_libelle")) $param.='&search_libelle='.urlencode(GETPOST("search_libelle")); - if (GETPOST("search_societe")) $param.='&search_societe='.urlencode(GETPOST("search_societe")); - if (GETPOST("search_montant_ht")) $param.='&search_montant_ht='.urlencode(GETPOST("search_montant_ht")); - if (GETPOST("search_montant_ttc")) $param.='&search_montant_ttc='.urlencode(GETPOST("search_montant_ttc")); + if ($month) $param.='&month='.urlencode($month); + if ($year) $param.='&year=' .urlencode($year); + if ($search_ref) $param.='&search_ref='.urlencode($search_ref); + if ($search_ref_supplier) $param.='&search_ref_supplier'.urlencode($search_ref_supplier); + if ($search_label) $param.='&search_label='.urlencode($search_label); + if ($search_company) $param.='&search_company='.urlencode($search_company); + if ($search_amount_no_tax) $param.='&search_amount_no_tax='.urlencode($search_amount_no_tax); + if ($search_amount_all_tax) $param.='&search_amount_all_tax='.urlencode($search_amount_all_tax); if (GETPOST("filtre") && GETPOST('filtre') != -1) $param.='&filtre='.urlencode(GETPOST("filtre")); print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); @@ -218,17 +233,18 @@ if ($resql) if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"fac.total_ht","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"fac.total_ttc","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder); + print ''; print "\n"; // Lignes des champs de filtre print ''; print ''; print ''; print ''; print ''; print ''; print ''; if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) { @@ -250,13 +266,15 @@ if ($resql) print ''; } print ''; print "\n"; @@ -312,6 +330,8 @@ if ($resql) //print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$objp->am); print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5); print ''; + + print ''; print "\n"; $i++; @@ -325,6 +345,7 @@ if ($resql) print ''; print ''; print ''; + print ''; print "\n"; } } From e48350fdc187e2c406905bb2159371e78f9afd84 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 08:33:39 +0100 Subject: [PATCH 0419/1190] Unpayed suppliers invoices list --- htdocs/fourn/facture/impayees.php | 78 +++++++++++++++---------------- htdocs/fourn/facture/list.php | 23 +++++---- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index a80cb00f2d3..3253a79fcd8 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -47,6 +47,31 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } +$sortfield = GETPOST("sortfield",'alpha'); +$sortorder = GETPOST("sortorder",'alpha'); + +$search_ref = GETPOST('search_ref','alpha'); +$search_ref_supplier = GETPOST('search_ref_supplier','alpha'); +$search_company = GETPOST('search_company','alpha'); +$search_amount_no_tax = GETPOST('search_amount_no_tax','alpha'); +$search_amount_all_tax = GETPOST('search_amount_all_tax','alpha'); + +$page = GETPOST("page",'int'); +if ($page == -1) { $page = 0; } +$offset = $conf->liste_limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (! $sortfield) $sortfield="f.date_lim_reglement"; +if (! $sortorder) $sortorder="ASC"; + +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_ref_supplier=""; + $search_company=""; + $search_amount_no_tax=""; + $search_amount_all_tax=""; +} /* * View @@ -61,31 +86,6 @@ $title=$langs->trans("BillsSuppliersUnpaid"); $facturestatic=new FactureFournisseur($db); $companystatic=new Societe($db); - -/*************************************************************************** -* * -* Mode Liste * -* * -***************************************************************************/ - -$sortfield = GETPOST("sortfield",'alpha'); -$sortorder = GETPOST("sortorder",'alpha'); - -$search_ref = GETPOST('search_ref','alpha'); -$search_ref_supplier = GETPOST('search_ref_supplier','alpha'); -$search_societe = GETPOST('search_societe','alpha'); -$search_montant_ht = GETPOST('search_montant_ht','int'); -$search_montant_ttc = GETPOST('search_montant_ttc','int'); - - -$page = GETPOST("page",'int'); -if ($page == -1) { $page = 0; } -$offset = $conf->liste_limit * $page; -$pageprev = $page - 1; -$pagenext = $page + 1; -if (! $sortfield) $sortfield="f.date_lim_reglement"; -if (! $sortorder) $sortorder="ASC"; - if ($user->rights->fournisseur->facture->lire) { $sql = "SELECT s.rowid as socid, s.nom as name,"; @@ -124,19 +124,19 @@ if ($user->rights->fournisseur->facture->lire) $sql .= " AND f.ref_supplier LIKE '%".$search_ref_supplier."%'"; } - if ($search_societe) + if ($search_company) { - $sql .= " AND s.nom LIKE '%".$search_societe."%'"; + $sql .= " AND s.nom LIKE '%".$search_company."%'"; } - if ($search_montant_ht) + if ($search_amount_no_tax) { - $sql .= " AND f.total_ht = '".$search_montant_ht."'"; + $sql .= " AND f.total_ht = '".$search_amount_no_tax."'"; } - if ($search_montant_ttc) + if ($search_amount_all_tax) { - $sql .= " AND f.total_ttc = '".$search_montant_ttc."'"; + $sql .= " AND f.total_ttc = '".$search_amount_all_tax."'"; } if (dol_strlen(GETPOST('sf_re')) > 0) @@ -165,9 +165,9 @@ if ($user->rights->fournisseur->facture->lire) if ($search_ref) $param.='&search_ref='.urlencode($search_ref); if ($search_ref_supplier) $param.='&search_ref_supplier='.urlencode($search_ref_supplier); - if ($search_societe) $param.='&search_societe='.urlencode($search_societe); - if ($search_montant_ht) $param.='&search_montant_ht='.urlencode($search_montant_ht); - if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc); + if ($search_company) $param.='&search_company='.urlencode($search_company); + if ($search_amount_no_tax) $param.='&search_amount_no_tax='.urlencode($search_amount_no_tax); + if ($search_amount_all_tax) $param.='&search_amount_all_tax='.urlencode($search_amount_all_tax); $param.=($option?"&option=".$option:""); if (! empty($late)) $param.='&late='.urlencode($late); @@ -209,15 +209,15 @@ if ($user->rights->fournisseur->facture->lire) print ''; print ''; print ''; - print "\n"; + print ''; + print "\n"; if ($num > 0) { diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 7ce928caa06..616e9690e8a 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -73,6 +73,17 @@ $search_amount_all_tax = GETPOST("search_amount_all_tax","alpha"); $month = GETPOST("month","int"); $year = GETPOST("year","int"); +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_ref_supplier=""; + $search_label=""; + $search_company=""; + $search_amount_no_tax=""; + $search_amount_all_tax=""; + $year=""; + $month=""; +} /* * Actions @@ -99,18 +110,6 @@ if ($mode == 'search') } } -if (GETPOST("button_removefilter")) -{ - $search_ref=""; - $search_ref_supplier=""; - $search_label=""; - $search_company=""; - $search_amount_no_tax=""; - $search_amount_all_tax=""; - $year=""; - $month=""; -} - /* * View */ From 64b9299eb6a96accf742d8bc4726557a8db73bba Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 08:45:42 +0100 Subject: [PATCH 0420/1190] Suppliers invoice payment list --- htdocs/fourn/facture/paiement.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 831749b1904..33691cb7942 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -458,6 +458,15 @@ if (empty($action)) $search_paymenttype=GETPOST('search_paymenttype'); $search_amount=GETPOST('search_amount'); $search_company=GETPOST('search_company'); + + if (GETPOST("button_removefilter")) + { + $search_ref=""; + $search_account=""; + $search_paymenttype=""; + $search_amount=""; + $search_company=""; + } $sql = 'SELECT p.rowid as pid, p.datep as dp, p.amount as pamount, p.num_paiement,'; $sql.= ' s.rowid as socid, s.nom as name,'; @@ -548,8 +557,9 @@ if (empty($action)) print ''; print ''; + print ''; + print ''; + print ''; print "\n"; while ($i < min($num,$limit)) From b74bdb8f7d08bf192b129b514145cfdc48ca19f8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Nov 2014 11:39:30 +0100 Subject: [PATCH 0421/1190] Fix: Bad error message --- htdocs/commande/card.php | 14 +++----------- htdocs/compta/facture.php | 18 ++++++------------ htdocs/core/lib/functions.lib.php | 6 +++++- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 47dfb568c78..d575c8089f0 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1295,18 +1295,10 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G setEventMessage($mesg, 'errors'); } } - /* } - else - { - $langs->load("other"); - $mesg='
    '.$langs->trans('ErrorMailRecipientIsEmpty').' !
    '; - $action='presend'; - dol_syslog('Recipient email is empty'); - }*/ } else { - $langs->load("errors"); - setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors'); - dol_syslog('Failed to read file: ' . $file); + $langs->load("other"); + setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors'); + dol_syslog($langs->trans('ErrorMailRecipientIsEmpty')); } } else { $langs->load("other"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 58001d5c918..8e618663237 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1615,8 +1615,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $sendtoid = $_POST['receiver']; } } - - if (dol_strlen($sendto)) { + + if (dol_strlen($sendto)) + { $langs->load("commercial"); $from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>'; @@ -1715,17 +1716,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO setEventMessage($mesg, 'errors'); } } - /* } - else - { - $langs->load("other"); - $mesgs[]='
    '.$langs->trans('ErrorMailRecipientIsEmpty').'
    '; - dol_syslog('Recipient email is empty'); - }*/ } else { - $langs->load("errors"); - setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors'); - dol_syslog('Failed to read file: ' . $file); + $langs->load("other"); + setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors'); + dol_syslog($langs->trans('ErrorMailRecipientIsEmpty')); } } else { $langs->load("other"); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 23092acfd0d..a94a77f1454 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2862,7 +2862,11 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou $listofcurrenciesbefore=array('USD'); if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code); - else $cursymbolafter.=$outlangs->getCurrencySymbol($currency_code); + else + { + $tmpcur=$outlangs->getCurrencySymbol($currency_code); + $cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur); + } } $output=$cursymbolbefore.$output.$end.$cursymbolafter; From 5086450f35176f392485ea4739ccf8ebae50e162 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Nov 2014 12:32:38 +0100 Subject: [PATCH 0422/1190] Fix: Forging email content must use dol_concatdesc. --- htdocs/comm/propal.php | 9 +++--- htdocs/commande/card.php | 9 +++--- htdocs/compta/facture.php | 32 ++++++------------- htdocs/compta/facture/impayees.php | 9 +++--- htdocs/core/actions_sendmails.inc.php | 11 ++++--- htdocs/core/class/interfaces.class.php | 3 +- .../core/triggers/dolibarrtriggers.class.php | 3 +- ...terface_50_modAgenda_ActionsAuto.class.php | 2 +- htdocs/expedition/card.php | 9 +++--- htdocs/fichinter/card.php | 9 +++--- htdocs/fourn/commande/card.php | 9 +++--- htdocs/fourn/facture/card.php | 9 +++--- 12 files changed, 56 insertions(+), 58 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 6281b1f25f4..189f1f9c041 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -617,11 +617,12 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G else $subject = $langs->transnoentities('Propal') . ' ' . $object->ref; $actiontypecode = 'AC_PROP'; - $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n"; + $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; if ($message) { - $actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n"; - $actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n"; - $actionmsg .= $message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2 = $langs->transnoentities('Action' . $actiontypecode); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index d575c8089f0..792da64a923 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1225,11 +1225,12 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G else $subject = $langs->transnoentities('Order') . ' ' . $object->ref; $actiontypecode = 'AC_COM'; - $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n"; + $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; if ($message) { - $actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n"; - $actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n"; - $actionmsg .= $message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2 = $langs->transnoentities('Action' . $actiontypecode); } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 8e618663237..2ba425f5a90 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1627,31 +1627,19 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO); $deliveryreceipt = $_POST['deliveryreceipt']; - if ($action == 'send') { + if ($action == 'send' || $action == 'relance') + { if (dol_strlen($_POST['subject'])) $subject = $_POST['subject']; else $subject = $langs->transnoentities('Bill') . ' ' . $object->ref; $actiontypecode = 'AC_FAC'; - $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n"; + $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; if ($message) { - $actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n"; - $actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n"; - $actionmsg .= $message; - } - // $actionmsg2=$langs->transnoentities('Action'.$actiontypecode); - } - if ($action == 'relance') { - if (dol_strlen($_POST['subject'])) - $subject = $_POST['subject']; - else - $subject = $langs->transnoentities('Relance facture ' . $object->ref); - $actiontypecode = 'AC_FAC'; - $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n"; - if ($message) { - $actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n"; - $actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n"; - $actionmsg .= $message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } // $actionmsg2=$langs->transnoentities('Action'.$actiontypecode); } @@ -1661,9 +1649,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $formmail = new FormMail($db); $attachedfiles = $formmail->get_attached_files(); - $filepath = $attachedfiles ['paths']; - $filename = $attachedfiles ['names']; - $mimetype = $attachedfiles ['mimes']; + $filepath = $attachedfiles['paths']; + $filename = $attachedfiles['names']; + $mimetype = $attachedfiles['mimes']; // Send mail require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index ea0d896f5d1..320d86f3377 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -136,12 +136,13 @@ if ($action == 'presend' && GETPOST('sendmail')) $message=make_substitutions($message, $substitutionarray); $actiontypecode='AC_FAC'; - $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; + $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n"; - $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n"; - $actionmsg.=$message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } // Create form object diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 337cf59c9b0..625376ace58 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -126,13 +126,14 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO if ($action == 'send' || $action == 'relance') { if (dol_strlen($_POST['subject'])) $subject = $_POST['subject']; - $actionmsg2=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; + $actionmsg2=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; - $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n"; - $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n"; - $actionmsg.=$message; + $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } } diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 407893021ef..199c342020d 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -31,7 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; */ class Interfaces { - var $dir; // Directory with all core and external triggers files + var $db; + var $dir; // Directory with all core and external triggers files var $errors = array(); // Array for errors /** diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php index 1fd29359d74..0682bb76a71 100644 --- a/htdocs/core/triggers/dolibarrtriggers.class.php +++ b/htdocs/core/triggers/dolibarrtriggers.class.php @@ -83,7 +83,8 @@ abstract class DolibarrTriggers $this->db = $db; - if (!isset($this->name)) { + if (empty($this->name)) + { $this->name = preg_replace('/^Interface/i', '', get_class($this)); } } diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 632acf71b0e..d4fe47c0faa 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -222,7 +222,7 @@ class InterfaceActionsAuto extends DolibarrTriggers $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail",$object->ref); $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; } - + // Parameters $object->sendtoid defined by caller //$object->sendtoid=0; } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 7db0ecc56b1..8984e4c5424 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -462,12 +462,13 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile' if (dol_strlen(GETPOST('subject','alpha'))) $subject=GETPOST('subject','alpha'); else $subject = $langs->transnoentities('Shipping').' '.$object->ref; $actiontypecode='AC_SHIP'; - $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; + $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n"; - $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n"; - $actionmsg.=$message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2=$langs->transnoentities('Action'.$actiontypecode); } diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index b5e874d03a6..77c7e17ffb5 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -745,12 +745,13 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha'); else $subject = $langs->transnoentities('Intervention').' '.$object->ref; $actiontypecode='AC_OTH_AUTO'; - $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; + $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n"; - $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n"; - $actionmsg.=$message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref); } diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 4ae8fb17754..0273dea94b9 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -944,12 +944,13 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if (dol_strlen(GETPOST('subject'))) $subject=GETPOST('subject'); else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref; $actiontypecode='AC_SUP_ORD'; - $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; + $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n"; - $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n"; - $actionmsg.=$message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2=$langs->transnoentities('Action'.$actiontypecode); } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index e88b5a37945..b88fd582400 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -903,12 +903,13 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P if (dol_strlen($_POST['subject'])) $subject=$_POST['subject']; else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref; $actiontypecode='AC_SUP_INV'; - $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; + $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n"; - $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n"; - $actionmsg.=$message; + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2=$langs->transnoentities('Action'.$actiontypecode); } From 6109529c6c6c88e6e84f98d3a4a54ecf33ee6158 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 14:19:28 +0100 Subject: [PATCH 0423/1190] vat payments list & typo on css class --- htdocs/compta/paiement/cheque/list.php | 4 +-- htdocs/compta/salaries/index.php | 2 +- htdocs/compta/sociales/index.php | 4 +-- htdocs/compta/tva/reglement.php | 41 ++++++++++++++++---------- htdocs/fourn/facture/paiement.php | 6 ++-- 5 files changed, 34 insertions(+), 23 deletions(-) diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 63923d6a3ce..47a6ee8ba74 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -130,7 +130,7 @@ if ($resql) // Lignes des champs de filtre print '    '; print ''; print ''; print ''; print ''; print ''; // Ref print ''; print ''; // Label diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index b280fbdc2c2..00ef402fa36 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -170,7 +170,7 @@ if ($resql) print ''; // Ref print ''; // Label print ''; @@ -182,7 +182,7 @@ if ($resql) print ''; // Amount print ''; print ''; print ''; // Date start - print ''; - print ''; print ''; // Date end - print ''; // Location - print ''; + if (empty($conf->global->AGENDA_DISABLE_LOCATION)) + { + print ''; + } // Assigned to - print ''; + else + { + if (!empty($_SESSION['assignedtouser'])) + { + $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); + } + } + print $form->select_dolusers_forevent('view','assignedtouser',1); + if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + print ' '; print '
     '; + print ''; + print ''; $formsocialcontrib->select_type_socialcontrib($typeid,'typeid',1,16,0); print '   '; - print ''; + print ''; print '
     '; + print ''; + print "
    '; + print ''; + print '   '; $form->select_types_paiements($typeid,'typeid','',0,0,1,16); print ''; - print ''; - print '
    '; + print ''; + print "
    '; - print ' '; - print ''; - print "
    '.$langs->trans("VirtualStock").'".$product->stock_theorique; + if ($product->stock_theorique < $product->seuil_stock_alerte) { + print ' '.img_warning($langs->trans("StockLowerThanLimit")); + } + print '
    '.$langs->trans("VirtualStock").'".$product->stock_theorique; - if ($product->stock_theorique < $product->seuil_stock_alerte) - { - print ' '.img_warning($langs->trans("StockLowerThanLimit")); - } - print '
    '; + $text_stock_options = (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)?$langs->trans("DeStockOnShipment").'
    ':''); + $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'
    ':''); + $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_BILL)?$langs->trans("DeStockOnBill").'
    ':''); + $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)?$langs->trans("ReStockOnBill").'
    ':''); + $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)?$langs->trans("ReStockOnValidateOrder").'
    ':''); + $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)?$langs->trans("ReStockOnDispatchOrder").'
    ':''); + print $form->textwithtooltip($langs->trans("StockDiffPhysicTeoric"),$text_stock_options,2,1,img_picto('', 'info'),'',0);; + print '    		'; - print '
    '; - if ($product->stock_theorique != $product->stock_reel) print $langs->trans("StockDiffPhysicTeoric"); - else print $langs->trans("RunningOrders"); - print ''; + $found=0; - $found=0; + // Number of customer orders running + if (! empty($conf->commande->enabled)) + { + if ($found) print '
    '; else $found=1; + print $langs->trans("CustomersOrdersRunning").': '.$product->stats_commande['qty']; + $result=$product->load_stats_commande(0,'0'); + if ($result < 0) dol_print_error($db,$product->error); + print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')'; + } - // Nbre de commande clients en cours - if (! empty($conf->commande->enabled)) - { - if ($found) print '
    '; else $found=1; - print $langs->trans("CustomersOrdersRunning").': '.($product->stats_commande['qty']-$product->stats_sendings['qty']); - $result=$product->load_stats_commande(0,'0'); - if ($result < 0) dol_print_error($db,$product->error); - print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')'; - //print '
    '; - //print $langs->trans("CustomersSendingRunning").': '.$stock_sending_client; - } + // Number of product from customer order already sent (partial shipping) + if (! empty($conf->expedition->enabled)) { + if ($found) print '
    '; else $found=1; + $result=$product->load_stats_sending(0,'2'); + print $langs->trans("SendingRunning").': '.$product->stats_expedition['qty']; + } - // Nbre de commande fournisseurs en cours - if (! empty($conf->fournisseur->enabled)) - { - if ($found) print '
    '; else $found=1; - print $langs->trans("SuppliersOrdersRunning").': '.($product->stats_commande_fournisseur['qty']-$product->stats_reception['qty']); - $result=$product->load_stats_commande_fournisseur(0,'0,1,2'); - if ($result < 0) dol_print_error($db,$product->error); - print ' ('.$langs->trans("DraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')'; - } - print '
     
    '; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -239,10 +255,10 @@ if ($resql) print ' '; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; + print ''; + print ''; print ''; - print ''; - print ''; $liststatus=array('paye:0'=>$langs->trans("Unpayed"), 'paye:1'=>$langs->trans("Payed")); print $form->selectarray('filtre', $liststatus, GETPOST('filtre'), 1); - print ''; + print ''; + print ''; + print ''; print '
     
    '.price($total).''.price($total_ttc).'  
      '; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; - print '
    '; print ''; - print ''; - print '
    '; - print ''; + print ''; print ''; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; @@ -142,7 +142,7 @@ if ($resql) print ' '; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index 8382029aa56..17c3efdbfaa 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -134,7 +134,7 @@ if ($result) print '
    '; - print ''; + print ''; print ' 
    '; - print ''; + print ''; print ' '; - print ''; + print ''; print ' '; diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 9bb4337782e..8babbd58f7d 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -35,6 +35,9 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:''; if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'tax', '', '', 'charges'); +$search_ref = GETPOST('search_ref','int'); +$search_label = GETPOST('search_label','alpha'); +$search_amount = GETPOST('search_amount','alpha'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -63,6 +66,14 @@ else $typeid=$_REQUEST['typeid']; } +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_label=""; + $search_amount=""; + $typeid=""; +} + /* * View */ @@ -76,8 +87,9 @@ $sql = "SELECT t.rowid, t.amount, t.label, t.datev as dm, t.fk_typepayment as ty $sql.= " FROM ".MAIN_DB_PREFIX."tva as t"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id"; $sql.= " WHERE t.entity = ".$conf->entity; -if (GETPOST("search_label")) $sql.=" AND t.label LIKE '%".$db->escape(GETPOST("search_label"))."%'"; -if (GETPOST("search_amount")) $sql.=" AND t.amount = ".price2num(GETPOST("search_amount")); +if ($search_ref) $sql.=" AND t.rowid=".$search_ref; +if ($search_label) $sql.=" AND t.label LIKE '%".$db->escape($search_label)."%'"; +if ($search_amount) $sql.=" AND t.amount='".$db->escape(price2num(trim($search_amount)))."'"; if ($filtre) { $filtre=str_replace(":","=",$filtre); $sql .= " AND ".$filtre; @@ -106,27 +118,26 @@ if ($result) print ''; print ''; - print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre(""); + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre(""); print "\n"; print ''; - print ''; - print ''; + print ''; + print ''; print ''; // Type print ''; - print ''; - print ''; - print "\n"; + print ''; + print '\n"; while ($i < min($num,$limit)) { diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 33691cb7942..3c94003ee4a 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -543,11 +543,11 @@ if (empty($action)) // Lines for filters fields print ''; print ''; print ''; print ''; print ''; print ''; From ff68c685c0d9f5620d2a27b312052b1dec30de73 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 14:41:19 +0100 Subject: [PATCH 0424/1190] Customers payments list --- htdocs/compta/paiement/list.php | 49 +++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index da1f2bd2833..65615b9bbf3 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -42,6 +42,11 @@ $paymentstatic=new Paiement($db); $accountstatic=new Account($db); $companystatic=new Societe($db); +$search_ref=GETPOST("search_ref","int"); +$search_account=GETPOST("search_account","int"); +$search_paymenttype=GETPOST("search_paymenttype"); +$search_amount=GETPOST("search_amount"); +$search_company=GETPOST("search_company"); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -53,8 +58,14 @@ $limit = $conf->liste_limit; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="p.rowid"; - - +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_account=""; + $search_amount=""; + $search_paymenttype=""; + $search_company=""; +} /* * View @@ -110,11 +121,11 @@ else else $sql.= " AND f.fk_user_author = ".$userid; } // Search criteria - if (GETPOST("search_ref")) $sql .=" AND p.rowid=".GETPOST("search_ref",'int'); - if (GETPOST("search_account") > 0) $sql .=" AND b.fk_account=".GETPOST("search_account",'int'); - if (GETPOST("search_paymenttype") != "") $sql .=" AND c.code='".GETPOST("search_paymenttype")."'"; - if (GETPOST("search_amount")) $sql .=" AND p.amount=".price2num(GETPOST("search_amount")); - if (GETPOST("search_company")) $sql .= natural_search('s.nom', GETPOST('search_company')); + if ($search_ref) $sql .=" AND p.rowid=".$search_ref; + if ($search_account > 0) $sql .=" AND b.fk_account=".$search_account; + if ($search_paymenttype != "") $sql .=" AND c.code='".$search_paymenttype."'"; + if ($search_amount) $sql .=" AND p.amount='".price2num($search_amount)."'"; + if ($search_company) $sql .= natural_search('s.nom', $search_company); } $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1, $offset); @@ -129,9 +140,9 @@ if ($resql) $paramlist=''; $paramlist.=(GETPOST("orphelins")?"&orphelins=1":""); - $paramlist.=($_REQUEST["search_ref"]?"&search_ref=".$_REQUEST["search_ref"]:""); - $paramlist.=($_REQUEST["search_company"]?"&search_company=".$_REQUEST["search_company"]:""); - $paramlist.=($_REQUEST["search_amount"]?"&search_amount=".$_REQUEST["search_amount"]:""); + $paramlist.=($search_ref?"&search_ref=".$search_ref:""); + $paramlist.=($search_company?"&search_company=".$search_company:""); + $paramlist.=($search_amount?"&search_amount=".$search_amount:""); print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num); @@ -149,26 +160,29 @@ if ($resql) { print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$paramlist,'align="right"',$sortfield,$sortorder); } - print "\n"; + print ''; + print "\n"; // Lines for filters fields print ''; print ''; print ''; print ''; print ''; print ''; print ''; if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { @@ -223,7 +237,8 @@ if ($resql) if ($objp->statut == 0) print ''; print ''; } - + + print ''; print ''; $i++; From 1dcb7a58f3c5b5677f88784887c34d3f4d2827aa Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 14:51:21 +0100 Subject: [PATCH 0425/1190] Presentation & fix SQL injection --- htdocs/compta/sociales/index.php | 1 - htdocs/fourn/facture/paiement.php | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 00ef402fa36..db4bef2abe6 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -76,7 +76,6 @@ if (GETPOST("button_removefilter")) $typeid=""; $year=""; $month=""; - $filtre=""; } /* diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 3c94003ee4a..f467e9235ef 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -503,7 +503,7 @@ if (empty($action)) } if (! empty($search_amount)) { - $sql .= " AND p.amount=".price2num($search_amount); + $sql .= " AND p.amount='".price2num($search_amount)."'"; } if (! empty($search_company)) { @@ -524,7 +524,7 @@ if (empty($action)) $paramlist=''; $paramlist.=(! empty($search_ref)?"&search_ref=".$search_ref:""); $paramlist.=(! empty($search_company)?"&search_company=".$search_company:""); - $paramlist.=(! empty($search_amount)?"&search_amount=".$search_amount:""); + $paramlist.=(! empty($search_amount)?"&search_amount='".$search_amount:""); print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num); @@ -538,7 +538,8 @@ if (empty($action)) print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'f.amount','',$paramlist,'align="right"',$sortfield,$sortorder); //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder); - print "\n"; + print ''; + print "\n"; // Lines for filters fields print ''; @@ -557,7 +558,8 @@ if (empty($action)) print ''; print ''; print "\n"; @@ -594,7 +596,8 @@ if (empty($action)) print '';*/ - + + print ''; print ''; $i++; } From bebf0395999b4b5f3eb37402c38e33f7d2aa2117 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 15:05:20 +0100 Subject: [PATCH 0426/1190] Prospects list --- htdocs/comm/prospect/list.php | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 94286ee4c53..113618ffae8 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -48,7 +48,6 @@ $search_state = GETPOST("search_state"); $search_datec = GETPOST("search_datec"); $search_categ = GETPOST("search_categ",'int'); $search_status = GETPOST("search_status",'int'); -if ($search_status=='') $search_status=1; // always display activ customer first $catid = GETPOST("catid",'int'); $sortfield = GETPOST("sortfield",'alpha'); @@ -154,6 +153,21 @@ $sts = array(-1,0,1,2,3); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('prospectlist')); +// Do we click on purge search criteria ? +if (GETPOST("button_removefilter_x")) +{ + $socname=""; + $stcomm=""; + $search_nom=""; + $search_zipcode=""; + $search_town=""; + $search_state=""; + $search_datec=""; + $search_categ=""; + $search_status=""; +} + +if ($search_status=='') $search_status=1; // always display active customer first /* * Actions @@ -361,7 +375,7 @@ if ($resql) // Print these two select print $langs->trans("From").' '; print ' '; - print $langs->trans("To").' '; + print $langs->trans("to").' '; print ''; @@ -378,9 +392,9 @@ if ($resql) print ''; // Print the search button - print ''; + print '\n"; $parameters=array(); $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook From 85f0462c2028d0428bf376127c43623d9274d7f6 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 15:16:49 +0100 Subject: [PATCH 0427/1190] Suppliers list --- htdocs/fourn/list.php | 57 +++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index d3f7e55c199..296415c1aee 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -32,15 +32,15 @@ $langs->load("suppliers"); $langs->load("orders"); $langs->load("companies"); -$socname = GETPOST("socname"); -$search_nom = GETPOST("search_nom"); -$search_zipcode = GETPOST("search_zipcode"); -$search_town = GETPOST("search_town"); -$search_code_fournisseur = GETPOST("search_code_fournisseur"); -$search_compta_fournisseur = GETPOST("search_compta_fournisseur"); -$search_datec = GETPOST("search_datec"); -$search_categ = GETPOST('search_categ','int'); -$catid = GETPOST("catid",'int'); +$socname = GETPOST("socname"); +$search_name = GETPOST("search_name"); +$search_zipcode = GETPOST("search_zipcode"); +$search_town = GETPOST("search_town"); +$search_supplier_code = GETPOST("search_supplier_code"); +$search_supplier_accounting = GETPOST("search_supplier_accounting"); +$search_datec = GETPOST("search_datec"); +$search_categ = GETPOST('search_categ','int'); +$catid = GETPOST("catid",'int'); // Security check $socid = GETPOST('socid','int'); @@ -60,6 +60,19 @@ if (! $sortfield) $sortfield="nom"; // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('supplierlist')); +if (GETPOST("button_removefilter_x")) +{ + $socname=""; + $search_name=""; + $search_zipcode=""; + $search_town=""; + $search_supplier_code=""; + $search_supplier_accounting=""; + $search_datec=""; + $search_categ=""; + $catid=""; +} + /* * Actions */ @@ -95,15 +108,15 @@ if ($socname) { $sortfield = "s.nom"; $sortorder = "ASC"; } -if ($search_nom) { - $sql .= natural_search('s.nom', $search_nom); +if ($search_name) { + $sql .= natural_search('s.nom', $search_name); } if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape($search_zipcode)."%'"; if ($search_town) { $sql .= natural_search('s.town', $search_town); } -if ($search_code_fournisseur) $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_code_fournisseur)."%'"; -if ($search_compta_fournisseur) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_compta_fournisseur)."%'"; +if ($search_supplier_code) $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_supplier_code)."%'"; +if ($search_supplier_accounting) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_supplier_accounting)."%'"; if ($search_datec) $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'"; if ($catid > 0) $sql.= " AND cf.fk_categorie = ".$catid; if ($catid == -2) $sql.= " AND cf.fk_categorie IS NULL"; @@ -126,7 +139,7 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - $param = "&search_nom=".$search_nom."&search_code_fournisseur=".$search_code_fournisseur."&search_zipcode=".$search_zipcode."&search_town=".$search_town; + $param = "&search_name=".$search_name."&search_supplier_code=".$search_supplier_code."&search_zipcode=".$search_zipcode."&search_town=".$search_town; if ($search_categ != '') $param.='&search_categ='.$search_categ; print_barre_liste($langs->trans("ListOfSuppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); @@ -166,26 +179,28 @@ if ($resql) print ''; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; print ''; print ''; print ''; - print ''; - + print '\n"; + $parameters=array(); $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook From df5d34266c933a8f9d1cb81b76bfcb13421ad19e Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 15:26:20 +0100 Subject: [PATCH 0428/1190] Lost button --- htdocs/comm/propal/list.php | 7 +++++-- htdocs/contact/list.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 6522a592097..2b8e478d37d 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -322,8 +322,11 @@ if ($result) print ''; - print ''; + print ''; print "\n"; $var=true; diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index c65e9601e53..a311c87cffc 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -357,7 +357,7 @@ if ($result) print ''; print ''; print ''; From 2b8abf27941312a193b107f1468abd7e2223afc2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Nov 2014 20:07:38 +0100 Subject: [PATCH 0429/1190] Fix: Missing label --- htdocs/core/boxes/box_actions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 7d118932ba4..738582ad931 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -63,7 +63,7 @@ class box_actions extends ModeleBoxes if ($user->rights->agenda->myactions->read) { $sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage,"; - $sql.= " ta.code,"; + $sql.= " ta.code, ta.libelle as type_label,"; $sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, "; $sql.= MAIN_DB_PREFIX."actioncomm AS a)"; @@ -96,7 +96,7 @@ class box_actions extends ModeleBoxes if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning)) $late=img_warning($langs->trans("Late")); //($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label) - $label=$objp->label; + $label=empty($objp->label)?$objp->type_label:$objp->label; $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => ("action"), From 10ed271e38efe8360438d4a7ecb54aad2a141d34 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 20:18:46 +0100 Subject: [PATCH 0430/1190] Search bank transactions --- htdocs/compta/bank/search.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 25b7d91a3ff..1e8196481e6 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; $langs->load("banks"); $langs->load("categories"); $langs->load("companies"); +$langs->load("margins"); // Security check if ($user->societe_id) $socid=$user->societe_id; @@ -72,6 +73,15 @@ $limit = $conf->liste_limit; if (! $sortorder) $sortorder='DESC'; if (! $sortfield) $sortfield='b.dateo'; +if (GETPOST("button_removefilter")) +{ + $description=""; + $type=""; + $debit=""; + $credit=""; + $account=""; + $bid=""; +} /* * View @@ -198,7 +208,7 @@ if ($resql) print ''; print ''; print ''; print ''; print ''; - print ''; + print ''; + print ''; + print "\n"; // Loop on each record $total_debit=0; From 5bf5b9b16f2fd59d34c3e0c37ec2693395bd6f29 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 21:12:40 +0100 Subject: [PATCH 0431/1190] Trips list --- htdocs/compta/deplacement/list.php | 71 +++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index bb2c50b42bf..da0e3e21dcd 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -27,6 +27,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("companies"); $langs->load("users"); @@ -37,6 +39,10 @@ $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement','',''); +$search_ref=GETPOST('search_ref','int'); +$search_name=GETPOST('search_name','alpha'); +$search_company=GETPOST('search_company','alpha'); +// $search_amount=GETPOST('search_amount','alpha'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -48,13 +54,24 @@ if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="d.dated"; $limit = $conf->liste_limit; -$search_ref=GETPOST('search_ref','alpha'); +$year=GETPOST("year"); +$month=GETPOST("month"); +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_name=""; + $search_company=""; + // $search_amount=""; + $year=""; + $month=""; +} /* * View */ +$formother = new FormOther($db); $tripandexpense_static=new Deplacement($db); $userstatic = new User($db); @@ -76,10 +93,31 @@ $sql.= " AND d.entity = ".$conf->entity; if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')'; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; -if (trim($search_ref) != '') + +if ($search_ref) $sql.=" AND d.rowid=".$search_ref; +if ($search_name) { - $sql.= ' AND d.rowid LIKE \'%'.$db->escape(trim($search_ref)) . '%\''; + $sql .= natural_search('u.lastname', $search_name); } +if ($search_company) +{ + $sql .= natural_search('s.nom', $search_company); +} +// if ($search_amount) $sql.=" AND d.km='".$db->escape(price2num(trim($search_amount)))."'"; +if ($month > 0) +{ + if ($year > 0 && empty($day)) + $sql.= " AND d.dated BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'"; + else if ($year > 0 && ! empty($day)) + $sql.= " AND d.dated BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'"; + else + $sql.= " AND date_format(d.dated, '%m') = '".$month."'"; +} +else if ($year > 0) +{ + $sql.= " AND bc.date_bordereau BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; +} + $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); @@ -97,7 +135,7 @@ if ($resql) print ""; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","","&socid=$socid",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"d.type","","&socid=$socid",'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.lastname","","&socid=$socid",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socid=$socid",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("FeesKilometersOrAmout"),$_SERVER["PHP_SELF"],"d.km","","&socid=$socid",'align="right"',$sortfield,$sortorder); @@ -107,24 +145,27 @@ if ($resql) // Filters lines print ''; print ''; print ''; + print ''; print ''; - print ''; print ''; - print ''; print '\n"; $var=true; @@ -142,9 +183,9 @@ if ($resql) // Type print ''; // Date - print ''; + print ''; // User - print ''; print "\n"; @@ -323,7 +334,8 @@ print ''; // ACTION print ''; print "\n"; From 39e83576a223efdcba485c410588b90e1f001e98 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 21:44:03 +0100 Subject: [PATCH 0437/1190] prelevement list --- htdocs/compta/prelevement/list.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 10fb995c023..0a68aa686ae 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -42,10 +42,10 @@ $result = restrictedArea($user, 'prelevement','','','bons'); $page = GETPOST('page','int'); $sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha'); $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.datec" : GETPOST('sortfield','alpha'); -$search_line = GETPOST('search_ligne','alpha'); +$search_line = GETPOST('search_line','alpha'); $search_bon = GETPOST('search_bon','alpha'); $search_code = GETPOST('search_code','alpha'); -$search_societe = GETPOST('search_societe','alpha'); +$search_company = GETPOST('search_company','alpha'); $statut = GETPOST('statut','int'); $bon=new BonPrelevement($db,""); @@ -53,7 +53,14 @@ $ligne=new LignePrelevement($db,$user); $offset = $conf->liste_limit * $page ; - +if (GETPOST("button_removefilter")) +{ + $search_line=""; + $search_bon=""; + $search_code=""; + $search_company=""; + $statut=""; +} /* * View @@ -88,9 +95,9 @@ if ($search_code) { $sql.= " AND s.code_client LIKE '%".$db->escape($search_code)."%'"; } -if ($search_societe) +if ($search_company) { - $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'"; + $sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'"; } $sql.=$db->order($sortfield,$sortorder); $sql.=$db->plimit($conf->liste_limit+1, $offset); @@ -122,15 +129,17 @@ if ($result) print ''; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; - print ''; - print ''; + print ''; print ''; $var=True; From a1980a1917bb8a4117f2aa6d0206f1e4cbd99d4a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 22:04:01 +0100 Subject: [PATCH 0438/1190] Correct travis error - Not me ! --- htdocs/core/lib/date.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 2d5bf7ab0cd..4b9401498d7 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -766,7 +766,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0) * @param int $inhour 0: return number of days, 1: return number of hours * @param int $lastday We include last day, 0: no, 1:yes * @param int $halfday Tag to define half day when holiday start and end - * @param string $countrycode Country code (company country code if not defined) + * @param string $country_code Country code (company country code if not defined) * @return int Number of days or hours */ function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0, $country_code='') From ddf737daed9e5ea7d5ab6223570be68e089044c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 3 Nov 2014 01:07:07 +0100 Subject: [PATCH 0439/1190] Removed deprecated page and option. --- htdocs/comm/action/card.php | 8 +- htdocs/comm/action/contact.php | 258 -------------------------------- htdocs/comm/action/document.php | 163 +++++++++++++------- htdocs/core/lib/agenda.lib.php | 8 - 4 files changed, 114 insertions(+), 323 deletions(-) delete mode 100644 htdocs/comm/action/contact.php diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 607f8e14c4e..a1e6f89f663 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -790,11 +790,11 @@ if ($id > 0) { $result1=$object->fetch($id); $result2=$object->fetch_thirdparty(); - $result2=$object->fetch_contact(); - $result3=$object->fetch_userassigned(); - $result4=$object->fetch_optionals($id,$extralabels); + $result3=$object->fetch_contact(); + $result4=$object->fetch_userassigned(); + $result5=$object->fetch_optionals($id,$extralabels); - if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0) + if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0) { dol_print_error($db,$object->error); exit; diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php deleted file mode 100644 index 334da53a2f4..00000000000 --- a/htdocs/comm/action/contact.php +++ /dev/null @@ -1,258 +0,0 @@ - - * Copyright (C) 2004-2012 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2012 Philippe Grand - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/comm/action/contact.php - * \ingroup agenda - * \brief Page for multi-users event - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; -require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - -$langs->load("companies"); -$langs->load("commercial"); -$langs->load("other"); -$langs->load("bills"); - -$id = GETPOST('id','int'); -$action = GETPOST('action','alpha'); -$ref = GETPOST('ref'); -$confirm = GETPOST('confirm'); -$lineid = GETPOST('lineid','int'); - -// Security check -$socid = GETPOST('socid','int'); -if ($user->societe_id) $socid=$user->societe_id; -if ($user->societe_id > 0) -{ - unset($_GET["action"]); - $action=''; -} -$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id'); - - -$object = new ActionComm($db); - - -/* - * Actions - */ - -// Add new contact -if ($action == 'addcontact' && $user->rights->action->creer) -{ - $result = $object->fetch($id); - - if ($object->id > 0) - { - $contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); - } - - if ($result >= 0) - { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); - exit; - } - else - { - if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') - { - $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); - } - else - { - setEventMessage($object->error, 'errors'); - } - } -} - -// modification d'un contact. On enregistre le type -if ($action == 'updateline') -{ - if ($object->fetch($id)) - { - $contact = $object->detail_contact($_POST["line"]); - $type = $_POST["type"]; - $statut = $contact->statut; - - $result = $object->update_contact($_POST["line"], $statut, $type); - if ($result >= 0) - { - $db->commit(); - } else - { - dol_print_error($db, "result=$result"); - $db->rollback(); - } - } - else - { - setEventMessage($object->error, 'errors'); - } -} - -// Bascule du statut d'un contact -else if ($action == 'swapstatut') -{ - if ($object->id > 0) - { - $result=$object->swapContactStatus(GETPOST('ligne')); - } -} - -// Efface un contact -else if ($action == 'deletecontact') -{ - $result = $object->delete_contact($lineid); - - if ($result >= 0) - { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); - exit; - } - else - { - dol_print_error($db); - } -} - -/* - * View - */ - -$form = new Form($db); -$formcompany= new FormCompany($db); - -$contactstatic=new Contact($db); -$userstatic=new User($db); - -$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'; -llxHeader('',$langs->trans("Agenda"),$help_url); - - -if ($id > 0 || ! empty($ref)) -{ - if ($object->fetch($id,$ref) > 0) - { - - $head=actions_prepare_head($object); - dol_fiche_head($head, 'contact', $langs->trans("Action"),0,'action'); - - // Affichage fiche action en mode visu - print '
      '; $form->select_types_paiements($typeid,'typeid','',0,0,1,16); print ''; - print ''; - print '
    '; + print ''; + print "
    '; - print ''; + print ''; print ' '; - print ''; + print ''; print ''; $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1); @@ -556,7 +556,7 @@ if (empty($action)) $form->select_comptes($search_account,'search_account',0,'',1); print ''; - print ''; + print ''; print ''; print ''; print '
     
    '; - print ''; + print ''; print ' '; - print ''; + print ''; print ''; - $form->select_types_paiements($_REQUEST["search_paymenttype"],'search_paymenttype','',2,1,1); + $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1); print ''; - $form->select_comptes($_REQUEST["search_account"],'search_account',0,'',1); + $form->select_comptes($search_account,'search_account',0,'',1); print ''; - print ''; + print ''; + print ''; print ''; + print ''; print ' 
     
    '; print ''; - print ''; + print ''; + print ''; print ''; print '
    '; print $invoicesupplierstatic->getNomUrl(1); print ' 
    '; - print ''; - print ''; + print ''; + print "
    '; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; + print ''; + print "
    '; $formpropal->selectProposalStatus($viewstatut,1); print ''; - print ''; + print ''; + print ' '; + print ''; + print '
    '; print ''; - print '  '; + print ' '; print ''; print '
      '; - $form->select_types_paiements(empty($_REQUEST["type"])?'':$_REQUEST["type"], 'type', '', 2, 0, 1, 8); + $form->select_types_paiements(empty($type)?'':$type, 'type', '', 2, 0, 1, 8); print ''; @@ -214,9 +224,9 @@ if ($resql) print ''; print ''; if (! empty($_REQUEST['bid'])) print ''; - print ''; - print '
    '; - print ''; + print ''; print ''; - //print ''; + print ' '; + print ''; + if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + print ''; + $formother->select_year($year?$year:-1,'year',1, 20, 5); print ''; - //print ''; + print ''; print ''; - print ' '; + print ''; + print ''; print ''; - print ' '; - print ''; - print ' '; + // print ''; print ''; + print ''; print "
    '.$langs->trans($obj->type).''.dol_print_date($db->jdate($obj->dd),'day').''.dol_print_date($db->jdate($obj->dd),'day').''; + print ''; $userstatic->id = $obj->rowid; $userstatic->lastname = $obj->lastname; $userstatic->firstname = $obj->firstname; From 5a18904bb48f19d792c7eb1afbde8c33efafb4a5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Nov 2014 21:16:31 +0100 Subject: [PATCH 0432/1190] Fix: Infinite loop --- htdocs/core/lib/date.lib.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index a95bbec6b72..2d5bf7ab0cd 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -566,9 +566,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') $nbFerie = 0; // Check to ensure we use correct parameters - if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hour and be GMT dates'; + if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates'; - while ($timestampStart < $timestampEnd) // Loop end when equals + $i=0; + while ($timestampStart < $timestampEnd && ($i < 50000)) // Loop end when equals (Test on i is a security loop to avoid infinite loop) { $ferie=false; $countryfound=0; @@ -576,7 +577,6 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') $jour = date("d", $timestampStart); $mois = date("m", $timestampStart); $annee = date("Y", $timestampStart); - if ($countrycode == 'FR') { $countryfound=1; @@ -722,8 +722,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') if ($ferie) $nbFerie++; // Increase number of days (on go up into loop) - $jour++; - $timestampStart=dol_mktime(0,0,0,$mois,$jour,$annee,1); // Generate GMT date for next day + $timestampStart=dol_time_plus_duree($timestampStart, 1, 'd'); + //var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart); + + $i++; } return $nbFerie; @@ -764,13 +766,16 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0) * @param int $inhour 0: return number of days, 1: return number of hours * @param int $lastday We include last day, 0: no, 1:yes * @param int $halfday Tag to define half day when holiday start and end + * @param string $countrycode Country code (company country code if not defined) * @return int Number of days or hours */ -function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0) +function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0, $country_code='') { - global $langs; + global $langs,$mysoc; - dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday); + if (empty($country_code)) $country_code=$mysoc->country_code; + + dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code); // Check parameters if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day'; @@ -779,7 +784,9 @@ function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $ha //print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday; if ($timestampStart < $timestampEnd) { - $nbOpenDay = num_between_day($timestampStart, $timestampEnd, $lastday) - num_public_holiday($timestampStart, $timestampEnd, $lastday); + $numdays = num_between_day($timestampStart, $timestampEnd, $lastday); + $numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code); + $nbOpenDay = $numdays - $numholidays; $nbOpenDay.= " " . $langs->trans("Days"); if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort"); return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday)); From 1f4f2291f610585b3958fc9f8e7070f65990b976 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Nov 2014 21:18:16 +0100 Subject: [PATCH 0433/1190] Start module with status experimental --- htdocs/core/modules/modSyncSupplierWebServices.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php index 088989f9de4..c17892ee217 100755 --- a/htdocs/core/modules/modSyncSupplierWebServices.class.php +++ b/htdocs/core/modules/modSyncSupplierWebServices.class.php @@ -44,7 +44,7 @@ class modSyncSupplierWebServices extends DolibarrModules // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i','',get_class($this)); $this->description = "Enable the client for external supplier web services"; - $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version + $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) From 627f5694f0a71b0b7fdb6a82188d732c54d029b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Nov 2014 21:16:31 +0100 Subject: [PATCH 0434/1190] Fix: Infinite loop --- htdocs/core/lib/date.lib.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 48ccec88cf1..6a5024c1c80 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -563,9 +563,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') $nbFerie = 0; // Check to ensure we use correct parameters - if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hour and be GMT dates'; + if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates'; - while ($timestampStart < $timestampEnd) // Loop end when equals + $i=0; + while ($timestampStart < $timestampEnd && ($i < 50000)) // Loop end when equals (Test on i is a security loop to avoid infinite loop) { $ferie=false; $countryfound=0; @@ -573,7 +574,6 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') $jour = date("d", $timestampStart); $mois = date("m", $timestampStart); $annee = date("Y", $timestampStart); - if ($countrycode == 'FR') { $countryfound=1; @@ -676,8 +676,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') if ($ferie) $nbFerie++; // Increase number of days (on go up into loop) - $jour++; - $timestampStart=dol_mktime(0,0,0,$mois,$jour,$annee,1); // Generate GMT date for next day + $timestampStart=dol_time_plus_duree($timestampStart, 1, 'd'); + //var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart); + + $i++; } return $nbFerie; @@ -718,13 +720,16 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0) * @param int $inhour 0: return number of days, 1: return number of hours * @param int $lastday We include last day, 0: no, 1:yes * @param int $halfday Tag to define half day when holiday start and end + * @param string $countrycode Country code (company country code if not defined) * @return int Number of days or hours */ -function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0) +function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0, $country_code='') { - global $langs; + global $langs,$mysoc; - dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday); + if (empty($country_code)) $country_code=$mysoc->country_code; + + dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code); // Check parameters if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day'; @@ -733,7 +738,9 @@ function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $ha //print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday; if ($timestampStart < $timestampEnd) { - $nbOpenDay = num_between_day($timestampStart, $timestampEnd, $lastday) - num_public_holiday($timestampStart, $timestampEnd, $lastday); + $numdays = num_between_day($timestampStart, $timestampEnd, $lastday); + $numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code); + $nbOpenDay = $numdays - $numholidays; $nbOpenDay.= " " . $langs->trans("Days"); if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort"); return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday)); From ca69bf9d7eb7b611bc09f8b32faaf69531df4edb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Nov 2014 21:20:24 +0100 Subject: [PATCH 0435/1190] Fix: Infinite loop --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 28d86310494..25d8c7d638d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ English Dolibarr ChangeLog - Fix: Civility & birthdate wasn't save into adherent module. - Fix: webservice Thirdparty parameter lastname for invidual creation is now lastname and not ref - Fix: Chars - is no more allowed into value for code for extra fields. +( Fix: [ bug #1622 ] Requesting holiday than spans across two years cause high CPU usage by Apache ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: From 5b2318030387262c530c3cc5e55f047853bda2f7 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 21:28:02 +0100 Subject: [PATCH 0436/1190] Holiday list --- htdocs/holiday/index.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 04a96a7001d..e988e640711 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -64,6 +64,19 @@ $search_employe = GETPOST('search_employe'); $search_valideur = GETPOST('search_valideur'); $search_statut = GETPOST('select_statut'); +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $month_create=""; + $year_create=""; + $month_start=""; + $year_start=""; + $month_end=""; + $year_end=""; + $search_employe=""; + $search_valideur=""; + $search_statut=""; +} /* * Actions @@ -71,8 +84,6 @@ $search_statut = GETPOST('select_statut'); // None - - /* * View */ @@ -257,7 +268,7 @@ print_liste_field_titre($langs->trans("Employe"),$_SERVER["PHP_SELF"],"cp.fk_use print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk_validator","",'','',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder); print '
    '; -print ''; +print ''; +print ''; print '
       
    '; + print ''; + print ''; + print '
    '; - - $linkback = ''.$langs->trans("BackToList").''; - - // Ref - print ''; - - // Type - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) - { - print ''; - } - - // Title - print ''; - - // Full day event - print ''; - - // Date start - print ''; - print ''; - print ''; - - // Date end - print ''; - - // Location - print ''; - - print '
    '.$langs->trans("Ref").''; - print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', ''); - print '
    '.$langs->trans("Type").''.$object->type.'
    '.$langs->trans("Title").''.$object->label.'
    '.$langs->trans("EventOnFullDay").''.yn($object->fulldayevent).'
    '.$langs->trans("DateActionStart").''; - if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour'); - else print dol_print_date($object->datep,'day'); - if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late")); - print ''."\n"; - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendar').' '; - print '
    '."\n"; - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarweek').' '; - print '
    '."\n"; - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarday').' '; - print '
    '."\n"; - print '
    '.$langs->trans("DateActionEnd").''; - if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour'); - else print dol_print_date($object->datef,'day'); - if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late")); - print '
    '.$langs->trans("Location").''.$object->location.'
    '; - - dol_fiche_end(); - - print '
    '; - - // Contacts lines (modules that overwrite templates must declare this into descriptor) - $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); - foreach($dirtpls as $reldir) - { - $res=@include dol_buildpath($reldir.'/contacts.tpl.php'); - if ($res) break; - } - - } - else - { - print "ErrorRecordNotFound"; - } -} - -llxFooter(); - -$db->close(); - diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 5e180f66abb..9bb3af6dcbd 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -41,7 +41,7 @@ $langs->load("commercial"); $langs->load("other"); $langs->load("bills"); -$objectid = GETPOST('id', 'int'); +$id = GETPOST('id', 'int'); $action=GETPOST('action', 'alpha'); $confirm = GETPOST('confirm', 'alpha'); @@ -53,13 +53,13 @@ if ($user->societe_id > 0) unset($_GET["action"]); $action=''; } -$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id'); +$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id'); $object = new ActionComm($db); -if ($objectid > 0) +if ($id > 0) { - $ret = $object->fetch($objectid); + $ret = $object->fetch($id); $object->fetch_thirdparty(); } @@ -96,11 +96,25 @@ llxHeader('',$langs->trans("Agenda"),$help_url); if ($object->id > 0) { + $result1=$object->fetch($id); + $result2=$object->fetch_thirdparty(); + $result3=$object->fetch_contact(); + $result4=$object->fetch_userassigned(); + $result5=$object->fetch_optionals($id,$extralabels); + + if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0) + { + dol_print_error($db,$object->error); + exit; + } + + if ($object->authorid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; } + if ($object->usermodid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; } + $author=new User($db); $author->fetch($object->author->id); $object->author=$author; - $object->fetch_contact(); $head=actions_prepare_head($object); @@ -132,53 +146,15 @@ if ($object->id > 0) print '
    '.$langs->trans("EventOnFullDay").''.yn($object->fulldayevent).'
    '.$langs->trans("DateActionStart").''; + print '
    '.$langs->trans("DateActionStart").''; if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour'); else print dol_print_date($object->datep,'day'); if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late")); print ''."\n"; - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' '; - print '
    '."\n"; - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' '; - print '
    '."\n"; - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' '; - print '
    '."\n"; - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' '; - print '
    '."\n"; - print '
    '.$langs->trans("DateActionEnd").''; + print '
    '.$langs->trans("DateActionEnd").''; if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour'); else print dol_print_date($object->datef,'day'); if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late")); @@ -190,16 +166,38 @@ if ($object->id > 0) print '
    '.$langs->trans("Location").''.$object->location.'
    '.$langs->trans("Location").''.$object->location.'
    '.$langs->trans("ActionAffectedTo").''; - if ($object->userownerid > 0) + print '
    '.$langs->trans("ActionAffectedTo").''; + $listofuserid=array(); + if (empty($donotclearsession)) { - $tmpuser=new User($object->userownerid); - print $tmpuser->getNomUrl(1); + if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency); // Owner first + if (! empty($object->userassigned)) // Now concat assigned users + { + // Restore array with key with same value than param 'id' + $tmplist1=$object->userassigned; $tmplist2=array(); + foreach($tmplist1 as $key => $val) + { + if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val; + } + } + $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } - print '


    '; @@ -252,8 +250,20 @@ if ($object->id > 0) print ($object->priority?$object->priority:''); print ''; + // Other attributes + $parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields,'edit'); + } - print '


    '; + + print '
    '; + + print '

    '; + + print ''; // Construit liste des fichiers $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); @@ -266,7 +276,8 @@ if ($object->id > 0) print ''; print ''; - print '
    '.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
    '.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
    '; + + print ''; print ''; @@ -274,6 +285,52 @@ if ($object->id > 0) $permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create; $param = '&id=' . $object->id; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; + + + if ($action != 'edit') + { + print "
    "; + + // Link to agenda views + print '
    '; + print '
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' '; + print '
    '."\n"; + print '
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' '; + print '
    '."\n"; + print '
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' '; + print '
    '."\n"; + print '
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + //print ''; + print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' '; + print '
    '."\n"; + print '
    '; + } } else { diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 3d9a5e8299c..d2270cb5584 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -440,14 +440,6 @@ function actions_prepare_head($object) $head[$h][2] = 'card'; $h++; - if (! empty($conf->global->AGENDA_USE_SEVERAL_CONTACTS)) - { - $head[$h][0] = DOL_URL_ROOT.'/comm/action/contact.php?id='.$object->id; - $head[$h][1] = $langs->trans("Contacts"); - $head[$h][2] = 'contact'; - $h++; - } - // Attached files require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $upload_dir = $conf->agenda->dir_output . "/" . $object->id; From 3ee4cfe30bddeb0f57814ea35516e4054b1f448f Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 3 Nov 2014 05:57:09 +0100 Subject: [PATCH 0440/1190] Intervention card list --- htdocs/fichinter/list.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 076ad9bc689..28dad4bbb89 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -61,6 +61,13 @@ $search_company=GETPOST('search_company','alpha'); $search_desc=GETPOST('search_desc','alpha'); $search_status=GETPOST('search_status'); +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_company=""; + $search_desc=""; + $search_status=""; +} /* * View @@ -125,6 +132,7 @@ if ($result) print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder); } print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder); + print_liste_field_titre('',$_SERVER["PHP_SELF"], ''); print "\n"; print ''; @@ -145,9 +153,10 @@ if ($result) print ''; $liststatus=$interventionstatic->statuts_short; print $form->selectarray('search_status', $liststatus, GETPOST('search_status'), 1, 0, 0, '', 1); - print ''; print ''; - print "\n"; + print ''; + print ''; + print "\n"; $companystatic=new Societe($db); @@ -178,7 +187,8 @@ if ($result) print ''.convertSecondToTime($objp->duree).''; } print ''.$interventionstatic->LibStatut($objp->fk_statut,5).''; - + + print ' '; print "\n"; $total += $objp->duree; @@ -188,10 +198,10 @@ if ($result) if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) { print ''.$langs->trans("Total").''; - print ''.convertSecondToTime($total).' '; + print ''.convertSecondToTime($total).'  '; print ''; } - + print ''; print "\n"; $db->free($result); From 111b2e83f1e52f25eb34620330b541c226b4ef26 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 3 Nov 2014 06:05:51 +0100 Subject: [PATCH 0441/1190] Contracts list --- htdocs/contrat/list.php | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index dcc1b83e6d8..cf57e97933b 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -40,11 +40,11 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -$search_nom=GETPOST('search_nom'); +$search_name=GETPOST('search_name'); $search_contract=GETPOST('search_contract'); $search_ref_supplier=GETPOST('search_ref_supplier','alpha'); $sall=GETPOST('sall'); -$statut=GETPOST('statut')?GETPOST('statut'):1; +$search_status=GETPOST('search_status'); $socid=GETPOST('socid'); if (! $sortfield) $sortfield="c.rowid"; @@ -58,6 +58,17 @@ $result = restrictedArea($user, 'contrat', $id); $staticcontrat=new Contrat($db); $staticcontratligne=new ContratLigne($db); +if (GETPOST("button_removefilter")) +{ + $search_name=""; + $search_contract=""; + $search_ref_supplier=""; + $sall=""; + $search_status=""; +} + +if ($search_status == '') $search_status=1; + /* * View @@ -84,8 +95,8 @@ $sql.= " WHERE c.fk_soc = s.rowid "; $sql.= " AND c.entity = ".$conf->entity; if ($socid) $sql.= " AND s.rowid = ".$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; -if ($search_nom) { - $sql .= natural_search('s.nom', $search_nom); +if ($search_name) { + $sql .= natural_search('s.nom', $search_name); } if ($search_contract) { $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract); @@ -106,13 +117,13 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_nom='.$search_nom, $sortfield, $sortorder,'',$num); + print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num); print ''; print ''; $param='&search_contract='.$search_contract; - $param.='&search_nom='.$search_nom; + $param.='&search_name='.$search_name; $param.='&search_ref_supplier='.$search_ref_supplier; print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder); @@ -136,13 +147,13 @@ if ($resql) print ''; print ''; print ''; print ''; //print ''; - print '"; - print "\n"; + print '\n"; print ''; $var=true; From 5dacf3c3cd9116de20c97ecdb278b9174d5fb1fe Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 3 Nov 2014 06:12:57 +0100 Subject: [PATCH 0442/1190] Contracts services list --- htdocs/contrat/services.php | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 77fc0155430..b0fb4ed5edb 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -44,7 +44,7 @@ if (! $sortfield) $sortfield="c.rowid"; if (! $sortorder) $sortorder="ASC"; $filter=GETPOST("filter"); -$search_nom=GETPOST("search_nom"); +$search_name=GETPOST("search_name"); $search_contract=GETPOST("search_contract"); $search_service=GETPOST("search_service"); $statut=GETPOST('statut')?GETPOST('statut'):1; @@ -69,6 +69,21 @@ $staticcontrat=new Contrat($db); $staticcontratligne=new ContratLigne($db); $companystatic=new Societe($db); +if (GETPOST("button_removefilter")) +{ + $search_name=""; + $search_contract=""; + $search_service=""; + $op1month=""; + $op1day=""; + $op1year=""; + $filter_op1=""; + $op2month=""; + $op2day=""; + $op2year=""; + $filter_op2=""; +} + /* * View */ @@ -101,7 +116,7 @@ if ($mode == "0") $sql.= " AND cd.statut = 0"; if ($mode == "4") $sql.= " AND cd.statut = 4"; if ($mode == "5") $sql.= " AND cd.statut = 5"; if ($filter == "expired") $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'"; -if ($search_nom) $sql.= " AND s.nom LIKE '%".$db->escape($search_nom)."%'"; +if ($search_name) $sql.= " AND s.nom LIKE '%".$db->escape($search_name)."%'"; if ($search_contract) $sql.= " AND c.rowid = '".$db->escape($search_contract)."'"; if ($search_service) $sql.= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')"; if ($socid > 0) $sql.= " AND s.rowid = ".$socid; @@ -122,7 +137,7 @@ if ($resql) $param=''; if ($search_contract) $param.='&search_contract='.urlencode($search_contract); - if ($search_nom) $param.='&search_nom='.urlencode($search_nom); + if ($search_name) $param.='&search_name='.urlencode($search_name); if ($search_service) $param.='&search_service='.urlencode($search_service); if ($mode) $param.='&mode='.$mode; if ($filter) $param.='&filter='.$filter; @@ -168,7 +183,7 @@ if ($resql) print ''; // Third party print ''; print ''; - print '"; - print "\n"; + print '\n"; print ''; $contractstatic=new Contrat($db); From b2ed53b78563fd4d64c202b43d4ff2318f7c25f6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 3 Nov 2014 15:47:33 +0100 Subject: [PATCH 0443/1190] Fix: Switch company/individual --- htdocs/societe/soc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 54effb54b20..d9c5e70283c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -781,7 +781,7 @@ else print '
    '; print $langs->trans("ThirdPartyType").':     '; print '
    '; - print ''; + print ''; print '
    '; - print ''; + print ''; print '  '; - print "
    '; + print ''; + print "
    '; - print ''; + print ''; print ''; $arrayofoperators=array('<'=>'<','>'=>'>'); @@ -184,9 +199,9 @@ if ($resql) $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year); print $form->select_date($filter_date2,'op2',0,0,1); print ''; - print "
    '; + print ''; + print "
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "
    '.$langs->trans("SearchAnIntervention").'
    :
    :
    \n"; + print "
    "; +} + /* * Draft proposals */ diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 076ad9bc689..4bea6c46850 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -56,10 +56,11 @@ if (! $sortfield) } $limit = $conf->liste_limit; -$search_ref=GETPOST('search_ref','alpha'); +$search_ref=GETPOST('search_ref')?GETPOST('search_ref','alpha'):GETPOST('search_inter','alpha'); $search_company=GETPOST('search_company','alpha'); $search_desc=GETPOST('search_desc','alpha'); $search_status=GETPOST('search_status'); +$sall=GETPOST('sall'); /* @@ -99,6 +100,11 @@ if (! $user->rights->societe->client->voir && empty($socid)) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = " . $socid; +if ($sall) { + $arraytosearch=array('f.ref', 'f.description', 's.nom'); + if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $arraytosearch=array('f.ref', 'f.description', 's.nom', 'fd.description'); + $sql .= natural_search($arraytosearch, $sall); +} $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1, $offset); //print $sql; diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 3e4011b0b79..c79da05364e 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -38,6 +38,7 @@ InterventionClassifiedBilledInDolibarr=Intervention %s set as billed InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled InterventionSentByEMail=Intervention %s sent by EMail InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening From 5074feacd68e1876deb9338da4f8a708dfe75a50 Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Mon, 3 Nov 2014 17:57:55 +0100 Subject: [PATCH 0448/1190] Add option and create new class --- htdocs/admin/security.php | 114 +++++++++++ .../generate/modGeneratePassPerso.class.php | 192 ++++++++++++++++++ htdocs/langs/fr_FR/admin.lang | 8 + 3 files changed, 314 insertions(+) create mode 100644 htdocs/core/modules/security/generate/modGeneratePassPerso.class.php diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 43ccef1e954..0101465e674 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -165,6 +165,16 @@ else if ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK') exit; } +if ($action == 'maj_pattern') +{ + dolibarr_set_const($db, "USER_PASSWORD_PATTERN", GETPOST("pattern"),'chaine',0,'',$conf->entity); + header("Location: security.php"); + exit; +} + + + + @@ -265,6 +275,110 @@ foreach ($arrayhandler as $key => $module) print ''; print ''; +//if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1) +// Patter for Password Perso +if ($conf->global->USER_PASSWORD_GENERATED == "Perso"){ +$var=!$var; + + $tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN); + /*$this->length2 = $tabConf[0]; + $this->NbMaj = $tabConf[1]; + $this->NbNum = $tabConf[2]; + $this->NbSpe = $tabConf[3]; + $this->NbRepeat = $tabConf[4]; + $this->WithoutAmbi = $tabConf[5]; + */ + print ''; + print ''; + print ''; + print ''; + + $var=!$var; + print ""; + print '"; + print ''; + print ''; + + $var=!$var; + print ""; + print '"; + print ''; + print ''; + + $var=!$var; + print ""; + print '"; + print ''; + print ''; + + $var=!$var; + print ""; + print '"; + print ''; + print ''; + + $var=!$var; + print ""; + print '"; + print ''; + print ''; + + $var=!$var; + print ""; + print '"; + print ''; + print ''; + + $var=!$var; + print ""; + print ''; + print ''; + print '
    '.$langs->trans("PasswordPatternDesc").'
    ' . $langs->trans("MinLength")."
    ' . $langs->trans("NbMajMin")."
    ' . $langs->trans("NbNumMin")."
    ' . $langs->trans("NbSpeMin")."
    ' . $langs->trans("NbIteConsecutive")."
    ' . $langs->trans("NoAmbiCaracAutoGeneration")."
    '.$langs->trans("Save").'
    '; + + print ''; +} + + // Cryptage mot de passe print '
    '; $var=true; diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php new file mode 100644 index 00000000000..b2eab5d1495 --- /dev/null +++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php @@ -0,0 +1,192 @@ + + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/modules/security/generate/modGeneratePassPerso.class.php + * \ingroup core + * \brief File to manage no password generation. + */ + +require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php'; + + +/** + * \class modGeneratePassPerso + * \brief Class to generate a password according to personal rules + */ +class modGeneratePassPerso extends ModeleGenPassword +{ + var $id; + var $length; + var $length2; // didn't overright display + var $NbMaj; + var $NbNum; + var $NbSpe; + var $NbRepeat; + var $WithoutAmbi; + + var $db; + var $conf; + var $lang; + var $user; + + var $Maj; + var $Min; + var $Nb; + var $Spe; + var $Ambi; + var $All; + + /** + * Constructor + * + * @param DoliDB $db Database handler + * @param Conf $conf Handler de conf + * @param Translate $langs Handler de langue + * @param User $user Handler du user connecte + */ + function __construct($db, $conf, $langs, $user) + { + $this->id = "Perso"; + $this->length = $langs->trans("SetupPerso"); + + $this->db=$db; + $this->conf=$conf; + $this->langs=$langs; + $this->user=$user; + + if(empty($conf->global->USER_PASSWORD_PATTERN)){ + dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;8;0','chaine',0,'',$conf->entity); + } + + $this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + //$this->Maj = "Y"; + $this->Min = strtolower($this->Maj); + $this->Nb = "0123456789"; + //$this->Nb = "X"; + $this->Spe = "!@#$%&*()_-+={}[]\\|:;'/"; + //$this->Spe = "<>;}?"; + $this->Ambi = array("1","I","l","|","O","0"); + + $tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN); + $this->length2 = $tabConf[0]; + $this->NbMaj = $tabConf[1]; + $this->NbNum = $tabConf[2]; + $this->NbSpe = $tabConf[3]; + $this->NbRepeat = $tabConf[4]; + $this->WithoutAmbi = $tabConf[5]; + + if($this->WithoutAmbi){ + $this->Maj = str_replace($this->Ambi,"",$this->Maj ); + $this->Min = str_replace($this->Ambi,"",$this->Min ); + $this->Nb = str_replace($this->Ambi,"",$this->Nb ); + $this->Spe = str_replace($this->Ambi,"",$this->Spe ); + } + + $this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe); + //$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe; + //$this->All = $this->Spe; + + } + + /** + * Return description of module + * + * @return string Description of text + */ + function getDescription() + { + global $langs; + return $langs->trans("PasswordGenerationPerso"); + } + + /** + * Return an example of password generated by this module + * + * @return string Example of password + */ + function getExample() + { + return $this->getNewGeneratedPassword(); + } + + /** + * Build new password + * + * @return string Return a new generated password + */ + function getNewGeneratedPassword() + { + $pass = ""; + for($i=0; $i<$this->NbMaj; $i++){ // Y + $pass .= $this->Maj[rand(0,strlen($this->Maj) - 1)]; + } + + for($i=0; $i<$this->NbNum; $i++){ // X + $pass .= $this->Nb[rand(0,strlen($this->Nb) - 1)]; + } + + for($i=0; $i<$this->NbSpe; $i++){ // @ + $pass .= $this->Spe[rand(0,strlen($this->Spe) - 1)]; + } + + for($i=strlen($pass);$i<$this->length2; $i++){ // y + $pass .= $this->All[rand(0,strlen($this->All) -1)]; + } + return str_shuffle($pass) ; + } + + /** + * Validate a password + * + * @param string $password Password to check + * @return int 0 if KO, >0 if OK + */ + function validatePassword($password) + { + return 1; + } + + /** + * consecutive iterations of the same character + * + * @param string $password Password to check + * @return int 0 if KO, >0 if OK + */ + function consecutiveInterationSameCharacter($password){ + $last = ""; + $count = 0; + $char = explode("", $password); + + foreach($char as $c){ + if($c != $last){ + $last = $c; + $count = 0; + }else{ + $count++; + } + + if($count > $this->NbRepeat) { + return true; + } + } + return false; + } +} + diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 28edf08867b..53061a3e944 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -327,6 +327,12 @@ ModuleDisabled=Module désactivé ModuleDisabledSoNoEvent=Module désactivé donc événement jamais créé ConfirmPurge=Êtes-vous sûr de vouloir réaliser cette purge ?
    Ceci effacera définitivement tous vos fichiers (espace GED, pièces jointes, etc...). MinLength=Longueur minimale +NbMajMin=Nombre de majuscule minimum +NbNumMin=Nombre de chiffre minimum +NbSpeMin=Nombre de caractère speciaux minimum +NbIteConsecutive=Nombre maximum d'iterations consecutive du même caractère +NoAmbiCaracAutoGeneration=Desactivaté les caractère ambigus pour la generation automatique ("1","I","l","|","0","O") +SetupPerso=Configuration personalisable LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant ListOfDirectories=Liste des répertoires des modèles OpenDocument @@ -1057,6 +1063,8 @@ EmptyNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout ##### Module password generation PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés. PasswordGenerationNone=Ne propose pas de mots de passe générés. Le mot de passe est à saisir manuellement. +PasswordGenerationPerso=Renvoie un mot de passe généré selon votre configuration. +PasswordPatternDesc=Pattern utilisé pour la génération de password personalisé ##### Users setup ##### UserGroupSetup=Configuration module utilisateurs et groupes GeneratePassword=Proposer un mot de passe généré From a4a01de8a13d5b4425cc4ebf76358d5a18a92805 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 3 Nov 2014 18:00:11 +0100 Subject: [PATCH 0449/1190] Fix: Missing label --- htdocs/core/lib/agenda.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index d2270cb5584..44e962de3ea 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -206,7 +206,7 @@ function show_array_actions_to_do($max=5) include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; $sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,"; - $sql.= " c.code, c.libelle,"; + $sql.= " c.code, c.libelle as type_label,"; $sql.= " s.nom as sname, s.rowid, s.client"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c LEFT JOIN "; $sql.= " ".MAIN_DB_PREFIX."actioncomm as a ON c.id = a.fk_action"; @@ -243,7 +243,7 @@ function show_array_actions_to_do($max=5) print ''; $staticaction->type_code=$obj->code; - $staticaction->libelle=$obj->label; + $staticaction->label=($obj->label?$obj->label:$obj->type_label); $staticaction->id=$obj->id; print ''.$staticaction->getNomUrl(1,34).''; From b6b6cced307621bb97b8dcd1dd378deade696d9e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 3 Nov 2014 20:02:11 +0100 Subject: [PATCH 0450/1190] Fix: Test sur user assigned not filled Can use empty line into select boolean form. --- htdocs/comm/action/card.php | 6 +++--- htdocs/core/class/html.form.class.php | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index a1e6f89f663..96db3133cf9 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -251,11 +251,11 @@ if ($action == 'add') if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $object->use_phenix=1; // Check parameters - if (empty($object->userownerid)) + if (empty($object->userownerid) && empty($_SESSION['assignedtouser'])) { $error++; $donotclearsession=1; $action = 'create'; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionAffectedTo")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionsOwnedBy")), 'errors'); } if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent)))) { @@ -423,7 +423,7 @@ if ($action == 'update') { $error++; $donotclearsession=1; $action = 'edit'; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionAffectedTo")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionsOwnedBy")), 'errors'); } // Fill array 'array_options' with data from add form diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8e369151fd7..eb7b3d8af4f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4166,18 +4166,18 @@ class Form /** * Return an html string with a select combo box to choose yes or no * - * @param string $htmlname Name of html select field - * @param string $value Pre-selected value - * @param int $option 0 return yes/no, 1 return 1/0 - * @param bool $disabled true or false - * @return mixed See option + * @param string $htmlname Name of html select field + * @param string $value Pre-selected value + * @param int $option 0 return yes/no, 1 return 1/0 + * @param bool $disabled true or false + * @param useempty $useempty 1=Add empty line + * @return mixed See option */ - function selectyesno($htmlname,$value='',$option=0,$disabled=false) + function selectyesno($htmlname,$value='',$option=0,$disabled=false,$useempty='') { global $langs; $yes="yes"; $no="no"; - if ($option) { $yes="1"; @@ -4187,15 +4187,17 @@ class Form $disabled = ($disabled ? ' disabled="disabled"' : ''); $resultyesno = ''."\n"; return $resultyesno; From 4e1f9babaf4e8f823824371f67f9cb6b2dab5185 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 3 Nov 2014 21:58:14 +0100 Subject: [PATCH 0451/1190] Merge --- htdocs/fichinter/card.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 77c7e17ffb5..4ffc31c9cab 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -748,10 +748,10 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); - $actionmsg = dol_concatdesc($actionmsg, $message); + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref); } From 0b41df7c35a076be6ec128d98f4b15e9021b5290 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 4 Nov 2014 00:33:50 +0100 Subject: [PATCH 0452/1190] Clean code to manage multiselect jquery: All code is centralized into function multipleselectarray (except loading of css). Code is prepared to choose which plugin to use (only a if is required to switch or add a new manager). Introduce working version with multiple-select jquery plugin. Removed deprecated old jquery plugin. --- COPYRIGHT | 62 +-- htdocs/core/class/html.form.class.php | 86 ++-- .../jquery/plugins/multiple-select/LICENSE | 21 + .../jquery/plugins/multiple-select/README.md | 96 ++++ .../multiple-select/jquery.multiple.select.js | 466 +++++++++++++++++ .../multiple-select/multiple-select.css | 183 +++++++ .../multiple-select.jquery.json | 28 + .../multiple-select/multiple-select.png | Bin 0 -> 3342 bytes .../plugins/multiselect/MIT-LICENSE.txt | 20 - .../multiselect/css/ui.multiselect.css | 31 -- .../plugins/multiselect/js/ui.multiselect.js | 480 ------------------ htdocs/main.inc.php | 11 +- 12 files changed, 879 insertions(+), 605 deletions(-) create mode 100644 htdocs/includes/jquery/plugins/multiple-select/LICENSE create mode 100644 htdocs/includes/jquery/plugins/multiple-select/README.md create mode 100644 htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js create mode 100644 htdocs/includes/jquery/plugins/multiple-select/multiple-select.css create mode 100644 htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json create mode 100644 htdocs/includes/jquery/plugins/multiple-select/multiple-select.png delete mode 100644 htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt delete mode 100644 htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css delete mode 100644 htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js diff --git a/COPYRIGHT b/COPYRIGHT index c0d8389369c..fd54e10f354 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -9,41 +9,41 @@ More information: http://www.gnu.org/licenses/gpl-3.0.txt Dolibarr uses some external libraries released under different licenses. This is compatibility summary: -Component Version License GPL Compatible Usage +Component Version License GPL Compatible Usage ------------------------------------------------------------------------------------- PHP libraries: -AdoDb-Date 0.32 Modified BSD License Yes Date convertion (not into rpm package) -CKEditor 4.3.3 LGPL-2.1+ Yes Editor WYSIWYG -FPDI 1.4.2 Apache Software License 2.0 Yes PDF templates management -FPDF_TPL 1.2 Apache Software License 2.0 Yes PDF templates management -GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package) -NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package) -odtPHP 1.0.1 GPL-2+ b Yes Library to build/edit ODT files -PHPExcel 1.7.8 LGPL-2.1+ Yes Read/Write XLS files, read ODS files -PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests -TCPDF 6.0.093 LGPL-3+ Yes PDF generation +AdoDb-Date 0.32 Modified BSD License Yes Date convertion (not into rpm package) +CKEditor 4.3.3 LGPL-2.1+ Yes Editor WYSIWYG +FPDI 1.4.2 Apache Software License 2.0 Yes PDF templates management +FPDF_TPL 1.2 Apache Software License 2.0 Yes PDF templates management +GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package) +NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package) +odtPHP 1.0.1 GPL-2+ b Yes Library to build/edit ODT files +PHPExcel 1.7.8 LGPL-2.1+ Yes Read/Write XLS files, read ODS files +PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests +TCPDF 6.0.093 LGPL-3+ Yes PDF generation JS libraries: -jQuery 1.8.2 MIT License Yes JS library -jQuery UI 1.9.1 GPL and MIT License Yes JS library plugin UI -jQuery UI Multiselect ? GPL and MIT License Yes JS library plugin for sexier multiselect -jQuery blockUI 2.43 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups) -jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors -jQuery DataTables 1.9.4 BSD Yes JS library for tables output -jQuery FileUpload 5.0.3 GPL and MIT License Yes JS library to upload files -jQuery Flot 0.7 MIT License Yes JS library to build graph -jQuery JCrop 0.9.8 GPL and MIT License Yes JS library plugin Crop (to crop images) -jQuery Jeditable 1.7.1 GPL and MIT License Yes JS library plugin jeditable (to edit in place) -jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups) -jQuery jPicker 1.1.6 GPL and MIT License Yes JS library for color picker with not defined list of colors -jQuery jqueryFileTree 1.0.1 GPL and MIT License Yes JS library for color picker with not defined list of colors -jQuery jquerytreeview 1.4.1 MIT License Yes JS library for color picker with not defined list of colors -jQuery Layout 1.3.0rc30.74 GPL and MIT License Yes JS library plugin Layout (RC-29.15) -jQuery Mobile 1.3.0 GPL and MIT License Yes JS library for smartphone (not used) -jQuery TableDnD 0.6 GPL and MIT License Yes JS library plugin TableDnD (to reorder table rows) -jQuery Timepicker 1.1.0 GPL and MIT License Yes JS library Timepicker addon for Datepicker -jQuery Tiptip 1.3 GPL and MIT License Yes JS library for tooltips -jsGantt 1.2 BSD License Yes JS library (to build Gantt reports) +jQuery 1.8.2 MIT License Yes JS library +jQuery UI 1.9.1 GPL and MIT License Yes JS library plugin UI +jQuery multiple-select 1.1.0 MIT License Yes JS library plugin for sexier multiselect +jQuery blockUI 2.43 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups) +jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors +jQuery DataTables 1.9.4 BSD Yes JS library for tables output +jQuery FileUpload 5.0.3 GPL and MIT License Yes JS library to upload files +jQuery Flot 0.7 MIT License Yes JS library to build graph +jQuery JCrop 0.9.8 GPL and MIT License Yes JS library plugin Crop (to crop images) +jQuery Jeditable 1.7.1 GPL and MIT License Yes JS library plugin jeditable (to edit in place) +jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups) +jQuery jPicker 1.1.6 GPL and MIT License Yes JS library for color picker with not defined list of colors +jQuery jqueryFileTree 1.0.1 GPL and MIT License Yes JS library for color picker with not defined list of colors +jQuery jquerytreeview 1.4.1 MIT License Yes JS library for color picker with not defined list of colors +jQuery Layout 1.3.0rc30.74 GPL and MIT License Yes JS library plugin Layout (RC-29.15) +jQuery Mobile 1.3.0 GPL and MIT License Yes JS library for smartphone (not used) +jQuery TableDnD 0.6 GPL and MIT License Yes JS library plugin TableDnD (to reorder table rows) +jQuery Timepicker 1.1.0 GPL and MIT License Yes JS library Timepicker addon for Datepicker +jQuery Tiptip 1.3 GPL and MIT License Yes JS library for tooltips +jsGantt 1.2 BSD License Yes JS library (to build Gantt reports) For licenses compatibility informations: http://www.fsf.org/licensing/licenses/index_html diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index eb7b3d8af4f..bade0344680 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4032,9 +4032,10 @@ class Form * @param int $translate Translate and encode value * @param int $maxlen Length maximum for labels * @param int $disabled Html select box is disabled - * @param int $sort 'ASC' or 'DESC' =Sort on label, '' or 'NONE'=Do not sort + * @param int $sort 'ASC' or 'DESC' = Sort on label, '' or 'NONE' = Do not sort * @param string $morecss Add more class to css styles * @return string HTML select string. + * @see multiselectarray */ static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='') { @@ -4092,54 +4093,65 @@ class Form * * @param string $htmlname Name of select * @param array $array Array with key+value - * @param array $selected Preselected keys + * @param array $selected Array with key+value preselected * @param int $key_in_label 1 pour afficher la key dans la valeur "[key] value" * @param int $value_as_key 1 to use value as key * @param string $option Valeur de l'option en fonction du type choisi * @param int $translate Translate and encode value + * @param int $width Force width of select box. May be used only when using jquery couch. * @return string HTML multiselect string + * @see selectarray */ - function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $option='', $translate=0) + static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $option='', $translate=0, $width=0) { global $conf, $langs; - $out = ''."\n"; if (is_array($array) && ! empty($array)) { if ($value_as_key) $array=array_combine($array, $array); - if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && is_array($selected) && ! empty($selected)) - { - foreach ($selected as $selected_value) - { - foreach($array as $key => $value) - { - if ($selected_value == $key) - { - $value=$array[$selected_value]; - $out.= ''."\n"; - unset($array[$key]); - } - } - } - - if (! empty($array)) - { - foreach ($array as $key => $value) - { - $out.= ''."\n"; - } - } - } - else + if (! empty($array)) { foreach ($array as $key => $value) { @@ -4150,7 +4162,7 @@ class Form } $out.= '>'; - $newval = ($translate ? $langs->trans(ucfirst($value)) : $value); + $newval = ($translate ? $langs->trans($value) : $value); $newval = ($key_in_label ? $key.' - '.$newval : $newval); $out.= dol_htmlentitiesbr($newval); $out.= ''."\n"; diff --git a/htdocs/includes/jquery/plugins/multiple-select/LICENSE b/htdocs/includes/jquery/plugins/multiple-select/LICENSE new file mode 100644 index 00000000000..c3ebd2b5248 --- /dev/null +++ b/htdocs/includes/jquery/plugins/multiple-select/LICENSE @@ -0,0 +1,21 @@ +(The MIT License) + +Copyright (c) 2012-2014 Zhixin Wen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/README.md b/htdocs/includes/jquery/plugins/multiple-select/README.md new file mode 100644 index 00000000000..81b82ba74c0 --- /dev/null +++ b/htdocs/includes/jquery/plugins/multiple-select/README.md @@ -0,0 +1,96 @@ +# Multiple Select + +Multiple select is a jQuery plugin to select multiple elements with checkboxes :). + +To get started checkout examples and documentation at http://wenzhixin.net.cn/p/multiple-select + +## Contributors + +Multiple select is due to the excellent work of the following contributors: + + + + +< + + + + + + + +
    文翼GitHub/wenzhixin
    Gaurav JassalGitHub/creativeaura
    guliGitHub/guli
    jwheadonGitHub/jwheadon
    yxGitHub/qqfish
    Tobias MaceyGitHub/blarghmatey
    Jona GoldmanGitHub/jonagoldman
    Alex JeffreyGitHub/ajeffrey
    + +## Changelog + +### 1.1.0 + +* Fix #63: Add ```keepOpen``` option. +* Fix #62: Fix ```isOpen``` and ```filter``` options are both true bug. +* Fix #57: Fire onCheckAll event when literally select. +* Add data attributes for support. +* Fix #55: Add ```name``` option. + +### 1.0.9 + +* Fix #42: Add ```styler``` option to custom item style. +* Fix firefox click bug. +* Add ```allSelected```, ```minumimCountSelected``` and ```countSelected``` options. +* Fix #35: Add ```onFocus``` and ```onBlur``` events. +* Fix #25: Add ```focus``` and ```blur``` methods. +* Fix #31: Trigger the onCheckAll & onUncheckAll events when use filter to select all. + +### 1.0.8 + +* Update the license to The MIT License. +* Fix #47: Add ```No matches found``` message when there are no results found. +* Fix #43: Add ```position``` option. + +### 1.0.7 + +* Fix #44: The filters not working bugs. + +### 1.0.6 + +* Fix #21: Add ```single``` option. +* Add ```override``` option. +* Add ```container``` option. +* Fix #29: Update the optgroups select text. +* Fix #30: Image is not shown in Firefox 25.0.1. +* Fix #22: fix group filter problem. + +### 1.0.5 + +* Update the button text witdh. +* Add keyboard support. + +### 1.0.4 + +* Fix #12: Add ```width``` option. +* Fix #11: Add callback events. +* Add ```maxHeight``` option. + +### 1.0.3 + +* Fix #4: Add ```filter``` option. +* Support mobile devices. +* Fix #6: Add ```refresh``` method. + +### 1.0.2 + +* Fix #7: Add ```selected``` and ```disabled``` options. +* Fix #5: Add ```checkAll``` and ```uncheckAll``` methods. + +### 1.0.1 + +* Fix #3: Add optgroups support. +* Add ```placeholder``` option. +* Fix #2: use prop method instead of attr. + +### 1.0.0 + +* Initial release + +## LICENSE + +[The MIT License](https://github.com/wenzhixin/multiple-select/blob/master/LICENSE) \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js b/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js new file mode 100644 index 00000000000..32e6635bbaa --- /dev/null +++ b/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js @@ -0,0 +1,466 @@ +/** + * @author zhixin wen + * @version 1.1.0 + * + * http://wenzhixin.net.cn/p/multiple-select/ + */ + +(function($) { + + 'use strict'; + + function MultipleSelect($el, options) { + var that = this, + name = $el.attr('name') || options.name || '', + elWidth = $el.width(); + + this.$el = $el.hide(); + this.options = options; + + this.$parent = $('
    '); + this.$choice = $(''); + this.$drop = $('
    '); + this.$el.after(this.$parent); + this.$parent.append(this.$choice); + this.$parent.append(this.$drop); + + if (this.$el.prop('disabled')) { + this.$choice.addClass('disabled'); + } + this.$choice.css('width', elWidth + 'px'); + this.$drop.css({ + width: (options.width || elWidth) + 'px' + }); + + if (!this.options.keepOpen) { + $('body').click(function(e) { + if ($(e.target)[0] === that.$choice[0] || + $(e.target).parents('.ms-choice')[0] === that.$choice[0]) { + return; + } + if (($(e.target)[0] === that.$drop[0] || + $(e.target).parents('.ms-drop')[0] !== that.$drop[0]) && + that.options.isOpen) { + that.close(); + } + }); + } + + this.selectAllName = 'name="selectAll' + name + '"'; + this.selectGroupName = 'name="selectGroup' + name + '"'; + this.selectItemName = 'name="selectItem' + name + '"'; + } + + MultipleSelect.prototype = { + constructor : MultipleSelect, + + init: function() { + var that = this, + html = []; + if (this.options.filter) { + html.push( + '
    ', + '', + '
    ' + ); + } + html.push('
      '); + if (this.options.selectAll && !this.options.single) { + html.push( + '
    • ', + '', + '
      • ' + ); + } + $.each(this.$el.children(), function(i, elm) { + html.push(that.optionToHtml(i, elm)); + }); + html.push('
    • No matches found
      • '); + html.push('
    '); + this.$drop.html(html.join('')); + this.$drop.find('ul').css('max-height', this.options.maxHeight + 'px'); + this.$drop.find('.multiple').css('width', this.options.multipleWidth + 'px'); + + this.$searchInput = this.$drop.find('.ms-search input'); + this.$selectAll = this.$drop.find('input[' + this.selectAllName + ']'); + this.$selectGroups = this.$drop.find('input[' + this.selectGroupName + ']'); + this.$selectItems = this.$drop.find('input[' + this.selectItemName + ']:enabled'); + this.$disableItems = this.$drop.find('input[' + this.selectItemName + ']:disabled'); + this.$noResults = this.$drop.find('.ms-no-results'); + this.events(); + this.update(); + + if (this.options.isOpen) { + this.open(); + } + }, + + optionToHtml: function(i, elm, group, groupDisabled) { + var that = this, + $elm = $(elm), + html = [], + multiple = this.options.multiple, + disabled, + type = this.options.single ? 'radio' : 'checkbox'; + + if ($elm.is('option')) { + var value = $elm.val(), + text = $elm.text(), + selected = $elm.prop('selected'), + style = this.options.styler(value) ? ' style="' + this.options.styler(value) + '"' : ''; + + disabled = groupDisabled || $elm.prop('disabled'); + html.push( + '', + '', + ' ', + text, + '', + '' + ); + } else if (!group && $elm.is('optgroup')) { + var _group = 'group_' + i, + label = $elm.attr('label'); + + disabled = $elm.prop('disabled'); + html.push( + '
  • ', + '', + '
    • '); + $.each($elm.children(), function(i, elm) { + html.push(that.optionToHtml(i, elm, _group, disabled)); + }); + } + return html.join(''); + }, + + events: function() { + var that = this; + this.$choice.off('click').on('click', function(e) { + e.preventDefault(); + that[that.options.isOpen ? 'close' : 'open'](); + }) + .off('focus').on('focus', this.options.onFocus) + .off('blur').on('blur', this.options.onBlur); + + this.$parent.off('keydown').on('keydown', function(e) { + switch (e.which) { + case 27: // esc key + that.close(); + that.$choice.focus(); + break; + } + }); + this.$searchInput.off('keyup').on('keyup', function() { + that.filter(); + }); + this.$selectAll.off('click').on('click', function() { + var checked = $(this).prop('checked'), + $items = that.$selectItems.filter(':visible'); + if ($items.length === that.$selectItems.length) { + that[checked ? 'checkAll' : 'uncheckAll'](); + } else { // when the filter option is true + that.$selectGroups.prop('checked', checked); + $items.prop('checked', checked); + that.options[checked ? 'onCheckAll' : 'onUncheckAll'](); + that.update(); + } + }); + this.$selectGroups.off('click').on('click', function() { + var group = $(this).parent().attr('data-group'), + $items = that.$selectItems.filter(':visible'), + $children = $items.filter('[data-group="' + group + '"]'), + checked = $children.length !== $children.filter(':checked').length; + $children.prop('checked', checked); + that.updateSelectAll(); + that.update(); + that.options.onOptgroupClick({ + label: $(this).parent().text(), + checked: checked, + children: $children.get() + }); + }); + this.$selectItems.off('click').on('click', function() { + that.updateSelectAll(); + that.update(); + that.updateOptGroupSelect(); + that.options.onClick({ + label: $(this).parent().text(), + value: $(this).val(), + checked: $(this).prop('checked') + }); + }); + }, + + open: function() { + if (this.$choice.hasClass('disabled')) { + return; + } + this.options.isOpen = true; + this.$choice.find('>div').addClass('open'); + this.$drop.show(); + if (this.options.container) { + var offset = this.$drop.offset(); + this.$drop.appendTo($(this.options.container)); + this.$drop.offset({ top: offset.top, left: offset.left }); + } + if (this.options.filter) { + this.$searchInput.val(''); + this.filter(); + } + this.options.onOpen(); + }, + + close: function() { + this.options.isOpen = false; + this.$choice.find('>div').removeClass('open'); + this.$drop.hide(); + if (this.options.container) { + this.$parent.append(this.$drop); + this.$drop.css({ + 'top': 'auto', + 'left': 'auto' + }) + } + this.options.onClose(); + }, + + update: function() { + var selects = this.getSelects('text'), + $span = this.$choice.find('>span'); + if (selects.length === this.$selectItems.length + this.$disableItems.length && this.options.allSelected) { + $span.removeClass('placeholder').html(this.options.allSelected); + } else if (selects.length > this.options.minumimCountSelected && this.options.countSelected) { + $span.removeClass('placeholder').html(this.options.countSelected + .replace('#', selects.length) + .replace('%', this.$selectItems.length + this.$disableItems.length)); + } else if (selects.length) { + $span.removeClass('placeholder').html(selects.join(', ')); + } else { + $span.addClass('placeholder').html(this.options.placeholder); + } + // set selects to select + this.$el.val(this.getSelects()); + }, + + updateSelectAll: function() { + var $items = this.$selectItems.filter(':visible'); + this.$selectAll.prop('checked', $items.length && + $items.length === $items.filter(':checked').length); + if (this.$selectAll.prop('checked')) { + this.options.onCheckAll(); + } + }, + + updateOptGroupSelect: function() { + var $items = this.$selectItems.filter(':visible'); + $.each(this.$selectGroups, function(i, val) { + var group = $(val).parent().attr('data-group'), + $children = $items.filter('[data-group="' + group + '"]'); + $(val).prop('checked', $children.length && + $children.length === $children.filter(':checked').length); + }); + }, + + //value or text, default: 'value' + getSelects: function(type) { + var that = this, + texts = [], + values = []; + this.$drop.find('input[' + this.selectItemName + ']:checked').each(function() { + texts.push($(this).parent().text()); + values.push($(this).val()); + }); + + if (type === 'text' && this.$selectGroups.length) { + texts = []; + this.$selectGroups.each(function() { + var html = [], + text = $.trim($(this).parent().text()), + group = $(this).parent().data('group'), + $children = that.$drop.find('[' + that.selectItemName + '][data-group="' + group + '"]'), + $selected = $children.filter(':checked'); + + if ($selected.length === 0) { + return; + } + + html.push('['); + html.push(text); + if ($children.length > $selected.length) { + var list = []; + $selected.each(function() { + list.push($(this).parent().text()); + }); + html.push(': ' + list.join(', ')); + } + html.push(']'); + texts.push(html.join('')); + }); + } + return type === 'text' ? texts : values; + }, + + setSelects: function(values) { + var that = this; + this.$selectItems.prop('checked', false); + $.each(values, function(i, value) { + that.$selectItems.filter('[value="' + value + '"]').prop('checked', true); + }); + this.$selectAll.prop('checked', this.$selectItems.length === + this.$selectItems.filter(':checked').length); + this.update(); + }, + + enable: function() { + this.$choice.removeClass('disabled'); + }, + + disable: function() { + this.$choice.addClass('disabled'); + }, + + checkAll: function() { + this.$selectItems.prop('checked', true); + this.$selectGroups.prop('checked', true); + this.$selectAll.prop('checked', true); + this.update(); + this.options.onCheckAll(); + }, + + uncheckAll: function() { + this.$selectItems.prop('checked', false); + this.$selectGroups.prop('checked', false); + this.$selectAll.prop('checked', false); + this.update(); + this.options.onUncheckAll(); + }, + + focus: function() { + this.$choice.focus(); + this.options.onFocus(); + }, + + blur: function() { + this.$choice.blur(); + this.options.onBlur(); + }, + + refresh: function() { + this.init(); + }, + + filter: function() { + var that = this, + text = $.trim(this.$searchInput.val()).toLowerCase(); + if (text.length === 0) { + this.$selectItems.parent().show(); + this.$disableItems.parent().show(); + this.$selectGroups.parent().show(); + } else { + this.$selectItems.each(function() { + var $parent = $(this).parent(); + $parent[$parent.text().toLowerCase().indexOf(text) < 0 ? 'hide' : 'show'](); + }); + this.$disableItems.parent().hide(); + this.$selectGroups.each(function() { + var $parent = $(this).parent(); + var group = $parent.attr('data-group'), + $items = that.$selectItems.filter(':visible'); + $parent[$items.filter('[data-group="' + group + '"]').length === 0 ? 'hide' : 'show'](); + }); + + //Check if no matches found + if (this.$selectItems.filter(':visible').length) { + this.$selectAll.parent().show(); + this.$noResults.hide(); + } else { + this.$selectAll.parent().hide(); + this.$noResults.show(); + } + } + this.updateOptGroupSelect(); + this.updateSelectAll(); + } + }; + + $.fn.multipleSelect = function() { + var option = arguments[0], + args = arguments, + + value, + allowedMethods = [ + 'getSelects', 'setSelects', + 'enable', 'disable', + 'checkAll', 'uncheckAll', + 'focus', 'blur', + 'refresh' + ]; + + this.each(function() { + var $this = $(this), + data = $this.data('multipleSelect'), + options = $.extend({}, $.fn.multipleSelect.defaults, + $this.data(), typeof option === 'object' && option); + + if (!data) { + data = new MultipleSelect($this, options); + $this.data('multipleSelect', data); + } + + if (typeof option === 'string') { + if ($.inArray(option, allowedMethods) < 0) { + throw "Unknown method: " + option; + } + value = data[option](args[1]); + } else { + data.init(); + } + }); + + return value ? value : this; + }; + + $.fn.multipleSelect.defaults = { + name: '', + isOpen: false, + placeholder: '', + selectAll: true, + selectAllText: 'Select all', + allSelected: 'All selected', + minumimCountSelected: 3, + countSelected: '# of % selected', + multiple: false, + multipleWidth: 80, + single: false, + filter: false, + width: undefined, + maxHeight: 250, + container: null, + position: 'bottom', + keepOpen: false, + + styler: function() {return false;}, + + onOpen: function() {return false;}, + onClose: function() {return false;}, + onCheckAll: function() {return false;}, + onUncheckAll: function() {return false;}, + onFocus: function() {return false;}, + onBlur: function() {return false;}, + onOptgroupClick: function() {return false;}, + onClick: function() {return false;} + }; +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css new file mode 100644 index 00000000000..d824e0c7a2b --- /dev/null +++ b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css @@ -0,0 +1,183 @@ +/** + * @author zhixin wen + */ + +.ms-parent { + display: inline-block; + position: relative; + vertical-align: middle; +} + +.ms-choice { + display: block; + height: 26px; + padding: 0; + overflow: hidden; + cursor: pointer; + border: 1px solid #aaa; + text-align: left; + white-space: nowrap; + line-height: 26px; + color: #444; + text-decoration: none; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + background-color: #fff; +} + +.ms-choice.disabled { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.ms-choice > span { + position: absolute; + top: 0; + left: 0; + right: 20px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: block; + padding-left: 8px; +} + +.ms-choice > span.placeholder { + color: #999; +} + +.ms-choice > div { + position: absolute; + top: 0; + right: 0; + width: 20px; + height: 25px; + background: url('multiple-select.png') right top no-repeat; +} + +.ms-choice > div.open { + background: url('multiple-select.png') left top no-repeat; +} + +.ms-drop { + overflow: hidden; + display: none; + margin-top: -1px; + padding: 0; + position: absolute; + z-index: 1000; + background: #fff; + color: #000; + border: 1px solid #aaa; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +.ms-drop.bottom { + top: 100%; + -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); + -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 4px 5px rgba(0, 0, 0, .15); +} + +.ms-drop.top { + bottom: 100%; + -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); + -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); +} + +.ms-search { + display: inline-block; + margin: 0; + min-height: 26px; + padding: 4px; + position: relative; + white-space: nowrap; + width: 100%; + z-index: 10000; +} + +.ms-search input { + width: 100%; + height: auto !important; + min-height: 24px; + padding: 0 20px 0 5px; + margin: 0; + outline: 0; + font-family: sans-serif; + font-size: 1em; + border: 1px solid #aaa; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background: #fff url('multiple-select.png') no-repeat 100% -22px; + background: url('multiple-select.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee)); + background: url('multiple-select.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%); + background: url('multiple-select.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%); + background: url('multiple-select.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%); + background: url('multiple-select.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%); + background: url('multiple-select.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%); +} + +.ms-search, .ms-search input { + -webkit-box-sizing: border-box; + -khtml-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} + +.ms-drop ul { + overflow: auto; + margin: 0; + padding: 5px 8px; +} + +.ms-drop ul > li { + list-style: none; + display: list-item; + background-image: none; + position: static; +} + +.ms-drop ul > li .disabled { + opacity: .35; + filter: Alpha(Opacity=35); +} + +.ms-drop ul > li.multiple { + display: block; + float: left; +} + +.ms-drop ul > li.group { + clear: both; +} + +.ms-drop ul > li.multiple label { + width: 100%; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.ms-drop ul > li label.optgroup { + font-weight: bold; +} + +.ms-drop input[type="checkbox"] { + vertical-align: middle; +} + +.ms-drop .ms-no-results { + display: none; +} \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json new file mode 100644 index 00000000000..dd636fda7e0 --- /dev/null +++ b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json @@ -0,0 +1,28 @@ +{ + "name": "multiple-select", + "version": "1.1.0", + "title": "Multiple Select", + "description": "Multiple select is a jQuery plugin to select multiple elements with checkboxes :).", + "author": { + "name": "zhixin wen", + "email": "wenzhixin2010@gmail.com", + "url": "http://wenzhixin.net.cn/" + }, + "licenses": [ + { + "type": "MIT License", + "url": "http://opensource.org/licenses/MIT" + } + ], + "dependencies": { + "jquery": ">=1.7" + }, + "keywords": ["multiple.select", "select.list", "multiple.choose", "checkbox"], + "homepage": "http://wenzhixin.net.cn/p/multiple-select/", + "demo": "http://wenzhixin.net.cn/p/multiple-select/#examples", + "bugs": { + "url": "https://github.com/wenzhixin/multiple-select/issues" + }, + "docs": "http://wenzhixin.net.cn/p/multiple-select/#documentation", + "download": "https://github.com/wenzhixin/multiple-select/archive/master.zip" +} \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.png b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.png new file mode 100644 index 0000000000000000000000000000000000000000..2a7ba608ea846d4873f84e00455ee2d1bbe4d13a GIT binary patch literal 3342 zcmV+p4e|1cP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z0y{}WK~#9!?3X)e6j2n0zq1=3V01+ht#msfAc%-)BQ`$3M$p2DVk2n`SooN;yTn4- znLC26k0PjzjfjYam81}?ZDM1QLXiY*OtV`=*er8w?n2Nty0V*DWDXo=?t^>3IhX&Q zGh${8vgH_X%K$UL3@`)ix0%^5-fIhjpb&=P=0EM*$%i^E7)8-&k|Y8oOS)G#8jV+R z9M`)AEEEd&MPwUrv?oVwX1nwG{L_3s|E%q~Tuz(KX0zK3s@3Wq5jiI!N2=B8;hq4N z%jLk#UMvA#Op@eGtycTq^#-|IO+>`M-yItpTh$Yhv|6o_nJsw02bD_YeYbE?6kQdO zgYCA6j1-GS*Au{riHVQEq?tA9_4;!_@CybTASs_%eXz$RdCnkwD^ESlL&hp}n@T$?7~EU-pIj&~Rv_0j#7nn>a} z9sxc8^T1hEopR0%1LHsh%&O{+)I{P{d>(k>yJmomz*gT*fZM8iEj2)|+Wo*KV3&t_ z2@C^Q{M0+DdO0<~WiId#DEa0+pd19j!ocKWRV@S8fkhwT0|QqqsOnANtv~v&Kac+y Y016sCsn^Dnga7~l07*qoM6N<$f>N').insertAfter(this.element); - this.count = 0; // number of currently selected options - this.selectedContainer = $('
    '); - if (this.options.selectedContainerOnLeft) { - this.selectedContainer.appendTo(this.container); - this.availableContainer = $('
    ').appendTo(this.container); - this.availableContainer.addClass('right-column'); - } - else - { - this.availableContainer = $('
    ').appendTo(this.container); - this.selectedContainer.appendTo(this.container); - this.selectedContainer.addClass('right-column'); - } - this.selectedActions = $('
    0 '+$.ui.multiselect.locale.itemsCount+''+(this.options.includeRemoveAll?''+$.ui.multiselect.locale.removeAll+'':' ')+'
    ').appendTo(this.selectedContainer); - this.availableActions = $('
    '+(this.options.includeAddAll?''+$.ui.multiselect.locale.addAll+'':' ')+'
    ').appendTo(this.availableContainer); - this.selectedList = $('
    ').bind('selectstart', function(){return false;}).appendTo(this.selectedContainer); - this.availableList = $('
    ').bind('selectstart', function(){return false;}).appendTo(this.availableContainer); - - var that = this; - - var width = this.options.width; - if (!width) { - width = this.element.width(); - } - var height = this.options.height; - if (!height) { - height = this.element.height(); - } - - // set dimensions - this.container.width(width-2); - if (this.options.selectedContainerOnLeft) { - this.selectedContainer.width(Math.floor(width*this.options.dividerLocation)-1); - this.availableContainer.width(Math.floor(width*(1-this.options.dividerLocation))-2); - } - else - { - this.selectedContainer.width(Math.floor(width*this.options.dividerLocation)-2); - this.availableContainer.width(Math.floor(width*(1-this.options.dividerLocation))-1); - } - - // fix list height to match