Commit Graph

69558 Commits

Author SHA1 Message Date
Laurent Destailleur
fdc958a172 Fix launch of ISCC.ex if not into path 2019-06-29 23:17:36 +02:00
Laurent Destailleur
854bbf8405 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-28 14:09:00 +02:00
Laurent Destailleur
58a7640dc3
Merge pull request #11417 from atm-maxime/7.0
Fix invoice list filter on withdrawal card
2019-06-28 12:41:13 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
12d3a7021f Prepare 8.0.5 2019-06-26 18:50:31 +02:00
Laurent Destailleur
07fb930a79 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-25 23:20:27 +02:00
Laurent Destailleur
e1ee079254 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-06-25 23:20:07 +02:00
Laurent Destailleur
c5572e0176 Add info on signature generator 2019-06-25 23:19:00 +02:00
Laurent Destailleur
162498d2f8 Add info on signature generator 2019-06-25 23:18:20 +02:00
Laurent Destailleur
1ae9d94de9 Add info on signature generator 2019-06-25 23:15:30 +02:00
Laurent Destailleur
144f2a5159 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/fichinter/list.php
2019-06-25 13:15:57 +02:00
Laurent Destailleur
de3ec5682c
Merge pull request #11403 from fmarcet/7.0
FIX: Not showing Contract and Project columns on ficheinter list
2019-06-25 13:07:03 +02:00
Ferran Marcet
7f127989b2 FIX: Not showing Contract and Project columns on ficheinter list 2019-06-25 09:55:34 +02:00
Laurent Destailleur
ae1ad80994 Fix count 2019-06-24 16:32:42 +02:00
Laurent Destailleur
b98874848f Fix backport 9.0 2019-06-24 16:12:54 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail
FIX mass send mail
2019-06-24 15:34:06 +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
John Botella
ec7ebe9f39 redo backported fix and update adherent substitution methode 2019-06-21 15:32:38 +02:00
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +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
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +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
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
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
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +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
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
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