Laurent Destailleur
|
ffb81d5acc
|
Merge pull request #16905 from dolibit-ut/patch-138
Create index.html
|
2021-03-21 21:46:49 +01:00 |
|
Laurent Destailleur
|
fa82f2161f
|
Merge pull request #16915 from dolibit-ut/patch-148
Create index.html
|
2021-03-21 21:46:43 +01:00 |
|
Laurent Destailleur
|
7f9199691a
|
Merge pull request #16908 from dolibit-ut/patch-141
Create index.html
|
2021-03-21 21:46:36 +01:00 |
|
Laurent Destailleur
|
4f025e419e
|
Merge pull request #16901 from dolibit-ut/patch-134
Create index.html
|
2021-03-21 21:46:29 +01:00 |
|
Laurent Destailleur
|
92b5d12574
|
Merge pull request #16903 from dolibit-ut/patch-136
Create index.html
|
2021-03-21 21:46:21 +01:00 |
|
Laurent Destailleur
|
2a25f3096c
|
Merge pull request #16902 from dolibit-ut/patch-135
Create index.html
|
2021-03-21 21:46:14 +01:00 |
|
Laurent Destailleur
|
449315c225
|
Merge pull request #16904 from dolibit-ut/patch-137
Create index.html
|
2021-03-21 21:46:07 +01:00 |
|
Laurent Destailleur
|
5ccbd62fc8
|
Merge pull request #16906 from dolibit-ut/patch-139
Create index.html
|
2021-03-21 21:45:59 +01:00 |
|
Laurent Destailleur
|
b798321f09
|
Merge pull request #16913 from dolibit-ut/patch-146
Create index.html
|
2021-03-21 21:45:53 +01:00 |
|
Laurent Destailleur
|
84487e4ef8
|
Merge pull request #16907 from dolibit-ut/patch-140
Create index.html
|
2021-03-21 21:45:46 +01:00 |
|
Laurent Destailleur
|
472fe901a7
|
Merge pull request #16909 from dolibit-ut/patch-142
Create index.html
|
2021-03-21 21:45:39 +01:00 |
|
Laurent Destailleur
|
ddea352092
|
Merge pull request #16910 from dolibit-ut/patch-143
Create index.html
|
2021-03-21 21:45:32 +01:00 |
|
Laurent Destailleur
|
d9ec217210
|
Merge pull request #16912 from dolibit-ut/patch-145
Create index.html
|
2021-03-21 21:45:25 +01:00 |
|
Laurent Destailleur
|
a78e62a16e
|
Merge pull request #16914 from dolibit-ut/patch-147
Create index.html
|
2021-03-21 21:45:18 +01:00 |
|
UT from dolibit
|
9eb50eee00
|
Create index.html
|
2021-03-21 21:40:37 +01:00 |
|
UT from dolibit
|
0241e2d449
|
Create index.html
|
2021-03-21 21:38:53 +01:00 |
|
UT from dolibit
|
98c2c59486
|
Create index.html
|
2021-03-21 21:36:41 +01:00 |
|
UT from dolibit
|
39190dc07f
|
Create index.html
|
2021-03-21 21:34:21 +01:00 |
|
UT from dolibit
|
5b028d192d
|
Create index.html
|
2021-03-21 21:33:39 +01:00 |
|
UT from dolibit
|
9925cdcbee
|
Create index.html
|
2021-03-21 21:32:35 +01:00 |
|
UT from dolibit
|
d0cace4f2c
|
Create index.html
|
2021-03-21 21:32:05 +01:00 |
|
UT from dolibit
|
50672bfe31
|
Create index.html
|
2021-03-21 21:19:54 +01:00 |
|
UT from dolibit
|
2a069a0a2c
|
Create index.html
|
2021-03-21 21:19:12 +01:00 |
|
UT from dolibit
|
4b3b4d072a
|
Create index.html
|
2021-03-21 21:17:12 +01:00 |
|
UT from dolibit
|
2f957667ed
|
Create index.html
|
2021-03-21 21:16:32 +01:00 |
|
UT from dolibit
|
163b960da9
|
Create index.html
|
2021-03-21 21:15:40 +01:00 |
|
UT from dolibit
|
8ec3c4a5b5
|
Create index.html
|
2021-03-21 21:14:52 +01:00 |
|
UT from dolibit
|
21a2b4e222
|
Create index.html
|
2021-03-21 21:13:33 +01:00 |
|
ptibogxiv
|
6d26b4aec3
|
Update notify.class.php
|
2021-03-21 21:11:39 +01:00 |
|
UT from dolibit
|
e4921fa843
|
Create index.html
|
2021-03-21 21:11:01 +01:00 |
|
UT from dolibit
|
c0e7800251
|
Create index.html
|
2021-03-21 21:10:13 +01:00 |
|
UT from dolibit
|
ae91f3be63
|
Create index.html
|
2021-03-21 21:07:25 +01:00 |
|
Laurent Destailleur
|
800eeef868
|
Clean code
|
2021-03-21 18:20:37 +01:00 |
|
Laurent Destailleur
|
3c8bf2167b
|
Debug permissions
|
2021-03-21 18:01:43 +01:00 |
|
Laurent Destailleur
|
af199189b3
|
NEW Add color and picto for direction of movement
|
2021-03-21 13:46:01 +01:00 |
|
Laurent Destailleur
|
eeb1c5d884
|
Replace deprecated code
|
2021-03-20 21:46:10 +01:00 |
|
Laurent Destailleur
|
2b3599dba5
|
Clean code
|
2021-03-20 21:29:36 +01:00 |
|
Laurent Destailleur
|
70be2dbcf0
|
Fix regression in tests
|
2021-03-20 20:51:19 +01:00 |
|
Laurent Destailleur
|
9900429fd0
|
Merge pull request #16889 from frederic34/adherent_to_member
rename files from adherent to member
|
2021-03-20 20:37:44 +01:00 |
|
Laurent Destailleur
|
8f6f8248a3
|
Merge pull request #16885 from daraelmin/daraelmin-patch-4
#Fix #16767 unremovable attached file in mailmodel
|
2021-03-20 19:51:26 +01:00 |
|
Laurent Destailleur
|
861a5becf1
|
Merge pull request #16884 from daraelmin/daraelmin-patch-3
#Fix #16767 v13 unremovable attached file in mailmodel
|
2021-03-20 19:51:07 +01:00 |
|
Laurent Destailleur
|
e330c0f91a
|
Merge pull request #16883 from aspangaro/14a28
Uniformize information on modules
|
2021-03-20 19:49:33 +01:00 |
|
Laurent Destailleur
|
a2b3afb511
|
Merge branch 'develop' into 14a22
|
2021-03-20 19:48:43 +01:00 |
|
Laurent Destailleur
|
46aa01aea0
|
Fix permission on export of BOM and website
|
2021-03-20 19:15:15 +01:00 |
|
Frédéric FRANCE
|
d2f7d3064d
|
can use $conf->member
|
2021-03-20 19:09:49 +01:00 |
|
Frédéric FRANCE
|
f6e7285949
|
rename files from adherent to member
|
2021-03-20 19:06:15 +01:00 |
|
daraelmin
|
cb71936ccd
|
#Fix #16767 unremovable attached file in mailmodel
#Fix #16767 make default attached file of a mail model selected removable
|
2021-03-20 14:10:56 +01:00 |
|
daraelmin
|
2d7f858c1a
|
#Fix #16767 unremovable attached file in mailmodel
#Fix #16767 unremovable attached file in mailmodel
|
2021-03-20 14:04:20 +01:00 |
|
Alexandre SPANGARO
|
3669c374c2
|
Uniformize information on modules
|
2021-03-20 13:55:43 +01:00 |
|
Laurent Destailleur
|
e334e83a64
|
Merge branch 'develop' into 14a22
|
2021-03-20 13:42:54 +01:00 |
|
Laurent Destailleur
|
e1f23105a6
|
Finally try to follow install per entity instead of per instance.
|
2021-03-20 12:49:44 +01:00 |
|
Laurent Destailleur
|
65bf47b693
|
Merge pull request #16845 from hregis/fix_warning_php8
FIX avoid php8 warning with multicompany
|
2021-03-20 12:46:02 +01:00 |
|
stickler-ci
|
625f72303b
|
Fixing style errors.
|
2021-03-20 11:43:13 +00:00 |
|
Laurent Destailleur
|
d8aa5f5eab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-20 12:43:07 +01:00 |
|
Laurent Destailleur
|
3d3a7bfd37
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2021-03-20 12:42:46 +01:00 |
|
Regis Houssin
|
29e090b025
|
FIX force to entity 0 for all entities
|
2021-03-20 12:35:41 +01:00 |
|
Regis Houssin
|
573ca669da
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8
|
2021-03-20 12:11:12 +01:00 |
|
Laurent Destailleur
|
ee84bef3b2
|
Merge pull request #16828 from frederic34/membersboxfix
fix new boxes add
|
2021-03-20 11:52:19 +01:00 |
|
Laurent Destailleur
|
2da85a9ca2
|
Merge pull request #16842 from hregis/fix_avoid_warning_php8
FIX avoid php8 warning in products list
|
2021-03-20 11:48:53 +01:00 |
|
Laurent Destailleur
|
285b166b12
|
Merge pull request #16849 from frederic34/ecmindex
fix php8 warnings
|
2021-03-20 11:37:00 +01:00 |
|
Laurent Destailleur
|
3cc8a8e2ee
|
Merge pull request #16850 from frederic34/patch-4
fix php8 warning
|
2021-03-20 11:28:47 +01:00 |
|
Laurent Destailleur
|
e54ca79a8c
|
Merge pull request #16854 from frederic34/confglobal
get conf global function
|
2021-03-20 11:26:32 +01:00 |
|
Laurent Destailleur
|
25f1b82c34
|
Merge pull request #16859 from frederic34/patch-11
fix doxygen
|
2021-03-20 11:24:50 +01:00 |
|
Laurent Destailleur
|
5f0a2e648b
|
Merge pull request #16871 from frederic34/patch-19
fix doxygen
|
2021-03-20 11:15:48 +01:00 |
|
Laurent Destailleur
|
685ec0bc63
|
Merge pull request #16872 from frederic34/patch-22
fix doxygen
|
2021-03-20 11:15:32 +01:00 |
|
Laurent Destailleur
|
3ce4762710
|
Merge pull request #16873 from frederic34/patch-23
fix doxygen
|
2021-03-20 11:15:22 +01:00 |
|
Laurent Destailleur
|
bc639045c0
|
Merge pull request #16874 from frederic34/patch-24
fix doxygen
|
2021-03-20 11:15:12 +01:00 |
|
Laurent Destailleur
|
810b15f73a
|
Merge pull request #16875 from frederic34/patch-25
fix doxygen
|
2021-03-20 11:14:57 +01:00 |
|
Laurent Destailleur
|
1d2b3a0967
|
Merge pull request #16876 from frederic34/patch-26
fix doxygen
|
2021-03-20 11:12:46 +01:00 |
|
Frédéric FRANCE
|
8142d76394
|
fix php8 warnings
|
2021-03-20 10:50:02 +01:00 |
|
Frédéric FRANCE
|
65c3dced1c
|
fix doxygen
|
2021-03-20 10:34:23 +01:00 |
|
Frédéric FRANCE
|
5da597d947
|
fix doxygen
|
2021-03-20 10:32:18 +01:00 |
|
Frédéric FRANCE
|
a8d8775328
|
fix doxygen
|
2021-03-20 10:30:26 +01:00 |
|
Frédéric FRANCE
|
dad7038a0d
|
fix doxygen
|
2021-03-20 10:22:34 +01:00 |
|
Frédéric FRANCE
|
49ff44e414
|
fix doxygen
|
2021-03-20 10:21:23 +01:00 |
|
Frédéric FRANCE
|
8af1f278ae
|
fix doxygen
|
2021-03-20 10:19:03 +01:00 |
|
Laurent Destailleur
|
b5264e978b
|
Merge pull request #16776 from frederic34/boxticket
fix php8 warnings
|
2021-03-20 10:14:34 +01:00 |
|
Frédéric FRANCE
|
1a2b22def4
|
fix doxygen
|
2021-03-20 09:14:52 +01:00 |
|
Alexandre SPANGARO
|
17d3b85ec4
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-20 07:47:54 +01:00 |
|
Alexandre SPANGARO
|
00e21caa42
|
NEW: Add a sub table to manage accountancy on product/company
|
2021-03-20 07:42:16 +01:00 |
|
Frédéric FRANCE
|
4c5ddc44dc
|
get conf global function
|
2021-03-19 17:58:01 +01:00 |
|
Frédéric FRANCE
|
93ae7a3fed
|
fix php8 warning
|
2021-03-19 17:01:14 +01:00 |
|
Frédéric FRANCE
|
239dae03bf
|
fix php8 warnings
|
2021-03-19 16:57:12 +01:00 |
|
Laurent Destailleur
|
be90f5f2de
|
Fix id of advanced perm
|
2021-03-19 15:00:22 +01:00 |
|
Laurent Destailleur
|
8462c4d3d3
|
Clean menu
|
2021-03-19 13:37:43 +01:00 |
|
Laurent Destailleur
|
aef2f1713e
|
FIX #yogosha5673
|
2021-03-19 13:25:58 +01:00 |
|
Laurent Destailleur
|
ebf409f831
|
FIX #yogosha5668
|
2021-03-19 12:08:40 +01:00 |
|
stickler-ci
|
08727a86b0
|
Fixing style errors.
|
2021-03-19 10:53:06 +00:00 |
|
ptibogxiv
|
d38f7f7dfe
|
NEW auto notification with templated emails
|
2021-03-19 11:50:15 +01:00 |
|
Regis Houssin
|
43e1dbb9ef
|
FIX avoid php8 warning with multicompany
|
2021-03-19 11:27:31 +01:00 |
|
stickler-ci
|
ee701bb480
|
Fixing style errors.
|
2021-03-19 09:05:20 +00:00 |
|
Regis Houssin
|
a1f6886e97
|
FIX avoid php8 warning in products list
|
2021-03-19 10:01:40 +01:00 |
|
Frédéric FRANCE
|
7183bfeb94
|
fix new boxes add
|
2021-03-19 09:15:35 +01:00 |
|
Laurent Destailleur
|
b9aacca771
|
Fix css
|
2021-03-19 00:04:43 +01:00 |
|
Laurent Destailleur
|
78aec3daae
|
Removed option MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES. The
implmentation did not make any test on subsidiaries. It has same effect
than being an internal user.
|
2021-03-19 00:00:06 +01:00 |
|
Laurent Destailleur
|
e9f9cf62af
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-18 23:59:03 +01:00 |
|
Laurent Destailleur
|
3785346835
|
Revert " fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject"
|
2021-03-18 23:57:48 +01:00 |
|
Laurent Destailleur
|
ce4aadba84
|
Merge branch 'develop' into abb120359
|
2021-03-18 23:54:27 +01:00 |
|
Laurent Destailleur
|
5ecef1bad3
|
Merge pull request #16739 from altairisfr/pr_searchbatch
NEW Add search on lots or serials into quick search bar
|
2021-03-18 23:43:23 +01:00 |
|
Laurent Destailleur
|
27c7950417
|
Fix migration of boxes
|
2021-03-18 23:39:19 +01:00 |
|
Frédéric FRANCE
|
5b253eeb47
|
fix the fix
|
2021-03-18 23:30:42 +01:00 |
|
Laurent Destailleur
|
5037de49c4
|
Merge pull request #16773 from frederic34/patch-5
fix php8 warning
|
2021-03-18 23:19:32 +01:00 |
|
Laurent Destailleur
|
b66173a111
|
Merge pull request #16771 from frederic34/projet_task_stats
fix php8 warnings
|
2021-03-18 23:15:37 +01:00 |
|
Laurent Destailleur
|
dc0482e98c
|
Merge pull request #16774 from frederic34/php8-fix-functionlib
fix php8 warnings
|
2021-03-18 23:13:12 +01:00 |
|
Laurent Destailleur
|
0c882739e3
|
Merge pull request #16777 from frederic34/patch-8
fix php8 warning
|
2021-03-18 23:10:59 +01:00 |
|
Laurent Destailleur
|
63b78af05f
|
Merge pull request #16778 from frederic34/patch-9
fix php8 warning
|
2021-03-18 23:10:20 +01:00 |
|
Laurent Destailleur
|
1ecb2ed342
|
Merge pull request #16780 from frederic34/patch-11
fix php8 warning
|
2021-03-18 23:09:54 +01:00 |
|
Laurent Destailleur
|
a200f6f6ea
|
Merge pull request #16785 from frederic34/fixextrafieldsadmin
fix php8 warning
|
2021-03-18 23:08:15 +01:00 |
|
Laurent Destailleur
|
319fe108fc
|
Merge pull request #16811 from frederic34/patch-19
fix php8 warning
|
2021-03-18 22:53:56 +01:00 |
|
Laurent Destailleur
|
f78b4b903d
|
Merge pull request #16795 from frederic34/patch-18
fix php7.4 php8 warning when upgrade reloads modules
|
2021-03-18 22:53:44 +01:00 |
|
Frédéric FRANCE
|
37fcaf2a57
|
fix php8 warning
|
2021-03-18 22:07:35 +01:00 |
|
Frédéric FRANCE
|
b584adf299
|
fix project replace projet
|
2021-03-18 21:10:55 +01:00 |
|
Frédéric FRANCE
|
c43d3dff92
|
fix project replace projet
|
2021-03-18 20:51:40 +01:00 |
|
Frédéric FRANCE
|
3380f740e5
|
need to clean glasses
|
2021-03-18 18:56:28 +01:00 |
|
Frédéric FRANCE
|
f810fffc01
|
fix php8 wzrning
|
2021-03-18 18:50:38 +01:00 |
|
Florian HENRY
|
df4a243f18
|
fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature
|
2021-03-18 17:13:34 +01:00 |
|
Alexandre SPANGARO
|
18d247026d
|
NEW: Add a sub table to manage product/societe
|
2021-03-18 17:08:55 +01:00 |
|
Frédéric FRANCE
|
1b4b48a634
|
fix php8 warning when upgrade reloads modules
|
2021-03-18 13:18:50 +01:00 |
|
Laurent Destailleur
|
ac6b6f22e7
|
Enhance sanitizing of data
|
2021-03-18 11:39:23 +01:00 |
|
Frédéric FRANCE
|
75cf5e3599
|
fix php8 warning
|
2021-03-17 23:55:46 +01:00 |
|
Frédéric FRANCE
|
22ac6c79b3
|
fix php8 warning
|
2021-03-17 22:29:33 +01:00 |
|
Frédéric FRANCE
|
00cd4cd953
|
fix php8 warning
|
2021-03-17 22:19:40 +01:00 |
|
Frédéric FRANCE
|
da3fcf3ca5
|
fix php8 warning
|
2021-03-17 22:16:54 +01:00 |
|
Laurent Destailleur
|
31478d5ac0
|
Look and feel v14
|
2021-03-17 22:01:25 +01:00 |
|
Frédéric FRANCE
|
0080d42b66
|
fix php8 warnings
|
2021-03-17 21:49:05 +01:00 |
|
Laurent Destailleur
|
35869f1449
|
Add function dol_string_onlythesehtmlattributes() and option
MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to enable it.
|
2021-03-17 21:39:28 +01:00 |
|
Frédéric FRANCE
|
9609c3095a
|
fix php8 warnings
|
2021-03-17 20:13:20 +01:00 |
|
Frédéric FRANCE
|
fced63e93b
|
fix php8 warning
|
2021-03-17 20:11:22 +01:00 |
|
Frédéric FRANCE
|
efaa2be3b8
|
fix php8 warnings
|
2021-03-17 18:38:24 +01:00 |
|
Laurent Destailleur
|
24576897ef
|
Merge pull request #16750 from frederic34/restrictiononfksoc
fix php8 warnings
|
2021-03-17 17:05:23 +01:00 |
|
Laurent Destailleur
|
8829d42e1d
|
Merge pull request #16742 from frederic34/fix-php8-20210306
Fix php8
|
2021-03-17 16:58:05 +01:00 |
|
Laurent Destailleur
|
09f8ccd882
|
Merge pull request #16753 from frederic34/patch-12
fix php8 warning
|
2021-03-17 16:56:10 +01:00 |
|
Laurent Destailleur
|
36cb213a83
|
Merge pull request #16764 from hregis/fix_php_8_warning_again
FIX avoid php 8.x warning
|
2021-03-17 16:50:21 +01:00 |
|
Laurent Destailleur
|
33c3b9d1a3
|
Merge pull request #16763 from hregis/fix_avoid_php_8_warning
FIX avoid php 8 warning
|
2021-03-17 16:50:08 +01:00 |
|
Regis Houssin
|
4d149dc3fe
|
FIX avoid php 8.x warning
|
2021-03-17 15:15:51 +01:00 |
|
Regis Houssin
|
5fc40f2b12
|
FIX avoid php 8 warning
|
2021-03-17 14:32:25 +01:00 |
|
Regis Houssin
|
bb4c8d9114
|
FIX avoid warning with php 8
|
2021-03-17 12:48:59 +01:00 |
|
Laurent Destailleur
|
8de1b4c94e
|
Factorize code
|
2021-03-17 11:34:19 +01:00 |
|
Frédéric FRANCE
|
dde51a23f0
|
fix php8 warning
sometimes $size == '' and cause warnings later in the code
|
2021-03-16 22:01:59 +01:00 |
|
Frédéric FRANCE
|
4e8ea5c07e
|
fix php8 warnings
|
2021-03-16 21:13:15 +01:00 |
|
Frédéric FRANCE
|
e1ad7013d9
|
fix php8
|
2021-03-16 17:47:24 +01:00 |
|
Christophe Battarel
|
f59c19b573
|
search on lots or serials
|
2021-03-16 16:50:59 +01:00 |
|
Laurent Destailleur
|
e366d2c379
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
|
2021-03-16 14:57:04 +01:00 |
|
Laurent Destailleur
|
f514dec6ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
|
2021-03-16 14:50:06 +01:00 |
|
Bahfir Abbes
|
9c51e62d0f
|
Update security.lib.php
MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES
|
2021-03-16 12:25:17 +01:00 |
|
Laurent Destailleur
|
017120f017
|
Merge pull request #16697 from frederic34/patch-3
fix syntax
|
2021-03-16 10:42:49 +01:00 |
|
Laurent Destailleur
|
71e7f10a54
|
FIX #16698
|
2021-03-16 10:39:10 +01:00 |
|
Laurent Destailleur
|
87ab711a0f
|
Merge pull request #16707 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-16 10:34:55 +01:00 |
|
Laurent Destailleur
|
a357ab0ee7
|
Merge pull request #16708 from frederic34/patch-4
fix php8 warning
|
2021-03-16 10:34:02 +01:00 |
|
Laurent Destailleur
|
897f4be033
|
Merge pull request #16712 from frederic34/patch-9
fix php8 warnings
|
2021-03-16 10:33:01 +01:00 |
|
Laurent Destailleur
|
401aeb8a7f
|
Merge pull request #16706 from frederic34/htmlforcc
decompose code
|
2021-03-16 10:32:44 +01:00 |
|
Laurent Destailleur
|
462164a5a8
|
Merge pull request #16709 from frederic34/patch-5
fix php8 warnings
|
2021-03-16 10:31:53 +01:00 |
|
Florian HENRY
|
9d8254eff4
|
fix price output in commoncard
|
2021-03-16 09:59:45 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +01:00 |
|
Frédéric FRANCE
|
2d741a33f0
|
fix php8 warning
|
2021-03-15 21:03:54 +01:00 |
|
Frédéric FRANCE
|
f7d43ce4fb
|
fix php8 warnings
|
2021-03-15 20:55:59 +01:00 |
|
Frédéric FRANCE
|
a0e6f454ff
|
fix php8 warnings
|
2021-03-15 20:31:55 +01:00 |
|
Frédéric FRANCE
|
c437b2d5c9
|
fix php8 warning
Undefined property: stdClass::$fin_validite
Undefined property: stdClass::$date_cloture
$dateterm, $dateclose, $late not used
|
2021-03-15 20:28:37 +01:00 |
|
Florian HENRY
|
177a6bfe4f
|
conference or booth card and list ok
|
2021-03-15 20:20:53 +01:00 |
|
Frédéric FRANCE
|
e89cfc3753
|
decompose code
|
2021-03-15 20:17:01 +01:00 |
|
Frédéric FRANCE
|
910b4f1daf
|
Update html.formmail.class.php
|
2021-03-15 18:58:35 +01:00 |
|
Frédéric FRANCE
|
dd4b8f2880
|
Update html.formmail.class.php
|
2021-03-15 18:22:50 +01:00 |
|
Florian HENRY
|
17c49e6ce9
|
ongoinf card and list
|
2021-03-15 18:06:23 +01:00 |
|
Laurent Destailleur
|
1e323b302e
|
Merge pull request #16684 from frederic34/patch-3
fix php8 warning
|
2021-03-15 17:14:42 +01:00 |
|
Laurent Destailleur
|
a8c34a5b05
|
Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
MAIN_EXTRAFIELDS_DISABLE_SELECT2
|
2021-03-15 14:16:55 +01:00 |
|
Frédéric FRANCE
|
d4eecf3eb2
|
fix php8 warning
|
2021-03-15 13:51:54 +01:00 |
|
Laurent Destailleur
|
3964801d40
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2021-03-15 13:26:20 +01:00 |
|
Laurent Destailleur
|
2129adf129
|
Add more fields to llx_oauth_token
|
2021-03-15 13:25:08 +01:00 |
|
Laurent Destailleur
|
85eaec48e1
|
Merge pull request #16307 from aspangaro/14a15
NEW: VAT report - Optimisation & collapse by rate
|
2021-03-15 11:56:06 +01:00 |
|
Christophe Battarel
|
090dc4f28a
|
Merge branch 'develop' into pr_batch_masks
|
2021-03-15 11:42:33 +01:00 |
|
Laurent Destailleur
|
7d1e18f5ab
|
Merge pull request #16625 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-15 11:37:57 +01:00 |
|
Frédéric FRANCE
|
15c751ae89
|
Merge remote-tracking branch 'upstream/develop' into php8-fix
|
2021-03-15 11:18:41 +01:00 |
|
Laurent Destailleur
|
21400b96fa
|
Merge pull request #16656 from frederic34/patch-11
remove dol_buildpath
|
2021-03-15 11:08:01 +01:00 |
|
Laurent Destailleur
|
007201ea64
|
Merge pull request #16662 from frederic34/patch-17
fix php8 warning
|
2021-03-15 11:06:38 +01:00 |
|
Laurent Destailleur
|
7b61f756f8
|
Merge pull request #16659 from frederic34/patch-14
fix php8 warnings
|
2021-03-15 11:05:53 +01:00 |
|
Laurent Destailleur
|
b7c7bd8d94
|
Merge pull request #16666 from frederic34/patch-21
fix php8 warning
|
2021-03-15 11:03:20 +01:00 |
|
Laurent Destailleur
|
57f9607e3e
|
Update accounting.lib.php
|
2021-03-15 11:01:01 +01:00 |
|
Laurent Destailleur
|
e7205a4f79
|
Merge pull request #16677 from frederic34/patch-31
fix php8 warning
|
2021-03-15 10:55:01 +01:00 |
|
Laurent Destailleur
|
26e8a9c795
|
Code comment
|
2021-03-15 10:08:02 +01:00 |
|
Frédéric FRANCE
|
e8b994ece5
|
fix php8 warning
|
2021-03-15 00:40:10 +01:00 |
|
Laurent Destailleur
|
382b810ba1
|
Fix phpcs
|
2021-03-15 00:18:26 +01:00 |
|
Laurent Destailleur
|
1d2929e3f5
|
Clean code
|
2021-03-15 00:01:55 +01:00 |
|
Frédéric FRANCE
|
abd9a639a2
|
fix php8 warning
|
2021-03-14 23:41:06 +01:00 |
|
Laurent Destailleur
|
9aa8916a9c
|
Disallow use of &# into dol_sanitizeUrl()
|
2021-03-14 20:35:55 +01:00 |
|
Frédéric FRANCE
|
bbb0d9acc4
|
fix php8 warning
|
2021-03-14 20:31:13 +01:00 |
|
Laurent Destailleur
|
45579edd43
|
Enhance WAF and dol_sanitizeUrl
|
2021-03-14 18:57:18 +01:00 |
|
Frédéric FRANCE
|
0cbf57327b
|
fiw php8 warnings
|
2021-03-14 18:18:21 +01:00 |
|
Frédéric FRANCE
|
220b1539f7
|
Update cron.lib.php
|
2021-03-14 17:36:27 +01:00 |
|
Laurent Destailleur
|
c2a86e71be
|
fix phpv8
|
2021-03-14 16:44:11 +01:00 |
|
Laurent Destailleur
|
4965ce8768
|
Fix method to sanitize an URL
|
2021-03-14 16:14:24 +01:00 |
|
Laurent Destailleur
|
74a61d559f
|
FIX sanitizing with GETPOST(alphanohtml) #yogosha5629
|
2021-03-14 15:39:59 +01:00 |
|
Laurent Destailleur
|
72766c830d
|
FIX #Yogosha5631
|
2021-03-14 15:06:40 +01:00 |
|
Laurent Destailleur
|
95006ec94c
|
Fix sanitizing backtopage
|
2021-03-14 12:58:37 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Laurent Destailleur
|
0a542ad9f9
|
Fix redirect to external website. Bad sanitizing of backtopage parameter
|
2021-03-14 11:38:42 +01:00 |
|
Laurent Destailleur
|
bcfe711544
|
Fix redirect to extern url
|
2021-03-13 19:20:34 +01:00 |
|
Laurent Destailleur
|
5faecef0e1
|
Look and feel v14
|
2021-03-13 18:56:02 +01:00 |
|
Frédéric FRANCE
|
c3c03e9de3
|
fix php8 fatal error
|
2021-03-13 18:42:50 +01:00 |
|
Laurent Destailleur
|
0dfe79e619
|
CSS
|
2021-03-13 14:10:07 +01:00 |
|
Laurent Destailleur
|
8c6fe6f29b
|
Merge pull request #16638 from frederic34/patch-5
go back actioncomm create after create project
|
2021-03-12 20:19:30 +01:00 |
|
Laurent Destailleur
|
aa26f873ff
|
Merge pull request #16634 from mrtnnbr/develop
Add UPC support to built-in barcode generator
|
2021-03-12 20:16:45 +01:00 |
|
stickler-ci
|
f507df994b
|
Fixing style errors.
|
2021-03-12 18:07:16 +00:00 |
|
Frédéric FRANCE
|
6be6e306b1
|
Update interface_50_modEventOrganization_EventOrganization.class.php
|
2021-03-12 19:05:03 +01:00 |
|
Laurent Destailleur
|
af5db0f5fa
|
Look and feel v14
|
2021-03-12 15:34:31 +01:00 |
|
Martin Neubauer
|
85eb82c8c3
|
Tweak offsets for UPC barcode text
|
2021-03-12 14:44:04 +01:00 |
|
Christophe Battarel
|
c339af533d
|
fix conflict
|
2021-03-12 14:15:55 +01:00 |
|
Martin Neubauer
|
0db65597fd
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2021-03-12 13:58:00 +01:00 |
|
Martin Neubauer
|
09cedb5a5e
|
ISBN might start with 979 these days
|
2021-03-12 13:55:39 +01:00 |
|
Martin Neubauer
|
5aaeb6742c
|
Add UPC support to built-in barcode generator
|
2021-03-12 13:54:27 +01:00 |
|
Frédéric FRANCE
|
7a2e28497d
|
fix number is already used doesn't propose new code with elephant
|
2021-03-12 13:14:53 +01:00 |
|
Martin Neubauer
|
7b59a3ac2b
|
Factor out generating EAN bars
|
2021-03-12 13:11:17 +01:00 |
|
Laurent Destailleur
|
777ba369c4
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-12 12:44:25 +01:00 |
|
Laurent Destailleur
|
f9918dd51f
|
Code comment
|
2021-03-12 11:50:48 +01:00 |
|
Laurent Destailleur
|
aee3fda3d1
|
Merge pull request #16280 from bafbes/abb120358
New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users
|
2021-03-12 11:14:31 +01:00 |
|
Regis Houssin
|
5375add08c
|
FIX just add mp4
|
2021-03-12 08:41:56 +01:00 |
|
Regis Houssin
|
290f49a3e0
|
FIX wrong extension
|
2021-03-12 08:39:36 +01:00 |
|
Regis Houssin
|
05532ca6b7
|
FIX missing video mime
|
2021-03-12 08:35:13 +01:00 |
|
Florian HENRY
|
f17aa47ad6
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft
|
2021-03-11 22:03:51 +01:00 |
|
Laurent Destailleur
|
fc08c48bf3
|
Merge pull request #16591 from Givriz/dev
Replace gender and civility by a picto
|
2021-03-11 21:36:16 +01:00 |
|
Laurent Destailleur
|
b7a66769bb
|
Merge pull request #16603 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-11 21:35:39 +01:00 |
|
Laurent Destailleur
|
e8bbef8d2d
|
Update interface_50_modEventOrganization_EventOrganization.class.php
|
2021-03-11 21:35:22 +01:00 |
|
Florian HENRY
|
862926316a
|
working on list
|
2021-03-11 19:09:42 +01:00 |
|
Damien BENOIT
|
420a3a73dd
|
Update html.form.class.php
|
2021-03-11 18:15:22 +01:00 |
|
Florian HENRY
|
3ae93679cf
|
Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft
|
2021-03-11 16:59:13 +01:00 |
|
Florian HENRY
|
6742241639
|
better tranaction and condition
|
2021-03-11 16:55:49 +01:00 |
|
stickler-ci
|
345fe648b3
|
Fixing style errors.
|
2021-03-11 15:37:27 +00:00 |
|
Laurent Destailleur
|
c596eb91a8
|
Merge branch 'develop' into abb120358
|
2021-03-11 16:35:21 +01:00 |
|
Christophe Battarel
|
229c581a25
|
try to fix sticker
|
2021-03-11 11:30:12 +01:00 |
|
Christophe Battarel
|
e8aacc7acf
|
try to fix sticker
|
2021-03-11 11:12:03 +01:00 |
|
Christophe Battarel
|
ba51c5dc70
|
differentiate masks for lot management and serial numbers management
|
2021-03-11 10:44:55 +01:00 |
|
lmarcouiller
|
9aa20585be
|
Fix #16617 : fix event add when removing boxes
|
2021-03-11 10:10:20 +01:00 |
|
Christophe Battarel
|
2c711f1a2d
|
add masks for batch
|
2021-03-11 10:02:31 +01:00 |
|
Bahfir Abbes
|
0158cbb893
|
Update security.lib.php
|
2021-03-11 04:02:30 +01:00 |
|
Laurent Destailleur
|
3007141b2b
|
Fix phpcs
|
2021-03-10 20:40:34 +01:00 |
|
Laurent Destailleur
|
82d5c7289d
|
Add property widgettype
|
2021-03-10 17:02:39 +01:00 |
|
Damien BENOIT
|
2b33bb2d04
|
Merge pull request #11 from Dolibarr/develop
Update fork
|
2021-03-10 16:53:35 +01:00 |
|
Laurent Destailleur
|
521e3b20dc
|
Rename widget
|
2021-03-10 16:44:46 +01:00 |
|
Damien BENOIT
|
93675082d7
|
Update html.form.class.php
|
2021-03-10 16:42:14 +01:00 |
|
Laurent Destailleur
|
c2200e6ffd
|
Clean code
|
2021-03-10 16:41:48 +01:00 |
|
Givriz
|
6e46396b17
|
Ajout de picto pour le genre et la civilité
|
2021-03-10 16:31:50 +01:00 |
|
Laurent Destailleur
|
514a9fb96a
|
Merge pull request #16561 from Hystepik/develop#1
Close #15917 : Improvement to ticket module
|
2021-03-10 15:49:20 +01:00 |
|
Laurent Destailleur
|
9ed128c6fa
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/class/html.formaccounting.class.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/langs/en_US/errors.lang
htdocs/product/card.php
|
2021-03-10 15:35:09 +01:00 |
|
Laurent Destailleur
|
680f6257a0
|
FIX warning if setup of chart of account is not yet done.
|
2021-03-10 11:04:28 +01:00 |
|
Laurent Destailleur
|
b1f4c29fde
|
Fix missing alias
|
2021-03-09 20:12:14 +01:00 |
|
Florian HENRY
|
7aec2fc02b
|
create task
|
2021-03-09 18:52:52 +01:00 |
|
Laurent Destailleur
|
b778820fe2
|
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList
Dev allow alias in common object get filed list
|
2021-03-09 16:54:22 +01:00 |
|
Laurent Destailleur
|
9cb4dce485
|
Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing
|
2021-03-09 16:12:30 +01:00 |
|
Laurent Destailleur
|
1fe90091b6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-09 15:35:25 +01:00 |
|
Laurent Destailleur
|
cf30e90b93
|
Work on inventory
|
2021-03-09 15:35:10 +01:00 |
|
Laurent Destailleur
|
3cb072f67a
|
Update commonobject.class.php
|
2021-03-09 15:13:20 +01:00 |
|
Laurent Destailleur
|
b822f04cbb
|
Merge pull request #16593 from frederic34/patch-3
fix unknown variable
|
2021-03-09 15:08:11 +01:00 |
|
Laurent Destailleur
|
1b3aae1984
|
Fix regression
|
2021-03-09 12:17:32 +01:00 |
|
Laurent Destailleur
|
53f8ff060a
|
Fix phpcs
|
2021-03-09 10:40:22 +01:00 |
|
Florian HENRY
|
ce5324c08c
|
Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList
|
2021-03-09 10:24:07 +01:00 |
|
Florian HENRY
|
bcbf8bb72a
|
allow table alias into commonObject getFieldList
|
2021-03-09 10:21:32 +01:00 |
|
Frédéric FRANCE
|
de1cf54e2f
|
Update box_members_by_type.php
|
2021-03-09 00:20:28 +01:00 |
|
Laurent Destailleur
|
c3a047ee06
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
|
2021-03-08 19:31:47 +01:00 |
|
Laurent Destailleur
|
2f0c4038fb
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
htdocs/compta/sociales/card.php
htdocs/societe/consumption.php
|
2021-03-08 19:27:34 +01:00 |
|
Laurent Destailleur
|
3b80b9dd75
|
Fix regression
|
2021-03-08 16:37:52 +01:00 |
|
Laurent Destailleur
|
a79a4e876d
|
Merge branch 'develop' into boxindex
|
2021-03-08 16:34:05 +01:00 |
|
Laurent Destailleur
|
24a0700426
|
Merge pull request #16573 from frederic34/box_index_societe
can add box on thirparties index
|
2021-03-08 16:25:46 +01:00 |
|
Laurent Destailleur
|
1aba0c2bc9
|
NEW Can set order of execution of hooks
|
2021-03-08 15:56:41 +01:00 |
|
lmarcouiller
|
b71a8c5d6f
|
Close #15917 : boxes on ticket index
|
2021-03-08 15:26:35 +01:00 |
|
lmarcouiller
|
d8a74bad93
|
update for continuous integration
|
2021-03-08 13:58:23 +01:00 |
|
lmarcouiller
|
8c7764ed5d
|
Move of 2 graph in boxes
|
2021-03-08 12:18:55 +01:00 |
|
Laurent Destailleur
|
ab89d85095
|
Fix for php8
|
2021-03-08 11:33:07 +01:00 |
|
ksar
|
ec8baa6bff
|
Update commondocgenerator.class.php
#16341
|
2021-03-08 10:00:19 +01:00 |
|
Alexandre SPANGARO
|
2f86971f84
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-03-08 09:56:57 +01:00 |
|
Frédéric FRANCE
|
92754760f4
|
can add box on thirparties index
|
2021-03-06 16:38:07 +01:00 |
|
Laurent Destailleur
|
0a0bb92689
|
Fix phpcs
|
2021-03-06 11:37:23 +01:00 |
|
Laurent Destailleur
|
315e66aa5a
|
Merge pull request #16537 from altairisfr/pr_sn_unicity
Unique serial number management
|
2021-03-06 11:22:44 +01:00 |
|
Laurent Destailleur
|
e5d8267786
|
Merge pull request #16546 from FHenry/12.0
fix: set class attribute at right place
|
2021-03-06 11:18:02 +01:00 |
|
Laurent Destailleur
|
cbd6357f45
|
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter
NEW: LDAP: usergroup search can be filtered
|
2021-03-06 11:08:24 +01:00 |
|
Laurent Destailleur
|
0816cb9c04
|
Merge pull request #16560 from code-chicken/patch-12
Don't discard previously collected data
|
2021-03-06 10:57:18 +01:00 |
|
Laurent Destailleur
|
3cbced439a
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
|
2021-03-05 19:29:09 +01:00 |
|
Laurent Destailleur
|
98c7814fa3
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-03-05 18:28:37 +01:00 |
|
Laurent Destailleur
|
6aa929cbf8
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-03-05 18:28:15 +01:00 |
|
Laurent Destailleur
|
1cd822bd75
|
Fix DOS attack on emailings wrappers
|
2021-03-05 14:54:17 +01:00 |
|
Rüdiger Hahn
|
18fc169cd0
|
Don't discard previously collected data
For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.
|
2021-03-05 11:32:03 +01:00 |
|
stickler-ci
|
06cabb35ec
|
Fixing style errors.
|
2021-03-05 10:24:28 +00:00 |
|
Marc de Lima Lucio
|
396fb3fae3
|
FIX: ldap: bad function comment
|
2021-03-05 11:21:04 +01:00 |
|
Marc de Lima Lucio
|
f731545af4
|
NEW: ldap: filter search on usergroups
|
2021-03-05 11:14:21 +01:00 |
|
Laurent Destailleur
|
83df996bc2
|
Fix english translation
|
2021-03-05 09:52:25 +01:00 |
|
Florian HENRY
|
6de6782458
|
fix: set class at right place
|
2021-03-05 08:41:04 +01:00 |
|
Laurent Destailleur
|
6eafc3b774
|
Clean code
|
2021-03-04 17:23:12 +01:00 |
|
Laurent Destailleur
|
7d20df8054
|
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
|
2021-03-04 16:53:54 +01:00 |
|
Laurent Destailleur
|
eda0b4dc37
|
Merge pull request #16531 from FHenry/12.0
avoid warning into modulebuilder
|
2021-03-04 16:52:47 +01:00 |
|
Laurent Destailleur
|
beb8dbcc01
|
Update project.lib.php
|
2021-03-04 16:48:25 +01:00 |
|
Laurent Destailleur
|
dcff298c5f
|
FIX #16533
|
2021-03-04 15:57:03 +01:00 |
|
Christophe Battarel
|
53cf042a57
|
adapt tobatch import/export
|
2021-03-04 15:35:53 +01:00 |
|
Laurent Destailleur
|
98eb0fc969
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-03-04 15:34:44 +01:00 |
|
Laurent Destailleur
|
ffa0e6c391
|
FIX Timezone management for datetime on list of events
|
2021-03-04 15:34:29 +01:00 |
|
atm-greg
|
c41b59b14c
|
Fix : when we have got models in database attached files are cleared even if we did not have selected a model
|
2021-03-04 14:23:08 +01:00 |
|
Juanjo Menent
|
a04a4806e0
|
Fix: lost selecteds items in ticket creation
|
2021-03-04 11:50:46 +01:00 |
|
stickler-ci
|
47dd477c61
|
Fixing style errors.
|
2021-03-04 09:36:17 +00:00 |
|
lmarcouiller
|
e94f703f5d
|
Fix #16523 : return to backward compatibility
|
2021-03-04 10:33:18 +01:00 |
|
Laurent Destailleur
|
7bc2e1ffad
|
FIX Timezone management for datetime with modulebuilder and extrafields
|
2021-03-04 10:31:31 +01:00 |
|
Florian HENRY
|
bf775855f6
|
avoid warning into modulebuilder
|
2021-03-04 10:28:41 +01:00 |
|
lmarcouiller
|
500f192a05
|
Fix #16523 : New column Contact assigned
|
2021-03-04 10:15:41 +01:00 |
|
Laurent Destailleur
|
5553bae3a1
|
FIX Timezone management for datetime with modulebuilder
|
2021-03-04 09:44:01 +01:00 |
|
Laurent Destailleur
|
33c4180781
|
FIX Timezone management for datetime with modulebuilder
|
2021-03-04 09:36:19 +01:00 |
|
Laurent Destailleur
|
aa1551bf1f
|
FIX class not found when creating recuring invoice from invoice+discount
|
2021-03-03 22:46:25 +01:00 |
|
Laurent Destailleur
|
43e58f70a1
|
Merge pull request #16528 from frederic34/patch-4
remove unused code
|
2021-03-03 15:10:58 +01:00 |
|
Laurent Destailleur
|
d22f929779
|
Merge pull request #16526 from frederic34/patch-3
fix unknown constant and variable
|
2021-03-03 15:10:38 +01:00 |
|
Alexandre SPANGARO
|
59a2fb8ed5
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-03-03 14:08:40 +01:00 |
|
Frédéric FRANCE
|
d05c0b749a
|
remove unused code
|
2021-03-03 13:11:10 +01:00 |
|
Frédéric FRANCE
|
2d9f00eb57
|
Update commonobject.class.php
|
2021-03-03 12:24:44 +01:00 |
|
Laurent Destailleur
|
da8b67da83
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-03-03 12:07:42 +01:00 |
|
Laurent Destailleur
|
5f8b52ffc9
|
Code comment
|
2021-03-03 12:05:43 +01:00 |
|
Laurent Destailleur
|
093eab188e
|
Code comment
|
2021-03-03 12:02:57 +01:00 |
|
Frédéric FRANCE
|
a8bf47b9ce
|
fix unknown constant and variable
|
2021-03-03 12:02:48 +01:00 |
|
Laurent Destailleur
|
f11a85a3e3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
|
2021-03-03 11:37:34 +01:00 |
|
Laurent Destailleur
|
889a496661
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-03 11:31:55 +01:00 |
|
Laurent Destailleur
|
b5d1e36ece
|
Fix include
|
2021-03-03 11:31:40 +01:00 |
|
Laurent Destailleur
|
6fcec3e99b
|
Merge pull request #16522 from FHenry/13.0
fix: warning on install
|
2021-03-02 23:58:26 +01:00 |
|
Laurent Destailleur
|
c2f0d9f42c
|
Update functions.lib.php
|
2021-03-02 23:57:37 +01:00 |
|
Laurent Destailleur
|
7abf572f2d
|
Merge pull request #16512 from Hystepik/develop#1
Fix #16432 : Update of getCountriesinEEC
|
2021-03-02 23:56:37 +01:00 |
|
Laurent Destailleur
|
348b8d2ffe
|
More phpunit tests
|
2021-03-02 23:55:41 +01:00 |
|
Florian HENRY
|
4e5849e50b
|
remove debug
|
2021-03-02 23:13:05 +01:00 |
|
Laurent Destailleur
|
7eb3e324c7
|
FIX #16503
|
2021-03-02 23:09:55 +01:00 |
|
Florian HENRY
|
30c6e268a1
|
fix warning
|
2021-03-02 22:55:43 +01:00 |
|
Frédéric FRANCE
|
22bc3b879b
|
new box replace
|
2021-03-02 22:21:34 +01:00 |
|
Frédéric FRANCE
|
d68de8617b
|
new box replace
|
2021-03-02 22:00:09 +01:00 |
|
Frédéric FRANCE
|
742c12f9d6
|
rename new boxes
|
2021-03-02 20:58:21 +01:00 |
|
Frédéric FRANCE
|
6cf8a46095
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-03-02 20:41:01 +01:00 |
|
lvessiller
|
66ad8fbb24
|
FIX select list dependancies on common object (FIX #16510)
|
2021-03-02 17:21:55 +01:00 |
|
lmarcouiller
|
2eaa6ad6c6
|
Fix #16432 : Add cache use in function
|
2021-03-02 16:21:43 +01:00 |
|
Laurent Destailleur
|
c81d5ff4d0
|
Introduce a variable to cache some data.
|
2021-03-02 16:13:00 +01:00 |
|
stickler-ci
|
b374a8a00b
|
Fixing style errors.
|
2021-03-02 15:03:36 +00:00 |
|
lmarcouiller
|
fc86784cfc
|
Fix #16432 : update with eldy advices
|
2021-03-02 16:03:14 +01:00 |
|
Laurent Destailleur
|
8fc89b9ef1
|
Merge pull request #16511 from FHenry/13.0
fix #16510 (missing ($this->) in previous PR
|
2021-03-02 15:49:13 +01:00 |
|
Laurent Destailleur
|
7f1d61f8a8
|
Fix phpcs
|
2021-03-02 15:34:43 +01:00 |
|
Florian HENRY
|
373d52a562
|
Merge remote-tracking branch 'origin/13.0' into 13.0
|
2021-03-02 15:33:38 +01:00 |
|
Laurent Destailleur
|
a5bcc47d0d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-02 15:29:54 +01:00 |
|
Laurent Destailleur
|
a82ad6a02c
|
Fix phpcs
|
2021-03-02 15:29:27 +01:00 |
|
Laurent Destailleur
|
42329b10c9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
|
2021-03-02 15:27:20 +01:00 |
|
lmarcouiller
|
c5ac79e34c
|
Fix #16432 : Update of getCountriesinEEX
|
2021-03-02 15:24:55 +01:00 |
|
Florian HENRY
|
2c163b8163
|
fix #16510
|
2021-03-02 15:22:22 +01:00 |
|
Laurent Destailleur
|
495c61c231
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
|
2021-03-02 15:12:41 +01:00 |
|
Laurent Destailleur
|
5fd341bbd3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
|
2021-03-02 15:11:18 +01:00 |
|
Laurent Destailleur
|
1f25f2bb7e
|
Fix phpcs
|
2021-03-02 15:09:29 +01:00 |
|
Laurent Destailleur
|
cdfb9254b3
|
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields
FIX : select list dependencies now work for ModuleBuilder sellist field
|
2021-03-02 14:51:53 +01:00 |
|
Laurent Destailleur
|
3982a36a3e
|
Update commonobject.class.php
|
2021-03-02 14:47:35 +01:00 |
|
Laurent Destailleur
|
7144e80063
|
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
|
2021-03-02 14:45:05 +01:00 |
|
Florian HENRY
|
27c354567a
|
FIX : select list dependencies now work for ModuleBuilder sellist field
|
2021-03-02 14:06:11 +01:00 |
|
Laurent Destailleur
|
acb7b30eb0
|
Merge pull request #16507 from frederic34/add_rule
Add rule
|
2021-03-02 12:52:03 +01:00 |
|
Laurent Destailleur
|
1132ed306c
|
Merge pull request #16506 from andreubisquerra/patch-1
Avoid php errors if negative var in Receipt Module
|
2021-03-02 12:50:57 +01:00 |
|
Frédéric FRANCE
|
e1ff1c736c
|
fix typo
Conflicts:
htdocs/core/login/functions_openid.php
|
2021-03-02 12:41:34 +01:00 |
|
Laurent Destailleur
|
25b2de4874
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-02 12:40:00 +01:00 |
|