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

Merge remote-tracking branch 'origin/3.3' into develop

Browse Source 
Conflicts:
	htdocs/exports/class/export.class.php
	htdocs/webservices/server_user.php
This commit is contained in:
Laurent Destailleur 2013-03-15 01:10:56 +01:00
commit 298ba17e8f
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/mailing/fiche.php
View File

@ -61,8 +61,8 @@ $object->substitutionarray=array(
'__OTHER3__' => 'Other3', '__OTHER3__' => 'Other3',
'__OTHER4__' => 'Other4', '__OTHER4__' => 'Other4',
'__OTHER5__' => 'Other5', '__OTHER5__' => 'Other5',
'__SIGNATURE__' => 'TagSignature', '__SIGNATURE__' => 'TagSignature'
//'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet //,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet
); );
if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
{ {
@ -86,8 +86,8 @@ $object->substitutionarrayfortest=array(
'__OTHER3__' => 'TESTOther3', '__OTHER3__' => 'TESTOther3',
'__OTHER4__' => 'TESTOther4', '__OTHER4__' => 'TESTOther4',
'__OTHER5__' => 'TESTOther5', '__OTHER5__' => 'TESTOther5',
'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''), '__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'')
//'__PERSONALIZED__' => 'TESTPersonalized' // Not used yet //,'__PERSONALIZED__' => 'TESTPersonalized' // Not used yet
); );
if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
{ {

6
htdocs/exports/class/export.class.php
View File

@ -227,18 +227,18 @@ class Export
$sql.=$this->array_export_sql_end[$indice]; $sql.=$this->array_export_sql_end[$indice];
//construction du filtrage si le parametrage existe //construction du filtrage si le parametrage existe
if (is_array($array_filterValue)) if (is_array($array_filterValue) && !empty($array_filterValue))
{ {
$sqlWhere=''; $sqlWhere='';
// pour ne pas a gerer le nombre de condition // pour ne pas a gerer le nombre de condition
foreach ($array_filterValue as $key => $value) foreach ($array_filterValue as $key => $value)
{ {
$sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]); if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
} }
$sql.=$sqlWhere; $sql.=$sqlWhere;
} }
$sql.=$this->array_export_sql_order[$indice]; $sql.=$this->array_export_sql_order[$indice];
return $sql; return $sql;
} }

10
htdocs/langs/en_US/admin.lang
View File

@ -289,7 +289,7 @@ GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done
GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br> GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br> GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b> GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=Return a customizable number according to a defined mask. GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b> ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b> ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
DoTestServerAvailability=Test server connectivity DoTestServerAvailability=Test server connectivity
@ -915,7 +915,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password. YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
DownloadMoreSkins=More skins to download DownloadMoreSkins=More skins to download
SimpleNumRefModelDesc=Return the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
ShowProfIdInAddress=Show professionnal id with addresses on documents ShowProfIdInAddress=Show professionnal id with addresses on documents
TranslationUncomplete=Partial translation TranslationUncomplete=Partial translation
SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix <b>.lang</b> text files into directory <b>htdocs/langs</b> and submit them on the forum at <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a>. SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix <b>.lang</b> text files into directory <b>htdocs/langs</b> and submit them on the forum at <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a>.
@ -1025,7 +1025,7 @@ WatermarkOnDraftInvoices=Watermark on draft invoices (any if empty)
PropalSetup=Commercial proposals module setup PropalSetup=Commercial proposals module setup
CreateForm=Create forms CreateForm=Create forms
NumberOfProductLines=Number of product lines NumberOfProductLines=Number of product lines
ProposalsNumberingModules=Commercial proposal numbering modules ProposalsNumberingModules=Commercial proposal numbering models
ProposalsPDFModules=Commercial proposal documents models ProposalsPDFModules=Commercial proposal documents models
ClassifiedInvoiced=Classified invoiced ClassifiedInvoiced=Classified invoiced
HideTreadedPropal=Hide the treated commercial proposals in the list HideTreadedPropal=Hide the treated commercial proposals in the list
@ -1036,7 +1036,7 @@ FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (any if empty) WatermarkOnDraftProposal=Watermark on draft commercial proposals (any if empty)
##### Orders ##### ##### Orders #####
OrdersSetup=Order management setup OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering modules OrdersNumberingModules=Orders numbering models
OrdersModelModule=Order documents models OrdersModelModule=Order documents models
HideTreadedOrders=Hide the treated or canceled orders in the list HideTreadedOrders=Hide the treated or canceled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
@ -1050,7 +1050,7 @@ Bookmark4uSetup=Bookmark4u module setup
##### Interventions ##### ##### Interventions #####
InterventionsSetup=Interventions module setup InterventionsSetup=Interventions module setup
FreeLegalTextOnInterventions=Free text on intervention documents FreeLegalTextOnInterventions=Free text on intervention documents
FicheinterNumberingModules=Intervention numbering modules FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (any if empty) WatermarkOnDraftInterventionCards=Watermark on intervention card documents (any if empty)
##### Contracts ##### ##### Contracts #####

30
htdocs/webservices/server_user.php
View File

@ -574,7 +574,7 @@ function createUserFromThirdparty($authentication,$thirdpartywithuser)
$contact->phone_pro = $thirdparty->phone; $contact->phone_pro = $thirdparty->phone;
$contact->phone_mobile = $thirdpartywithuser['phone_mobile']; $contact->phone_mobile = $thirdpartywithuser['phone_mobile'];
$contact->fax = $thirdparty->fax; $contact->fax = $thirdparty->fax;
//Retreive all extrafield for thirdsparty //Retreive all extrafield for thirdsparty
// fetch optionals attributes and labels // fetch optionals attributes and labels
$extrafields=new ExtraFields($db); $extrafields=new ExtraFields($db);
@ -666,31 +666,31 @@ function createUserFromThirdparty($authentication,$thirdpartywithuser)
* @return mixed * @return mixed
*/ */
function setUserPassword($authentication,$shortuser) { function setUserPassword($authentication,$shortuser) {
global $db,$conf,$langs; global $db,$conf,$langs;
dol_syslog("Function: setUserPassword login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext); dol_syslog("Function: setUserPassword login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
if ($authentication['entity']) $conf->entity=$authentication['entity']; if ($authentication['entity']) $conf->entity=$authentication['entity'];
$objectresp=array(); $objectresp=array();
$errorcode='';$errorlabel=''; $errorcode='';$errorlabel='';
$error=0; $error=0;
$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel); $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
if ($fuser->societe_id) $socid=$fuser->societe_id; if ($fuser->societe_id) $socid=$fuser->societe_id;
if (! $error && ! $shortuser) if (! $error && ! $shortuser)
{ {
$error++; $error++;
$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter shortuser must be provided."; $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter shortuser must be provided.";
} }
if (! $error) if (! $error)
{ {
$fuser->getrights(); $fuser->getrights();
if ($fuser->rights->user->user->password || $fuser->rights->user->self->password) if ($fuser->rights->user->user->password || $fuser->rights->user->self->password)
{ {
$userstat=new User($db); $userstat=new User($db);
@ -698,7 +698,7 @@ function setUserPassword($authentication,$shortuser) {
if($res) if($res)
{ {
$res = $userstat->setPassword($userstat,$shortuser['password']); $res = $userstat->setPassword($userstat,$shortuser['password']);
if($res) if($res)
{ {
$objectresp = array( $objectresp = array(
'result'=>array('result_code' => 'OK', 'result_label' => ''), 'result'=>array('result_code' => 'OK', 'result_label' => ''),
@ -716,7 +716,7 @@ function setUserPassword($authentication,$shortuser) {
$error++; $error++;
$errorcode='NOT_FOUND'; $errorlabel='User not found'; $errorcode='NOT_FOUND'; $errorlabel='User not found';
} }
} }
else else
{ {
@ -724,15 +724,15 @@ function setUserPassword($authentication,$shortuser) {
$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request'; $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
} }
} }
if ($error) if ($error)
{ {
$objectresp = array( $objectresp = array(
'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel) 'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel)
); );
} }
return $objectresp; return $objectresp;
} }