From 399093f501f3c1226c66f2b7817b9c032554903a Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Fri, 1 Nov 2013 13:48:22 +0100 Subject: [PATCH 01/21] USe good status icon for thirdparty ActivityCeased --- htdocs/societe/class/societe.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 495f6ec6a5a..79a7e3d47b2 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1513,22 +1513,22 @@ class Societe extends CommonObject } if ($mode == 2) { - if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6').' '.$langs->trans("ActivityCeased"); + if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased"); if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity"); } if ($mode == 3) { - if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6'); + if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1'); if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4'); } if ($mode == 4) { - if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6').' '.$langs->trans("ActivityCeased"); + if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased"); if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity"); } if ($mode == 5) { - if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut6'); + if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut1'); if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4'); } } From e8a80e236504d134249d6e691570d25f3561ed0a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 1 Nov 2013 17:46:57 +0100 Subject: [PATCH 02/21] Now comments in changelog are concatenated --- build/debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build/debian/changelog b/build/debian/changelog index f8cca0e8e41..cc9bd706d86 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,5 +1,19 @@ dolibarr (3.4.2) unstable; urgency=low + [ Laurent Destailleur (eldy) ] + * Maintenance release. + + -- Laurent Destailleur (eldy) Mon, 22 Apr 2013 12:00:00 +0100 + +dolibarr (3.4.1) unstable; urgency=low + + [ Laurent Destailleur (eldy) ] + * Maintenance release. + + -- Laurent Destailleur (eldy) Mon, 22 Apr 2013 12:00:00 +0100 + +dolibarr (3.4.0) unstable; urgency=low + [ Laurent Destailleur (eldy) ] * New upstream release. From 662f48ddc200b829369c521c0a1e376b86c54f6f Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Sat, 2 Nov 2013 02:21:45 +0100 Subject: [PATCH 03/21] Use good icons --- htdocs/societe/class/societe.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 79a7e3d47b2..80b65229f68 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1513,22 +1513,22 @@ class Societe extends CommonObject } if ($mode == 2) { - if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased"); + if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut8').' '.$langs->trans("ActivityCeased"); if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity"); } if ($mode == 3) { - if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1'); + if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut8'); if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4'); } if ($mode == 4) { - if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut1').' '.$langs->trans("ActivityCeased"); + if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut8').' '.$langs->trans("ActivityCeased"); if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity"); } if ($mode == 5) { - if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut1'); + if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut8'); if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4'); } } From 6aea0bf7a1e4f686feca224a43bf7e1ffe5161b5 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Sat, 2 Nov 2013 12:49:37 +0100 Subject: [PATCH 04/21] Fix [ bug #1105 ] Searching Boxes other search option --- ChangeLog | 2 ++ htdocs/compta/facture/list.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 763e3369203..41982d6ecf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.4.2 compared to 3.4.1 ***** Fix: Bad rounding on margin calculations and display. Fix: Option drpo table into backup was broken. +Fix: [ bug #1105 ] Searching Boxes other search option + ***** ChangeLog for 3.4.1 compared to 3.4.0 ***** Fix: Display buying price on line edit when no supplier price is defined diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index aa685e11ab3..998d4fab931 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -216,7 +216,7 @@ if (! $sall) } else { - $sql.= ' AND (s.nom LIKE \'%'.$db->escape($sall).'%\' OR f.facnumber LIKE \'%'.$db->escape($sall).'%\' OR f.note LIKE \'%'.$db->escape($sall).'%\' OR fd.description LIKE \'%'.$db->escape($sall).'%\')'; + $sql.= ' AND (s.nom LIKE \'%'.$db->escape($sall).'%\' OR f.facnumber LIKE \'%'.$db->escape($sall).'%\' OR f.note_private LIKE \'%'.$db->escape($sall).'%\' OR f.note_public LIKE \'%'.$db->escape($sall).'%\' OR fd.description LIKE \'%'.$db->escape($sall).'%\')'; } $sql.= ' ORDER BY '; $listfield=explode(',',$sortfield); From c5f29e14a452ac39aa30ca6135d94f149ad39bee Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Sat, 2 Nov 2013 17:50:24 +0100 Subject: [PATCH 05/21] missing trad and fix language --- htdocs/adherents/admin/adherent.php | 2 +- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/comm/propal/document.php | 2 +- htdocs/commande/class/commande.class.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/cron/card.php | 8 ++++---- htdocs/cron/list.php | 2 +- htdocs/expedition/class/expedition.class.php | 2 +- htdocs/fourn/class/fournisseur.commande.class.php | 2 +- htdocs/fourn/class/fournisseur.facture.class.php | 2 +- htdocs/fourn/commande/document.php | 2 +- htdocs/langs/fr_FR/admin.lang | 12 ++++++------ htdocs/langs/fr_FR/cron.lang | 10 +++++----- htdocs/langs/fr_FR/projects.lang | 8 ++++---- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index cfb7372308a..71f6cbb52ad 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -265,7 +265,7 @@ print '
'; /* - * Edition des variables globales non rattache a un theme specifique + * Editing global variables not related to a specific theme */ $constantes=array( 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT', diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 87db0d27f25..dd80dbe9bb4 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1664,7 +1664,7 @@ class Propal extends CommonObject { if ($statut == 2) { - // Classe la societe rattachee comme client + // The connected company is classified as a client $soc=new Societe($this->db); $soc->id = $this->socid; $result=$soc->set_as_client(); diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index b0eca76345b..b5a9028e286 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -21,7 +21,7 @@ /** * \file htdocs/comm/propal/document.php * \ingroup propale - * \brief Page de gestion des documents attaches a une proposition commerciale + * \brief Management page of documents attached to a business proposal */ require '../../main.inc.php'; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 4e00900d995..2f2e3c98a16 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -266,7 +266,7 @@ class Commande extends CommonOrder if (preg_match('/^[\(]?PROV/i', $this->ref)) { // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) - // afin de ne pas perdre les fichiers attaches + // in order not to lose the attachments $comref = dol_sanitizeFileName($this->ref); $snum = dol_sanitizeFileName($num); $dirsource = $conf->commande->dir_output.'/'.$comref; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 1d599ee549d..c81c799ab1b 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -21,7 +21,7 @@ /** * \file htdocs/commande/document.php * \ingroup order - * \brief Page de gestion des documents attachees a une commande + * \brief Management page of documents attached to an order */ require '../main.inc.php'; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d7b17f3ac20..35b23dbc2a7 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1793,7 +1793,7 @@ class Facture extends CommonInvoice if (preg_match('/^[\(]?PROV/i', $this->ref)) { // On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref) - // afin de ne pas perdre les fichiers attaches + // in order not to lose the attachments $facref = dol_sanitizeFileName($this->ref); $snumfa = dol_sanitizeFileName($num); $dirsource = $conf->facture->dir_output.'/'.$facref; diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 7b7dc26767a..626b90047d8 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -108,7 +108,7 @@ if ($action=='add') { $object->unitfrequency=GETPOST('unitfrequency','int'); $object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int'); - //Ajout de la tache cron + //Adding cron task $result = $object->create($user); // test du Resultat de la requete @@ -141,7 +141,7 @@ if ($action=='update') { $object->unitfrequency=GETPOST('unitfrequency','int'); $object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int'); - //Ajout de la tache cron + //Adding cron task $result = $object->update($user); // test du Resultat de la requete @@ -158,7 +158,7 @@ if ($action=='update') { if ($action=='activate') { $object->status=1; - //Ajout de la tache cron + //Adding cron task $result = $object->update($user); // test du Resultat de la requete @@ -174,7 +174,7 @@ if ($action=='activate') { if ($action=='inactive') { $object->status=0; - //Ajout de la tache cron + //Adding cron task $result = $object->update($user); // test du Resultat de la requete diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index f75fcb5754b..6d8f20e1aeb 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -77,7 +77,7 @@ if (!empty($search_label)) { // Delete jobs if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete){ - //Delete de la tache cron + //Delete cron task $object = new Cronjob($db); $object->id=$id; $result = $object->delete($user); diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 90b1b89d1a5..70a789d1f6a 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -569,7 +569,7 @@ class Expedition extends CommonObject if (preg_match('/^[\(]?PROV/i', $this->ref)) { // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) - // afin de ne pas perdre les fichiers attaches + // In order not to loose attached files $oldref = dol_sanitizeFileName($this->ref); $newref = dol_sanitizeFileName($numref); $dirsource = $conf->expedition->dir_output.'/sending/'.$oldref; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 633115fa373..013ab28c78b 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -354,7 +354,7 @@ class CommandeFournisseur extends CommonOrder if (preg_match('/^[\(]?PROV/i', $this->ref)) { // On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref) - // afin de ne pas perdre les fichiers attaches + // In order not to loose attached files $oldref = dol_sanitizeFileName($this->ref); $newref = dol_sanitizeFileName($num); $dirsource = $conf->fournisseur->dir_output.'/commande/'.$oldref; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index dbaf9ac2cea..c5767bd90ef 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -870,7 +870,7 @@ class FactureFournisseur extends CommonInvoice if (preg_match('/^[\(]?PROV/i', $this->ref)) { // On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref) - // afin de ne pas perdre les fichiers attaches + // In order not to loose attached files $facref = dol_sanitizeFileName($this->ref); $snumfa = dol_sanitizeFileName($num); diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index d1fdaeb113e..315c6151b4a 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -22,7 +22,7 @@ /** * \file htdocs/fourn/commande/document.php * \ingroup supplier - * \brief Page de gestion des documents attachees a une commande fournisseur + * \brief Management page of attached documents to a supplier order */ require '../../main.inc.php'; diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index dacaf21cdf2..cfc86c45660 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -470,7 +470,7 @@ Module1780Desc= Gestion des catégories (produits, fournisseurs, clients et adh Module2000Name= Editeur WYSIWYG Module2000Desc= Permet la saisie de certaines zones de textes grace à un éditeur avancé Module2300Name= Cron -Module2300Desc= Gestionnaire de taches programmées +Module2300Desc= Gestionnaire de tâches programmées Module2400Name= Agenda Module2400Desc= Gestion des actions (événements et tâches) et de l'agenda Module2500Name= Gestion Electronique de Documents @@ -695,10 +695,10 @@ Permission1411= Lire les mouvements comptables Permission1412= Créer/modifier/annuler les mouvements comptables Permission1415= Lire CA, bilans, résultats, journaux, grands livres Permission1421= Exporter les commandes clients et attributs -Permission23001 = Voir les taches planifiée -Permission23002 = Créer/Modifier les taches planifiée -Permission23003 = Supprimer les taches planifiée -Permission23004 = Executer les taches planifiée +Permission23001 = Voir les tâches planifiée +Permission23002 = Créer/Modifier les tâches planifiée +Permission23003 = Supprimer les tâches planifiée +Permission23004 = Exécuter les tâches planifiée Permission2401= Lire les actions (événements ou tâches) liées à son compte Permission2402= Créer/modifier les actions (événements ou tâches) liées à son compte Permission2403= Supprimer les actions (événements ou tâches) liées à son compte @@ -964,7 +964,7 @@ ExtraFieldsCustomerInvoices=Attributs supplémentaires (factures clients) ExtraFieldsSupplierOrders=Attributs supplémentaires (commandes) ExtraFieldsSupplierInvoices=Attributs supplémentaires (factures) ExtraFieldsProject=Attributs supplémentaires (projets) -ExtraFieldsProjectTask=Attributs supplémentaires (taches) +ExtraFieldsProjectTask=Attributs supplémentaires (tâches) ExtraFieldHasWrongValue=L'attribut %s a une valeur incorrecte. AlphaNumOnlyCharsAndNoSpace=uniquement caractères alphanumériques sans espace SendingMailSetup=Configuration de l'envoi par mail diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index b5fa47b336a..9fe99f43ccc 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -5,12 +5,12 @@ CHARSET=UTF-8 # Admin # CronSetup = Page de configuration du module - Gestion de tâches planifiées -URLToLaunchCronJobs=URL pour lancer les taches automatiques -OrToLaunchASpecificJob=Ou pour lancer une tache spécifique -KeyForCronAccess=Clé de sécurité pour l'URL de lancement des taches automatiques -FileToLaunchCronJobs=Commande pour lancer les taches automatiques +URLToLaunchCronJobs=URL pour lancer les tâches automatiques +OrToLaunchASpecificJob=Ou pour lancer une tâche spécifique +KeyForCronAccess=Clé de sécurité pour l'URL de lancement des tâches automatiques +FileToLaunchCronJobs=Commande pour lancer les tâches automatiques CronExplainHowToRunUnix=Sur un environement Unix vous pouvez paramétrer CronTab pour executer cette commande toute les minutes. -CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tache pour lancer cette commande toute les minutes. +CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tâches pour lancer cette commande toute les minutes. # # Menu diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index e26e92322e5..03751234361 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -86,14 +86,14 @@ ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (%s tâches actuellement) et le suivi des consommés. IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers. CloneProject=Cloner le projet -CloneTasks=Cloner les taches +CloneTasks=Cloner les tâches CloneContacts=Cloner les contacts CloneNotes=Cloner les notes CloneFiles=Cloner les pièces jointes ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ? -ProjectReportDate=Reporter les dates des taches en fonction de la date de départ. -ErrorShiftTaskDate=Une erreur c'est produite dans le report des dates des taches. -ProjectsAndTasksLines=Projets et taches +ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ. +ErrorShiftTaskDate=Une erreur c'est produite dans le report des dates des tâches. +ProjectsAndTasksLines=Projets et tâches ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Chef de projet TypeContact_project_external_PROJECTLEADER=Chef de projet From aaf1dd1b27a6e2f2cb25a6c80bf80e33bd3b1a92 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Mon, 4 Nov 2013 10:41:02 +0100 Subject: [PATCH 06/21] fix some language error --- htdocs/langs/fr_FR/projects.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 03751234361..712ea544e8d 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -55,7 +55,7 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet ListContractAssociatedProject=Liste des contrats associés au projet ListFichinterAssociatedProject=Liste des interventions associées au projet -ListTripAssociatedProject=Liste des notes de frais associés au projet +ListTripAssociatedProject=Liste des notes de frais associées au projet ListActionsAssociatedProject=Liste des événements associés au projet ActivityOnProjectThisWeek=Activité sur les projets cette semaine ActivityOnProjectThisMonth=Activité sur les projets ce mois @@ -92,7 +92,7 @@ CloneNotes=Cloner les notes CloneFiles=Cloner les pièces jointes ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ? ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ. -ErrorShiftTaskDate=Une erreur c'est produite dans le report des dates des tâches. +ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches. ProjectsAndTasksLines=Projets et tâches ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Chef de projet @@ -105,6 +105,6 @@ TypeContact_project_task_internal_CONTRIBUTOR=Intervenant TypeContact_project_task_external_CONTRIBUTOR=Intervenant # Documents models DocumentModelBaleine=Modèle de rapport de projet complet (logo...) -SelectElement=Eléments associable au projet : +SelectElement=Eléments associables au projet : AddElement=Associer ProjectReferers=Objets associés \ No newline at end of file From 8653f3f0263e82f9940a1c52366b99f8c83dc676 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 4 Nov 2013 12:38:21 +0100 Subject: [PATCH 07/21] Add missing Country UK. --- htdocs/langs/en_US/dict.lang | 1 + htdocs/langs/fr_FR/dict.lang | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang index d5b302ca9c7..f06c6c5e337 100644 --- a/htdocs/langs/en_US/dict.lang +++ b/htdocs/langs/en_US/dict.lang @@ -7,6 +7,7 @@ CountryES=Spain CountryDE=Germany CountryCH=Switzerland CountryGB=Great Britain +CountryUK=United Kingdom CountryIE=Ireland CountryCN=China CountryTN=Tunisia diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang index e0a8fd6f2ef..bace202e0de 100644 --- a/htdocs/langs/fr_FR/dict.lang +++ b/htdocs/langs/fr_FR/dict.lang @@ -6,7 +6,8 @@ CountryIT=Italie CountryES=Espagne CountryDE=Allemagne CountryCH=Suisse -CountryGB=Royaume-Uni +CountryGB=Grande-Bretagne +CountryUK=Royaume-Uni CountryIE=Irlande CountryCN=Chine CountryTN=Tunisie From b82cbf1385c424cee705fd08f1a97e5b0fd73b7a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 6 Nov 2013 15:35:10 +0100 Subject: [PATCH 08/21] Fix: current balance was visible when it should not Conflicts: htdocs/compta/bank/account.php --- htdocs/compta/bank/account.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 372ec9b6f8b..86e26612e2e 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -486,7 +486,7 @@ if ($id > 0 || ! empty($ref)) $var=true; $num = $db->num_rows($result); - $i = 0; $total = 0; $sep = 0; + $i = 0; $total = 0; $sep = -1; while ($i < $num) { @@ -499,13 +499,14 @@ if ($id > 0 || ! empty($ref)) // Is it a transaction in future ? $dos=dol_print_date($db->jdate($objp->do),'%Y%m%d'); //print "dos=".$dos." nows=".$nows; - if ($dos > $nows && !$sep) // Yes, we show a subtotal + if ($dos < $nows) $sep=0; // 0 means there was at least one line before current date + if ($dos > $nows && ! $sep) // We have found a line in future and we already found on line before current date { $sep = 1 ; print ''; print $langs->trans("CurrentBalance"); print ''; - print ''.price($total - $objp->amount).''; + print ''.price($total - $objp->amount).''; print " "; print ''; } @@ -747,10 +748,10 @@ if ($id > 0 || ! empty($ref)) if ($page == 0 && ! $mode_search) { print ''; - if ($sep) print ' '; + if ($sep > 0) print ' '; // If we had at least one line in future else print $langs->trans("CurrentBalance"); print ''; - print ''.price($total).''; + print ''.price($total).''; print ' '; print ''; } From 91702593513f12814cc84ea2d7b771e13c8255ac Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 9 Nov 2013 06:51:10 +0100 Subject: [PATCH 09/21] fix for language --- htdocs/compta/bank/account.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 372ec9b6f8b..591a3dc22e3 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -581,7 +581,7 @@ if ($id > 0 || ! empty($ref)) $banklinestatic->fetch($links[$key]['url_id']); $bankstatic->id=$banklinestatic->fk_account; $bankstatic->label=$banklinestatic->bank_account_label; - print ' ('.$langs->trans("From "); + print ' ('.$langs->trans("TransferFrom").' '; print $bankstatic->getNomUrl(1,'transactions'); print ' '.$langs->trans("toward").' '; $bankstatic->id=$objp->bankid; @@ -593,7 +593,7 @@ if ($id > 0 || ! empty($ref)) { $bankstatic->id=$objp->bankid; $bankstatic->label=$objp->bankref; - print ' ('.$langs->trans("From "); + print ' ('.$langs->trans("TransferFrom").' '; print $bankstatic->getNomUrl(1,''); print ' '.$langs->trans("toward").' '; $banklinestatic->fetch($links[$key]['url_id']); From 4b26d8441b66b251d2aba0c8a959566d07102206 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Nov 2013 12:52:06 +0100 Subject: [PATCH 10/21] Fix: Entry lost --- htdocs/product/fiche.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index c58c15bed5e..f3817028e15 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -684,7 +684,7 @@ else $tmpcode=''; if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type); - print ''.$langs->trans("Ref").''; + print ''.$langs->trans("Ref").''; if ($_error) { print $langs->trans("RefAlreadyExists"); @@ -692,7 +692,7 @@ else print ''; // Label - print ''.$langs->trans("Label").''; + print ''.$langs->trans("Label").''; // On sell print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; From 6b6855dff502b76bb23f1d0a956eb244e239afff Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 10 Nov 2013 06:37:08 +0100 Subject: [PATCH 11/21] Fix for document cerfa into module Don --- htdocs/core/modules/dons/html_cerfafr.html | 2 +- htdocs/core/modules/dons/html_cerfafr.modules.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html index 2f21e1c0afe..9310ac46cb6 100644 --- a/htdocs/core/modules/dons/html_cerfafr.html +++ b/htdocs/core/modules/dons/html_cerfafr.html @@ -98,7 +98,7 @@ __Name__ :
- __DONATOR_NAME__
+ __DONATOR_FIRSTNAME__ __DONATOR_LASTNAME__
__Address__ :
__DONATOR_ADDRESS__
__Zip__ : __DONATOR_ZIP__
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index 05c3dd96f24..a3811f51d6d 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -143,7 +143,8 @@ class html_cerfafr extends ModeleDon $form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__',$mysoc->address,$form); $form = str_replace('__MAIN_INFO_SOCIETE_ZIP__',$mysoc->zip,$form); $form = str_replace('__MAIN_INFO_SOCIETE_TOWN__',$mysoc->town,$form); - $form = str_replace('__DONATOR_NAME__',$don->nom,$form); + $form = str_replace('__DONATOR_FIRSTNAME__',$don->firstname,$form); + $form = str_replace('__DONATOR_LASTNAME__',$don->lastname,$form); $form = str_replace('__DONATOR_ADDRESS__',$don->address,$form); $form = str_replace('__DONATOR_ZIP__',$don->zip,$form); $form = str_replace('__DONATOR_TOWN__',$don->town,$form); From 5b7f2e0c53acf9d0bf89d0b6150490ef139a5095 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Mon, 11 Nov 2013 17:35:36 +0100 Subject: [PATCH 12/21] Better nl_NL translation --- htdocs/langs/nl_NL/admin.lang | 4 +-- htdocs/langs/nl_NL/categories.lang | 2 +- htdocs/langs/nl_NL/commercial.lang | 4 +-- htdocs/langs/nl_NL/companies.lang | 8 +++--- htdocs/langs/nl_NL/dict.lang | 10 ++++---- htdocs/langs/nl_NL/main.lang | 2 +- htdocs/langs/nl_NL/margins.lang | 40 +++++++++++++++--------------- htdocs/langs/nl_NL/products.lang | 2 +- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index f24eac0b403..67a826f0d82 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -341,7 +341,7 @@ Module70Name = Interventies Module70Desc = Interventiesbeheer Module75Name = Reisnotities en -kosten Module75Desc = Beheer van reisnotities en -kosten -Module80Name = Verzendingen +Module80Name = Verzend Adviezen Module80Desc = Beheer afnemersverzending en -ontvangst Module85Name = Bank en Contant Module85Desc = Beheer van bank- en / of kasrekeningen @@ -1251,7 +1251,7 @@ ContractsNumberingModules=Contracten nummering modules AdherentLoginRequired=Beheren van een login voor elk lid ListOfAvailableNotifications=Lijst van beschikbare meldingen (Deze lijst is afhankelijk van geactiveerde modules) SendingsNumberingModules=Verzendingen nummering modules -FreeLegalTextOnShippings=Vrije tekst op verzendingen +FreeLegalTextOnShippings=Vrije tekst op verzend advies AdvancedEditor=Geavanceerde editor AccountancyCode=Accountancy Code // STOP - Lines generated via autotranslator.php tool (2011-10-10 01:54:18). diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index e1d2b67b6ac..67607bb1f85 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -75,7 +75,7 @@ ProductsCategoryShort = Productencategorie MembersCategoryShort = Ledencategorie SuppliersCategoriesShort = Leverancierscategorie CustomersCategoriesShort = Afnemerscategorie -CustomersProspectsCategoriesShort = Afnemers- / Prospectencategorie +CustomersProspectsCategoriesShort = Afnemers-/Prosp.categorie ProductsCategoriesShort = Productencategorie MembersCategoriesShort = Ledencategorie ThisCategoryHasNoProduct = Deze categorie bevat geen producten. diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang index 85935408c81..c8cdd786de9 100644 --- a/htdocs/langs/nl_NL/commercial.lang +++ b/htdocs/langs/nl_NL/commercial.lang @@ -24,8 +24,8 @@ TaskRDVWith = Vergadering met %s ShowTask = Toon taak ShowAction = Toon actie ActionsReport = Actiesverslag -SalesRepresentative = Vertegenwoordiger -SalesRepresentatives = Vertegenwoordigers +SalesRepresentative = Account Manager +SalesRepresentatives = Accountmanagers SalesRepresentativeFollowUp = Vertegenwoordiger (opvolging) SalesRepresentativeSignature = Vertegenwoordiger (handtekening) CommercialInterlocutor = Zakelijke gesprekspartner diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang index 3b2ad012bae..3a0f5ce1e51 100644 --- a/htdocs/langs/nl_NL/companies.lang +++ b/htdocs/langs/nl_NL/companies.lang @@ -34,8 +34,8 @@ CompanyName = Bedrijfsnaam Companies = Bedrijven CountryIsInEEC = Lidstaat van de Europese Unie ThirdPartyName = Naam van Klant -ThirdParty = Klant -ThirdParties = Klant +ThirdParty = Klant / Leverancier +ThirdParties = Klanten / Leveranciers ThirdPartyAll = Klanten (alle) ThirdPartyProspects = Prospecten ThirdPartyCustomers = Afnemers @@ -290,7 +290,7 @@ CardSupplier = Leverancierskaart CardCompany = Bedrijfskaart DeleteFile = Bestand verwijderen ConfirmDeleteFile = Weet u zeker dat u dit bestand wilt verwijderen? -AllocateCommercial = Toewijzing +AllocateCommercial = Account Manager SelectCountry = Selecteer een land SelectCompany = Selecteer een Klant Organization = Organisatie @@ -303,7 +303,7 @@ ListProspectsShort = Prospectenoverzicht ListCustomersShort = Afnemersoverzicht ThirdPartiesArea = Overzicht van derde partijen LastModifiedThirdParties = Laatste %s bewerkte derde partijen -UniqueThirdParties = Totaal aantal unieke derde partijen +UniqueThirdParties = Totaal aantal unieke klanten/leveranciers # Monkey = MonkeyNumRefModelDesc = Geeft een nummer als %syymm-nnnn voor afnemerscodes en %sjjmm-nnnn voor leverancierscodes waar jj het jaar is, mm de maand en nnnn een opeenvolgend nummer vanaf 0. # Leopard = diff --git a/htdocs/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang index 37aa3207418..5132baf0151 100644 --- a/htdocs/langs/nl_NL/dict.lang +++ b/htdocs/langs/nl_NL/dict.lang @@ -247,11 +247,11 @@ CountryME = Montenegro CountryBL = Saint Barthelemy CountryMF = Saint Martin ##### Civilities ##### = -CivilityMME = Mevrouw -CivilityMR = Meneer -CivilityMLE = Mejuffrouw -CivilityMTRE = Meester -CivilityDR = Dokter +CivilityMME =Mw. +CivilityMR = Dhr. +CivilityMLE = Mw. +CivilityMTRE = Dhr. +CivilityDR = Dhr. ##### Currencies ##### = Currencyeuros = Euro CurrencyAUD = Australische Dollars diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 7e57bc38417..0c9d189b04f 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -522,7 +522,7 @@ NeverReceived = Nooit ontvangen Canceled = Geannuleerd YouCanChangeValuesForThisListFromDictionnarySetup = U kunt deze waarden veranderen via het menu Home->Instellingen->Constanten Color = Kleur -Documents = Gekoppelde bestanden +Documents = Gekoppelde Bestanden DocumentsNb = Bijlagen (%s) Documents2 = Documenten BuildDocuments = Gegenereerde documenten diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang index 3494ca6d643..21bda68dc86 100644 --- a/htdocs/langs/nl_NL/margins.lang +++ b/htdocs/langs/nl_NL/margins.lang @@ -4,49 +4,49 @@ CHARSET=UTF-8 Margin=Marge Margins=Marges TotalMargin=Marge Totaal -MarginOnProducts=Marge / Training -MarginOnServices=Marge / Dienst -MarginRate=Marge verhouding -MarkRate=Markerings verhouding +MarginOnProducts=Marge Training/Boeken +MarginOnServices=Marge Dienst +MarginRate=Marge Verhouding +MarkRate=Markerings Verhouding DisplayMarginRates=Toon Marge Verhouding DisplayMarkRates=Toon Markeringsverhouding InputPrice=Voer Prijs in -margin=Winst marge management -margesSetup=Winst marge management setup +margin=Winst Marge Management +margesSetup=Winst Marge Management setup -MarginDetails=Marge details +MarginDetails=Marge Details -ProductMargins=Product marge -CustomerMargins=Klant marges +ProductMargins=Product Marge +CustomerMargins=Klant Marges AgentMargins=Acc. Manager marges -ProductService=Trainning of Dienst +ProductService=Training/Product of Dienst AllProducts=Alle Trainingen en Diensten -ChooseProduct/Service=Kies Training of Dienst -CommercialAgent=Commerciel Agent +ChooseProduct/Service=Kies Training/Product of Dienst +CommercialAgent=Commercieël Agent StartDate=Start datum EndDate=Eind datum Launch=Start ForceBuyingPriceIfNull=Forceer een inkoopprijs indien null -ForceBuyingPriceIfNullDetails=indien "ON", marge wodt nul (inkoopprijs = verkoopprijs), anders("OFF"), marge is gelijk verkoopprijs (inkoopprijs = 0) +ForceBuyingPriceIfNullDetails=indien "ON", marge wordt null (inkoopprijs = verkoopprijs), anders("OFF"), marge is gelijk verkoopprijs (inkoopprijs = 0) MARGIN_METHODE_FOR_DISCOUNT=Marge methode voor globale discounts -UseDiscountAsProduct=Als een training +UseDiscountAsProduct=Als een training/dienst UseDiscountAsService=Als een dienst UseDiscountOnTotal=Op subtotaal -MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definieert als een globale discount wordt behandelt als een training, een dienst, of alleen een subtotaal voor marge berekening. +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definieer als een globale discount, wordt behandelt als een training/product, een dienst, alleen een subtotaal voor marge berekening. MARGIN_TYPE=Marge type -MargeBrute=Groffe marge -MargeNette=Netto marge -MARGIN_TYPE_DETAILS=Groffe marge : Verkoopprijs - Inkoopprijs
Netto marge : Verkoopprijs - Kostprijs +MargeBrute=Groffe Marge +MargeNette=Netto Marge +MARGIN_TYPE_DETAILS=Groffe marge : Verkoopprijs - Inkoopprijs
Netto Marge : Verkoopprijs - Kostprijs CostPrice=Kostprijs BuyingCost=Kostprijs -UnitCharges=Unit toeslag +UnitCharges=Unit Toeslag Charges=Toeslag AgentContactType=Contact type used voor commissie -AgentContactTypeDetails=Definieer het contact type (gelinked op facturen) wordt geassocieerd met commercieel agent \ No newline at end of file +AgentContactTypeDetails=Definieër het contact type (gelinked op facturen) wordt geassocieerd met een commercieël agent \ No newline at end of file diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang index 731630aa79b..f5649c1e9bb 100644 --- a/htdocs/langs/nl_NL/products.lang +++ b/htdocs/langs/nl_NL/products.lang @@ -161,7 +161,7 @@ CloneContentProduct = Kloon alle hoofdinformatie van het product / de dienst ClonePricesProduct = Kloon hoofdinformatie en prijzen ProductIsUsed = Dit product wordt gebruikt NewRefForClone = Referentie naar nieuw produkt / dienst -CustomerPrices = Consumentenprijs +CustomerPrices = Verkoopprijs SuppliersPrices = Leveranciersprijs CustomCode = Code op maat CountryOrigin = Land van herkomst From 4ad541316398353d86a67c018c701569e051e050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 12 Nov 2013 15:34:12 +0100 Subject: [PATCH 13/21] Sync db upgrade with db install to avoid silly upgrade errors --- .../install/mysql/migration/3.3.0-3.4.0.sql | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 6bae41c0799..3af6c53cd79 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -58,7 +58,7 @@ ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn; ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn_ref; UPDATE llx_facture_fourn set ref = NULL where ref = ''; ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (ref, entity); -ALTER TABLE llx_facture_fourn CHANGE COLUMN facnumber ref_supplier varchar(30); +ALTER TABLE llx_facture_fourn CHANGE COLUMN facnumber ref_supplier varchar(50); ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref_supplier (ref_supplier, fk_soc, entity); @@ -161,22 +161,22 @@ CREATE TABLE llx_c_revenuestamp insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, '0.4', 'Timbre fiscal', 1); -ALTER TABLE llx_c_tva MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_c_tva MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_commandedet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_commandedet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_contratdet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_contratdet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_facturedet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_facturedet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; -ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; +ALTER TABLE llx_c_tva MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_c_tva MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_commandedet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_commandedet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_contratdet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_contratdet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_facturedet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_facturedet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL; +ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL; -- No more use type 7, use revenuse stamp instead UPDATE llx_c_tva set localtax1=0, localtax1_type='0' where localtax1_type = '7'; UPDATE llx_c_tva set localtax2=0, localtax2_type='0' where localtax2_type = '7'; From 7dbe2bcf2c23b8c54588b912de5e52f5728dd598 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 13 Nov 2013 18:41:31 +0100 Subject: [PATCH 14/21] fix wrong buy price update --- htdocs/fourn/class/fournisseur.product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 884fcd8d4ad..80cd40942a0 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -222,7 +222,7 @@ class ProductFournisseur extends Product { // Add price for this quantity to supplier $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price("; - $sql.= "datec, fk_product, fk_soc, ref_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, unitcharges, fk_availability, entity, info_bits)"; + $sql.= "datec, fk_product, fk_soc, ref_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, unitcharges, fk_availability, info_bits, entity)"; $sql.= " values('".$this->db->idate($now)."',"; $sql.= " ".$this->id.","; $sql.= " ".$fourn->id.","; From d23130739b4714b49738b03b31adb09c024d01d3 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 13 Nov 2013 18:43:31 +0100 Subject: [PATCH 15/21] update ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41982d6ecf5..ab573ef4b12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ English Dolibarr ChangeLog Fix: Bad rounding on margin calculations and display. Fix: Option drpo table into backup was broken. Fix: [ bug #1105 ] Searching Boxes other search option - +Fix: wrong buy price update ***** ChangeLog for 3.4.1 compared to 3.4.0 ***** Fix: Display buying price on line edit when no supplier price is defined From e8c7bb9c6202abaec0c1d9e4b62550c705f48d5a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 14 Nov 2013 21:02:33 +0100 Subject: [PATCH 16/21] Fix for language --- htdocs/compta/prelevement/bons.php | 2 +- htdocs/compta/prelevement/factures.php | 4 ++-- htdocs/compta/prelevement/fiche-rejet.php | 4 ++-- htdocs/compta/prelevement/fiche-stat.php | 4 ++-- htdocs/compta/prelevement/fiche.php | 4 ++-- htdocs/compta/prelevement/ligne.php | 2 +- htdocs/compta/prelevement/lignes.php | 4 ++-- htdocs/compta/prelevement/liste.php | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 8f2d336defe..eecc14711ea 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -79,7 +79,7 @@ if ($result) print ''; print ''; - print_liste_field_titre($langs->trans("WithdrawalReceipt"),"bons.php","p.ref",'','','class="liste_titre"'); + print_liste_field_titre($langs->trans("WithdrawalReceipts"),"bons.php","p.ref",'','','class="liste_titre"'); print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"'); print ''; print ''; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 115a7829374..92a4464a635 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -47,7 +47,7 @@ $page = GETPOST('page','int'); $sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha'); $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.ref" : GETPOST('sortfield','alpha'); -llxHeader('',$langs->trans("WithdrawalReceipt")); +llxHeader('',$langs->trans("WithdrawalReceipts")); if ($prev_id) { @@ -56,7 +56,7 @@ if ($prev_id) if ($bon->fetch($prev_id) == 0) { $head = prelevement_prepare_head($bon); - dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment'); + dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipts"), '', 'payment'); print '
'.$langs->trans("Amount").'
'; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 87516c3ad65..10d69c3434d 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -46,7 +46,7 @@ $page = GETPOST('page','int'); /* * View */ -llxHeader('',$langs->trans("WithdrawalReceipt")); +llxHeader('',$langs->trans("WithdrawalReceipts")); if ($prev_id) { @@ -55,7 +55,7 @@ if ($prev_id) if ($bon->fetch($prev_id) == 0) { $head = prelevement_prepare_head($bon); - dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipt"), '', 'payment'); + dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipts"), '', 'payment'); print '
'; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 5fcd70b1a9b..f349fe23230 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -44,7 +44,7 @@ $page = GETPOST('page','int'); * View */ -llxHeader('',$langs->trans("WithdrawalReceipt")); +llxHeader('',$langs->trans("WithdrawalReceipts")); if ($prev_id) { @@ -53,7 +53,7 @@ if ($prev_id) if ($bon->fetch($prev_id) == 0) { $head = prelevement_prepare_head($bon); - dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipt"), '', 'payment'); + dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipts"), '', 'payment'); print '
'; diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 22af3b3548d..43e2e042456 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -133,7 +133,7 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit) $bon = new BonPrelevement($db,""); $form = new Form($db); -llxHeader('',$langs->trans("WithdrawalReceipt")); +llxHeader('',$langs->trans("WithdrawalReceipts")); if ($id > 0) @@ -141,7 +141,7 @@ if ($id > 0) $bon->fetch($id); $head = prelevement_prepare_head($bon); - dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipt"), '', 'payment'); + dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipts"), '', 'payment'); if (GETPOST('error','alpha')!='') { diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 4ba08c10445..9d0d0fc3718 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -130,7 +130,7 @@ if ($id) print '
'; - print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index c322142b6a9..32f83b93906 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -54,7 +54,7 @@ $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "pl.fk_soc" : GETPOST('sortf * View */ -llxHeader('',$langs->trans("WithdrawalReceipt")); +llxHeader('',$langs->trans("WithdrawalReceipts")); if ($prev_id) { @@ -63,7 +63,7 @@ if ($prev_id) if ($bon->fetch($prev_id) == 0) { $head = prelevement_prepare_head($bon); - dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipt"), '', 'payment'); + dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipts"), '', 'payment'); print '
'.$langs->trans("WithdrawalReceipt").''; + print '
'.$langs->trans("WithdrawalReceipts").''; print ''.$lipre->bon_ref.'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($lipre->amount).'
'; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index cd09dc6cf25..33e2bfb71e1 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -111,7 +111,7 @@ if ($result) print ''; print ''; - print_liste_field_titre($langs->trans("WithdrawalReceipt"),$_SERVER["PHP_SELF"],"p.ref"); + print_liste_field_titre($langs->trans("WithdrawalReceipts"),$_SERVER["PHP_SELF"],"p.ref"); print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom"); print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"'); From 8050f8e9fe3619430511a65c07400260aaa04bd0 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 14 Nov 2013 21:40:30 +0100 Subject: [PATCH 17/21] Fix problem field --- htdocs/societe/rib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 451209913aa..ab2b8f6dadd 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -66,7 +66,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"]) $account->iban_prefix = $_POST["iban_prefix"]; $account->domiciliation = $_POST["domiciliation"]; $account->proprio = $_POST["proprio"]; - $account->adresse_proprio = $_POST["adresse_proprio"]; + $account->owner_address = $_POST["owner_address"]; $result = $account->update($user); if (! $result) @@ -154,7 +154,7 @@ if ($_GET["socid"] && $_GET["action"] != 'edit') print "\n"; print '\n"; print '
'.$langs->trans("Line").'
'.$langs->trans("BankAccountOwnerAddress").''; - print $account->adresse_proprio; + print $account->owner_address; print "
'; @@ -236,8 +236,8 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer print "\n"; print ''.$langs->trans("BankAccountOwnerAddress").''; - print ""; print '
'; From 200553c001264dc51e9fc214c7ce4f65ca65fa06 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 15 Nov 2013 04:58:59 +0100 Subject: [PATCH 18/21] Update ChangeLog --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41982d6ecf5..41a34943ffc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,8 +2,10 @@ English Dolibarr ChangeLog -------------------------------------------------------------- ***** ChangeLog for 3.4.2 compared to 3.4.1 ***** +Fix: field's problem into company's page (RIB) +Fix: Document cerfa doesn't contained firstname & lastname from donator Fix: Bad rounding on margin calculations and display. -Fix: Option drpo table into backup was broken. +Fix: Option drop table into backup was broken. Fix: [ bug #1105 ] Searching Boxes other search option From 89a56389086e599f976ae81670d1040f45f84597 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Sun, 17 Nov 2013 12:59:33 +0100 Subject: [PATCH 19/21] Fix bad translation on margin config --- htdocs/langs/en_US/margins.lang | 4 ++-- htdocs/langs/fr_FR/margins.lang | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index e8c5ab38b6b..bf65bf5d270 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -48,5 +48,5 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges -AgentContactType=Contact type used for commissioning -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be associated with commercial agents \ No newline at end of file +AgentContactType=Commercial agent contact type +AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents \ No newline at end of file diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang index dcfe51d6786..78e5e1c380e 100644 --- a/htdocs/langs/fr_FR/margins.lang +++ b/htdocs/langs/fr_FR/margins.lang @@ -48,5 +48,5 @@ CostPrice=Prix de revient UnitCharges=Charge unitaire Charges=Charges -AgentContactType=Type de contact commissionné -AgentContactTypeDetails=Permet de définir le type de contact associé aux factures qui sera associé aux agents commerciaux +AgentContactType=Type de contact agent commercial +AgentContactTypeDetails=Permet de définir le type de contact associé aux factures qui sera utilisé pour le rapport de marges par agent commercial From 870b78fc19184fbd8d36588df1af0620c95b2883 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Tue, 19 Nov 2013 10:41:00 +0100 Subject: [PATCH 20/21] [ bug #1142 ] Set paiement on invoice --- htdocs/fourn/facture/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index f9ab0cd0cab..e4c0e27ce47 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -265,7 +265,7 @@ if ($action == 'create' || $action == 'add_paiement') $sql.= ' AND f.fk_soc = '.$object->socid; $sql.= ' AND f.paye = 0'; $sql.= ' AND f.fk_statut = 1'; // Statut=0 => non validee, Statut=2 => annulee - $sql.= ' GROUP BY f.rowid, f.ref_supplier, f.total_ht, f.total_ttc, f.datef'; + $sql.= ' GROUP BY f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef'; $resql = $db->query($sql); if ($resql) { From 68718c6100bc971c56678dd0b05c6961dc9327bb Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Tue, 19 Nov 2013 10:42:29 +0100 Subject: [PATCH 21/21] Update changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index efe4c3c2eb1..f6d72624b4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Fix: Bad rounding on margin calculations and display. Fix: Option drop table into backup was broken. Fix: [ bug #1105 ] Searching Boxes other search option Fix: wrong buy price update +Fix :[ bug #1142 ] Set paiement on invoice (PGSql) ***** ChangeLog for 3.4.1 compared to 3.4.0 ***** Fix: Display buying price on line edit when no supplier price is defined