diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..4d86664e43f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+
+# Explicitly declare text files we want to always be normalized and converted
+# to native line endings on checkout.
+*.php text eol=lf
+*.sql text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.css text eol=lf
+*.lang text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary
diff --git a/.gitignore b/.gitignore
index 3748a6ef1b8..3ec764dec5b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ doxygen_warnings.log
/.project
.DS_Store
.idea
+*.iml
diff --git a/ChangeLog b/ChangeLog
index cf19d7f6565..6152f1407b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,16 +4,21 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.5 compared to 3.4 *****
For users:
-- New: [ task #877 ] Reorganize menus
-- New: [ task #858 ] Holiday module: note on manual holiday assignation
-- New: [ task #892 ] Add option in thridparty customer/supplier admin to hide non active in select_company method
-- New: [ task #531 ] Add a workload on tasks
+- New: [ task #877 ] Reorganize menus.
+- New: [ task #858 ] Holiday module: note on manual holiday assignation.
+- New: [ task #892 ] Add option in thridparty customer/supplier admin to hide non active in select_company method.
+- New: [ task #531 ] Add a workload on tasks.
- New: Add graph of bank account input/output into input-output report page.
- New: Add script export-bank-receipts.
-- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge
+- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge.
PDF that has one payment on a specific bank account.*
-- New: [ task #901 ] Add Extrafeild on Fiche Inter
-- New: Show process id in all command line scripts
+- New: [ task #901 ] Add Extrafeild on Fiche Inter.
+- New: Show process id in all command line scripts.
+- New: Module mailman can subscribe/unsubscribe to ML according to categories of member.
+
+For translators:
+- Normalized sort order of all languages files with english ref file.
+
For developers:
- New: DolGraph can build graph with three lines.
@@ -104,10 +109,12 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- If module use hook pdf_writelinedesc, module may have to add return 1 at end of
function to keep same behaviour.
-
+
+
+***** ChangeLog for 3.3.3 compared to 3.3.2 *****
+ - Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
***** ChangeLog for 3.3.2 compared to 3.3.1 *****
-
- Fix: Dutch (nl_NL) translation
- Generalize fix: file with a specific mask not found, again
- Fix: translations and BILL_SUPPLIER_BUILDDOC trigger
@@ -136,8 +143,8 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- Fix: [ bug #788 ] Date of linked interventions are not shown
- Fix: external users should not see costprice and margin infos
- Fix: [ bug #806 ] Tasks are ordered alphabetically instead of chronological order
-***** ChangeLog for 3.3.1 compared to 3.3 *****
+***** ChangeLog for 3.3.1 compared to 3.3 *****
- Fix: [ bug #733 ] Mass emailing tools do not support
-';
llxHeaderVierge($langs->trans("DolibarrDemo"), $head);
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index e44342278f0..81d218cec78 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -26,10 +26,10 @@
*/
if (! defined('NOLOGIN')) define("NOLOGIN",1); // This means this output page does not require to be logged.
-if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Do not check anti POST attack test
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
+if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check anti CSRF attack test
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Do not check anti POST attack test
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
/**
* Header empty
@@ -55,13 +55,13 @@ $securitykey=GETPOST('securitykey');
* Actions
*/
-dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
-
+dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
+
if ($securitykey != $conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY)
{
print 'Bad security key value.';
exit;
-}
+}
if (! empty($tag))
{
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 8585b19cd4a..3f86685fad3 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -25,16 +25,16 @@
* \brief Script use to update unsubcribe contact to prospect mailing list
*/
-if (! defined('NOLOGIN')) define("NOLOGIN",1); // This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check anti CSRF attack test
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
+if (! defined('NOLOGIN')) define("NOLOGIN",1); // This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check anti CSRF attack test
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
-/**
- * Header empty
- *
- * @return void
- */
-function llxHeader() { }
+/**
+ * Header empty
+ *
+ * @return void
+ */
+function llxHeader() { }
/**
* Footer empty
*
@@ -53,15 +53,15 @@ $langs->load("mails");
$tag=GETPOST('tag');
$unsuscrib=GETPOST('unsuscrib');
-$securitykey=GETPOST('securitykey');
+$securitykey=GETPOST('securitykey');
/*
* Actions
*/
-dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
-
+dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
+
if ($securitykey != $conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY)
{
print 'Bad security key value.';
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 358201aa4a7..d2de44e3beb 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -71,7 +71,7 @@ if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1);
if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
{
- print $langs->trans("Auto subscription form for public visitors has no been enabled");
+ print $langs->trans("Auto subscription form for public visitors has not been enabled");
exit;
}
diff --git a/htdocs/public/offline.php b/htdocs/public/offline.php
index d97c8e6e7f3..a52b446b4bb 100644
--- a/htdocs/public/offline.php
+++ b/htdocs/public/offline.php
@@ -23,8 +23,8 @@
* \brief Dolibarr offline page
*/
-define('NOCSRFCHECK',1);
-define('NOLOGIN',1);
+define('NOCSRFCHECK',1);
+define('NOLOGIN',1);
require '../main.inc.php';
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 24be3c5af6f..c4457ff4d93 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -63,29 +63,29 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-// Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
-{
- $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
- $from=$conf->global->MAILING_EMAIL_FROM;
- require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+// Send an email
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+{
+ $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
+ $from=$conf->global->MAILING_EMAIL_FROM;
+ require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile(
- 'New subscription payed',
- $sendto,
+ 'New subscription payed',
+ $sendto,
$from,
'New subscription payed '.$fulltag
- );
+ );
- $result=$mailfile->sendfile();
- if ($result)
- {
- dol_syslog("EMail sent to ".$sendto);
- }
- else
- {
- dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
- }
-}
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ dol_syslog("EMail sent to ".$sendto);
+ }
+ else
+ {
+ dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+ }
+}
llxHeaderPayBox($langs->trans("PaymentForm"));
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 33107883d8f..b8940fa1a32 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -41,15 +41,15 @@ $langs->load("companies");
$langs->load("paybox");
$langs->load("paypal");
-/*$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYBOXTOKEN=GETPOST('TOKEN');
-if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
-$PAYBOXPAYERID=GETPOST('PAYERID');
-if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
+/*$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYBOXTOKEN=GETPOST('TOKEN');
+if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
+$PAYBOXPAYERID=GETPOST('PAYERID');
+if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
*/
-$PAYBOXFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
+$PAYBOXFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
/*
@@ -77,44 +77,44 @@ llxHeaderPayBox($langs->trans("PaymentForm"));
print ''."\n";
print '
'."\n";
-// Get on url call
+// Get on url call
/*
$token = $PAYBOXTOKEN;
-*/
-$fulltag = $PAYBOXFULLTAG;
-/*$payerID = $PAYBOXPAYERID;
-// Set by newpayment.php
-$paymentType = $_SESSION['PaymentType'];
-$currencyCodeType = $_SESSION['currencyCodeType'];
-$FinalPaymentAmt = $_SESSION["Payment_Amount"];
-// From env
-$ipaddress = $_SESSION['ipaddress'];
-
-dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
-*/
-
-// Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
-{
- $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
- $from=$conf->global->MAILING_EMAIL_FROM;
- require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+*/
+$fulltag = $PAYBOXFULLTAG;
+/*$payerID = $PAYBOXPAYERID;
+// Set by newpayment.php
+$paymentType = $_SESSION['PaymentType'];
+$currencyCodeType = $_SESSION['currencyCodeType'];
+$FinalPaymentAmt = $_SESSION["Payment_Amount"];
+// From env
+$ipaddress = $_SESSION['ipaddress'];
+
+dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+*/
+
+// Send an email
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+{
+ $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
+ $from=$conf->global->MAILING_EMAIL_FROM;
+ require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile(
- 'New subscription payed',
- $sendto,
- $from,
+ 'New subscription payed',
+ $sendto,
+ $from,
'New subscription payed '.$fulltag
- );
-
- $result=$mailfile->sendfile();
- if ($result)
- {
- dol_syslog("EMail sent to ".$sendto);
- }
- else
- {
- dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
- }
+ );
+
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ dol_syslog("EMail sent to ".$sendto);
+ }
+ else
+ {
+ dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+ }
}
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index ee72206ae52..21d93f3eaa1 100755
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -71,29 +71,29 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
-// Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
-{
- $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
- $from=$conf->global->MAILING_EMAIL_FROM;
- require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+// Send an email
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+{
+ $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
+ $from=$conf->global->MAILING_EMAIL_FROM;
+ require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile(
- 'New subscription payed',
- $sendto,
- $from,
+ 'New subscription payed',
+ $sendto,
+ $from,
'New subscription payed '.$fulltag
- );
-
- $result=$mailfile->sendfile();
- if ($result)
- {
- dol_syslog("EMail sent to ".$sendto);
- }
- else
- {
- dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
- }
-}
+ );
+
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ dol_syslog("EMail sent to ".$sendto);
+ }
+ else
+ {
+ dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+ }
+}
llxHeaderPaypal($langs->trans("PaymentForm"));
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 012269b8be3..e4ea8a92095 100755
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -81,14 +81,14 @@ if (empty($PAYPAL_API_SIGNATURE))
return -1;
}
-$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYPALTOKEN=GETPOST('TOKEN');
+if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+$PAYPALPAYERID=GETPOST('PAYERID');
+if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+$PAYPALFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
/*
@@ -135,23 +135,23 @@ if ($PAYPALTOKEN)
{
$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
$from=$conf->global->MAILING_EMAIL_FROM;
- require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile(
- 'New subscription payed',
+ 'New subscription payed',
$sendto,
- $from,
+ $from,
'New subscription payed '.$fulltag
- );
-
- $result=$mailfile->sendfile();
- if ($result)
- {
- dol_syslog("EMail sent to ".$sendto);
- }
- else
- {
+ );
+
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ dol_syslog("EMail sent to ".$sendto);
+ }
+ else
+ {
dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
- }
+ }
}
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
new file mode 100644
index 00000000000..d79fe3f4ee9
--- /dev/null
+++ b/htdocs/societe/ajax/company.php
@@ -0,0 +1,107 @@
+
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2007-2011 Laurent Destailleur
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/product/ajax/products.php
+ * \brief File to return Ajax response on product list request
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1');
+if (empty($_GET['keysearch']) && ! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+
+require '../../main.inc.php';
+
+$htmlname=GETPOST('htmlname','alpha');
+$socid=GETPOST('socid','int');
+$type=GETPOST('type','int');
+$mode=GETPOST('mode','int');
+$status=((GETPOST('status','int') >= 0) ? GETPOST('status','int') : -1);
+$outjson=(GETPOST('outjson','int') ? GETPOST('outjson','int') : 0);
+$price_level=GETPOST('price_level','int');
+$action=GETPOST('action', 'alpha');
+$id=GETPOST('id', 'int');
+$price_by_qty_rowid=GETPOST('pbq', 'int');
+
+/*
+ * View
+ */
+
+//print ''."\n";
+
+dol_syslog(join(',',$_GET));
+//print_r($_GET);
+
+if (! empty($action) && $action == 'fetch' && ! empty($id))
+{
+ require DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+
+ $outjson=array();
+
+ $object = new Societe($db);
+ $ret=$object->fetch($id);
+ if ($ret > 0)
+ {
+ $outname=$object->name;
+
+ $outjson = array('name'=>$outname);
+ }
+
+ echo json_encode($outjson);
+}
+else
+{
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+ $langs->load("products");
+ $langs->load("main");
+
+ top_httphead();
+
+ if (empty($htmlname)) return;
+
+ $match = preg_grep('/('.$htmlname.'[0-9]+)/',array_keys($_GET));
+ sort($match);
+ $id = (! empty($match[0]) ? $match[0] : '');
+
+ if (! GETPOST($htmlname) && ! GETPOST($id)) return;
+
+ // When used from jQuery, the search term is added as GET param "term".
+ $searchkey=(GETPOST($id)?GETPOST($id):(GETPOST($htmlname)?GETPOST($htmlname):''));
+
+ $form = new Form($db);
+ if (empty($mode) || $mode == 'customer')
+ {
+ $arrayresult=$form->select_company_html($socid,$htmlname,"client IN (1,3)",0,0,0,null,$searchkey,$outjson);
+ }
+ elseif ($mode == 'supplier')
+ {
+ $arrayresult=$form->select_company_html($socid,$htmlname,"fournisseur=1",0,0,0,null,$searchkey,$outjson);
+ }
+
+ $db->close();
+
+ if ($outjson) print json_encode($arrayresult);
+}
+
+?>
\ No newline at end of file
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 61c01b00f2a..0fb2da5a053 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -66,8 +66,8 @@ else
//ini_set('default_socket_timeout', $params['response_timeout']);
//$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
$soapclient = new nusoap_client($WS_DOL_URL_WSDL,true,$params['proxy_host'],$params['proxy_port'],$params['proxy_login'],$params['proxy_password'],$params['connection_timeout'],$params['response_timeout']);
- $soapclient->soap_defencoding = 'utf-8';
- $soapclient->xml_encoding = 'utf-8';
+ $soapclient->soap_defencoding = 'utf-8';
+ $soapclient->xml_encoding = 'utf-8';
$soapclient->decode_utf8 = false;
// Check for an error
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f998f563729..b6bee432087 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1452,14 +1452,14 @@ class Societe extends CommonObject
{
$lien = 'url='http://www.specimen.com';
$this->phone='0909090901';
- $this->fax='0909090909';
+ $this->fax='0909090909';
$this->code_client='CC-'.dol_print_date($now,'dayhourlog');
$this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 27db36e8a32..356001648c3 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -443,10 +443,10 @@ if (empty($reshook))
}
// Set parent company
- if ($action == 'set_thirdparty' && $user->rights->societe->creer)
+ if ($action == 'set_thirdparty' && $user->rights->societe->creer)
{
- $result = $object->set_parent(GETPOST('editparentcompany','int'));
- }
+ $result = $object->set_parent(GETPOST('editparentcompany','int'));
+ }
/*
* Generate document
@@ -1721,24 +1721,24 @@ else
// Parent company
if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
{
- // Payment term
- print '