aspangaro
f4efd3b2e8
Move donation receipt to french model cerfa 11580*03
2014-06-15 22:18:19 +02:00
Maxime Kohlhaas
19a3194b02
Fix : duedate was not auto calculated + move calculation function to common invoice class
2014-06-14 12:53:02 +02:00
Florian HENRY
42e6727e5d
Better error return
2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b
Fix link element from project "associates object" pages
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
2014-06-13 15:54:37 +02:00
Florian HENRY
aecede08c4
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-06-13 14:38:44 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
74ee3e9823
Improved SQL error logging
2014-06-13 01:52:57 +02:00
Marcos García de La Fuente
2e2cecb6c7
Undefined constant
2014-06-13 01:48:11 +02:00
Marcos García de La Fuente
0ed2481a20
Removed unuseful errors
2014-06-13 01:46:27 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Florian HENRY
40a5d20cc8
Do not reset index on product import !!!
2014-06-12 16:46:20 +02:00
Laurent Destailleur
b4ef780274
Fix: When project was disabled, label was not visible
2014-06-12 15:41:00 +02:00
Florian HENRY
f796a6408e
Do not display dictionnay for non activated module
2014-06-12 15:28:11 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
d1d4c6d8a5
Increased SQL Error to LOG_ERROR level
2014-06-12 11:45:32 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Florian HENRY
80facefa23
Fix [ bug #1454 ] Mention de bas de page erroné
2014-06-12 09:13:51 +02:00
Mickael Desgranges
57b4cb08b7
Update modSociete.class.php
2014-06-11 13:28:31 +02:00
Mickael Desgranges
81e715f34c
Update modSociete.class.php
2014-06-11 12:26:54 +02:00
Mickael Desgranges
84f1b8c02b
Add customers/supplier status fo contact export
...
When you export a contact list it's usefull to know if your contact is a prospect, client or supplier
2014-06-11 12:22:24 +02:00
Marcos García de La Fuente
ae4bd4445e
Moved dol_syslog query log to the database handler and decreased report level to DEBUG
2014-06-09 15:49:54 +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
Laurent Destailleur
9ba4b53a88
Merge pull request #1645 from FHenry/3.5
...
Start fix [ bug #1437 ] Securitu Issue
2014-06-09 15:10:55 +02:00
Laurent Destailleur
8d8ca154f1
Fix: For supplier order/invoice, deselect product when free line is
...
selected.
2014-06-09 14:58:58 +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
Laurent Destailleur
48cdd3c13f
Fix: extra fields key.
2014-06-06 16:08:42 +02:00
Laurent Destailleur
2ec4c56f6b
Merge pull request #1640 from FHenry/3.5
...
3.5
2014-06-06 15:34:57 +02:00
BENKE Charles
f806b4373a
Update modules_commande.php
...
don't display specific version
2014-06-06 15:30:33 +02:00
BENKE Charles
37c908aa99
Update modules_propale.php
...
don't display specific number of version
2014-06-06 15:29:45 +02:00
Laurent Destailleur
768163c6fc
Fix: Easy fix to solve pb with pagebreak when adding image
2014-06-06 12:57:12 +02:00
Laurent Destailleur
171227e43a
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Laurent Destailleur
905f700136
Fix: Pb with pagebreak when adding image
2014-06-06 11:57:45 +02:00
Laurent Destailleur
c45aace9b9
Add easy fix to solve pb of links for some modules.
2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63
Fix: Missing global
2014-06-05 22:42:49 +02:00
Florian HENRY
ebe49b0525
Same bug, missing select column use in result
2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158
Fix warining message during societe activation
2014-06-05 10:53:00 +02:00
Marcos García de La Fuente
4c11e37203
Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
2014-06-03 15:45:03 +02:00
aspangaro
bb4fed30a8
Salaries :: Missing key language & typo
2014-06-03 06:45:37 +02:00
Florian HENRY
0de66e838c
camel case
2014-05-30 12:01:26 +02:00
Laurent Destailleur
fb0f0047e7
Merge pull request #1633 from aspangaro/develop
...
Typo / Missing key language / Fix limit list on mass movement stock page
2014-05-30 11:33:08 +02:00
Laurent Destailleur
82a2a723c3
Fix: [ bug #1419 ] Margins module shows margin of sold services even if
...
services module is disabled
2014-05-29 21:01:00 +02:00
Laurent Destailleur
56d71f0da0
Fix: edit form
...
Fix: pgsql driver
2014-05-29 19:56:15 +02:00
Laurent Destailleur
b75dea98ee
Fix: sql syntax
2014-05-29 19:46:32 +02:00
Laurent Destailleur
7a670c5bc7
Fix: pgsql driver not complete
...
Conflicts:
htdocs/core/db/pgsql.class.php
2014-05-29 19:39:34 +02:00
Laurent Destailleur
e8ec0f524f
Fix: pgsql driver not complete
2014-05-29 19:30:51 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Florian HENRY
f87772f3ec
Add comment for travis
2014-05-29 14:56:55 +02:00
