'."\n";
-
+
// Parameters for edit in place
if (! empty($GLOBALS['object']))
{
@@ -3848,10 +3848,10 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
/**
* Format output for start and end date
*
- * @param date_start Start date
- * @param date_end End date
- * @param format Output format
- * @param outputlangs Output language
+ * @param timestamp $date_start Start date
+ * @param timestamp $date_end End date
+ * @param string $format Output format
+ * @param Translate $outputlangs Output language
* @return void
*/
function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
@@ -3862,11 +3862,11 @@ function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
/**
* Format output for start and end date
*
- * @param date_start Start date
- * @param date_end End date
- * @param format Output format
- * @param outputlangs Output language
- * @return string String
+ * @param timestamp $date_start Start date
+ * @param timestamp $date_end End date
+ * @param string $format Output format
+ * @param Translate $outputlangs Output language
+ * @return string String
*/
function get_date_range($date_start,$date_end,$format = '',$outputlangs='')
{
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 29db22df3fd..5d46b2e8fc7 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -362,15 +362,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Make substitutions into odt of freetext
- if ($newfreetext)
- {
- try {
- $odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
- }
- catch(OdfException $e)
- {
- }
+ try {
+ $odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
}
+ catch(OdfException $e)
+ {
+ }
+
// Make substitutions into odt of user info
$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
//var_dump($tmparray); exit;
@@ -432,8 +430,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{
}
}
- // Replace tags of object
+ // Replace tags of object + external modules
$tmparray=$this->get_substitutionarray_object($object,$outputlangs);
+ complete_substitutions_array($tmparray, $outputlangs, $object);
foreach($tmparray as $key=>$value)
{
try {
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 76fb65db8c7..68681e069fc 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -43,7 +43,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
/**
* Constructor
*
- * @param DoliDB $DB Database handler
+ * @param DoliDB $db Database handler
*/
function doc_generic_odt($db)
{
@@ -226,7 +226,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
// Open and load template
require_once(ODTPHP_PATH.'odf.php');
- $odfHandler = new odf($srctemplatepath, array(
+ $odfHandler = new odf($srctemplatepath, array
+ (
'PATH_TO_TMP' => $conf->societe->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
@@ -255,6 +256,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
catch(OdfException $e)
{
+ // setVars failed, probably because key not found
}
}
// Make substitutions into odt of mysoc info
@@ -276,11 +278,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
catch(OdfException $e)
{
+ // setVars failed, probably because key not found
}
}
// Make substitutions into odt of thirdparty + external modules
$tmparray=$this->get_substitutionarray_thirdparty($object,$outputlangs);
- complete_substitutions_array($tmparray, $langs, $object);
+ complete_substitutions_array($tmparray, $outputlangs, $object);
//var_dump($object->id); exit;
foreach($tmparray as $key=>$value)
{
@@ -297,6 +300,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
catch(OdfException $e)
{
+ // setVars failed, probably because key not found
}
}
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index f674b4fb11f..a25c78446e0 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -352,12 +352,12 @@ abstract class ModeleAccountancyCode
/**
* Create a document for third party
*
- * @param db Database handler
- * @param id Id of third party to use
- * @param message Message
- * @param modele Force model to use ('' to not force). model can be a model name or a template file.
- * @param outputlangs Objet lang to use for translation
- * @return int <0 if KO, >0 if OK
+ * @param DoliDB $db Database handler
+ * @param int $id Id of third party to use
+ * @param string $message Message
+ * @param string $modele Force model to use ('' to not force). model can be a model name or a template file.
+ * @param Translate $outputlangs Object lang to use for translation
+ * @return int <0 if KO, >0 if OK
*/
function thirdparty_doc_create($db, $id, $message, $modele, $outputlangs)
{
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 8695e9d6004..b01d7dc61b9 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -33,30 +33,29 @@ if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.0-alpha'); // Also defin
if (! defined('EURO')) define('EURO',chr(128));
// Definition des constantes syslog
-if (function_exists("define_syslog_variables"))
+if (! defined('LOG_DEBUG'))
{
- if (version_compare(PHP_VERSION, '5.3.0', '<'))
- {
- define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
- }
+ if (function_exists("define_syslog_variables"))
+ {
+ define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
+ }
+ else
+ {
+ // Pour PHP sans syslog (comme sous Windows)
+ define('LOG_EMERG',0);
+ define('LOG_ALERT',1);
+ define('LOG_CRIT',2);
+ define('LOG_ERR',3);
+ define('LOG_WARNING',4);
+ define('LOG_NOTICE',5);
+ define('LOG_INFO',6);
+ define('LOG_DEBUG',7);
+ }
}
-else
-{
- // Pour PHP sans syslog (comme sous Windows)
- define('LOG_EMERG',0);
- define('LOG_ALERT',1);
- define('LOG_CRIT',2);
- define('LOG_ERR',3);
- define('LOG_WARNING',4);
- define('LOG_NOTICE',5);
- define('LOG_INFO',6);
- define('LOG_DEBUG',7);
-}
-
// Forcage du parametrage PHP error_reporting (Dolibarr non utilisable en mode error E_ALL)
error_reporting(E_ALL ^ E_NOTICE);
-//error_reporting(E_ALL);
+//error_reporting(E_ALL | E_STRICT);
// Define vars
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index d3a424b9c8f..8bfb3e10110 100755
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -93,9 +93,9 @@ DeleteSocialContribution=Διαγραφή κοινωνικής εισφοράς
ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε να διαγράψετε την κοινωνική εισφορά;
ExportDataset_tax_1=Social contributions and payments
AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary, mode
%sClaims-Debts%s said
Commitment accounting.
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode
%sRevenues-Expensens%s said
cash accounting.
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode
%sIncomes-Expensens%s said
cash accounting.
AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode
%sClaims-Debts%s said
Commitment accounting.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode
%sRevenues-Expenses%s said
cash accounting.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode
%sIncomes-Expenses%s said
cash accounting.
SeeReportInInputOutputMode=See report
%sIncomes-Expenses%s said
cash accounting for a calculation on actual payments made
SeeReportInDueDebtMode=See report
%sClaims-Debts%s said
commitment accounting for a calculation on issued invoices
RulesResultDue=- Amounts shown are with all taxes included
- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses.
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 6fb68b6bd24..473ef385806 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -6,8 +6,8 @@ Treasury=Treasury
MenuFinancial=Financial
TaxModuleSetupToModifyRules=Go to
module setup to modify rules for calculation
OptionMode=Option for accountancy
-OptionModeTrue=Option Input-Output
-OptionModeVirtual=Option Credits-Debits
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). \nThe validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
@@ -102,9 +102,9 @@ DeleteSocialContribution=Delete a social contribution
ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
ExportDataset_tax_1=Social contributions and payments
AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary, mode
%sClaims-Debts%s said
Commitment accounting.
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode
%sRevenues-Expenses%s said
cash accounting.
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode
%sIncomes-Expenses%s said
cash accounting.
AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode
%sClaims-Debts%s said
Commitment accounting.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode
%sRevenues-Expenses%s said
cash accounting.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode
%sIncomes-Expenses%s said
cash accounting.
SeeReportInInputOutputMode=See report
%sIncomes-Expenses%s said
cash accounting for a calculation on actual payments made
SeeReportInDueDebtMode=See report
%sClaims-Debts%s said
commitment accounting for a calculation on issued invoices
RulesResultDue=- Amounts shown are with all taxes included
- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses.
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 1f223fc38f9..c56ded1c2aa 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -42,7 +42,6 @@ require_once("filefunc.inc.php"); // May have been already require by main.inc.p
require_once(DOL_DOCUMENT_ROOT."/core/class/conf.class.php");
$conf = new Conf();
-
// Identifiant propres au serveur base de donnee
$conf->db->host = $dolibarr_main_db_host;
$conf->db->port = $dolibarr_main_db_port;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 38a6635312b..ccb94dd5bc0 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -150,7 +150,6 @@ class Societe extends CommonObject
$this->db = $DB;
- $this->id = $id;
$this->client = 0;
$this->prospect = 0;
$this->fournisseur = 0;
@@ -720,12 +719,12 @@ class Societe extends CommonObject
$this->parent = $obj->parent;
- $this->siren = $obj->siren; // TODO obsolete
- $this->idprof1 = $obj->siren;
- $this->siret = $obj->siret; // TODO obsolete
- $this->idprof2 = $obj->siret;
- $this->ape = $obj->ape; // TODO obsolete
- $this->idprof3 = $obj->ape;
+ $this->siren = $obj->idprof1; // TODO obsolete
+ $this->idprof1 = $obj->idprof1;
+ $this->siret = $obj->idprof2; // TODO obsolete
+ $this->idprof2 = $obj->idprof2;
+ $this->ape = $obj->idprof3; // TODO obsolete
+ $this->idprof3 = $obj->idprof3;
$this->idprof4 = $obj->idprof4;
$this->capital = $obj->capital;
@@ -2521,6 +2520,11 @@ class Societe extends CommonObject
$this->tva_intra='EU1234567';
$this->note_public='This is a comment (public)';
$this->note='This is a comment (private)';
+
+ $this->idprof1='idprof1';
+ $this->idprof2='idprof2';
+ $this->idprof3='idprof3';
+ $this->idprof4='idprof4';
}
}
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 738bb8d35c6..d61d3f26a66 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -177,6 +177,10 @@ class SocieteTest extends PHPUnit_Framework_TestCase
$localobject->fax='New fax';
$localobject->email='New email';
$localobject->url='New url';
+ $localobject->idprof1='new idprof1';
+ $localobject->idprof2='new idprof2';
+ $localobject->idprof3='new idprof3';
+ $localobject->idprof4='new idprof4';
$result=$localobject->update($localobject->id,$user);
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
@@ -203,6 +207,10 @@ class SocieteTest extends PHPUnit_Framework_TestCase
$this->assertEquals($localobject->fax, $newobject->fax);
$this->assertEquals($localobject->email, $newobject->email);
$this->assertEquals($localobject->url, $newobject->url);
+ $this->assertEquals($localobject->idprof1, $newobject->idprof1);
+ $this->assertEquals($localobject->idprof2, $newobject->idprof2);
+ $this->assertEquals($localobject->idprof3, $newobject->idprof3);
+ $this->assertEquals($localobject->idprof4, $newobject->idprof4);
return $localobject;
}