2
0
forked from Wavyzz/dolibarr
Commit Graph

592 Commits

Author SHA1 Message Date
Laurent Destailleur
c485b1fe30 Fix When generation of doc is required and generator not provided, we
take first entry found.
2015-05-03 20:07:16 +02:00
Laurent Destailleur
b619c64770 Fix #2713 2015-04-27 20:24:02 +02:00
Laurent Destailleur
d5afff4388 Fix warnings when submitting a vote for a survey 2015-04-12 11:42:49 +02:00
aspangaro
d897139f25 Module member: move field note in note_private 2015-04-03 06:54:08 +02:00
aspangaro
6a0916b3fa Correct path 2015-03-26 21:03:56 +01:00
aspangaro
be0ab4c9b4 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-23 06:58:25 +01:00
Laurent Destailleur
2632b8e25b Update test page to prepare datatables architecture. 2015-03-22 21:26:13 +01:00
Laurent Destailleur
1a1959b52c Fix: Solve conflict with imgup and imgdown class use for sort fields and
to drag and drop lines.
2015-03-22 21:18:25 +01:00
aspangaro
c9d31dab3a Move module Dons in htdocs->donations 2015-03-19 05:41:13 +01:00
Laurent Destailleur
60a6d8789f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
Laurent Destailleur
7050ef6176 Fix parameter notolderthan was not effective 2015-03-02 17:56:37 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
aspangaro
c1069eea47 FIXED: Update licence to GPLv3 2015-02-23 22:04:01 +01:00
frederic34
925aa2039b Tooltip and cache for boxes 2015-01-23 10:51:12 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
1d1970b5a1 Sec: Bad security test 2015-01-14 19:10:48 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Laurent Destailleur
48818ed2fd Fixed: Quick solution to solve problem of unknown payment amount for
online subscription.
2015-01-04 15:40:01 +01:00
Laurent Destailleur
ec0c7476fb Work on select2 prototype. 2014-12-07 23:51:36 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
aspangaro
ef991e6c5d HTML5 - <center> is deprecated - Need CSS - continue working 2014-11-24 06:43:15 +01:00
Laurent Destailleur
1c1e2ed246 Better comment 2014-11-23 13:19:28 +01:00
Laurent Destailleur
76b8ff9416 Fix: css 2014-11-20 11:34:43 +01:00
Laurent Destailleur
d4ad7236e5 Clean old code for multiselect (replaced with select2 plugin). 2014-11-16 00:46:27 +01:00
Laurent Destailleur
a46a6cccaf Fix: Screen page tests. Page tests are now ok with 3.7. 2014-11-15 00:57:31 +01:00
Laurent Destailleur
a3ab22e27d Fix: css 2014-11-15 00:16:59 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
2014-10-30 18:19:13 +01:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
Juanjo Menent
dc46d59d68 Fix: Unsubscribe emailing not working 2014-09-01 18:26:24 +02:00
Laurent Destailleur
1c39e7ecbd Fix: Bad param 2014-08-01 17:11:18 +02:00
Laurent Destailleur
bcd441cc1e Fix: Bad url for cron
Fix: must use html syntax, not xml
2014-07-28 20:30:31 +02:00
Laurent Destailleur
709bf20deb Work on prootype for using datatable. 2014-07-27 20:31:11 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d Fix: Confusion between is_int and is_numeric. 2014-06-09 15:21:20 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
2014-06-09 12:34:10 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
3122944ab7 Fix: Email html format was missing br. 2014-05-07 10:05:32 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02: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
b117ea83be Fix: missing trans
Fix: detection of html content
2014-04-25 16:45:14 +02:00
Laurent Destailleur
76b5659d4c Optimize for small screen 2014-04-22 00:04:31 +02:00
Laurent Destailleur
918de2d0a1 Fix: Payment detail are not visible. 2014-04-11 19:20:11 +02:00
Laurent Destailleur
b77e068a72 New: More information into email confirm for paybox payment. 2014-04-06 15:01:45 +02:00
Laurent Destailleur
2be6b2ecf7 Fix: var not initialized 2014-04-06 14:53:42 +02:00
Laurent Destailleur
6cb39ea3dc Fix: Missing message keys 2014-04-06 14:49:04 +02:00