Frédéric FRANCE
0c56664c4f
Update card.php
2020-11-05 20:30:09 +01:00
Laurent Destailleur
bd9158ec50
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-05 19:32:39 +01:00
Laurent Destailleur
61cceba7e2
Removed not used log
2020-11-05 19:32:14 +01:00
Laurent Destailleur
5b737d77c2
Merge pull request #15292 from prietojc/12.0_patch-2
...
NEW: Add select by supplier category
2020-11-05 19:29:30 +01:00
Laurent Destailleur
d6912e89be
Merge pull request #15306 from frederic34/patch-6
...
doxygen
2020-11-05 19:23:10 +01:00
Laurent Destailleur
529d7ca9cb
Merge pull request #15305 from fappels/13_fix_reception_update
...
Fix sql error reception update, tms is auto timestamp
2020-11-05 19:22:55 +01:00
Laurent Destailleur
790adde247
Merge pull request #15310 from hregis/develop_bug2
...
FIX missing rename file date_m to tms
2020-11-05 19:21:06 +01:00
Laurent Destailleur
4535d81964
Fix CSS for holiday. Fix #15266
2020-11-05 19:09:58 +01:00
Laurent Destailleur
b2273eec6b
Fix GETPOST
2020-11-05 19:01:33 +01:00
Laurent Destailleur
38f1431534
HOLIDAY_HIDE_FOR_NON_SALARIES replaces !HOLIDAY_FOR_NON_SALARIES_TOO
2020-11-05 19:01:00 +01:00
Laurent Destailleur
81bba56776
CSS
2020-11-05 18:58:55 +01:00
Regis Houssin
6348a64369
FIX missing rename file date_m to tms
2020-11-05 18:45:30 +01:00
Frédéric FRANCE
9d1756e499
doxygen
2020-11-05 14:48:41 +01:00
Laurent Destailleur
57bb6506a3
Fix POST moved into GETPOST
2020-11-05 14:33:41 +01:00
Francis Appels
1ca0083eb8
Fix sql error reception update, tms is auto timestamp
...
remove deprecated
2020-11-05 14:30:30 +01:00
Laurent Destailleur
24ee3ac0fa
Comment
2020-11-05 12:03:23 +01:00
Laurent Destailleur
2d7b9c1ed3
Optimize travis load
2020-11-05 12:02:24 +01:00
Laurent Destailleur
f62bdf288c
Clean travis file
2020-11-05 12:00:07 +01:00
Laurent Destailleur
2bc7ca0753
Removed useless verbose logs
2020-11-05 11:56:13 +01:00
Laurent Destailleur
395731014d
Fix test
2020-11-05 11:51:59 +01:00
Laurent Destailleur
eab2582dd3
Try to save travis load
2020-11-05 11:40:13 +01:00
Laurent Destailleur
94ee6935c4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-05 11:29:41 +01:00
Laurent Destailleur
a313c35f5b
Fix php8
2020-11-05 11:29:23 +01:00
Laurent Destailleur
781cb10d54
Merge pull request #15300 from frederic34/patch-6
...
The property typent_code does not exist on Adherent
2020-11-05 11:27:36 +01:00
Laurent Destailleur
dd97ae94d0
css
2020-11-05 11:24:33 +01:00
Laurent Destailleur
779566ef30
Clean page with security summary
2020-11-05 10:03:53 +01:00
Laurent Destailleur
1d9aacc7da
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
2020-11-05 09:51:28 +01:00
Laurent Destailleur
9380ea4bc5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-05 09:43:38 +01:00
Laurent Destailleur
a5328f4230
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-05 09:43:28 +01:00
Laurent Destailleur
6bb598498e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-11-05 09:42:51 +01:00
Laurent Destailleur
f27508cf2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/class/project.class.php
2020-11-05 09:42:07 +01:00
Laurent Destailleur
72e94edae4
Fix permission on project for external user that are external contact
2020-11-05 09:40:37 +01:00
Laurent Destailleur
9df2f62e04
Merge pull request #15276 from Hystepik/develop
...
FIX 14750 fix of custom contact type in project list.php
2020-11-05 09:27:51 +01:00
Laurent Destailleur
c399721345
Update doc
2020-11-05 09:16:51 +01:00
Laurent Destailleur
c6b293673f
Merge pull request #15299 from fappels/13_update_commonobject
...
Update commonobject.
2020-11-05 09:08:12 +01:00
Laurent Destailleur
824b778d51
Update commonobject.class.php
2020-11-05 09:07:06 +01:00
Laurent Destailleur
cd4151bbdd
Merge pull request #15302 from frederic34/patch-10
...
doxygen
2020-11-05 09:05:59 +01:00
Laurent Destailleur
cc00b60148
Merge pull request #15301 from frederic34/patch-8
...
doxygen
2020-11-05 09:05:48 +01:00
Frédéric FRANCE
32391d211a
doxygen
2020-11-05 08:55:04 +01:00
Frédéric FRANCE
59e78e6a9f
doxygen
2020-11-05 08:38:54 +01:00
Frédéric FRANCE
2dfdd98b5a
Update vcard.php
2020-11-04 20:42:16 +01:00
Laurent Destailleur
63ae623da8
Merge pull request #15277 from OPEN-DSI/add_new_hook_download_page
...
NEW: Add new hook on document.php page
2020-11-04 20:37:55 +01:00
Laurent Destailleur
4b7c8a0d1d
Merge pull request #15291 from prietojc/12.0_patch-1
...
FIX force payment mode to withdraw
2020-11-04 20:36:29 +01:00
Laurent Destailleur
8d84f7437b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-04 20:35:36 +01:00
Laurent Destailleur
00d4d0db23
Fix phpcs
2020-11-04 20:35:24 +01:00
Laurent Destailleur
7f011718f4
Merge pull request #15298 from code-chicken/patch-11
...
Fix: Keep status filter when using pager
2020-11-04 20:32:21 +01:00
Francis Appels
5866facf11
Update commonobject.
...
Don't think $fk_delivery_address is deprecated, also no alternative indicated.
Switch of implode paramenters.
showInputField preselected value for array type can be array.
2020-11-04 20:31:55 +01:00
Laurent Destailleur
3295d37be2
Merge pull request #15284 from frederic34/patch-13
...
Update card.php
2020-11-04 20:31:46 +01:00
Laurent Destailleur
9e509a805a
Merge pull request #15289 from frederic34/patch-16
...
can't input two lines address
2020-11-04 18:55:08 +01:00
Laurent Destailleur
bd596965ef
Update card.php
2020-11-04 18:54:56 +01:00
