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

48714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
d65d501750 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:04:42 +02:00
Juanjo Menent
0e49f80035 Merge pull request #3333 from fmarcet/3.8 
FIX: Missing interventions headers
 2015-08-06 18:03:35 +02:00
Juanjo Menent
98072ec73e Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:00:59 +02:00
Juanjo Menent
0c8ed503fa Merge pull request #3331 from FHenry/3.8 
FIX : better fetchAll method into skeleton_class.class.php
 2015-08-06 17:57:38 +02:00
Juanjo Menent
df1d997540 Merge pull request #3330 from IonAgorria/patch-1 
Added EvalMath library to COPYRIGHT
 2015-08-06 17:56:35 +02:00
Florian HENRY
2a7f5da4a7 FIX : export SQL instruction on modProduct with extrafields 2015-08-04 11:49:26 +02:00
Florian HENRY
d6776e1155 FIX : Error management in societe/soc.php 2015-08-03 11:39:24 +02:00
Florian HENRY
8562bc2369 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-08-03 10:08:22 +02:00
Juanjo Menent
1dac1932a9 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 15:44:16 +02:00
Juanjo Menent
e45d19862a Fix merge menu regresion 2015-08-01 15:43:14 +02:00
Juanjo Menent
9ae31f3a08 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 15:01:19 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
 2015-08-01 14:50:07 +02:00
Juanjo Menent
2a67bd1f38 Fix #3314 Display state in bank account card 2015-08-01 14:43:04 +02:00
Juanjo Menent
34b1ce618f Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 14:32:43 +02:00
Juanjo Menent
3d847ac894 Fix #3217 [Stocks] Warehouse list shows SQL request 2015-08-01 14:29:32 +02:00
Laurent Destailleur
f9a7a49e78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-31 11:06:54 +02:00
Laurent Destailleur
9569431f44 Fix ident 2015-07-31 11:06:25 +02:00
Laurent Destailleur
08d8da4b69 Removed useless files 2015-07-31 01:23:06 +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
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/resultat/clientfourn.php
 2015-07-30 15:07:22 +02:00
Laurent Destailleur
6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2015-07-30 14:54:33 +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
fmarcet
bd46f87ed8 FIX: Missing interventions headers 2015-07-29 13:04:12 +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
Florian HENRY
e291ca2e23 FIX : Better FetchAll method 2015-07-29 11:52:23 +02:00
Florian HENRY
73192b78e9 FIX : better fetchAll method into skeleton_class.class.php 2015-07-29 11:50:31 +02:00
Ion Agorria
a21ff677bf Added EvalMath library to COPYRIGHT 
Added EvalMath library to COPYRIGHT.
As requested by @rdoursenaud
 2015-07-29 00:05:19 +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
c2eb47f3a1 Merge pull request #3325 from atm-ph/3.6_fix_timespent_id 
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
 2015-07-28 18:36:48 +02:00
Laurent Destailleur
565b0861d9 Merge pull request #3323 from fmarcet/3.6 
Fix: Not showing product's supplier reference when page break
 2015-07-28 18:36:01 +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