lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,836 Commits 43 Branches 150 Tags 886 MiB
4.0
Commit Graph

10096 Commits

Author SHA1 Message Date
Laurent Destailleur
dae3e03603 Merge pull request #6323 from fappels/Fix_3.9_elephant_code_verif 
Fix verify of elephant code model for services
 2017-01-27 00:53:56 +01:00
Laurent Destailleur
1239e8600a Merge pull request #6326 from altatof/fix_entity_thirdpart_files 
Fix entity thirdparty files links
 2017-01-27 00:30:03 +01:00
Laurent Destailleur
eac6ac0247 Fix fields into projet export 2017-01-26 10:41:02 +01:00
altatof
d65cb29536 FIX: use param for http links 2017-01-25 09:25:06 +01:00
Laurent Destailleur
755d353dfa Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2017-01-24 18:41:29 +01:00
Laurent Destailleur
84fec7c5c7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2017-01-24 18:40:01 +01:00
fappels
2be6011069 Fix product elephant verify for service 2017-01-23 20:59:32 +01:00
Laurent Destailleur
03c1521cde Merge pull request #6271 from altatof/fix_extra_input 
FIX: extrafield input for varchar was not working with special char
 2017-01-18 16:53:43 +01:00
arnaud
39f35bbaab FIX all dolibarr versions about project list and ajax completion bug 2017-01-17 11:17:40 +01:00
altatof
3dd160c663 use dol_escape_htmltag 2017-01-16 09:17:37 +01:00
Regis Houssin
fd4a19855d Fix: preview image not show with multicompany product sharing 2017-01-15 12:09:26 +01:00
Laurent Destailleur
1fd9f5e1fb Fix: host was twice into message id for smtp driver and swiftmailer was 
not using dol_getprefix() to build host.
 2017-01-14 13:27:44 +01:00
altatof
55c0a99bce fix was not at the right place 2017-01-13 15:42:07 +01:00
altatof
487b5b25db FIX: extrafield input for varchar was not working with special char 
within (ie double quotes)
 2017-01-13 15:37:33 +01:00
Laurent Destailleur
5e71ff816f Increase limit for better backward compatibility without loosing minimum 
security.
 2017-01-12 10:51:31 +01:00
Laurent Destailleur
351c416ed8 Merge pull request #6265 from hregis/4.0_bug 
Fix: avoid errors if constants values not exists
 2017-01-12 10:49:23 +01:00
Laurent Destailleur
3d8c5b377b Fix string not translated 2017-01-12 10:16:19 +01:00
Regis Houssin
5898d27609 Fix: avoid errors if constants values not exists 2017-01-11 16:47:17 +01:00
Laurent Destailleur
1559c45a61 FIX link for not found photo when using gravatar. Must use external url 2017-01-10 09:24:55 +01:00
Laurent Destailleur
2aae4ea6ea FIX We must not drop column if there is still record on other entities. 2017-01-04 15:05:13 +01:00
Laurent Destailleur
157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:31:58 +01:00
Marcos García de La Fuente
98599b0bbf FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish 2016-12-27 12:56:49 +01:00
Laurent Destailleur
e297b64722 Several security fix in using mailings. 2016-12-26 12:35:10 +01:00
Laurent Destailleur
8ce5ed0192 Fix position of discount on PDF with US letter format 2016-12-23 15:57:31 +01:00
Laurent Destailleur
b4ed0a1e12 Fix nb of lat approvals wrong 2016-12-22 17:30:39 +01:00
Laurent Destailleur
3f5d67d4d6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-19 02:35:16 +01:00
Laurent Destailleur
0d1d68d5d9 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/price.php
 2016-12-19 02:34:29 +01:00
Laurent Destailleur
876722733a Better fix to get localtax 2016-12-19 02:33:54 +01:00
Laurent Destailleur
74e00c4d80 More comment and hidden option to solve problems when sending emails. 2016-12-19 01:04:17 +01:00
Laurent Destailleur
dbf96b8f59 Log at wrong place 2016-12-18 23:32:31 +01:00
Laurent Destailleur
0e7da2cd22 FIX Label of project is in field title not label. 2016-12-18 11:55:30 +01:00
Laurent Destailleur
47bf442c84 Merge pull request #6167 from atm-florian/4.0 
GETPOST instead of $_GET
 2016-12-18 10:59:27 +01:00
Laurent Destailleur
27785323ae Merge pull request #6164 from hregis/4.0_bug 
Fix: missing date locale and date rfc
 2016-12-18 10:57:29 +01:00
Laurent Destailleur
394e284a4a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/langs/en_US/errors.lang
 2016-12-18 02:16:40 +01:00
Laurent Destailleur
c5db333af8 Fix translation of error message when sending email 2016-12-17 14:00:39 +01:00
Laurent Destailleur
d8e394d3aa FIX Missing field 2016-12-16 17:09:15 +01:00
Laurent Destailleur
8f3ce46c50 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f Better fix to add server name into email id. 2016-12-15 12:11:39 +01:00
Laurent Destailleur
d2e4888bdd Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-14 12:21:33 +01:00
Laurent Destailleur
e4dd020887 Fix bad concat 2016-12-14 11:23:55 +01:00
Laurent Destailleur
af407a094a FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 11:20:44 +01:00
Laurent Destailleur
56b3f2c011 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:36:11 +01:00
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
florian HENRY
3992a92dd4 Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 2016-12-13 13:34:05 +01:00
Regis Houssin
337509d40f Fix: missing date locale and date rfc 2016-12-13 09:40:08 +01:00
Laurent Destailleur
9b436ce871 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 02:51:32 +01:00
florian HENRY
0f0db5a3fb fix: uniformize 2016-12-10 12:06:18 +01:00
Regis Houssin
239e42faa0 Fix: contract use "total_vat" instead "total_tva" 2016-12-09 13:04:05 +01:00
Laurent Destailleur
c2bee0f937 FIX #6088 2016-12-07 12:44:56 +01:00
Laurent Destailleur
c75a00e683 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-07 11:54:41 +01:00
Laurent Destailleur
cfff6a8cb8 FIX Export of opportunity status must be code, not id. 2016-12-06 14:05:43 +01:00
Laurent Destailleur
0d7ab3301b FIX in export. Error when using a separate extrafields. 2016-12-06 11:52:07 +01:00
florian HENRY
de5ad57af4 FIX : export extrafields must not include separe type 2016-12-02 12:02:08 +01:00
Laurent Destailleur
e3c529d483 FIX javascript error when using on mobile/smartphone 2016-11-20 15:38:48 +01:00
Laurent Destailleur
b538f13efb FIX Module gravatar was not triggered on thirdparty and contact card 2016-11-19 19:43:55 +01:00
Laurent Destailleur
b3b395df42 Backport a file to make migration easier 2016-11-17 19:28:19 +01:00
Laurent Destailleur
7ccc70e00d Fix as suggested for #5960 2016-11-11 15:29:48 +01:00
Laurent Destailleur
a605e0b972 Fix phpcs 2016-11-11 15:06:31 +01:00
Laurent Destailleur
e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php
 2016-11-11 15:03:05 +01:00
Laurent Destailleur
fd1c0f404c Merge pull request #5864 from hregis/4.0_bug 
Fix: add possibility to change width type to prevent some display issues
 2016-11-11 14:55:28 +01:00
Laurent Destailleur
e30622cbd8 FIX Bcc must not appears to recipient when using SMTPs lib 2016-11-09 00:10:02 +01:00
Laurent Destailleur
bb5df3beeb Fix missing tab 2016-11-07 04:02:16 +01:00
Laurent Destailleur
90881f2fa9 FIX Sanitize title of ajax_dialog 2016-11-07 00:15:58 +01:00
Laurent Destailleur
9b64fbaa98 Fix having the css of extrafield on td is not enough to detect it. We 
must have it on tr too.
 2016-11-06 16:26:18 +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
3882fa0c3d Fix dol_buildpath with parameter 3. Add phpunit tests 2016-10-31 10:37:58 +01:00
Laurent Destailleur
b4303470f8 Fix do not update instance status if method used to update other element 2016-10-30 15:42:43 +01:00
Laurent Destailleur
17c1b3f1d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-10-29 19:00:43 +02: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
phf
3e2f39fbc0 Fix on first activate module it must create if needed the first currency rate from general settings 2016-10-25 13:31:36 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-24 02:15:12 +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
Laurent Destailleur
ffcfe30529 FIX Avoid errors on debian 2016-10-22 16:51:54 +02:00
Laurent Destailleur
1c59721294 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:20:51 +02:00
Laurent Destailleur
629af89986 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:18:28 +02:00
Laurent Destailleur
3ca3b7ab78 Fix code comment 2016-10-21 10:36:11 +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
46c985d8cc FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO 2016-10-17 15:16:21 +02:00
Laurent Destailleur
2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php
 2016-10-16 19:02:36 +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
Laurent Destailleur
4fb66cf7a4 Better explanation for ftp module setup to avoid error with FTPS/SFTP. 2016-10-15 02:11:49 +02:00
Sergio Sanchis Climent
567f7e5365 FIX: #5340 2016-10-14 00:43:10 +02:00
Regis Houssin
6423b23fb3 Fix: use parameter instead constant 2016-10-12 15:36:51 +02:00
Regis Houssin
d848e98759 Fix: add possibility to change width type to prevent some display issues 2016-10-12 15:33:33 +02:00
Laurent Destailleur
b2afe98060 Fix option unique of extrafields not saved 2016-10-11 12:20:14 +02:00
Laurent Destailleur
c1e10fa4e6 FIX Sql error in widget of product for stock alerts 2016-10-04 20:54:51 +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
2cf9bf170e FIX Link on supplier invoice in widget was not clickable 2016-10-03 12:24:14 +02:00
Laurent Destailleur
6124c60157 FIX Nber of attached files were not reported in event report of email 
sent
 2016-10-03 00:44:01 +02:00
Laurent Destailleur
9fbe96dd38 Fix name of agenda tab 2016-10-02 21:31:32 +02:00
Laurent Destailleur
4dfdf29a55 FIX #5742 error on project list if an extra field separator is added. 2016-10-01 18:00:17 +02:00
Laurent Destailleur
521008a698 FIX #5746 chrome php 
Try a fix. Not sure it solved all problems reported
 2016-10-01 17:27:52 +02:00
Laurent Destailleur
cf7327a2a2 FIX #5750 Bug: CmailFile::server_parse enters an infinite loop if 
$server_response is false
 2016-10-01 16:41:12 +02:00