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

42241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
869bde5fb0 Fix: Ignore vagrant dir into CI 
Conflicts:
	.travis.yml
 2014-07-08 20:18:22 +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
Laurent Destailleur
fa84409fea Merge pull request #1707 from FHenry/3.6 
avoid warning message on preg_replace
 2014-07-04 13:22:36 +02:00
Florian HENRY
cdfe8818da avoid message 
Delimiter must not be alphanumeric or backslash in
/home/bobby/Eclipse/workspace/dolibarr/htdocs/main.inc.php on line 450
on preg_replace
 2014-07-04 13:16:48 +02:00
Laurent Destailleur
7d519fdfe6 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-04 13:08:50 +02:00
Laurent Destailleur
105e7189ec Add -p on phpcs to avoid timeout 2014-07-04 13:08:31 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Laurent Destailleur
c662f34f16 Merge pull request #1702 from atm-maxime/3.6 
Fix : virtual stock was not correctly calculated because reception was n...
 2014-07-04 12:29:37 +02:00
Laurent Destailleur
7ee1388582 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-04 12:22:10 +02:00
Laurent Destailleur
f22a04810e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-04 11:59:01 +02:00
Laurent Destailleur
11abba30b3 Fix: Add information to help debug pb with TZ. 2014-07-04 11:58:41 +02:00
Juanjo Menent
47cff4d407 Fix: Unable to add lines in supplier orders 2014-07-04 10:04:30 +02:00
Maxime Kohlhaas
db0fa0afd0 Revert "Fix : ordered should display qty in supplier order not yet send" 
This reverts commit f2248d5bc8.
 2014-07-03 18:17:34 +02:00
Maxime Kohlhaas
8eb8f33f28 Ajout qté dans écran consommation produit 2014-07-03 18:14:26 +02:00
Maxime Kohlhaas
f2248d5bc8 Fix : ordered should display qty in supplier order not yet send 2014-07-03 17:57:36 +02:00
Maxime Kohlhaas
51e4fa0d36 Fix : picto for already ordered product was missing 2014-07-03 15:31:51 +02:00
Maxime Kohlhaas
a26db9ab52 Fix : qty ordered was not including qty already received 2014-07-03 14:47:28 +02:00
Maxime Kohlhaas
a22963e432 Fix : filter by status + was not working if desiredstock not defined 2014-07-03 14:37:30 +02:00
Maxime Kohlhaas
830cc30f80 Fix : sendings and reception stock calculation must be on the same status than order and oreder supplier calculation 2014-07-03 12:31:55 +02:00
Maxime Kohlhaas
b115e9b943 Fix : replenish function was not working with virtual stock 2014-07-03 12:07:34 +02:00
Maxime Kohlhaas
959c41e8db Fix : virtual stock was not correctly calculated because reception was not included. 2014-07-03 10:24:29 +02:00