From 477aeecdac467663a3fbe42aaa5cdf27130b17e5 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 2 Dec 2014 22:30:40 +0100 Subject: [PATCH 01/20] #1725 Missing table cells in services list header --- htdocs/product/liste.php | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index cab06a7f387..44a6a69da2e 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -324,12 +324,16 @@ else print ''; print ''; print ''; + + // Barcode if (! empty($conf->barcode->enabled)) { print ''; print ''; print ''; } + + // Date modification print ''; print ' '; print ''; @@ -363,16 +367,7 @@ else print ''; print ' '; print ''; - //desiredstock - print ''; - print ' '; - print ''; - } - else - { - print ''; - print ' '; - print ''; + // Desired stock print ''; print ' '; print ''; @@ -501,15 +496,6 @@ else print $product_static->stock_reel; print ''; } - else - { - print ''; - print ' '; - print ''; - print ''; - print ' '; - print ''; - } } // Status (to buy) From aaf2cca45f3488a81ffd713e148ea9c3572efaf8 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 27 Oct 2014 19:31:42 +0100 Subject: [PATCH 02/20] Fix bug n sellist extrafield filtered --- htdocs/core/class/extrafields.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 451598a5830..228fef11d10 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -727,11 +727,11 @@ 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]; } } 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. From bd8b393d8a8e383e6345488be2836e61d7e1004c Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Fri, 5 Dec 2014 21:24:16 +0100 Subject: [PATCH 03/20] Fix [ bug #1740 ] Clone project make task date crazy --- htdocs/projet/class/task.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 4f883e1b743..68b6c867442 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1007,7 +1007,8 @@ class Task extends CommonObject $error=0; - $now=dol_now(); + //Use 00:00 of today if time is use on task. + $now=dol_mktime(0,0,0,dol_print_date(dol_now(),'%m'),dol_print_date(dol_now(),'%d'),dol_print_date(dol_now(),'%Y')); $datec = $now; From 146107280160f090dfd7fb1cdf8c37996ae3f7f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Dec 2014 01:12:52 +0100 Subject: [PATCH 04/20] Fix: Paypal link were broken dur to SSL v3 closed. --- ChangeLog | 2 ++ htdocs/paypal/lib/paypal.lib.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a65eef7fc9..949492346b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 3.5.7 compared to 3.5.6 ***** +Fix: Paypal link were broken dur to SSL v3 closed. ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 31ed9b97ff8..3d9dcf16d02 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -683,7 +683,8 @@ function hash_call($methodName,$nvpStr) exit;*/ curl_setopt($ch, CURLOPT_URL, $API_Endpoint); curl_setopt($ch, CURLOPT_VERBOSE, 1); - curl_setopt($ch, CURLOPT_SSLVERSION, 3); // Force SSLv3 + //curl_setopt($ch, CURLOPT_SSLVERSION, 3); // Force SSLv3 + curl_setopt($ch, CURLOPT_SSLVERSION, 1); // Force TLSv1 //turning off the server and peer verification(TrustManager Concept). curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); From 666e66e78f54ca45ed926f20e41fe442c20289d3 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 9 Dec 2014 05:04:12 +0100 Subject: [PATCH 05/20] Correct link in activity box --- htdocs/core/boxes/box_activity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index bddeb4b957e..8e0bd6a8a21 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"', From 81dc1415deabd45c2c3da2f4376d841c825166f4 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 9 Dec 2014 05:04:39 +0100 Subject: [PATCH 06/20] Untranslatable token in activity box --- htdocs/core/class/html.formother.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 5150f2d4e41..c54991af434 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -1017,6 +1017,7 @@ class FormOther if ($nbboxactivated) { $langs->load("boxes"); + $langs->load("projects"); $emptybox=new ModeleBoxes($db); From a1bba472a03e146975fd932a1c91490cdddcf57d Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Fri, 12 Dec 2014 11:57:20 +0100 Subject: [PATCH 07/20] FIX: hook insertExtraFields must return a returnvalue (0,1,-1) --- htdocs/core/class/hookmanager.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 849b6bb0370..2a54354aedf 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -131,6 +131,7 @@ class HookManager // Define type of hook ('output', 'returnvalue' or 'addreplace'). 'addreplace' should be type for all hooks. 'output' and 'returnvalue' are deprecated. $hooktype='output'; if (preg_match('/^pdf_/',$method)) $hooktype='returnvalue'; // pdf_xxx except pdf_writelinedesc are returnvalue hooks. When there is 2 hooks of this type, only last one win. + if ($method =='insertExtraFields') $hooktype='returnvalue'; if (in_array( $method, array( From 27b47a4f4836f4bbb49898187a1be06d9ca00841 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Fri, 12 Dec 2014 14:31:36 +0100 Subject: [PATCH 08/20] FIX: dont put a mess with date and datetime extrafield value if already in right format (the bug was in propale/order/invoice extrafields, mainly visible with 2 datetime extrafields) --- htdocs/core/class/commonobject.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 5af3f5a93c3..3b7623f43ca 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2178,10 +2178,10 @@ abstract class CommonObject $this->array_options[$key] = price2num($this->array_options[$key]); break; case 'date': - $this->array_options[$key]=$this->db->idate($this->array_options[$key]); + if (is_numeric($this->array_options[$key])) $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]); + if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]); break; } } From bdf8189d20d3c797c79f3b317d307565af1c2e18 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Dec 2014 10:40:39 +0100 Subject: [PATCH 09/20] Fixed: CSS --- htdocs/theme/eldy/style.css.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 35460af92e3..143b76b00ed 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -100,12 +100,12 @@ $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15); -$colorbacklineimpair1='255,255,255'; // line pair -$colorbacklineimpair2='255,255,255'; // line pair -$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); -$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair -$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair -$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair +$colorbacklineimpair1='255,255,255'; // line impair +$colorbacklineimpair2='255,255,255'; // line impair +$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair +$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line pair +$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line pair +$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair $colorbackbody='#f9f9f9'; $colortext='40,40,40'; $fontsize='12'; @@ -1840,7 +1840,7 @@ table.liste td { } */ -.impair:hover { +.impair:hover, td.nohover { background: rgb(); @@ -1866,7 +1866,7 @@ table.liste td { min-height: 18px; /* seems to not be used */ } -td.nohover, .pair:hover { +.pair:hover { background: rgb(); From 574502994246f9664931bfddb6d0b2ffaaec6bf7 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 15 Dec 2014 11:33:09 +0100 Subject: [PATCH 10/20] Change credential test data in WS demo --- htdocs/webservices/demo_wsclient_actioncomm.php-NORUN | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN index 32df64218d3..1e14c07a5bf 100755 --- a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN +++ b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN @@ -53,8 +53,8 @@ if ($soapclient) $authentication=array( 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, 'sourceapplication'=>'DEMO', - 'login'=>'admin_dolibarDev', - 'password'=>'homedread', + 'login'=>'admin', + 'password'=>'changeme', 'entity'=>'1'); From a4a1a991b85b88e418740837bcf4b0f5e0a846a1 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Mon, 15 Dec 2014 14:13:57 +0100 Subject: [PATCH 11/20] FIX: avoid milestones in margin calculation --- htdocs/margin/agentMargins.php | 1 + htdocs/margin/customerMargins.php | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 51166bc472b..30adf727318 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -119,6 +119,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND sc.fk_soc = f.fk_soc"; +$sql.= " AND (d.product_type = 0 OR d.product_type = 1)"; if (! empty($conf->global->AGENT_CONTACT_TYPE)) $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))"; else diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 6675753d4d6..38691d4f43b 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -173,6 +173,7 @@ $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.fk_statut > 0"; $sql.= " AND s.entity = ".$conf->entity; $sql.= " AND d.fk_facture = f.rowid"; +$sql.= " AND (d.product_type = 0 OR d.product_type = 1)"; if ($client) $sql.= " AND f.fk_soc = ".$socid; if (!empty($startdate)) From 1850ebe33a6db0f788d78754894a5cdc149b7590 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Dec 2014 01:41:49 +0100 Subject: [PATCH 12/20] VAT setup for canada was rong --- htdocs/langs/en_CA/admin.lang | 5 +++++ htdocs/langs/en_CA/companies.lang | 5 +++++ htdocs/langs/en_CA/main.lang | 28 ++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 htdocs/langs/en_CA/admin.lang create mode 100644 htdocs/langs/en_CA/companies.lang create mode 100644 htdocs/langs/en_CA/main.lang diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang new file mode 100644 index 00000000000..cee56c0f791 --- /dev/null +++ b/htdocs/langs/en_CA/admin.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - admin +VATManagement=GST Management +LocalTax1IsUsedDesc=Use a second tax (PST) +LocalTax1IsNotUsedDesc=Do not use second tax (PST) +LocalTax1Management=PST Management diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang new file mode 100644 index 00000000000..985f125d7de --- /dev/null +++ b/htdocs/langs/en_CA/companies.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - companies +VATIsUsed=GST is used +VATIsNotUsed=GST is not use +LocalTax1IsUsedES=PST is used +LocalTax1IsNotUsedES=GST is not used diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang new file mode 100644 index 00000000000..fca2906cd12 --- /dev/null +++ b/htdocs/langs/en_CA/main.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=, +SeparatorThousand=None +FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y +FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d.%m.%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rate defined for country '%s'. +AmountVAT=Amount GST +AmountLT1=Amount PST +TotalVAT=Total GST +TotalLT1=Total PST +IncludedVAT=Including GST +VAT=GST +VATRate=GST rate From 174428ad3145991d8e2afb51af784d826da55c1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Dec 2014 01:55:03 +0100 Subject: [PATCH 13/20] Data init for canada vat --- htdocs/install/mysql/data/llx_c_tva.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 01d2894bca6..a2e1cb6bbb3 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -66,7 +66,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2 -- CANADA (id country=14) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14, '7','0','VAT standard rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14, '0','0','VAT Rate 0',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','TPS and TVQ rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1); -- CAMEROUN (id country=24) From c9f69279c7ca0eca48e436e48f0e5570c4738305 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Tue, 16 Dec 2014 16:21:31 +0100 Subject: [PATCH 14/20] FIX: pagebreak on fichinter like in other documents --- .../fichinter/doc/pdf_soleil.modules.php | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 6a0feda2e9d..ad5516f2bf6 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -255,19 +255,44 @@ class pdf_soleil extends ModelePDFFicheinter $txt=''.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration),1,$outputlangs->charset_output).''; $desc=dol_htmlentitiesbr($objectligne->desc,1); - $pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,$desc), 0, 1, 0); - + $pdf->startTransaction(); + $pdf->writeHTMLCell(0, 0, $curX, $curY, $txt.'
'.$desc, LR, 1, 0); + $pageposafter=$pdf->getPage(); + if ($pageposafter > $pageposbefore) // There is a pagebreak + { + $pdf->rollbackTransaction(true); + $pageposafter=$pageposbefore; + //print $pageposafter.'-'.$pageposbefore;exit; + $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it. + $pdf->writeHTMLCell(0, 0, $curX, $curY, $txt.'
'.$desc, LR, 1, 0); + $pageposafter=$pdf->getPage(); + $posyafter=$pdf->GetY(); + //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit; + if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text + { + if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page + { + $pdf->AddPage('','',true); + $pdf->setPage($pageposafter+1); + } + } + } + else // No pagebreak + { + $pdf->commitTransaction(); + } + $nexY = $pdf->GetY(); $pageposafter=$pdf->getPage(); $pdf->setPage($pageposbefore); $pdf->setTopMargin($this->marge_haute); $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it. - + // We suppose that a too long description is moved completely on next page if ($pageposafter > $pageposbefore) { $pdf->setPage($pageposafter); $curY = $tab_top_newpage; } - + $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut // Detect if some page were added automatically and output _tableau for past pages From 849628f02051070a35f368ee35a570af08fe2c6c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 17 Dec 2014 01:56:36 +0100 Subject: [PATCH 15/20] Fix: Typo and translation --- htdocs/expedition/card.php | 2 +- htdocs/langs/ar_SA/printipp.lang | 14 ++++++++++++ htdocs/langs/ar_SA/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/bg_BG/printipp.lang | 14 ++++++++++++ htdocs/langs/bg_BG/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/bs_BA/printipp.lang | 14 ++++++++++++ htdocs/langs/bs_BA/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ca_ES/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/cs_CZ/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/da_DK/printipp.lang | 14 ++++++++++++ htdocs/langs/da_DK/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/de_DE/printipp.lang | 14 ++++++++++++ htdocs/langs/de_DE/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/el_GR/printipp.lang | 14 ++++++++++++ htdocs/langs/el_GR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/et_EE/printipp.lang | 14 ++++++++++++ htdocs/langs/et_EE/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/eu_ES/printipp.lang | 14 ++++++++++++ htdocs/langs/eu_ES/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/fa_IR/printipp.lang | 14 ++++++++++++ htdocs/langs/fa_IR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/fi_FI/printipp.lang | 14 ++++++++++++ htdocs/langs/fi_FI/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/he_IL/printipp.lang | 14 ++++++++++++ htdocs/langs/he_IL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/hr_HR/printipp.lang | 14 ++++++++++++ htdocs/langs/hr_HR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/hu_HU/printipp.lang | 14 ++++++++++++ htdocs/langs/hu_HU/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/id_ID/printipp.lang | 14 ++++++++++++ htdocs/langs/id_ID/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/is_IS/printipp.lang | 14 ++++++++++++ htdocs/langs/is_IS/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/it_IT/printipp.lang | 14 ++++++++++++ htdocs/langs/it_IT/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ja_JP/printipp.lang | 14 ++++++++++++ htdocs/langs/ja_JP/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ko_KR/printipp.lang | 14 ++++++++++++ htdocs/langs/ko_KR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/lt_LT/printipp.lang | 14 ++++++++++++ htdocs/langs/lt_LT/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/lv_LV/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/mk_MK/printipp.lang | 14 ++++++++++++ htdocs/langs/mk_MK/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/nb_NO/printipp.lang | 14 ++++++++++++ htdocs/langs/nb_NO/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/nl_NL/printipp.lang | 14 ++++++++++++ htdocs/langs/nl_NL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/pl_PL/printipp.lang | 14 ++++++++++++ htdocs/langs/pl_PL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/pt_PT/printipp.lang | 14 ++++++++++++ htdocs/langs/pt_PT/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ro_RO/printipp.lang | 14 ++++++++++++ htdocs/langs/ro_RO/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ru_RU/printipp.lang | 14 ++++++++++++ htdocs/langs/ru_RU/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sk_SK/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sl_SI/printipp.lang | 14 ++++++++++++ htdocs/langs/sl_SI/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sq_AL/printipp.lang | 14 ++++++++++++ htdocs/langs/sq_AL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sv_SE/printipp.lang | 14 ++++++++++++ htdocs/langs/sv_SE/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/th_TH/printipp.lang | 14 ++++++++++++ htdocs/langs/th_TH/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/tr_TR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/uk_UA/printipp.lang | 14 ++++++++++++ htdocs/langs/uk_UA/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/vi_VN/printipp.lang | 14 ++++++++++++ htdocs/langs/vi_VN/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/zh_CN/printipp.lang | 14 ++++++++++++ htdocs/langs/zh_CN/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/zh_TW/printipp.lang | 14 ++++++++++++ htdocs/langs/zh_TW/productbatch.lang | 20 ++++++++++++++++++ .../theme/dolibarr_preferred_partner_int.png | Bin 0 -> 9804 bytes 75 files changed, 1257 insertions(+), 1 deletion(-) create mode 100644 htdocs/langs/ar_SA/printipp.lang create mode 100644 htdocs/langs/ar_SA/productbatch.lang create mode 100644 htdocs/langs/bg_BG/printipp.lang create mode 100644 htdocs/langs/bg_BG/productbatch.lang create mode 100644 htdocs/langs/bs_BA/printipp.lang create mode 100644 htdocs/langs/bs_BA/productbatch.lang create mode 100644 htdocs/langs/ca_ES/productbatch.lang create mode 100644 htdocs/langs/cs_CZ/productbatch.lang create mode 100644 htdocs/langs/da_DK/printipp.lang create mode 100644 htdocs/langs/da_DK/productbatch.lang create mode 100644 htdocs/langs/de_DE/printipp.lang create mode 100644 htdocs/langs/de_DE/productbatch.lang create mode 100644 htdocs/langs/el_GR/printipp.lang create mode 100644 htdocs/langs/el_GR/productbatch.lang create mode 100644 htdocs/langs/et_EE/printipp.lang create mode 100644 htdocs/langs/et_EE/productbatch.lang create mode 100644 htdocs/langs/eu_ES/printipp.lang create mode 100644 htdocs/langs/eu_ES/productbatch.lang create mode 100644 htdocs/langs/fa_IR/printipp.lang create mode 100644 htdocs/langs/fa_IR/productbatch.lang create mode 100644 htdocs/langs/fi_FI/printipp.lang create mode 100644 htdocs/langs/fi_FI/productbatch.lang create mode 100644 htdocs/langs/he_IL/printipp.lang create mode 100644 htdocs/langs/he_IL/productbatch.lang create mode 100644 htdocs/langs/hr_HR/printipp.lang create mode 100644 htdocs/langs/hr_HR/productbatch.lang create mode 100644 htdocs/langs/hu_HU/printipp.lang create mode 100644 htdocs/langs/hu_HU/productbatch.lang create mode 100644 htdocs/langs/id_ID/printipp.lang create mode 100644 htdocs/langs/id_ID/productbatch.lang create mode 100644 htdocs/langs/is_IS/printipp.lang create mode 100644 htdocs/langs/is_IS/productbatch.lang create mode 100644 htdocs/langs/it_IT/printipp.lang create mode 100644 htdocs/langs/it_IT/productbatch.lang create mode 100644 htdocs/langs/ja_JP/printipp.lang create mode 100644 htdocs/langs/ja_JP/productbatch.lang create mode 100644 htdocs/langs/ko_KR/printipp.lang create mode 100644 htdocs/langs/ko_KR/productbatch.lang create mode 100644 htdocs/langs/lt_LT/printipp.lang create mode 100644 htdocs/langs/lt_LT/productbatch.lang create mode 100644 htdocs/langs/lv_LV/productbatch.lang create mode 100644 htdocs/langs/mk_MK/printipp.lang create mode 100644 htdocs/langs/mk_MK/productbatch.lang create mode 100644 htdocs/langs/nb_NO/printipp.lang create mode 100644 htdocs/langs/nb_NO/productbatch.lang create mode 100644 htdocs/langs/nl_NL/printipp.lang create mode 100644 htdocs/langs/nl_NL/productbatch.lang create mode 100644 htdocs/langs/pl_PL/printipp.lang create mode 100644 htdocs/langs/pl_PL/productbatch.lang create mode 100644 htdocs/langs/pt_PT/printipp.lang create mode 100644 htdocs/langs/pt_PT/productbatch.lang create mode 100644 htdocs/langs/ro_RO/printipp.lang create mode 100644 htdocs/langs/ro_RO/productbatch.lang create mode 100644 htdocs/langs/ru_RU/printipp.lang create mode 100644 htdocs/langs/ru_RU/productbatch.lang create mode 100644 htdocs/langs/sk_SK/productbatch.lang create mode 100644 htdocs/langs/sl_SI/printipp.lang create mode 100644 htdocs/langs/sl_SI/productbatch.lang create mode 100644 htdocs/langs/sq_AL/printipp.lang create mode 100644 htdocs/langs/sq_AL/productbatch.lang create mode 100644 htdocs/langs/sv_SE/printipp.lang create mode 100644 htdocs/langs/sv_SE/productbatch.lang create mode 100644 htdocs/langs/th_TH/printipp.lang create mode 100644 htdocs/langs/th_TH/productbatch.lang create mode 100644 htdocs/langs/tr_TR/productbatch.lang create mode 100644 htdocs/langs/uk_UA/printipp.lang create mode 100644 htdocs/langs/uk_UA/productbatch.lang create mode 100644 htdocs/langs/vi_VN/printipp.lang create mode 100644 htdocs/langs/vi_VN/productbatch.lang create mode 100644 htdocs/langs/zh_CN/printipp.lang create mode 100644 htdocs/langs/zh_CN/productbatch.lang create mode 100644 htdocs/langs/zh_TW/printipp.lang create mode 100644 htdocs/langs/zh_TW/productbatch.lang create mode 100755 htdocs/theme/dolibarr_preferred_partner_int.png diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 979ed0491a1..4e795005abb 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -95,7 +95,7 @@ if (! empty($conf->productbatch->enabled)) if (! (GETPOST('entrepot_id','int') > 0)) { $langs->load("errors"); - setEventMessage($langs->trans("WarhouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); + setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); exit; } diff --git a/htdocs/langs/ar_SA/printipp.lang b/htdocs/langs/ar_SA/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ar_SA/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ar_SA/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/bg_BG/printipp.lang b/htdocs/langs/bg_BG/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/bg_BG/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/bg_BG/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/bs_BA/printipp.lang b/htdocs/langs/bs_BA/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/bs_BA/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/bs_BA/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ca_ES/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/cs_CZ/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/da_DK/printipp.lang b/htdocs/langs/da_DK/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/da_DK/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/da_DK/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/de_DE/printipp.lang b/htdocs/langs/de_DE/printipp.lang new file mode 100644 index 00000000000..c4ce34ef962 --- /dev/null +++ b/htdocs/langs/de_DE/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Einstellungen des DirektDruck-Moduls +PrintIPPDesc=Dieses Modul fügt einen "Drucken"-Button zu, um Dokumente direkt zu einen Drucker zu senden. Dies erfordert ein Linux-System mit installiertem CUPS. +PRINTIPP_ENABLED="Direktdruck"-Symbol in Dokumentlisten anzeigen +PRINTIPP_HOST=Druckserver +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Passwort +NoPrinterFound=Keine Drucker gefunden (CUPS-Konfiguration prüfen) +FileWasSentToPrinter=Datei %s zum Drucker gesandt +NoDefaultPrinterDefined=Kein Standarddrucker defininert +DefaultPrinter=Standarddrucker +Printer=Drucker +CupsServer=CUPS-Server diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang new file mode 100644 index 00000000000..a78b3a8302c --- /dev/null +++ b/htdocs/langs/de_DE/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Charge/Seriennr. verwalten +ProductStatusOnBatch=Verwaltet +ProductStatusNotOnBatch=Nicht Verwaltet +ProductStatusOnBatchShort=Verwaltet +ProductStatusNotOnBatchShort=Nicht verwaltet +Batch=Charge/Seriennr +atleast1batchfield=Verzehren-bis-, verkaufen-bis-Datum oder Chargennr +batch_number=Charge/Seriennr +l_eatby=Verzehren-bis-Datum +l_sellby=Verkaufen-bis-Datum +DetailBatchNumber=Chargen-/Seriennummern-Details +DetailBatchFormat=Charge/Seriennr: %s - E: %s - S: %s (Menge: %d) +printBatch=Charge: %s +printEatby=Verzehren bis: %s +printSellby=Verkaufen bis: %s +printQty=Menge: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Nicht definiert +WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Chargen/Seriennr eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden. diff --git a/htdocs/langs/el_GR/printipp.lang b/htdocs/langs/el_GR/printipp.lang new file mode 100644 index 00000000000..04a8bfda5b9 --- /dev/null +++ b/htdocs/langs/el_GR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Ρύθμιση του module Άμεση Εκτύπωση +PrintIPPDesc=Το module αυτό προσθέτει ένα κουμπί Εκτύπωσης για να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή. Απαιτεί ένα σύστημα Linux με εγκατεστημένο CUPS. +PRINTIPP_ENABLED=Εμφάνιση εικονιδίου "Απευθείας εκτύπωση" στις λίστες εγγράφων +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Σύνδεση +PRINTIPP_PASSWORD=Κωδικός +NoPrinterFound=Δεν βρέθηκαν εκτυπωτές (ελέγξτε τη ρύθμιση του CUPS) +FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή +NoDefaultPrinterDefined=Δεν έχει οριστεί προεπιλεγμένος εκτυπωτής +DefaultPrinter=Προεπιλογμένος εκτυπωτής +Printer=Εκτυπωτής +CupsServer=CUPS Server diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/el_GR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/et_EE/printipp.lang b/htdocs/langs/et_EE/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/et_EE/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/et_EE/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/eu_ES/printipp.lang b/htdocs/langs/eu_ES/printipp.lang new file mode 100644 index 00000000000..f9c36810b91 --- /dev/null +++ b/htdocs/langs/eu_ES/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Direct Print modulua konfiguratu +PrintIPPDesc=Modulu honek "Inprimatu" botoia gehitzen du dokumentuak zuzenean inprimagailu batera bidaltzeko. CUPS instalatuta duen Linux sistema behar du. +PRINTIPP_ENABLED=Dokumentuen zerrendetan "Direct Print" ikonoa erakutsi +PRINTIPP_HOST=Inprimatzeko zerbitzaria +PRINTIPP_PORT=Ataka +PRINTIPP_USER=Hasi saioa honela +PRINTIPP_PASSWORD=Pasahitza +NoPrinterFound=Ez da inprimagailurik aurkitu (CUPS konfigurazioa egiaztatu) +FileWasSentToPrinter=%s fitxategia inprimagailura bidali da +NoDefaultPrinterDefined=Ez da lehenetsitako inprimagailurik ezarri +DefaultPrinter=Lehenetsitako inprimagailua +Printer=Inprimagailua +CupsServer=CUPS zerbitzaria diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/eu_ES/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/fa_IR/printipp.lang b/htdocs/langs/fa_IR/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/fa_IR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/fa_IR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/fi_FI/printipp.lang b/htdocs/langs/fi_FI/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/fi_FI/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/fi_FI/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/he_IL/printipp.lang b/htdocs/langs/he_IL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/he_IL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/he_IL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/hr_HR/printipp.lang b/htdocs/langs/hr_HR/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/hr_HR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/hr_HR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/hu_HU/printipp.lang b/htdocs/langs/hu_HU/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/hu_HU/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/hu_HU/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/id_ID/printipp.lang b/htdocs/langs/id_ID/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/id_ID/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/id_ID/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/is_IS/printipp.lang b/htdocs/langs/is_IS/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/is_IS/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/is_IS/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/it_IT/printipp.lang b/htdocs/langs/it_IT/printipp.lang new file mode 100644 index 00000000000..7c597de10e1 --- /dev/null +++ b/htdocs/langs/it_IT/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Server di stampa +PRINTIPP_PORT=Porta +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=Nessuna stampante trovata (controlla la tua installazione di CUPS) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang new file mode 100644 index 00000000000..39171461732 --- /dev/null +++ b/htdocs/langs/it_IT/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Gestito +ProductStatusNotOnBatch=Non gestito +ProductStatusOnBatchShort=Gestito +ProductStatusNotOnBatchShort=Non gestito +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Quantità: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Non definito +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ja_JP/printipp.lang b/htdocs/langs/ja_JP/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ja_JP/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ja_JP/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ko_KR/printipp.lang b/htdocs/langs/ko_KR/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ko_KR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ko_KR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/lt_LT/printipp.lang b/htdocs/langs/lt_LT/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/lt_LT/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/lt_LT/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/lv_LV/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/mk_MK/printipp.lang b/htdocs/langs/mk_MK/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/mk_MK/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/mk_MK/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/nb_NO/printipp.lang b/htdocs/langs/nb_NO/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/nb_NO/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/nb_NO/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/nl_NL/printipp.lang b/htdocs/langs/nl_NL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/nl_NL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/nl_NL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/pl_PL/printipp.lang b/htdocs/langs/pl_PL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/pl_PL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/pl_PL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/pt_PT/printipp.lang b/htdocs/langs/pt_PT/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/pt_PT/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/pt_PT/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ro_RO/printipp.lang b/htdocs/langs/ro_RO/printipp.lang new file mode 100644 index 00000000000..a1734576be5 --- /dev/null +++ b/htdocs/langs/ro_RO/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Configurarea modulului Imprimare directă +PrintIPPDesc=Acest modul adauga un buton de imprimare pentru a trimite documentele direct la o imprimantă. Este nevoie de un sistem Linux cu CUPS instalat. +PRINTIPP_ENABLED=Afișare pictogramă "Print Direct" în listele de documente +PRINTIPP_HOST=Server print +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Parolă +NoPrinterFound=Nu există imprimante (verificați setarea CUPS) +FileWasSentToPrinter=Fișierul %s a fost trimis la imprimantă +NoDefaultPrinterDefined=Nicio imprimantă implicită definită +DefaultPrinter=Imprimantă implicită +Printer=Imprimanta +CupsServer=Server CUPS diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang new file mode 100644 index 00000000000..fe1147cc7b1 --- /dev/null +++ b/htdocs/langs/ro_RO/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Gestionează lot/serie +ProductStatusOnBatch=Gestionat +ProductStatusNotOnBatch=Negestionat +ProductStatusOnBatchShort=Gestionat +ProductStatusNotOnBatchShort=Negestionat +Batch=Lot / Serie +atleast1batchfield=Data expirare sau data de vânzare sau numărul de lot +batch_number=Lot / Număr de serie +l_eatby=Data expirare +l_sellby=Data vânzare +DetailBatchNumber=Detalii Lot / Serie +DetailBatchFormat=Lot / Serie:%s - E:%s - S:%s (Cant.: %d) +printBatch=Lot: %s +printEatby=Expiră : %s +printSellby=Vanzare: %s +printQty=Cant: %d +AddDispatchBatchLine=Adauga o linie pentru Perioada de valabilitate expediere +BatchDefaultNumber=Nedefinit +WhenProductBatchModuleOnOptionAreForced=Când modulul de lot / serial este pornit, modul de creștere / scădere a stocului este fortat la ultima alegere și nu poate fi editat. Alte opțiuni pot fi definite după cum doriți. diff --git a/htdocs/langs/ru_RU/printipp.lang b/htdocs/langs/ru_RU/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ru_RU/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ru_RU/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sk_SK/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sl_SI/printipp.lang b/htdocs/langs/sl_SI/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/sl_SI/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sl_SI/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sq_AL/printipp.lang b/htdocs/langs/sq_AL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/sq_AL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sq_AL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sv_SE/printipp.lang b/htdocs/langs/sv_SE/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/sv_SE/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sv_SE/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/th_TH/printipp.lang b/htdocs/langs/th_TH/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/th_TH/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/th_TH/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang new file mode 100644 index 00000000000..61b366364b3 --- /dev/null +++ b/htdocs/langs/tr_TR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Parti/seri yönetimi +ProductStatusOnBatch=Yapıldı +ProductStatusNotOnBatch=Yapılmadı +ProductStatusOnBatchShort=Yapıldı +ProductStatusNotOnBatchShort=Yapılmadı +Batch=Parti/Seri +atleast1batchfield=Son yenme tarihi ya da Son satış tarihi ya da Parti numarası +batch_number=Parti/Seri numarası +l_eatby=Son yenme tarihi +l_sellby=Son satış tarihi +DetailBatchNumber=Parti/Seri ayrıntıları +DetailBatchFormat=Parti/Seri: %s - Y: %s - S: %s (Mik : %d) +printBatch=Parti: %s +printEatby=Son Yenme: %s +printSellby=Son satış: %s +printQty=Mik: %d +AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle +BatchDefaultNumber=Tanımlanmamış +WhenProductBatchModuleOnOptionAreForced=Parti/Seri devredeyken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler istediğiniz gibi yapılandırılabilir. diff --git a/htdocs/langs/uk_UA/printipp.lang b/htdocs/langs/uk_UA/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/uk_UA/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/uk_UA/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/vi_VN/printipp.lang b/htdocs/langs/vi_VN/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/vi_VN/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/vi_VN/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/zh_CN/printipp.lang b/htdocs/langs/zh_CN/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/zh_CN/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/zh_CN/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/zh_TW/printipp.lang b/htdocs/langs/zh_TW/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/zh_TW/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/zh_TW/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/theme/dolibarr_preferred_partner_int.png b/htdocs/theme/dolibarr_preferred_partner_int.png new file mode 100755 index 0000000000000000000000000000000000000000..c72d6153ddccee77e666b2ca86a4dea35967f885 GIT binary patch literal 9804 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 literal 0 HcmV?d00001 From a06c5b251e11454873a78180fa81e35633c591a7 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Wed, 17 Dec 2014 15:49:51 +0100 Subject: [PATCH 16/20] Fix: check warehouse on product batch Only check warehouse when on actions 'create' and 'add' --- htdocs/expedition/card.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 4e795005abb..f7c27e129d1 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -90,18 +90,19 @@ $hookmanager->initHooks(array('expeditioncard','globalcard')); */ $warehousecanbeselectedlater=1; -if (! empty($conf->productbatch->enabled)) +if ($action == 'create' || $action == 'add') { - if (! (GETPOST('entrepot_id','int') > 0)) + if (! empty($conf->productbatch->enabled)) { - $langs->load("errors"); - setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); - header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); - exit; + if (! (GETPOST('entrepot_id','int') > 0)) + { + $langs->load("errors"); + setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); + header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); + exit; + } } } - - $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'); From f7d2d0e81f0bb3836829ed4af24f5c48c52fc1a7 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Wed, 17 Dec 2014 15:51:12 +0100 Subject: [PATCH 17/20] Revert "Fix: check warehouse on product batch" This reverts commit a06c5b251e11454873a78180fa81e35633c591a7. --- htdocs/expedition/card.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index f7c27e129d1..4e795005abb 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -90,19 +90,18 @@ $hookmanager->initHooks(array('expeditioncard','globalcard')); */ $warehousecanbeselectedlater=1; -if ($action == 'create' || $action == 'add') +if (! empty($conf->productbatch->enabled)) { - if (! empty($conf->productbatch->enabled)) + if (! (GETPOST('entrepot_id','int') > 0)) { - if (! (GETPOST('entrepot_id','int') > 0)) - { - $langs->load("errors"); - setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); - header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); - exit; - } + $langs->load("errors"); + setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); + header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); + exit; } } + + $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'); From 722fdaa4eb69aab664774b663c23a4cfc19c26cc Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Wed, 17 Dec 2014 15:58:48 +0100 Subject: [PATCH 18/20] Fix: check warehouse on product batch Only check warehouse on actions 'create' and 'add' --- htdocs/expedition/card.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 4e795005abb..6ee45778d18 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -90,18 +90,20 @@ $hookmanager->initHooks(array('expeditioncard','globalcard')); */ $warehousecanbeselectedlater=1; -if (! empty($conf->productbatch->enabled)) +if (($action == 'create') || ($action == 'add')) { - if (! (GETPOST('entrepot_id','int') > 0)) + if (! empty($conf->productbatch->enabled)) { - $langs->load("errors"); - setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); - header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); - exit; + if (! (GETPOST('entrepot_id','int') > 0)) + { + $langs->load("errors"); + setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); + header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); + exit; + } } } - $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'); From d9aba405dd84aa085b0497754f161713baf8327c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Dec 2014 10:09:47 +0100 Subject: [PATCH 19/20] Fix: utf must be default value. --- htdocs/core/lib/functions.lib.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a48b7e3caff..a831767d940 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1029,7 +1029,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e function dol_getdate($timestamp,$fast=false) { global $conf; - + $usealternatemethod=false; if ($timestamp <= 0) $usealternatemethod=true; // <= 1970 if ($timestamp >= 2145913200) $usealternatemethod=true; // >= 2038 @@ -1041,7 +1041,7 @@ function dol_getdate($timestamp,$fast=false) else { $arrayinfo=getdate($timestamp); - + $startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1; if($startday==1) { @@ -1116,11 +1116,11 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) $default_timezone=@date_default_timezone_get(); } } - + if (empty($localtz)) { $localtz = new DateTimeZone('UTC'); } - + $dt = new DateTime(null,$localtz); $dt->setDate($year,$month,$day); $dt->setTime((int) $hour, (int) $minute, (int) $second); @@ -1788,6 +1788,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo { global $conf; + if (empty($stringencoding)) $stringencoding='UTF-8'; + if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string; // We go always here From 38ba6ac75b5753b855842318ccb213e91d84b049 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Dec 2014 11:48:30 +0100 Subject: [PATCH 20/20] Fixed: pgsql to make order --- htdocs/fourn/class/fournisseur.commande.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index b96e7f01c95..7593dcf9903 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -828,7 +828,7 @@ class CommandeFournisseur extends CommonOrder $result = 0; if ($user->rights->fournisseur->commande->commander) { - $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.",date_commande=".$this->db->idate("$date"); + $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."'"; $sql .= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::commande", LOG_DEBUG);