Commit Graph

103596 Commits

Author SHA1 Message Date
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Laurent Destailleur
b77cadf39a Fix filter 2021-09-27 11:38:34 +02:00
Laurent Destailleur
9b825df158 Clean code 2021-09-27 11:36:40 +02:00
Laurent Destailleur
c9ae46db50 FIX Filter on categories 2021-09-27 11:34:26 +02:00
Laurent Destailleur
6d92591358 Fix look and feel v15 2021-09-27 11:28:34 +02:00
Laurent Destailleur
96c8743ee9 Look and feel 2021-09-27 11:27:02 +02:00
Gauthier PC portable 024
fde0f1ac25 NEW : HRM integration, source code 2021-09-27 11:20:38 +02:00
Gauthier PC portable 024
07bdc534db NEW : integration HRM sql and migrations files 2021-09-27 10:34:31 +02:00
stickler-ci
526380a4b8 Fixing style errors. 2021-09-27 08:10:49 +00:00
Stephan Steininger
c7ff60866a load existing batch numbers for item within mrp consumtion 2021-09-27 10:04:59 +02:00
Laurent Destailleur
4a85304572 Fix security 2021-09-26 21:01:34 +02:00
Laurent Destailleur
621296d84f Fix implement CSRF protection by session (with option per call) 2021-09-26 20:56:40 +02:00
Laurent Destailleur
bb5eb9e292 FIX Filter on categories 2021-09-26 20:56:17 +02:00
Laurent Destailleur
4f6586d6a8 Fix token 2021-09-26 20:35:54 +02:00
Laurent Destailleur
1436f0de7d Fix newToken 2021-09-26 20:26:20 +02:00
Laurent Destailleur
5497d7d730 Fix look and feel v15 2021-09-26 20:23:15 +02:00
Benjamin Chantalat
15b4e9f89d Merge branch 'develop' of https://github.com/PyroShape/dolibarr into develop 2021-09-26 19:09:56 +02:00
Benjamin Chantalat
e1fc471295
Merge branch 'Dolibarr:develop' into develop 2021-09-26 19:09:37 +02:00
Benjamin Chantalat
5623e5f98a Correct isset 2021-09-26 19:09:09 +02:00
Laurent Destailleur
d5d4b8d8e0 Fix escape the undescore on search in website module 2021-09-26 14:21:23 +02:00
Laurent Destailleur
cb964a3ab3 Fix cancel button 2021-09-26 13:55:19 +02:00
Laurent Destailleur
c02b5b08ea Fix trans 2021-09-26 12:58:34 +02:00
Alexandre SPANGARO
b7c577b762 NEW #18814 Add legal form for Sweden 2021-09-26 05:17:03 +02:00
Laurent Destailleur
ab974eff19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-25 21:17:23 +02:00
Laurent Destailleur
a47cd22450 Fix sql 2021-09-25 21:15:53 +02:00
Laurent Destailleur
efa6e8a408 Fix sql 2021-09-25 21:15:21 +02:00
Laurent Destailleur
567334318a Fix sql eventorganization 2021-09-25 21:13:55 +02:00
Philippe Grand
f7041ef1fc
Update box_members_last_subscriptions.php 2021-09-25 19:03:08 +02:00
Philippe Grand
2edad621b8
Update box_members_last_modified.php 2021-09-25 19:02:28 +02:00
Philippe Grand
694754267c
Update box_members_by_type.php 2021-09-25 19:01:54 +02:00
Philippe Grand
a29ed0229b
Update barcode.php 2021-09-25 19:00:47 +02:00
Philippe Grand
dbe459bc3f
Update box_members_subscriptions_by_year.php 2021-09-25 18:59:39 +02:00
Philippe GRAND
661f13adb3 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\admin\barcode.php on line 376 2021-09-25 18:58:06 +02:00
Philippe GRAND
67cc5155b1 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\lib\barcode.lib.php on line 62 2021-09-25 18:15:44 +02:00
Philippe GRAND
1feb6e676c fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_by_type.php on line 70 2021-09-25 16:17:24 +02:00
Philippe GRAND
6b3cf5d482 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions_by_year.php on line 70 2021-09-25 16:15:31 +02:00
Philippe GRAND
d9110a8114 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions.php on line 70 2021-09-25 16:13:35 +02:00
Philippe GRAND
f8609a4619 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_modified.php on line 70 2021-09-25 16:09:34 +02:00
stickler-ci
509e1f5636 Fixing style errors. 2021-09-25 10:48:39 +00:00
ptibogxiv
1cdba9fb80
NEW API get list of legal form of business 2021-09-25 12:46:27 +02:00
stickler-ci
6b820ae4c5 Fixing style errors. 2021-09-25 10:16:29 +00:00
ptibogxiv
77d64e4fe2
NEW API list of staff units 2021-09-25 12:13:06 +02:00
Alexandre SPANGARO
372ba6cf0b NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3) 2021-09-25 07:49:08 +02:00
Alexandre SPANGARO
4e212054a4 Merge branch '14.0' into 14p16 2021-09-25 07:13:03 +02:00
Alexandre SPANGARO
8f5f657e4d FIX Accountancy - Missing specific filename for export on format FEC2, Ciel & repare it 2021-09-25 07:12:33 +02:00
Laurent Destailleur
e1cd1bb046
Merge pull request #18819 from FVolral/fix-docker-permission-error
FIX: Docker-compose file and Dockerfile
2021-09-25 00:29:11 +02:00
FVolral
c6e7881763 FIX: Docker-compose file and Dockerfile
Fix #18816 : During the build of the docker-compose `web` service, in
the `Dockerfile` There is a command which attemps to modify
`/etc/hosts`. On my system This file is Read-only. Using the
`extra_hosts` parameter in `docker-compose.yml` instead fix the
problem.
2021-09-24 19:49:30 +02:00
lmarcouiller
14bcb124fe update reception class and card 2021-09-24 14:46:52 +02:00
Benjamin Chantalat
5cf90d0247 Correct date format 2021-09-24 14:10:19 +02:00