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

42260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Laurent Destailleur
44e57ca08a Fix: Seach on company was not working 2014-07-18 18:21:09 +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
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
Juanjo Menent
2ac088d60e Merge pull request #1739 from KreizIT/XssFix 
Security fix
 2014-07-14 19:58: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 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
Cedric
d289306fa4 Security fix 2014-07-12 16:22:49 +02:00
juanjo
c1bfe0f6c5 Update ChangeLog: Remove add_photo_web() 2014-07-11 22:00:41 +02:00
Florian HENRY
b9df48d48c Fix 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
 2014-07-11 15:53:31 +02:00
Laurent Destailleur
ff5ea31452 Fix: Date error 2014-07-11 12:40:30 +02:00
Laurent Destailleur
0cba9b8fae Merge pull request #1726 from atm-alexis/3.5 
FIX : Bad rank when a bill was made by multiple orders
 2014-07-11 12:25:50 +02:00
Laurent Destailleur
13cc8620b2 Merge pull request #1732 from FHenry/3.5 
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un projet
 2014-07-11 12:16:25 +02:00
Florian HENRY
7d77772820 changelog 2014-07-11 11:45:59 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +02:00
Laurent Destailleur
32c15132df Fix: sql syntax error 2014-07-08 23:19:46 +02:00
Laurent Destailleur
f0056b3b95 Fix: Migration does not match tables 2014-07-08 22:40:06 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden. 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
 2014-07-08 21:50:29 +02:00
Laurent Destailleur
f1d1736532 Fix: checkstyle 2014-07-08 20:59:14 +02:00
Laurent Destailleur
0e78e631c1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 20:22:51 +02:00
Laurent Destailleur
0598bb6114 Fix: travis file for 3.5 2014-07-08 20:21:32 +02:00
Laurent Destailleur
869bde5fb0 Fix: Ignore vagrant dir into CI 
Conflicts:
	.travis.yml
 2014-07-08 20:18:22 +02:00
Alexis Algoud
6d83882a5d FIX : Bad rank when a bill was made by multiple orders 2014-07-08 09:00:41 +02:00
Laurent Destailleur
0eabf26d27 Fix: Checkstyle 2014-07-08 01:15:59 +02:00
Laurent Destailleur
36e6f9a9fc Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 01:06:17 +02:00
Laurent Destailleur
6c8c232036 Fix: Solve timeout pb. 2014-07-08 00:53:15 +02:00
Laurent Destailleur
5b1cdd05cb Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-08 00:50:32 +02:00
Laurent Destailleur
e8b7d36004 Fix: Solve timeout pb. 2014-07-08 00:50:05 +02:00
Laurent Destailleur
41dc0681c6 Merge pull request #1715 from defrance69/patch-5 
getlibstatut added
 2014-07-08 00:31:07 +02:00
Laurent Destailleur
7c16322391 Merge pull request #1713 from FHenry/3.6 
Remove fetch_optionnal becauwe done in fetch from product class
 2014-07-07 21:25:53 +02:00
Laurent Destailleur
96ec3ad7f4 Fix: Allow percent to solve presentation pb by some pages. 2014-07-07 00:14:24 +02:00
Laurent Destailleur
56c067f15c Fix: form is not allowed inside a table 
Conflicts:
	htdocs/fichinter/fiche.php
 2014-07-06 21:16:27 +02:00
BENKE Charles
4d9f78dc07 getlibstatut added 
Add function getlibstatut and libstatut on task (fk_statut allready present on project_task table)
 2014-07-06 15:06:34 +02:00
Florian HENRY
cb9e0983dd Remove fetch_optionnal becauwe done in fetch from product class 2014-07-06 10:24:01 +02:00
Laurent Destailleur
851fdf3bb7 Merge pull request #1711 from FHenry/3.6_contractextrafields 
3.6 contractextrafields
 2014-07-05 12:53:14 +02:00
Laurent Destailleur
2921412634 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-05 11:51:02 +02:00
Laurent Destailleur
dec4ff2e19 Fix: Duplicate confirmation 2014-07-05 11:50:25 +02:00
Laurent Destailleur
fe547de0e3 Fix: Removed duplicate lines 2014-07-05 11:32:44 +02:00
Florian HENRY
fe50d8b1ab restore min jquery 2014-07-05 11:19:49 +02:00
Florian HENRY
02574a7af2 Fix Ajax combobox in Extrafeilds 
Add Extrafield on contract
 2014-07-05 11:17:50 +02:00
Florian HENRY
13c208dd8f Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-05 10:28:58 +02:00
Laurent Destailleur
faa5eba203 Fix: Substitution for external module at wrong place. 2014-07-04 18:43:37 +02:00
Florian HENRY
b8c293fb16 $dateSelector is a paramters of formAddObjectLine, if use global it is 
reset to 0 because not declare in outer context but already exists in
the same context.
 2014-07-04 14:48:27 +02:00