From 616ede1643ba8c900bb0de7867ac48be0088d8dd Mon Sep 17 00:00:00 2001 From: BoboTiG Date: Mon, 6 Jun 2016 19:05:24 +0200 Subject: [PATCH 01/25] Unpayed invoices box: fix status icon --- htdocs/core/boxes/box_factures_imp.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 783aa8b2c64..a3d1e3357b5 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -77,8 +77,10 @@ class box_factures_imp extends ModeleBoxes $sql.= " f.tva as total_tva,"; $sql.= " f.total_ttc,"; $sql.= " f.paye, f.fk_statut, f.rowid as facid"; + $sql.= ", sum(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture "; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.entity = ".$conf->entity; $sql.= " AND f.paye = 0"; @@ -146,7 +148,7 @@ class box_factures_imp extends ModeleBoxes $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', - 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3), + 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$objp->am), ); $line++; @@ -186,4 +188,3 @@ class box_factures_imp extends ModeleBoxes } } - From 2f8915947f6733162f5f08ea973b775f67f8cd43 Mon Sep 17 00:00:00 2001 From: BoboTiG Date: Tue, 7 Jun 2016 10:16:20 +0200 Subject: [PATCH 02/25] Add GROUP BY to be SQL standart compliant --- htdocs/core/boxes/box_factures_imp.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index a3d1e3357b5..bcc26f60e4c 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -87,6 +87,8 @@ class box_factures_imp extends ModeleBoxes $sql.= " AND fk_statut = 1"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id; + $sql.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.facnumber, f.date_lim_reglement,"; + $sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid"; //$sql.= " ORDER BY f.datef DESC, f.facnumber DESC "; $sql.= " ORDER BY datelimite ASC, f.facnumber ASC "; $sql.= $db->plimit($max, 0); From 54fbd2b23a2661eb86c0b3ffb65232b7cbe8ea61 Mon Sep 17 00:00:00 2001 From: novalore Date: Tue, 7 Jun 2016 12:48:47 +0200 Subject: [PATCH 03/25] fixes and typos in en_US lang files --- htdocs/langs/en_US/bills.lang | 2 +- htdocs/langs/en_US/receiptprinter.lang | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index f6428f6a49a..ad5260f8144 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -471,7 +471,7 @@ PDFCrevetteSituationInvoiceTitle=Situation invoice PDFCrevetteDescription=Invoice PDF template Crevette. A invoice template if you use situation invoice PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s TotalSituationInvoice=Total situation -invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line +invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices. ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu %s - %s - %s. diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang index 189a8f25e38..a2f3ba26a21 100644 --- a/htdocs/langs/en_US/receiptprinter.lang +++ b/htdocs/langs/en_US/receiptprinter.lang @@ -75,16 +75,16 @@ DOL_PRINT_ORDER_LOCAL_TAX=Print order local tax DOL_PRINT_ORDER_TOTAL=Print order total DOL_PRINT_ORDER_NUMBER=Print order number DOL_PRINT_ORDER_NUMBER_UNIQUE=Print order number after validation -DOL_PRINT_CUSTOMER_FIRSTNAME=Print customer firstname -DOL_PRINT_CUSTOMER_LASTNAME=Print customer name +DOL_PRINT_CUSTOMER_FIRSTNAME=Print customer name +DOL_PRINT_CUSTOMER_LASTNAME=Print customer surname DOL_PRINT_CUSTOMER_MAIL=Print customer mail DOL_PRINT_CUSTOMER_PHONE=Print customer phone DOL_PRINT_CUSTOMER_MOBILE=Print customer mobile DOL_PRINT_CUSTOMER_SKYPE=Print customer skype DOL_PRINT_CUSTOMER_TAX_NUMBER=Print customer VAT number DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Print customer account balance -DOL_PRINT_VENDOR_LASTNAME=Print vendor name -DOL_PRINT_VENDOR_FIRSTNAME=Print vendor firstname +DOL_PRINT_VENDOR_LASTNAME=Print vendor surname +DOL_PRINT_VENDOR_FIRSTNAME=Print vendor name DOL_PRINT_VENDOR_MAIL=Print vendor mail DOL_PRINT_CUSTOMER_POINTS=Print customer points DOL_PRINT_ORDER_POINTS=Print number of points for this order From 2f9031faa4f8ebe19232d501ae16941a91843dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 8 Jun 2016 02:31:59 +0200 Subject: [PATCH 04/25] Added Markdown rule to editorconfig Markdown uses two spaces to encode a line break. Editors usually removes them without this configuration which can prove quite frustrating. --- .editorconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.editorconfig b/.editorconfig index 5b3e0d6a8df..2df455f0d4f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,3 +15,5 @@ indent_style = tab indent_style = tab [*.xml] indent_style = tab +[*.md] +trim_trailing_whitespace = false From c5dcebb58e35709dcfc0188e6249f8889425dec2 Mon Sep 17 00:00:00 2001 From: damirugrin Date: Mon, 13 Jun 2016 18:13:41 +0200 Subject: [PATCH 05/25] Conflict with ModSecurity solved. When ModSecurity is enabled on apache server then "scandir" is forbidden word. When changing numbering model then you will find following error in apache log: ModSecurity: Access denied with code 403 (phase 2). Pattern match "(?i)(?:\\\\b(?:f(?:tp_(?:nb_)?f?(?:ge|pu)t|get(?:s?s|c)|s(?:ession_start|candir) I have changed "scandir" to "scan_dir". --- htdocs/admin/facture.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index bae4b0abd88..197df291c63 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -42,7 +42,7 @@ if (! $user->admin) accessforbidden(); $action = GETPOST('action','alpha'); $value = GETPOST('value','alpha'); $label = GETPOST('label','alpha'); -$scandir = GETPOST('scandir','alpha'); +$scandir = GETPOST('scan_dir','alpha'); $type='invoice'; @@ -380,7 +380,7 @@ foreach ($dirmodels as $reldir) } else { - print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').''; + print 'scan_dir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').''; } print ''; @@ -566,7 +566,7 @@ foreach ($dirmodels as $reldir) else { print "\n"; - print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"),'switch_off').''; + print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"),'switch_off').''; print ""; } @@ -578,7 +578,7 @@ foreach ($dirmodels as $reldir) } else { - print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"),'off').''; + print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"),'off').''; } print ''; From ec6dd0c42f0fe24808c6b5e1093d66cdcfe3d56c Mon Sep 17 00:00:00 2001 From: damirugrin Date: Mon, 13 Jun 2016 18:48:10 +0200 Subject: [PATCH 06/25] Update facture.php --- htdocs/admin/facture.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 197df291c63..3b7facc9dc8 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -380,7 +380,7 @@ foreach ($dirmodels as $reldir) } else { - print 'scan_dir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').''; + print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').''; } print ''; From d9d247e49da0792a3912e1b8664684fcb333008e Mon Sep 17 00:00:00 2001 From: Sergio Sanchis Climent Date: Tue, 14 Jun 2016 00:37:13 +0200 Subject: [PATCH 07/25] Fix install mysql 5.7.9 --- htdocs/install/mysql/data/llx_accounting.sql | 56 ++++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index eb682b55cf8..191cdee4712 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -138,13 +138,13 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (100,'PCG99-ABREGE','PROD', 'XXXXXX', '786', '1407', 'Reprises sur provisions pour risques', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (101,'PCG99-ABREGE','PROD', 'XXXXXX', '787', '1407', 'Reprises sur provisions', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (102,'PCG99-ABREGE','PROD', 'XXXXXX', '79', '1407', 'Transferts de charges', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1401,'PCG99-ABREGE','CAPIT', 'XXXXXX', '1', '', 'Fonds propres, provisions pour risques et charges et dettes à plus d''un an', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1402,'PCG99-ABREGE','IMMO', 'XXXXXX', '2', '', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1403,'PCG99-ABREGE','STOCK', 'XXXXXX', '3', '', 'Stock et commandes en cours d''exécution', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1404,'PCG99-ABREGE','TIERS', 'XXXXXX', '4', '', 'Créances et dettes à un an au plus', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1405,'PCG99-ABREGE','FINAN', 'XXXXXX', '5', '', 'Placement de trésorerie et de valeurs disponibles', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1406,'PCG99-ABREGE','CHARGE','XXXXXX', '6', '', 'Charges', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1407,'PCG99-ABREGE','PROD', 'XXXXXX', '7', '', 'Produits', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1401,'PCG99-ABREGE','CAPIT', 'XXXXXX', '1', '0', 'Fonds propres, provisions pour risques et charges et dettes à plus d''un an', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1402,'PCG99-ABREGE','IMMO', 'XXXXXX', '2', '0', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1403,'PCG99-ABREGE','STOCK', 'XXXXXX', '3', '0', 'Stock et commandes en cours d''exécution', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1404,'PCG99-ABREGE','TIERS', 'XXXXXX', '4', '0', 'Créances et dettes à un an au plus', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1405,'PCG99-ABREGE','FINAN', 'XXXXXX', '5', '0', 'Placement de trésorerie et de valeurs disponibles', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1406,'PCG99-ABREGE','CHARGE','XXXXXX', '6', '0', 'Charges', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1407,'PCG99-ABREGE','PROD', 'XXXXXX', '7', '0', 'Produits', '1'); -- -- Descriptif des plans comptables FR PCG99-BASE @@ -488,13 +488,13 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (436,'PCG99-BASE','PROD', 'XXXXXX', '791', '435', 'Transferts de charges d''exploitation ', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (437,'PCG99-BASE','PROD', 'XXXXXX', '796', '435', 'Transferts de charges financières', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (438,'PCG99-BASE','PROD', 'XXXXXX', '797', '435', 'Transferts de charges exceptionnelles', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1501,'PCG99-BASE','CAPIT', 'XXXXXX', '1', '', 'Fonds propres, provisions pour risques et charges et dettes à plus d''un an', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1502,'PCG99-BASE','IMMO', 'XXXXXX', '2', '', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1503,'PCG99-BASE','STOCK', 'XXXXXX', '3', '', 'Stock et commandes en cours d''exécution', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1504,'PCG99-BASE','TIERS', 'XXXXXX', '4', '', 'Créances et dettes à un an au plus', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1505,'PCG99-BASE','FINAN', 'XXXXXX', '5', '', 'Placement de trésorerie et de valeurs disponibles', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1506,'PCG99-BASE','CHARGE','XXXXXX', '6', '', 'Charges', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1507,'PCG99-BASE','PROD', 'XXXXXX', '7', '', 'Produits', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1501,'PCG99-BASE','CAPIT', 'XXXXXX', '1', '0', 'Fonds propres, provisions pour risques et charges et dettes à plus d''un an', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1502,'PCG99-BASE','IMMO', 'XXXXXX', '2', '0', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1503,'PCG99-BASE','STOCK', 'XXXXXX', '3', '0', 'Stock et commandes en cours d''exécution', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1504,'PCG99-BASE','TIERS', 'XXXXXX', '4', '0', 'Créances et dettes à un an au plus', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1505,'PCG99-BASE','FINAN', 'XXXXXX', '5', '0', 'Placement de trésorerie et de valeurs disponibles', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1506,'PCG99-BASE','CHARGE','XXXXXX', '6', '0', 'Charges', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1507,'PCG99-BASE','PROD', 'XXXXXX', '7', '0', 'Produits', '1'); -- -- Descriptif des plans comptables BE PCMN-BASE @@ -1413,13 +1413,13 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1348, 'PCMN-BASE', 'PROD', 'XXXXXX', '792', '1345', 'Prélèvement sur les réserves', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1349, 'PCMN-BASE', 'PROD', 'XXXXXX', '793', '1345', 'Perte à reporter', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1350, 'PCMN-BASE', 'PROD', 'XXXXXX', '794', '1345', 'Intervention d''associés (ou du propriétaire) dans la perte', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1351, 'PCMN-BASE', 'CAPIT', 'XXXXXX', '1', '', 'Fonds propres, provisions pour risques et charges et dettes à plus d''un an', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1352, 'PCMN-BASE', 'IMMO', 'XXXXXX', '2', '', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1353, 'PCMN-BASE', 'STOCK', 'XXXXXX', '3', '', 'Stock et commandes en cours d''exécution', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1354, 'PCMN-BASE', 'TIERS', 'XXXXXX', '4', '', 'Créances et dettes à un an au plus', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1355, 'PCMN-BASE', 'FINAN', 'XXXXXX', '5', '', 'Placement de trésorerie et de valeurs disponibles', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1356, 'PCMN-BASE', 'CHARGE', 'XXXXXX', '6', '', 'Charges', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1357, 'PCMN-BASE', 'PROD', 'XXXXXX', '7', '', 'Produits', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1351, 'PCMN-BASE', 'CAPIT', 'XXXXXX', '1', '0', 'Fonds propres, provisions pour risques et charges et dettes à plus d''un an', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1352, 'PCMN-BASE', 'IMMO', 'XXXXXX', '2', '0', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1353, 'PCMN-BASE', 'STOCK', 'XXXXXX', '3', '0', 'Stock et commandes en cours d''exécution', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1354, 'PCMN-BASE', 'TIERS', 'XXXXXX', '4', '0', 'Créances et dettes à un an au plus', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1355, 'PCMN-BASE', 'FINAN', 'XXXXXX', '5', '0', 'Placement de trésorerie et de valeurs disponibles', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1356, 'PCMN-BASE', 'CHARGE', 'XXXXXX', '6', '0', 'Charges', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1357, 'PCMN-BASE', 'PROD', 'XXXXXX', '7', '0', 'Produits', '1'); -- -- Descriptif des plans comptables ES PCG08-PYME @@ -1427,13 +1427,13 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype INSERT INTO llx_accounting_system (rowid, pcg_version, label, active) VALUES (4, 'PCG08-PYME', 'The PYME accountancy spanish plan', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4001,'PCG08-PYME','FINANCIACION', 'XXXXXX', '1', '', 'Financiación básica', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4002,'PCG08-PYME','ACTIVO', 'XXXXXX', '2', '', 'Activo no corriente', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4003,'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '3', '', 'Existencias', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4004,'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4', '', 'Acreedores y deudores por operaciones comerciales', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4005,'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5', '', 'Cuentas financieras', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4006,'PCG08-PYME','COMPRAS_GASTOS','XXXXXX', '6', '', 'Compras y gastos', '1'); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4007,'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7', '', 'Ventas e ingresos', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4001,'PCG08-PYME','FINANCIACION', 'XXXXXX', '1', '0', 'Financiación básica', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4002,'PCG08-PYME','ACTIVO', 'XXXXXX', '2', '0', 'Activo no corriente', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4003,'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '3', '0', 'Existencias', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4004,'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4', '0', 'Acreedores y deudores por operaciones comerciales', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4005,'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5', '0', 'Cuentas financieras', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4006,'PCG08-PYME','COMPRAS_GASTOS','XXXXXX', '6', '0', 'Compras y gastos', '1'); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4007,'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7', '0', 'Ventas e ingresos', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4008, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '10', '4001', 'CAPITAL', '1'); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4009, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '100', '4008', 'Capital social', '1'); From 49d515be7e461f450ea0e0a6daccd0e275097974 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 16 Jun 2016 12:22:55 +0200 Subject: [PATCH 08/25] Fix debug info was visible --- htdocs/expensereport/list.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 8175c130ef6..889310df163 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -297,7 +297,6 @@ if ($resql) print ""; print ''; print $expensereportstatic->getNomUrl(1); - print $expensereportstatic->status; if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late")); if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late")); print ''; From 2ef3d7cedbd5bed5131d6ee5372f8e1aa15cd38f Mon Sep 17 00:00:00 2001 From: Drosis Nikos Date: Thu, 16 Jun 2016 13:50:35 +0300 Subject: [PATCH 09/25] New TVA for Greece 24% --- htdocs/install/mysql/data/llx_c_tva.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 9fca86e45b5..3d88e6bbcc9 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -107,7 +107,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 5 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 55, 5, '10.7','0','USt. Landwirtschaft', 0); -- GREECE (id country=102) -insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (2462, 102, 23, 0, '0', 0, '0', 0, 'Κανονικός Φ.Π.Α.', 1); +insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (2462, 102, 24, 0, '0', 0, '0', 0, 'Κανονικός Φ.Π.Α.', 1); insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (2463, 102, 0, 0, '0', 0, '0', 0, 'Μηδενικό Φ.Π.Α.', 1); insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (2464, 102, 13, 0, '0', 0, '0', 0, 'Μειωμένος Φ.Π.Α.', 1); insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (2465, 102, 6.5, 0, '0', 0, '0', 0, 'Υπερμειωμένος Φ.Π.Α.', 1); From eb54c3f8af101448e8161f28ee5fe4d31ff0f792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 16 Jun 2016 13:08:06 +0200 Subject: [PATCH 10/25] Fix #5350 date_pointoftax prevented creating invoices --- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 4 ++-- htdocs/install/mysql/tables/llx_facture.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d4c616d09ac..4b5da68f8a2 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -358,7 +358,7 @@ class Facture extends CommonInvoice $sql.= ", ".($this->remise_absolue>0?$this->remise_absolue:'NULL'); $sql.= ", ".($this->remise_percent>0?$this->remise_percent:'NULL'); $sql.= ", '".$this->db->idate($this->date)."'"; - $sql.= ", '".$this->db->idate($this->date_pointoftax)."'"; + $sql.= ", ".(strval($this->date_pointoftax)!='' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null'); $sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); $sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null"); $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null"); diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql index c20ef305c39..935f8a04917 100644 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql @@ -111,7 +111,7 @@ ALTER TABLE llx_cronjob ADD COLUMN test varchar(255) DEFAULT '1'; ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut); -ALTER TABLE llx_facture ADD COLUMN date_pointoftax date; +ALTER TABLE llx_facture ADD COLUMN date_pointoftax date DEFAULT NULL; UPDATE llx_projet as p set p.opp_percent = (SELECT percent FROM llx_c_lead_status as cls WHERE cls.rowid = p.fk_opp_status) WHERE p.opp_percent IS NULL AND p.fk_opp_status IS NOT NULL; @@ -506,4 +506,4 @@ CREATE TABLE llx_oauth_state ( entity integer )ENGINE=InnoDB; -ALTER TABLE llx_import_model MODIFY COLUMN type varchar(50); \ No newline at end of file +ALTER TABLE llx_import_model MODIFY COLUMN type varchar(50); diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index b8e97f4dc1e..f62d8452953 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -38,7 +38,7 @@ create table llx_facture fk_soc integer NOT NULL, datec datetime, -- date de creation de la facture datef date, -- date invoice - date_pointoftax date, -- date point of tax (for GB) + date_pointoftax date DEFAULT NULL, -- date point of tax (for GB) date_valid date, -- date validation tms timestamp, -- date creation/modification paye smallint DEFAULT 0 NOT NULL, From 25fe110a343c230be73297663e8e194d0470d007 Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Thu, 16 Jun 2016 14:08:14 +0200 Subject: [PATCH 11/25] FIX a task without project inclusion call a non included object Link --- htdocs/core/lib/project.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index c6efa6ab3e1..87ef87cfe64 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -162,6 +162,7 @@ function task_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':''); $filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; $nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview\.png)$')); $nbLinks=Link::count($db, $object->element, $object->id); $head[$h][1] = $langs->trans('Documents'); From 48f30b5ef1a51baad3327250410a6d2a6175a739 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Jun 2016 12:39:00 +0200 Subject: [PATCH 12/25] Cleaner menu --- htdocs/core/menus/standard/empty.php | 4 +- htdocs/theme/eldy/style.css.php | 83 +++++++++++++++------------- 2 files changed, 49 insertions(+), 38 deletions(-) diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index 801eea2b0c8..0002aabaf21 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -165,7 +165,9 @@ class MenuManager for($j = ($i + 1); $j < $num; $j++) { if (empty($menu_array[$j]['level'])) $lastopened=false; - } + } + $alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined + $lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined if (($alt%2==0)) { print '
'."\n"; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 5aa97452a11..b10bc03e49b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -667,13 +667,37 @@ td.showDragHandle { height: calc(100% - 50px);*/ } +.side-nav { + display: table-cell; + border-right: 1px solid #d0d0d0; +} +div.blockvmenulogo +{ + border-bottom: 0 !important; +} +div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks { + border-top: none !important; + border-left: none !important; + border-right: none !important; + border-bottom: 1px solid #e0e0e0; + padding-left: 0 !important; +} +div.blockvmenuend { + border: none !important; + padding-left: 0 !important; +} +div.vmenu, td.vmenu { + padding-right: 6px !important; +} + + + /* For desktop */ global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> #id-container { width: 100%; } .side-nav { - border-right: 1px solid #BBB; border-bottom: 1px solid #BBB; background: #FFF; } @@ -687,7 +711,8 @@ div.blockvmenulogo border-bottom: 0 !important; } div.blockvmenusearch { - padding-bottom: 10px !important; + padding-bottom: 12px !important; + border-bottom: 1px solid #e0e0e0; } div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend { border-top: none !important; @@ -699,9 +724,6 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen div.vmenu, td.vmenu { padding-right: 6px !important; } -div.blockvmenulast { - border-bottom: 0; -} div.fiche { margin-: 6px !important; margin-: 6px !important; @@ -1017,8 +1039,13 @@ div.tmenucenter width: 100%; } +#menu_titre_logo { + padding-top: 0; + padding-bottom: 0; +} div.menu_titre { - padding-top: 5px; + padding-top: 4px; + padding-bottom: 4px; } .mainmenuaspan { @@ -1373,12 +1400,12 @@ div.vmenu, td.vmenu { } .menu_contenu { - padding-top: 5px; - padding-bottom: 2px; + padding-top: 3px; + padding-bottom: 3px; overflow: hidden; text-overflow: ellipsis; } -#menu_contenu_logo { padding-right: 4px; } +#menu_contenu_logo { padding-top: 0; } .companylogo { } .searchform { padding-top: 4px; } @@ -1402,15 +1429,20 @@ a.vsmenu.addbookmarkpicto { } .vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone { - border-bottom: 1px solid #BBB; +/* border-bottom: 1px solid #BBB; */ +} +div.blockvmenusearchphone +{ + border-bottom: none !important; } .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo { margin: 0 0 8px 2px; } -.vmenu div.blockvmenusearch +.vmenu div.blockvmenusearch { - padding-bottom: 5px; + padding-bottom: 14px; + border-bottom: 1px solid #e0e0e0; } .vmenu div.blockvmenuend { @@ -1419,6 +1451,7 @@ a.vsmenu.addbookmarkpicto { .vmenu div.blockvmenulogo { padding-bottom: 10px; + padding-top: 0; } div.blockvmenubookmarks { @@ -1434,21 +1467,12 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen padding-right: 1px; padding-top: 3px; padding-bottom: 3px; - /* margin: 1px 0 8px 2px; */ margin: 0 0 0 2px; background: rgb(); border-left: 1px solid #AAA; border-right: 1px solid #BBB; -/* border-bottom: 1px solid #BBB; - border-top: 1px solid #BBB; - border-radius: 4px; - -moz-border-radius: 4px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; - */ } div.blockvmenusearch @@ -1457,26 +1481,11 @@ div.blockvmenusearch color: #000000; text-align: ; text-decoration: none; - /*padding-left: 5px; - padding-right: 1px; - padding-top: 3px; - padding-bottom: 3px; */ - margin: 1px 0px 4px 2px; + margin: 1px 0px 0px 2px; background: rgb(); - - /*border-left: 1px solid #AAA; - border-right: 1px solid #BBB; - border-bottom: 1px solid #BBB; - border-top: 1px solid #BBB;*/ - /*border-radius: 4px; - -moz-border-radius: 4px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD;*/ } div.blockvmenusearch > form > div { -/* min-height: 40px; */ padding-top: 3px; } div.blockvmenusearch > form > div > label { From d94953c4d770cb7445ae71db31cd75d46ee874d5 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Fri, 17 Jun 2016 13:33:48 +0200 Subject: [PATCH 13/25] FIX bug with PgSQL on GROUP BY missing column --- htdocs/compta/facture/list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 2bd9ce1d8a4..0a886230100 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -756,7 +756,8 @@ if (! $sall) $sql.= ' f.datef, f.date_lim_reglement,'; $sql.= ' f.paye, f.fk_statut,'; $sql.= ' f.datec, f.tms,'; - $sql.= ' s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.code_client, s.client'; + $sql.= ' s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.code_client, s.client, typent.code'; + $sql.= ' ,state.code_departement, state.nom'; } else { From 93417a08b34997985bc7c3fdeec6d7daa02ff908 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Fri, 17 Jun 2016 13:49:44 +0200 Subject: [PATCH 14/25] FIX : Add comment because accoutancy cannot work with PgSQL --- htdocs/accountancy/customer/index.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 64825d62cbb..d5f913ae0dd 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -184,6 +184,8 @@ print '' . $langs->trans("NovemberMin") . ''; print '' . $langs->trans("DecemberMin") . ''; print '' . $langs->trans("Total") . ''; + +//TODO : Cannot work with PGSQL !, Change that with php treatment rather than big SQL query $sql = "SELECT IF(aa.account_number IS NULL, 'Non pointe', aa.account_number) AS 'code comptable',"; $sql .= " IF(aa.label IS NULL, 'Non pointe', aa.label) AS 'Intitulé',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=1,fd.total_ht,0)),2) AS 'Janvier',"; From 388cd202aad3cd84ed000d22557066082881d5b1 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Fri, 17 Jun 2016 14:19:54 +0200 Subject: [PATCH 15/25] international comment for code --- htdocs/don/admin/donation.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index d699a9fc7a6..b6043539c0d 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -1,7 +1,7 @@ * Copyright (C) 2012-2015 Juanjo Menent - * Copyright (C) 2013-2015 Philippe Grand + * Copyright (C) 2013-2016 Philippe Grand * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2015 Benoit Bruchard * @@ -90,12 +90,12 @@ else if ($action == 'setdoc') { if (dolibarr_set_const($db, "DON_ADDON_MODEL",$value,'chaine',0,'',$conf->entity)) { - // La constante qui a ete lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage coherent + // The constant that was read before the new set + // So we go through a variable for a coherent display $conf->global->DON_ADDON_MODEL = $value; } - // On active le modele + // It enables the model $ret = delDocumentModel($value, $type); if ($ret > 0) { @@ -321,7 +321,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) print '
'; print load_fiche_titre($langs->trans("DonationsModels")); -// Defini tableau def de modele +// Defined the template definition table $type='donation'; $def = array(); $sql = "SELECT nom"; @@ -408,7 +408,7 @@ if (is_resource($handle)) print ""; } - // Defaut + // Default if ($conf->global->DON_ADDON_MODEL == "$name") { print ""; From 243a30e5de961ee8e064d6526600a2ad4ebcd3d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Jun 2016 15:51:09 +0200 Subject: [PATCH 16/25] Code comment --- htdocs/core/lib/functions.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index fe9b16e7e65..88bdd5aa3b6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4871,6 +4871,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb if (block) { $.dolEventValid("","'.dol_escape_js($out).'"); } else { + /* jnotify(message, preset of message type, keepmessage) */ $.jnotify("'.dol_escape_js($out).'", "'.($style=="ok" ? 3000 : $style).'", '.($style=="ok" ? "false" : "true").', From 34c741bf0d086193fdf282828f04806c1b82a55e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Jun 2016 16:28:16 +0200 Subject: [PATCH 17/25] FIX CSS and responsive behaviour (feature with a menu hider is on on smarpthone) --- htdocs/core/class/html.formfile.class.php | 2 +- htdocs/core/menus/standard/empty.php | 4 +-- .../tpl/document_actions_post_headers.tpl.php | 2 +- htdocs/ecm/index.php | 2 +- htdocs/ecm/index_auto.php | 2 +- htdocs/main.inc.php | 9 ++--- htdocs/theme/eldy/style.css.php | 33 ++++++++++++------- 7 files changed, 32 insertions(+), 22 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 40275c5c794..00790ebc9fd 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1267,7 +1267,7 @@ class FormFile print ''; print ''; print ''; - print $langs->trans('Link') . ': '; + print $langs->trans('Link') . ': '; print ''; print ''; print $langs->trans('Label') . ': '; diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index 0002aabaf21..633f0cae238 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -170,11 +170,11 @@ class MenuManager $lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined if (($alt%2==0)) { - print '
'."\n"; + print '
'."\n"; } else { - print '
'."\n"; + print '
'."\n"; } } diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php index a983bf7f36e..35d1299fd8f 100644 --- a/htdocs/core/tpl/document_actions_post_headers.tpl.php +++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php @@ -65,7 +65,7 @@ $formfile->form_attach_new_file( 0, 0, $permission, - 50, + $conf->browser->layout == 'phone' ? 40 : 60, $object, '', 1, diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 797e759fb13..896db6f0b85 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -371,7 +371,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":" , north__paneSelector: \"#ecm-layout-north\" , west__paneSelector: \"#ecm-layout-west\" , resizable: true - , north__size: 32 + , north__size: 36 , north__resizable: false , north__closable: false , west__size: 340 diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 76ce04235e4..c6944065b3a 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -373,7 +373,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":" , north__paneSelector: \"#ecm-layout-north\" , west__paneSelector: \"#ecm-layout-west\" , resizable: true - , north__size: 32 + , north__size: 36 , north__resizable: false , north__closable: false , west__size: 340 diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 839c4fdd3b0..5e919498a9b 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -207,7 +207,7 @@ if (ini_get('register_globals')) // To solve bug in using $_SESSION } // Init the 5 global objects -// This include will set: $conf, $db, $langs, $user, $mysoc objects +// This include will make the new and set properties for: $conf, $db, $langs, $user, $mysoc objects require_once 'master.inc.php'; // Activate end of page function @@ -221,11 +221,12 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) $conf->browser->os=$tmp['browseros']; $conf->browser->version=$tmp['browserversion']; $conf->browser->layout=$tmp['layout']; // 'classic', 'phone', 'tablet' - $conf->browser->phone=$tmp['phone']; // deprecated, use layout - $conf->browser->tablet=$tmp['tablet']; // deprecated, use layout + $conf->browser->phone=$tmp['phone']; // TODO deprecated, use ->layout + $conf->browser->tablet=$tmp['tablet']; // TODO deprecated, use ->layout //var_dump($conf->browser); -} + if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1; +} // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url) // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off' diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b10bc03e49b..4a24f2d3dad 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -958,7 +958,6 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { font-weight: normal; padding: 0px 5px 0px 3px; white-space: nowrap; - /* text-shadow: 1px 1px 1px #000000; */ color: #; text-decoration: none; } @@ -1002,13 +1001,16 @@ li.tmenu, li.tmenusel { margin: 0 0 0 0; font-weight: normal; } +li.menuhider:hover { + background-image: none !important; +} li.tmenusel, li.tmenu:hover { - background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%) !important; - background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important; - background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important; - background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%) !important; - background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%) !important; - background: rgb(); + background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%); + background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%); + background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%); + background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%); + background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%); + /* background: rgb(); */ } .tmenuend .tmenuleft { width: 0px; } .tmenuend { display: none; } @@ -1038,6 +1040,13 @@ div.tmenucenter height: px; width: 100%; + /* + max-width: px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: #; + */ } #menu_titre_logo { padding-top: 0; @@ -4310,7 +4319,7 @@ img.demothumb { /* nboftopmenuentries = , fontsize= */ /* rule to reduce top menu - 1st reduction */ -@media only screen and (max-width: px) +@media only screen and (max-width: px) { div.tmenucenter { max-width: px; /* size of viewport */ @@ -4329,7 +4338,7 @@ img.demothumb { } li.tmenu, li.tmenusel { - min-width: 32px; + min-width: 36px; } div.mainmenu { min-width: auto; @@ -4339,7 +4348,7 @@ img.demothumb { } } /* rule to reduce top menu - 2nd reduction */ -@media only screen and (max-width: px) +@media only screen and (max-width: px) { div.mainmenu { height: 23px; @@ -4358,7 +4367,7 @@ img.demothumb { } } /* rule to reduce top menu - 3rd reduction */ -@media only screen and (max-width: 605px) +@media only screen and (max-width: 660px) { /* Reduce login top right info */ .usertextatoplogin { @@ -4385,7 +4394,7 @@ img.demothumb { } li.tmenu, li.tmenusel { - min-width: 30px; + min-width: 32px; } div.mainmenu { height: 23px; From 33dc2d5ec399014d272748f0bb57fa248b4942ff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Jun 2016 19:29:58 +0200 Subject: [PATCH 18/25] Sync lang --- htdocs/langs/fr_FR/website.lang | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 htdocs/langs/fr_FR/website.lang diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang new file mode 100644 index 00000000000..5a213dc099c --- /dev/null +++ b/htdocs/langs/fr_FR/website.lang @@ -0,0 +1,25 @@ +# Dolibarr language file - Source file is en_US - website +Shortname=Code +WebsiteSetupDesc=Créer ici autant d'entrée que de nombre différents de sites web que nécessaire.\nEnsuite, aller dans le menu Sites Web pour les éditer. +DeleteWebsite=Effacer site web +ConfirmDeleteWebsite=Êtes-vous sûr de vouloir supprimer ce site web. Toutes les pages et le contenu seront également supprimés. +WEBSITE_PAGENAME=Nom/alias de la page +WEBSITE_URL=URL du site web +WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe +WEBSITE_CSS_INLINE=Contenu de la feuille de style (CSS) +MediaFiles=Répertoire de médias +EditCss=Modifier la feuille de style (CSS) +EditMenu=Modifier le menu +EditPageMeta=Modifier les métadonnées +EditPageContent=Modifier le contenu +Website=Site web +AddPage=Ajouter une page +Page=Page +PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web n'est pas disponible actuellement. Vous devez créer la première page. +RequestedPageHasNoContentYet=La page demandée : %s est vide ou le fichier .tpm.PHP a été supprimé. Modifiez le contenu de la page pour résoudre ce problème. +PageDeleted=Page%s du site web effacée %s +PageAdded=Page %s du site web ajouté %s +ViewSiteInNewTab=Pré-visualiser le site dans un nouvel onglet +ViewPageInNewTab=Pré-visualiser la page dans un nouvel onglet +SetAsHomePage=Définir comme page d'accueil +RealURL=URL réelle From 4382f2a437dce4e9ffc6349bb1a00ccedebceea5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jun 2016 10:34:42 +0200 Subject: [PATCH 19/25] Clean language files --- dev/translation/sanity_check_en_langfiles.php | 16 +++++++++------- htdocs/compta/bank/search.php | 2 +- htdocs/core/lib/pdf.lib.php | 4 ++-- .../thirdparties_services_expired.modules.php | 4 ++-- htdocs/core/modules/modExpedition.class.php | 2 +- htdocs/langs/en_US/accountancy.lang | 2 -- htdocs/langs/en_US/banks.lang | 2 -- htdocs/langs/en_US/bills.lang | 4 +--- htdocs/langs/en_US/categories.lang | 3 --- htdocs/langs/en_US/companies.lang | 2 -- htdocs/langs/en_US/errors.lang | 1 + htdocs/langs/en_US/exports.lang | 4 ---- htdocs/langs/en_US/help.lang | 1 - htdocs/langs/en_US/loan.lang | 2 +- htdocs/langs/en_US/main.lang | 9 +++++++-- htdocs/langs/en_US/margins.lang | 2 -- htdocs/langs/en_US/multicurrency.lang | 3 --- htdocs/langs/en_US/orders.lang | 1 - htdocs/langs/en_US/other.lang | 1 - htdocs/langs/en_US/products.lang | 3 --- htdocs/langs/en_US/projects.lang | 2 -- htdocs/langs/en_US/propal.lang | 1 - htdocs/langs/en_US/sendings.lang | 3 --- htdocs/langs/en_US/sms.lang | 3 --- htdocs/langs/en_US/suppliers.lang | 3 --- htdocs/langs/en_US/website.lang | 1 - htdocs/loan/calc.php | 2 +- htdocs/loan/card.php | 8 ++++---- htdocs/loan/document.php | 2 +- htdocs/loan/index.php | 2 +- htdocs/loan/payment/card.php | 2 +- htdocs/loan/payment/payment.php | 4 ++-- htdocs/margin/agentMargins.php | 4 ++-- htdocs/margin/checkMargins.php | 4 ++-- htdocs/margin/customerMargins.php | 4 ++-- htdocs/margin/productMargins.php | 4 ++-- 36 files changed, 43 insertions(+), 74 deletions(-) diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index 5eb92509eb1..cef7405d2d4 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -96,10 +96,11 @@ if ($web) print "
"; // directory containing the php and lang files -$htdocs = $path."/../../htdocs/"; +$htdocs = $path."../../htdocs/"; +$scripts = $path."../../scripts/"; // directory containing the english lang files -$workdir = $htdocs."langs/en_US/"; +$workdir = $htdocs."langs/en_US/"; $files = scandir($workdir); @@ -241,17 +242,18 @@ if ($web) // STEP 2 - Search key not used - -if (! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') +if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true')) { foreach ($langstrings_dist AS $value) { - $search = '\'trans("'.$value.'")\''; - $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'*'; + //$search = '\'trans("'.$value.'")\''; + $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\''; + $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*'; + //print $string."
\n"; exec($string,$output); if (empty($output)) { $unused[$value] = true; - echo $value.'
'; + echo $value."
\n"; } } diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index f0c8a6bcdda..9b1b0c8328f 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -190,7 +190,7 @@ if ($resql) $moreforfilter = ''; $moreforfilter.='
'; - $moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('StartDate') . ' '; + $moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('DateStart') . ' '; $moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1); $moreforfilter .= ' - '; $moreforfilter .= $langs->trans('EndDate') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1); diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index f831de667bd..2a8074f6276 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1948,7 +1948,7 @@ function pdf_getLinkedObjects($object,$outputlangs) $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending"); if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / '; $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref); - //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending"); + //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment"); //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / '; //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs); } @@ -1957,7 +1957,7 @@ function pdf_getLinkedObjects($object,$outputlangs) $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending"); if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : ''); $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref); - //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : ''); + //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : ''); //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs); //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : ''); } diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index 5837329a476..39790959b97 100644 --- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -128,8 +128,8 @@ class mailing_thirdparties_services_expired extends MailingTargets 'lastname' => $obj->name, // For thirdparties, lastname must be name 'firstname' => '', // For thirdparties, firstname is '' 'other' => - ('StartDate='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'. - ('EndDate='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'. + ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'. + ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'. ('Contract='.$obj->fk_contrat).';'. ('ContactLine='.$obj->cdid), 'source_url' => $this->url($obj->id), diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php index 4f7baff0c64..13d72baebc1 100644 --- a/htdocs/core/modules/modExpedition.class.php +++ b/htdocs/core/modules/modExpedition.class.php @@ -236,7 +236,7 @@ class modExpedition extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='Shipments'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("expedition","shipment","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits'); + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateDeliveryPlanned",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits'); if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic'); //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text"); $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text'); diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 993570f4790..65c68a5a93f 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -148,7 +148,6 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = % FicheVentilation=Breakdown card GeneralLedgerIsWritten=Operations are written in the general ledger -MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s ## Admin ApplyMassCategories=Apply mass categories @@ -177,7 +176,6 @@ OptionModeProductBuyDesc=Show all products with no accounting account defined fo ## Dictionary Range=Range of accounting account -Sens=Sens Calculated=Calculated Formula=Formula diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index e4c38a8d549..65f5a02865b 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -163,8 +163,6 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? -StartDate=Start date -EndDate=End date RejectCheck=Check returned ConfirmRejectCheck=Are you sure you want to mark this check as rejected ? RejectCheckDate=Date the check was returned diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index ad5260f8144..cde0a426a1b 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -435,7 +435,7 @@ RevenueStamp=Revenue stamp YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) -PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation +PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. @@ -456,7 +456,6 @@ InvoiceSituationAsk=Invoice following the situation InvoiceSituationDesc=Create a new situation following an already existing one SituationAmount=Situation invoice amount(net) SituationDeduction=Situation subtraction -Progress=Progress ModifyAllLines=Modify all lines CreateNextSituationInvoice=Create next situation NotLastInCycle=This invoice is not the latest in cycle and must not be modified. @@ -468,7 +467,6 @@ InvoiceSituationLast=Final and general invoice PDFCrevetteSituationNumber=Situation N°%s PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT PDFCrevetteSituationInvoiceTitle=Situation invoice -PDFCrevetteDescription=Invoice PDF template Crevette. A invoice template if you use situation invoice PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s TotalSituationInvoice=Total situation invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 4a569316425..a3cfb6828a1 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -55,7 +55,6 @@ SupplierHasNoCategory=This supplier is not in any tags/categories CompanyHasNoCategory=This thirdparty is not in any tags/categories MemberHasNoCategory=This member is not in any tags/categories ContactHasNoCategory=This contact is not in any tags/categories -ContactHasNoCategory=This contact is not in any tags/categories AccountHasNoCategory=This account is not in any tags/categories ClassifyInCategory=Add to tag/category NoneCategory=None @@ -106,8 +105,6 @@ CatCusLinks=Links between customers/prospects and tags/categories CatProdLinks=Links between products/services and tags/categories CatMemberLinks=Links between members and tags/categories DeleteFromCat=Remove from tags/category -DeletePicture=Picture delete -ConfirmDeletePicture=Confirm picture deletion? ExtraFieldsCategories=Complementary attributes CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 83c49532e41..bd57c1226dd 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -380,8 +380,6 @@ ChangeContactInProcess=Change status to 'Contact in process' ChangeContactDone=Change status to 'Contact done' ProspectsByStatus=Prospects by status BillingContact=Billing contact -NbOfAttachedFiles=Number of attached files -AttachANewFile=Attach a new file NoRIB=No BAN defined NoParentCompany=None ExportImport=Import-Export diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index aeb43525336..3fe2f9b5852 100755 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -175,6 +175,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In ErrorSavingChanges=An error has ocurred when saving the changes ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship ErrorFileMustHaveFormat=File must have format %s +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. # Warnings WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user. diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index b51d70d5fbb..0b6a699224b 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -120,10 +120,6 @@ CsvOptions=Csv Options Separator=Separator Enclosure=Enclosure SuppliersProducts=Suppliers Products -BankCode=Bank code -DeskCode=Desk code -BankAccountNumber=Account number -BankAccountNumberKey=Key SpecialCode=Special code ExportStringFilter=%% allows replacing one or more characters in the text ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang index 29c9bec34f0..a4c11246461 100644 --- a/htdocs/langs/en_US/help.lang +++ b/htdocs/langs/en_US/help.lang @@ -4,7 +4,6 @@ EMailSupport=Emails support RemoteControlSupport=Online real time / remote support OtherSupport=Other support ToSeeListOfAvailableRessources=To contact/see available resources: -ClickHere=Click here HelpCenter=Help center DolibarrHelpCenter=Dolibarr help and support center ToGoBackToDolibarr=Otherwise, click here to use Dolibarr diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 35060e134dc..4ca8c615e5a 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -5,7 +5,7 @@ NewLoan=New Loan ShowLoan=Show Loan PaymentLoan=Loan payment ShowLoanPayment=Show Loan Payment -Capital=Capital +LoanCapital=Capital Insurance=Insurance Interest=Interest Nbterms=Number of terms diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 1ee858aa23d..750e02fa11c 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -236,8 +236,8 @@ Date=Date DateAndHour=Date and hour DateToday=Today's date DateReference=Reference date -DateStart=Date start -DateEnd=Date end +DateStart=Start date +DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date DateModification=Modification date @@ -471,6 +471,8 @@ LateDesc=Delay to define if a record is late or not depends on your setup. Ask y Photo=Picture Photos=Pictures AddPhoto=Add picture +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? Login=Login CurrentLogin=Current login January=January @@ -751,6 +753,9 @@ MassFilesArea=Area for files built by mass actions HideTempMassFilesArea=Hide area of files built by mass actions ShowTempMassFilesArea=Show area of files built by mass actions RelatedObjects=Related Objects +ClassifyBilled=Classify billed +Progress=Progress +ClickHere=Click here # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index 43ba02178e6..32e6abf355e 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -20,8 +20,6 @@ UserMargins=User margins ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service -StartDate=Start date -EndDate=End date Launch=Start ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default. diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang index b37355372a1..b75942ebb44 100644 --- a/htdocs/langs/en_US/multicurrency.lang +++ b/htdocs/langs/en_US/multicurrency.lang @@ -1,6 +1,4 @@ # ADMIN -RecordSaved=Currency rate added -RecordDeleted=Currency rate deleted ErrorAddRateFail=Error in added rate ErrorAddCurrencyFail=Error in added currency ErrorDeleteCurrencyFail=Error delete fail @@ -13,5 +11,4 @@ multicurrency_appCurrencySource=Currency source multicurrency_alternateCurrencySource= Alternate currency souce CurrenciesUsed=Currencies used CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you proposals, orders, etc. -Rate=Rate rate=rate \ No newline at end of file diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 85838a8fce1..b7ed77b30ba 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -109,7 +109,6 @@ ConfirmCancelOrder=Are you sure you want to cancel this order ? ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? GenerateBill=Generate invoice ClassifyShipped=Classify delivered -ClassifyBilled=Classify billed ComptaCard=Accountancy card DraftOrders=Draft orders DraftSuppliersOrders=Draft suppliers orders diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 3afebc9141b..66f734f3c1c 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -191,7 +191,6 @@ ImageEditor=Image editor YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s. YouReceiveMailBecauseOfNotification2=This event is the following: ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start". -ClickHere=Click here UseAdvancedPerms=Use the advanced permissions of some modules FileFormat=File format SelectAColor=Choose a color diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 3dd12b2bb41..c0509e6a902 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -107,7 +107,6 @@ BuyingPrice=Buying price PriceForEachProduct=Products with specific prices NoPriceSpecificToCustomer=This customer has no specific prices. All standard prices for products/services will be used. SupplierCard=Supplier card -CommercialCard=Commercial card AllWays=Path to find your product in stock NoCat=Your product is not in any category PrimaryWay=Primary path @@ -142,8 +141,6 @@ ErrorAssociationIsFatherOfThis=One of selected product is parent with current pr DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? ProductDeleted=Product/Service "%s" deleted from database. -DeletePicture=Delete a picture -ConfirmDeletePicture=Are you sure you want to delete this picture ? ExportDataset_produit_1=Products ExportDataset_service_1=Services ImportDataset_produit_1=Products diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index a9fd3b993e4..6d1c8e4e3cb 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -20,7 +20,6 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it. OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it. -ProjectsArea=Projects area NewProject=New project AddProject=Create project DeleteAProject=Delete a project @@ -70,7 +69,6 @@ MyActivities=My tasks/activities MyProjects=My projects MyProjectsArea=My projects Area DurationEffective=Effective duration -Progress=Progress ProgressDeclared=Declared progress ProgressCalculated=Calculated progress Time=Time diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index cc06aeff937..943cde76835 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -65,7 +65,6 @@ DateEndPropalShort=Date end ValidityDuration=Validity duration CloseAs=Set status to SetAcceptedRefused=Set accepted/refused -ClassifyBilled=Classify billed BuildBill=Build invoice ErrorPropalNotFound=Propal %s not found Estimate=Estimate : diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index c35aa71c8a1..270c92b3045 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -20,14 +20,11 @@ SendingCard=Shipment card NewSending=New shipment CreateASending=Create a shipment CreateSending=Create shipment -QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order -DateSending=Shipping date -DateSendingShort=Shipping date SendingsForSameOrder=Shipments for this order SendingsAndReceivingForSameOrder=Shipments and receivings for this order SendingsToValidate=Shipments to validate diff --git a/htdocs/langs/en_US/sms.lang b/htdocs/langs/en_US/sms.lang index 70066caac96..2b41de470d2 100644 --- a/htdocs/langs/en_US/sms.lang +++ b/htdocs/langs/en_US/sms.lang @@ -39,9 +39,6 @@ SmsSuccessfulySent=Sms correctly sent (from %s to %s) ErrorSmsRecipientIsEmpty=Number of target is empty WarningNoSmsAdded=No new phone number to add to target list ConfirmValidSms=Do you confirm validation of this campain ? -ConfirmResetMailing=Warning, if you make a reinit of Sms campain %s, you will allow to make a mass sending of it a second time. Is it really what you wan to do ? -ConfirmDeleteMailing=Do you confirm removing of campain ? -NbOfRecipients=Number of targets NbOfUniqueSms=Nb dof unique phone numbers NbOfSms=Nbre of phon numbers ThisIsATestMessage=This is a test message diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index f64d7c2de1b..8c96a0a68e8 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -9,7 +9,6 @@ History=History ListOfSuppliers=List of suppliers ShowSupplier=Show supplier OrderDate=Order date -BuyingPrice=Buying price BuyingPriceMin=Minimum purchase price BuyingPriceMinShort=Min purchase price SellingPriceMinShort=Min sell price @@ -19,8 +18,6 @@ TotalSellingPriceMinShort=Total of subproducts sell prices SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Add supplier price ChangeSupplierPrice=Change supplier price -ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier -ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s NoRecordedSuppliers=No suppliers recorded diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 9ce7cfb09a3..d43b65fc0f8 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -14,7 +14,6 @@ EditPageMeta=Edit Meta EditPageContent=Edit Content Website=Web site AddPage=Add page -Page=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first add a page. RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this. PageDeleted=Page '%s' of website %s deleted diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php index 0a384c1c859..b6e649962fa 100644 --- a/htdocs/loan/calc.php +++ b/htdocs/loan/calc.php @@ -327,7 +327,7 @@ if ($form_complete && $show_progress) { $legend = ''; $legend.= '' . $langs->trans("Month") . ''; $legend.= '' . $langs->trans("Interest") . ''; - $legend.= '' . $langs->trans("Capital") . ''; + $legend.= '' . $langs->trans("LoanCapital") . ''; $legend.= '' . $langs->trans("Position") . ''; $legend.= ''; diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 31de81d8b9b..63b62a3d156 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -101,7 +101,7 @@ if ($action == 'add' && $user->rights->loan->write) } elseif (! $_POST["capital"]) { - setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Capital")), null, 'errors'); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors'); $action = 'create'; } else @@ -220,7 +220,7 @@ if ($action == 'create') } // Capital - print ''.$langs->trans("Capital").''; + print ''.$langs->trans("LoanCapital").''; // Date Start print ""; @@ -365,7 +365,7 @@ if ($id > 0) } // Capital - print ''.$langs->trans("Capital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; + print ''.$langs->trans("LoanCapital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; // Date start print "".$langs->trans("DateStart").""; @@ -490,7 +490,7 @@ if ($id > 0) print ''.$langs->trans("Type").''; print ''.$langs->trans("Insurance").''; print ''.$langs->trans("Interest").''; - print ''.$langs->trans("Capital").''; + print ''.$langs->trans("LoanCapital").''; print ' '; print ''; diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index 362aa84843c..7463da4a190 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -116,7 +116,7 @@ if ($object->id) } // Amount - print ''.$langs->trans("Capital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; + print ''.$langs->trans("LoanCapital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; // Date start print "".$langs->trans("DateStart").""; diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index abf4e9470c1..b0c65b90cbf 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -125,7 +125,7 @@ if ($resql) print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("LoanCapital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre(''); diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index 6315264bad7..9c1e938c3ed 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -163,7 +163,7 @@ print ''.$langs->trans('Mode').''.$lan print ''.$langs->trans('Number').''.$payment->num_payment.''; // Amount -print ''.$langs->trans('Capital').''.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).''; +print ''.$langs->trans('LoanCapital').''.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).''; print ''.$langs->trans('Insurance').''.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).''; print ''.$langs->trans('Interest').''.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).''; diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index e735480e414..91c71e95e5a 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -239,7 +239,7 @@ if ($action == 'create') print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -268,7 +268,7 @@ if ($action == 'create') print ''; +print ''; print ''; -print ''; +print ''; print ''; diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index 79d4ceb3794..365c38f565a 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -124,11 +124,11 @@ print ''; print '
'.$langs->trans("DateDue").''.$langs->trans("Capital").''.$langs->trans("LoanCapital").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").''.$langs->trans("Amount").''; if ($sumpaid < $loan->capital) { - print $langs->trans("Capital") .': '; + print $langs->trans("LoanCapital") .': '; } else { diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index fe429f7c145..3b31cee302b 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -99,11 +99,11 @@ if ($user->rights->margins->read->all) { } // Start date -print ''.$langs->trans('StartDate').' ('.$langs->trans("DateValidation").')'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')'; $form->select_date($startdate,'startdate','','',1,"sel",1,1); print ''.$langs->trans('EndDate').' ('.$langs->trans("DateValidation").')'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')'; $form->select_date($enddate,'enddate','','',1,"sel",1,1); print '
'; // Start date -print ''; +print ''; print ''; -print ''; +print ''; print ''; diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 9977354e67a..83e173ca0ce 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -120,11 +120,11 @@ if (! $sortfield) } // Start date -print ''; +print ''; print ''; -print ''; +print ''; print ''; diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index 789932320e5..d604ed5ed22 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -122,11 +122,11 @@ else { } // Start date -print ''; +print ''; print ''; -print ''; +print ''; print ''; From cbdb9f9b2ab70e3ec700422097f319b550e71cc6 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Sat, 18 Jun 2016 11:52:41 +0200 Subject: [PATCH 20/25] internationalization of code comment --- htdocs/adherents/card.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index bec4156dbe0..07faaf92696 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Marcos García - * Copyright (C) 2012-2015 Philippe Grand + * Copyright (C) 2012-2016 Philippe Grand * Copyright (C) 2015 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify @@ -94,7 +94,7 @@ if ($rowid > 0) // Define variables to know what current user can do on properties of user linked to edited member if ($object->user_id) { - // $user est le user qui edite, $object->user_id est l'id de l'utilisateur lies au membre edite + // $ User is the user who edits, $ object->user_id is the id of the related user in the edited member $caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer) || (($user->id != $object->user_id) && $user->rights->user->user->creer)); $caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password) @@ -209,7 +209,7 @@ if (empty($reshook)) { if ($result > 0) { - // Creation user + // User creation $company = new Societe($db); $result=$company->create_from_member($object,GETPOST('companyname')); @@ -495,7 +495,7 @@ if (empty($reshook)) $error++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors'); } - // Test si le login existe deja + // Tests if the login already exists if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { if (empty($login)) { @@ -550,11 +550,11 @@ if (empty($reshook)) { $db->begin(); - // Email a peu pres correct et le login n'existe pas + // Email about right and login does not exist $result=$object->create($user); if ($result > 0) { - // Categories association + // Fundation categories $memcats = GETPOST('memcats', 'array'); $object->setCategories($memcats); @@ -615,7 +615,7 @@ if (empty($reshook)) if ($result >= 0 && ! count($object->errors)) { - // Send confirmation Email (selon param du type adherent sinon generique) + // Send confirmation email (according to parameters of member type. Otherwise generic) if ($object->email && GETPOST("send_mail")) { $result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2); @@ -1379,7 +1379,7 @@ else $helpcontent.=dol_htmlentitiesbr($texttosend)."\n"; $label=$form->textwithpicto($tmp,$helpcontent,1,'help'); - // Cree un tableau formulaire + // Create an array $formquestion=array(); if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false')); if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])); From d192438eae09757da028d37ad54ddacbcd94cfb7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jun 2016 11:57:52 +0200 Subject: [PATCH 21/25] Enhance tool to clean language files --- dev/translation/sanity_check_en_langfiles.php | 57 +++++++++++++++---- htdocs/langs/en_US/accountancy.lang | 24 -------- htdocs/langs/en_US/admin.lang | 5 -- 3 files changed, 47 insertions(+), 39 deletions(-) diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index cef7405d2d4..cd59ceafb3b 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -110,8 +110,11 @@ if (empty($files)) exit; } +$dups=array(); $exludefiles = array('.','..','README'); $files = array_diff($files,$exludefiles); +// To force a file: $files=array('myfile.lang'); +$files = array('admin.lang'); $langstrings_3d = array(); $langstrings_full = array(); foreach ($files AS $file) { @@ -128,7 +131,7 @@ foreach ($files AS $file) { $langstrings_3d[$path_file['basename']][$line+1]=$row_array[0]; $langstrings_3dtrans[$path_file['basename']][$line+1]=$row_array[1]; $langstrings_full[]=$row_array[0]; - $langstrings_dist[$row_array[0]]=$row_array[0]; + $langstrings_dist[$row_array[0]]=$row; } } } @@ -244,7 +247,10 @@ if ($web) if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true')) { - foreach ($langstrings_dist AS $value) + print "***** Strings in en_US that are never used:\n"; + + $unused=array(); + foreach ($langstrings_dist AS $value => $line) { //$search = '\'trans("'.$value.'")\''; $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\''; @@ -252,17 +258,48 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a //print $string."
\n"; exec($string,$output); if (empty($output)) { - $unused[$value] = true; - echo $value."
\n"; + $qualifiedforclean=1; + // Check if we must keep this key to be into file for removal + if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0; + if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0; + if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0; + if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0; + if (preg_match('/^Country/', $value)) $qualifiedforclean=0; + if (preg_match('/^Civility/', $value)) $qualifiedforclean=0; + if (preg_match('/^Currency/', $value)) $qualifiedforclean=0; + if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0; + if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0; + if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; + if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0; + if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0; + if (preg_match('/^Month/', $value)) $qualifiedforclean=0; + if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; + if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; + + if ($qualifiedforclean) + { + $unused[$value] = $line; + echo $line; // $trad contains the \n + } + } + else + { + unset($output); + //print 'X'.$output.'Y'; } } - if ($web) print "

\n"; - print "Strings in en_US that are never used\n"; - if ($web) print "

\n"; - if ($web) echo "
";
-	print_r($unused);
-	if ($web) echo "
\n"; + if (empty($unused)) print "No string not used found.\n"; + else + { + $filetosave='/tmp/notused.lang'; + print "Strings in en_US that are never used are saved into file ".$filetosave.":\n"; + file_put_contents($filetosave, join("",$unused)); + } } echo "\n"; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 65c68a5a93f..10e92ee4735 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -9,18 +9,11 @@ ACCOUNTING_EXPORT_DEVISE=Export currency Selectformat=Select the format for the file ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name -Accounting=Accounting -Globalparameters=Global parameters -Menuaccount=Accounting accounts -Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools - ConfigAccountingExpert=Configuration of the module accounting expert Journaux=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts -Definechartofaccounts=Define a chart of accounts Selectchartofaccounts=Select a chart of accounts Addanaccount=Add an accounting account AccountAccounting=Accounting account @@ -31,29 +24,21 @@ Ventilation=Breakdown MenuAccountancy=Accountancy CustomersVentilation=Breakdown customers SuppliersVentilation=Breakdown suppliers -TradeMargin=Trade margin Reports=Reports -ByCustomerInvoice=By invoices customers NewAccount=New accounting account Create=Create CreateMvts=Create movement -UpdateAccount=Modification of an accounting account UpdateMvts=Modification of a movement WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalance=Account balance -AccountingVentilation=Breakdown accounting -AccountingVentilationSupplier=Breakdown accounting supplier -AccountingVentilationCustomer=Breakdown accounting customer - CAHTF=Total purchase supplier before tax InvoiceLines=Lines of invoice to be ventilated InvoiceLinesDone=Ventilated lines of invoice IntoAccount=Ventilate in the accounting account Ventilate=Ventilate -VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -63,14 +48,10 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Column separator in export file - ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50) ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50) ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts @@ -108,9 +89,6 @@ DescPurchasesJournal=Purchases journal FinanceJournal=Finance journal DescFinanceJournal=Finance journal including all the types of payments by bank account -CashPayment=Cash Payment - -SupplierInvoicePayment=Payment of invoice supplier CustomerInvoicePayment=Payment of invoice customer ThirdPartyAccount=Thirdparty account @@ -125,7 +103,6 @@ DescThirdPartyReport=Consult here the list of the thirdparty customers and the s ListAccounts=List of the accounting accounts -Pcgversion=Version of the plan Pcgtype=Class of account Pcgsubtype=Under class of account Accountparent=Root of the account @@ -138,7 +115,6 @@ DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounti ChangeAccount=Change the accounting account for lines selected by the account: Vide=- DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account ValidateHistory=Validate Automatically diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index d0a745ab491..2574422be18 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -26,18 +26,15 @@ YourSession=Your session Sessions=Users session WebUserGroup=Web server user/group NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). -HTMLCharset=Charset for generated HTML pages DBStoringCharset=Database charset to store data DBSortingCharset=Database charset to sort data WarningModuleNotActive=Module %s must be enabled WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. DolibarrSetup=Dolibarr install or upgrade -DolibarrUser=Dolibarr user InternalUser=Internal user ExternalUser=External user InternalUsers=Internal users ExternalUsers=External users -GlobalSetup=Global setup GUISetup=Display SetupArea=Setup area FormToTestFileUploadForm=Form to test file upload (according to setup) @@ -56,9 +53,7 @@ Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) -ConfirmAjax=Use Ajax confirmation popups UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). From de76f2a9aa152bb66d19845b49fbea7d40f873d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jun 2016 15:36:19 +0200 Subject: [PATCH 22/25] Clean language files --- dev/translation/sanity_check_en_langfiles.php | 11 +- htdocs/admin/stock.php | 4 +- htdocs/langs/en_US/admin.lang | 162 ------------------ htdocs/langs/en_US/agenda.lang | 18 -- htdocs/langs/en_US/banks.lang | 28 --- 5 files changed, 11 insertions(+), 212 deletions(-) mode change 100755 => 100644 htdocs/langs/en_US/admin.lang diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index cd59ceafb3b..ea27b2ffc3b 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -85,7 +85,7 @@ if ($web) echo ""; } -echo "If you call this file with the argument \"?unused=true\" it searches for the translation strings that exist in en_US but are never used.\n"; +echo "If you call this with argument \"unused=true\" it searches for the translation strings that exist in en_US but are never used.\n"; if ($web) print "
"; echo "IMPORTANT: that can take quite a lot of time (up to 10 minutes), you need to tune the max_execution_time on your php.ini accordingly.\n"; if ($web) print "
"; @@ -114,7 +114,10 @@ $dups=array(); $exludefiles = array('.','..','README'); $files = array_diff($files,$exludefiles); // To force a file: $files=array('myfile.lang'); -$files = array('admin.lang'); +if (isset($argv[2])) +{ + $files = array($argv[2]); +} $langstrings_3d = array(); $langstrings_full = array(); foreach ($files AS $file) { @@ -279,6 +282,7 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a if (preg_match('/^Month/', $value)) $qualifiedforclean=0; if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; + if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; if ($qualifiedforclean) { @@ -299,6 +303,9 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a $filetosave='/tmp/notused.lang'; print "Strings in en_US that are never used are saved into file ".$filetosave.":\n"; file_put_contents($filetosave, join("",$unused)); + print "To remove from original file, run command :\n"; + if (($argv[2]?$argv[2]:"")) print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; "; + print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:"")."\n"; } } diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 4e9957fe48d..b78bf1ce0bd 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -313,13 +313,13 @@ $found++; { $var=!$var; print ""; - print ''; + print ''; print "\n"; }*/ print '
' . $langs->trans('StartDate') . ' (' . $langs->trans("DateValidation") . ')' . $langs->trans('DateStrt') . ' (' . $langs->trans("DateValidation") . ')'; $form->select_date($startdate, 'startdate', '', '', 1, "sel", 1, 1); print '' . $langs->trans('EndDate') . ' (' . $langs->trans("DateValidation") . ')' . $langs->trans('DateEnd') . ' (' . $langs->trans("DateValidation") . ')'; $form->select_date($enddate, 'enddate', '', '', 1, "sel", 1, 1); print ''.$langs->trans('StartDate').' ('.$langs->trans("DateValidation").')'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')'; $form->select_date($startdate,'startdate','','',1,"sel",1,1); print ''.$langs->trans('EndDate').' ('.$langs->trans("DateValidation").')'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')'; $form->select_date($enddate,'enddate','','',1,"sel",1,1); print ''.$langs->trans('StartDate').' ('.$langs->trans("DateValidation").')'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')'; $form->select_date($startdate,'startdate','','',1,"sel",1,1); print ''.$langs->trans('EndDate').' ('.$langs->trans("DateValidation").')'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')'; $form->select_date($enddate,'enddate','','',1,"sel",1,1); print '
'.$langs->trans("NoModueToManageStockIncrease").''.$langs->trans("NoModuleToManageStockIncrease").'
'; -// Optio to force stock to be enough before adding a line into document +// Option to force stock to be enough before adding a line into document if ($conf->invoice->enabled || $conf->order->enabled || $conf->expedition->enabled) { print '
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang old mode 100755 new mode 100644 index 2574422be18..f7e85f80d44 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -54,18 +54,13 @@ ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is re ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) -SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s -ViewFullDateActions=Show full dates events in the third sheet NotAvailableWhenAjaxDisabled=Not available when Ajax disabled AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty JavascriptDisabled=JavaScript disabled -UsePopupCalendar=Use popup for dates input UsePreviewTabs=Use preview tabs ShowPreview=Show preview PreviewNotAvailable=Preview not available @@ -87,23 +82,19 @@ MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to %sExample for ClamAv: /usr/bin/clamscan AntiVirusParam= More parameters on command line AntiVirusParamExample= Example for ClamWin: --database="C:\Program Files (x86)\ClamWin\lib" ComptaSetup=Accounting module setup UserSetup=User management setup -MenuSetup=Menu management setup MultiCurrencySetup=Multi-currency setup MenuLimits=Limits and accuracy MenuIdParent=Parent menu ID DetailMenuIdParent=ID of parent menu (empty for a top menu) DetailPosition=Sort number to define menu position -PersonalizedMenusNotSupported=Personalized menus not supported AllMenus=All NotConfigured=Module not configured -Activation=Activation Active=Active SetupShort=Setup OtherOptions=Other options @@ -114,27 +105,16 @@ Destination=Destination IdModule=Module ID IdPermissions=Permissions ID Modules=Modules -ModulesCommon=Main modules -ModulesOther=Other modules -ModulesInterfaces=Interfaces modules -ModulesSpecial=Modules very specific -ParameterInDolibarr=Parameter %s -LanguageParameter=Language parameter %s LanguageBrowserParameter=Parameter %s LocalisationDolibarrParameters=Localisation parameters ClientTZ=Client Time Zone (user) ClientHour=Client time (user) OSTZ=Server OS Time Zone PHPTZ=PHP server Time Zone -PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) -ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) DaylingSavingTime=Daylight saving time CurrentHour=PHP Time (server) -CompanyTZ=Company Time Zone (main company) -CompanyHour=Company Time (main company) CurrentSessionTimeOut=Current session timeout YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" -OSEnv=OS Environment Box=Widget Boxes=Widgets MaxNbOfLinesForBoxes=Max number of lines for widgets @@ -159,13 +139,10 @@ PurgeNothingToDelete=No directory or files to delete. PurgeNDirectoriesDeleted=%s files or directories deleted. PurgeAuditEvents=Purge all security events ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. -NewBackup=New backup GenerateBackup=Generate backup Backup=Backup Restore=Restore RunCommandSummary=Backup has been launched with the following command -RunCommandSummaryToLaunch=Backup can be launched with the following command -WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands BackupResult=Backup result BackupFileSuccessfullyCreated=Backup file successfully generated YouCanDownloadBackupFile=Generated files can now be downloaded @@ -203,9 +180,6 @@ Rights=Permissions BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. OnlyActiveElementsAreShown=Only elements from enabled modules are shown. ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. -ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. -ModulesSpecialDesc=Special modules are very specific or seldom used modules. -ModulesJobDesc=Business modules provide simple preconfigured setup of Dolibarr for specific businesses. ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules @@ -217,8 +191,6 @@ BoxesActivated=Widgets activated ActivateOn=Activate on ActiveOn=Activated on SourceFile=Source file -AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled -AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Required UsedOnlyWithTypeOption=Used by some agenda option only @@ -232,9 +204,7 @@ ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recom ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). Feature=Feature DolibarrLicense=License -DolibarrProjectLeader=Project leader Developpers=Developers/contributors -OtherDeveloppers=Other developers/contributors OfficialWebSite=Dolibarr international official web site OfficialWebSiteLocal=Local web site (%s) OfficialWiki=Dolibarr documentation on Wiki @@ -247,10 +217,7 @@ ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
t ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. HelpCenterDesc2=Some part of this service are available in english only. -CurrentTopMenuHandler=Current top menu handler -CurrentLeftMenuHandler=Current left menu handler CurrentMenuHandler=Current menu handler -CurrentSmartphoneMenuHandler=Current smartphone menu handler MeasuringUnit=Measuring unit Emails=E-mails EMailsSetup=E-mails setup @@ -262,9 +229,6 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to -MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) MAIN_MAIL_SENDMODE=Method to use to send EMails MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required @@ -275,7 +239,6 @@ MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) MAIN_SMS_SENDMODE=Method to use to send SMS MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. -SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr. SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit your change to www.transifex.com/dolibarr-association/dolibarr/ ModuleSetup=Module setup ModulesSetup=Modules setup @@ -332,8 +295,6 @@ UseACacheDelay= Delay for caching export response in seconds (0 or empty for no DisableLinkToHelpCenter=Hide link "Need help or support" on login page DisableLinkToHelp=Hide link to online help "%s" AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. -ModuleDisabled=Module disabled -ModuleDisabledSoNoEvent=Module disabled so event never created ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). MinLength=Minimum length LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory @@ -417,12 +378,10 @@ EraseAllCurrentBarCode=Erase all current barcode values ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ? AllBarcodeReset=All barcode values have been removed NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. -NoRecordWithoutBarcodeDefined=No record with no barcode value defined. EnableFileCache=Enable file cache ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number). NoDetails=No more details in footer DisplayCompanyInfo=Display company address -DisplayCompanyManager=Display manager names DisplayCompanyInfoAndManagers=Display company and manager names EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible. @@ -846,7 +805,6 @@ DictionaryOpportunityStatus=Opportunity status for project/lead SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list -VATReceivedOnly=Special rate not charged VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. @@ -889,7 +847,6 @@ NbOfDays=Nb of days AtEndOfMonth=At end of month Offset=Offset AlwaysActive=Always active -UpdateRequired=Your system needs to be updated. To do this, click on Update now. Upgrade=Upgrade MenuUpgrade=Upgrade / Extend AddExtensionThemeModuleOrOther=Add extension (theme, module, ...) @@ -899,14 +856,8 @@ DataRootServer=Data files directory IP=IP Port=Port VirtualServerName=Virtual server name -AllParameters=All parameters OS=OS -PhpEnv=Env -PhpModules=Modules -PhpConf=Conf PhpWebLink=Web-Php link -Pear=Pear -PearPackages=Pear Packages Browser=Browser Server=Server Database=Database @@ -915,28 +866,14 @@ DatabaseName=Database name DatabasePort=Database port DatabaseUser=Database user DatabasePassword=Database password -DatabaseConfiguration=Database setup Tables=Tables TableName=Table name -TableLineFormat=Line format NbOfRecord=Nb of records -Constraints=Constraints -ConstraintsType=Constraints type -ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry -AllMustBeOk=All of these must be checked Host=Server DriverType=Driver type SummarySystem=System information summary SummaryConst=List of all Dolibarr setup parameters -SystemUpdate=System update -SystemSuccessfulyUpdate=Your system has been updated successfuly MenuCompanySetup=Company/Foundation -MenuNewUser=New user -MenuTopManager=Top menu manager -MenuLeftManager=Left menu manager -MenuSmartphoneManager=Smartphone menu manager -DefaultMenuTopManager=Top menu manager -DefaultMenuLeftManager=Left menu manager DefaultMenuManager= Standard menu manager DefaultMenuSmartphoneManager=Smartphone menu manager Skin=Skin theme @@ -950,7 +887,6 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu -SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities CompanyName=Name @@ -961,17 +897,12 @@ CompanyCountry=Country CompanyCurrency=Main currency CompanyObject=Object of the company Logo=Logo -DoNotShow=Do not show DoNotSuggestPaymentMode=Do not suggest NoActiveBankAccountDefined=No active bank account defined OwnerOfBankAccount=Owner of bank account %s BankModuleNotActive=Bank accounts module not enabled ShowBugTrackLink=Show link "%s" -ShowWorkBoard=Show "workbench" on homepage Alerts=Alerts -Delays=Delays -DelayBeforeWarning=Delay before warning -DelaysBeforeWarning=Delays before warning DelaysOfToleranceBeforeWarning=Tolerance delays before warning DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element. Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet @@ -994,7 +925,6 @@ SetupDescription2=The two most important setup steps are the first two in the se SetupDescription3=Parameters in menu Setup -> Company/foundation are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example). SetupDescription4=Parameters in menu Setup -> Modules are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable. SetupDescription5=Other menu entries manage optional parameters. -EventsSetup=Setup for events logs LogEvents=Security audit events Audit=Audit InfoDolibarr=About Dolibarr @@ -1006,7 +936,6 @@ InfoPHP=About PHP InfoPerf=About Performances BrowserName=Browser name BrowserOS=Browser OS -ListEvents=Audit events ListOfSecurityEvents=List of Dolibarr security events SecurityEventsPurged=Security events purged LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of data in database. @@ -1016,7 +945,6 @@ SystemAreaForAdminOnly=This area is available for administrator users only. None CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page) DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here AvailableModules=Available modules -DeprecatedModules=Deprecated modules ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). SessionTimeOut=Time out for session SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every %s/%s access, but only during access made by other sessions.
Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default session.gc_maxlifetime, no matter what the value entered here. @@ -1029,14 +957,12 @@ TriggerActiveAsModuleActive=Triggers in this file are active as module %s GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password DictionaryDesc=Insert all reference data. You can add your values to the default. ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. -OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu. MiscellaneousDesc=All other security related parameters are defined here. LimitsSetup=Limits/Precision setup LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices MAIN_MAX_DECIMALS_TOT=Max decimals for total prices MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add ... after this number if you want to see ... when number is truncated when shown on screen) -MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files. MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps) UnitPriceOfProduct=Net unit price of a product TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding @@ -1066,7 +992,6 @@ ShowProfIdInAddress=Show professionnal id with addresses on documents ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents TranslationUncomplete=Partial translation SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. -MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled) MAIN_DISABLE_METEO=Disable meteo view TestLoginToAPI=Test login to API ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. @@ -1085,16 +1010,13 @@ ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) ExtraFieldsMemberType=Complementary attributes (member type) -ExtraFieldsCustomerOrders=Complementary attributes (orders) ExtraFieldsCustomerInvoices=Complementary attributes (invoices) ExtraFieldsSupplierOrders=Complementary attributes (orders) ExtraFieldsSupplierInvoices=Complementary attributes (invoices) ExtraFieldsProject=Complementary attributes (projects) ExtraFieldsProjectTask=Complementary attributes (tasks) ExtraFieldHasWrongValue=Attribute %s has a wrong value. -AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space -SendingMailSetup=Setup of sendings by email SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba). PathToDocuments=Path to documents PathDirectory=Directory @@ -1123,7 +1045,6 @@ AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) GetBarCode=Get barcode -EmptyNumRefModelDesc=The code is free. This code can be modified at any time. ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually. @@ -1131,11 +1052,7 @@ PasswordGenerationPerso=Return a password according to your personally defined c SetupPerso=According to your configuration PasswordPatternDesc=Password pattern description ##### Users setup ##### -UserGroupSetup=Users and groups module setup -GeneratePassword=Suggest a generated password RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords -DoNotSuggest=Do not suggest any password -EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page UsersSetup=Users module setup UserMailRequired=EMail required to create a new user @@ -1145,10 +1062,6 @@ HRMSetup=HRM module setup CompanySetup=Companies module setup CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier) AccountCodeManager=Module for accountancy code generation (customer or supplier) -ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by third party supplier code for a supplier accountancy code,
%s followed by third party customer code for a customer accountancy code. -ModuleCompanyCodePanicum=Return an empty accountancy code. -ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. -UseNotifications=Use notifications NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) @@ -1160,43 +1073,15 @@ MustBeMandatory=Mandatory to create third parties ? MustBeInvoiceMandatory=Mandatory to validate invoices ? Miscellaneous=Miscellaneous ##### Webcal setup ##### -WebCalSetup=Webcalendar link setup -WebCalSyncro=Add Dolibarr events to WebCalendar -WebCalAllways=Always, no asking -WebCalYesByDefault=On demand (yes by default) -WebCalNoByDefault=On demand (no by default) -WebCalNever=Never -WebCalURL=URL for calendar access -WebCalServer=Server hosting calendar database -WebCalDatabaseName=Database name -WebCalUser=User to access database -WebCalSetupSaved=Webcalendar setup saved successfully. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. -WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. -WebCalTestKo2=Connection to server '%s' with user '%s' failed. -WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database. -WebCalAddEventOnCreateActions=Add calendar event on actions create -WebCalAddEventOnCreateCompany=Add calendar event on companies create -WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change -WebCalAddEventOnStatusContract=Add calendar event on contracts status change -WebCalAddEventOnStatusBill=Add calendar event on bills status change -WebCalAddEventOnStatusMember=Add calendar event on members status change WebCalUrlForVCalExport=An export link to %s format is available at following link: %s -WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. ##### Invoices ##### BillsSetup=Invoices module setup -BillsDate=Invoices date BillsNumberingModule=Invoices and credit notes numbering model BillsPDFModules=Invoice documents models -CreditNoteSetup=Credit note module setup -CreditNotePDFModules=Credit note document models CreditNote=Credit note CreditNotes=Credit notes ForceInvoiceDate=Force invoice date to validation date -AllowCreditNoteWithoutRelatedInvoice=Allow to create credit note without a related invoice -DisableRepeatable=Disable repeatable invoices SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice -EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account SuggestPaymentByChequeToAddress=Suggest payment by cheque to FreeLegalTextOnInvoices=Free text on invoices @@ -1206,15 +1091,8 @@ SuppliersPayment=Suppliers payments SupplierPaymentSetup=Suppliers payments setup ##### Proposals ##### PropalSetup=Commercial proposals module setup -CreateForm=Create forms -NumberOfProductLines=Number of product lines ProposalsNumberingModules=Commercial proposal numbering models ProposalsPDFModules=Commercial proposal documents models -ClassifiedInvoiced=Classified invoiced -HideTreadedPropal=Hide the treated commercial proposals in the list -AddShippingDateAbility=Add shipping date ability -AddDeliveryAddressAbility=Add delivery date ability -UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal @@ -1230,8 +1108,6 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models OrdersModelModule=Order documents models -HideTreadedOrders=Hide the treated or cancelled orders in the list -ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable @@ -1240,7 +1116,6 @@ BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
__PHONETO__ that will be replaced with the phone number of person to call
__PHONEFROM__ that will be replaced with phone number of calling person (yours)
__LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
__PASS__ that will be replaced with your clicktodial password (defined on your user card). ##### Bookmark4u ##### -Bookmark4uSetup=Bookmark4u module setup ##### Interventions ##### InterventionsSetup=Interventions module setup FreeLegalTextOnInterventions=Free text on intervention documents @@ -1253,11 +1128,9 @@ ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) -ContractsAndServices=List of contracts and services ##### Members ##### MembersSetup=Members module setup MemberMainOptions=Main options -AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription AdherentLoginRequired= Manage a Login for each member AdherentMailRequired=EMail required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default @@ -1277,7 +1150,6 @@ LDAPSynchronizeUsers=Organization of users in LDAP LDAPSynchronizeGroups=Organization of groups in LDAP LDAPSynchronizeContacts=Organization of contacts in LDAP LDAPSynchronizeMembers=Organization of foundation's members in LDAP -LDAPTypeExample=OpenLdap, Egroupware or Active Directory LDAPPrimaryServer=Primary server LDAPSecondaryServer=Secondary server LDAPServerPort=Server port @@ -1295,11 +1167,9 @@ LDAPGroupDn=Groups' DN LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com) LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) LDAPServerDnExample=Complete DN (ex: dc=example,dc=com) -LDAPPasswordExample=Admin password LDAPDnSynchroActive=Users and groups synchronization LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization LDAPDnContactActive=Contacts' synchronization -LDAPDnContactActiveYes=Activated synchronization LDAPDnContactActiveExample=Activated/Unactivated synchronization LDAPDnMemberActive=Members' synchronization LDAPDnMemberActiveExample=Activated/Unactivated synchronization @@ -1315,8 +1185,6 @@ LDAPGroupObjectClassList=List of objectClass LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames) LDAPContactObjectClassList=List of objectClass LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) -LDAPMemberTypeDn=Dolibarr members type DN -LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com) LDAPTestConnect=Test LDAP connection LDAPTestSynchroContact=Test contacts synchronization LDAPTestSynchroUser=Test user synchronization @@ -1330,10 +1198,6 @@ LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) -LDAPUnbindSuccessfull=Disconnect successful -LDAPUnbindFailed=Disconnect failed -LDAPConnectToDNSuccessfull=Connection to DN (%s) successful -LDAPConnectToDNFailed=Connection to DN (%s) failed LDAPSetupForVersion3=LDAP server configured for version 3 LDAPSetupForVersion2=LDAP server configured for version 2 LDAPDolibarrMapping=Dolibarr Mapping @@ -1346,11 +1210,9 @@ LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSambaExample=Example : samaccountname LDAPFieldFullname=Full name LDAPFieldFullnameExample=Example : cn -LDAPFieldPassword=Password LDAPFieldPasswordNotCrypted=Password not crypted LDAPFieldPasswordCrypted=Password crypted LDAPFieldPasswordExample=Example : userPassword -LDAPFieldCommonName=Common name LDAPFieldCommonNameExample=Example : cn LDAPFieldName=Name LDAPFieldNameExample=Example : sn @@ -1373,7 +1235,6 @@ LDAPFieldZipExample=Example : postalcode LDAPFieldTown=Town LDAPFieldTownExample=Example : l LDAPFieldCountry=Country -LDAPFieldCountryExample=Example : c LDAPFieldDescription=Description LDAPFieldDescriptionExample=Example : description LDAPFieldNotePublic=Public Note @@ -1381,7 +1242,6 @@ LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Group members LDAPFieldGroupMembersExample= Example : uniqueMember LDAPFieldBirthdate=Birthdate -LDAPFieldBirthdateExample=Example : LDAPFieldCompany=Company LDAPFieldCompanyExample=Example : o LDAPFieldSid=SID @@ -1389,7 +1249,6 @@ LDAPFieldSidExample=Example : objectsid LDAPFieldEndLastSubscription=Date of subscription end LDAPFieldTitle=Post/Function LDAPFieldTitleExample=Example: title -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode. LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts. @@ -1421,15 +1280,11 @@ ProductSetup=Products module setup ServiceSetup=Services module setup ProductServiceSetup=Products and Services modules setup NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) -ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms -ModifyProductDescAbility=Personalization of product descriptions in forms ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language -UseMaskOnClone=Use product next ref when we clone a product%s (available if mask configured) UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). -UseEcoTaxeAbility=Support Eco-Taxe (WEEE) SetDefaultBarcodeTypeProducts=Default barcode type to use for products SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition @@ -1439,10 +1294,8 @@ IsNotADir=is not a directory! ##### Syslog ##### SyslogSetup=Logs module setup SyslogOutput=Logs outputs -SyslogSyslog=Syslog SyslogFacility=Facility SyslogLevel=Level -SyslogSimpleFile=File SyslogFilename=File name and path YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant @@ -1456,7 +1309,6 @@ DonationsReceiptModel=Template of donation receipt BarcodeSetup=Barcode setup PaperFormatModule=Print format module BarcodeEncodeModule=Barcode encoding type -UseBarcodeInProductModule=Use bar codes for products CodeBarGenerator=Barcode generator ChooseABarCode=No generator defined FormatNotSupportedByGenerator=Format not supported by this generator @@ -1486,7 +1338,6 @@ MailingDelay=Seconds to wait after sending next message ##### Notification ##### NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup @@ -1516,16 +1367,13 @@ OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted -TreeMenu=Tree menus Menus=Menus TreeMenuPersonalized=Personalized menus NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry NewMenu=New menu -MenuConf=Menus setup Menu=Selection of menu MenuHandler=Menu handler MenuModule=Source module @@ -1535,9 +1383,7 @@ DetailMenuHandler=Menu handler where to show new menu DetailMenuModule=Module name if menu entry come from a module DetailType=Type of menu (top or left) DetailTitre=Menu label or label code for translation -DetailMainmenu=Group for which it belongs (obsolete) DetailUrl=URL where menu send you (Absolute URL link or external link with http://) -DetailLeftmenu=Display condition or not (obsolete) DetailEnabled=Condition to show or not entry DetailRight=Condition to display unauthorized grey menus DetailLangs=Lang file name for label code translation @@ -1606,9 +1452,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa ##### API #### ApiSetup=API module setup ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services. -KeyForApiAccess=Key to use API (parameter "api_key") ApiProductionMode=Enable production mode (this will activate use of a caches for services management) -ApiEndPointIs=You can access to the API at url ApiExporerIs=You can explore the APIs at url OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed ApiKey=Key for API @@ -1645,20 +1489,15 @@ TasksNumberingModules=Tasks numbering module TaskModelModule=Tasks reports document model UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box) ##### ECM (GED) ##### -ECMSetup = GED Setup -ECMAutoTree = Show also the automatic tree folder and document ##### Fiscal Year ##### FiscalYears=Fiscal years -FiscalYear=Fiscal year FiscalYearCard=Fiscal year card NewFiscalYear=New fiscal year -EditFiscalYear=Edit fiscal year OpenFiscalYear=Open fiscal year CloseFiscalYear=Close fiscal year DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? AlwaysEditable=Can always be edited -IsHidden=Is not visible MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) NbMajMin=Minimum number of uppercase characters NbNumMin=Minimum number of numeric characters @@ -1672,7 +1511,6 @@ TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both custome IncludePath=Include path (defined into variable %s) ExpenseReportsSetup=Setup of module Expense Reports TemplatePDFExpenseReports=Document templates to generate expense report document -NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification". ListOfNotificationsPerContact=List of notifications per contact* diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index acb9f40f7e3..4f745f56bcf 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -1,26 +1,20 @@ # Dolibarr language file - Source file is en_US - agenda IdAgenda=ID event Actions=Events -ActionsArea=Events area (Actions and tasks) Agenda=Agenda Agendas=Agendas Calendar=Calendar -Calendars=Calendars LocalAgenda=Internal calendar ActionsOwnedBy=Event owned by ActionsOwnedByShort=Owner AffectedTo=Assigned to -DoneBy=Done by Event=Event Events=Events EventsNb=Number of events -MyEvents=My events -OtherEvents=Other events ListOfActions=List of events Location=Location ToUserOfGroup=To any user in group EventOnFullDay=Event on all day(s) -SearchAnAction= Search an event/task MenuToDoActions=All incomplete events MenuDoneActions=All terminated events MenuToDoMyActions=My incomplete events @@ -29,18 +23,12 @@ ListOfEvents=List of events (internal calendar) ActionsAskedBy=Events reported by ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by -ActionsForUser=Events for user -ActionsForUsersGroup=Events for all users of group ActionAssignedTo=Event assigned to -AllMyActions= All my events/tasks -AllActions= All events/tasks ViewCal=Month view ViewDay=Day view ViewWeek=Week view -ViewYear=Year view ViewPerUser=Per user view ViewPerType=Per type view -ViewWithPredefinedFilters= View with predefined filters AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) @@ -70,10 +58,6 @@ ProposalDeleted=Proposal deleted OrderDeleted=Order deleted InvoiceDeleted=Invoice deleted NewCompanyToDolibarr= Third party created -DateActionPlannedStart= Planned start date -DateActionPlannedEnd= Planned end date -DateActionDoneStart= Real start date -DateActionDoneEnd= Real end date DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: @@ -95,8 +79,6 @@ ExtSitesNbOfAgenda=Number of calendars AgendaExtNb=Calendar nb %s ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range VisibleTimeRange=Visible time range VisibleDaysRange=Visible days range AddEvent=Create event diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 65f5a02865b..2e166f16bc7 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -1,11 +1,8 @@ # Dolibarr language file - Source file is en_US - banks Bank=Bank -Banks=Banks MenuBankCash=Bank/Cash -MenuSetupBank=Bank/Cash setup BankName=Bank name FinancialAccount=Account -FinancialAccounts=Accounts BankAccount=Bank account BankAccounts=Bank accounts ShowAccount=Show Account @@ -13,10 +10,7 @@ AccountRef=Financial account ref AccountLabel=Financial account label CashAccount=Cash account CashAccounts=Cash accounts -MainAccount=Main account -CurrentAccount=Current account CurrentAccounts=Current accounts -SavingAccount=Savings account SavingAccounts=Savings accounts ErrorBankLabelAlreadyExists=Financial account label already exists BankBalance=Balance @@ -40,13 +34,10 @@ SwiftValid=BIC/SWIFT is Valid SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order -Withdrawals=Withdrawals -Withdrawal=Withdrawal AccountStatement=Account statement AccountStatementShort=Statement AccountStatements=Account statements LastAccountStatements=Last account statements -Rapprochement=Reconciliate IOMonthlyReporting=Monthly reporting BankAccountDomiciliation=Account address BankAccountCountry=Account country @@ -55,29 +46,19 @@ BankAccountOwnerAddress=Account owner address RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN). CreateAccount=Create account NewAccount=New account -NewBankAccount=New bank account NewFinancialAccount=New financial account MenuNewFinancialAccount=New financial account -NewCurrentAccount=New current account -NewSavingAccount=New savings account -NewCashAccount=New cash account EditFinancialAccount=Edit account -AccountSetup=Financial accounts setup -SearchBankMovement=Search bank movement -Debts=Debts LabelBankCashAccount=Bank or cash label AccountType=Account type BankType0=Savings account BankType1=Current or credit card account BankType2=Cash account -IfBankAccount=If bank account AccountsArea=Accounts area AccountCard=Account card DeleteAccount=Delete account ConfirmDeleteAccount=Are you sure you want to delete this account ? Account=Account -ByCategories=By categories -ByRubriques=By categories BankTransactionByCategories=Bank transactions by categories BankTransactionForCategory=Bank transactions for category %s RemoveFromRubrique=Remove link with category @@ -85,14 +66,12 @@ RemoveFromRubriqueConfirm=Are you sure you want to remove link between the trans ListBankTransactions=List of bank transactions IdTransaction=Transaction ID BankTransactions=Bank transactions -SearchTransaction=Search transaction ListTransactions=List transactions ListTransactionsByCategory=List transaction/category TransactionsToConciliate=Transactions to reconcile Conciliable=Can be reconciled Conciliate=Reconcile Conciliation=Reconciliation -ConciliationForAccount=Reconcile this account IncludeClosedAccount=Include closed accounts OnlyOpenedAccount=Only open accounts AccountToCredit=Account to credit @@ -102,7 +81,6 @@ ConciliationDisabled=Reconciliation feature disabled StatusAccountOpened=Open StatusAccountClosed=Closed AccountIdShort=Number -EditBankRecord=Edit record LineRecord=Transaction AddBankRecord=Add transaction AddBankRecordLong=Add transaction manually @@ -110,11 +88,8 @@ ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Transaction reconciled CustomerInvoicePayment=Customer payment -CustomerInvoicePaymentBack=Customer payment back -SupplierInvoicePayment=Supplier payment WithdrawalPayment=Withdrawal payment SocialContributionPayment=Social/fiscal tax payment -FinancialAccountJournal=Financial account journal BankTransfer=Bank transfer BankTransfers=Bank transfers TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction) @@ -134,13 +109,11 @@ DeleteTransaction=Delete transaction ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions BankMovements=Movements -CashBudget=Cash budget PlannedTransactions=Planned transactions Graph=Graphics ExportDataset_banque_1=Bank transactions and account statement ExportDataset_banque_2=Deposit slip TransactionOnTheOtherAccount=Transaction on the other account -TransactionWithOtherAccount=Account transfer PaymentNumberUpdateSucceeded=Payment number updated successfully PaymentNumberUpdateFailed=Payment number could not be updated PaymentDateUpdateSucceeded=Payment date updated successfully @@ -156,7 +129,6 @@ InputReceiptNumber=Choose the bank statement related with the conciliation. Use EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click -BankDashboard=Bank accounts summary DefaultRIB=Default BAN AllRIB=All BAN LabelRIB=BAN Label From 94b7e176a63b832c0b5b07056b9451aacd1dd30a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jun 2016 16:46:21 +0200 Subject: [PATCH 23/25] Clean language files --- dev/translation/sanity_check_en_langfiles.php | 22 +++++++- .../tpl/linkedobjectblock.tpl.php | 2 - htdocs/langs/en_US/bookmarks.lang | 1 - htdocs/langs/en_US/boxes.lang | 21 -------- htdocs/langs/en_US/cashdesk.lang | 6 --- htdocs/langs/en_US/categories.lang | 33 ------------ htdocs/langs/en_US/commercial.lang | 26 ---------- htdocs/langs/en_US/companies.lang | 52 ------------------- htdocs/langs/en_US/compta.lang | 28 ---------- htdocs/langs/en_US/contracts.lang | 16 ------ htdocs/langs/en_US/cron.lang | 16 ------ htdocs/langs/en_US/deliveries.lang | 6 +-- htdocs/langs/en_US/donations.lang | 10 ---- htdocs/langs/en_US/ecm.lang | 12 ----- htdocs/langs/en_US/errors.lang | 10 ---- htdocs/langs/en_US/expensereports.lang | 2 - htdocs/langs/en_US/exports.lang | 12 ----- htdocs/langs/en_US/help.lang | 1 - htdocs/projet/card.php | 1 - 19 files changed, 21 insertions(+), 256 deletions(-) mode change 100755 => 100644 htdocs/langs/en_US/errors.lang delete mode 100644 htdocs/langs/en_US/expensereports.lang diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index ea27b2ffc3b..3adf0e92f7c 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -283,6 +283,23 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; + if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0; + if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0; + if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0; + if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0; + if (preg_match('/^PL_/', $value)) $qualifiedforclean=0; + if (preg_match('/^TE_/', $value)) $qualifiedforclean=0; + if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0; + if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0; + if (preg_match('/^newLT/', $value)) $qualifiedforclean=0; + if (preg_match('/^LT\dSummary/', $value)) $qualifiedforclean=0; + if (preg_match('/^LT\dPaid/', $value)) $qualifiedforclean=0; + if (preg_match('/^LT\dPayment/', $value)) $qualifiedforclean=0; + if (preg_match('/^LT\dCustomer/', $value)) $qualifiedforclean=0; + if (preg_match('/^LT\dSupplier/', $value)) $qualifiedforclean=0; + if (preg_match('/^LT\dReport/', $value)) $qualifiedforclean=0; + if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0; + if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; if ($qualifiedforclean) { @@ -300,12 +317,13 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a if (empty($unused)) print "No string not used found.\n"; else { - $filetosave='/tmp/notused.lang'; + $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang'; print "Strings in en_US that are never used are saved into file ".$filetosave.":\n"; file_put_contents($filetosave, join("",$unused)); print "To remove from original file, run command :\n"; if (($argv[2]?$argv[2]:"")) print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; "; - print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:"")."\n"; + print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:""); + if (($argv[2]?$argv[2]:"")) print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n"; } } diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php index 743137ded67..b31b90e5a88 100644 --- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php @@ -28,8 +28,6 @@ global $user; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; -$langs->load("expensereports"); - $var=true; $total=0; foreach($linkedObjectBlock as $key => $objectlink) diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang index 19e383b2b3e..e529130e1bc 100644 --- a/htdocs/langs/en_US/bookmarks.lang +++ b/htdocs/langs/en_US/bookmarks.lang @@ -16,4 +16,3 @@ SetHereATitleForLink=Set a title for the bookmark UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not BookmarksManagement=Bookmarks management -ListOfBookmarks=List of bookmarks diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index bbb03afa4f2..ff20b6afb1c 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -12,45 +12,27 @@ BoxLastProspects=Latest modified prospects BoxLastCustomers=Latest modified customers BoxLastSuppliers=Latest modified suppliers BoxLastCustomerOrders=Latest customer orders -BoxLastValidatedCustomerOrders=Latest validated customer orders -BoxLastBooks=Latest bookmarks BoxLastActions=Latest actions BoxLastContracts=Latest contracts BoxLastContacts=Latest contacts/addresses BoxLastMembers=Latest members BoxFicheInter=Latest interventions BoxCurrentAccounts=Open accounts balance -BoxSalesTurnover=Sales turnover -BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices -BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices -BoxTitleLastBooks=Latest %s recorded bookmarks -BoxTitleNbOfCustomers=Number of clients BoxTitleLastRssInfos=Latest %s news from %s BoxTitleLastProducts=Latest %s modified products/services BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Latest %s customer orders -BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders BoxTitleLastSuppliers=Latest %s recorded suppliers -BoxTitleLastCustomers=Latest %s recorded customers BoxTitleLastModifiedSuppliers=Latest %s modified suppliers BoxTitleLastModifiedCustomers=Latest %s modified customers BoxTitleLastCustomersOrProspects=Latest %s customers or prospects -BoxTitleLastPropals=Latest %s proposals -BoxTitleLastModifiedPropals=Latest %s modified proposals BoxTitleLastCustomerBills=Latest %s customer's invoices -BoxTitleLastModifiedCustomerBills=Latest %s modified customer invoices BoxTitleLastSupplierBills=Latest %s supplier's invoices -BoxTitleLastModifiedSupplierBills=Latest %s modified supplier invoices BoxTitleLastModifiedProspects=Latest %s modified prospects -BoxTitleLastProductsInContract=Latest %s products/services in a contract BoxTitleLastModifiedMembers=Latest %s members BoxTitleLastFicheInter=Latest %s modified interventions BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Open accounts balances -BoxTitleSalesTurnover=Sales turnover -BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices -BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses BoxMyLastBookmarks=My latest %s bookmarks BoxOldestExpiredServices=Oldest active expired services @@ -73,7 +55,6 @@ NoRecordedOrders=No recorded customer's orders NoRecordedProposals=No recorded proposals NoRecordedInvoices=No recorded customer's invoices NoUnpaidCustomerBills=No unpaid customer's invoices -NoRecordedSupplierInvoices=No recorded supplier's invoices NoUnpaidSupplierBills=No unpaid supplier's invoices NoModifiedSupplierBills=No recorded supplier's invoices NoRecordedProducts=No recorded products/services @@ -82,8 +63,6 @@ NoContractedProducts=No products/services contracted NoRecordedContracts=No recorded contracts NoRecordedInterventions=No recorded interventions BoxLatestSupplierOrders=Latest supplier orders -BoxTitleLatestSupplierOrders=Latest %s supplier orders -BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders NoSupplierOrder=No recorded supplier order BoxCustomersInvoicesPerMonth=Customer invoices per month BoxSuppliersInvoicesPerMonth=Supplier invoices per month diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index f3b5f77f296..7b80d1a6f47 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -1,8 +1,6 @@ # Language file - Source file is en_US - cashdesk CashDeskMenu=Point of sale CashDesk=Point of sale -CashDesks=Point of sales -CashDeskBank=Bank account CashDeskBankCash=Bank account (cash) CashDeskBankCB=Bank account (card) CashDeskBankCheque=Bank account (cheque) @@ -12,7 +10,6 @@ CashDeskProducts=Products CashDeskStock=Stock CashDeskOn=on CashDeskThirdParty=Third party -CashdeskDashboard=Point of sale access ShoppingCart=Shopping cart NewSell=New sell BackOffice=Back office @@ -22,7 +19,6 @@ SellFinished=Sell finished PrintTicket=Print ticket NoProductFound=No article found ProductFound=product found -ProductsFound=products found NoArticle=No article Identification=Identification Article=Article @@ -30,8 +26,6 @@ Difference=Difference TotalTicket=Total ticket NoVAT=No VAT for this sale Change=Excess received -CalTip=Click to view the calendar -CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse BankToPay=Charge Account ShowCompany=Show company ShowStock=Show warehouse diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index a3cfb6828a1..976c8a50d93 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -2,7 +2,6 @@ Rubrique=Tag/Category Rubriques=Tags/Categories categories=tags/categories -TheCategorie=The tag/category NoCategoryYet=No tag/category of this type created In=In AddIn=Add in @@ -12,65 +11,38 @@ CategoriesArea=Tags/Categories area ProductsCategoriesArea=Products/Services tags/categories area SuppliersCategoriesArea=Suppliers tags/categories area CustomersCategoriesArea=Customers tags/categories area -ThirdPartyCategoriesArea=Third parties tags/categories area MembersCategoriesArea=Members tags/categories area ContactsCategoriesArea=Contacts tags/categories area AccountsCategoriesArea=Accounts tags/categories area -MainCats=Main tags/categories SubCats=Subcategories -CatStatistics=Statistics CatList=List of tags/categories -AllCats=All tags/categories -ViewCat=View tag/category -NewCat=Add tag/category NewCategory=New tag/category ModifCat=Modify tag/category CatCreated=Tag/category created CreateCat=Create tag/category CreateThisCat=Create this tag/category -ValidateFields=Validate the fields NoSubCat=No subcategory. SubCatOf=Subcategory FoundCats=Found tags/categories -FoundCatsForName=Tags/categories found for the name : -FoundSubCatsIn=Subcategories found in the tag/category -ErrSameCatSelected=You selected the same tag/category several times -ErrForgotCat=You forgot to choose the tag/category -ErrForgotField=You forgot to inform the fields -ErrCatAlreadyExists=This name is already used -AddProductToCat=Add this product to a tag/category? ImpossibleAddCat=Impossible to add the tag/category %s -ImpossibleAssociateCategory=Impossible to associate the tag/category to WasAddedSuccessfully=%s was added successfully. ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category. -CategorySuccessfullyCreated=This tag/category %s has been added successfully. ProductIsInCategories=Product/service is linked to following tags/categories -SupplierIsInCategories=Third party is linked to following suppliers tags/categories CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories MemberIsInCategories=This member is linked to following members tags/categories ContactIsInCategories=This contact is linked to following contacts tags/categories ProductHasNoCategory=This product/service is not in any tags/categories -SupplierHasNoCategory=This supplier is not in any tags/categories CompanyHasNoCategory=This thirdparty is not in any tags/categories MemberHasNoCategory=This member is not in any tags/categories ContactHasNoCategory=This contact is not in any tags/categories -AccountHasNoCategory=This account is not in any tags/categories ClassifyInCategory=Add to tag/category -NoneCategory=None NotCategorized=Without tag/category CategoryExistsAtSameLevel=This category already exists with this ref -ReturnInProduct=Back to product/service card -ReturnInSupplier=Back to supplier card -ReturnInCompany=Back to customer/prospect card -ContentsVisibleByAll=The contents will be visible by all ContentsVisibleByAllShort=Contents visible by all ContentsNotVisibleByAllShort=Contents not visible by all -CategoriesTree=Tags/categories tree DeleteCategory=Delete tag/category ConfirmDeleteCategory=Are you sure you want to delete this tag/category ? -RemoveFromCategory=Remove link with tag/category -RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ? NoCategoriesDefined=No tag/category defined SuppliersCategoryShort=Suppliers tag/category CustomersCategoryShort=Customers tag/category @@ -90,10 +62,6 @@ ThisCategoryHasNoCustomer=This category does not contain any customer. ThisCategoryHasNoMember=This category does not contain any member. ThisCategoryHasNoContact=This category does not contain any contact. ThisCategoryHasNoAccount=This category does not contain any account. -AssignedToCustomer=Assigned to a customer -AssignedToTheCustomer=Assigned to the customer -InternalCategory=Internal category -CategoryContents=Tag/category contents CategId=Tag/category id CatSupList=List of supplier tags/categories CatCusList=List of customer/prospect tags/categories @@ -103,7 +71,6 @@ CatContactList=List of contact tags/categories CatSupLinks=Links between suppliers and tags/categories CatCusLinks=Links between customers/prospects and tags/categories CatProdLinks=Links between products/services and tags/categories -CatMemberLinks=Links between members and tags/categories DeleteFromCat=Remove from tags/category ExtraFieldsCategories=Complementary attributes CategoriesSetup=Tags/categories setup diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index 03798ed96aa..825f429a3a2 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -1,8 +1,6 @@ # Dolibarr language file - Source file is en_US - commercial Commercial=Commercial CommercialArea=Commercial area -CommercialCard=Commercial card -CustomerArea=Customers area Customer=Customer Customers=Customers Prospect=Prospect @@ -12,13 +10,10 @@ NewAction=New event AddAction=Create event AddAnAction=Create an event AddActionRendezVous=Create a Rendez-vous event -Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event ? CardAction=Event card -PercentDone=Percentage complete ActionOnCompany=Related company ActionOnContact=Related contact -TaskRDV=Meetings TaskRDVWith=Meeting with %s ShowTask=Show task ShowAction=Show event @@ -28,30 +23,21 @@ SalesRepresentative=Sales representative SalesRepresentatives=Sales representatives SalesRepresentativeFollowUp=Sales representative (follow-up) SalesRepresentativeSignature=Sales representative (signature) -CommercialInterlocutor=Commercial interlocutor -ErrorWrongCode=Wrong code NoSalesRepresentativeAffected=No particular sales representative assigned ShowCustomer=Show customer ShowProspect=Show prospect ListOfProspects=List of prospects ListOfCustomers=List of customers LastDoneTasks=Latest %s completed tasks -LastRecordedTasks=Latest recorded tasks LastActionsToDo=Oldest %s not completed actions -DoneAndToDoActionsFor=Completed and To do events for %s DoneAndToDoActions=Completed and To do events DoneActions=Completed events -DoneActionsFor=Completed events for %s ToDoActions=Incomplete events -ToDoActionsFor=Incomplete events for %s SendPropalRef=Submission of commercial proposal %s SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete -MyActionsAsked=Events I have recorded -MyActionsToDo=Events I have to do -MyActionsDone=Events assigned to me StatusActionInProcess=In process TasksHistoryForThisContact=Events for this contact LastProspectDoNotContact=Do not contact @@ -59,13 +45,8 @@ LastProspectNeverContacted=Never contacted LastProspectToContact=To contact LastProspectContactInProcess=Contact in process LastProspectContactDone=Contact done -DateActionPlanned=Date event planned for -DateActionDone=Date event done -ActionAskedBy=Event reported by ActionAffectedTo=Event assigned to ActionDoneBy=Event done by -ActionUserAsk=Reported by -ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. ActionAC_TEL=Phone call ActionAC_FAX=Send fax ActionAC_PROP=Send proposal by mail @@ -85,13 +66,6 @@ ActionAC_OTH_AUTO=Other (automatically inserted events) ActionAC_MANUAL=Manually inserted events ActionAC_AUTO=Automatically inserted events Stats=Sales statistics -CAOrder=Sales volume (validated orders) -FromTo=from %s to %s -MargeOrder=Margins (validated orders) -RecapAnnee=Summary of the year -NoData=There is no data StatusProsp=Prospect status DraftPropals=Draft commercial proposals -SearchPropal=Search a commercial proposal -CommercialDashboard=Commercial summary NoLimit=No limit diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index bd57c1226dd..f13a2ec02ec 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -1,33 +1,25 @@ # Dolibarr language file - Source file is en_US - companies ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. -ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. ErrorSetACountryFirst=Set the country first SelectThirdParty=Select a third party -DeleteThirdParty=Delete a third party ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ? DeleteContact=Delete a contact/address ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ? MenuNewThirdParty=New third party -MenuNewCompany=New company MenuNewCustomer=New customer MenuNewProspect=New prospect MenuNewSupplier=New supplier MenuNewPrivateIndividual=New private individual -MenuSocGroup=Groups NewCompany=New company (prospect, customer, supplier) NewThirdParty=New third party (prospect, customer, supplier) -NewSocGroup=New company group -NewPrivateIndividual=New private individual (prospect, customer, supplier) CreateDolibarrThirdPartySupplier=Create a third party (supplier) ProspectionArea=Prospection area -SocGroup=Group of companies IdThirdParty=Id third party IdCompany=Company Id IdContact=Contact Id Contacts=Contacts/Addresses ThirdPartyContacts=Third party contacts ThirdPartyContact=Third party contact/address -StatusContactValidated=Status of contact/address Company=Company CompanyName=Company name AliasNames=Alias name (commercial, trademark, ...) @@ -37,7 +29,6 @@ CountryIsInEEC=Country is inside European Economic Community ThirdPartyName=Third party name ThirdParty=Third party ThirdParties=Third parties -ThirdPartyAll=Third parties (all) ThirdPartyProspects=Prospects ThirdPartyProspectsStats=Prospects ThirdPartyCustomers=Customers @@ -49,9 +40,7 @@ Company/Fundation=Company/Foundation Individual=Private individual ToCreateContactWithSameName=Will create automatically a physical contact with same informations ParentCompany=Parent company -Subsidiary=Subsidiary Subsidiaries=Subsidiaries -NoSubsidiary=No subsidiary ReportByCustomers=Report by customers ReportByQuarter=Report by rate CivilityCode=Civility code @@ -60,7 +49,6 @@ Lastname=Last name Firstname=First name PostOrFunction=Post/Function UserTitle=Title -Surname=Surname/Pseudo Address=Address State=State/Province StateShort=State @@ -86,7 +74,6 @@ DefaultLang=Language by default VATIsUsed=VAT is used VATIsNotUsed=VAT is not used CopyAddressFromSoc=Fill address with thirdparty address -NoEmailDefined=There is no email defined ##### Local Taxes ##### LocalTax1IsUsed=Use second tax LocalTax1IsUsedES= RE is used @@ -98,8 +85,6 @@ LocalTax1ES=RE LocalTax2ES=IRPF TypeLocaltax1ES=RE Type TypeLocaltax2ES=IRPF Type -TypeES=Type -ThirdPartyEMail=%s WrongCustomerCode=Customer code invalid WrongSupplierCode=Supplier code invalid CustomerCodeModel=Customer code model @@ -252,16 +237,13 @@ ProfId5RU=- ProfId6RU=- VATIntra=VAT number VATIntraShort=VAT number -VATIntraVeryShort=VAT VATIntraSyntaxIsValid=Syntax is valid VATIntraValueIsValid=Value is valid ProspectCustomer=Prospect / Customer Prospect=Prospect CustomerCard=Customer Card Customer=Customer -CustomerDiscount=Customer Discount CustomerRelativeDiscount=Relative customer discount -CustomerAbsoluteDiscount=Absolute customer discount CustomerRelativeDiscountShort=Relative discount CustomerAbsoluteDiscountShort=Absolute discount CompanyHasRelativeDiscount=This customer has a default discount of %s%% @@ -271,11 +253,8 @@ CompanyHasCreditNote=This customer still has credit notes for %s %s CompanyHasNoAbsoluteDiscount=This customer has no discount credit available CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users) CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself) -DefaultDiscount=Default discount -AvailableGlobalDiscounts=Absolute discounts available DiscountNone=None Supplier=Supplier -CompanyList=Company's list AddContact=Create contact AddContactAddress=Create contact/address EditContact=Edit contact @@ -285,7 +264,6 @@ ContactsAddresses=Contacts/Addresses NoContactDefinedForThirdParty=No contact defined for this third party NoContactDefined=No contact defined DefaultContact=Default contact/address -AddCompany=Create company AddThirdParty=Create third party DeleteACompany=Delete a company PersonalInformations=Personal data @@ -294,23 +272,16 @@ CustomerCode=Customer code SupplierCode=Supplier code CustomerCodeShort=Customer code SupplierCodeShort=Supplier code -CustomerAccount=Customer account -SupplierAccount=Supplier account CustomerCodeDesc=Customer code, unique for all customers SupplierCodeDesc=Supplier code, unique for all suppliers RequiredIfCustomer=Required if third party is a customer or prospect RequiredIfSupplier=Required if third party is a supplier ValidityControledByModule=Validity controled by module ThisIsModuleRules=This is rules for this module -LastProspect=Latest ProspectToContact=Prospect to contact CompanyDeleted=Company "%s" deleted from database. ListOfContacts=List of contacts/addresses ListOfContactsAddresses=List of contacts/adresses -ListOfProspectsContacts=List of prospect contacts -ListOfCustomersContacts=List of customer contacts -ListOfSuppliersContacts=List of supplier contacts -ListOfCompanies=List of companies ListOfThirdParties=List of third parties ShowCompany=Show thirdparty ShowContact=Show contact @@ -322,19 +293,15 @@ ContactForProposals=Proposal's contact ContactForContracts=Contract's contact ContactForInvoices=Invoice's contact NoContactForAnyOrder=This contact is not a contact for any order -NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment NoContactForAnyProposal=This contact is not a contact for any commercial proposal NoContactForAnyContract=This contact is not a contact for any contract NoContactForAnyInvoice=This contact is not a contact for any invoice NewContact=New contact NewContactAddress=New contact/address -LastContacts=Latest contacts MyContacts=My contacts -Phones=Phones Capital=Capital CapitalOf=Capital of %s EditCompany=Edit company -EditDeliveryAddress=Edit delivery address ThisUserIsNot=This user is not a prospect, customer nor supplier VATIntraCheck=Check VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work. @@ -379,10 +346,7 @@ ChangeToContact=Change status to 'To be contacted' ChangeContactInProcess=Change status to 'Contact in process' ChangeContactDone=Change status to 'Contact done' ProspectsByStatus=Prospects by status -BillingContact=Billing contact -NoRIB=No BAN defined NoParentCompany=None -ExportImport=Import-Export ExportCardToFormat=Export card to format ContactNotLinkedToCompany=Contact not linked to any third party DolibarrLogin=Dolibarr login @@ -394,24 +358,14 @@ ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attribut ImportDataset_company_3=Bank details ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies) PriceLevel=Price level -DeliveriesAddress=Delivery addresses DeliveryAddress=Delivery address -DeliveryAddressLabel=Delivery address label -DeleteDeliveryAddress=Delete a delivery address -ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address ? -NewDeliveryAddress=New delivery address -AddDeliveryAddress=Add delivery address AddAddress=Add address -NoOtherDeliveryAddress=No alternative delivery address defined SupplierCategory=Supplier category JuridicalStatus200=Independent DeleteFile=Delete file ConfirmDeleteFile=Are you sure you want to delete this file? AllocateCommercial=Assigned to sales representative -SelectCountry=Select a country -SelectCompany=Select a third party Organization=Organization -AutomaticallyGenerated=Automatically generated FiscalYearInformation=Information on the fiscal year FiscalMonthStart=Starting month of the fiscal year YouMustCreateContactFirst=To be able to add email notifications, you must first insert email contacts for the third party @@ -423,7 +377,6 @@ LastModifiedThirdParties=Latest %s modified third parties UniqueThirdParties=Total of unique third parties InActivity=Open ActivityCeased=Closed -ActivityStateFilter=Activity status ProductsIntoElements=List of products/services into %s CurrentOutstandingBill=Current outstanding bill OutstandingBill=Max. for outstanding bill @@ -431,15 +384,10 @@ OutstandingBillReached=Max. for outstanding bill reached MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) -SearchThirdparty=Search third party -SearchContact=Search contact MergeOriginThirdparty=Duplicate third party (third party you want to delete) MergeThirdparties=Merge third parties ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one. ThirdpartiesMergeSuccess=Thirdparties have been merged -ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted. SaleRepresentativeLogin=Login of sales representative SaleRepresentativeFirstname=Firstname of sales representative SaleRepresentativeLastname=Lastname of sales representative -ModelModulesContact=Document Models of contact -ModelModulesThirdParties=Document models of third party diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index c2893c0dbcc..66869d57e3f 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -1,7 +1,4 @@ # Dolibarr language file - Source file is en_US - compta -Accountancy=Accountancy -AccountancyCard=Accountancy card -Treasury=Treasury MenuFinancial=Financial TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation @@ -15,13 +12,9 @@ VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. Param=Setup RemainingAmountPayment=Amount payment remaining : -AmountToBeCharged=Total amount to pay : -AccountsGeneral=Accounts Account=Account -Accounts=Accounts Accountparent=Account parent Accountsparent=Accounts parent -BillsForSuppliers=Bills for suppliers Income=Income Outcome=Expense ReportInOut=Income / Expense @@ -34,8 +27,6 @@ Balance=Balance Debit=Debit Credit=Credit Piece=Accounting Doc. -Withdrawal=Withdrawal -Withdrawals=Withdrawals AmountHTVATRealReceived=Net collected AmountHTVATRealPaid=Net paid VATToPay=VAT sells @@ -45,7 +36,6 @@ VATSummary=VAT Balance LT2SummaryES=IRPF Balance LT1SummaryES=RE Balance VATPaid=VAT paid -SalaryPaid=Salary paid LT2PaidES=IRPF Paid LT1PaidES=RE Paid LT2CustomerES=IRPF sales @@ -54,36 +44,27 @@ LT1CustomerES=RE sales LT1SupplierES=RE purchases VATCollected=VAT collected ToPay=To pay -ToGet=To get back SpecialExpensesArea=Area for all special payments -TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area SocialContribution=Social or fiscal tax SocialContributions=Social or fiscal taxes SocialContributionsDeductibles=Deductible social or fiscal taxes SocialContributionsNondeductibles=Nondeductible social or fiscal taxes MenuSpecialExpenses=Special expenses MenuTaxAndDividends=Taxes and dividends -MenuSalaries=Salaries MenuSocialContributions=Social/fiscal taxes MenuNewSocialContribution=New social/fiscal tax NewSocialContribution=New social/fiscal tax ContributionsToPay=Social/fiscal taxes to pay AccountancyTreasuryArea=Accountancy/Treasury area -AccountancySetup=Accountancy setup NewPayment=New payment Payments=Payments PaymentCustomerInvoice=Customer invoice payment -PaymentSupplierInvoice=Supplier invoice payment PaymentSocialContribution=Social/fiscal tax payment PaymentVat=VAT payment -PaymentSalary=Salary payment ListPayment=List of payments -ListOfPayments=List of payments ListOfCustomerPayments=List of customer payments -ListOfSupplierPayments=List of supplier payments DateStartPeriod=Date start period DateEndPeriod=Date end period -NewVATPayment=New VAT payment newLT1Payment=New tax 2 payment newLT2Payment=New tax 3 payment LT1Payment=Tax 2 payment @@ -103,12 +84,10 @@ Refund=Refund SocialContributionsPayments=Social/fiscal taxes payments ShowVatPayment=Show VAT payment TotalToPay=Total to pay -TotalVATReceived=Total VAT received CustomerAccountancyCode=Customer accountancy code SupplierAccountancyCode=Supplier accountancy code CustomerAccountancyCodeShort=Cust. account. code SupplierAccountancyCodeShort=Sup. account. code -AccountNumberShort=Account number AccountNumber=Account number NewAccount=New account SalesTurnover=Sales turnover @@ -116,9 +95,6 @@ SalesTurnoverMinimum=Minimum sales turnover ByExpenseIncome=By expenses & incomes ByThirdParties=By third parties ByUserAuthorOfInvoice=By invoice author -AccountancyExport=Accountancy export -ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s -SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit LastCheckReceiptShort=Latest %s check receipts @@ -189,16 +165,12 @@ DescSellsJournal=Sales Journal DescPurchasesJournal=Purchases Journal InvoiceRef=Invoice ref. CodeNotDef=Not defined -AddRemind=Dispatch available amount -RemainToDivide= Remain to dispatch : WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module. DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. Pcg_version=Pcg version Pcg_type=Pcg type Pcg_subtype=Pcg subtype InvoiceLinesToDispatch=Invoice lines to dispatch -InvoiceDispatched=Dispatched invoices -AccountancyDashboard=Accountancy summary ByProductsAndServices=By products and services RefExt=External ref ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s". diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 620d212c386..bb4bb033b03 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -1,12 +1,9 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastModifiedContracts=Latest %s modified contracts AllContracts=All contracts ContractCard=Contract card -ContractStatus=Contract status ContractStatusNotRunning=Not running -ContractStatusRunning=Running ContractStatusDraft=Draft ContractStatusValidated=Validated ContractStatusClosed=Closed @@ -17,7 +14,6 @@ ServiceStatusNotLateShort=Not expired ServiceStatusLate=Running, expired ServiceStatusLateShort=Expired ServiceStatusClosed=Closed -ServicesLegend=Services legend Contracts=Contracts ContractsSubscriptions=Contracts/Subscriptions ContractsAndLine=Contracts and line of contracts @@ -33,7 +29,6 @@ MenuClosedServices=Closed services NewContract=New contract NewContractSubscription=New contract/subscription AddContract=Create contract -SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ? @@ -46,22 +41,16 @@ ConfirmActivateService=Are you sure you want to activate this service with date RefContract=Contract reference DateContract=Contract date DateServiceActivate=Service activation date -DateServiceUnactivate=Service deactivation date -DateServiceStart=Date for beginning of service -DateServiceEnd=Date for end of service ShowContract=Show contract ListOfServices=List of services ListOfInactiveServices=List of not active services ListOfExpiredServices=List of expired active services ListOfClosedServices=List of closed services -ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts LastContracts=Latest %s contracts -LastActivatedServices=Latest %s activated services LastModifiedServices=Latest %s modified services -EditServiceLine=Edit service line ContractStartDate=Start date ContractEndDate=End date DateStartPlanned=Planned start date @@ -72,10 +61,7 @@ DateStartReal=Real start date DateStartRealShort=Real start date DateEndReal=Real end date DateEndRealShort=Real end date -NbOfServices=Nb of services CloseService=Close service -ServicesNomberShort=%s service(s) -RunningServices=Running services BoardRunningServices=Expired running services ServiceStatus=Status of service DraftContracts=Drafts contracts @@ -88,7 +74,6 @@ ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ? PaymentRenewContractId=Renew contract line (number %s) ExpiredSince=Expiration date -RelatedContracts=Related contracts NoExpiredServices=No expired active services ListOfServicesToExpireWithDuration=List of Services to expire in %s days ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days @@ -104,4 +89,3 @@ TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up cont TypeContact_contrat_external_BILLING=Billing customer contact TypeContact_contrat_external_CUSTOMER=Follow-up customer contact TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact -Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index b7f68681d30..d52433ed267 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -1,8 +1,5 @@ # Dolibarr language file - Source file is en_US - cron # About page -About = About -CronAbout = About Cron -CronAboutPage = Cron about page # Right Permission23101 = Read Scheduled job Permission23102 = Create/update Scheduled job @@ -18,15 +15,10 @@ CronExplainHowToRunUnix=On Unix environment you should use the following crontab CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes CronMethodDoesNotExists=Class %s does not contains any method %s # Menu -CronJobs=Scheduled jobs -CronListActive=List of enabled/scheduled jobs -CronListInactive=List of disabled jobs EnabledAndDisabled=Enabled and disabled # Page list -CronDateLastRun=Last run CronLastOutput=Last run output CronLastResult=Last result code -CronListOfCronJobs=List of scheduled jobs CronCommand=Command CronList=Scheduled jobs CronDelete=Delete scheduled jobs @@ -34,7 +26,6 @@ CronConfirmDelete=Are you sure you want to delete these scheduled jobs ? CronExecute=Launch scheduled jobs CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ? CronInfo=Scheduled job module allow to execute job that have been planned -CronWaitingJobs=Waiting jobs CronTask=Job CronNone=None CronDtStart=Not before @@ -46,10 +37,6 @@ CronFrequency=Frequency CronClass=Class CronMethod=Method CronModule=Module -CronAction=Action -CronStatus=Status -CronStatusActive=Enabled -CronStatusInactive=Disabled CronNoJobs=No jobs registered CronPriority=Priority CronLabel=Description @@ -59,7 +46,6 @@ CronEach=Every JobFinished=Job launched and finished #Page card CronAdd= Add jobs -CronHourStart= Start hour and date of job CronEvery=Execute job each CronObject=Instance/Object to create CronArgs=Parameters @@ -81,12 +67,10 @@ CronCommandHelp=The system command line to execute. CronCreateJob=Create new Scheduled Job CronFrom=From # Info -CronInfoPage=Information # Common CronType=Job type CronType_method=Call method of a Dolibarr Class CronType_command=Shell command -CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs. JobDisabled=Job disabled diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index d4dfcbd81b8..4242cc7ea81 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -1,15 +1,11 @@ # Dolibarr language file - Source file is en_US - deliveries Delivery=Delivery DeliveryRef=Ref Delivery -Deliveries=Deliveries DeliveryCard=Delivery card DeliveryOrder=Delivery order -DeliveryOrders=Delivery orders DeliveryDate=Delivery date -DeliveryDateShort=Deliv. date CreateDeliveryOrder=Generate delivery order DeliveryStateSaved=Delivery state saved -QtyDelivered=Qty delivered SetDeliveryDate=Set shipping date ValidateDeliveryReceipt=Validate delivery receipt ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ? @@ -31,4 +27,4 @@ Recipient=Recipient ErrorStockIsNotEnough=There's not enough stock Shippable=Shippable NonShippable=Not Shippable -ShowReceiving=Show delivery receipt \ No newline at end of file +ShowReceiving=Show delivery receipt diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 24ce0cc17b0..89f9c1857f4 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -3,19 +3,12 @@ Donation=Donation Donations=Donations DonationRef=Donation ref. Donor=Donor -Donors=Donors AddDonation=Create a donation NewDonation=New donation DeleteADonation=Delete a donation ConfirmDeleteADonation=Are you sure you want to delete this donation ? ShowDonation=Show donation -DonationPromise=Gift promise -PromisesNotValid=Not validated promises -PromisesValid=Validated promises -DonationsPaid=Donations paid -DonationsReceived=Donations received PublicDonation=Public donation -DonationsNumber=Donation number DonationsArea=Donations area DonationStatusPromiseNotValidated=Draft promise DonationStatusPromiseValidated=Validated promise @@ -27,12 +20,9 @@ DonationTitle=Donation receipt DonationDatePayment=Payment date ValidPromess=Validate promise DonationReceipt=Donation receipt -BuildDonationReceipt=Build receipt DonationsModels=Documents models for donation receipts LastModifiedDonations=Latest %s modified donations -SearchADonation=Search a donation DonationRecipient=Donation recipient -ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s FreeTextOnDonations=Free text to show in footer diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang index d5d69daa7cf..1f19562af27 100644 --- a/htdocs/langs/en_US/ecm.lang +++ b/htdocs/langs/en_US/ecm.lang @@ -1,14 +1,5 @@ # Dolibarr language file - Source file is en_US - ecm -DocsMine=My documents -DocsGenerated=Generated documents -DocsElements=Elements documents -DocsThirdParties=Documents third parties -DocsContracts=Documents contracts -DocsProposals=Documents proposals -DocsOrders=Documents orders -DocsInvoices=Documents invoices ECMNbOfDocs=Nb of documents in directory -ECMNbOfDocsSmall=Nb of doc. ECMSection=Directory ECMSectionManual=Manual directory ECMSectionAuto=Automatic directory @@ -18,7 +9,6 @@ ECMSections=Directories ECMRoot=Root ECMNewSection=New directory ECMAddSection=Add directory -ECMNewDocument=New document ECMCreationDate=Creation date ECMNbOfFilesInDir=Number of files in directory ECMNbOfSubDir=Number of sub-directories @@ -28,11 +18,9 @@ ECMArea=EDM area ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element. ECMSectionWasRemoved=Directory %s has been deleted. -ECMDocumentsSection=Document of directory ECMSearchByKeywords=Search by keywords ECMSearchByEntity=Search by object ECMSectionOfDocuments=Directories of documents -ECMTypeManual=Manual ECMTypeAuto=Automatic ECMDocsBySocialContributions=Documents linked to social or fiscal taxes ECMDocsByThirdParties=Documents linked to third parties diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang old mode 100755 new mode 100644 index 3fe2f9b5852..ba9debb49ba --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -17,7 +17,6 @@ ErrorFailToCreateFile=Failed to create file '%s'. ErrorFailToRenameDir=Failed to rename directory '%s' into '%s'. ErrorFailToCreateDir=Failed to create directory '%s'. ErrorFailToDeleteDir=Failed to delete directory '%s'. -ErrorFailedToDeleteJoinedFiles=Cannot delete environment because joined files are present. Remove joined files first. ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type. ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only. ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different. @@ -30,7 +29,6 @@ ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used ErrorBarCodeAlreadyUsed=Bar code already used ErrorPrefixRequired=Prefix required -ErrorUrlNotValid=The website address is incorrect ErrorBadSupplierCodeSyntax=Bad syntax for supplier code ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used @@ -83,7 +81,6 @@ ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" -ErrorDatabaseParameterWrong=Database setup parameter '%s' has a value not compatible to use Dolibarr (must have value '%s'). ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete. @@ -93,12 +90,10 @@ ErrorBadMaskBadRazMonth=Error, bad reset value ErrorMaxNumberReachForThisMask=Max number reach for this mask ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits ErrorSelectAtLeastOne=Error. Select at least one entry. -ErrorProductWithRefNotExist=Product with reference '%s' don't exist ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated ErrorProdIdAlreadyExist=%s is assigned to another third ErrorFailedToSendPassword=Failed to send password ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. -ErrorPasswordDiffers=Passwords differs, please type them again. ErrorForbidden=Access denied.
You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user. ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). @@ -106,7 +101,6 @@ ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can b ErrorRecordAlreadyExists=Record already exists ErrorCantReadFile=Failed to read file '%s' ErrorCantReadDir=Failed to read directory '%s' -ErrorFailedToFindEntity=Failed to read environment '%s' ErrorBadLoginPassword=Bad value for login or password ErrorLoginDisabled=Your account has been disabled ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir. @@ -168,7 +162,6 @@ ErrorGlobalVariableUpdater3=The requested data was not found in result ErrorGlobalVariableUpdater4=SOAP client failed with error '%s' ErrorGlobalVariableUpdater5=No global variable selected ErrorFieldMustBeANumeric=Field %s must be a numeric value -ErrorFieldMustBeAnInteger=Field %s must be an integer ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu) @@ -181,8 +174,6 @@ ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Corre WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user. WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. -WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. You must modify this file manually. -WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show. WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists. WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe. @@ -193,7 +184,6 @@ WarningUntilDirRemoved=All security warnings (visible by admin users only) will WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box. WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). -WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit. diff --git a/htdocs/langs/en_US/expensereports.lang b/htdocs/langs/en_US/expensereports.lang deleted file mode 100644 index b378b12060d..00000000000 --- a/htdocs/langs/en_US/expensereports.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - expensereports -RelatedExpenseReports=associated expense reports \ No newline at end of file diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 0b6a699224b..55e592dc91d 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -18,18 +18,11 @@ ExportableFields=Exportable fields ExportedFields=Exported fields ImportModelName=Import profile name ImportModelSaved=Import profile saved under name %s. -ImportableFields=Importable fields -ImportedFields=Imported fields DatasetToExport=Dataset to export DatasetToImport=Import file into dataset -NoDiscardedFields=No fields in source file are discarded -Dataset=Dataset ChooseFieldsOrdersAndTitle=Choose fields order... -FieldsOrder=Fields order FieldsTitle=Fields title -FieldOrder=Field order FieldTitle=Field title -ChooseExportFormat=Choose export format NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file... AvailableFormats=Available formats LibraryShort=Library @@ -72,13 +65,10 @@ MoveField=Move field column number %s ExampleOfImportFile=Example_of_import_file SaveImportProfile=Save this import profile ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name. -ImportSummary=Import setup summary TablesTarget=Targeted tables FieldsTarget=Targeted fields -TableTarget=Targeted table FieldTarget=Targeted field FieldSource=Source field -DoNotImportFirstLine=Do not import first line of source file NbOfSourceLines=Number of lines in source file NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)... RunSimulateImportFile=Launch the import simulation @@ -119,7 +109,6 @@ ExportFieldAutomaticallyAdded=Field %s was automatically added. It will a CsvOptions=Csv Options Separator=Separator Enclosure=Enclosure -SuppliersProducts=Suppliers Products SpecialCode=Special code ExportStringFilter=%% allows replacing one or more characters in the text ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days @@ -130,7 +119,6 @@ SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude th KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file ## filters SelectFilterFields=If you want to filter on some values, just input values here. -FilterableFields=Filterable Fields FilteredFields=Filtered fields FilteredFieldsValues=Value for filter FormatControlRule=Format control rule diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang index a4c11246461..8c549f71514 100644 --- a/htdocs/langs/en_US/help.lang +++ b/htdocs/langs/en_US/help.lang @@ -22,6 +22,5 @@ ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment BackToHelpCenter=Otherwise, click here to go back to help center home page. LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): PossibleLanguages=Supported languages -MakeADonation=Help Dolibarr project, make a donation SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation SeeOfficalSupport=For official Dolibarr support in your language:
%s diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index a8e579c950c..b38e322d2d7 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -956,7 +956,6 @@ else } if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) { - $langs->load("expensereports"); $langs->load("trips"); print '
'.$langs->trans("AddTrip").'
'; } From f817b562ad4dcd3c3b678a7080eadc6b6440ba9b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jun 2016 17:17:45 +0200 Subject: [PATCH 24/25] Clean language files --- dev/translation/sanity_check_en_langfiles.php | 100 ++++++++++-------- htdocs/langs/en_US/holiday.lang | 45 -------- htdocs/langs/en_US/hrm.lang | 3 - htdocs/langs/en_US/incoterm.lang | 4 - htdocs/langs/en_US/install.lang | 18 ---- htdocs/langs/en_US/interventions.lang | 11 -- htdocs/langs/en_US/ldap.lang | 6 -- htdocs/langs/en_US/loan.lang | 6 +- htdocs/langs/en_US/mails.lang | 30 ------ 9 files changed, 55 insertions(+), 168 deletions(-) diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index 3adf0e92f7c..9c422338d90 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -255,57 +255,65 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a $unused=array(); foreach ($langstrings_dist AS $value => $line) { - //$search = '\'trans("'.$value.'")\''; + $qualifiedforclean=1; + // Check if we must keep this key to be into file for removal + if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0; + if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0; + if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0; + if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0; + if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0; + if (preg_match('/^Country/', $value)) $qualifiedforclean=0; + if (preg_match('/^Civility/', $value)) $qualifiedforclean=0; + if (preg_match('/^Currency/', $value)) $qualifiedforclean=0; + if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0; + if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0; + if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; + if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0; + if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0; + if (preg_match('/^Month/', $value)) $qualifiedforclean=0; + if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; + if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; + if (preg_match('/^Short/', $value)) $qualifiedforclean=0; + if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; + if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0; + if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0; + if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0; + if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0; + if (preg_match('/^PL_/', $value)) $qualifiedforclean=0; + if (preg_match('/^TE_/', $value)) $qualifiedforclean=0; + if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0; + if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0; + if (preg_match('/^newLT/', $value)) $qualifiedforclean=0; + if (preg_match('/^LT\d/', $value)) $qualifiedforclean=0; + if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0; + if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; + if (preg_match('/^Language_/', $value)) $qualifiedforclean=0; + if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0; + if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; + if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0; + if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0; + if (preg_match('/^.b$/', $value)) $qualifiedforclean=0; + if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0; + if (preg_match('/^By/', $value)) $qualifiedforclean=0; + + if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0; + + if (! $qualifiedforclean) + { + continue; + } + + //$search = '\'trans("'.$value.'")\''; $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\''; $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*'; //print $string."
\n"; exec($string,$output); if (empty($output)) { - $qualifiedforclean=1; - // Check if we must keep this key to be into file for removal - if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0; - if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0; - if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0; - if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0; - if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0; - if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0; - if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0; - if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0; - if (preg_match('/^Country/', $value)) $qualifiedforclean=0; - if (preg_match('/^Civility/', $value)) $qualifiedforclean=0; - if (preg_match('/^Currency/', $value)) $qualifiedforclean=0; - if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0; - if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0; - if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; - if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0; - if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0; - if (preg_match('/^Month/', $value)) $qualifiedforclean=0; - if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; - if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; - if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; - if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0; - if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0; - if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0; - if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0; - if (preg_match('/^PL_/', $value)) $qualifiedforclean=0; - if (preg_match('/^TE_/', $value)) $qualifiedforclean=0; - if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0; - if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0; - if (preg_match('/^newLT/', $value)) $qualifiedforclean=0; - if (preg_match('/^LT\dSummary/', $value)) $qualifiedforclean=0; - if (preg_match('/^LT\dPaid/', $value)) $qualifiedforclean=0; - if (preg_match('/^LT\dPayment/', $value)) $qualifiedforclean=0; - if (preg_match('/^LT\dCustomer/', $value)) $qualifiedforclean=0; - if (preg_match('/^LT\dSupplier/', $value)) $qualifiedforclean=0; - if (preg_match('/^LT\dReport/', $value)) $qualifiedforclean=0; - if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0; - if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; - - if ($qualifiedforclean) - { - $unused[$value] = $line; - echo $line; // $trad contains the \n - } + $unused[$value] = $line; + echo $line; // $trad contains the \n } else { diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 9ff15079900..4113dd62aa0 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -5,8 +5,6 @@ CPTitreMenu=Leaves MenuReportMonth=Monthly statement MenuAddCP=New leave request NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. AddCP=Make a leave request DateDebCP=Start date DateFinCP=End date @@ -23,31 +21,26 @@ DescCP=Description SendRequestCP=Create leave request DelayToRequestCP=Leave requests must be made at least %s day(s) before them. MenuConfCP=Balance of leaves -UpdateAllCP=Update the leaves SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by TitreRequestCP=Leave request NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete -ActionValidCP=Validate ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status -SendToValidationCP=Send to validation TitleDeleteCP=Delete the leave request ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your leave request does not contain working day. @@ -77,7 +70,6 @@ UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance alreadyCPexist=A leave request has already been done on this period. -UserName=Name FirstDayOfHoliday=First day of vacation LastDayOfHoliday=Last day of vacation BoxTitleLastLeaveRequests=Latest %s modified leave requests @@ -86,47 +78,12 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of leave request module -DescOptionCP=Description of the option -ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve leave requests -ConfirmConfigCP=Validate the configuration LastUpdateCP=Latest automatic update of leaves allocation MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation UpdateConfCPOK=Updated successfully. -ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. -DelayForSubmitCP=Deadline to make a leave requests -AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of leave request -TitleOptionEventCP=Settings of leave requets for events -ValidEventCP=Validate -UpdateEventCP=Update events -CreateEventCP=Create -NameEventCP=Event name -OkCreateEventCP=The addition of the event went well. -ErrorCreateEventCP=Error creating the event. -UpdateEventOkCP=The update of the event went well. -ErrorUpdateEventCP=Error while updating the event. -DeleteEventCP=Delete Event -DeleteEventOkCP=The event has been deleted. -ErrorDeleteEventCP=Error while deleting the event. -TitleDeleteEventCP=Delete a exceptional leave -TitleCreateEventCP=Create a exceptional leave -TitleUpdateEventCP=Edit or delete a exceptional leave -DeleteEventOptionCP=Delete -UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: -NoCPforMonth=No leave this month. -nbJours=Number days -TitleAdminCP=Configuration of Leaves NoticePeriod=Notice period #Messages HolidaysToValidate=Validate leave requests @@ -139,8 +96,6 @@ HolidaysRefused=Request denied HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : HolidaysCanceled=Canceled leaved request HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -NewByMonth=Added per month -Affect=Followed by a counter FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.
0: Not followed by a counter. NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter GoIntoDictionaryHolidayTypes=Go into Home - Setup - Dictionaries - Type of leaves to setup the different types of leaves. diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 1c6ec8e61fc..6730da53d2d 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -12,9 +12,6 @@ CloseEtablishment=Close establishment DictionaryDepartment=HRM - Department list DictionaryFunction=HRM - Function list # Module -ListOfEmployees=List of employees Employees=Employees Employee=Employee -Employe=Employe NewEmployee=New employee -EmployeeCard=Employee card diff --git a/htdocs/langs/en_US/incoterm.lang b/htdocs/langs/en_US/incoterm.lang index 4fce5519c3a..7ff371e3a95 100644 --- a/htdocs/langs/en_US/incoterm.lang +++ b/htdocs/langs/en_US/incoterm.lang @@ -1,7 +1,3 @@ Module62000Name=Incoterm Module62000Desc=Add features to manage Incoterm IncotermLabel=Incoterms -IncotermSetupTitle1=Feature -IncotermSetupTitle2=Status -IncotermSetup=Setup of module Incoterm -IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) \ No newline at end of file diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index eacd6937e92..f9d1d1338c6 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -1,9 +1,7 @@ # Dolibarr language file - Source file is en_US - install InstallEasy=Just follow the instructions step by step. MiscellaneousChecks=Prerequisites check -DolibarrWelcome=Welcome to Dolibarr ConfFileExists=Configuration file %s exists. -ConfFileDoesNotExists=Configuration file %s does not exist ! ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! ConfFileCouldBeCreated=Configuration file %s could be created. ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). @@ -27,14 +25,12 @@ ErrorFailedToCreateDatabase=Failed to create database '%s'. ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. ErrorPHPVersionTooLow=PHP version too old. Version %s is required. -WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. ErrorDatabaseAlreadyExists=Database '%s' already exists. IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. PHPVersion=PHP Version -YouCanContinue=You can continue... License=Using license ConfigurationFile=Configuration file WebPagesDirectory=Directory where web pages are stored @@ -43,7 +39,6 @@ URLRoot=URL Root ForceHttps=Force secure connections (https) CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate. DolibarrDatabase=Dolibarr Database -DatabaseChoice=Database choice DatabaseType=Database type DriverType=Driver type Server=Server @@ -63,7 +58,6 @@ CheckToCreateUser=Check box if database owner does not exist and must be created DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) SaveConfigurationFile=Save values -ConfigurationSaving=Saving configuration file ServerConnection=Server connection DatabaseCreation=Database creation UserCreation=User creation @@ -93,9 +87,7 @@ LoginAlreadyExists=Already exists DolibarrAdminLogin=Dolibarr admin login AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. -ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s FunctionNotAvailableInThisPHP=Not available on this PHP -MigrateScript=Migration script ChoosedMigrateScript=Choose migration script DataMigration=Data migration DatabaseMigration=Structure database migration @@ -113,22 +105,12 @@ AlreadyDone=Already migrated DatabaseVersion=Database version ServerVersion=Database server version YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. -CharsetChoice=Character set choice -CharacterSetClient=Character set used for generated HTML web pages -CharacterSetClientComment=Choose character set for web display.
Default proposed character set is the one of your database. DBSortingCollation=Character sorting order -DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.
This parameter can't be defined if database already exists. -CharacterSetDatabase=Character set for database -CharacterSetDatabaseComment=Choose character set wanted for database creation.
This parameter can't be defined if database already exists. YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue. -KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do. -KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do. -KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do. -KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do. FieldRenamed=Field renamed IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user" ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 9df35ba9e38..26959e39ab9 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -5,12 +5,10 @@ InterventionCard=Intervention card NewIntervention=New intervention AddIntervention=Create intervention ListOfInterventions=List of interventions -EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention LastInterventions=Latest %s interventions AllInterventions=All interventions CreateDraftIntervention=Create draft -CustomerDoesNotHavePrefix=Customer does not have a prefix InterventionContact=Intervention contact DeleteIntervention=Delete intervention ValidateIntervention=Validate intervention @@ -27,7 +25,6 @@ InterventionCardsAndInterventionLines=Interventions and lines of interventions InterventionClassifyBilled=Classify "Billed" InterventionClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed -RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s SendInterventionByMail=Send intervention by Email @@ -38,20 +35,12 @@ InterventionClassifiedBilledInDolibarr=Intervention %s set as billed InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled InterventionSentByEMail=Intervention %s sent by EMail InterventionDeletedInDolibarr=Intervention %s deleted -SearchAnIntervention=Search an intervention InterventionsArea=Interventions area DraftFichinter=Draft interventions LastModifiedInterventions=Latest %s modified interventions ##### Types de contacts ##### -TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention -TypeContact_fichinter_internal_INTERVENING=Intervening -TypeContact_fichinter_external_BILLING=Billing customer contact TypeContact_fichinter_external_CUSTOMER=Following-up customer contact # Modele numérotation -ArcticNumRefModelDesc1=Generic number model -ArcticNumRefModelError=Failed to activate -PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card PrintProductsOnFichinterDetails=interventions generated from orders InterventionStatistics=Statistics of interventions diff --git a/htdocs/langs/en_US/ldap.lang b/htdocs/langs/en_US/ldap.lang index 02e457446a6..23f0df862b9 100644 --- a/htdocs/langs/en_US/ldap.lang +++ b/htdocs/langs/en_US/ldap.lang @@ -2,25 +2,19 @@ DomainPassword=Password for domain YouMustChangePassNextLogon=Password for user %s on the domain %s must be changed. UserMustChangePassNextLogon=User must change password on the domain %s -LdapUacf_NORMAL_ACCOUNT=User account -LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires -LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s LDAPInformationsForThisContact=Information in LDAP database for this contact LDAPInformationsForThisUser=Information in LDAP database for this user LDAPInformationsForThisGroup=Information in LDAP database for this group LDAPInformationsForThisMember=Information in LDAP database for this member -LDAPAttribute=LDAP attribute LDAPAttributes=LDAP attributes LDAPCard=LDAP card LDAPRecordNotFound=Record not found in LDAP database LDAPUsers=Users in LDAP database -LDAPGroups=Groups in LDAP database LDAPFieldStatus=Status LDAPFieldFirstSubscriptionDate=First subscription date LDAPFieldFirstSubscriptionAmount=First subscription amount LDAPFieldLastSubscriptionDate=Last subscription date LDAPFieldLastSubscriptionAmount=Last subscription amount -SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP) UserSynchronized=User synchronized GroupSynchronized=Group synchronized MemberSynchronized=Member synchronized diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 4ca8c615e5a..de0d5a0525f 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -12,14 +12,10 @@ Nbterms=Number of terms LoanAccountancyCapitalCode=Accountancy code capital LoanAccountancyInsuranceCode=Accountancy code insurance LoanAccountancyInterestCode=Accountancy code interest -LoanPayment=Loan payment ConfirmDeleteLoan=Confirm deleting this loan LoanDeleted=Loan Deleted Successfully ConfirmPayLoan=Confirm classify paid this loan LoanPaid=Loan Paid -ErrorLoanCapital=Loan amount has to be numeric and greater than zero. -ErrorLoanLength=Loan length has to be numeric and greater than zero. -ErrorLoanInterest=Annual interest has to be numeric and greater than zero. # Calc LoanCalc=Bank Loans Calculator PurchaseFinanceInfo=Purchase & Financing Information @@ -50,4 +46,4 @@ YouWillSpend=You will spend %s in year %s ConfigLoan=Configuration of the module loan LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default -LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default \ No newline at end of file +LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 7eba3525fc1..79c7aff2029 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -1,11 +1,9 @@ # Dolibarr language file - Source file is en_US - mails Mailing=EMailing EMailing=EMailing -Mailings=EMailings EMailings=EMailings AllEMailings=All eMailings MailCard=EMailing card -MailTargets=Targets MailRecipients=Recipients MailRecipient=Recipient MailTitle=Description @@ -27,16 +25,11 @@ ResetMailing=Resend emailing DeleteMailing=Delete emailing DeleteAMailing=Delete an emailing PreviewMailing=Preview emailing -PrepareMailing=Prepare emailing CreateMailing=Create emailing -MailingDesc=This page allows you to send emailings to a group of people. -MailingResult=Sending emails result TestMailing=Test email ValidMailing=Valid emailing -ApproveMailing=Approve emailing MailingStatusDraft=Draft MailingStatusValidated=Validated -MailingStatusApproved=Approved MailingStatusSent=Sent MailingStatusSentPartialy=Sent partialy MailingStatusSentCompletely=Sent completely @@ -45,7 +38,6 @@ MailingStatusNotSent=Not sent MailSuccessfulySent=Email successfully sent (from %s to %s) MailingSuccessfullyValidated=EMailing successfully validated MailUnsubcribe=Unsubscribe -Unsuscribe=Unsubscribe MailingStatusNotContact=Don't contact anymore MailingStatusReadAndUnsubscribe=Read and unsubscribe ErrorMailRecipientIsEmpty=Email recipient is empty @@ -53,12 +45,10 @@ WarningNoEMailsAdded=No new Email to add to recipient's list. ConfirmValidMailing=Are you sure you want to validate this emailing ? ConfirmResetMailing=Warning, by reinitializing emailing %s, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ? ConfirmDeleteMailing=Are you sure you want to delete this emailling ? -NbOfRecipients=Number of recipients NbOfUniqueEMails=Nb of unique emails NbOfEMails=Nb of EMails TotalNbOfDistinctRecipients=Number of distinct recipients NoTargetYet=No recipients defined yet (Go on tab 'Recipients') -AddRecipients=Add recipients RemoveRecipient=Remove recipient CommonSubstitutions=Common substitutions YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. @@ -74,37 +64,18 @@ DateLastSend=Date of latest sending DateSending=Date sending SentTo=Sent to %s MailingStatusRead=Read -CheckRead=Read Receipt YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list -MailtoEMail=Hyper link to email -ActivateCheckRead=Allow to use the "Unsubcribe" link ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature EMailSentToNRecipients=EMail sent to %s recipients. XTargetsAdded=%s recipients added into target list -EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version). -MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) -SendRemind=Send reminder by EMails -RemindSent=%s reminder(s) sent AllRecipientSelected=All thirdparties selected and if an email is set. -NoRemindSent=No EMail reminder sent ResultOfMailSending=Result of mass EMail sending NbSelected=Nb selected NbIgnored=Nb ignored NbSent=Nb sent # Libelle des modules de liste de destinataires mailing -MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...) -MailingModuleDescDolibarrUsers=Dolibarr users -MailingModuleDescFundationMembers=Foundation members with emails -MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other) -MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) -MailingModuleDescContactsCategories=Third parties (by category) -MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines -MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category) -MailingModuleDescContactsByCategory=Contacts/addresses of third parties (by category) -MailingModuleDescMembersCategories=Foundation members (by categories) -MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function) LineInFile=Line %s in file RecipientSelectionModules=Defined requests for recipient's selection MailSelectedRecipients=Selected recipients @@ -116,7 +87,6 @@ MailNoChangePossible=Recipients for validated emailing can't be changed SearchAMailing=Search mailing SendMailing=Send emailing SendMail=Send email -SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? From d0a15d32b2e04e0e3600d0b32e1d3592c12d602f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jun 2016 19:48:58 +0200 Subject: [PATCH 25/25] Clean language files --- dev/translation/sanity_check_en_langfiles.php | 30 +++++++- htdocs/langs/en_US/main.lang | 57 --------------- htdocs/langs/en_US/margins.lang | 7 +- htdocs/langs/en_US/members.lang | 35 --------- htdocs/langs/en_US/opensurvey.lang | 7 -- htdocs/langs/en_US/orders.lang | 26 ------- htdocs/langs/en_US/other.lang | 16 ---- htdocs/langs/en_US/paypal.lang | 2 - htdocs/langs/en_US/printing.lang | 35 +-------- htdocs/langs/en_US/products.lang | 73 ------------------- htdocs/langs/en_US/projects.lang | 15 ---- htdocs/langs/en_US/propal.lang | 22 ------ htdocs/langs/en_US/receiptprinter.lang | 54 -------------- htdocs/langs/en_US/resource.lang | 4 - htdocs/langs/en_US/sendings.lang | 20 ----- htdocs/langs/en_US/stocks.lang | 15 ---- htdocs/langs/en_US/supplier_proposal.lang | 13 +--- htdocs/langs/en_US/suppliers.lang | 10 +-- htdocs/langs/en_US/trips.lang | 16 ---- htdocs/langs/en_US/users.lang | 23 ------ htdocs/langs/en_US/website.lang | 3 +- htdocs/langs/en_US/withdrawals.lang | 13 ---- 22 files changed, 32 insertions(+), 464 deletions(-) diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index 9c422338d90..d32f45c6161 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -292,15 +292,39 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; if (preg_match('/^Language_/', $value)) $qualifiedforclean=0; if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0; + // main.lang if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0; if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0; if (preg_match('/^.b$/', $value)) $qualifiedforclean=0; if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0; - if (preg_match('/^By/', $value)) $qualifiedforclean=0; - if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0; - + // orders + if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0; + if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0; + // other.lang + if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0; + if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0; + if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0; + if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0; + if (preg_match('/ById$/', $value)) $qualifiedforclean=0; + if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0; + // products + if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0; + if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0; + if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0; + if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0; + + if (preg_match('/sms/i', $value)) $qualifiedforclean=0; + if (preg_match('/TF_/i', $value)) $qualifiedforclean=0; + if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0; + if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0; + if (! $qualifiedforclean) { continue; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 750e02fa11c..4b41f0ba038 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -45,10 +45,8 @@ ErrorLogoFileNotFound=Logo file '%s' was not found ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this ErrorGoToModuleSetup=Go to Module setup to fix this ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) -ErrorAttachedFilesDisabled=File attaching is disabled on this server ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory. ErrorInternalErrorDetected=Error detected -ErrorNoRequestRan=No request ran ErrorWrongHostParameter=Wrong host parameter ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records. @@ -69,7 +67,6 @@ SelectDate=Select a date SeeAlso=See also %s SeeHere=See here BackgroundColorByDefault=Default background color -FileNotUploaded=The file was not uploaded FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries @@ -79,8 +76,6 @@ RecordSaved=Record saved RecordDeleted=Record deleted LevelOfFeature=Level of features NotDefined=Not defined -DefinedAndHasThisValue=Defined and value to -IsNotDefined=undefined DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. Administrator=Administrator Undefined=Undefined @@ -94,7 +89,6 @@ ConnectedSince=Connected since AuthenticationMode=Authentification mode RequestedUrl=Requested Url DatabaseTypeManager=Database type manager -RequestLastAccess=Latest database access request RequestLastAccessInError=Latest database access request error ReturnCodeLastAccessInError=Return code for latest database access request error InformationLastAccessInError=Information for latest database access request error @@ -115,7 +109,6 @@ Yes=Yes no=no No=No All=All -Alls=All Home=Home Help=Help OnlineHelp=Online help @@ -139,8 +132,6 @@ AddLink=Add link RemoveLink=Remove link AddToDraft=Add to draft Update=Update -AddActionToDo=Add event to do -AddActionDone=Add event done Close=Close CloseBox=Remove widget from your dashboard Confirm=Confirm @@ -158,7 +149,6 @@ Save=Save SaveAs=Save As TestConnection=Test connection ToClone=Clone -ConfirmCloneAction=Are you sure you want to clone this event ? ConfirmClone=Choose data you want to clone : NoCloneOptionsSpecified=No data to clone defined. Of=of @@ -187,13 +177,11 @@ Groups=Groups NoUserGroupDefined=No user group defined Password=Password PasswordRetype=Retype your password -NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. Name=Name Person=Person Parameter=Parameter Parameters=Parameters Value=Value -GlobalValue=Global value PersonalValue=Personal value NewValue=New value CurrentValue=Current value @@ -202,7 +190,6 @@ Type=Type Language=Language MultiLanguage=Multi-language Note=Note -CurrentNote=Current note Title=Title Label=Label RefOrLabel=Ref. or label @@ -220,7 +207,6 @@ AmountByMonth=Amount by month Numero=Number Limit=Limit Limits=Limits -DevelopmentTeam=Development Team Logout=Logout NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s Connection=Connection @@ -253,8 +239,6 @@ DateOperationShort=Oper. Date DateLimit=Limit date DateRequest=Request date DateProcess=Process date -DatePlanShort=Date planed -DateRealShort=Date real. DateBuild=Report build date DatePayment=Date of payment DateApprove=Approving date @@ -308,7 +292,6 @@ Copy=Copy Paste=Paste Default=Default DefaultValue=Default value -DefaultGlobalValue=Global value Price=Price UnitPrice=Unit price UnitPriceHT=Unit price (net) @@ -316,7 +299,6 @@ UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) PriceUHTCurrency=U.P (currency) -SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount @@ -335,10 +317,7 @@ AmountLT1ES=Amount RE AmountLT2ES=Amount IRPF AmountTotal=Total amount AmountAverage=Average amount -PriceQtyHT=Price for this quantity (net of tax) PriceQtyMinHT=Price quantity min. (net of tax) -PriceQtyTTC=Price for this quantity (inc. tax) -PriceQtyMinTTC=Price quantity min. (inc. of tax) Percentage=Percentage Total=Total SubTotal=Subtotal @@ -355,7 +334,6 @@ TotalLT1=Total tax 2 TotalLT2=Total tax 3 TotalLT1ES=Total RE TotalLT2ES=Total IRPF -IncludedVAT=Included tax HT=Net of tax TTC=Inc. tax VAT=Sales tax @@ -383,9 +361,7 @@ CommercialProposalsShort=Commercial proposals Comment=Comment Comments=Comments ActionsToDo=Events to do -ActionsDone=Events done ActionsToDoShort=To do -ActionsRunningshort=Started ActionsDoneShort=Done ActionNotApplicable=Not applicable ActionRunningNotStarted=To start @@ -398,7 +374,6 @@ ContactsAddressesForCompany=Contacts/addresses for this third party AddressesForCompany=Addresses for this third party ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member -NActions=%s events NActionsLate=%s late RequestAlreadyDone=Request already recorded Filter=Filter @@ -411,15 +386,11 @@ Generate=Generate Duration=Duration TotalDuration=Total duration Summary=Summary -MyBookmarks=My bookmarks -OtherInformationsBoxes=Other widgets -DolibarrBoard=Dolibarr board DolibarrStateBoard=Statistics DolibarrWorkBoard=Work tasks board Available=Available NotYetAvailable=Not yet available NotAvailable=Not available -Popularity=Popularity Categories=Tags/categories Category=Tag/category By=By @@ -438,7 +409,6 @@ ApprovedBy2=Approved by (second approval) Approved=Approved Refused=Refused ReCalculate=Recalculate -ResultOk=Success ResultKo=Failure Reporting=Reporting Reportings=Reporting @@ -458,11 +428,9 @@ ByCompanies=By third parties ByUsers=By users Links=Links Link=Link -Receipts=Receipts Rejects=Rejects Preview=Preview NextStep=Next step -PreviousStep=Previous step Datas=Data None=None NoneF=None @@ -534,10 +502,8 @@ ReportDescription=Description Report=Report Keyword=Keyword Legend=Legend -FillTownFromZip=Fill city from zip Fill=Fill Reset=Reset -ShowLog=Show log File=File Files=Files NotAllowed=Not allowed @@ -548,10 +514,8 @@ Examples=Examples NoExample=No example FindBug=Report a bug NbOfThirdParties=Number of third parties -NbOfCustomers=Number of customers NbOfLines=Number of lines NbOfObjects=Number of objects -NbOfReferers=Number of referrers NbOfObjectReferers=Number of related items Referers=Related items TotalQuantity=Total quantity @@ -566,20 +530,13 @@ Internals=Internal Externals=External Warning=Warning Warnings=Warnings -BuildPDF=Build PDF -RebuildPDF=Rebuild PDF BuildDoc=Build Doc -RebuildDoc=Rebuild Doc Entity=Environment Entities=Entities -EventLogs=Logs CustomerPreview=Customer preview SupplierPreview=Supplier preview -AccountancyPreview=Accountancy preview ShowCustomerPreview=Show customer preview ShowSupplierPreview=Show supplier preview -ShowAccountancyPreview=Show accountancy preview -ShowProspectPreview=Show prospect preview RefCustomer=Ref. customer Currency=Currency InfoAdmin=Information for administrators @@ -590,7 +547,6 @@ UndoExpandAll=Undo expand Reason=Reason FeatureNotYetSupported=Feature not yet supported CloseWindow=Close window -Question=Question Response=Response Priority=Priority SendByMail=Send by EMail @@ -601,7 +557,6 @@ EMail=E-mail NoEMail=No email NoMobilePhone=No mobile phone Owner=Owner -DetectedVersion=Detected version FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. Refresh=Refresh BackToList=Back to list @@ -611,7 +566,6 @@ CanBeModifiedIfKo=Can be modified if not valid RecordModifiedSuccessfully=Record modified successfully RecordsModified=%s records modified AutomaticCode=Automatic code -NotManaged=Not managed FeatureDisabled=Feature disabled MoveBox=Move widget Offered=Offered @@ -620,18 +574,14 @@ SessionName=Session name Method=Method Receive=Receive PartialWoman=Partial -PartialMan=Partial TotalWoman=Total -TotalMan=Total NeverReceived=Never received Canceled=Canceled YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup Color=Color Documents=Linked files -DocumentsNb=Linked files (%s) Documents2=Documents -BuildDocuments=Generated documents UploadDisabled=Upload disabled MenuECM=Documents MenuAWStats=AWStats @@ -654,7 +604,6 @@ Page=Page Notes=Notes AddNewLine=Add new line AddFile=Add file -ListOfFiles=List of available files FreeZone=Free entry FreeLineOfType=Free entry of type CloneMainAttributes=Clone object with its main attributes @@ -662,7 +611,6 @@ PDFMerge=PDF Merge Merge=Merge PrintContentArea=Show page to print main content area MenuManager=Menu manager -NoMenu=No sub-menu WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. CoreErrorTitle=System error CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator. @@ -689,7 +637,6 @@ Frequency=Frequency IM=Instant messaging NewAttribute=New attribute AttributeCode=Attribute code -OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToAnotherThirdParty=Link to another third party CreateDraft=Create draft @@ -705,8 +652,6 @@ ByMonth=By month ByDay=By day BySalesRepresentative=By sales representative LinkedToSpecificUsers=Linked to a particular user contact -DeleteAFile=Delete a file -ConfirmDeleteAFile=Are you sure you want to delete file NoResults=No results AdminTools=Admin tools SystemTools=System tools @@ -714,7 +659,6 @@ ModulesSystemTools=Modules tools Test=Test Element=Element NoPhotoYet=No pictures available yet -HomeDashboard=Home summary Dashboard=Dashboard Deductible=Deductible from=from @@ -750,7 +694,6 @@ ConfirmDeleteLine=Are you sure you want to delete this line ? NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records. MassFilesArea=Area for files built by mass actions -HideTempMassFilesArea=Hide area of files built by mass actions ShowTempMassFilesArea=Show area of files built by mass actions RelatedObjects=Related Objects ClassifyBilled=Classify billed diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index 32e6abf355e..12a61c146be 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -20,7 +20,6 @@ UserMargins=User margins ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service -Launch=Start ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default. MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -29,15 +28,11 @@ UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation -MargeBrute=Raw margin -MargeNette=Net margin MargeType1=Margin on Best supplier price MargeType2=Margin on Weighted Average Price (WAP) MargeType3=Margin on Cost Price -MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card
* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined
* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined CostPrice=Cost price -BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type @@ -45,4 +40,4 @@ AgentContactTypeDetails=Define what contact type (linked on invoices) will be us rateMustBeNumeric=Rate must be a numeric value markRateShouldBeLesserThan100=Mark rate should be lower than 100 ShowMarginInfos=Show margin infos -CheckMargins=Margins detail \ No newline at end of file +CheckMargins=Margins detail diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 7ebbe1dde4f..527a5bd7db3 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -1,19 +1,14 @@ # Dolibarr language file - Source file is en_US - members MembersArea=Members area -PublicMembersArea=Public members area MemberCard=Member card SubscriptionCard=Subscription card Member=Member Members=Members -MemberAccount=Member login ShowMember=Show member card UserNotLinkedToMember=User not linked to a member ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Members Tickets FundationMembers=Foundation members -Attributs=Attributes -ErrorMemberTypeNotDefined=Member type not defined -ListOfPublicMembers=List of public members ListOfValidatedPublicMembers=List of validated public members ErrorThisMemberIsNotPublic=This member is not public ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). @@ -36,21 +31,16 @@ MenuMembersUpToDate=Up to date members MenuMembersNotUpToDate=Out of date members MenuMembersResiliated=Resiliated members MembersWithSubscriptionToReceive=Members with subscription to receive -DateAbonment=Subscription date DateSubscription=Subscription date -DateNextSubscription=Next subscription DateEndSubscription=Subscription end date EndSubscription=End subscription SubscriptionId=Subscription id MemberId=Member id NewMember=New member -NewType=New member type MemberType=Member type MemberTypeId=Member type id MemberTypeLabel=Member type label MembersTypes=Members types -MembersAttributes=Members attributes -SearchAMember=Search a member MemberStatusDraft=Draft (needs to be validated) MemberStatusDraftShort=Draft MemberStatusActive=Validated (waiting subscription) @@ -62,17 +52,9 @@ MemberStatusPaidShort=Up to date MemberStatusResiliated=Resiliated member MemberStatusResiliatedShort=Resiliated MembersStatusToValid=Draft members -MembersStatusToValidShort=Draft members -MembersStatusValidated=Validated members -MembersStatusPaid=Subscription up to date -MembersStatusPaidShort=Up to date -MembersStatusNotPaid=Subscription out of date -MembersStatusNotPaidShort=Out of date MembersStatusResiliated=Resiliated members -MembersStatusResiliatedShort=Resiliated members NewCotisation=New contribution PaymentSubscription=New contribution payment -EditMember=Edit member SubscriptionEndDate=Subscription's end date MembersTypeSetup=Members type setup NewSubscription=New subscription @@ -81,8 +63,6 @@ Subscription=Subscription Subscriptions=Subscriptions SubscriptionLate=Late SubscriptionNotReceived=Subscription never received -SubscriptionLateShort=Late -SubscriptionNotReceivedShort=Never received ListOfSubscriptions=List of subscriptions SendCardByMail=Send card by Email AddMember=Create member @@ -90,7 +70,6 @@ NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" NewMemberType=New member type WelcomeEMail=Welcome e-mail SubscriptionRequired=Subscription required -EditType=Edit member type DeleteType=Delete VoteAllowed=Vote allowed Physical=Physical @@ -111,23 +90,18 @@ PublicMemberList=Public member list BlankSubscriptionForm=Public auto-subscription form BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. EnablePublicSubscriptionForm=Enable the public auto-subscription form -MemberPublicLinks=Public links/pages ExportDataset_member_1=Members and subscriptions ImportDataset_member_1=Members -LastMembers=Latest %s members LastMembersModified=Latest %s modified members LastSubscriptionsModified=Latest %s modified subscriptions -AttributeName=Attribute name String=String Text=Text Int=Int DateAndTime=Date and time PublicMemberCard=Member public card -MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe SubscriptionNotRecorded=Subscription not recorded AddSubscription=Create subscription ShowSubscription=Show subscription -MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest @@ -147,12 +121,9 @@ DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -MayBeOverwrited=This text can be overwrited by value defined for member's type ShowTypeCard=Show type '%s' HTPasswordExport=htpassword file generation NoThirdPartyAssociatedToMember=No third party associated to this member -ThirdPartyDolibarr=Dolibarr third party MembersAndSubscriptions= Members and Subscriptions MoreActions=Complementary action on recording MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription @@ -171,7 +142,6 @@ MembersStatisticsByCountries=Members statistics by country MembersStatisticsByState=Members statistics by state/province MembersStatisticsByTown=Members statistics by town MembersStatisticsByRegion=Members statistics by region -MemberByRegion=Members by region NbOfMembers=Number of members NoValidatedMemberYet=No validated members found MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. @@ -192,11 +162,6 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) DefaultAmount=Default amount of subscription CanEditAmount=Visitor can choose/edit amount of its subscription MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -Associations=Foundations -Collectivités=Organizations -Particuliers=Personal -Entreprises=Companies -DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
ByProperties=By characteristics MembersStatisticsByProperties=Members statistics by characteristics MembersByNature=This screen show you statistics on members by nature. diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang index bc90d1488e3..f42ea006eb6 100644 --- a/htdocs/langs/en_US/opensurvey.lang +++ b/htdocs/langs/en_US/opensurvey.lang @@ -3,7 +3,6 @@ Survey=Poll Surveys=Polls OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... NewSurvey=New poll -NoSurveysInDatabase=%s poll(s) into database. OpenSurveyArea=Polls area AddACommentForPoll=You can add a comment into poll... AddComment=Add comment @@ -40,26 +39,20 @@ NbOfVoters=Nb of voters SurveyResults=Results PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. 5MoreChoices=5 more choices -Abstention=Abstention Against=Against YouAreInivitedToVote=You are invited to vote for this poll VoteNameAlreadyExists=This name was already used for this poll -ErrorPollDoesNotExists=Error, poll %s does not exists. -OpenSurveyNothingToSetup=There is no specific setup to do. -PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. AddADate=Add a date AddStartHour=Add start hour AddEndHour=Add end hour votes=vote(s) NoCommentYet=No comments have been posted for this poll yet -CanEditVotes=Can change vote of others CanComment=Voters can comment in the poll CanSeeOthersVote=Voters can see other people's vote SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. BackToCurrentMonth=Back to current month ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation ErrorOpenSurveyOneChoice=Enter at least one choice -ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD ErrorInsertingComment=There was an error while inserting your comment MoreChoices=Enter more choices for the voters SurveyExpiredInfo=The poll has been closed or voting delay has expired. diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index b7ed77b30ba..a57bce0569f 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -6,7 +6,6 @@ OrderId=Order Id Order=Order Orders=Orders OrderLine=Order line -OrderFollow=Follow up OrderDate=Order date OrderDateShort=Order date OrderToProcess=Order to process @@ -20,7 +19,6 @@ CustomerOrder=Customer order CustomersOrders=Customer orders CustomersOrdersRunning=Current customer orders CustomersOrdersAndOrdersLines=Customer orders and order lines -OrdersToValid=Customer orders to validate OrdersToBill=Customer orders delivered OrdersInProcess=Customer orders in process OrdersToProcess=Customer orders to process @@ -35,7 +33,6 @@ StatusOrderProcessedShort=Processed StatusOrderDelivered=Delivered StatusOrderDeliveredShort=Delivered StatusOrderToBillShort=Delivered -StatusOrderToBill2Short=To bill StatusOrderApprovedShort=Approved StatusOrderRefusedShort=Refused StatusOrderBilledShort=Billed @@ -49,7 +46,6 @@ StatusOrderOnProcess=Ordered - Standby reception StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered -StatusOrderToBill2=To bill StatusOrderApproved=Approved StatusOrderRefused=Refused StatusOrderBilled=Billed @@ -58,13 +54,8 @@ StatusOrderReceivedAll=Everything received ShippingExist=A shipment exists ProductQtyInDraft=Product quantity into draft orders ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered -DraftOrWaitingApproved=Draft or approved not yet ordered -DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders -SearchOrder=Search order -SearchACustomerOrder=Search a customer order -SearchASupplierOrder=Search a supplier order ShipProduct=Ship product CreateOrder=Create Order RefuseOrder=Refuse order @@ -76,22 +67,16 @@ DeleteOrder=Delete order CancelOrder=Cancel order OrderReopened= Order %s Reopened AddOrder=Create order -AddToMyOrders=Add to my orders -AddToOtherOrders=Add to other orders AddToDraftOrders=Add to draft order ShowOrder=Show order OrdersOpened=Orders to process -NoOpenedOrders=No open orders -NoOtherOpenedOrders=No other open orders NoDraftOrders=No draft orders NoOrder=No order NoSupplierOrder=No supplier order -OtherOrders=Other orders LastOrders=Latest %s customer orders LastCustomerOrders=Latest %s customer orders LastSupplierOrders=Latest %s supplier orders LastModifiedOrders=Latest %s modified orders -LastClosedOrders=Latest %s closed orders AllOrders=All orders NbOfOrders=Number of orders OrdersStatistics=Order's statistics @@ -101,7 +86,6 @@ AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=List of orders CloseOrder=Close order ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. ConfirmDeleteOrder=Are you sure you want to delete this order ? ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? @@ -109,24 +93,17 @@ ConfirmCancelOrder=Are you sure you want to cancel this order ? ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? GenerateBill=Generate invoice ClassifyShipped=Classify delivered -ComptaCard=Accountancy card DraftOrders=Draft orders DraftSuppliersOrders=Draft suppliers orders -RelatedOrders=Related orders -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders OnProcessOrders=In process orders RefOrder=Ref. order RefCustomerOrder=Ref. order for customer -RefCustomerOrderShort=Ref. order for cust. RefOrderSupplier=Ref. order for supplier SendOrderByMail=Send order by mail ActionsOnOrder=Events on order NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order OrderMode=Order method AuthorRequest=Request author -UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -RunningOrders=Orders on process UserWithApproveOrderGrant=Users granted with "approve orders" permission. PaymentOrderRef=Payment of order %s CloneOrder=Clone order @@ -151,8 +128,6 @@ TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=Commercial proposal @@ -163,7 +138,6 @@ OrderSource4=Fax campaign OrderSource5=Commercial OrderSource6=Store QtyOrdered=Qty ordered -AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models PDFEinsteinDescription=A complete order model (logo...) PDFEdisonDescription=A simple order model diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 66f734f3c1c..1d0452a2596 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -77,11 +77,9 @@ DemoCompanyServiceOnly=Manage a freelance activity selling service only DemoCompanyShopWithCashDesk=Manage a shop with a cash desk DemoCompanyProductAndStocks=Manage a small or medium company selling products DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules) -GoToDemo=Go to demo CreatedBy=Created by %s ModifiedBy=Modified by %s ValidatedBy=Validated by %s -CanceledBy=Canceled by %s ClosedBy=Closed by %s CreatedById=User id who created ModifiedById=User id who made latest change @@ -95,10 +93,7 @@ CanceledByLogin=User login who canceled ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed -FeatureNotYetAvailableShort=Available in a future version FeatureNotYetAvailable=Feature not yet available in the current version -FeatureExperimental=Experimental feature. Not stable in the current version -FeatureDevelopment=Development feature. Not stable in the current version FeaturesSupported=Supported features Width=Width Height=Height @@ -110,7 +105,6 @@ Right=Right CalculatedWeight=Calculated weight CalculatedVolume=Calculated volume Weight=Weight -TotalWeight=Total weight WeightUnitton=tonne WeightUnitkg=kg WeightUnitg=g @@ -129,7 +123,6 @@ SurfaceUnitmm2=mm² SurfaceUnitfoot2=ft² SurfaceUnitinch2=in² Volume=Volume -TotalVolume=Total volume VolumeUnitm3=m³ VolumeUnitdm3=dm³ (L) VolumeUnitcm3=cm³ (ml) @@ -151,7 +144,6 @@ SendNewPasswordDesc=This form allows you to request a new password. It will be s BackToLoginPage=Back to login page AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
In this mode, Dolibarr can't know nor change your password.
Contact your system administrator if you want to change your password. EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option. -EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. DolibarrDemo=Dolibarr ERP/CRM demo StatsByNumberOfUnits=Statistics in number of products/services units @@ -210,11 +202,8 @@ SourcesRepository=Repository for sources Chart=Chart ##### Calendar common ##### -AddCalendarEntry=Add entry in calendar %s NewCompanyToDolibarr=Company %s added ContractValidatedInDolibarr=Contract %s validated -ContractCanceledInDolibarr=Contract %s canceled -ContractClosedInDolibarr=Contract %s closed PropalClosedSignedInDolibarr=Proposal %s signed PropalClosedRefusedInDolibarr=Proposal %s refused PropalValidatedInDolibarr=Proposal %s validated @@ -222,9 +211,6 @@ PropalClassifiedBilledInDolibarr=Proposal %s classified billed InvoiceValidatedInDolibarr=Invoice %s validated InvoicePaidInDolibarr=Invoice %s changed to paid InvoiceCanceledInDolibarr=Invoice %s canceled -PaymentDoneInDolibarr=Payment %s done -CustomerPaymentDoneInDolibarr=Customer payment %s done -SupplierPaymentDoneInDolibarr=Supplier payment %s done MemberValidatedInDolibarr=Member %s validated MemberResiliatedInDolibarr=Member %s resiliated MemberDeletedInDolibarr=Member %s deleted @@ -241,10 +227,8 @@ LibraryUsed=Librairy used LibraryVersion=Version ExportableDatas=Exportable data NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions) -ToExport=Export NewExport=New export ##### External sites ##### -ExternalSites=External sites WebsiteSetup=Setup of module website WEBSITE_PAGEURL=URL of page WEBSITE_TITLE=Title diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 54f8cb1980f..179c9027089 100644 --- a/htdocs/langs/en_US/paypal.lang +++ b/htdocs/langs/en_US/paypal.lang @@ -3,7 +3,6 @@ PaypalSetup=PayPal module setup PaypalDesc=This module offer pages to allow payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) PaypalOrCBDoPayment=Pay with credit card or Paypal PaypalDoPayment=Pay with Paypal -PaypalCBDoPayment=Pay with credit card PAYPAL_API_SANDBOX=Mode test/sandbox PAYPAL_API_USER=API username PAYPAL_API_PASSWORD=API password @@ -15,7 +14,6 @@ PaypalModeOnlyPaypal=PayPal only PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page ThisIsTransactionId=This is id of transaction: %s PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail -PAYPAL_IPN_MAIL_ADDRESS=E-mail address for the instant notification of payment (IPN) PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode NewPaypalPaymentReceived=New Paypal payment received diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang index 427b4973e80..14577a126e4 100644 --- a/htdocs/langs/en_US/printing.lang +++ b/htdocs/langs/en_US/printing.lang @@ -5,7 +5,6 @@ PrintingSetup=Setup of Direct Printing System PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. MenuDirectPrinting=Direct Printing jobs DirectPrint=Direct print -ModuleDriverSetup=Setup Module Driver PrintingDriverDesc=Configuration variables for printing driver. ListDrivers=List of drivers PrintTestDesc=List of Printers. @@ -14,10 +13,8 @@ NoActivePrintingModuleFound=No active module to print document PleaseSelectaDriverfromList=Please select a driver from list. PleaseConfigureDriverfromList=Please configure the selected driver from list. SetupDriver=Driver setup -TestDriver=Test TargetedPrinter=Targeted printer UserConf=Setup per user -PRINTGCP=Google Cloud Print PRINTGCP_INFO=Google OAuth API setup PRINTGCP_AUTHLINK=Authentication PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token @@ -26,21 +23,6 @@ PRINTGCP_TOKEN_EXPIRED=Token Expired PRINTGCP_TOKEN_EXPIRE_AT=Token expire at PRINTGCP_DELETE_TOKEN=Delete saved token PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. -PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. -PrintTestDescprintgcp=List of Printers for Google Cloud Print. -PRINTGCP_LOGIN=Google Account Login -PRINTGCP_PASSWORD=Google Account Password -STATE_ONLINE=Online -STATE_UNKNOWN=Unknown -STATE_OFFLINE=Offline -STATE_DORMANT=Offline for quite a while -TYPE_GOOGLE=Google -TYPE_HP=HP Printer -TYPE_DOCS=DOCS -TYPE_DRIVE=Google Drive -TYPE_FEDEX=Fedex -TYPE_ANDROID_CHROME_SNAPSHOT=Android -TYPE_IOS_CHROME_SNAPSHOT=IOS GCP_Name=Name GCP_displayName=Display Name GCP_Id=Printer Id @@ -48,21 +30,14 @@ GCP_OwnerName=Owner Name GCP_State=Printer State GCP_connectionStatus=Online State GCP_Type=Printer Type -PRINTIPP=PrintIPP Driver -PrintIPPSetup=Setup of Direct Print module PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. -PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. -PrintTestDescprintipp=List of Printers for driver PrintIPP. -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) NoDefaultPrinterDefined=No default printer defined DefaultPrinter=Default printer Printer=Printer -CupsServer=CUPS Server IPP_Uri=Printer Uri IPP_Name=Printer Name IPP_State=Printer State @@ -73,14 +48,6 @@ IPP_Color=Color IPP_Device=Device IPP_Media=Printer media IPP_Supported=Type of media -STATE_IPP_idle=Idle -STATE_IPP_stopped=Stopped -STATE_IPP_paused=Paused -STATE_IPP_toner-low-report=Low Toner -STATE_IPP_none=None -MEDIA_IPP_stationery=Stationery -MEDIA_IPP_thermal=Thermal -IPP_COLOR_print-black=BW Printer DirectPrintingJobsDesc=This page lists printing jobs found for available printers. GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret. -GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth. \ No newline at end of file +GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth. diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index c0509e6a902..a6f2ba51f23 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -14,8 +14,6 @@ Create=Create Reference=Reference NewProduct=New product NewService=New service -ProductCode=Product code -ServiceCode=Service code ProductVatMassChange=Mass VAT change ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. MassBarcodeInit=Mass barcode init @@ -25,29 +23,17 @@ ProductAccountancySellCode=Accountancy code (sell) ProductOrService=Product or Service ProductsAndServices=Products and Services ProductsOrServices=Products or Services -ProductsAndServicesOnSell=Products and Services for sale or for purchase -ProductsAndServicesNotOnSell=Products and Services not for sale -ProductsAndServicesStatistics=Products and Services statistics -ProductsStatistics=Products statistics ProductsOnSell=Product for sale or for purchase ProductsNotOnSell=Product not for sale and not for purchase ProductsOnSellAndOnBuy=Products for sale and for purchase ServicesOnSell=Services for sale or for purchase ServicesNotOnSell=Services not for sale ServicesOnSellAndOnBuy=Services for sale and for purchase -InternalRef=Internal reference -LastRecorded=Latest recorded products/services on sell -LastRecordedProductsAndServices=Latest %s recorded products/services LastModifiedProductsAndServices=Latest %s modified products/services LastRecordedProducts=Latest %s recorded products LastRecordedServices=Latest %s recorded services -LastProducts=Latest products -CardProduct0=Product card -CardProduct1=Service card -CardContract=Contract card Stock=Stock Stocks=Stocks -Movement=Movement Movements=Movements Sell=Sales Buy=Purchases @@ -62,7 +48,6 @@ ProductStatusOnBuy=For purchase ProductStatusNotOnBuy=Not for purchase ProductStatusOnBuyShort=For purchase ProductStatusNotOnBuyShort=Not for purchase -UpdatePrice=Update price UpdateVAT=Update vat UpdateDefaultPrice=Update default price UpdateLevelPrices=Update prices for each level @@ -70,22 +55,12 @@ AppliedPricesFrom=Applied prices from SellingPrice=Selling price SellingPriceHT=Selling price (net of tax) SellingPriceTTC=Selling price (inc. tax) -PublicPrice=Public price -CurrentPrice=Current price CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost. CostPriceUsage=In a future version, this value could be used for margin calculation. NewPrice=New price MinPrice=Min. selling price -MinPriceHT=Min. selling price (net of tax) -MinPriceTTC=Min. selling price (inc. tax) CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount. -ContractStatus=Contract status ContractStatusClosed=Closed -ContractStatusRunning=Ongoing -ContractStatusExpired=expired -ContractStatusOnHold=On hold -ContractStatusToRun=Make ongoing -ContractNotRunning=This contract is not ongoing ErrorProductAlreadyExists=A product with reference %s already exists. ErrorProductBadRefOrLabel=Wrong value for reference or label. ErrorProductClone=There was a problem while trying to clone the product or service. @@ -97,30 +72,19 @@ ShowService=Show service ProductsAndServicesArea=Product and Services area ProductsArea=Product area ServicesArea=Services area -AddToMyProposals=Add to my proposals -AddToOtherProposals=Add to other proposals -AddToMyBills=Add to my bills -AddToOtherBills=Add to other bills -CorrectStock=Correct stock ListOfStockMovements=List of stock movements BuyingPrice=Buying price PriceForEachProduct=Products with specific prices -NoPriceSpecificToCustomer=This customer has no specific prices. All standard prices for products/services will be used. SupplierCard=Supplier card -AllWays=Path to find your product in stock -NoCat=Your product is not in any category -PrimaryWay=Primary path PriceRemoved=Price removed BarCode=Barcode BarcodeType=Barcode type SetDefaultBarcodeType=Set barcode type BarcodeValue=Barcode value NoteNotVisibleOnBill=Note (not visible on invoices, proposals...) -CreateCopy=Create copy ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices -MultiPriceLevelsName=Price categories AssociatedProductsAbility=Activate the package feature AssociatedProducts=Package product AssociatedProductsNumber=Number of products composing this package product @@ -128,12 +92,10 @@ ParentProductsNumber=Number of parent packaging product ParentProducts=Parent products IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product -EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter CategoryFilter=Category filter ProductToAddSearch=Search product to add -AddDel=Add/Delete NoMatchFound=No match found ProductAssociationList=List of products/services that are component of this virtual product/package ProductParentList=List of package products/services with this product as a component @@ -147,22 +109,13 @@ ImportDataset_produit_1=Products ImportDataset_service_1=Services DeleteProductLine=Delete product line ConfirmDeleteProductLine=Are you sure you want to delete this product line? -NoProductMatching=No product/service match your criteria -MatchingProducts=Matching products/services -NoStockForThisProduct=No stock for this product -NoStock=No Stock -Restock=Restock ProductSpecial=Special QtyMin=Minimum Qty -PriceQty=Price for this quantity PriceQtyMin=Price for this min. qty (w/o discount) VATRateForSupplierProduct=VAT Rate (for this supplier/product) DiscountQtyMin=Default discount for qty NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product -RecordedProducts=Products recorded -RecordedServices=Services recorded -RecordedProductsAndServices=Products/services recorded PredefinedProductsToSell=Predefined products to sell PredefinedServicesToSell=Predefined services to sell PredefinedProductsAndServicesToSell=Predefined products/services to sell @@ -171,7 +124,6 @@ PredefinedServicesToPurchase=Predefined services to purchase PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase NotPredefinedProducts=Not predefined products/services GenerateThumb=Generate thumb -ProductCanvasAbility=Use special "canvas" addons ServiceNb=Service #%s ListProductServiceByPopularity=List of products/services by popularity ListProductByPopularity=List of products by popularity @@ -192,7 +144,6 @@ SuppliersPrices=Supplier prices SuppliersPricesOfProductsOrServices=Supplier prices (of products or services) CustomCode=Customs code CountryOrigin=Origin country -HiddenIntoCombo=Hidden into select lists Nature=Nature ShortLabel=Short label Unit=Unit @@ -211,42 +162,24 @@ gram=gram g=g meter=meter m=m -linearmeter=linear meter lm=lm -squaremeter=square meter m2=m² -cubicmeter=cubic meter m3=m³ liter=liter l=L ProductCodeModel=Product ref template ServiceCodeModel=Service ref template -AddThisProductCard=Create product card -HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. -AddThisServiceCard=Create service card -HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity PriceByQuantityRange=Quantity range -ProductsDashboard=Products/Services summary -UpdateOriginalProductLabel=Modify original label -HelpUpdateOriginalProductLabel=Allows to edit the name of the product MultipriceRules=Price level rules UseMultipriceRules=Use price level rules (defined into product module setup) to autocalculate prices of all other level according to first level PercentVariationOver=%% variation over %s PercentDiscountOver=%% discount over %s ### composition fabrication -Building=Production and items dispatchment Build=Produce -BuildIt=Produce & Dispatch -BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) -QtyNeed=Qty -UnitPmp=Net unit VWAP -CostPmpHT=Net total VWAP -ProductUsedForBuild=Auto consumed by production -ProductBuilded=Production completed ProductsMultiPrice=Products and prices for each price level ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices) ProductSellByQuarterHT=Products turnover quarterly before tax @@ -297,12 +230,6 @@ AddUpdater=Add Updater GlobalVariables=Global variables VariableToUpdate=Variable to update GlobalVariableUpdaters=Global variable updaters -GlobalVariableUpdaterType0=JSON data -GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value, -GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} -GlobalVariableUpdaterType1=WebService data -GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method -GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} UpdateInterval=Update interval (minutes) LastUpdated=Last updated CorrectlyUpdated=Correctly updated diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 6d1c8e4e3cb..1a370ecf47a 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -26,18 +26,13 @@ DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? ConfirmDeleteATask=Are you sure you want to delete this task ? -OfficerProject=Officer project -LastProjects=Latest %s projects -AllProjects=All projects OpenedProjects=Open projects OpenedTasks=Open tasks OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status OpportunitiesStatusForProjects=Opportunities amount of projects by status -ProjectsList=List of projects ShowProject=Show project SetProject=Set project NoProject=No project defined or owned -NbOpenTasks=Nb of open tasks NbOfProjects=Nb of projects TimeSpent=Time spent TimeSpentByYou=Time spent by you @@ -53,7 +48,6 @@ TasksOnOpenedProject=Tasks on open projects WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent -MyTasks=My tasks Tasks=Tasks Task=Task TaskDateStart=Task start date @@ -61,10 +55,8 @@ TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task AddTask=Create task -AddDuration=Add duration Activity=Activity Activities=Tasks/activities -MyActivity=My activity MyActivities=My tasks/activities MyProjects=My projects MyProjectsArea=My projects Area @@ -87,7 +79,6 @@ ListExpenseReportsAssociatedProject=List of expense reports associated with the ListDonationsAssociatedProject=List of donations associated with the project ListActionsAssociatedProject=List of events associated with the project ListTaskTimeUserProject=List of time consumed on tasks of project -TaskTimeUserProject=Time consumed on tasks of project ActivityOnProjectToday=Activity on project today ActivityOnProjectYesterday=Activity on project yesterday ActivityOnProjectThisWeek=Activity on project this week @@ -150,18 +141,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element -UnlinkElement=Unlink element # Documents models DocumentModelBeluga=Project template for linked objects overview DocumentModelBaleine=Project report template for tasks PlannedWorkload=Planned workload PlannedWorkloadShort=Workload -WorkloadOccupation=Workload assignation ProjectReferers=Related items -SearchAProject=Search a project -SearchATask=Search a task ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a resource to allocate time InputPerDay=Input per day InputPerWeek=Input per week @@ -170,7 +156,6 @@ TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s ProjectsWithThisUserAsContact=Projects with this user as contact TasksWithThisUserAsContact=Tasks assigned to this user ResourceNotAssignedToProject=Not assigned to project -ResourceNotAssignedToTask=Not assigned to task ResourceNotAssignedToTheTask=Not assigned to the task AssignTaskToMe=Assign task to me AssignTask=Assign diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 943cde76835..8c8c37a7bb1 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -3,27 +3,21 @@ Proposals=Commercial proposals Proposal=Commercial proposal ProposalShort=Proposal ProposalsDraft=Draft commercial proposals -ProposalDraft=Draft commercial proposal ProposalsOpened=Open commercial proposals Prop=Commercial proposals CommercialProposal=Commercial proposal -CommercialProposals=Commercial proposals ProposalCard=Proposal card NewProp=New commercial proposal -NewProposal=New commercial proposal NewPropal=New proposal Prospect=Prospect -ProspectList=Prospect list DeleteProp=Delete commercial proposal ValidateProp=Validate commercial proposal AddProp=Create proposal ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name %s ? LastPropals=Latest %s proposals -LastClosedProposals=Latest %s closed proposals LastModifiedProposals=Latest %s modified proposals AllPropals=All proposals -LastProposals=Latest proposals SearchAProposal=Search a proposal NoProposal=No proposal ProposalsStatistics=Commercial proposal's statistics @@ -33,17 +27,12 @@ NbOfProposals=Number of commercial proposals ShowPropal=Show proposal PropalsDraft=Drafts PropalsOpened=Open -PropalsNotBilled=Closed not billed PropalStatusDraft=Draft (needs to be validated) PropalStatusValidated=Validated (proposal is open) -PropalStatusOpened=Validated (proposal is open) -PropalStatusClosed=Closed PropalStatusSigned=Signed (needs billing) PropalStatusNotSigned=Not signed (closed) PropalStatusBilled=Billed PropalStatusDraftShort=Draft -PropalStatusValidatedShort=Validated -PropalStatusOpenedShort=Open PropalStatusClosedShort=Closed PropalStatusSignedShort=Signed PropalStatusNotSignedShort=Not signed @@ -52,24 +41,14 @@ PropalsToClose=Commercial proposals to close PropalsToBill=Signed commercial proposals to bill ListOfProposals=List of commercial proposals ActionsOnPropal=Events on proposal -NoOpenedPropals=No open commercial proposals -NoOtherOpenedPropals=No other open commercial proposals -NoPropal=No commercial proposal RefProposal=Commercial proposal ref SendPropalByMail=Send commercial proposal by mail -AssociatedDocuments=Documents associated with the proposal: -ErrorCantOpenDir=Can't open directory DatePropal=Date of proposal DateEndPropal=Validity ending date -DateEndPropalShort=Date end ValidityDuration=Validity duration CloseAs=Set status to SetAcceptedRefused=Set accepted/refused -BuildBill=Build invoice ErrorPropalNotFound=Propal %s not found -Estimate=Estimate : -EstimateShort=Estimate -OtherPropals=Other proposals AddToDraftProposals=Add to draft proposal NoDraftProposals=No draft proposals CopyPropalFrom=Create commercial proposal by copying existing proposal @@ -96,7 +75,6 @@ TypeContact_propal_external_BILLING=Customer invoice contact TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal # Document models DocModelAzurDescription=A complete proposal model (logo...) -DocModelJauneDescription=Jaune proposal model DefaultModelPropalCreate=Default model creation DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang index a2f3ba26a21..756461488cc 100644 --- a/htdocs/langs/en_US/receiptprinter.lang +++ b/htdocs/langs/en_US/receiptprinter.lang @@ -35,64 +35,10 @@ DOL_ALIGN_RIGHT=Right align text DOL_USE_FONT_A=Use font A of printer DOL_USE_FONT_B=Use font B of printer DOL_USE_FONT_C=Use font C of printer -DOL_BOLD=Text Bold -/DOL_BOLD=End of Text Bold -DOL_DOUBLE_HEIGHT=Text double height -/DOL_DOUBLE_HEIGHT=End of Text double height -DOL_DOUBLE_WIDTH=Text double width -/DOL_DOUBLE_WIDTH=End of Text double width -DOL_UNDERLINE=Underline text -/DOL_UNDERLINE=End of Underline text -DOL_UNDERLINE_2DOTS=Underline with double line -/DOL_UNDERLINE_2DOTS=End of Underline with double line -DOL_EMPHASIZED=Emphasized text -/DOL_EMPHASIZED=End of Emphasized text -DOL_SWITCH_COLORS=Print in white on black -/DOL_SWITCH_COLORS=End of Print in white on black DOL_PRINT_BARCODE=Print barcode DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id -DOL_SET_PRINT_WIDTH_57=Ticket print width of 57mm DOL_CUT_PAPER_FULL=Cut ticket completely DOL_CUT_PAPER_PARTIAL=Cut ticket partially DOL_OPEN_DRAWER=Open cash drawer DOL_ACTIVATE_BUZZER=Activate buzzer DOL_PRINT_QRCODE=Print QR Code -DOL_PRINT_DATE=Print date AAAA-MM-DD -DOL_PRINT_DATE_TIME=Print date and time AAAA-MM-DD HH:MM:SS -DOL_PRINT_YEAR=Print Year -DOL_PRINT_MONTH_LETTERS=Print month in letters (example : november) -DOL_PRINT_MONTH=Print month number -DOL_PRINT_DAY=Print day number -DOL_PRINT_DAY_LETTERS=Print day number -DOL_PRINT_TABLE=Print table number (for restaurant, bar...) -DOL_PRINT_CUTLERY=Print number of cutlery (for restaurant) -DOL_PRINT_PAYMENT=Print payment method -DOL_PRINT_LOGO=Print logo stored on printer. Example : 32|32 -DOL_PRINT_LOGO_OLD=Print logo stored on printer. Must be followed by logo code. For old printers. -DOL_PRINT_ORDER_LINES=Print order lines -DOL_PRINT_ORDER_TAX=Print order total tax -DOL_PRINT_ORDER_LOCAL_TAX=Print order local tax -DOL_PRINT_ORDER_TOTAL=Print order total -DOL_PRINT_ORDER_NUMBER=Print order number -DOL_PRINT_ORDER_NUMBER_UNIQUE=Print order number after validation -DOL_PRINT_CUSTOMER_FIRSTNAME=Print customer name -DOL_PRINT_CUSTOMER_LASTNAME=Print customer surname -DOL_PRINT_CUSTOMER_MAIL=Print customer mail -DOL_PRINT_CUSTOMER_PHONE=Print customer phone -DOL_PRINT_CUSTOMER_MOBILE=Print customer mobile -DOL_PRINT_CUSTOMER_SKYPE=Print customer skype -DOL_PRINT_CUSTOMER_TAX_NUMBER=Print customer VAT number -DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Print customer account balance -DOL_PRINT_VENDOR_LASTNAME=Print vendor surname -DOL_PRINT_VENDOR_FIRSTNAME=Print vendor name -DOL_PRINT_VENDOR_MAIL=Print vendor mail -DOL_PRINT_CUSTOMER_POINTS=Print customer points -DOL_PRINT_ORDER_POINTS=Print number of points for this order -DOL_PRINT_IF_CUSTOMER=Print the line IF a customer is affected to the order -DOL_PRINT_IF_VENDOR=Print the line IF a vendor is affected to the order -DOL_PRINT_IF_HAPPY_HOUR=Print the line IF Happy Hour -DOL_PRINT_IF_NUM_ORDER_UNIQUE=Print the line IF order is validated -DOL_PRINT_IF_CUSTOMER_POINTS=Print the line IF customer points > 0 -DOL_PRINT_IF_ORDER_POINTS=Print the line IF points of the order > 0 -DOL_PRINT_IF_CUSTOMER_TAX_NUMBER=Print the line IF customer has vat number -DOL_PRINT_IF_CUSTOMER_ACCOUNT_BALANCE_POSITIVE=Print the line IF customer balance > 0 diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang index cdff0391c30..f95121db351 100644 --- a/htdocs/langs/en_US/resource.lang +++ b/htdocs/langs/en_US/resource.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - resource MenuResourceIndex=Resources MenuResourceAdd=New resource -MenuResourcePlanning=Resource planning DeleteResource=Delete resource ConfirmDeleteResourceElement=Confirm delete the resource for this element NoResourceInDatabase=No resource in database. @@ -18,8 +17,6 @@ ResourceFormLabel_description=Resource description ResourcesLinkedToElement=Resources linked to element ShowResource=Show resource -ShowResourcePlanning=Show resource planning -GotoDate=Go to date ResourceElementPage=Element resources ResourceCreatedWithSuccess=Resource successfully created @@ -27,7 +24,6 @@ RessourceLineSuccessfullyDeleted=Resource line successfully deleted RessourceLineSuccessfullyUpdated=Resource line successfully updated ResourceLinkedWithSuccess=Resource linked with success -TitleResourceCard=Resource card ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 270c92b3045..5a4ef0da435 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -10,42 +10,31 @@ Receivings=Delivery Receipts SendingsArea=Shipments area ListOfSendings=List of shipments SendingMethod=Shipping method -SendingReceipt=Shipping receipt LastSendings=Latest %s shipments -SearchASending=Search for shipment StatisticsOfSendings=Statistics for shipments NbOfSendings=Number of shipments NumberOfShipmentsByMonth=Number of shipments by month SendingCard=Shipment card NewSending=New shipment CreateASending=Create a shipment -CreateSending=Create shipment QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order -SendingsForSameOrder=Shipments for this order SendingsAndReceivingForSameOrder=Shipments and receivings for this order SendingsToValidate=Shipments to validate StatusSendingCanceled=Canceled StatusSendingDraft=Draft StatusSendingValidated=Validated (products to ship or already shipped) StatusSendingProcessed=Processed -StatusSendingCanceledShort=Canceled StatusSendingDraftShort=Draft StatusSendingValidatedShort=Validated StatusSendingProcessedShort=Processed SendingSheet=Shipment sheet -Carriers=Carriers -Carrier=Carrier -CarriersArea=Carriers area -NewCarrier=New carrier ConfirmDeleteSending=Are you sure you want to delete this shipment ? ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? ConfirmCancelSending=Are you sure you want to cancel this shipment ? -GenericTransport=Generic transport -Enlevement=Gotten by customer DocumentModelSimple=Simple document model DocumentModelMerou=Merou A5 model WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. @@ -57,11 +46,7 @@ SendShippingRef=Submission of shipment %s ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. -RelatedShippings=Related shipments ShipmentLine=Shipment line -CarrierList=List of transporters -SendingRunning=Product from ordered customer orders -SuppliersReceiptRunning=Product from ordered supplier orders ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent @@ -69,14 +54,9 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened suppli NoProductToShipFoundIntoStock=No product to ship found into warehouse %s. Correct stock or go back to choose another warehouse. WeightVolShort=Weight/Vol. ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments. -CloseShippeOrdersAutomatically=Classify the order "Delivered" if entirely shipped. # Sending methods -SendingMethodCATCH=Catch by customer -SendingMethodTRANS=Transporter -SendingMethodCOLSUI=Colissimo # ModelDocument -DocumentModelSirocco=Simple document model for delivery receipts DocumentModelTyphon=More complete document model for delivery receipts (logo...) Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Sum of product volumes diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index c0f304bce35..d295e4b3451 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -5,8 +5,6 @@ Warehouses=Warehouses NewWarehouse=New warehouse / Stock area WarehouseEdit=Modify warehouse MenuNewWarehouse=New warehouse -WarehouseOpened=Warehouse open -WarehouseClosed=Warehouse closed WarehouseSource=Source warehouse WarehouseSourceNotDefined=No warehouse defined, AddOne=Add one @@ -17,11 +15,8 @@ DeleteSending=Delete sending Stock=Stock Stocks=Stocks StocksByLotSerial=Stocks by lot/serial -Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required -ErrorWarehouseLabelRequired=Warehouse label is required -CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements StocksArea=Warehouses area @@ -41,7 +36,6 @@ StockMovements=Stock movements LabelMovement=Movement label NumberOfUnit=Number of units UnitPurchaseValue=Unit purchase price -TotalStock=Total in stock StockTooLow=Stock too low StockLowerThanLimit=Stock lower than alert limit EnhancedValue=Value @@ -63,7 +57,6 @@ DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification close ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving -ReStockOnDeleteInvoice=Increase real stocks on invoice deletion OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. @@ -73,10 +66,6 @@ StockLimit=Stock limit for alert PhysicalStock=Physical stock RealStock=Real Stock VirtualStock=Virtual stock -MininumStock=Minimum stock -StockUp=Stock up -MininumStockShort=Stock min -StockUpShort=Stock up IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse @@ -96,10 +85,8 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase NoStockAction=No stock action -LastWaitingSupplierOrders=Orders waiting for receptions DesiredStock=Desired optimal stock DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature. -DesiredMaxStock=Desired maximum stock StockToBuy=To order Replenishment=Replenishment ReplenishmentOrders=Replenishment orders @@ -122,7 +109,6 @@ Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) MassMovement=Mass movement -MassStockMovement=Mass stock movement SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". RecordMovement=Record transfert ReceivingForSameOrder=Receipts for this order @@ -137,7 +123,6 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse -WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. InventoryCodeShort=Inv./Mov. code NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang index 394d4cabe01..86127b11a96 100644 --- a/htdocs/langs/en_US/supplier_proposal.lang +++ b/htdocs/langs/en_US/supplier_proposal.lang @@ -13,34 +13,23 @@ SupplierProposalArea=Supplier proposals area SupplierProposalShort=Supplier proposal SupplierProposals=Supplier proposals NewAskPrice=New price request -NewAsk=New request ShowSupplierProposal=Show price request AddSupplierProposal=Create a price request SupplierProposalRefFourn=Supplier ref SupplierProposalDate=Delivery date SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references. -RelatedSupplierProposal=Related price requests suppliers ConfirmValidateAsk=Are you sure you want to validate this price request under name %s ? -DateAsk=Date of request DeleteAsk=Delete request ValidateAsk=Validate request -AddAsk=Create a request -SupplierProposalDraft=Drafts -SupplierProposalOpened=Open SupplierProposalStatusDraft=Draft (needs to be validated) SupplierProposalStatusValidated=Validated (request is open) -SupplierProposalStatusOpened=Validated (request is open) SupplierProposalStatusClosed=Closed SupplierProposalStatusSigned=Accepted SupplierProposalStatusNotSigned=Refused -SupplierProposalStatusBilled=Billed SupplierProposalStatusDraftShort=Draft -SupplierProposalStatusValidatedShort=Validated -SupplierProposalStatusOpenedShort=Open SupplierProposalStatusClosedShort=Closed SupplierProposalStatusSignedShort=Accepted SupplierProposalStatusNotSignedShort=Refused -SupplierProposalStatusBilledShort=Billed CopyAskFrom=Create price request by copying existing a request CreateEmptyAsk=Create blank request CloneAsk=Clone price request @@ -60,4 +49,4 @@ ListOfSupplierProposal=List of supplier proposal requests SupplierProposalsToClose=Supplier proposals to close SupplierProposalsToProcess=Supplier proposals to process LastSupplierProposals=Last price requests -AllPriceRequests=All requests \ No newline at end of file +AllPriceRequests=All requests diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 8c96a0a68e8..10b4a5e60c8 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -1,7 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -AddSupplier=Create a supplier -SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice ShowSupplierInvoice=Show Supplier Invoice NewSupplier=New supplier @@ -11,14 +9,11 @@ ShowSupplier=Show supplier OrderDate=Order date BuyingPriceMin=Minimum purchase price BuyingPriceMinShort=Min purchase price -SellingPriceMinShort=Min sell price -TotalBuyingPriceMin=Total of subproducts buying prices TotalBuyingPriceMinShort=Total of subproducts purchase prices TotalSellingPriceMinShort=Total of subproducts sell prices SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Add supplier price ChangeSupplierPrice=Change supplier price -ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s NoRecordedSuppliers=No suppliers recorded SupplierPayment=Supplier payment @@ -33,12 +28,9 @@ ConfirmApproveThisOrder=Are you sure you want to approve order %s ? DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -AddCustomerOrder=Create customer order -AddCustomerInvoice=Create customer invoice AddSupplierOrder=Create supplier order AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s -NoneOrBatchFileNeverRan=None or batch %s not ran recently SentToSuppliers=Sent to suppliers ListOfSupplierOrders=List of supplier orders MenuOrdersSupplierToBill=Supplier orders to invoice @@ -48,4 +40,4 @@ UseDoubleApproval=Use double approval when amount (without tax) is higher than ( SupplierReputation=Supplier reputation DoNotOrderThisProductToThisSupplier=Do not order NotTheGoodQualitySupplier=Wrong quality -ReputationForThisProduct=Reputation \ No newline at end of file +ReputationForThisProduct=Reputation diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 9b96843f98d..33f98d6d5a7 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - trips ExpenseReport=Expense report ExpenseReports=Expense reports -Trip=Expense report Trips=Expense reports TripsAndExpenses=Expenses reports TripsAndExpensesStatistics=Expense reports statistics @@ -12,21 +11,18 @@ ListOfFees=List of fees ShowTrip=Show expense report NewTrip=New expense report CompanyVisited=Company/foundation visited -Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers DeleteTrip=Delete expense report ConfirmDeleteTrip=Are you sure you want to delete this expense report ? ListTripsAndExpenses=List of expense reports ListToApprove=Waiting for approval ExpensesArea=Expense reports area -SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' ExpenseReportWaitingForApproval=A new expense report has been submitted for approval ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s TripId=Id expense report AnyOtherInThisListCanValidate=Person to inform for validation. TripSociete=Information company -TripSalarie=Informations user TripNDF=Informations expense report PDFStandardExpenseReports=Standard template to generate a PDF document for expense report ExpenseReportLine=Expense report line @@ -43,13 +39,8 @@ TF_HOTEL=Hotel TF_TAXI=Taxi ErrorDoubleDeclaration=You have declared another expense report into a similar date range. -AucuneNDF=No expense reports found for this criteria AucuneLigne=There is no expense report declared yet -AddLine=Add a line -AddLineMini=Add -Date_DEBUT=Period date start -Date_FIN=Period date end ModePaiement=Payment mode VALIDATOR=User responsible for approval @@ -64,21 +55,15 @@ MOTIF_CANCEL=Reason DATE_REFUS=Deny date DATE_SAVE=Validation date -DATE_VALIDE=Validation date DATE_CANCEL=Cancelation date DATE_PAIEMENT=Payment date -TO_PAID=Pay BROUILLONNER=Reopen -SendToValid=Sent on approval -ModifyInfoGen=Edit ValidateAndSubmit=Validate and submit for approval ValidatedWaitingApproval=Validated (waiting for approval) -NOT_VALIDATOR=You are not allowed to approve this expense report NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. -RefuseTrip=Deny an expense report ConfirmRefuseTrip=Are you sure you want to deny this expense report ? ValideTrip=Approve expense report @@ -87,7 +72,6 @@ ConfirmValideTrip=Are you sure you want to approve this expense report ? PaidTrip=Pay an expense report ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? -CancelTrip=Cancel an expense report ConfirmCancelTrip=Are you sure you want to cancel this expense report ? BrouillonnerTrip=Move back expense report to status "Draft" diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 13f816c7a3e..a8447504235 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -1,9 +1,7 @@ # Dolibarr language file - Source file is en_US - users HRMArea=HRM area UserCard=User card -ContactCard=Contact card GroupCard=Group card -NoContactCard=No card among contacts Permission=Permission Permissions=Permissions EditPassword=Edit password @@ -11,8 +9,6 @@ SendNewPassword=Regenerate and send password ReinitPassword=Regenerate password PasswordChangedTo=Password changed to: %s SubjectNewPassword=Your new password for Dolibarr -AvailableRights=Available permissions -OwnedRights=Owned permissions GroupRights=Group permissions UserRights=User permissions UserGUISetup=User display setup @@ -20,31 +16,23 @@ DisableUser=Disable DisableAUser=Disable a user DeleteUser=Delete DeleteAUser=Delete a user -DisableGroup=Disable -DisableAGroup=Disable a group EnableAUser=Enable a user -EnableAGroup=Enable a group DeleteGroup=Delete DeleteAGroup=Delete a group ConfirmDisableUser=Are you sure you want to disable user %s ? -ConfirmDisableGroup=Are you sure you want to disable group %s ? ConfirmDeleteUser=Are you sure you want to delete user %s ? ConfirmDeleteGroup=Are you sure you want to delete group %s ? ConfirmEnableUser=Are you sure you want to enable user %s ? -ConfirmEnableGroup=Are you sure you want to enable group %s ? ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ? ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ? NewUser=New user CreateUser=Create user -SearchAGroup=Search a group -SearchAUser=Search a user LoginNotDefined=Login is not defined. NameNotDefined=Name is not defined. ListOfUsers=List of users SuperAdministrator=Super Administrator SuperAdministratorDesc=Global administrator AdministratorDesc=Administrator -AdministratorDescEntity=Administrator (for its company) DefaultRights=Default permissions DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user). DolibarrUsers=Dolibarr users @@ -57,7 +45,6 @@ RemoveFromGroup=Remove from group PasswordChangedAndSentTo=Password changed and sent to %s. PasswordChangeRequestSent=Request to change password for %s sent to %s. MenuUsersAndGroups=Users & Groups -MenuMyUserCard=My user card LastGroupsCreated=Latest %s created groups LastUsersCreated=Latest %s users created ShowGroup=Show group @@ -65,25 +52,17 @@ ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully PhotoFile=Photo file -UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group ListOfGroupsForUser=List of groups for this user -UsersToAdd=Users to add to this group -GroupsToAdd=Groups to add to this user -NoLogin=No login LinkToCompanyContact=Link to third party / contact LinkedToDolibarrMember=Link to member LinkedToDolibarrUser=Link to Dolibarr user LinkedToDolibarrThirdParty=Link to Dolibarr third party CreateDolibarrLogin=Create a user CreateDolibarrThirdParty=Create a third party -LoginAccountDisable=Account disabled, put a new login to activate it. LoginAccountDisableInDolibarr=Account disabled in Dolibarr. -LoginAccountDisableInLdap=Account disabled in the domain. UsePersonalValue=Use personal value -GuiLanguage=Interface language InternalUser=Internal user -MyInformations=My data ExportDataset_user_1=Dolibarr's users and properties DomainUser=Domain user %s Reactivate=Reactivate @@ -94,8 +73,6 @@ Inherited=Inherited UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party) UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party) IdPhoneCaller=Id phone caller -UserLogged=User %s login -UserLogoff=User %s logout NewUserCreated=User %s created NewUserPassword=Password change for %s EventUserModified=User %s modified diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index d43b65fc0f8..64e5041061a 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -4,7 +4,6 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. WEBSITE_PAGENAME=Page name/alias -WEBSITE_URL=Web site URL WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS content MediaFiles=Media library @@ -21,4 +20,4 @@ PageAdded=Page '%s' added ViewSiteInNewTab=View site in new tab ViewPageInNewTab=View page in new tab SetAsHomePage=Set as Home page -RealURL=Real URL \ No newline at end of file +RealURL=Real URL diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 1b282432a16..54b3de3915b 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -1,24 +1,16 @@ # Dolibarr language file - Source file is en_US - withdrawals -StandingOrdersArea=Standing orders area CustomersStandingOrdersArea=Customers standing orders area StandingOrders=Standing orders StandingOrder=Standing orders NewStandingOrder=New standing order StandingOrderToProcess=To process -StandingOrderProcessed=Processed -Withdrawals=Withdrawals -Withdrawal=Withdrawal WithdrawalsReceipts=Withdrawal receipts WithdrawalReceipt=Withdrawal receipt -WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Latest %s withdrawal receipts -WithdrawedBills=Withdrawal invoices WithdrawalsLines=Withdrawal lines RequestStandingOrderToTreat=Request for standing orders to process RequestStandingOrderTreated=Request for standing orders processed NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. -CustomersStandingOrders=Customer standing orders -CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information InvoiceWaitingWithdraw=Invoice waiting for withdraw @@ -32,7 +24,6 @@ WithdrawRejectStatistics=Withdraw reject's statistics LastWithdrawalReceipt=Latest %s withdrawal receipts MakeWithdrawRequest=Make a withdraw request ThirdPartyBankCode=Third party bank code -ThirdPartyDeskCode=Third party desk code NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN. ClassCredited=Classify credited ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? @@ -48,7 +39,6 @@ RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection InvoiceRefused=Invoice refused (Charge the rejection to customer) -StatusUnknown=Unknown StatusWaiting=Waiting StatusTrans=Sent StatusCredited=Credited @@ -67,10 +57,8 @@ CreateGuichet=Only office CreateBanque=Only bank OrderWaiting=Waiting for treatment NotifyTransmision=Withdrawal Transmission -NotifyEmision=Withdrawal Emission NotifyCredit=Withdrawal Credit NumeroNationalEmetter=National Transmitter Number -PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws @@ -95,7 +83,6 @@ InfoCreditMessage=The standing order %s has been paid by the bank
Data of pay InfoTransSubject=Transmission of standing order %s to bank InfoTransMessage=The standing order %s has been sent to bank by %s %s.

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

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

--
%s ModeWarning=Option for real mode was not set, we stop after this simulation