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

48677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d3bfbbf55d test phpcodesniffer 2015-08-12 22:08:48 +02:00
Laurent Destailleur
d66af1c94e Quality control file for code climate 2015-07-31 00:44:11 +02:00
Laurent Destailleur
4567f56980 Sync from transifex 2015-07-30 17:09:18 +02:00
Laurent Destailleur
0c6cb1c444 Fix bad translation 2015-07-30 14:47:56 +02:00
Laurent Destailleur
84e45848c8 Doc comments 2015-07-30 14:44:05 +02:00
Laurent Destailleur
cbb2d8d800 Fix typo 2015-07-29 16:30:30 +02:00
Laurent Destailleur
459f9e3db8 Fix avoid warning 2015-07-29 15:54:49 +02:00
Laurent Destailleur
ffeaa4e224 Test update checksum file 2015-07-29 15:50:59 +02:00
Laurent Destailleur
fcc6ce8c31 Fix Option for second level approbation was visible when it should 
not.
 2015-07-29 15:39:34 +02:00
Laurent Destailleur
c058437879 Fix missing translation 2015-07-29 14:50:53 +02:00
Laurent Destailleur
52b433a3f1 Comment 2015-07-29 13:11:23 +02:00
Laurent Destailleur
a6bac40f0a Fix bad translation 2015-07-29 13:03:52 +02:00
Laurent Destailleur
36a1fa6fbe Fix missing backtopage param 2015-07-29 12:38:02 +02:00
Laurent Destailleur
c2d2e06202 Fix bad glossary 2015-07-29 12:33:16 +02:00
Laurent Destailleur
068d235682 Fix missing $db into constructor 2015-07-29 12:10:04 +02:00
Laurent Destailleur
5cea60cf58 Default price for margin was not set 2015-07-28 19:39:42 +02:00
Laurent Destailleur
a753755d75 Missing translation key 2015-07-28 19:06:49 +02:00
Laurent Destailleur
a73541194c Merge remote-tracking branch 'origin/develop' into 3.8 2015-07-28 18:57:42 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
Laurent Destailleur
cc49b39eb6 Merge pull request #3329 from atm-gauthier/3.7_fix_add_user_on_event_in_create_mode 
FIX : When we add an user on event in create mode, we lose linked object
 2015-07-28 18:37:19 +02:00
Laurent Destailleur
bd4a31c45d Merge pull request #3320 from fmarcet/3.7 
Fix: Not showing delivery date on rouget pdf (expedition)
 2015-07-28 18:34:19 +02:00
Laurent Destailleur
fff86c0769 Fix PHPCS 2015-07-28 18:33:43 +02:00
Laurent Destailleur
a8d2aab291 Merge pull request #3315 from mrsof/patch-1 
FIX : Move "<script>" code inside "body"
 2015-07-28 18:32:11 +02:00
Laurent Destailleur
c42e952ce9 Merge pull request #3319 from FHenry/3.7 
FIX : #3318
 2015-07-28 18:30:19 +02:00
Laurent Destailleur
a3b379476b Merge pull request #3308 from atm-gauthier/3.7_fix_display_extraf_text_line_break 
FIX : Line break display as a block
 2015-07-28 18:19:07 +02:00
Laurent Destailleur
22c68a3221 Merge pull request #3328 from FHenry/3.8 
FIX : php_build_class_from_table.php comma ending on insert
 2015-07-28 18:15:10 +02:00
Laurent Destailleur
bdd9a6e59e Fix bad position of translation key 2015-07-28 18:14:15 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Gauthier
aaa9d85d07 FIX : When we add an user on event in create mode, we lose linked object 2015-07-28 17:25:33 +02:00
Gauthier
556d01ff8a FIX : Line break display as a block 2015-07-28 15:14:54 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
9451296f6b Fix: Missing tooltip 2015-07-28 12:11:39 +02:00
Laurent Destailleur
a16d6b037c Fix: bad link to task 2015-07-28 12:06:57 +02:00
Florian HENRY
938be9bae0 FIX : fetchAll method in skeleton.class.php 2015-07-28 11:38:01 +02:00
Florian HENRY
ab3e1631f4 FIX : php_build_class_from_table comma ending on insert 2015-07-28 11:20:00 +02:00
Laurent Destailleur
17f7b1528a Fix not compatible not supported option 2015-07-28 10:05:48 +02:00
Florian HENRY
517e9094da FIX : Avoid warning strict mode when hosting server do not have 
php5_curl installed
 2015-07-27 22:34:30 +02:00
Florian HENRY
d78292b9af FIX : if multicompany enabled, call to undifend method _setCookie 
instead of setCookie
 2015-07-27 22:08:33 +02:00
Laurent Destailleur
7e7d39f068 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-27 20:22:51 +02:00
Laurent Destailleur
f9fe623522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-27 17:09:27 +02:00
Laurent Destailleur
d128cf69d9 Doxygen doc 2015-07-27 17:09:16 +02:00
fmarcet
e130af8033 Fix: Not showing delivery date on rouget pdf (expedition) 2015-07-27 13:11:07 +02:00
Florian HENRY
c0412acdea FIX : #3318 2015-07-27 13:03:47 +02:00
Sof
e455ed14ef FIX : Move "<script>" code inside "body" 2015-07-24 11:27:40 +02:00
Laurent Destailleur
96f1c25a73 Merge pull request #3287 from marcosgdf/bug-3198 
Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne
 2015-07-23 22:51:17 +02:00
Laurent Destailleur
e6f5450265 Merge pull request #3299 from FHenry/3.8_jquery 
NEW : upgrade jQuery Component Datable (and extras) to 1.10.7
 2015-07-23 22:48:10 +02:00
Laurent Destailleur
215d62f48d Merge pull request #3295 from FHenry/3.8 
FIX : #3305
 2015-07-23 22:08:08 +02:00
Laurent Destailleur
9ba9db9abe Merge pull request #3303 from All-3kcis/develop-patch-5 
Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS"
 2015-07-23 22:07:15 +02:00
Laurent Destailleur
ad43ef6112 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-22 23:34:07 +02:00