Commit Graph

1487 Commits

Author SHA1 Message Date
Laurent Destailleur
ea3d091f03 Merge pull request #1900 from ndrosis/patch-5
Correct view greek language in PDF
2014-09-18 17:25:44 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total
Fix: Warning message not translated
2014-09-18 10:05:37 +02:00
Laurent Destailleur
f0ebd7721d Fix: Restore sort feature. Still did not see why previous commit is a
bug fix of dolibarr bug.
2014-09-17 17:49:39 +02:00
Drosis Nikos
de6e1c5036 Correct view greek language in PDF 2014-09-17 18:01:59 +03:00
Regis Houssin
f185028707 Fix: remove hook restriction ! 2014-09-17 16:08:14 +02:00
Regis Houssin
d225d92c0b Fix: remove hook restriction ! 2014-09-17 16:03:21 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
Laurent Destailleur
0e944b0403 Fix: Pb with week position when week start on sunday. 2014-09-05 15:00:53 +02:00
Laurent Destailleur
1505ade3db Fix error management: When an error is returned by hooks into
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php
2014-08-28 15:14:06 +02:00
Regis Houssin
0632cbdad0 Fix: broken feature: add param for use only "disabled" with delConstant
and "enabled" with setConstant
2014-08-17 15:15:52 +02:00
Regis Houssin
86f1d59e3c Fix: broken feature: add param for use only "disabled" with delConstant
and "enabled" with setConstant
2014-08-17 15:12:20 +02:00
Regis Houssin
a8668aee11 Fix: add global object to test condition with an object 2014-08-14 15:35:08 +02:00
Regis Houssin
d4a0c122be Fix: add global object to test condition with an object 2014-08-14 15:33:41 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
5026320fec Fix: Longueur zone texte libre incorrecte. 2014-08-13 14:44:41 +02:00
Laurent Destailleur
b2638625c9 Add comment to warn about a bug 2014-08-13 14:36:40 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
2014-08-08 01:19:03 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
2014-08-07 12:13:00 +02:00
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
2014-08-07 11:50:34 +02:00
Laurent Destailleur
273b9029b8 Fix: mb_strtolower function does not exists on all PHP versions.
Conflicts:
	htdocs/core/lib/pdf.lib.php
2014-08-06 01:45:31 +02:00
Laurent Destailleur
f33df3419c Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:25:47 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
2014-08-04 12:49:54 +02:00
Laurent Destailleur
b16dc8dbcd Fix: Tab not selected 2014-08-03 23:51:26 +02:00
Laurent Destailleur
8ea52f52f5 Fix: Missing counter into document tab 2014-08-03 23:48:27 +02:00
Laurent Destailleur
1a96bc0f30 Fix: Bad url for cron
Fix: must use html syntax, not xml
2014-07-28 20:33:37 +02:00
Laurent Destailleur
0ca72dcfea Fix: Restore compatibility with old modules. 2014-07-27 23:53:46 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Maxime Kohlhaas
d61e5bae93 Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related 2014-06-28 17:01:52 +02:00
Laurent Destailleur
0778d38b2c Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:08:32 +02:00
Laurent Destailleur
62b0d8a472 Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:03:01 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any
html.
2014-06-21 01:26:41 +02:00
Laurent Destailleur
a2724822d7 Fix: Add hidden option to partially fix a bug. A more complete fix
should be done later.
2014-06-20 16:01:08 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Laurent Destailleur
e2afa6853b Fix: Deletion of translation has disappeared. 2014-06-20 15:05:39 +02:00
Laurent Destailleur
6740e0321a Merge pull request #1670 from FHenry/3.5
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
2014-06-20 13:16:11 +02:00
Laurent Destailleur
3791175536 Fix: doxygen 2014-06-20 13:07:15 +02:00
Laurent Destailleur
221d7b56aa Fix: The object deliverycompany was not used anymore and output of
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:52:08 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236 Fix: The object deliverycompany was not used anymore and output of
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
2014-06-20 12:41:23 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
card
2014-06-17 11:18:30 +02:00
Florian HENRY
f796a6408e Do not display dictionnay for non activated module 2014-06-12 15:28:11 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +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
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
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
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
Laurent Destailleur
1557d8973f Fix: [ bug #1403 ] suppression d'une fiche produit impossible 2014-05-26 23:12:47 +02:00