Commit Graph

43796 Commits

Author SHA1 Message Date
Marcos García de La Fuente
cdc40ca76f Optimized is_ip dolibarr function 2014-07-17 21:12:50 +02:00
nicoplh
25a591bd03 Update impayees.php
Add column ref.Client with search module.
2014-07-17 16:21:23 +02:00
Juanjo Menent
2564413a70 Fix: Translation 2014-07-17 11:44:10 +02:00
Juanjo Menent
6e1f6f7485 Trad: Update es_ES from transifex 2014-07-17 11:14:47 +02:00
Laurent Destailleur
ef2629d309 Fix: Translation 2014-07-17 02:02:35 +02:00
Laurent Destailleur
9394f3f405 Fix: Translation 2014-07-17 01:56:34 +02:00
Laurent Destailleur
1bad6ebc78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-17 01:29:30 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other
main page).
- New: Can search on project ref or string from project main page (like
other main page).
2014-07-17 01:28:01 +02:00
Laurent Destailleur
6a19cc614a Merge pull request #1737 from GPCsolutions/accessibility
Accessibility
2014-07-16 15:15:03 +02:00
Laurent Destailleur
a6a799c812 Merge pull request #1747 from KreizIT/Fix_batch
FIX stock inconsistency when activating batch management
2014-07-16 15:13:23 +02:00
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	ChangeLog
2014-07-15 23:30:15 +02:00
Laurent Destailleur
f096253a6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-15 23:28:58 +02:00
Laurent Destailleur
0cb11a537d Fix: IP address of user was lost into paypal confirm email 2014-07-15 23:27:11 +02:00
Cedric
f38ab46928 correction typo 2014-07-15 19:02:43 +02:00
Marcos García de La Fuente
8a17feb69b Deprecated some functions and improved method documentation 2014-07-15 17:35:12 +02:00
Marcos García de La Fuente
ad4512cb24 Avoiding include in case of unexisting file 2014-07-15 17:18:41 +02:00
Cedric
769c9a9b66 FIX stock inconsistency when activating batch management on product which already have stock 2014-07-15 11:22:16 +02:00
Laurent Destailleur
25f1259061 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-14 23:48:01 +02:00
Laurent Destailleur
2cf9a7511b Add date of file so we know if file was correctly build before
publishing it.
2014-07-14 23:47:46 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
2014-07-14 23:36:10 +02:00
Laurent Destailleur
3a625ce6bf Merge pull request #1741 from marcosgdf/url-not-available
Removed index.php and replaced them with blank index.html as it is more appropiate
2014-07-14 23:20:32 +02:00
Laurent Destailleur
0025b507a7 Merge pull request #1738 from marcosgdf/vagrant
Updated Vagrant box
2014-07-14 23:16:08 +02:00
Laurent Destailleur
32a6d59b64 Merge pull request #1734 from FHenry/3.5
Fix
2014-07-14 23:13:03 +02:00
Laurent Destailleur
f55814e3b2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Conflicts:
	ChangeLog
2014-07-14 23:11:33 +02:00
Laurent Destailleur
d02df05ab8 Merge branch 'marcosgdf-bug-1526' into 3.5 2014-07-14 23:10:05 +02:00
Laurent Destailleur
0bfc90ee9a Merge pull request #1744 from marcosgdf/bug-linkedprojects
Fixed a bug introduced in commit 0916d2cf3b
2014-07-14 23:05:16 +02:00
Cedric
dda17f4082 Security fix 2014-07-14 20:00:22 +02:00
Juanjo Menent
2ac088d60e Merge pull request #1739 from KreizIT/XssFix
Security fix
2014-07-14 19:58:48 +02:00
Juanjo Menent
2031cdfdd7 Merge pull request #1745 from ndrosis/patch-2
Fix Link product
2014-07-14 19:48:37 +02:00
Juanjo Menent
ccf32636f8 Fix: Import ProfId1 to siren and ProfId2 to siret
Conflicts:
	ChangeLog
2014-07-14 19:43:59 +02:00
Juanjo Menent
9410b18473 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:43:48 +02:00
Juanjo Menent
3a8835892e Fix: Import ProfId1 to siren and ProfId2 to siret
Conflicts:
	ChangeLog
2014-07-14 19:42:54 +02:00
Juanjo Menent
f8b5bac05c Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:40:18 +02:00
Juanjo Menent
3816e0fe14 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:39:08 +02:00
Juanjo Menent
3930c8829e Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:38:00 +02:00
Marcos García
8eced58ba0 Removed @ operator from dol_include_once
Adding @ operator to include_once makes include errors untraceable, it shouldn't be there. Errors must be thrown so that we notice them. It is PHP configuration's choice to decide wether to log them or print them.
2014-07-14 19:16:28 +02:00
Drosis Nikos
fcc0632beb In list view and label product 2014-07-14 17:18:31 +03:00
Drosis Nikos
1ae4341d57 Fix Link product 2014-07-14 16:53:12 +03:00
Marcos García de La Fuente
b0ae2fe2aa Fixed a bug introduced in commit 0916d2cf3b 2014-07-14 01:32:57 +02:00
Marcos García de La Fuente
4bc8e026b6 [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly 2014-07-13 19:51:44 +02:00
Marcos García de La Fuente
2dd3bacd4f Removed no longer needed files 2014-07-12 23:30:01 +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
Florian HENRY
13e434cf68 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-12 19:06:39 +02:00
Cedric
d289306fa4 Security fix 2014-07-12 16:22:49 +02:00
Marcos García de La Fuente
43f6d3deaf Moved dolibarr source to another folder of /var/www so that external libraries get separated from dolibarr core 2014-07-12 15:51:39 +02:00
Marcos García de La Fuente
0c8765bfe3 Updated vagrant box 2014-07-12 14:56:22 +02:00
Raphaël Doursenaud
94bcb0dc40 Labels and autofocus for company card forms 2014-07-12 14:45:23 +02:00
Raphaël Doursenaud
f1853c435b More labels and autofocus for thirdparty and contact forms 2014-07-12 12:04:39 +02:00
Juanjo Menent
d02814192f Qual: More intuitive if contract ref_ext we say ref. customer
Visu: ref. customer is not required
2014-07-12 10:56:13 +02:00
Juanjo Menent
630bf8f8e0 Merge pull request #1731 from FHenry/develop
[ task #1204 ] Add ref_ext contract field
2014-07-12 10:43:09 +02:00