Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Laurent Destailleur
d5bb208957
Clean admin menu entries
2017-02-22 02:19:50 +01:00
Laurent Destailleur
c2fc9ecf68
Fix scrutinizer warning
2016-04-09 16:12:53 +02:00
Laurent Destailleur
36b0cb5b23
NEW Merge all admin tools (system and module admin tools) into same
...
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
2016-02-16 12:50:15 +01:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Laurent Destailleur
3588d73c8e
Fix css
2015-05-31 16:36:11 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Laurent Destailleur
f1f7ff315f
Fix: CRLF
2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
6942700ce7
New: Direct jump to edit page
2013-01-14 15:18:15 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694
Fix: change for a neutral email
2012-12-30 15:11:07 +01:00
Laurent Destailleur
2e2f156839
Fix: title
2012-09-05 16:20:51 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Regis Houssin
e0385cf06f
Fix: strict mode palace
2012-08-02 10:07:55 +02:00
Laurent Destailleur
8a83b273ef
Uniformize code
2011-12-28 12:53:46 +01:00
Regis Houssin
726d9581dd
Fix: remove obsolete tags (in progress)
2011-08-27 14:24:16 +00:00
Laurent Destailleur
f4606c2253
Fix: Avoid errors into rpm packages
2011-08-03 00:45:22 +00:00
Regis Houssin
68c1571d13
Qual: First change to remove pre.inc.php
2010-03-01 09:20:41 +00:00
Laurent Destailleur
e93964a718
Look: Uniformize look
2009-07-26 11:19:11 +00:00
Laurent Destailleur
2dd6b94222
Look: Modif esthtique mineure
2006-12-08 23:35:28 +00:00
Laurent Destailleur
ac6f085ced
Corrige comptage dans suppression recursive
2006-11-11 15:52:17 +00:00
Laurent Destailleur
1d5b45e5e1
New: Ajout page admin pour purger les fichiers de documents
...
New: Quelques amliorations mineures sur expditions
Trad: Un peu plus de traduction sur expditions
2006-11-11 00:46:15 +00:00
Laurent Destailleur
532fff5eef
New: Ajout outil de dump par mysqldump
2006-08-20 19:15:47 +00:00