Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 17 commits
  • 22 files changed
  • 0 comments
  • 3 contributors
61  htdocs/comm/mailing/fiche.php
@@ -47,8 +47,6 @@
47 47
 $substitutionarray=array(
48 48
 '__ID__' => 'IdRecord',
49 49
 '__EMAIL__' => 'EMail',
50  
-'__CHECK_READ__' => 'CheckMail',
51  
-'__UNSUSCRIBE__' => 'Unsuscribe',
52 50
 '__LASTNAME__' => 'Lastname',
53 51
 '__FIRSTNAME__' => 'Firstname',
54 52
 '__OTHER1__' => 'Other1',
@@ -59,11 +57,20 @@
59 57
 '__SIGNATURE__' => 'Signature',
60 58
 '__PERSONALIZED__' => 'Personalized'
61 59
 );
  60
+if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
  61
+{
  62
+    $substitutionarray=array_merge(
  63
+        $substitutionarray,
  64
+        array(
  65
+			'__CHECK_READ__' => 'CheckMail',
  66
+			'__UNSUSCRIBE__' => 'Unsuscribe'
  67
+	        )
  68
+    );
  69
+}
  70
+
62 71
 $substitutionarrayfortest=array(
63 72
 '__ID__' => 'TESTIdRecord',
64 73
 '__EMAIL__' => 'TESTEMail',
65  
-'__CHECK_READ__' => 'TESTCheckMail',
66  
-'__UNSUSCRIBE__' => 'TESTUnsuscribe',
67 74
 '__LASTNAME__' => 'TESTLastname',
68 75
 '__FIRSTNAME__' => 'TESTFirstname',
69 76
 '__OTHER1__' => 'TESTOther1',
@@ -74,7 +81,16 @@
74 81
 '__SIGNATURE__' => 'TESTSignature',
75 82
 '__PERSONALIZED__' => 'TESTPersonalized'
76 83
 );
77  
-
  84
+if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
  85
+{
  86
+    $substitutionarray=array_merge(
  87
+    $substitutionarray,
  88
+    array(
  89
+			'__CHECK_READ__' => 'TESTCheckMail',
  90
+			'__UNSUSCRIBE__' => 'TESTCheckMail'
  91
+    )
  92
+    );
  93
+}
78 94
 
79 95
 // Action clone object
80 96
 if ($action == 'confirm_clone' && $confirm == 'yes')
@@ -158,7 +174,7 @@
158 174
 			if ($num)
159 175
 			{
160 176
 				dol_syslog("comm/mailing/fiche.php: nb of targets = ".$num, LOG_DEBUG);
161  
-				
  177
+
162 178
 				$now=dol_now();
163 179
 
164 180
 				// Positionne date debut envoi
@@ -191,9 +207,9 @@
191 207
                     $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
192 208
 					$substitutionarray=array(
193 209
 						'__ID__' => $obj->source_id,
194  
-						'__EMAIL__' => '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>',
195  
-						'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'" width="0" height="0" style="width:0px;height:0px" border="0"/>',
196  
-						'__UNSUSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-usubscribe.php?tag='.$obj->tag.'&unsuscrib=1" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>',
  210
+						'__EMAIL__' => $obj->email,
  211
+					    '__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'" width="0" height="0" style="width:0px;height:0px" border="0"/>',
  212
+					    '__UNSUSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>',
197 213
 						'__LASTNAME__' => $obj->nom,
198 214
 						'__FIRSTNAME__' => $obj->prenom,
199 215
 						'__OTHER1__' => $other1,
@@ -270,11 +286,11 @@
270 286
 								{
271 287
 									dol_print_error($db);
272 288
 								}
273  
-							
  289
+
274 290
 							    //Update status communication of contact prospect
275 291
 								$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
276 292
 								dol_syslog("fiche.php: set prospect contact status sql=".$sql, LOG_DEBUG);
277  
-								
  293
+
278 294
 								$resql2=$db->query($sql);
279 295
 								if (! $resql2)
280 296
 								{
@@ -282,8 +298,8 @@
282 298
 								}
283 299
 							}
284 300
 						}
285  
-						
286  
-						
  301
+
  302
+
287 303
 						//test if CHECK READ change statut prospect contact
288 304
 					}
289 305
 					else
@@ -531,11 +547,11 @@
531 547
 
532 548
 // Action confirmation validation
533 549
 if ($action == 'confirm_valid' && $confirm == 'yes')
534  
-{	
  550
+{
535 551
 	if ($object->fetch($id) >= 0)
536 552
 	{
537 553
 		$object->valid($user);
538  
-	
  554
+
539 555
 		Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
540 556
 		exit;
541 557
 	}
@@ -547,17 +563,17 @@
547 563
 
548 564
 // Resend
549 565
 if ($action == 'confirm_reset' && $confirm == 'yes')
550  
-{	
  566
+{
551 567
 	if ($object->fetch($id) >= 0)
552 568
 	{
553 569
 		$db->begin();
554  
-	
  570
+
555 571
 		$result=$object->valid($user);
556 572
 		if ($result > 0)
557 573
 		{
558 574
 			$result=$object->reset_targets_status($user);
559 575
 		}
560  
-	
  576
+
561 577
 		if ($result > 0)
562 578
 		{
563 579
 			$db->commit();
@@ -580,7 +596,7 @@
580 596
 if ($action == 'confirm_delete' && $confirm == 'yes')
581 597
 {
582 598
 	$object->fetch($id);
583  
-	
  599
+
584 600
 	if ($object->delete($object->id))
585 601
 	{
586 602
 		Header("Location: liste.php");
@@ -1027,8 +1043,11 @@
1027 1043
 			print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
1028 1044
 			print '__ID__ = '.$langs->trans("IdRecord").'<br>';
1029 1045
 			print '__EMAIL__ = '.$langs->trans("EMail").'<br>';
1030  
-			print '__CHECK_READ__ = '.$langs->trans("CheckRead").'<br>';
1031  
-			print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'<br>';
  1046
+            if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
  1047
+            {
  1048
+    			print '__CHECK_READ__ = '.$langs->trans("CheckRead").'<br>';
  1049
+	    		print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'<br>';
  1050
+            }
1032 1051
 			print '__LASTNAME__ = '.$langs->trans("Lastname").'<br>';
1033 1052
 			print '__FIRSTNAME__ = '.$langs->trans("Firstname").'<br>';
1034 1053
 			print '__OTHER1__ = '.$langs->trans("Other").'1<br>';
9  htdocs/compta/bank/search.php
... ...
@@ -1,7 +1,8 @@
1 1
 <?php
2  
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3  
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
4  
- * Copytight (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
  2
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville <rodolphe@quiedeville.org>
  3
+ * Copyright (C) 2004-2008  Laurent Destailleur  <eldy@users.sourceforge.net>
  4
+ * Copytight (C) 2005-2010  Regis Houssin        <regis@dolibarr.fr>
  5
+ * Copytight (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
5 6
  *
6 7
  * This program is free software; you can redistribute it and/or modify
7 8
  * it under the terms of the GNU General Public License as published by
@@ -211,7 +212,7 @@
211 212
 
212 213
         // Payment type
213 214
         print "<td align=\"center\">";
214  
-        $labeltype=$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle');
  215
+        $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle');
215 216
         if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
216 217
         else print $labeltype;
217 218
         print "</td>\n";
2  htdocs/core/lib/functions.lib.php
@@ -1705,7 +1705,7 @@ function img_picto_common($alt, $picto, $options='', $pictoisfullpath=0)
1705 1705
     global $conf;
1706 1706
     if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png';
1707 1707
     if ($pictoisfullpath) return '<img src="'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
1708  
-    if (! empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS) && file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/'.$picto)) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
  1708
+    if (! empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS) && file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/'.$picto)) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
1709 1709
     return '<img src="'.DOL_URL_ROOT.'/theme/common/'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
1710 1710
 }
1711 1711
 
20  htdocs/langs/en_US/companies.lang
@@ -105,16 +105,19 @@ ProfId2AR=Prof Id 2 (Revenu brutes)
105 105
 ProfId3AR=-
106 106
 ProfId4AR=-
107 107
 ProfId5AR=-
  108
+ProfId6AR=-
108 109
 ProfId1AU=Prof Id 1 (ABN)
109 110
 ProfId2AU=-
110 111
 ProfId3AU=-
111 112
 ProfId4AU=-
112 113
 ProfId5AU=-
  114
+ProfId6AU=-
113 115
 ProfId1BE=Prof Id 1 (Professional number)
114 116
 ProfId2BE=-
115 117
 ProfId3BE=-
116 118
 ProfId4BE=-
117 119
 ProfId5BE=-
  120
+ProfId6BE=-
118 121
 ProfId1BR=CNPJ
119 122
 ProfId2BR=IE (Inscricao Estadual)
120 123
 ProfId3BR=IM (Inscricao Municipal)
@@ -126,26 +129,31 @@ ProfId2CH=-
126 129
 ProfId3CH=Prof Id 1 (Federal number)
127 130
 ProfId4CH=Prof Id 2 (Commercial Record number)
128 131
 ProfId5CH=-
  132
+ProfId6CH=-
129 133
 ProfId1CL=Prof Id 1 (R.U.T.)
130 134
 ProfId2CL=-
131 135
 ProfId3CL=-
132 136
 ProfId4CL=-
133 137
 ProfId5CL=-
  138
+ProfId6CL=-
134 139
 ProfId1CO=Prof Id 1 (R.U.T.)
135 140
 ProfId2CO=-
136 141
 ProfId3CO=-
137 142
 ProfId4CO=-
138 143
 ProfId5CO=-
  144
+ProfId6CO=-
139 145
 ProfId1DE=Prof Id 1 (USt.-IdNr)
140 146
 ProfId2DE=Prof Id 2 (USt.-Nr)
141 147
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
142 148
 ProfId4DE=-
143 149
 ProfId5DE=-
  150
+ProfId6DE=-
144 151
 ProfId1ES=Prof Id 1 (CIF/NIF)
145 152
 ProfId2ES=Prof Id 2 (Social security number)
146 153
 ProfId3ES=Prof Id 3 (CNAE)
147 154
 ProfId4ES=Prof Id 4 (Collegiate number)
148 155
 ProfId5ES=-
  156
+ProfId6ES=-
149 157
 ProfId1FR=Prof Id 1 (SIREN)
150 158
 ProfId2FR=Prof Id 2 (SIRET)
151 159
 ProfId3FR=Prof Id 3 (NAF, old APE)
@@ -157,51 +165,61 @@ ProfId2GB=-
157 165
 ProfId3GB=SIC
158 166
 ProfId4GB=-
159 167
 ProfId5GB=-
  168
+ProfId6GB=-
160 169
 ProfId1HN=Id prof. 1 (RTN)
161 170
 ProfId2HN=-
162 171
 ProfId3HN=-
163 172
 ProfId4HN=-
164 173
 ProfId5HN=-
  174
+ProfId6HN=-
165 175
 ProfId1IN=Prof Id 1 (TIN)
166 176
 ProfId2IN=Prof Id 2 (PAN)
167 177
 ProfId3IN=Prof Id 3 (SRVC TAX)
168 178
 ProfId4IN=Prof Id 4
169 179
 ProfId5IN=Prof Id 5
  180
+ProfId6IN=-
170 181
 ProfId1MA=Id prof. 1 (R.C.)
171 182
 ProfId2MA=Id prof. 2 (Patente)
172 183
 ProfId3MA=Id prof. 3 (I.F.)
173 184
 ProfId4MA=Id prof. 4 (C.N.S.S.)
174 185
 ProfId5MA=-
  186
+ProfId6MA=-
175 187
 ProfId1MX=Prof Id 1 (R.F.C).
176 188
 ProfId2MX=Prof Id 2 (R..P. IMSS)
177 189
 ProfId3MX=Prof Id 3 (Profesional Charter)
178 190
 ProfId4MX=-
179 191
 ProfId5MX=-
  192
+ProfId6MX=-
180 193
 ProfId1NL=KVK nummer
181 194
 ProfId2NL=-
182 195
 ProfId3NL=-
183  
-ProfId4NL=-
  196
+ProfId4NL=Burgerservicenummer (BSN)
184 197
 ProfId5NL=-
  198
+ProfId6NL=-
185 199
 ProfId1PT=Prof Id 1 (NIPC)
186 200
 ProfId2PT=Prof Id 2 (Social security number)
187 201
 ProfId3PT=Prof Id 3 (Commercial Record number)
188 202
 ProfId4PT=Prof Id 4 (Conservatory)
189 203
 ProfId5PT=-
  204
+ProfId6PT=-
190 205
 ProfId1SN=RC
191 206
 ProfId2SN=NINEA
192 207
 ProfId3SN=-
193 208
 ProfId4SN=-
194 209
 ProfId5SN=-
  210
+ProfId6SN=-
195 211
 ProfId1TN=Prof Id 1 (RC)
196 212
 ProfId2TN=Prof Id 2 (Fiscal matricule)
197 213
 ProfId3TN=Prof Id 3 (Douane code)
198 214
 ProfId4TN=Prof Id 4 (BAN)
199 215
 ProfId5TN=-
  216
+ProfId6TN=-
200 217
 ProfId1RU=Prof Id 1 (OGRN)
201 218
 ProfId2RU=Prof Id 2 (INN)
202 219
 ProfId3RU=Prof Id 3 (KPP)
203 220
 ProfId4RU=Prof Id 4 (OKPO)
204 221
 ProfId5RU=-
  222
+ProfId6RU=-
205 223
 VATIntra=VAT number
206 224
 VATIntraShort=VAT number
207 225
 VATIntraVeryShort=VAT
20  htdocs/langs/fr_FR/companies.lang
@@ -107,16 +107,19 @@ ProfId2AR=Id prof. 2 (Revenu brutes)
107 107
 ProfId3AR=-
108 108
 ProfId4AR=-
109 109
 ProfId5AR=-
  110
+ProfId6AR=-
110 111
 ProfId1AU=Id prof. 1 (ABN)
111 112
 ProfId2AU=-
112 113
 ProfId3AU=-
113 114
 ProfId4AU=-
114 115
 ProfId5AU=-
  116
+ProfId6AU=-
115 117
 ProfId1BE=Id prof. 1 (N° professionnel)
116 118
 ProfId2BE=-
117 119
 ProfId3BE=-
118 120
 ProfId4BE=-
119 121
 ProfId5BE=-
  122
+ProfId6BE=-
120 123
 ProfId1BR=CNPJ
121 124
 ProfId2BR=IE (Inscricao Estadual)
122 125
 ProfId3BR=IM (Inscricao Municipal)
@@ -128,26 +131,31 @@ ProfId2CH=-
128 131
 ProfId3CH=Numéro fédéral
129 132
 ProfId4CH=Num registre du commerce
130 133
 ProfId5CH=-
  134
+ProfId6CH=-
131 135
 ProfId1CL=Prof Id 1 (R.U.T.)
132 136
 ProfId2CL=-
133 137
 ProfId3CL=-
134 138
 ProfId4CL=-
135 139
 ProfId5CL=-
  140
+ProfId6CL=-
136 141
 ProfId1CO=Prof Id 1 (R.U.T.)
137 142
 ProfId2CO=-
138 143
 ProfId3CO=-
139 144
 ProfId4CO=-
140 145
 ProfId5CO=-
  146
+ProfId6CO=-
141 147
 ProfId1DE=Id prof. 1 (USt.-IdNr)
142 148
 ProfId2DE=Id prof. 2 (USt.-Nr)
143 149
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
144 150
 ProfId4DE=-
145 151
 ProfId5DE=-
  152
+ProfId6DE=-
146 153
 ProfId1ES=Id prof. 1 (CIF/NIF)
147 154
 ProfId2ES=Id prof. 2 (Num sécurité social)
148 155
 ProfId3ES=Id prof. 3 (CNAE)
149 156
 ProfId4ES=Id prof. 4 (Num Collégiale)
150 157
 ProfId5ES=-
  158
+ProfId6ES=-
151 159
 ProfId1FR=Id prof. 1 (SIREN)
152 160
 ProfId2FR=Id prof. 2 (SIRET)
153 161
 ProfId3FR=Id prof. 3 (NAF, ex APE)
@@ -159,51 +167,61 @@ ProfId2GB=-
159 167
 ProfId3GB=SIC
160 168
 ProfId4GB=-
161 169
 ProfId5GB=-
  170
+ProfId6GB=-
162 171
 ProfId1HN=Id prof. 1 (RTN)
163 172
 ProfId2HN=-
164 173
 ProfId3HN=-
165 174
 ProfId4HN=-
166 175
 ProfId5HN=-
  176
+ProfId6HN=-
167 177
 ProfId1IN=Id prof. 1 (TIN)
168 178
 ProfId2IN=Id prof. 2 (PAN)
169 179
 ProfId3IN=Id prof. 3 (SRVC TAX)
170 180
 ProfId4IN=Id prof. 4
171 181
 ProfId5IN=Id prof. 5
  182
+ProfId6IN=-
172 183
 ProfId1MA=Id prof. 1 (R.C.)
173 184
 ProfId2MA=Id prof. 2 (Patente)
174 185
 ProfId3MA=Id prof. 3 (I.F.)
175 186
 ProfId4MA=Id prof. 4 (C.N.S.S.)
176 187
 ProfId5MA=-
  188
+ProfId6MA=-
177 189
 ProfId1MX=Prof Id 1 (R.F.C).
178 190
 ProfId2MX=Prof Id 2 (R..P. IMSS)
179 191
 ProfId3MX=Prof Id 3 (Charte Profesional)
180 192
 ProfId4MX=-
181 193
 ProfId5MX=-
  194
+ProfId6MX=-
182 195
 ProfId1NL=KVK nummer
183 196
 ProfId2NL=- 	 
184 197
 ProfId3NL=- 	 
185  
-ProfId4NL=-
  198
+ProfId4NL=Burgerservicenummer (BSN)
186 199
 ProfId5NL=-
  200
+ProfId6NL=-
187 201
 ProfId1PT=Id prof. 1 (NIPC)
188 202
 ProfId2PT=Id prof. 2 (Num sécurité social)
189 203
 ProfId3PT=Id prof. 3 (Num enreg. commercial)
190 204
 ProfId4PT=Id prof. 4 (Conservatory)
191 205
 ProfId5PT=Id prof. 5
  206
+ProfId6PT=-
192 207
 ProfId1RU=Id prof.1 (OGRN)
193 208
 ProfId2RU=Id prof.2 (INN)
194 209
 ProfId3RU=Id prof.3 (KPP)
195 210
 ProfId4RU=Id prof.4 (OKPO)
196 211
 ProfId5RU=-
  212
+ProfId6RU=-
197 213
 ProfId1SN=RC
198 214
 ProfId2SN=NINEA 
199 215
 ProfId3SN=- 
200 216
 ProfId4SN=- 
201 217
 ProfId5SN=- 
  218
+ProfId6SN=- 
202 219
 ProfId1TN=Id prof. 1 (RC)
203 220
 ProfId2TN=Id prof. 2 (Matricule fiscal)
204 221
 ProfId3TN=Id prof. 3 (Code en douane)
205 222
 ProfId4TN=Id prof. 4 (BAN)
206 223
 ProfId5TN=-
  224
+ProfId6TN=- 
207 225
 VATIntra=Numéro de TVA
208 226
 VATIntraShort=Num TVA
209 227
 VATIntraVeryShort=N° TVA
2  htdocs/langs/nl_NL/companies.lang
@@ -128,7 +128,7 @@ ProfId4MA = Id prof. 4 (C.N.S.S.)
128 128
 ProfId1NL = KVK nummer
129 129
 ProfId2NL = 
130 130
 ProfId3NL = 
131  
-ProfId4NL = Burgerservicenummer
  131
+ProfId4NL = Burgerservicenummer (BSN)
132 132
 ProfId1PT = Prof. id 1 (NIPC)
133 133
 ProfId2PT = Prof. id 2 (Social security number)
134 134
 ProfId3PT = Prof. Id 3 (Commercial Record aantal)
4  htdocs/langs/pt_BR/bills.lang
@@ -13,6 +13,8 @@ BillsUnpayed=Pendentes de Pagamento
13 13
 BillsLate=Atrasos de Pagamento
14 14
 BillsStatistics=Estatísticas faturas a clientes
15 15
 BillsStatisticsSuppliers=Estatísticas faturas de Fornecedores
  16
+RelatedBill=Fatura Anexo
  17
+RelatedBills=Faturas Anexos
16 18
 InvoiceStandard=Fatura Standard
17 19
 InvoiceStandardAsk=Fatura Standard
18 20
 InvoiceStandardDesc=Este tipo de fatura é a fatura tradicional. Também é conhecida como <b>Fatura de Débito</b>.
@@ -184,8 +186,6 @@ RemainderToTake=Falta Cobrar
184 186
 AmountExpected=Valor Reclamado
185 187
 ExcessReceived=Recebido em Excesso
186 188
 EscompteOffered=Desconto (Pronto pagamento)
187  
-CreateDraft=Criar Rascunho
188  
-CreateeDraft=Criar Rascunho
189 189
 SendBillRef=Enviar Fatura %s
190 190
 SendReminderBillRef=Lembrete Fatura %s
191 191
 StandingOrders=Débitos Diretos
2  htdocs/langs/pt_BR/contracts.lang 100644 → 100755
@@ -62,7 +62,7 @@ DateStartReal=Data Real Colocação em Serviço
62 62
 DateStartRealShort=Data Inicio
63 63
 DateEndReal=Data Real Fim do Serviço
64 64
 DateEndRealShort=Data Real Finalização
65  
-NbOfServices=N de Serviços
  65
+NbOfServices=No de Serviços
66 66
 CloseService=Finalizar Serviço
67 67
 ServicesNomberShort=%s Serviço(s)
68 68
 RunningServices=Serviços Ativos
3  htdocs/langs/pt_BR/main.lang
... ...
@@ -1,4 +1,5 @@
1 1
 # Dolibarr language file - pt_BR rev. 0.0 - main
  2
+# 2012      Vinícius Nogueira        <viniciusvgn@gmail.com>
2 3
 CHARSET=UTF-8
3 4
 SeparatorDecimal=,
4 5
 SeparatorThousand=.
@@ -279,6 +280,7 @@ ActionRunningShort=Iniciado
279 280
 ActionDoneShort=Terminado
280 281
 CompanyFundation=Empresa ou Instituição
281 282
 ContactsForCompany=Contatos desta empresa
  283
+ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
282 284
 ActionsOnCompany=Ações nesta sociedade
283 285
 NActions=%s ações
284 286
 NActionsLate=%s em atraso
@@ -520,5 +522,6 @@ ShortThursday=Qui
520 522
 ShortFriday=Sex
521 523
 ShortSaturday=Sab
522 524
 ShortSunday=Dom
  525
+CreateDraft=Criar Rascunho
523 526
 
524 527
 
1  htdocs/langs/pt_BR/propal.lang 100644 → 100755
... ...
@@ -1,4 +1,5 @@
1 1
 # Dolibarr language file - pt_BR rev. 0.0 - propal
  2
+# 2012      Vinícius Nogueira        <viniciusvgn@gmail.com>
2 3
 CHARSET=UTF-8
3 4
 Proposals=Orçamentos
4 5
 Proposal=Orçamento
1  htdocs/langs/pt_BR/sendings.lang 100644 → 100755
... ...
@@ -1,4 +1,5 @@
1 1
 # Dolibarr language file - pt_BR rev. 0.0 - sendings
  2
+# 2012      Vinícius Nogueira        <viniciusvgn@gmail.com>
2 3
 CHARSET=UTF-8
3 4
 RefSending=Ref. Envio
4 5
 Sending=Envio
23  htdocs/langs/pt_BR/teste.lang
... ...
@@ -1,23 +0,0 @@
1  
-Users=Uasuaaário
2  
-acoes=ações
3  
-acaes=acçães
4  
-
5  
-
6  
-
7  
-
8  
-
9  
-
10  
-
11  
-
12  
-
13  
-
14  
-
15  
-
16  
-
17  
-
18  
-
19  
-
20  
-
21  
-
22  
-
23  
-
6  htdocs/main.inc.php
@@ -868,8 +868,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
868 868
         print '<!-- Includes for Dolibarr, modules or specific pages-->'."\n";
869 869
         // Output style sheets (optioncss='print' or '')
870 870
         $themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
871  
-        $themeparam='?lang='.$langs->defaultlang.'&theme='.$conf->theme.(GETPOST('optioncss')?'&optioncss='.GETPOST('optioncss','alpha',1):'');
872  
-        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&dol_resetcache='.$_SESSION['dol_resetcache'];
  871
+        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss')?'&amp;optioncss='.GETPOST('optioncss','alpha',1):'');
  872
+        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
873 873
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
874 874
         print '<link rel="stylesheet" type="text/css" title="default" href="'.$themepath.$themeparam.'">'."\n";
875 875
         // CSS forced by modules (relative url starting with /)
@@ -1446,7 +1446,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
1446 1446
             print '" href="';
1447 1447
             print sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
1448 1448
             print '">';
1449  
-            print img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1).' ';
  1449
+            print img_picto('', 'helpdoc').' ';
1450 1450
             print $langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
1451 1451
             //if ($mode == 'wiki') print ' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
1452 1452
             print '</a>';
19  htdocs/product/index.php
@@ -159,7 +159,7 @@
159 159
 print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
160 160
 
161 161
 /*
162  
- * Derniers produits/services en vente
  162
+ * Last modified products
163 163
  */
164 164
 $max=15;
165 165
 $sql = "SELECT p.rowid, p.label, p.price, p.ref, p.fk_product_type, p.tosell, p.tobuy,";
@@ -186,7 +186,10 @@
186 186
 
187 187
 		print '<table class="noborder" width="100%">';
188 188
 
189  
-		print '<tr class="liste_titre"><td colspan="6">'.$transRecordedType.'</td></tr>';
  189
+		$colnb=5;
  190
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) $colnb++;
  191
+
  192
+		print '<tr class="liste_titre"><td colspan="'.$colnb.'">'.$transRecordedType.'</td></tr>';
190 193
 
191 194
 		$var=True;
192 195
 
@@ -211,7 +214,7 @@
211 214
 			}
212 215
 
213 216
 			$var=!$var;
214  
-			print "<tr $bc[$var]>";
  217
+			print "<tr ".$bc[$var].">";
215 218
 			print '<td nowrap="nowrap">';
216 219
 			$product_static->id=$objp->rowid;
217 220
 			$product_static->ref=$objp->ref;
@@ -226,9 +229,9 @@
226 229
 			if (empty($conf->global->PRODUIT_MULTIPRICES))
227 230
 			{
228 231
 				print '<td align="right">';
229  
-    				if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
230  
-    				else print price($objp->price).' '.$langs->trans("HT");
231  
-    				print '</td>';
  232
+    			if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
  233
+    			else print price($objp->price).' '.$langs->trans("HT");
  234
+    			print '</td>';
232 235
 			}
233 236
 			print '<td align="right" nowrap="nowrap">';
234 237
 			print $product_static->LibStatut($objp->tosell,5,0);
@@ -252,7 +255,7 @@
252 255
 
253 256
 print '</td></tr></table>';
254 257
 
255  
-$db->close();
256  
-
257 258
 llxFooter();
  259
+
  260
+$db->close();
258 261
 ?>
17  htdocs/public/emailing/mailing-read.php
@@ -24,7 +24,7 @@
24 24
  *      \ingroup    mailing
25 25
  *      \brief      Script use to update mail status if destinaries read it (if images during mail read are display)
26 26
  */
27  
- 
  27
+
28 28
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
29 29
 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
30 30
 
@@ -32,31 +32,34 @@
32 32
 
33 33
 $id=GETPOST('tag');
34 34
 
  35
+if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled');
  36
+
  37
+
  38
+/*
  39
+ * Actions
  40
+ */
35 41
 
36 42
 if ($id!='')
37 43
 {
38 44
 	$statut='2';
39 45
 	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$id."'";
40 46
 	dol_syslog("public/emailing/mailing-read.php : Mail read : ".$sql, LOG_DEBUG);
41  
-	
  47
+
42 48
 	$resql=$db->query($sql);
43 49
 
44 50
 	//Update status communication of thirdparty prospect
45 51
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$id."' AND source_type='thirdparty' AND source_id is not null)";
46 52
 	dol_syslog("public/emailing/mailing-read.php : Mail read thirdparty : ".$sql, LOG_DEBUG);
47  
-	
  53
+
48 54
 	$resql=$db->query($sql);
49 55
 
50 56
     //Update status communication of contact prospect
51 57
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$id."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
52 58
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
53  
-	
  59
+
54 60
 	$resql=$db->query($sql);
55 61
 
56 62
 }
57 63
 
58  
-
59  
-
60  
-
61 64
 $db->close();
62 65
 ?>
26  htdocs/public/emailing/mailing-usubscribe.php → htdocs/public/emailing/mailing-unsubscribe.php
@@ -20,11 +20,11 @@
20 20
 
21 21
 
22 22
 /**
23  
- *      \file       scripts/emailings/mailing-usubscribe.php
  23
+ *      \file       scripts/emailings/mailing-unsubscribe.php
24 24
  *      \ingroup    mailing
25 25
  *      \brief      Script use to update unsubcribe contact to prospect mailing list
26 26
  */
27  
- 
  27
+
28 28
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
29 29
 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
30 30
 
@@ -39,26 +39,32 @@
39 39
 $id=GETPOST('tag');
40 40
 $unsuscrib=GETPOST('unsuscrib');
41 41
 
  42
+if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled');
  43
+
  44
+
  45
+/*
  46
+ * Actions
  47
+ */
42 48
 
43 49
 if (($id!='') && ($unsuscrib=='1'))
44 50
 {
45 51
 	//Udate status of mail in Destinaries maling list
46 52
 	$statut='3';
47 53
 	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$id."'";
48  
-	dol_syslog("public/emailing/mailing-usubscribe.php : Mail unsubcribe : ".$sql, LOG_DEBUG);
49  
-	
  54
+	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe : ".$sql, LOG_DEBUG);
  55
+
50 56
 	$resql=$db->query($sql);
51  
-	
  57
+
52 58
 	//Update status communication of thirdparty prospect
53 59
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$id."' AND source_type='thirdparty' AND source_id is not null)";
54 60
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe thirdparty : ".$sql, LOG_DEBUG);
55  
-	
  61
+
56 62
 	$resql=$db->query($sql);
57 63
 
58 64
     //Update status communication of contact prospect
59 65
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$id."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
60 66
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
61  
-	
  67
+
62 68
 	$resql=$db->query($sql);
63 69
 
64 70
 	$sql = "SELECT mc.email";
@@ -66,9 +72,9 @@
66 72
 	$sql .= " WHERE mc.tag='".$id."'";
67 73
 
68 74
 	$resql=$db->query($sql);
69  
-	
  75
+
70 76
 	$obj = $db->fetch_object($resql);
71  
-	
  77
+
72 78
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
73 79
 
74 80
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
@@ -92,8 +98,6 @@
92 98
 	print '</td></tr></table>';
93 99
 	print "</body>\n";
94 100
 	print "</html>\n";
95  
-	
96  
-
97 101
 }
98 102
 
99 103
 $db->close();
184  htdocs/societe/soc.php
@@ -803,46 +803,24 @@
803 803
         print '<tr><td>'.$langs->trans('EMail').($conf->global->SOCIETE_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$object->email.'"></td>';
804 804
         print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
805 805
 
806  
-        print '<tr>';
807  
-        // IdProf1 (SIREN for France)
808  
-        $idprof=$langs->transcountry('ProfId1',$object->country_code);
809  
-        if ($idprof!='-')
810  
-        {
811  
-            print '<td>'.$idprof.'</td><td>';
812  
-            print $formcompany->get_input_id_prof(1,'idprof1',$object->idprof1,$object->country_code);
813  
-            print '</td>';
814  
-        }
815  
-        else print '<td>&nbsp;</td><td>&nbsp;</td>';
816  
-        // IdProf2 (SIRET for France)
817  
-        $idprof=$langs->transcountry('ProfId2',$object->country_code);
818  
-        if ($idprof!='-')
819  
-        {
820  
-            print '<td>'.$idprof.'</td><td>';
821  
-            print $formcompany->get_input_id_prof(2,'idprof2',$object->idprof2,$object->country_code);
822  
-            print '</td>';
823  
-        }
824  
-        else print '<td>&nbsp;</td><td>&nbsp;</td>';
825  
-        print '</tr>';
826  
-        print '<tr>';
827  
-        // IdProf3 (APE for France)
828  
-        $idprof=$langs->transcountry('ProfId3',$object->country_code);
829  
-        if ($idprof!='-')
  806
+        // Prof ids
  807
+        $i=1; $j=0;
  808
+        while ($i <= 6)
830 809
         {
831  
-            print '<td>'.$idprof.'</td><td>';
832  
-            print $formcompany->get_input_id_prof(3,'idprof3',$object->idprof3,$object->country_code);
833  
-            print '</td>';
834  
-        }
835  
-        else print '<td>&nbsp;</td><td>&nbsp;</td>';
836  
-        // IdProf4 (NU for France)
837  
-        $idprof=$langs->transcountry('ProfId4',$object->country_code);
838  
-        if ($idprof!='-')
839  
-        {
840  
-            print '<td>'.$idprof.'</td><td>';
841  
-            print $formcompany->get_input_id_prof(4,'idprof4',$object->idprof4,$object->country_code);
842  
-            print '</td>';
  810
+            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
  811
+            if ($idprof!='-')
  812
+            {
  813
+                if (($j % 2) == 0) print '<tr>';
  814
+                print '<td>'.$idprof.'</td><td>';
  815
+                $key='idprof'.$i;
  816
+                print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
  817
+                print '</td>';
  818
+                if (($j % 2) == 1) print '</tr>';
  819
+                $j++;
  820
+            }
  821
+            $i++;
843 822
         }
844  
-        else print '<td>&nbsp;</td><td>&nbsp;</td>';
845  
-        print '</tr>';
  823
+        if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
846 824
 
847 825
         // Assujeti TVA
848 826
         $form = new Form($db);
@@ -985,7 +963,7 @@
985 963
         /*
986 964
          * Edition
987 965
          */
988  
-        
  966
+
989 967
         //print_fiche_titre($langs->trans("EditCompany"));
990 968
 
991 969
         if ($socid)
@@ -998,7 +976,7 @@
998 976
 
999 977
 
1000 978
 	        $head = societe_prepare_head($object);
1001  
-	
  979
+
1002 980
 	        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
1003 981
 
1004 982
 
@@ -1265,46 +1243,24 @@
1265 1243
             print '<tr><td>'.$langs->trans('EMail').($conf->global->SOCIETE_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$object->email.'"></td>';
1266 1244
             print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
1267 1245
 
1268  
-            print '<tr>';
1269  
-            // IdProf1 (SIREN for France)
1270  
-            $idprof=$langs->transcountry('ProfId1',$object->country_code);
1271  
-            if ($idprof!='-')
1272  
-            {
1273  
-                print '<td>'.$idprof.'</td><td>';
1274  
-                print $formcompany->get_input_id_prof(1,'idprof1',$object->idprof1,$object->country_code);
1275  
-                print '</td>';
1276  
-            }
1277  
-            else print '<td>&nbsp;</td><td>&nbsp;</td>';
1278  
-            // IdProf2 (SIRET for France)
1279  
-            $idprof=$langs->transcountry('ProfId2',$object->country_code);
1280  
-            if ($idprof!='-')
1281  
-            {
1282  
-                print '<td>'.$idprof.'</td><td>';
1283  
-                print $formcompany->get_input_id_prof(2,'idprof2',$object->idprof2,$object->country_code);
1284  
-                print '</td>';
1285  
-            }
1286  
-            else print '<td>&nbsp;</td><td>&nbsp;</td>';
1287  
-            print '</tr>';
1288  
-            print '<tr>';
1289  
-            // IdProf3 (APE for France)
1290  
-            $idprof=$langs->transcountry('ProfId3',$object->country_code);
1291  
-            if ($idprof!='-')
  1246
+            // Prof ids
  1247
+            $i=1; $j=0;
  1248
+            while ($i <= 6)
1292 1249
             {
1293  
-                print '<td>'.$idprof.'</td><td>';
1294  
-                print $formcompany->get_input_id_prof(3,'idprof3',$object->idprof3,$object->country_code);
1295  
-                print '</td>';
1296  
-            }
1297  
-            else print '<td>&nbsp;</td><td>&nbsp;</td>';
1298  
-            // IdProf4 (NU for France)
1299  
-            $idprof=$langs->transcountry('ProfId4',$object->country_code);
1300  
-            if ($idprof!='-')
1301  
-            {
1302  
-                print '<td>'.$idprof.'</td><td>';
1303  
-                print $formcompany->get_input_id_prof(4,'idprof4',$object->idprof4,$object->country_code);
1304  
-                print '</td>';
  1250
+                $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
  1251
+                if ($idprof!='-')
  1252
+                {
  1253
+                    if (($j % 2) == 0) print '<tr>';
  1254
+                    print '<td>'.$idprof.'</td><td>';
  1255
+                    $key='idprof'.$i;
  1256
+                    print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
  1257
+                    print '</td>';
  1258
+                    if (($j % 2) == 1) print '</tr>';
  1259
+                    $j++;
  1260
+                }
  1261
+                $i++;
1305 1262
             }
1306  
-            else print '<td>&nbsp;</td><td>&nbsp;</td>';
1307  
-            print '</tr>';
  1263
+            if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
1308 1264
 
1309 1265
             // VAT payers
1310 1266
             print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>';
@@ -1585,63 +1541,29 @@
1585 1541
         print dol_print_url($object->url);
1586 1542
         print '</td></tr>';
1587 1543
 
1588  
-        // ProfId1 (SIREN for France)
1589  
-        $profid=$langs->transcountry('ProfId1',$object->country_code);
1590  
-        if ($profid!='-')
1591  
-        {
1592  
-            print '<tr><td>'.$profid.'</td><td>';
1593  
-            print $object->idprof1;
1594  
-            if ($object->idprof1)
1595  
-            {
1596  
-                if ($object->id_prof_check(1,$object) > 0) print ' &nbsp; '.$object->id_prof_url(1,$object);
1597  
-                else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
1598  
-            }
1599  
-            print '</td>';
1600  
-        }
1601  
-        else print '<tr><td>&nbsp;</td><td>&nbsp;</td>';
1602  
-        // ProfId2 (SIRET for France)
1603  
-        $profid=$langs->transcountry('ProfId2',$object->country_code);
1604  
-        if ($profid!='-')
1605  
-        {
1606  
-            print '<td>'.$profid.'</td><td>';
1607  
-            print $object->idprof2;
1608  
-            if ($object->idprof2)
1609  
-            {
1610  
-                if ($object->id_prof_check(2,$object) > 0) print ' &nbsp; '.$object->id_prof_url(2,$object);
1611  
-                else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
1612  
-            }
1613  
-            print '</td></tr>';
1614  
-        }
1615  
-        else print '<td>&nbsp;</td><td>&nbsp;</td></tr>';
1616  
-
1617  
-        // ProfId3 (APE for France)
1618  
-        $profid=$langs->transcountry('ProfId3',$object->country_code);
1619  
-        if ($profid!='-')
  1544
+        // Prof ids
  1545
+        $i=1; $j=0;
  1546
+        while ($i <= 6)
1620 1547
         {
1621  
-            print '<tr><td>'.$profid.'</td><td>';
1622  
-            print $object->idprof3;
1623  
-            if ($object->idprof3)
1624  
-            {
1625  
-                if ($object->id_prof_check(3,$object) > 0) print ' &nbsp; '.$object->id_prof_url(3,$object);
1626  
-                else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
1627  
-            }
1628  
-            print '</td>';
1629  
-        }
1630  
-        else print '<tr><td>&nbsp;</td><td>&nbsp;</td>';
1631  
-        // ProfId4 (NU for France)
1632  
-        $profid=$langs->transcountry('ProfId4',$object->country_code);
1633  
-        if ($profid!='-')
1634  
-        {
1635  
-            print '<td>'.$profid.'</td><td>';
1636  
-            print $object->idprof4;
1637  
-            if ($object->idprof4)
  1548
+            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
  1549
+            if ($idprof!='-')
1638 1550
             {
1639  
-                if ($object->id_prof_check(4,$object) > 0) print ' &nbsp; '.$object->id_prof_url(4,$object);
1640  
-                else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
  1551
+                if (($j % 2) == 0) print '<tr>';
  1552
+                print '<td>'.$idprof.'</td><td>';
  1553
+                $key='idprof'.$i;
  1554
+                print $object->$key;
  1555
+                if ($object->$key)
  1556
+                {
  1557
+                    if ($object->id_prof_check($i,$object) > 0) print ' &nbsp; '.$object->id_prof_url($i,$object);
  1558
+                    else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
  1559
+                }
  1560
+                print '</td>';
  1561
+                if (($j % 2) == 1) print '</tr>';
  1562
+                $j++;
1641 1563
             }
1642  
-            print '</td></tr>';
  1564
+            $i++;
1643 1565
         }
1644  
-        else print '<td>&nbsp;</td><td>&nbsp;</td></tr>';
  1566
+        if ($j % 2 == 1)  print '<td colspan="2"></td></tr>';
1645 1567
 
1646 1568
         // VAT payers
1647 1569
         $form = new Form($db);
0  htdocs/theme/common/helpdoc.png → htdocs/theme/auguria/img/helpdoc.png
File renamed without changes
BIN  htdocs/theme/bureau2crea/img/helpdoc.png
BIN  htdocs/theme/cameleo/img/helpdoc.png
BIN  htdocs/theme/eldy/img/helpdoc.png
13  scripts/emailings/mailing-send.php
@@ -106,8 +106,11 @@
106 106
 	{
107 107
 		dol_syslog("nb of targets = ".$num, LOG_DEBUG);
108 108
 
  109
+		$now=dol_now();
  110
+
109 111
 		// Positionne date debut envoi
110  
-		$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=SYSDATE() WHERE rowid=".$id;
  112
+		$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
  113
+
111 114
 		$resql2=$db->query($sql);
112 115
 		if (! $resql2)
113 116
 		{
@@ -135,9 +138,9 @@
135 138
 			$other5=$other[4];
136 139
 			$substitutionarray=array(
137 140
 				'__ID__' => $obj->source_id,
138  
-				'__EMAIL__' => '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>',
  141
+				'__EMAIL__' => $obj->email,
139 142
 				'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'" width="0" height="0" style="width:0px;height:0px" border="0"/>',
140  
-				'__UNSUSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-usubscribe.php?tag='.$obj->tag.'&unsuscrib=1" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>',
  143
+				'__UNSUSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>',
141 144
 				'__LASTNAME__' => $obj->lastname,
142 145
 				'__FIRSTNAME__' => $obj->firstname,
143 146
 				'__OTHER1__' => $other1,
@@ -212,11 +215,11 @@
212 215
 						{
213 216
 							dol_print_error($db);
214 217
 						}
215  
-					
  218
+
216 219
 					    //Update status communication of contact prospect
217 220
 						$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
218 221
 						dol_syslog("fiche.php: set prospect contact status sql=".$sql, LOG_DEBUG);
219  
-						
  222
+
220 223
 						$resql2=$db->query($sql);
221 224
 						if (! $resql2)
222 225
 						{

No commit comments for this range

Something went wrong with that request. Please try again.