Merge pull request #563 from marcosgdf/3.3

Little bug fixes and translations
2012-12-31 04:49:21 -08:00
parent 6b6f725f99 674034e648
commit 83a3720f43
18 changed files with 61 additions and 30 deletions
--- a/24
+++ b/24
@@ -35,13 +35,13 @@ For users:
 - New: Support unique field for extrafields.
 - New: Extra fields supports more types (int, string, double, date, datetime).
 - New: Can correct stock of a warehouse from warehouse card.
- New: [ task #185 ]: Can input amount when correcting stock to recalculate PMP.
- New: [ task #454 ]: Add "No category" into filters on category.
+- New: [ task #185 ] Can input amount when correcting stock to recalculate PMP.
+- New: [ task #454 ] Add "No category" into filters on category.
 - New: Auto check box on page to edit interface options of user.
 - New: More surface control on stock correction page.
 - New: Add great britain provinces.
 - New: [ task #494 ] Send an email to foundation when a new member has auto-subscribed.
- New: [ task #326 ]: Add a numbering module to suggest automatically a product ref.
+- New: [ task #326 ] Add a numbering module to suggest automatically a product ref.
 - New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates.
 - New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.
 - New: Can select thirdparties into emailing targets, even if module category is not enabled.
@@ -61,9 +61,8 @@ For users:
 - New: Add new import options: Third parties bank details, warehouses and stocks, categories and suppliers prices
 - New: English bank account need a bank code (called sort code) to identify an account. 
 - New: Can choose menu entry to show with external site module.
- New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM
-       to force margins of generated PDF.
- New:  [ task #314 ] Can define if prof id are mandatory or not.
+- New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of generated PDF.
+- New: [ task #314 ] Can define if prof id are mandatory or not.
 - New: Add button on order card to create intervention from services.
 - New: Add search box to find products by supplier reference.
 - New: Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" onto logon page. 
@@ -76,11 +75,15 @@ New experimental modules:
 - New: Add commissions management module.


- Fix: [ bug #499 ]: Supplier order input method not translated
+- Fix: [ bug #499 ] Supplier order input method not translated
 - Fix: No images into product description lines as PDF generation does
  not work with this.
 - Fix: Errors weren't being shown in customer's & supplier's orders
 - Fix: Lastname wasn't being recorded in xinputuser emailing module.
+- Fix: [ bug #653 ] Error while creating agenda additional attributes
+- Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO
+- Fix: [ bug #658 ] Search on bank do not work for description
+- Fix: [ bug #659 ] Comment in recurrent invoices is not stored

 For developers:
 - New: Add webservice for thirdparty creation and list.
@@ -103,7 +106,12 @@ For developers:
 - New: We can use a dynamic value ($conf->global->XXX for example) into titles of menus.
 - Qual: Renamed SUPPLIER_INVOICE_BUILDDOC trigger to BILL_SUPPLIER_BUILDDOC
 - Qual: Renamed INVOICE_SUPPLIER_DELETE trigger to BILL_SUPPLIER_DELETE
- Qual: Renamed SUPLLIER_ORDER_BUILDDOC trigger to ORDER_SUPPLIER_BUILDDOC
+- Qual: Renamed SUPLIER_ORDER_BUILDDOC trigger to ORDER_SUPPLIER_BUILDDOC
+- Qual: Renamed CONTRACTLINE_DELETE trigger to CONTRACT_LINE_DELETE
+- Qual: Renamed all ficheinter.class.php triggers so that they start with 'FICHINTER_'
+- Fix: [ bug #655 ] ORDER_REOPEN trigger incorrectly named
+- Fix: [ bug #656 ] Contracts trigger CONTRACT_MODIFY incorrectly named
+- Fix: [ bug #657 ] Usergroup class' GROUP_DELETE trigger incorrectly named

 For translators:
 - New: Update language files (de, tr, pt, ca, es, en, fr).
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -371,7 +371,8 @@ if ($id == 11)
 			'propal'            => $langs->trans('Proposal'),
 			'facture'           => $langs->trans('Bill'),
 			'facture_fourn'     => $langs->trans('SupplierBill'),
-			'fichinter'         => $langs->trans('InterventionCard')
+			'fichinter'         => $langs->trans('InterventionCard'),
+			'agenda'			=> $langs->trans('Agenda')
 	);
 	if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
 	$sourceList = array(
@@ -1247,7 +1248,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
 			$align="left";
 			if (in_array($fieldlist[$field],array('taux','localtax1','localtax2'))) $align="right";	// Fields aligned on right
 			print '<td align="'.$align.'">';
-			print '<input type="text" class="flat" value="'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
+			print '<input type="text" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'libelle_facture') {
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -28,6 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Noti

 $langs->load("admin");
 $langs->load("other");
+$langs->load("orders");
+$langs->load("propal");
+$langs->load("bills");

 // Security check
 if (!$user->admin)
@@ -109,8 +112,14 @@ foreach($listofnotifiedevents as $notifiedevent)
 {
    $var=!$var;
    $label=$langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
+
+    if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
+    elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
+    elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
+    elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
+
    print '<tr '.$bc[$var].'>';
-    print '<td>'.$notifiedevent['elementtype'].'</td>';
+    print '<td>'.$elementLabel.'</td>';
    print '<td>'.$notifiedevent['code'].'</td>';
    print '<td>'.$label.'</td>';
    print '</tr>';
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -108,7 +108,7 @@ class InterfaceDemo
        // Data and type of action are stored into $object and $action
    
        // Users
-        if     ($action == 'USER_LOGIN')
+        if ($action == 'USER_LOGIN')
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
@@ -322,10 +322,6 @@ class InterfaceDemo
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
-        elseif ($action == 'CONTRACT_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
        elseif ($action == 'CONTRACT_ACTIVATE')
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -404,19 +400,19 @@ class InterfaceDemo
        }

 		// Interventions
-		elseif ($action == 'FICHEINTER_CREATE')
+		elseif ($action == 'FICHINTER_CREATE')
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
-        elseif ($action == 'FICHEINTER_MODIFY')
+        elseif ($action == 'FICHINTER_MODIFY')
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
-        elseif ($action == 'FICHEINTER_VALIDATE')
+        elseif ($action == 'FICHINTER_VALIDATE')
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
-	    elseif ($action == 'FICHEINTER_DELETE')
+	    elseif ($action == 'FICHINTER_DELETE')
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -192,7 +192,7 @@ else
 	print '</tr>';

 	print '<tr class="impair">';
-	print '<td>'.$langs->trans("Passive").'</td>';
+	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
 	$defaultpassive=GETPOST("FTP_PASSIVE_" . ($lastftpentry+1));
 	if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
 	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).'</td>';
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -907,3 +907,4 @@ ALTER TABLE llx_element_lock DROP COLUMN fk_user_modif;
 ALTER TABLE llx_element_lock DROP COLUMN status;

 DELETE FROM llx_c_action_trigger WHERE elementtype='withdraw';
+UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER_VALIDATE';
--- a/htdocs/langs/en_US/ftp.lang
+++ b/htdocs/langs/en_US/ftp.lang
@@ -10,3 +10,4 @@ FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
 FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
 FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
 FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
+FTPPassiveMode=Passive mode
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -107,6 +107,7 @@ Activated=Activated
 Closed=Closed
 Closed2=Closed
 Enabled=Enabled
+Deprecated=Deprecated
 Disable=Disable
 Disabled=Disabled
 Add=Add
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -10,6 +10,8 @@ PAYPAL_API_USER=API username
 PAYPAL_API_PASSWORD=API password
 PAYPAL_API_SIGNATURE=API signature
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
 PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page
 ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1179,7 +1179,7 @@ LDAPFieldSidExample=Ejemplo : objectsid
 LDAPFieldEndLastSubscription=Fecha finalización como miembro
 LDAPParametersAreStillHardCoded=Los parámetros LDAP son codificados en duro (en la clase contact)
 LDAPSetupNotComplete=Configuración LDAP incompleta (a completar en las otras pestañas)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contraseña no inindicados. Los accesos LDAP serán anónimos y en solo lectura.
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contraseña no indicados. Los accesos LDAP serán anónimos y en solo lectura.
 LDAPDescContact=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los contactos Dolibarr.
 LDAPDescUsers=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los usuarios Dolibarr.
 LDAPDescGroups=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los grupos usuarios Dolibarr.
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -75,3 +75,7 @@ ExtSitesNbOfAgenda=Número de calendarios
 AgendaExtNb=Calendario nº %s
 ExtSiteUrlAgenda=Url de acceso al archivo .ical
 ExtSiteNoLabel=Sin descripción
+
+# Type contacts
+TypeContact_agenda_internal_GUEST=Invitado
+TypeContact_agenda_external_GUEST=Invitado
--- a/htdocs/langs/es_ES/ftp.lang
+++ b/htdocs/langs/es_ES/ftp.lang
@@ -10,3 +10,4 @@ FailedToConnectToFTPServer=No se pudo conectar con el servidor FTP  (servidor: %
 FailedToConnectToFTPServerWithCredentials=No se pudo conectar con el login/contraseña FTP configurados
 FTPFailedToRemoveFile=No se pudo eliminar el archivo <b>%s</b>.
 FTPFailedToRemoveDir=No se pudo eliminar el directorio <b>%s</b> (Compruebe los permisos y que el directorio está vacío).
+FTPPassiveMode=Modo pasivo
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -107,6 +107,7 @@ Closed2=Cerrado
 Enabled=Activado
 Disable=Desactivar
 Disabled=Desactivado
+Deprecated=Obsoleto
 Create=Crear
 Add=Añadir
 AddLink=Enlazar
--- a/htdocs/langs/es_ES/paypal.lang
+++ b/htdocs/langs/es_ES/paypal.lang
@@ -10,6 +10,8 @@ PAYPAL_API_USER=Nombre usuario API
 PAYPAL_API_PASSWORD=Contraseña usuario API
 PAYPAL_API_SIGNATURE=Firma API
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proponer pago integral (Tarjeta+Paypal) o sólo Paypal
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=Sólo PayPal
 PAYPAL_CSS_URL=Url opcional de la hoja de estilo CSS de la página de pago
 ThisIsTransactionId=Identificador de la transacción: <b>%s</b> 
 PAYPAL_ADD_PAYMENT_URL=Añadir la url del pago Paypal al enviar un documento por e-mail
--- a/htdocs/langs/fr_FR/ftp.lang
+++ b/htdocs/langs/fr_FR/ftp.lang
@@ -10,3 +10,4 @@ FailedToConnectToFTPServer=Échec de connexion au serveur FTP (serveur: %s, port
 FailedToConnectToFTPServerWithCredentials=Échec de login avec le login/mot de passe FTP configuré
 FTPFailedToRemoveFile=Échec suppression fichier <b>%s</b>.
 FTPFailedToRemoveDir=Échec suppression répertoire <b>%s</b> (Vérifiez les permissions et que le répertoire soit vide).
+FTPPassiveMode=Mode passif
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -107,6 +107,7 @@ Closed2=Fermé
 Enabled=Actif
 Disable=Désactiver
 Disabled=Désactivé
+Deprecated=Obsolète
 Create=Créer
 Add=Ajouter
 AddLink=Lier
--- a/htdocs/langs/fr_FR/paypal.lang
+++ b/htdocs/langs/fr_FR/paypal.lang
@@ -10,6 +10,8 @@ PAYPAL_API_USER=Nom utilisateur API
 PAYPAL_API_PASSWORD=Mot de passe utilisateur API
 PAYPAL_API_SIGNATURE=Signature API
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proposer le paiement intégral (Carte+Paypal) ou Paypal seul
+PaypalModeIntegral=Intégral
+PaypalModeOnlyPaypal=PayPal seul
 PAYPAL_CSS_URL=Url optionnelle de la feuille de style CSS de la page de paiement
 ThisIsTransactionId=Voici l'identifiant de la transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Ajouter l'url de paiement Paypal lors de l'envoi d'un document par mail
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -157,7 +157,7 @@ print "</tr>\n";
 $var=!$var;
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").'</td><td>';
-print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=>'Integral','paypalonly'=>'Paypal only'),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
+print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
 print '</td></tr>';

 /*$var=!$var;