From f973a1fb432cddc0ed25a6a4fdf4af363d05c9fa Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 14 Jun 2015 20:15:22 +0200 Subject: [PATCH 1/3] Typo "cibility" --- htdocs/contact/class/contact.class.php | 2 +- htdocs/societe/soc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index ebc167ae6d6..9bbb684e831 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -918,7 +918,7 @@ class Contact extends CommonObject $result=''; $label = '' . $langs->trans("ShowContact") . ''; $label.= '
' . $langs->trans("Name") . ': '.$this->getFullName($langs); - //if ($this->cibility_id) $label.= '
' . $langs->trans("Civility") . ': '.$this->civility_id; // TODO Translate cibilty_id code + //if ($this->civility_id) $label.= '
' . $langs->trans("Civility") . ': '.$this->civility_id; // TODO Translate cibilty_id code $label.= '
' . $langs->trans("Poste") . ': '.$this->poste; $label.= '
' . $langs->trans("EMail") . ': '.$this->email; $label.= '
' . $langs->trans("Phone") . ': '.join(', ',array($this->phone_pro,$this->phone_mobile,$this->phone_perso)); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index e4098332e64..cb0e01b4bcb 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -243,7 +243,7 @@ if (empty($reshook)) $object->particulier = GETPOST("private"); $object->name = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha')); - $object->civility_id = GETPOST('civility_id'); // Note: cibility id is a code, not an int + $object->civility_id = GETPOST('civility_id'); // Note: civility id is a code, not an int // Add non official properties $object->name_bis = GETPOST('name','alpha'); $object->firstname = GETPOST('firstname','alpha'); @@ -995,7 +995,7 @@ else print ''.fieldLabel('FirstName','firstname').''; print ''; print ' '; - print ''.fieldLabel('UserTitle','cibility_id').''; + print ''.fieldLabel('UserTitle','civility_id').''; print $formcompany->select_civility($object->civility_id).''; print ' '; } From a4acc867aa395f72980b17b1f2aaf8f3ac9de38b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 14 Jun 2015 20:24:25 +0200 Subject: [PATCH 2/3] Typo "inra_vat" --- htdocs/societe/soc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index cb0e01b4bcb..9d7d3d26f72 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1131,7 +1131,7 @@ else print ''; print $form->selectyesno('assujtva_value',1,1); // Assujeti par defaut en creation print ''; - print ''.fieldLabel('VATIntra','inra_vat').''; + print ''.fieldLabel('VATIntra','intra_vat').''; print ''; $s = ''; From b6958bb592b72b765c9e1aa567dacddec8f60510 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 15 Jun 2015 05:22:50 +0200 Subject: [PATCH 3/3] Wrong address --- scripts/accountancy/export-thirdpartyaccount.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php index f1ff769059c..a3e967ed383 100755 --- a/scripts/accountancy/export-thirdpartyaccount.php +++ b/scripts/accountancy/export-thirdpartyaccount.php @@ -1,6 +1,6 @@ - * Copyright (C) 2013-2014 Alexandre Spangaro + * Copyright (C) 2013-2014 Alexandre Spangaro * Copyright (C) 2014 Florian Henry * * This program is free software; you can redistribute it and/or modify