From aa9951948b1ab7e6c7c33c07bd363b1b4b8a478c Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 3 Jun 2015 06:02:52 +0200 Subject: [PATCH 1/2] New: Add logo cerfa in common themes files --- htdocs/theme/common/logo_cerfa.png | Bin 0 -> 5718 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/theme/common/logo_cerfa.png diff --git a/htdocs/theme/common/logo_cerfa.png b/htdocs/theme/common/logo_cerfa.png new file mode 100644 index 0000000000000000000000000000000000000000..0db57c205ab11248aafeebd6fba99ec991b02cf4 GIT binary patch literal 5718 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 literal 0 HcmV?d00001 From 3461a8712aac4c09fa2656352a61c537d5720ae0 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 3 Jun 2015 06:48:15 +0200 Subject: [PATCH 2/2] New: Add object of the company - Needed for donation --- htdocs/admin/company.php | 11 +++++++++++ htdocs/core/class/commondocgenerator.class.php | 1 + htdocs/langs/en_US/admin.lang | 1 + 3 files changed, 13 insertions(+) diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index dccf26e75c0..1a75a199dc6 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2011 Philippe Grand + * Copyright (C) 2015 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -151,6 +152,7 @@ if ( ($action == 'update' && empty($_POST["cancel"])) dolibarr_set_const($db, "MAIN_INFO_PROFID6",$_POST["MAIN_INFO_PROFID6"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_INFO_SOCIETE_OBJECT",$_POST["object"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START",$_POST["fiscalmonthstart"],'chaine',0,'',$conf->entity); @@ -528,6 +530,12 @@ if ($action == 'edit' || $action == 'updateedit') $var=!$var; print ''; print ''; + print ''; + + // Object of the company + $var=!$var; + print ''; + print ''; print ''; print ''; @@ -929,6 +937,9 @@ else } print ''; print ''; + + $var=!$var; + print ''.$langs->trans("CompanyObject").'' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . ''; print ''; print ''; diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 22a33f4d2a8..d0730149b36 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -118,6 +118,7 @@ abstract class CommonDocGenerator 'mycompany_idprof5'=>$mysoc->idprof5, 'mycompany_idprof6'=>$mysoc->idprof6, 'mycompany_vatnumber'=>$mysoc->tva_intra, + 'mycompany_object'=>$mysoc->object, // Only private not exists for "mysoc" 'mycompany_note_private'=>$mysoc->note_private, diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 2c6db68dac7..0420e808e41 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -940,6 +940,7 @@ CompanyZip=Zip CompanyTown=Town CompanyCountry=Country CompanyCurrency=Main currency +CompanyObject=Object of the company Logo=Logo DoNotShow=Do not show DoNotSuggestPaymentMode=Do not suggest