lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,778 Commits 43 Branches 150 Tags 886 MiB
0854984a08
Commit Graph

72778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0854984a08 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-06-23 18:09:49 +02:00
Laurent Destailleur
b153019000 FIX security (a user can read leave or holiday of other without perm. 2019-06-23 18:08:24 +02:00
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
Laurent Destailleur
26c12c61a7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-20 03:39:56 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
Laurent Destailleur
53688e2d0f
Merge pull request #11353 from fmarcet/8.0 
FIX: Wrong stock movement on supplier credit notes
 2019-06-20 03:11:28 +02:00
Laurent Destailleur
d840c8f831
Merge pull request #11348 from frederic34/patch-5 
Update companies.lang
 2019-06-20 03:05:43 +02:00
Laurent Destailleur
4c7a689fb5
Merge pull request #11373 from atm-john/8.0_fix_var_name 
FIX var name
 2019-06-20 02:57:39 +02:00
Laurent Destailleur
33f39bdfcb
Merge pull request #11368 from atm-gauthier/8.0_fix_facfourn_fetch_in_right_entity 
FIX : we need to fetch fourn invoice with ref in current entity
 2019-06-20 02:48:42 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
gauthier
3ad13adf31 FIX : better syntax 2019-06-19 10:43:42 +02:00
gauthier
7331e43db8 FIX : we need to fetch fourn invoice with ref in current entity 2019-06-19 10:19:33 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first 
chars wrong.
 2019-06-18 19:41:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
81bca34a08 FIX A user may read holiday and expense report without permissions 2019-06-18 16:04:25 +02:00
Laurent Destailleur
6e9874b95a FIX A user may read holiday and expense report without permissions 2019-06-18 16:01:24 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Laurent Destailleur
27f52dd0bd Fix columns in csv 2019-06-18 14:32:35 +02:00
Laurent Destailleur
f6f66f2a77 Fix syntax error 2019-06-17 18:11:38 +02:00
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +02:00
Frédéric FRANCE
a399e3f63d
Update companies.lang 2019-06-17 13:33:44 +02:00
Laurent Destailleur
c0a30d1ff5 FIX #11325 FIX #5249 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-16 22:21:38 +02:00
Laurent Destailleur
5a4f2fa0b3
Merge pull request #11342 from simnandez/9.0 
FIX: #11335
 2019-06-16 17:25:02 +02:00
Juanjo Menent
a73ae49c4d FIX: #11296 2019-06-14 18:56:30 +02:00
Juanjo Menent
8afffc8762 FIX: #11335 2019-06-14 18:28:01 +02:00
Laurent Destailleur
239e41f6c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-14 13:57:49 +02:00
Laurent Destailleur
1d2c9c9df4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-14 13:57:23 +02:00
Laurent Destailleur
a163623dc6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-14 13:57:17 +02:00
Laurent Destailleur
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape 
FIX: in edit mode, dictionary inputs do not escape the string inside …
 2019-06-14 13:36:06 +02:00
Laurent Destailleur
5bac3d4d2b
Merge pull request #11332 from atm-gauthier/7.0_fix_syntax_error 
FIX : syntax error
 2019-06-14 13:35:40 +02:00
atm-florian.m
787e1319b9 FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes 2019-06-13 16:21:07 +02:00
Laurent Destailleur
9a5ac7d1c7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-13 12:12:57 +02:00
Laurent Destailleur
3e6b7208cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:07:24 +02:00
gauthier
28218a00b3 FIX : syntax error 2019-06-13 11:01:12 +02:00
Laurent Destailleur
1318e26cda
Merge pull request #11298 from hregis/7.0_price 
FIX missing compatibility with multicompany transverse mode
 2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php 2019-06-13 09:59:10 +02:00
Laurent Destailleur
4f5f03b893
Merge pull request #11326 from atm-greg/FIX_massaction_presend 
Fix massaction presend
 2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28
Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
afe1ec633b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:21 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
1b6b471cb7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:43 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00