From b92f52cdf95f49cec6597236ed5edc06ffbf24ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Mon, 10 Sep 2012 14:12:31 +0200
Subject: [PATCH 1/2] Social charges deductible field now with yes/no select

---
 htdocs/admin/dict.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 3ea8af0ae97..c2494433776 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -883,7 +883,7 @@ if ($id)
                                     $valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays;
                                 }
                             }
-                            else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm') {
+                            else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm' || $fieldlist[$field] == 'deductible') {
                                 $valuetoshow=yn($valuetoshow);
                             }
                             else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
@@ -1140,7 +1140,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
             print 'user<input type="hidden" name="type" value="user">';
             print '</td>';
         }
-        elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm') {
+        elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm' || $fieldlist[$field] == 'deductible') {
             print '<td>';
             print $form->selectyesno($fieldlist[$field],(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),1);
             print '</td>';

From d7d1c8ac6570639249a5c880e4543438cfc46356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Mon, 10 Sep 2012 15:14:29 +0200
Subject: [PATCH 2/2] Missing paper formats unit translations

---
 htdocs/admin/dict.php         | 14 +++++++++++++-
 htdocs/langs/en_US/other.lang |  1 +
 htdocs/langs/es_ES/other.lang |  1 +
 htdocs/langs/fr_FR/other.lang |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c2494433776..fccf5896951 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -969,6 +969,13 @@ if ($id)
                             else if ($fieldlist[$field]=='unicode') {
                             	$valuetoshow = getCurrencySymbol($obj->code);
                             }
+
+                            else if (($fieldlist[$field] == 'unit') && ($tabname[$_GET['id']] == MAIN_DB_PREFIX.'c_paper_format'))
+                            {
+                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+                                $valuetoshow = ($obj->code && ($key != 'SizeUnit'.strtolower($obj->unit))) ? $key : $obj->$fieldlist[$field];
+                            }
+
                             if ($showfield) print '<td>'.$valuetoshow.'</td>';
                         }
                     }
@@ -1159,7 +1166,12 @@ function fieldList($fieldlist,$obj='',$tabname='')
         }
         elseif ($fieldlist[$field]=='unit') {
             print '<td>';
-            print $form->selectarray('unit',array('mm','cm','point','inch'),(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),0,0,1);
+            print $form->selectarray('unit', array(
+            	'mm' => $langs->trans('SizeUnitmm'),
+            	'cm' => $langs->trans('SizeUnitcm'),
+            	'point' => $langs->trans('SizeUnitpoint'),
+            	'inch' => $langs->trans('SizeUnitinch')
+            ), (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), 0, 0, 0);
             print '</td>';
         }
         else
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 57e34e66146..14af38beb6a 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -123,6 +123,7 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=inch
 SizeUnitfoot=foot
+SizeUnitpoint=point
 BugTracker=Bug tracker
 SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
 BackToLoginPage=Back to login page
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 0a81d626e94..df10df64e11 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -119,6 +119,7 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=pulgada
 SizeUnitfoot=pie
+SizeUnitpoint=punto
 BugTracker=Incidencias
 SendNewPasswordDesc=Este formulario permite enviar una nueva contraseña. Se enviará al e-mail del usuario<br>La modificación de la contraseña no será efectiva hasta que el usuario haga clic en el link de confirmación incluido en este e-mail.<br>Supervise su correo.
 BackToLoginPage=Volver a la página de conexión
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 127e874a6df..d7c2b04cd6c 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -122,6 +122,7 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=pouce
 SizeUnitfoot=pied
+SizeUnitpoint=point
 BugTracker=Bug tracker
 SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre user.<br>La modification du mot de passe ne sera effective qu'après clic par le destinataire du lien de confirmation inclut dans ce mail.<br>Surveillez votre messagerie.
 BackToLoginPage=Retour page de connexion