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

Merge pull request #9569 from grandoc/new_branch_19_09_2018

Browse Source 
Missing translation
This commit is contained in:
Laurent Destailleur 2018-09-21 09:50:18 +02:00 committed by GitHub
commit 8cfe5d7252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 147 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -38,9 +38,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_order_odt extends ModelePDFCommandes
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

6
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -115,9 +115,9 @@ class pdf_einstein extends ModelePDFCommandes
public $marge_basse;
/**
* Issuer
* @var Societe
*/
* Issuer
* @var Societe
*/
public $emetteur; // Objet societe qui emet

11
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_contract_odt extends ModelePDFContract
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

11
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -39,9 +39,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_shipment_odt extends ModelePdfExpedition
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

9
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -38,9 +38,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_invoice_odt extends ModelePDFFactures
{
/**
* Issuer
* @var Societe
*/
public $emetteur; // Objet societe qui emet
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

11
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
View File

@ -36,9 +36,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_product_odt extends ModelePDFProduct
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

10
htdocs/core/modules/product/doc/pdf_standard.modules.php
View File

@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFProduct
/**
* @var array() Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.3 = array(5, 3)
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 2);
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFProduct
public $marge_haute;
public $marge_basse;
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
/**

9
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -54,9 +54,18 @@ if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/
*/
class doc_generic_task_odt extends ModelePDFTask
{
/**
* Issuer
* @var Societe
*/
public $emetteur; // Objet societe qui emet
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

9
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_proposal_odt extends ModelePDFPropales
{
/**
* Issuer
* @var Societe
*/
public $emetteur; // Objet societe qui emet
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

11
htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
View File

@ -36,9 +36,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_stock_odt extends ModelePDFStock
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

10
htdocs/core/modules/stock/doc/pdf_standard.modules.php
View File

@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFStock
/**
* @var array() Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.3 = array(5, 3)
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 2);
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFStock
public $marge_haute;
public $marge_basse;
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
/**

10
htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
View File

@ -59,9 +59,9 @@ class pdf_stdmovement extends ModelePDFMovement
/**
* @var array() Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.3 = array(5, 3)
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 2);
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
@ -77,7 +77,11 @@ class pdf_stdmovement extends ModelePDFMovement
public $marge_haute;
public $marge_basse;
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
/**

11
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
View File

@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

7
htdocs/core/modules/ticket/mod_ticket_simple.php
View File

@ -30,7 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php';
*/
class mod_ticket_simple extends ModeleNumRefTicket
{
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $prefix = 'TS';
public $error = '';
public $nom = "Simple";

7
htdocs/core/modules/ticket/mod_ticket_universal.php
View File

@ -29,7 +29,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php';
*/
class mod_ticket_universal extends ModeleNumRefTicket
{
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $error = '';
public $nom = 'Universal';
public $name = 'Universal';

11
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -35,9 +35,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_user_odt extends ModelePDFUser
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

11
htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
View File

@ -37,9 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_usergroup_odt extends ModelePDFUserGroup
{
public $emetteur; // Objet societe qui emet
/**
* Issuer
* @var Societe
*/
public $emetteur;
public $phpmin = array(5,4,0); // Minimum version of PHP required by module
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';

5
htdocs/expedition/shipment.php
View File

@ -4,6 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -921,8 +922,8 @@ if ($id > 0 || ! empty($ref))
}
else
{
/* Commande non trouvee */
print "Commande inexistante";
/* Order not found */
setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
}
}

1
htdocs/langs/en_US/deliveries.lang
View File

@ -28,3 +28,4 @@ ErrorStockIsNotEnough=There's not enough stock
Shippable=Shippable
NonShippable=Not Shippable
ShowReceiving=Show delivery receipt
NonExistentOrder=Non-existent order