Frédéric FRANCE
4ca3c0aa95
Add odt for members
2020-11-14 00:48:13 +01:00
Laurent Destailleur
c7b2577bb2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-14 00:47:42 +01:00
Laurent Destailleur
3c5ef18b36
FIX #15390
2020-11-14 00:47:28 +01:00
Laurent Destailleur
ea23d328c3
Merge pull request #15396 from frederic34/patch-18
...
fix member status in box
2020-11-14 00:39:59 +01:00
Laurent Destailleur
8970fbca79
Merge pull request #15397 from frederic34/patch-19
...
can upload odt model for user
2020-11-14 00:39:44 +01:00
Frédéric FRANCE
70f1ed53f8
can upload odt model for user
2020-11-13 22:51:10 +01:00
Frédéric FRANCE
cce6afbeea
fix member status in box
2020-11-13 22:22:51 +01:00
Frédéric FRANCE
2f3ff6628d
The variable $obj does not seem to be defined
...
The variable $obj does not seem to be defined for all execution paths leading up to this point.
2020-11-13 20:51:48 +01:00
Frédéric FRANCE
42ddf7e27b
doxygen
2020-11-13 20:45:03 +01:00
Laurent Destailleur
86481d16d0
Clean code
2020-11-13 15:02:49 +01:00
Laurent Destailleur
0d19d2d5e4
Merge pull request #15372 from glu000/patch-1
...
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
2020-11-13 10:03:46 +01:00
Laurent Destailleur
5498800ad6
Update commonobject.class.php
2020-11-13 10:02:34 +01:00
Laurent Destailleur
b91123a84c
Merge pull request #15368 from cfoellmann/fix-new-contact-button
...
fix new company in contacts template file
2020-11-13 10:00:09 +01:00
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
Günter Lukas
2da8fb75a8
Fix #15371
...
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
2020-11-12 15:59:42 +01:00
Laurent Destailleur
754a9778ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/modUser.class.php
2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-12 14:13:19 +01:00
Laurent Destailleur
02158928cc
FIX #15365 export of extrafields for user and resources
2020-11-12 14:11:59 +01:00
Christian Foellmann
2061d0f858
fix new company in contacts template file
2020-11-12 14:03:18 +01:00
Laurent Destailleur
1dbc91e343
Clean code
2020-11-12 13:44:57 +01:00
Laurent Destailleur
0b6123328d
Removed rule with +99% of false positives
2020-11-12 13:12:38 +01:00
Laurent Destailleur
84cc0ef19b
Add a protection to avoid infinite loop when we will trigger ACTION_
2020-11-12 12:55:09 +01:00
Laurent Destailleur
a168c3fbb1
Remove warnings
2020-11-12 12:33:29 +01:00
Laurent Destailleur
576e1e1de8
Fix pdf crabe
2020-11-11 23:42:24 +01:00
Laurent Destailleur
767f07d02e
Debug function to show list of files in ECM module
2020-11-11 22:47:06 +01:00
Laurent Destailleur
03e60bf084
Fix warning
2020-11-11 20:27:21 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
Laurent Destailleur
64428f34a0
Fix error message
2020-11-11 05:04:15 +01:00
Laurent Destailleur
617da2ec5f
Fix error message
2020-11-11 04:55:44 +01:00
andreubisquerra
d6b5168d12
NEW Receipt Printer module as stable
...
I want to propose in the canceled devcamp to set this module as stable. I will present the new TakePOS connector in the devcamp too, and requires this module. What a pity, the devcamp was canceled.
2020-11-10 22:19:46 +01:00
Laurent Destailleur
db08786ddf
Add missing properties
2020-11-10 20:13:54 +01:00
Laurent Destailleur
29f0a9b784
Fix in select of user when firstname and lastname is empty
2020-11-10 15:03:35 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
...
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
f8ddad4d4c
Fix warning
2020-11-10 13:20:45 +01:00
Laurent Destailleur
47b3b30aaa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
Laurent Destailleur
73df033000
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/boxes/box_birthdays.php
2020-11-10 11:05:53 +01:00
quentin
fb27c98f9c
FIX : handling $heightforinfotot when he's superior to a page height
2020-11-10 09:40:45 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
0f90cee597
Fix missing fields
2020-11-09 15:15:21 +01:00
Laurent Destailleur
5be634cbd4
Clean code
2020-11-09 11:34:58 +01:00
Laurent Destailleur
5d5bbb2b5e
Fix warning
2020-11-09 09:55:32 +01:00
Laurent Destailleur
807d3b99c9
Fix update field when visilbity is 4 or -4
2020-11-09 09:53:56 +01:00
Laurent Destailleur
fc49583efe
Removed warning
2020-11-09 09:18:06 +01:00
lvessiller
279b4309b9
NEW include "extrafields_list_array_fields" tpl in module builder
2020-11-09 08:51:11 +01:00
Laurent Destailleur
8802bd4a91
Fix warning
2020-11-08 18:56:02 +01:00
Laurent Destailleur
26b8e8d2bf
More logs
2020-11-08 18:52:26 +01:00
Laurent Destailleur
daa4d33d5b
Fix trackid
2020-11-08 14:41:26 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
1c1a9a5463
Fix log
2020-11-08 12:57:56 +01:00
Laurent Destailleur
191c289253
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-08 12:57:09 +01:00
