diff --git a/.mailmap b/.mailmap
index e8821f0f8ebb504219a825e119af941654b6375d..3aadbbedfca8c1fefd97b85d8db256c8f4e68ae9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,9 +21,9 @@ Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry.mail@gmail.
Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-conept.pro>
Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry@open-concept.pro>
Florian Henry <florian.henry@open-concept.pro> HENRY Florian <florian.henry@open-concept.pro>
-Alexandre Spangaro <alexandre.spangaro@gmail.com> aspangaro <alexandre.spangaro@gmail.com>
-Alexandre Spangaro <alexandre.spangaro@gmail.com> Spangaro Alexandre <alexandre.spangaro@gmail.com>
-Alexandre Spangaro <alexandre.spangaro@gmail.com> Alexandre SPANGARO <alexandre.spangaro@gmail.com>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> aspangaro <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Spangaro Alexandre <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> Raphaël Doursenaud <rdoursenaud@free.fr>
Philippe Grand <philippe.grand@atoo-net.com> Grand Philippe <contact@atoo-net.com>
Philippe Grand <philippe.grand@atoo-net.com> Philippe GRAND <philippe.grand@atoo-net.com>
diff --git a/COPYRIGHT b/COPYRIGHT
index 426e03c5b64a47e00d6f3b1041aad14541e37db3..df0ba8b3e90df8e4db1338a2e736ad513ec72cfa 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -60,7 +60,7 @@ Copyright
Copyright (C) 2015
- Laurent Destailleur <eldy@users.sourceforge.net>
- Marcos García <marcosgdf@gmail.com>
-- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
- Frederic France <frederic.france@free.fr>
- Regis Houssin <regis.houssin@capnetworks.com>
@@ -74,7 +74,7 @@ Copyright (C) 2014
- Regis Houssin <regis.houssin@capnetworks.com>
- Maxime Kohlhaas <mko@atm-consulting.fr>
- Juanjo Menent <jmenent@2byte.es>
-- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
- Frederic France <frederic.france@free.fr>
Copyright (C) 2013
@@ -88,7 +88,7 @@ Copyright (C) 2013
- Maxime Kohlhaas <mko@atm-consulting.fr>
- Juanjo Menent <jmenent@2byte.es>
- Adolfo Segura <adolfo.segura@gmail.com>
-- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
Copyright (C) 2012
- Christophe Battarel <christophe.battarel@altairis.fr>
@@ -102,7 +102,7 @@ Copyright (C) 2012
- Maxime Kohlhaas <mko@atm-consulting.fr>
- Juanjo Menent <jmenent@2byte.es>
- Nicolas Péré <nicolas@amarok2.net>
-- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
Copyright (C) 2011
- Laurent Destailleur <eldy@users.sourceforge.net>
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index d935eb025dc09e3f929a81e9c98e4f8264e3ad02..accbd6111c72823f21babc24d24acb926c6507ee 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 092122a653dd728b9eee0f16be1b36e95174a5e7..51c6a5c671570be22a84451a929f1cb8f3aa20c4 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -1,6 +1,6 @@
<?PHP
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index c0f24821d1c9445e5a21041cd49f20cb27b8047d..3da29bd9cc134c8d29d839b9117d59f1fd53ccd2 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index e269bafae6cc5f743f10573d3c47bc102982fd62..bd530eaa8d77d8b062d2a4ac44ee76a5003674b8 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index fc985efffe7c3d52c020918db1622a9c020b1390..a1692878c55f22829d5c2864cfe5001b96bae3f3 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index b6fa546edff42b4ed4905b123f09277019b794eb..ddd0eaaab9844ec0f032720e76676059057de227 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 14e1eb90636fa1ca28363b0fbdab794fe87b6d53..e81557d052201d7ca8f1a46f643d3a4727e44bcc 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -1,7 +1,7 @@
<?php
/*
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index dfc251617184bba985f002592808848d5834a9b6..fc8994c4836b19231783083a4ea7282097a693c5 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014-2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php
index 5a305d87f2c94c1a6fe62e3528c08b2ee05c225f..e2359ebd8ee1e866bc28b314c6c822ad01504d47 100644
--- a/htdocs/accountancy/admin/journaux.php
+++ b/htdocs/accountancy/admin/journaux.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 22e2cc8f260b7c7a476726e0ba3683e4babdf7e1..43b8150d2f63f31a96b0b6e2b5a4c0228743c3e1 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -1,7 +1,7 @@
<?PHP
/*
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Ari Elbaz (elarifr) <github@accedinfo.com>
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index bae7b10e38cc814a75833612776ff5f62b7d0bdd..54c239f2db9d91ed513422ef60362d79888687fb 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index c1101fb6349feefb301e8c41c1018a55938894cb..515b9898c2351dfc76b461ffdc05a282fd882875 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index cc90b3873db8b7dfda1081575a68648c710477bd..d9b6d66b503c229b57e2ddd6c94220d6e29049ca 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 0135f073427eb8b755e12dfcbb3e364a8d45de07..ce6d10f9730f498b451d13aa4c04e956c2f1dd4c 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index ab0765ff1155328cb6bc616b4574108d4e7e7e9a..86c2e5ed3f27c7b5bbf088273af8f14395248a22 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 5fc546a8ce99f22125d05e1918fa111f3ecce062..0c79820ea4441f0b7c848eb5446e1afcecf91916 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Ari Elbaz (elarifr) <github@accedinfo.com>
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0e51f0f64ee21bb42c73b03de5e584a8ca5b6e38..a36ca8c18259316ff106f1b06f3aecdd368364b3 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
index a596d481d9c378c58b5fc339a7b70c829828e823..b86c0fdd2e2ae0a3bac94bd029135e13d0de2825 100644
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Ari Elbaz (elarifr) <github@accedinfo.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 81fbea30baa374f965f83ba4345b2e2c9d8d6c6b..03f6b8171012de591e0a6f0170b0a5c472d30c88 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -1,7 +1,7 @@
<?PHP
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 5a1ffc30bb727976482f8557c17b70cd4227a760..24c0e81587f0d5207a757d500c7b2c526e806372 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index d00296ed2b928a8b2b1c0663d48dd95a7ce3abb3..11d69e3c7e6a7bb10ebaba9aec4f206f3efc7be9 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014-2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 992dc5ec739b588a9f28d7aa80f9d7d3f9526bc6..d3a4547c38b38a9faadd959c872430cfb09fc3e9 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014-2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 1764a127515b8cf54dc44a08f9c3e0c81b3c182f..f4d6400449fb8c55bae7603e7a402fdd0cd0a0bc 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -4,7 +4,7 @@
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
*
diff --git a/htdocs/accountancy/journal/index.php b/htdocs/accountancy/journal/index.php
index 36286ce265e0c8f35cbebd20f101e4d5481b0fde..9906c68d0c8e75260920d696807f1aa81de72e1c 100644
--- a/htdocs/accountancy/journal/index.php
+++ b/htdocs/accountancy/journal/index.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 862ff92eb4b2f3639d8ed8b2efd5a6d25a4a32a2..8d0502ad57c55290798e9cc3e770cd99fb1beb15 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -3,7 +3,7 @@
* Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
*
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 83191f88bf4538e3a9366f460aacf13ce56e746f..a0bd51fbbf8c17d2c8907d4094c41f8c0a9de8fb 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -4,7 +4,7 @@
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index c293418b6695bb93972f3ed33533a6b504300683..36c8cd09d6538482133d13b3671f958ebe49cc66 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 2c2392bfa27aa264dcd0bff9c3f4d7b1f4c4836c..cae09cc98c2f4111199458c2a5d5bce328c1101d 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 80f7bc5e6eed450a13980c4a7056888ff0eefe70..73ec8b28c0d73b7e65a4839645f345e7b889d12a 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014-2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 02057b3125564f11ea3dc09f95f8adde784beea6..2f22a19347ae687fd4f5dca92b506c675b11f746 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014-2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>s
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index d87729ee0c5f243515821e24802734820695ad61..94e31fc24baa9ebad4223219d1e649417fc0f537 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012-2013 Philippe Grand <philippe.grand@atoo-net.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 752a756b8cb9baad6883ea2d722d9609e4bc1668..87f1b3f14d99e1f8fa29d4e90b915f8da16bc675 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -3,7 +3,7 @@
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 40029d45f84d02aaa26ba5be377a2d594ec9c4f5..58bb828302946d33052e03c260a33a81fb6e6f9d 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -5,7 +5,7 @@
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2014-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 191ac35a3d1d3aed7da63818a46a5c50eb9f2548..6c9423b6178d963481908462ce56fbf373371b2b 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 53f5962f017c3a9c2fc6ac3dc91fe1abb7aa3ba8..d95df9c5465b4805077209cd37f8eee9250fc192 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -4,7 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ff99ce5e4bfc412fa1145c0e1dfa77997aae0d92..ed158daeab33657d92861b36efb2ff2d8b2702cd 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,7 +8,7 @@
* Copyright (C) 2011 Remy Younes <ryounes@gmail.com>
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index bac6b748a93aa72f2ae5e57f1408f6b1fbd8ed1b..a98e44539b9e2c938636ef7cd5972fe017dfa9cb 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index 01ae0d11d137e8896ea12a14bd820d9f3db42047..291c3848a63f2046d2d45fcc3bf42307ba031fbd 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 3f8ecca00d9cbc9d8d620a859dc6b74997d416e2..0802b2230ec45e7105d19ae28e6f904e805c57d3 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 75d18dd8cd599b556d406386c66af74e9c27ecd9..623ebcbf1bc1d95ee7aadebdbd08b5628d65c6f9 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -6,7 +6,7 @@
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 949165e6784aa6821dc911c387539c3bbf531646..d6ff35f8af508ce76d63d8ac8e3fe8f1fa9ab8fa 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 680a12c211c82bd2d49a2c129574eecd7e7a2618..c64d8b48e3d2aa2c615b5ab8551cbf00a1b7d28a 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@@2byte.es>
* Copyright (C) 2012-2014 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2011-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index acc1d3ecfa3378c89ef14a42c2092a23a71f6c19..61e3dc111dff77a866665bb9a02f43de3285b2a4 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -3,7 +3,7 @@
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2014-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index b1cd1442f087139e34693277a1903d3c1340a7ef..8ccf4107ee74aadef9aa0816ff182224d94483f1 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 6e8b896f5aa1731697b7586f8439169b358aa491..e69e2dce2e7cc23c6959a3d22c7ef167f63e406f 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index d62e0658dd0bdd957f9aca231b54c82d13c1f171..18aacc82bf901435193654809b61b3fa43f1d61f 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -181,7 +181,7 @@ if ($resql)
$var=True;
$num = $db->num_rows($resql);
- print_fiche_titre($langs->trans("Reconciliation").': <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>','title_bank.png');
+ print_fiche_titre($langs->trans("Reconciliation").': <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>', '', 'title_bank.png');
print '<br>';
// Show last bank receipts
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 08bd304aa2da285399fa747bb6e3881763fb8b51..45b10f2363cf54b74f5c274532366f0aabbb998b 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index aab2e0b18d5e17085fba8c666dce040393bf8e90..eefedcdcc6e59b9921fd9a0ccb45dab28dd0aad3 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -6,7 +6,7 @@
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index 584077509b30e1316deec46e0cf664d988b1aba1..4e931ef2b9d098e189f0b9e267626f5d1109de52 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
* Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2014 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 34cf525104a1bcaeec39c162be2b2a67cd34c727..a4b699b70b77b49fd2d143de6f4c7b47ac7e0f25 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -3,7 +3,7 @@
* Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Alexandre spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2012 Alexandre spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index e2842f6dd1e8fc3921bb323831656b3e0486abc0..f0aeeeb6458515d20485ef4ed8640af4ddfd6d81 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -3,7 +3,7 @@
* Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2012 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2012 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index aea7579007a9b3f32cb1437686f64997ec710489..aa496a177202c6c89cf6239bb8488a685cd9a5ad 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -4,7 +4,7 @@
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index fdfe86ec178813eb347bfebb93c3f37f47254ba9..8f1e4cbb0efc4cf3c657fecda7a43c5d92564d16 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 3389cedec56d917cc6e12f5cf53648f526464feb..f96531b059c3c82d47f58a06042c3edc2ce308cd 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index f44a1c05608240cacc8be45452abc5de4468560d..cc0029620cb2b8ac76e53b49f9e304dd71896b8a 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 71f10388acefbf903161c1aaf891949534b22612..7e015a4ad2ea18f85cadb03d91eea924833bf8b5 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 0e08b70f87ea65fd79040eaa48df3d671f2a7ac9..773ec79f796456092a37b5b04d8de942844a763c 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 4d638e23cf7b2663ed235dcdb694f112222372e0..7be1360287c175ab4ee1ba923de18b0b6bb42810 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -19,7 +19,7 @@
/**
* \file htdocs/compta/sociales/charges.php
* \ingroup tax
- * \brief Social contribution car page
+ * \brief Social contribution card page
*/
require '../../main.inc.php';
@@ -387,7 +387,7 @@ if ($id > 0)
{
$num = $db->num_rows($resql);
$i = 0; $total = 0;
- echo '<table class="nobordernopadding" width="100%">';
+ print '<table class="nobordernopadding" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("RefPayment").'</td>';
print '<td>'.$langs->trans("Date").'</td>';
@@ -488,7 +488,7 @@ if ($id > 0)
/*
- * Boutons actions
+ * Actions buttons
*/
if ($action != 'edit')
{
@@ -500,7 +500,7 @@ if ($id > 0)
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&action=edit\">".$langs->trans("Modify")."</a>";
}
- // Emettre paiement
+ // Emit payment
if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer)
{
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/paiement_charge.php?id=$object->id&action=create\">".$langs->trans("DoPayment")."</a>";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 978396e0cf52021fc90aefa93f22eaab58beccd4..e5acabd4e1907342d5a1c66a77424e463e46a0d4 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index fa8a71a24e4de4651a71f6fb5df4f75581bf1682..a938087c689f3c6262a57288bb647e34aaf15809 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 857523673342d169dc6ee6a7ee7a2d42ff76f3ed..0625dd4978dbd9e622fd6a88339ca9b0662c3d78 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -90,9 +90,8 @@ if (empty($min)) {
// Define modetax (0 or 1)
// 0=normal, 1=option vat for services is on debit
$modetax = $conf->global->TAX_MODE;
-if (isset($_REQUEST["modetax"])) {
- $modetax=$_REQUEST["modetax"];
-}
+if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
+if (empty($modetax)) $modetax=0;
// Security check
$socid = GETPOST('socid','int');
diff --git a/htdocs/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php
index 5861dcdaff45022ad23301f4d86e7bc6ba32d782..09a6622147eb55ee502475eb85edd5e2c7d203d2 100644
--- a/htdocs/compta/tva/quarter_report.php
+++ b/htdocs/compta/tva/quarter_report.php
@@ -1,9 +1,9 @@
<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2007, 2015 Yannick Warnier <ywarnier@beeznest.org>
- * Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2007, 2015 Yannick Warnier <ywarnier@beeznest.org>
+ * Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
*
* 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
@@ -252,7 +252,7 @@ $vatsup=$langs->trans("VATPaid");
// VAT Received and paid
-echo '<table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">';
$y = $year_current;
$total = 0;
@@ -538,8 +538,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
// Blank line
print '<tr><td colspan="'.($span+1).'"> </td></tr>';
- //print table headers for this quadri - expenses now
- //imprime les en-tete de tables pour ce quadri - maintenant les d�penses
+ // Print table headers for this quadri - expenses now
print '<tr class="liste_titre">';
print '<td align="left">'.$elementsup.'</td>';
print '<td align="left">'.$langs->trans("Date").'</td>';
@@ -680,7 +679,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
print '</tr>';
}
- if (count($x_paye) == 0) { // Show a total ine if nothing shown
+ if (count($x_paye) == 0) { // Show a total line if nothing shown
print '<tr class="liste_total">';
print '<td colspan="'.$span.'"></td>';
print '<td align="right">'.$langs->trans("Total").':</td>';
@@ -706,7 +705,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$i++;
}
-echo '</table>';
+print '</table>';
$db->close();
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 3f9c0d1bb5989270e255304f52a78765f3bef831..4156bc977a35ad409c70336f30ec13e0c6b5baa3 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 29d266eff515b5d6e0dc27d7951be4eca104ac26..77c3b7a318c3509eaa09af766e12cf4966a9bcf4 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 7731ee85e7fc062334e695636f9dcba03c73105e..0d9f411602618b86f563206dab2cc22a2fdfcf16 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -6,7 +6,7 @@
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 9a5ab3b0f0761d42054e5bc063125bd0dcd0168a..239b1d9a6fdedd0d43f78eebd39bf5d18e77da43 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index c6ac982e348724c8928f5ee4a3a33b479bc5f03c..85fdbc2870f589bcdeff5e9729c43ea9334b5b7e 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index 855709f48e24166f6ad76308e1475c43a36f0038..826e6fe9ba4c8ae933abcba2a5d61c98e1304b97 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -25,7 +25,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Required to knwo date format for dol_print_date
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Required to know date format for dol_print_date
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -50,7 +50,7 @@ top_httphead();
if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvnext')
{
// Increase date
- $al =new AccountLine($db);
+ $al = new AccountLine($db);
$al->datev_next($_GET["rowid"]);
$al->fetch($_GET["rowid"]);
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index a48fb4b15cfe9188832c80ea8861b652a44c35b7..d20dbf2d4f39ad90e30ecf4fe20da9722c44571f 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index de85fd445f6b9c25272f28a85e0fbf44ae23cee4..c7b7374a8f9b2d52929e2c262bd5ad465744cfdf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -15,7 +15,7 @@
* Copyright (C) 2012-2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2012-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php
index 7de7b721f9aec779a0fe07ccefb8ee0880908e18..ad74b465f279705c4361c637da8d7de521d8536b 100644
--- a/htdocs/core/class/html.formbank.class.php
+++ b/htdocs/core/class/html.formbank.class.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index b004621a0d2f081157df8a1f9bcbf12be9feb619..196dcfe0997b2f9c988b499491fe6d8f9fa42bf2 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index f79e2c8ddf17cb39bd7f8cbe312f76343d133eb1..bca5b2f1bdfb7a268016e241b2418e2369d3cb56 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2006-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 5ba2ea89009fbc1046678cbee3b88588f44ec410..92b5676746c9868f90abd61313dd93a8b18eaf70 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -6,7 +6,7 @@
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Christophe Battarel <contact@altairis.fr>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index 5cc5c2d6785680be8df10b39771e55fb4e3ff579..fe32f5f7dff9228c613735d211ce477c38715673 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php
index 37266b5149518c1ab01765d07f971d5276baaead..083930ee9f9429c737b29413a3626d13f7b20a67 100644
--- a/htdocs/core/lib/fiscalyear.lib.php
+++ b/htdocs/core/lib/fiscalyear.lib.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1ff5509528cf18f2f4f29403efdc2eb12fc96cac..30d8e7a5045a49c58c661685badfb851054bf772 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9,7 +9,7 @@
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Cédric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index 1dcd2fea7f9732adc5d408cddb8eeeacad0de583..ded12eb2003242633239f5285be4b2f0d481c82e 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 358209ef23e12889a6a844ce6ffbccbee4ec926b..513a16a71f6468d024e8bae2aeb27a59477fe32f 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2006-2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 7d9ee545dea4cd874740a2f5a36c39c40aeac110..b2b99d34d3be1a65b685c1704039c602f9fbb860 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -108,102 +108,73 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
if ($modetax == 1)
{
// If vat paid on due invoices (non draft)
- if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+ $sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,";
+ $sql.= " sum(f.$total_ht) as amount, sum(f.".$total_tva.") as tva,";
+ $sql.= " sum(f.localtax1) as localtax1,";
+ $sql.= " sum(f.localtax2) as localtax2";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql.= " ".MAIN_DB_PREFIX."societe as s";
+ $sql.= " WHERE f.entity = " . $conf->entity;
+ $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+ else $sql.= " AND f.type IN (0,1,2,3,5)";
+ if ($y && $m)
{
- // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
- // n'est pas stocke dans la table des payments.
- // Seul le module compta expert peut resoudre ce probleme.
- // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
- // detail part tva et part ht).
- $sql = 'TODO';
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
}
- if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+ else if ($y)
{
- $sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,";
- $sql.= " sum(f.$total_ht) as amount, sum(f.".$total_tva.") as tva,";
- $sql.= " sum(f.localtax1) as localtax1,";
- $sql.= " sum(f.localtax2) as localtax2";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s";
- $sql.= " WHERE f.entity = " . $conf->entity;
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- if ($y && $m)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
- }
- else if ($y)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
- }
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND s.rowid = f.fk_soc";
- $sql.= " GROUP BY s.rowid, s.nom, s.tva_intra, s.tva_assuj";
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
}
+ if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql.= " AND s.rowid = f.fk_soc";
+ $sql.= " GROUP BY s.rowid, s.nom, s.tva_intra, s.tva_assuj";
}
else
{
- if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+ // Tva sur factures payes (should be on payment)
+/* $sql = "SELECT s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj,";
+ $sql.= " sum(fd.total_ht) as amount, sum(".$total_tva.") as tva";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f, ".MAIN_DB_PREFIX.$invoicetable." as fd, ".MAIN_DB_PREFIX."societe as s";
+ $sql.= " WHERE ";
+ $sql.= " f.fk_statut in (2)"; // Paid (partially or completely)
+ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+ else $sql.= " AND f.type IN (0,1,2,3,5)";
+ if ($y && $m)
{
- // If vat paid on payments
- // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
- // n'est pas stocke dans la table des payments.
- // Seul le module compta expert peut resoudre ce probleme.
- // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
- // detail part tva et part ht).
- $sql = 'TODO';
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
}
- if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+ else if ($y)
{
- // Tva sur factures payes (should be on payment)
-/* $sql = "SELECT s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj,";
- $sql.= " sum(fd.total_ht) as amount, sum(".$total_tva.") as tva";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f, ".MAIN_DB_PREFIX.$invoicetable." as fd, ".MAIN_DB_PREFIX."societe as s";
- $sql.= " WHERE ";
- $sql.= " f.fk_statut in (2)"; // Paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- if ($y && $m)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
- }
- else if ($y)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
- }
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND s.rowid = f.fk_soc AND f.rowid = fd.".$fk_facture;
- $sql.= " GROUP BY s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj";
-*/
- $sql = 'TODO';
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
}
+ if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql.= " AND s.rowid = f.fk_soc AND f.rowid = fd.".$fk_facture;
+ $sql.= " GROUP BY s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj";
+*/
}
if (! $sql) return -1;
- if ($sql == 'TODO') return -2;
- if ($sql != 'TODO')
+
+ dol_syslog("Tax.lib:thirdparty", LOG_DEBUG);
+ $resql = $db->query($sql);
+ if ($resql)
{
- dol_syslog("Tax.lib:thirdparty", LOG_DEBUG);
- $resql = $db->query($sql);
- if ($resql)
+ while($assoc = $db->fetch_object($resql))
{
- while($assoc = $db->fetch_object($resql))
- {
- $list[] = $assoc;
- }
- $db->free($resql);
- return $list;
- }
- else
- {
- dol_print_error($db);
- return -3;
+ $list[] = $assoc;
}
+ $db->free($resql);
+ return $list;
+ }
+ else
+ {
+ dol_print_error($db);
+ return -3;
}
}
@@ -265,98 +236,74 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$sql='';
if ($modetax == 1) // Option vat on delivery for goods (payment) and debit invoice for services
{
- if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+ // Count on delivery date (use invoice date as delivery is unknown)
+ $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+ $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql.= " d.date_start as date_start, d.date_end as date_end,";
+ $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql.= " 0 as payment_id, 0 as payment_amount";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql.= " WHERE f.entity = " . $conf->entity;
+ $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+ else $sql.= " AND f.type IN (0,1,2,3,5)";
+ $sql.= " AND f.rowid = d.".$fk_facture;
+ $sql.= " AND s.rowid = f.fk_soc";
+ if ($y && $m)
{
- // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
- // n'est pas stocke dans la table des payments.
- // Seul le module compta expert peut resoudre ce probleme.
- // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
- // detail part tva et part ht).
- $sql='TODO';
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
}
- if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+ else if ($y)
{
- // Count on delivery date (use invoice date as delivery is unknown)
- $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " 0 as payment_id, 0 as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity = " . $conf->entity;
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- if ($y && $m)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
- }
- else if ($y)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
- }
- if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 0"; // Limit to products
- $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service
- $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
}
+ if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+ if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql.= " AND (d.product_type = 0"; // Limit to products
+ $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service
+ $sql.= " ORDER BY d.rowid, d.".$fk_facture;
}
else // Option vat on delivery for goods (payments) and payments for services
{
- if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+ // Count on delivery date (use invoice date as delivery is unknown)
+ $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+ $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql.= " d.date_start as date_start, d.date_end as date_end,";
+ $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef as date_f, s.nom as company_name, s.rowid as company_id,";
+ $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql.= " 0 as payment_id, 0 as payment_amount";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql.= " WHERE f.entity = " . $conf->entity;
+ $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+ else $sql.= " AND f.type IN (0,1,2,3,5)";
+ $sql.= " AND f.rowid = d.".$fk_facture;
+ $sql.= " AND s.rowid = f.fk_soc";
+ if ($y && $m)
{
- // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
- // n'est pas stocke dans la table des payments.
- // Seul le module compta expert peut resoudre ce probleme.
- // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
- // detail part tva et part ht).
- $sql='TODO';
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
}
- if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+ else if ($y)
{
- // Count on delivery date (use invoice date as delivery is unknown)
- $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef as date_f, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " 0 as payment_id, 0 as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity = " . $conf->entity;
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- if ($y && $m)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
- }
- else if ($y)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
- }
- if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 0"; // Limit to products
- $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service
- $sql.= " ORDER BY d.rowid, d.".$fk_facture;
- //print $sql;
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
}
+ if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+ if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql.= " AND (d.product_type = 0"; // Limit to products
+ $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of service
+ $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+ //print $sql;
}
//print $sql.'<br>';
@@ -429,103 +376,77 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$sql='';
if ($modetax == 1) // Option vat on delivery for goods (payment) and debit invoice for services
{
- if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+ // Count on invoice date
+ $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+ $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql.= " d.date_start as date_start, d.date_end as date_end,";
+ $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql.= " 0 as payment_id, 0 as payment_amount";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql.= " WHERE f.entity = " . $conf->entity;
+ $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+ else $sql.= " AND f.type IN (0,1,2,3,5)";
+ $sql.= " AND f.rowid = d.".$fk_facture;
+ $sql.= " AND s.rowid = f.fk_soc";
+ if ($y && $m)
{
- // Count on invoice date
- // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
- // n'est pas stocke dans la table des payments.
- // Seul le module compta expert peut resoudre ce probleme.
- // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
- // detail part tva et part ht).
- $sql='TODO';
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
}
- if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+ else if ($y)
{
- // Count on invoice date
- $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " 0 as payment_id, 0 as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity = " . $conf->entity;
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- if ($y && $m)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
- }
- else if ($y)
- {
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
- }
- if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 1"; // Limit to services
- $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
- $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+ $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+ $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
}
+ if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+ if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql.= " AND (d.product_type = 1"; // Limit to services
+ $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+ $sql.= " ORDER BY d.rowid, d.".$fk_facture;
}
else // Option vat on delivery for goods (payments) and payments for services
{
- if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+ // Count on payments date
+ $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+ $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql.= " d.date_start as date_start, d.date_end as date_end,";
+ $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount";
+ $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+ $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+ $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql.= " WHERE f.entity = " . $conf->entity;
+ $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+ else $sql.= " AND f.type IN (0,1,2,3,5)";
+ $sql.= " AND f.rowid = d.".$fk_facture;
+ $sql.= " AND s.rowid = f.fk_soc";
+ $sql.= " AND pf.".$fk_facture2." = f.rowid";
+ $sql.= " AND pa.rowid = pf.".$fk_payment;
+ if ($y && $m)
{
- // Count on payments date
- // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
- // n'est pas stocke dans la table des payments.
- // Seul le module compta expert peut resoudre ce probleme.
- // (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le
- // detail part tva et part ht).
- $sql='TODO';
+ $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+ $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
}
- if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+ else if ($y)
{
- // Count on payments date
- $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
- $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity = " . $conf->entity;
- $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- $sql.= " AND pf.".$fk_facture2." = f.rowid";
- $sql.= " AND pa.rowid = pf.".$fk_payment;
- if ($y && $m)
- {
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
- }
- else if ($y)
- {
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
- }
- if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 1"; // Limit to services
- $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
- $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+ $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+ $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
}
+ if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
+ if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+ $sql.= " AND (d.product_type = 1"; // Limit to services
+ $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+ $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
}
if (! $sql)
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 67131a2864510b0e4830bbeeef4db696f9764e03..1b3e982210682425b01858f211634f340251bf12 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2014-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index d2ade2e4fc6973fa4a16e521c442bdc4b761dd42..0731b803ca342cbcb058263f9a7ac18c12593887 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 7b7a9dd4517db2542859c675cc16070341f7b852..d4db6b2e7982b908042524d2e6c6ef6ad9d26cef 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 1d279b8514863dbf567c9dab321705dff0a1cb51..237c6b19014b9ea566b671035877c2fa34bc5476 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index fcc4930e34b744040acdcde5b2cc325410e134ad..988391bca424c3cb2ea9b3a0a71d6ca2e8633c3d 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -115,7 +115,7 @@ class modHoliday extends DolibarrModules
// 'group' to add a tab in group view
// 'contact' to add a tab in contact view
// 'categories_x' to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
- $this->tabs = array('user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/list.php?mainmenu=holiday&id=__ID__');
+ $this->tabs = array('user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=holiday&id=__ID__');
// Boxes
$this->boxes = array(); // List of boxes
@@ -155,14 +155,14 @@ class modHoliday extends DolibarrModules
$r++;
$this->rights[$r][0] = 20004; // Permission id (must not be already used)
- $this->rights[$r][1] = 'Read hollidays for everybody'; // Permission label
+ $this->rights[$r][1] = 'Read holidays for everybody'; // Permission label
$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
$this->rights[$r][4] = 'read_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$r++;
$this->rights[$r][0] = 20005; // Permission id (must not be already used)
- $this->rights[$r][1] = 'Create/modify hollidays for everybody'; // Permission label
+ $this->rights[$r][1] = 'Create/modify holidays for everybody'; // Permission label
$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
$this->rights[$r][4] = 'write_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index ab2ca7f33c28fcbfe9eaf8dc058cb0c4361d93d2..96139ee3fec6780a7f839197535f859ce6d26ab6 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 1708c7a8ed08bb1a9c1bb2c2c6b8cf9939f32d7e..b4e349d7560cb7ae15c07e4860aba73c0f72c96d 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -5,7 +5,7 @@
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php
index a55f979db8c54754955959f22895f2422220062d..68b7619253b049e3d50eaaff321436805a3f1322 100644
--- a/htdocs/core/modules/modSkype.class.php
+++ b/htdocs/core/modules/modSkype.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 0815deaf085514105946448ba5f50f2a81f8fba3..0385977c7dc42332037a76db4c6826d641525d4e 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index 923fd9168a95bf451a243eceb8dd031d164c2265..6acb7e5d90eca738b2b3597354018712722eb4ed 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 75e30da80a3ca8b94768a581f43024dc8c4279ab..323f36bd609cf0382801c4742382a93ce629c69d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
if (! empty($conf->projet->enabled))
{
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
}
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -595,8 +596,8 @@ if (! empty($id) && $action != 'edit')
print "<tr ".$bc[$var]."><td>";
print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
- $labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->paiement_type;
- print "<td>".$labeltype.' '.$object->num_paiement."</td>\n";
+ $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+ print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
print '<td align="right">'.price($objp->amount)."</td><td> ".$langs->trans("Currency".$conf->currency)."</td>\n";
print "</tr>";
$totalpaid += $objp->amount;
@@ -658,8 +659,10 @@ if (! empty($id) && $action != 'edit')
print '<tr>';
print '<td>'.$langs->trans("Project").'</td>';
print '<td>';
- $object->fetch_projet();
- print $object->project->getNomUrl(4);
+ $projettmp=new Project($db);
+ $projettmp->id=$object->fk_projet;
+ $projettmp->ref=$object->project;
+ print $projettmp->getNomUrl(1);
print '</td>';
print '</tr>';
}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index fa7bc6dffd8e9dbdaac225df072cbad218b4ea5e..2b84f0d072763bc4c027c28b8fc5d626de4c7133 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
@@ -55,8 +55,8 @@ class Don extends CommonObject
var $email;
var $public;
var $fk_projet;
- var $modepaiement;
- var $modepaiementid;
+ var $fk_typepayment;
+ var $num_payment;
var $note_private;
var $note_public;
var $statut;
@@ -608,7 +608,7 @@ class Don extends CommonObject
$sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
$sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, cp.libelle, d.email, d.phone, ";
$sql.= " d.phone_mobile, d.fk_projet, d.model_pdf,";
- $sql.= " p.title as project_label,";
+ $sql.= " p.ref as project_ref,";
$sql.= " c.code as country_code, c.label as country";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet";
@@ -652,7 +652,7 @@ class Don extends CommonObject
$this->email = $obj->email;
$this->phone = $obj->phone;
$this->phone_mobile = $obj->phone_mobile;
- $this->project = $obj->project_label;
+ $this->project = $obj->project_ref;
$this->fk_projet = $obj->fk_projet;
$this->public = $obj->public;
$this->modepaymentid = $obj->fk_payment;
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 27784446e4bc01ac153d87050900a5c8b691eeb9..73cbbc3930194f3629124f4bc7c4286028d66a90 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
@@ -90,8 +90,8 @@ class PaymentDonation extends CommonObject
// Clean parameters
if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation);
if (isset($this->amount)) $this->amount=trim($this->amount);
- if (isset($this->typepayment)) $this->typepayment=trim($this->typepayment);
- if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
+ if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
+ if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
if (isset($this->note)) $this->note=trim($this->note);
if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 3bc60e25176e5b29f9480fbc17121e5826d10afa..793bdadd3b1cdf91e35c65fca6a17f1a395fca7b 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index ff41b1947df5c1041cda26757162f469a739d7e1..daa5c6e62de484d2b2fa077e321931f81753d8e2 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index ba551deea67debbf7726faa1a4878c7f79e78fca..2d89c6252f6d5dc1caacd3fe57be5a8bc51f06c1 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index a31b7a71068319c70c3fa7411934b7b2a6d7935b..c4ed9891be64f96b9b69ab82129a1ef64ead1e86 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 91f4465f376c7a9f4e2a6d795b862fd2c355faf4..baeda9b8a8248d7e591d5c76b2bc02e5097300ef 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index 226987c0c44686d815ececa073b8255d50d95e8a..b32ba2446d47534eb0ac656e71939d08db43bd8e 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index ec172d74cce2c689a9ba9ece0d1eb8b3a50516cd..0d582217011242da0d3554cec2988ccad7a35cfb 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
@@ -1452,8 +1452,8 @@ else
print "<tr ".$bc[$var]."><td>";
print '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
- $labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->fk_typepayment;
- print "<td>".$labeltype.' '.$object->num_payment."</td>\n";
+ $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->fk_typepayment;
+ print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
print '<td align="right">'.price($objp->amount)."</td><td> ".$langs->trans("Currency".$conf->currency)."</td>\n";
print "</tr>";
$totalpaid += $objp->amount;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index dff70ad934e2ee2cef21742abadecd5ebd3d9c94..9a802ac7f34847f5b907690a0694393c459e874b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
@@ -56,8 +56,8 @@ class ExpenseReport extends CommonObject
var $user_author_infos;
var $user_validator_infos;
- var $modepayment;
- var $modepaymentid;
+ var $fk_typepayment;
+ var $num_payment;
var $code_paiement;
var $code_statut;
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 0c46943de4993dfdb797e4068ebbca318d082215..96e421c4769d864aa53b07e4afcf2b541d74b6df 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 3d94718c9f790c701cc5018d99817bc8ad6e69dd..f025079fca944eac70bd13897ec229a3fceaf9f0 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -3,6 +3,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
@@ -141,7 +142,7 @@ $max=10;
$langs->load("boxes");
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE u.rowid = d.fk_user_author";
@@ -177,8 +178,8 @@ if ($result)
while ($i < $num && $i < $max)
{
$obj = $db->fetch_object($result);
- $expensereportstatic->ref=$obj->rowid;
$expensereportstatic->id=$obj->rowid;
+ $expensereportstatic->ref=$obj->ref;
$userstatic->id=$obj->uid;
$userstatic->lastname=$obj->lastname;
$userstatic->firstname=$obj->firstname;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8b83f69ee12bd43f0038c23e6fefb4010caee165..83961d4f2742b82cb872e0e3f83fcdd71e06dab4 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 5b62b13835610f5747d183f0e1755feb7c544767..0a9b5a0577800ac6f26cd7778b2bce8479683e3c 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 7b867609f4fdb655f77ad33d685fd4e384b79269..3c61179e1b36b9bd725935ffc3b9933d00679896 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 9c83b70502ac0ceaf5d04e5e172db9282f070993..d84826ed5d0415f8d2551306a527957f93742f0f 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -5,7 +5,7 @@
-- Copyright (C) 2004 Guillaume Delecourt <guillaume.delecourt@opensides.be>
-- Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
-- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index afc70f08a9f58842da83bfadfff55ab0ae4e3ab5..421033589e383fe6db02c1755d3dc98e33013631 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -5,7 +5,7 @@
-- Copyright (C) 2004 Guillaume Delecourt <guillaume.delecourt@opensides.be>
-- Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
-- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
--- Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 54f24b1ea80e77c31b3da2867b3b975a7d715536..5e2be869a9ffec5f114c3837dd3da2b333833bb4 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -1,6 +1,6 @@
-- ============================================================================
-- Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
--- Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
index 569c22dd57e5be04aac8fe716b49c864dd9a7bcf..89fd3ac878019094eeb3803947b53dc84667bc97 100644
--- a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
@@ -1,5 +1,5 @@
-- ============================================================================
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_accounting_system.sql b/htdocs/install/mysql/tables/llx_accounting_system.sql
index d567561dad52fa499d1d2627d22361ffb322ec7a..50a9c66b054e4896134d42e1566bf58cd848b918 100644
--- a/htdocs/install/mysql/tables/llx_accounting_system.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_system.sql
@@ -1,6 +1,6 @@
-- ============================================================================
-- Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2011-2012 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2011-2012 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index ac060bc0df305e4217c5503a4e6c8aaefdb5ebb7..934949e7a667d097ed18f5e44a3ed94dc27caf9e 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -2,7 +2,7 @@
-- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
index 503cc0eec061bef4d48331b2b25dd398b0e22235..a955d76ea81bb7c704dd2be9674dabaec6878ae5 100644
--- a/htdocs/install/mysql/tables/llx_c_country.sql
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -1,7 +1,7 @@
-- ========================================================================
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
index 090dc2c47be7776f5af02d25908848b590957449..f5c70cc122ed3229396e8a73f2fb532ef6eba0d2 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.sql
@@ -1,7 +1,7 @@
-- ========================================================================
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql
index 9d6d594fe104917e0444cc10160e4c92c5f89172..dec81d43ed35518c32c19d15c86fd3e16efa5818 100644
--- a/htdocs/install/mysql/tables/llx_c_tva.sql
+++ b/htdocs/install/mysql/tables/llx_c_tva.sql
@@ -1,7 +1,7 @@
-- ========================================================================
-- Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2010-2015 Juanjo Menent <jmenent@2byte.es>
--- Copyright (C) 2011-2012 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2011-2012 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql
index 145330012eb654d14a7fbce7ee34fe3dfa05835b..e980562aff2205c3412fe268c13f4f91e46122d3 100644
--- a/htdocs/install/mysql/tables/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql
@@ -1,7 +1,7 @@
-- ========================================================================
-- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index f2aa52f073d2baec199928f7304fdf86ffb077ba..809627a6eb5d68fc324c1d194661650c56548de2 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -2,7 +2,7 @@
-- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com>
-- Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.key.sql b/htdocs/install/mysql/tables/llx_don_extrafields.key.sql
index 592df29f8f9a198a8cd6519f59133fb5c654370f..e8da3084d349c53c469f40fc9551b5c55efacfbb 100644
--- a/htdocs/install/mysql/tables/llx_don_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_don_extrafields.key.sql
@@ -1,5 +1,5 @@
-- ===================================================================
--- Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.sql b/htdocs/install/mysql/tables/llx_don_extrafields.sql
index b81f31f0c6513386d5093e1e38423a937ae09bad..72b4d0a862a3776550f7c16e5bafe6df950028c8 100644
--- a/htdocs/install/mysql/tables/llx_don_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_don_extrafields.sql
@@ -1,5 +1,5 @@
-- ========================================================================
--- Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index 21e9e09d8b70b0263c50373c0dfdb9caed9b9d78..6fd3c0d2099515bfea75e6aae593c68156814cde 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -1,5 +1,5 @@
-- ========================================================================
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-- Copyright (C) 2015 Frederic France <frederic.france@free.fr>
--
-- This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 0389a59e06ea49edfbc416592d1b0dbc975b4ae6..afa5075cd4eec8c38993f688ca52749657960ffd 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -1,5 +1,5 @@
-- ===================================================================
--- Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 55d10289348e1b53882cfc53d2088acd265e0e4e..40e3977197881c1cd2dee194f5548da1c8b3cfec 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -1,5 +1,5 @@
-- ===================================================================
--- Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index 4a0ba519c78262d5c529d14c6a8fb91bd066fe1f..d023c0393910c61d4488ff08d931a69bacd06f50 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -1,5 +1,5 @@
-- ===================================================================
--- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-- Copyright (C) 2015 Frederic France <frederic.france@free.fr>
--
-- This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index 5bda961c274cfb3ee2c9776724781d110cecde9b..bce4da9904af264ecf748e8a30efd272fe3e613c 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -1,5 +1,5 @@
-- ===================================================================
--- Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+-- Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
--
-- 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
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index cc14a66aea538b261c028e0e56431126a4ecfa84..3b54b6d9714ad6c87f48a1ed78df63c9a013359d 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index bb6fe9451b6c536d593ae9426975cb18d46e796a..6c96f01420a43ec07c67d2934f862f62893cc86c 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002 David Tufts <http://dave.imarc.net>
- * Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 2eec1695887349583b50455f28c8b45bbb7cd404..0c8309e724405f6661cd4ffb079cf806658f5459 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 85d0694b725b838708b88295ea5f031cede85690..24ca97b5225eb30ef06147598cc2c208cb1cfefb 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 35ce4cbaaa08e7d797400482733baccd6b8de5eb..03517b91adf80d9af8c1ffc093d7a906a0b49d3e 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 41de056dce5ad121925ee15f6eab815dd03b8368..97d5c2265075b9bce7a13de5f207a2f3c977b3e8 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index 82ff98f0529172d1f3ee845ccc3775b25dcafd16..87412dadcd2eefb422f0dfaa136d49bda8f6b3a7 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
*
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 16c349b92e93902f49a1ffd953493c92aabe572a..83fab095d175fa9aa70dc6b60869ababc67955a9 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index eb048ce15a6f0e6e403726bfa11220c42b799b4a..8d8b5dd1ecf0ce0b12e4024858ad07b48ec7b244 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 32e6ed57d2de2b640af1800c4f2af285e2fac0d7..a9e33fc54a206a47c68f346d34ffad20caea0fdb 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index bd0d2cb8a5186a6936e9cf539651a9aef498d656..35837c0331d901f17964789ea17375016435d091 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -220,7 +220,7 @@ else print dol_htmlentities($object->titre);
print '</td></tr>';
// Description
-print '<tr><td valign="top">'.$langs->trans("Description") .'</td><td colspan="2">';
+print '<tr><td class="tdtop">'.$langs->trans("Description") .'</td><td colspan="2">';
if ($action == 'edit')
{
$doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120);
@@ -228,12 +228,7 @@ if ($action == 'edit')
}
else
{
- if (empty($conf->fckeditor->enabled)) print dol_htmlentitiesbr($object->commentaires);
- else
- {
- $doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120,1);
- $doleditor->Create(0,'');
- }
+ print (dol_textishtml($object->commentaires)?$object->commentaires:dol_nl2br($object->commentaires,1,true));
}
print '</td></tr>';
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 61c3cd6dff697174deaa708dd4af3cadfeea651b..7f6609d5fe6b916b922b405c4298e1f7a7c70839 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ec60f691e056181cea8e0b00a63e2d0ff3064280..704a0db9442ca619cdd6514e0178915e0f450850 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -8,7 +8,7 @@
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013-2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012-2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Cédric Gross <c.gross@kreiz-it.fr>
* Copyright (C) 2014-2015 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
@@ -1010,13 +1010,13 @@ else
{
print '<table class="border" width="100%">';
- // PRIX
+ // Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td>';
print '<td><input name="price" size="10" value="'.$object->price.'">';
print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
print '</td></tr>';
- // MIN PRICE
+ // Min price
print '<tr><td>'.$langs->trans("MinPrice").'</td>';
print '<td><input name="price_min" size="10" value="'.$object->price_min.'">';
print '</td></tr>';
@@ -1031,28 +1031,21 @@ else
print '<br>';
}
- /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
- {
- // Don't show accounting field when accounting id disabled.
- }
- else
- {*/
- print '<table class="border" width="100%">';
+ print '<table class="border" width="100%">';
- // Accountancy_code_sell
- print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
- print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">';
- print '</td></tr>';
+ // Accountancy_code_sell
+ print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
+ print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">';
+ print '</td></tr>';
- // Accountancy_code_buy
- print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
- print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">';
- print '</td></tr>';
+ // Accountancy_code_buy
+ print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+ print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">';
+ print '</td></tr>';
- print '</table>';
+ print '</table>';
- print '<br>';
- //}
+ print '<br>';
dol_fiche_end();
@@ -1435,22 +1428,15 @@ else
print '</td></tr>'."\n";
}
- /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
- {
- // Don't show accounting field when accounting id disabled.
- }
- else
- {*/
- // Accountancy sell code
- print '<tr><td>'.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
- print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
- print '</td></tr>';
+ // Accountancy sell code
+ print '<tr><td>'.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
+ print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
+ print '</td></tr>';
- // Accountancy buy code
- print '<tr><td>'.$form->editfieldkey("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
- print $form->editfieldval("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
- print '</td></tr>';
- //}
+ // Accountancy buy code
+ print '<tr><td>'.$form->editfieldkey("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
+ print $form->editfieldval("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
+ print '</td></tr>';
// Status (to sell)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 28af434d56a4e4e2b07fd0ce21e7bf4c5aef65f7..13368f652a9616e87115d60cf838705fbfec098b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -8,7 +8,7 @@
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2013-2014 Cedric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2013-2015 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Henry Florian <florian.henry@open-concept.pro>
* Copyright (C) 2014 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2014 Ion agorria <ion@agorria.com>
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index b00ed56166dda71fae7ecee182ad1fc3db9e72be..1b8babd9a3673c374db668ea3dfa0e5d25eeb800 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -1,9 +1,9 @@
<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2014 Charles-Fr BENKE <charles.fr@benke.fr>
- * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014 Charles-Fr BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* 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
@@ -330,6 +330,7 @@ if ($result)
$db->free($result);
print "</table>";
+ print '<br>';
}
}
else
@@ -395,7 +396,6 @@ function activitytrim($product_type)
if ($num > 0 )
{
- print '<br>';
print '<table class="noborder" width="75%">';
if ($product_type==0)
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index c37f206850a11955eff8a3028867550f09dd9937..fbb6995f8ac6a11a6f93fc883d08542dd57ac4ac 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
index d142ad91e47d660c1f23e0ba705244afc578f782..6243a0d270cce0b1ee0cb5e913dec12516f6724f 100644
--- a/htdocs/resource/add.php
+++ b/htdocs/resource/add.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a1352dacc61ee71aff40233fbdc744db7b57fdb7..fba9bdd30be3936bb6738b90b14834427d8a2970 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -8,7 +8,7 @@
* Copyright (C) 2008 Patrick Raguin <patrick.raguin@auguria.net>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013 Peter Fontaine <contact@peterfontaine.fr>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 5bd270c1ef5a64b825051d198adcb965c9cbb32c..ff5e7918b43c230ccc67f212885ea56533e43e1e 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2008 Patrick Raguin <patrick.raguin@auguria.net>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2011-2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php
index d1525b05af71aa5e7673675d53cafa321c462d62..bd70786dab4b6cdd5b821403d613c004aceb5814 100644
--- a/htdocs/theme/md_exp/style.css.php
+++ b/htdocs/theme/md_exp/style.css.php
@@ -4,7 +4,7 @@
* Copyright (C) 2007-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 6332aab479423e851fd5e973d5d21b214e9cb1b1..4b04766f07a6d77970b2db01ec003a3b33a122f1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -8,7 +8,7 @@
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ce2c7987aa5b204ec04c9ba6711cbd0d79b0fb21..81beed0a69cd19dd6ed775e4bcc8041ed6adf2a0 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -8,7 +8,7 @@
* Copyright (C) 2005 Lionel Cousteix <etm_ltd@tiscali.co.uk>
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2013-2014 Philippe Grand <philippe.grand@atoo-net.com>
- * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 75b996abe20369541480f1c5f039069e22c78a26..9c8060e72755dd64460ea8afd0bcc469f8d7a071 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* 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
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index a3e967ed3838009416bd3b99c88945454329aa22..0613df1950137e60c20dd7b1a06094fdf6a45e4e 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -1,6 +1,6 @@
<?PHP
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify