Commit Graph

9089 Commits

Author SHA1 Message Date
Laurent Destailleur
530d3503f5 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
2016-12-14 10:32:31 +01:00
Laurent Destailleur
c2bee0f937 FIX #6088 2016-12-07 12:44:56 +01:00
florian HENRY
de5ad57af4 FIX : export extrafields must not include separe type 2016-12-02 12:02:08 +01:00
Regis Houssin
e33654cc45 Merge remote-tracking branch 'origin/3.9' into 3.9_bug 2016-11-04 10:22:43 +01:00
Regis Houssin
718adef600 Fix: external access of fkeditor image with multicompany 2016-11-04 10:21:20 +01:00
Laurent Destailleur
b8f8b6dcde Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:45:19 +02:00
Laurent Destailleur
78eaeab168 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:44:55 +02:00
Regis Houssin
d0bd1d5d36 Fix: missing path of user photo 2016-10-28 14:22:06 +02:00
Maxime Kohlhaas
be493fcf09 Fix bad parameter in hook call 2016-10-28 10:16:58 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
	htdocs/core/lib/functions.lib.php
2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
	htdocs/core/lib/functions.lib.php
2016-10-24 02:10:17 +02:00
Juanjo Menent
f28c7bbc6d Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x 2016-10-18 10:20:09 +02:00
Juanjo Menent
6a944bb6a3 Fix: Bad localtaxes calc for Spain if VAT is 0 2016-10-18 10:11:42 +02:00
Laurent Destailleur
ab34885a89 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:31 +02:00
Laurent Destailleur
3d1ddbb923 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:20 +02:00
Sergio Sanchis Climent
567f7e5365 FIX: #5340 2016-10-14 00:43:10 +02:00
Juanjo Menent
56245e2c9a FIX: only show projects of related third if external user 2016-10-04 16:51:44 +02:00
Laurent Destailleur
0b49d6316e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-29 10:48:14 +02:00
Juanjo Menent
30050b51f0 FIX: Failed to export contact categories with contact extra fields 2016-09-28 10:15:41 +02:00
Laurent Destailleur
8829db7d65 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-25 16:45:16 +02:00
Laurent Destailleur
4cccaae831 Fix warning 2016-09-25 16:44:55 +02:00
Regis Houssin
937f1fd3ee Fix: Using $this when not in object context 2016-09-20 12:19:17 +02:00
Raphaël Doursenaud
1d95720644
Fixed product description field name in line edit.
The POST value 'desc' was never evaluated and caused fields to blank
out on update action.
2016-09-13 11:38:57 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3 Solve php regression failing travis 2016-08-28 01:58:11 +02:00
florian HENRY
a1323756a9 FIX : in PgSQL no quote "word style" is permitted around column name 2016-08-17 10:23:23 +02:00
florian HENRY
3932a32399 FIX : #5629 PgSQL Interger string stylish error 2016-08-16 09:00:52 +02:00
florian HENRY
321814fae3 better fix for #5594 2016-08-09 15:17:19 +02:00
florian HENRY
90cb71f341 revert better fix 2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466 better test 2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411 FIX #5594 2016-08-08 13:43:44 +02:00
florian HENRY
5144f21c6c FIX php Strict 2016-08-02 15:36:00 +02:00
Laurent Destailleur
803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
2016-08-01 15:01:14 +02:00
Laurent Destailleur
b3cdb1f163 FIX tag for date rfc in odt substitution 2016-07-29 16:21:28 +02:00
Laurent Destailleur
27243069cb FIX #5535 bad dependency.
Conflicts:
	htdocs/fourn/facture/list.php
2016-07-29 15:19:04 +02:00
florian HENRY
7b72965315 FIX incoterms 2016-07-28 16:48:16 +02:00
florian HENRY
c13c15188b FIX: incoterms do not output into crabe invoice PDF 2016-07-28 16:44:08 +02:00
Laurent Destailleur
0e79cae9d4 FIX #5534 2016-07-27 18:51:33 +02:00
Marcos García de La Fuente
3029fd0fe1 FIX #5540 getFormMail is not registered as addReplace hook 2016-07-25 13:18:41 +02:00
Marcos García de La Fuente
3ef3a038cf Merge branch '3.9' into bug-5537 2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91 FIX #5537 AJAX project search does not work properly 2016-07-25 11:49:04 +02:00
Laurent Destailleur
1624894346 Fix missing load 2016-07-21 19:35:45 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for
substitution hooks
2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75 Fix missing badge 2016-07-13 22:21:18 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
2016-07-06 14:53:05 +02:00
Maxime Kohlhaas
d658e2cf31 FIX task ODT company object not correctly retrieved 2016-07-05 16:04:18 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/pdf.lib.php
2016-07-01 03:17:20 +02:00
Laurent Destailleur
3645bd8f69 Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
2016-07-01 03:06:31 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00