Laurent Destailleur
ec09d95dc6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 17:24:39 +02:00
Laurent Destailleur
08adb73c6e
Trans
2021-07-08 17:24:05 +02:00
altairis-noe
9983163e7a
a few more getDolGlobalString
2021-07-08 17:21:36 +02:00
Florian Mortgat
38fac48c30
FIX: in kanban view, Dolibarr says "no updates available" even if updates are available
2021-07-08 17:18:47 +02:00
Alexandre SPANGARO
eaa6987e8b
Fix: formconfim if type radio must be :checked to get correct value
2021-07-08 17:15:03 +02:00
altairis-noe
66590ba810
getDolGlobalString instead of $conf->global
2021-07-08 17:10:03 +02:00
Laurent Destailleur
310ebfbe2e
Merge pull request #18089 from atm-jpb/NEW_CMD_LIST_Add_Filter
...
add filter
2021-07-08 16:55:04 +02:00
altairis-noe
68442a2d13
stickler corrections
2021-07-08 16:49:13 +02:00
stickler-ci
327481dc78
Fixing style errors.
2021-07-08 14:47:38 +00:00
jpb
4df29292ab
update comment
2021-07-08 16:44:24 +02:00
jpb
2e44acbc81
update comment
2021-07-08 16:43:05 +02:00
altairis-noe
cbd8fa3572
better element id
2021-07-08 16:42:54 +02:00
Laurent Destailleur
2e33d85b29
Merge pull request #18106 from EpixFr/develop
...
NEW : Adding accounting export model for iSuite Expert
2021-07-08 16:37:11 +02:00
Laurent Destailleur
fe20217bfe
Update accountancyexport.class.php
2021-07-08 16:36:53 +02:00
Laurent Destailleur
856d6eab4a
Merge pull request #18102 from altairisfr/expe_extra
...
FIX display of extrafields on shipping lines
2021-07-08 16:35:38 +02:00
Laurent Destailleur
b84fc94324
Merge pull request #18104 from fappels/14_fix_php8_warning_part4
...
14 fix php8 warning on user page
2021-07-08 16:31:25 +02:00
Laurent Destailleur
7870336f2a
Update card.php
2021-07-08 16:31:01 +02:00
Laurent Destailleur
a521a61f6b
Merge pull request #18108 from fappels/14_patch_product_class
...
Remove duplicate code in product class
2021-07-08 16:29:21 +02:00
altairis-noe
4e77a0d16a
don't display custom masks if they are not used
2021-07-08 15:55:07 +02:00
Laurent Destailleur
752b55ac98
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d
Fix type of param
...
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
2021-07-08 13:59:04 +02:00
Francis Appels
d6c327ed85
Remove duplicate code
2021-07-08 13:17:07 +02:00
Laurent Destailleur
1380344fdb
Fix PHP 8
2021-07-08 12:17:32 +02:00
Laurent Destailleur
16ee47b12c
Fix warning.
...
Reduce memory need for getmin/max on large graphs.
2021-07-08 11:13:15 +02:00
Laurent Destailleur
470f683d41
Clean code
2021-07-08 10:38:36 +02:00
Laurent Destailleur
34c7295cbc
Make code more jquery compliant
2021-07-07 21:01:30 +02:00
Laurent Destailleur
4ada220083
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
2021-07-07 19:18:32 +02:00
Laurent Destailleur
2acbdc2c80
Fix avoid error message
2021-07-07 18:51:00 +02:00
Laurent Destailleur
9308fab7ca
Fix css for field pos/position in dictionary.
...
Conflicts:
htdocs/admin/dict.php
2021-07-07 18:46:11 +02:00
Laurent Destailleur
6cfb3c0e16
Fix css for field pos/position in dictionary.
2021-07-07 18:41:37 +02:00
Laurent Destailleur
9d3f7c5cdd
Support fk_parent into dictionary of ticket categories
2021-07-07 18:30:10 +02:00
stickler-ci
335c3029dc
Fixing style errors.
2021-07-07 15:55:07 +00:00
EpixFr
edfd40719b
Gestion des longueurs des comptes variables
2021-07-07 17:53:10 +02:00
EpixFr
45d36d9134
Ajout export compta iSuite Expert
2021-07-07 17:32:48 +02:00
Francis Appels
a942183127
better fix for optioncss
2021-07-07 15:02:00 +02:00
Francis Appels
0e2c57fe65
Fix php 8 warning on user page
2021-07-07 14:50:10 +02:00
Laurent Destailleur
01e272fb8c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-07 14:40:55 +02:00
Laurent Destailleur
2f25079981
Fix CSRF token generation must be fast, can have low entropy.
2021-07-07 14:40:47 +02:00
Laurent Destailleur
d97a95aa2a
Fix CSRF token generation must be fast, can have low entropy.
2021-07-07 14:38:52 +02:00
Christophe Battarel
7e174412b7
FIX display of extrafields on shipping lines
2021-07-07 10:30:01 +02:00
stickler-ci
89ffa85290
Fixing style errors.
2021-07-07 06:40:12 +00:00
jpb
73bfeee4e7
fix comment
2021-07-07 08:37:49 +02:00
jpb
1a919c9f2b
change comment
2021-07-07 08:35:31 +02:00
Laurent Destailleur
34f1cfe575
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/index.php
2021-07-07 02:09:53 +02:00
Laurent Destailleur
3bc896be57
Debug v14
2021-07-07 02:07:35 +02:00
Laurent Destailleur
48435eb911
Fix navigation links
2021-07-07 01:58:06 +02:00
Laurent Destailleur
ff94c60cc7
Fix GETPOST with restricthtml
2021-07-07 01:45:31 +02:00
Laurent Destailleur
9d010f6d10
Look and feel v14
2021-07-07 01:24:40 +02:00
Laurent Destailleur
f050a38c6b
Fix migration
2021-07-07 01:18:28 +02:00
Laurent Destailleur
f286017cab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 19:03:55 +02:00
Laurent Destailleur
f761a2d3b8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03
Fix phpcs
2021-07-06 19:02:03 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3
...
Fix php8 warning
2021-07-06 18:52:05 +02:00
Laurent Destailleur
70fa742939
Fix upgrade
2021-07-06 18:40:54 +02:00
Florian Mortgat
9f7be989c2
FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter()
2021-07-06 17:38:37 +02:00
Francis Appels
874bf8ed44
backtopageforcancel can be set but empty
2021-07-06 16:39:58 +02:00
Laurent Destailleur
5444d45e68
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8
Fix phpunit
2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/tpl/objectline_view.tpl.php
2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877
Fix function not found
2021-07-06 15:55:43 +02:00
Laurent Destailleur
c23f46af9b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-06 15:35:39 +02:00
Laurent Destailleur
37801184c0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/holiday/class/holiday.class.php
Fix case of newByMonth
2021-07-06 15:35:17 +02:00
Laurent Destailleur
4dd29af555
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-06 15:24:37 +02:00
Laurent Destailleur
a345d38320
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-07-06 15:24:01 +02:00
Laurent Destailleur
ed71888501
Merge pull request #18093 from FHenry/14_deveventorg
...
new: working on conference or booth object and event type #FoundationFunding
2021-07-06 15:05:09 +02:00
Lenin Rivas
a2288b9039
Update unicode and name of currency
2021-07-06 15:00:19 +02:00
damien clochard
4c5bb786ba
FIX #18085 : Migration 13 to 14 : Explicit cast when changing the type of llx_c_ticket_category.pos
2021-07-06 14:51:53 +02:00
Laurent Destailleur
1cfa43c085
Merge pull request #18088 from aspangaro/14p1
...
FIX Accountancy - Link from admin
2021-07-06 14:48:26 +02:00
Laurent Destailleur
ab14a07064
Trans
2021-07-06 11:58:05 +02:00
Laurent Destailleur
b4b939e1a9
Fix add migration of export/import profile when field name changes
2021-07-06 11:54:32 +02:00
Laurent Destailleur
7dab4ef571
Debug v14
2021-07-06 11:18:09 +02:00
Laurent Destailleur
9a3d2f13a6
Fix graph per type of expense report
2021-07-06 10:55:23 +02:00
Laurent Destailleur
555f1c719b
Debug v14
2021-07-06 04:29:25 +02:00
Laurent Destailleur
61ed899608
Fix set discount on line in TakePos
2021-07-06 03:53:42 +02:00
Laurent Destailleur
407ad4d84d
Fix bad value
2021-07-06 02:15:52 +02:00
Laurent Destailleur
c901e518a7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 02:11:28 +02:00
Laurent Destailleur
6e24ee48d4
Debug security page
2021-07-06 02:07:58 +02:00
Laurent Destailleur
3dff7e29cc
Fix #yogosha6567
2021-07-06 01:44:05 +02:00
Laurent Destailleur
0dfa7bdbcc
Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML
2021-07-06 00:47:43 +02:00
Laurent Destailleur
0b7b9aae79
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 23:07:56 +02:00
Laurent Destailleur
2a5699a9a2
Merge
2021-07-05 23:07:40 +02:00
Laurent Destailleur
185ed5ceeb
Code comment
2021-07-05 22:52:37 +02:00
Laurent Destailleur
f8eadf6fe1
Fix #yogosha6561
2021-07-05 22:42:48 +02:00
Laurent Destailleur
db95339085
Code comment
2021-07-05 20:32:05 +02:00
Laurent Destailleur
6a6216898e
Fix unit price of expense report
2021-07-05 19:57:11 +02:00
Laurent Destailleur
8e7508dd9f
Clean code
2021-07-05 19:50:16 +02:00
Laurent Destailleur
a04ed363c7
Look and feel v14
2021-07-05 19:28:50 +02:00
Laurent Destailleur
e2d7de3146
css
2021-07-05 18:56:24 +02:00
Laurent Destailleur
adec77e449
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 18:47:24 +02:00
Laurent Destailleur
abb1ad6bf0
Fix sql injection
2021-07-05 18:46:27 +02:00
Laurent Destailleur
3ac72fe73c
Fix
2021-07-05 18:19:02 +02:00
Laurent Destailleur
38d272e31a
Better position of fields
2021-07-05 18:16:52 +02:00
Laurent Destailleur
a14c68e996
Fix Hide sensitive key on info page
2021-07-05 18:14:52 +02:00
Laurent Destailleur
65adb16191
Fix increase entrophy of default password generation.
2021-07-05 17:55:17 +02:00
Laurent Destailleur
f648185839
Fix phpcs
2021-07-05 17:34:25 +02:00
Laurent Destailleur
87f9530272
Fix report by Ahsan Aziz (can reset the password of another user that
...
did not request password reset).
2021-07-05 17:29:10 +02:00
Laurent Destailleur
c0118c7de2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-05 17:08:27 +02:00
Laurent Destailleur
d414bcb572
Fix phpcs
2021-07-05 17:08:10 +02:00
Laurent Destailleur
fe5c4f4a0e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 17:04:38 +02:00
Marc de Lima Lucio
eea90cef56
FIX: holiday: balances not updated correctly with pgsql because of case sensitivity
2021-07-05 16:31:33 +02:00
Laurent Destailleur
8b07e99e05
Fix for ' inserted by CKEditor instead of '
2021-07-05 16:08:47 +02:00
Laurent Destailleur
22c45fe7cc
Trans
2021-07-05 15:44:11 +02:00
Florian HENRY
03f8557aaf
fix template email
2021-07-05 15:36:41 +02:00
Florian HENRY
ca53abcef2
fix email template type
2021-07-05 15:35:05 +02:00
Florian HENRY
dd3c0ac5ab
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg
2021-07-05 15:17:43 +02:00
Florian HENRY
cb2c10551b
on goign
2021-07-05 15:17:21 +02:00
Francis Appels
1333ca3660
Fix php 8 warning on not set field keys
2021-07-05 14:51:34 +02:00
Francis Appels
df5878b3d6
Fix php 8 warning in inventory module
2021-07-05 14:45:00 +02:00
Laurent Destailleur
87241c94a3
Code comment
2021-07-05 14:41:40 +02:00
Laurent Destailleur
383c678200
Trans
2021-07-05 14:09:01 +02:00
Francis Appels
5d824899e5
Fix php 8 warning on home page
2021-07-05 13:44:05 +02:00
Laurent Destailleur
d43e043b48
Fix regression when adding a product with multicompany
2021-07-05 12:49:10 +02:00
Laurent Destailleur
2eddc02deb
Fix selection of Autofill description
2021-07-05 11:59:30 +02:00
Laurent Destailleur
b7c86f3aec
Fix ldap
2021-07-05 11:41:55 +02:00
Laurent Destailleur
dfee489e7e
Fix sanitizing entity
2021-07-05 11:33:32 +02:00
stickler-ci
bcb06d5c90
Fixing style errors.
2021-07-05 07:40:44 +00:00
jpb
ad62062cd5
add filter
2021-07-05 08:55:03 +02:00
Alexandre SPANGARO
8bde61c2c6
FIX Accountancy - Link from admin
2021-07-05 06:58:10 +02:00
ATM john
752fe22c68
Add simple auto mode
2021-07-04 23:24:38 +02:00
ATM john
a709cc583f
Add modal option to btn
2021-07-04 22:59:53 +02:00
Laurent Destailleur
f37a62b1d4
CSS v14
2021-07-04 21:40:30 +02:00
Laurent Destailleur
5779a56ae0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032
Fix trouble with product id = -1
2021-07-04 21:02:02 +02:00
Laurent Destailleur
5853aa4c1e
Look and feel v14
2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee
Fix phpcs v14
2021-07-04 19:23:04 +02:00
Laurent Destailleur
744a95ce7e
Fix var init
2021-07-04 18:30:20 +02:00
Laurent Destailleur
ab1ba5bc6a
css
2021-07-03 19:26:04 +02:00
Laurent Destailleur
affe6d9631
Sync transifex
2021-07-03 19:00:58 +02:00
Laurent Destailleur
df498def86
Fix css
2021-07-03 18:38:43 +02:00
Laurent Destailleur
d1c6a9899c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-03 18:33:00 +02:00
Laurent Destailleur
30f9eb9f23
Fix phpcs
2021-07-03 18:32:52 +02:00
Laurent Destailleur
9b7c0a9246
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-07-03 18:32:31 +02:00
Laurent Destailleur
8a3b92a32d
Fix filter
2021-07-03 18:30:58 +02:00
Laurent Destailleur
bb0daa4f0d
Prepare v14
2021-07-03 18:11:01 +02:00
Laurent Destailleur
7fb0946022
Fix link
2021-07-03 18:09:48 +02:00
Laurent Destailleur
e35ecdf58d
Fix trans
2021-07-03 17:58:37 +02:00
Laurent Destailleur
b43fddfc74
Merge pull request #18058 from altairisfr/exportprices
...
add labels and export only latest prices
2021-07-02 16:35:58 +02:00
Laurent Destailleur
dbd2d2eb20
Merge pull request #18069 from marc-dll/13.0_FIX_holiday_menus
...
FIX: holiday: status filter parameter has been renamed but not in links it was used
2021-07-02 16:35:14 +02:00
Laurent Destailleur
f0eb245f45
Merge pull request #18068 from FHenry/13_fix_trigger_paiement_online
...
fix: payment ok should trigger PAYMENTONLINE_PAYMENT_OK even on custom object
2021-07-02 16:34:08 +02:00
Laurent Destailleur
6ae1d192e4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
2021-07-02 16:14:12 +02:00
Laurent Destailleur
8bade0e4e7
Fix add permission
2021-07-02 16:11:42 +02:00
Laurent Destailleur
1a455ad5d6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-02 16:06:57 +02:00
Laurent Destailleur
01cf608ef4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-02 16:06:48 +02:00
Laurent Destailleur
d03cbd88ae
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-07-02 16:05:59 +02:00
Laurent Destailleur
a7f850dafb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-07-02 16:05:51 +02:00
lmarcouiller
2a30c699ac
Fix #18063 : search filter status lost "Back to list"
2021-07-02 16:05:28 +02:00
lmarcouiller
903adadcc4
Fix Error type ent in fourn/commande/list.php
2021-07-02 16:05:14 +02:00
Laurent Destailleur
a562cd227a
Merge pull request #18072 from Hystepik/develop#1
...
Fix #18063 : search filter status lost "Back to list"
2021-07-02 16:03:41 +02:00
Laurent Destailleur
2595e91f51
Merge pull request #18067 from Hystepik/develop#2
...
Fix Error type ent in fourn/commande/list.php
2021-07-02 16:02:55 +02:00
lmarcouiller
3bf268796c
Fix #18063 : search filter status lost "Back to list"
2021-07-02 12:47:42 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object
2021-07-02 12:04:14 +02:00
Christophe Battarel
3c5bc3fef4
fix division by zero on of create
2021-07-02 11:53:32 +02:00
Marc de Lima Lucio
97938f489e
FIX: holiday: status filter parameter has been renamed but not in links it was used
2021-07-02 11:35:26 +02:00
Florian HENRY
783257706c
fix: payment ok should trigger PAYMENTONLINE_PAYMENT_OK even on custom object
2021-07-02 10:53:51 +02:00
lmarcouiller
7c072c7960
Fix Error type ent in fourn/commande/list.php
2021-07-02 10:47:57 +02:00
Théo David
079608fe00
NEW #18046 Add ticket ticket categories functions
2021-07-02 10:26:03 +02:00
Théo David
110b0fecf5
NEW #18046 Add ticket categories views
2021-07-02 10:05:45 +02:00
Laurent Destailleur
0dce34f527
Fix trans
2021-07-01 19:06:16 +02:00
Laurent Destailleur
414da83456
Fix colspan
2021-07-01 18:45:07 +02:00
Laurent Destailleur
664af6ad1f
Fix trans
2021-07-01 18:22:33 +02:00
Théo David
de847250b1
NEW #18046 Add ticket categories data model
2021-07-01 17:55:54 +02:00
Frédéric FRANCE
3aa24cccff
fix can't remove extrafield date or datetime value
2021-07-01 15:15:35 +02:00
Laurent Destailleur
9392624e54
Fix deletion of line on replacement invoice
2021-07-01 13:36:04 +02:00
stickler-ci
b102dc619f
Fixing style errors.
2021-07-01 10:15:55 +00:00
Nicolas Domenech
5c0086790e
Merge branch 'develop' into fix_process_payment_with_online_link_order
2021-07-01 12:13:59 +02:00
Nicolas
3e6eeeb977
fix : remove comments
2021-07-01 11:59:00 +02:00
Nicolas
9b71f1e16b
fix : move check if invoice module is enabled into paymentok.php
2021-07-01 11:55:06 +02:00
Laurent Destailleur
5b34ea6c22
FIX permission to close a proposal when using advanced permissions
2021-07-01 03:06:40 +02:00
Laurent Destailleur
1a63a379cc
Fix missing permission
2021-07-01 03:03:59 +02:00
Laurent Destailleur
1de165a6cd
css
2021-06-30 18:34:04 +02:00
Laurent Destailleur
4cff865c6b
Trans
2021-06-30 18:22:40 +02:00
Laurent Destailleur
bf7f8f7c45
Fix phpcs
2021-06-30 17:28:23 +02:00
Laurent Destailleur
aec4d6016c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:40 +02:00
Laurent Destailleur
6cb5ea6ec2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd
Prepare fix #yogosha6443
2021-06-30 17:22:36 +02:00
Christophe Battarel
ac6cb5853e
fix for multientity
2021-06-30 15:35:55 +02:00
Laurent Destailleur
7c2121c439
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/tpl/objectline_edit.tpl.php
2021-06-30 15:06:16 +02:00
Laurent Destailleur
068622bced
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-06-30 15:00:23 +02:00
Laurent Destailleur
a914ffa42c
CSS
2021-06-30 15:00:04 +02:00
Laurent Destailleur
5c6ccfd3a6
Merge pull request #18051 from altairisfr/timespent2inter
...
NEW generate intervention from time spent
2021-06-30 14:52:16 +02:00
Laurent Destailleur
b6a538f439
Merge pull request #18056 from aspangaro/14b16
...
FIX Accountancy - Clean virtual zero on the import
2021-06-30 14:44:12 +02:00
Laurent Destailleur
51456741d9
FIX Can't edit replacement invoice
...
FIX Status of invoice when making a replacement invoice
2021-06-30 12:43:44 +02:00
atm-arnaud
8772c53723
FIX deposit can create credit note in payment conf
2021-06-30 12:37:21 +02:00
Christophe Battarel
3b4ea5c5af
use formintervention
2021-06-30 10:56:09 +02:00
Christophe Battarel
27e2c62cab
Merge branch 'develop' into timespent2inter
2021-06-30 10:34:22 +02:00
lmarcouiller
2ab97d522d
Fix php 8.0 warning societe index
2021-06-30 10:30:46 +02:00
lmarcouiller
dcd4d53622
Fix php 8 warning in adherents list
2021-06-30 10:22:00 +02:00
Christophe Battarel
4f2e579bb2
add labels and export only latest prices
2021-06-30 10:21:31 +02:00
Christophe Battarel
0b5e231dd5
add labels and export only latest prices
2021-06-30 10:18:14 +02:00
Florian Mortgat
5d4c40fffa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
2021-06-30 09:36:34 +02:00
Florian Mortgat
94416072d8
FIX after PR feedback: remove uses of keyword attribute of EcmFiles (use keywords instead)
2021-06-30 09:34:49 +02:00
Alexandre SPANGARO
f95b5be971
FIX Accountancy - Clean virtual zero on the import
2021-06-30 04:55:22 +02:00
Laurent Destailleur
94974af738
trans
2021-06-30 01:52:54 +02:00
Laurent Destailleur
5e37c2ef74
CSS
2021-06-30 01:36:49 +02:00
Alexandre SPANGARO
6f12812329
FIX Accountancy - Clean virtual zero on the import
2021-06-29 23:07:20 +02:00
Laurent Destailleur
02a5755876
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/nl_NL/main.lang
2021-06-29 19:59:51 +02:00
Laurent Destailleur
5f019e0857
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-29 19:57:06 +02:00
Laurent Destailleur
7d8770305a
Merge pull request #17790 from aspangaro/14b11
...
NEW Add field date from/to in supplier payment list
2021-06-29 19:54:41 +02:00
Laurent Destailleur
04148dd5fb
Merge pull request #17789 from aspangaro/14b10
...
NEW Add field date from/to in customer payment list
2021-06-29 19:54:12 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet
...
NEW: project time spent: conf to prevent recording time after X months
2021-06-29 19:53:20 +02:00
Laurent Destailleur
c7befd9acc
Fix php8 (related to #18019 )
2021-06-29 19:49:37 +02:00
Laurent Destailleur
11b5c044bc
Merge pull request #18052 from Hystepik/develop#3
...
New : selectGroupTicket multilevel >1 level
2021-06-29 19:37:39 +02:00
Laurent Destailleur
2a876d139b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-06-29 19:25:09 +02:00
Laurent Destailleur
1804c36a05
Merge pull request #18047 from aspangaro/14b16
...
Uniformize accounting displays
2021-06-29 19:24:57 +02:00
Laurent Destailleur
c74060d02c
Fix lost change in merge
2021-06-29 19:24:46 +02:00
Laurent Destailleur
d59dfcb08a
Update list.php
2021-06-29 19:21:35 +02:00
Laurent Destailleur
eab6fc9347
Merge pull request #18053 from fappels/14_fix_php8_part2
...
Fix php8 warning
2021-06-29 19:17:09 +02:00
Laurent Destailleur
2860e12b65
Update objectline_view.tpl.php
2021-06-29 19:16:29 +02:00
Laurent Destailleur
56787bc292
Update card.php
2021-06-29 19:14:03 +02:00
Laurent Destailleur
0f020d5b20
Fix for phpv8
2021-06-29 19:05:18 +02:00
Laurent Destailleur
7aeb652c66
Better sanitizing, fix phpcs
2021-06-29 18:22:36 +02:00
Laurent Destailleur
796b2d201a
Enhance the sanitizing.
2021-06-29 18:17:27 +02:00
Francis Appels
1b7b45d72a
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef
Fix some core php8 warnings.
...
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
2021-06-29 16:37:07 +02:00
Francis Appels
e4f61d430f
Invoice php 8 issue and warnings.
...
Seems if ("" < 0) is true in php 8
2021-06-29 16:33:24 +02:00
Francis Appels
b8f5dc74d7
Some order php 8 warning
2021-06-29 16:30:36 +02:00
Francis Appels
b83f57da48
Fix some proposal php 8 warning
2021-06-29 16:26:48 +02:00
lmarcouiller
3d41c00199
New : selectGroupTicket multilevel >1 level
2021-06-29 16:13:03 +02:00
Laurent Destailleur
25c6b64b1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
htdocs/core/modules/reception/doc/pdf_squille.modules.php
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Laurent Destailleur
24fccc2b72
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-06-29 15:53:22 +02:00
Christophe Battarel
c8f55907eb
stickler
2021-06-29 15:52:50 +02:00
Laurent Destailleur
1cf3408f5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/class/contact.class.php
2021-06-29 15:52:39 +02:00
Christophe Battarel
d423e47d3b
stickler
2021-06-29 15:50:41 +02:00
Laurent Destailleur
ce18eff133
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-29 15:48:06 +02:00
Laurent Destailleur
e2c4a14939
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-29 15:47:58 +02:00
Laurent Destailleur
d788e58f67
Merge pull request #18036 from frederic34/codesample
...
remove unused code
2021-06-29 15:47:03 +02:00
Laurent Destailleur
6a877074a5
Merge pull request #18041 from Hystepik/develop#1
...
Fix #18014 : update of compta/facture/card.php
2021-06-29 15:46:24 +02:00
Laurent Destailleur
ba4a01dbea
Merge pull request #18037 from atm-maxime/fix_mo_stuff
...
Fix MO and BOM links in boxes
2021-06-29 15:42:09 +02:00
Laurent Destailleur
ab4dbcf5ae
Update box_mos.php
2021-06-29 15:41:48 +02:00
Laurent Destailleur
474df5fef2
Update box_boms.php
2021-06-29 15:41:21 +02:00
Christophe Battarel
6d77f5e12f
fix translation string
2021-06-29 15:38:24 +02:00
Laurent Destailleur
ffef2191bd
Merge pull request #18042 from Hystepik/develop#2
...
Fix CI bot error
2021-06-29 15:36:40 +02:00
Laurent Destailleur
ba242b4ecf
Merge pull request #18044 from fappels/14_fix_php8
...
Fix php 8 warnings
2021-06-29 15:33:07 +02:00
Laurent Destailleur
9b328bd8be
Trans
2021-06-29 15:31:42 +02:00
Laurent Destailleur
a123154446
Fix clean alias
2021-06-29 15:29:28 +02:00
Christophe Battarel
ef8aaa7fd7
generate intervention from time spent
2021-06-29 15:26:04 +02:00
Alexandre SPANGARO
52b8044517
FIX Accountancy - Suggested account of product not concerned by account of thirdparty
2021-06-29 04:25:32 +02:00
Laurent Destailleur
17c3649905
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-29 02:42:50 +02:00
Laurent Destailleur
c90730d530
Prepare branch to dev v15
2021-06-29 02:40:05 +02:00
Laurent Destailleur
69e0381e55
Prepare v14
2021-06-29 02:39:20 +02:00
Francis Appels
9b59f264fd
Fix some php 8 warning
2021-06-28 20:00:10 +02:00
Francis Appels
4558efdea3
Fix travis, also fixed upstream transifex
2021-06-28 19:21:29 +02:00
Francis Appels
b534fbae77
Fix warning php 8 in product ajax.
2021-06-28 19:12:19 +02:00
Laurent Destailleur
d7fbddb8e1
Add rowid/ref in response
2021-06-28 16:45:29 +02:00
Francis Appels
69affc5df5
Fix php 8 warnings
2021-06-28 16:25:16 +02:00
lmarcouiller
477b1272e0
Fix CI bot error
2021-06-28 13:30:26 +02:00
lmarcouiller
923a015aac
Fix #18014 : update of compta/facture/card.php
2021-06-28 11:38:34 +02:00
lvessiller
fa28a02d74
FIX update contact birthday alert
2021-06-28 11:03:22 +02:00
Laurent Destailleur
813440bd16
Trans
2021-06-27 18:29:54 +02:00
Laurent Destailleur
2e2d9002ad
Code comment
2021-06-27 14:54:17 +02:00
Maxime Kohlhaas
c3cbd29542
Fix #17836 : order delay warning in list was wrong, date_commande is deprecated
2021-06-27 09:04:47 +02:00
Maxime Kohlhaas
8332385bd5
Fix links in box last BOM
2021-06-27 08:42:08 +02:00
Maxime Kohlhaas
d86caa39e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_mo_stuff
2021-06-27 08:34:11 +02:00
Laurent Destailleur
15fdf95c22
css
2021-06-27 00:02:25 +02:00
Laurent Destailleur
6ef08852f3
Transifex sync
2021-06-26 22:51:23 +02:00
Frédéric FRANCE
58701bef5d
remove unused code
2021-06-26 21:10:59 +02:00
Laurent Destailleur
4b8f2f42b9
Lookd and feel v14
2021-06-26 16:42:35 +02:00
Laurent Destailleur
4ff2ff779b
css
2021-06-26 16:35:33 +02:00
Laurent Destailleur
b051f6e2d1
CSS
2021-06-26 16:13:39 +02:00
Laurent Destailleur
b3b96ddb7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-26 16:11:13 +02:00
Laurent Destailleur
bbc6b9aa1b
Look and feel v14
2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701
Debug v14
2021-06-26 15:39:52 +02:00
Laurent Destailleur
f4a512fa7b
Merge pull request #18004 from OPEN-DSI/new-export-parent-compnay-document-lines
...
NEW parent company on exports
2021-06-26 12:30:57 +02:00
Laurent Destailleur
97f5a0e541
Merge pull request #18018 from frederic34/patch-7
...
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
2021-06-26 12:24:01 +02:00
Laurent Destailleur
781df5a8a8
Merge pull request #18016 from fappels/13_fix_klaas
...
FIX #17919 pictures in docs.
2021-06-26 12:22:57 +02:00
Laurent Destailleur
eb6415c374
Merge pull request #18024 from frederic34/patch-11
...
fix warnings in propal list
2021-06-26 12:19:17 +02:00
Laurent Destailleur
5dc82ccb71
Merge pull request #18023 from frederic34/patch-8
...
fix inexistent right
2021-06-26 12:18:42 +02:00
Laurent Destailleur
012f326168
Merge pull request #18020 from Hystepik/develop#1
...
Fix : error display fr phone number
2021-06-26 12:18:16 +02:00
Laurent Destailleur
a64100f277
Merge pull request #18026 from frederic34/patch-13
...
fix warnings
2021-06-26 12:17:14 +02:00
Laurent Destailleur
877252521e
Merge pull request #18025 from frederic34/patch-12
...
fix warnings in propal list
2021-06-26 12:16:50 +02:00
Laurent Destailleur
61761876a4
Merge pull request #18027 from frederic34/patch-14
...
fix warning
2021-06-26 12:02:11 +02:00
Laurent Destailleur
49688f327c
Merge pull request #18028 from frederic34/patch-15
...
fix warnings
2021-06-26 12:02:04 +02:00
Laurent Destailleur
df6d160374
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-26 12:00:42 +02:00
Laurent Destailleur
cc65e4bb38
FIX #18030
2021-06-26 12:00:25 +02:00
Laurent Destailleur
67e7556f70
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors
...
NEW get errors on create invoice from clone
2021-06-26 11:53:45 +02:00
Laurent Destailleur
bc816f253c
Fix tooltip
2021-06-26 02:07:18 +02:00
Laurent Destailleur
720ea16bb1
css
2021-06-26 02:00:30 +02:00
Laurent Destailleur
2fd47615eb
Fix load of conf when using alternative $db
2021-06-26 01:46:14 +02:00
Laurent Destailleur
12d591b848
css
2021-06-26 00:18:46 +02:00
Laurent Destailleur
ccffb36a37
CSS
2021-06-26 00:14:53 +02:00
Laurent Destailleur
6e3647af2c
Debug v14
2021-06-26 00:08:19 +02:00
Laurent Destailleur
c7b03da7e6
Fix bad object used
2021-06-25 23:43:22 +02:00
Laurent Destailleur
d2485033d7
Fix deletion of template invoice
2021-06-25 23:10:42 +02:00
lvessiller
2cb2ec02d6
NEW parent compnay in order supplier lines export
2021-06-25 17:04:19 +02:00
lvessiller
24acc82ca6
NEW get errors on create invoice from clone
2021-06-25 16:40:39 +02:00
Laurent Destailleur
c4e9e1c8df
Comment
2021-06-25 10:50:58 +02:00
Laurent Destailleur
46ae7180f8
Fix phpunit. Refused @@ char in sql.
2021-06-25 10:47:31 +02:00
Francis Appels
ec805d36fe
Remove deprecated level parameter.
2021-06-25 10:02:23 +02:00
Frédéric FRANCE
438e37ed59
fix warnings
2021-06-24 21:12:32 +02:00
Frédéric FRANCE
06522d5b2e
fix warning
2021-06-24 21:01:23 +02:00
Frédéric FRANCE
6e1c4ed980
fix warnings
2021-06-24 20:30:11 +02:00
Frédéric FRANCE
fde23632ce
Update list.php
2021-06-24 20:20:50 +02:00
Frédéric FRANCE
aad45a8157
fix warnings in propal list
2021-06-24 20:15:57 +02:00
Frédéric FRANCE
f92cc8f5a3
fix warnings in propal list
2021-06-24 20:11:40 +02:00
Frédéric FRANCE
7a2ec389a1
fix inexistent right
2021-06-24 18:57:22 +02:00
lmarcouiller
98244a5e44
Fix : error display fr phone number
2021-06-24 14:20:19 +02:00
Laurent Destailleur
a4e6eb12a8
Fix migration pgsql
2021-06-24 12:46:50 +02:00
Laurent Destailleur
b47fa50d05
Try postgresl migration fix
2021-06-24 12:46:04 +02:00
Francis Appels
88f7ca9214
Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE
2021-06-24 12:27:39 +02:00
Laurent Destailleur
cfc5646059
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-24 12:18:30 +02:00
Laurent Destailleur
a2d451dbfb
Missing extrafield on report
2021-06-24 12:17:32 +02:00
Francis Appels
dc9e71084b
Fix missing posYAfterImage for nexy for espadon and squille
2021-06-24 12:15:29 +02:00
Laurent Destailleur
2859ff46b5
Fix link of type of membership
2021-06-24 12:08:11 +02:00
Frédéric FRANCE
47b1d2b7df
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
2021-06-24 11:54:05 +02:00
Laurent Destailleur
2c4fd9e409
Debug ENTREPOT_EXTRA_STATUS
2021-06-24 11:51:10 +02:00
Florian Mortgat
d0a4ae88b1
NEW: make it easier to set the keyword, keywords and description attributes of an ecm file object
2021-06-24 11:50:34 +02:00
Francis Appels
d20bd5bcf6
fix ctrl-y
2021-06-24 10:18:21 +02:00
Francis Appels
09382e0505
FIX #17919 pictures in docs.
...
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
2021-06-24 10:12:34 +02:00
Laurent Destailleur
e23ce0bb97
Trans
2021-06-24 09:57:54 +02:00
Laurent Destailleur
594f7c8e9e
Fix code for v14
2021-06-24 09:54:30 +02:00
Laurent Destailleur
8d3b156d47
Fix php8
2021-06-23 19:07:42 +02:00
Laurent Destailleur
c03958a867
Fix look and feel v14
2021-06-23 19:02:14 +02:00
atm-lena
7eddf43aef
FIX List and Create Companies Left Menus
2021-06-23 17:33:02 +02:00
Laurent Destailleur
743474513b
Fix option SOCIETE_ASK_FOR_WAREHOUSE
2021-06-23 16:53:26 +02:00
Laurent Destailleur
4327d53c60
Fix closing linkto section when js on.
2021-06-23 14:38:24 +02:00
Laurent Destailleur
a657fe2fca
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-23 13:31:40 +02:00
Laurent Destailleur
6db44e66d6
FIX #18006
2021-06-23 13:30:00 +02:00
Laurent Destailleur
293b67a693
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/cashcontrol/report.php
2021-06-23 13:08:05 +02:00
Laurent Destailleur
acce226c05
Debug cash fence feature (missing report per vat rate)
2021-06-23 13:00:50 +02:00
Laurent Destailleur
3a30d41fbf
Fix missing properties
2021-06-23 11:44:10 +02:00
Laurent Destailleur
11a71d8d2f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
2021-06-23 11:41:30 +02:00
Laurent Destailleur
c46097ccd9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/main.inc.php
2021-06-23 11:39:17 +02:00
Laurent Destailleur
034906a129
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
2021-06-23 11:30:44 +02:00
Laurent Destailleur
f24d8a31af
Fix migration
2021-06-23 11:14:28 +02:00
Laurent Destailleur
eb9be15c4c
Fix php8
2021-06-23 10:52:05 +02:00
Laurent Destailleur
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block
...
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
2021-06-23 10:48:22 +02:00
Laurent Destailleur
9c657206b3
Update linkedobjectblock.tpl.php
2021-06-23 10:47:51 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php
2021-06-23 10:47:23 +02:00
Laurent Destailleur
82ee5c2825
Clean code
2021-06-23 10:42:27 +02:00
Laurent Destailleur
d57699b7d7
css
2021-06-23 10:22:51 +02:00
Laurent Destailleur
3bc1f90589
Fix rounding
2021-06-23 02:51:31 +02:00
Laurent Destailleur
5c6c708531
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-23 02:45:22 +02:00
Laurent Destailleur
40b35cc44a
Fix upload file form has disappear
2021-06-23 02:45:06 +02:00
Laurent Destailleur
95680a585c
Merge pull request #17997 from frederic34/patch-9
...
move admin warnings on top instead bottom
2021-06-23 02:33:00 +02:00
Laurent Destailleur
30087bd16a
Merge pull request #18001 from aspangaro/14b15
...
Fix Forget information in tooltip for direct download
2021-06-23 02:31:45 +02:00
Laurent Destailleur
cf28fcc8cd
CSS
2021-06-23 02:22:49 +02:00
Laurent Destailleur
62822c424c
Fix php8
2021-06-23 01:34:14 +02:00
Laurent Destailleur
28d416a00d
Try fix of phpunit
2021-06-23 00:58:27 +02:00
Laurent Destailleur
de7df8ad9f
Fix lang
2021-06-22 19:11:58 +02:00
Laurent Destailleur
c08255657e
Fix pgsql
2021-06-22 18:59:14 +02:00
Laurent Destailleur
12748640a5
Add log
2021-06-22 18:04:06 +02:00
Laurent Destailleur
ecd028d124
Clean code
2021-06-22 17:33:43 +02:00
Laurent Destailleur
bcffbe3d67
Test fix
2021-06-22 17:09:02 +02:00
Laurent Destailleur
f6eb5b76f5
css
2021-06-22 15:45:47 +02:00
Laurent Destailleur
2f6a91f506
Look and feel v14
2021-06-22 15:25:49 +02:00
Alexandre SPANGARO
26c5875f97
Uniformize accounting dyiplays
2021-06-22 14:20:08 +02:00
lvessiller
21ebfb6094
NEW parent company on exports
2021-06-22 14:13:18 +02:00
Alexandre SPANGARO
f1a5d4009f
Merge remote-tracking branch 'upstream/develop' into 14b15
2021-06-22 14:07:52 +02:00
Laurent Destailleur
d6e9947cd4
CSS
2021-06-22 12:30:50 +02:00
Laurent Destailleur
312968eeac
Clean code
2021-06-22 11:38:02 +02:00
Laurent Destailleur
8887f71c26
Doc
2021-06-22 10:57:16 +02:00
Laurent Destailleur
05c0bc4fac
css
2021-06-22 10:44:49 +02:00
ATM john
b8244edb89
Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object
2021-06-21 21:54:53 +02:00
ATM john
4d043b713c
WIP - create validation method for common object
2021-06-21 21:54:03 +02:00
Alexandre SPANGARO
23f6e183d3
Forget information in tooltip for direct download
2021-06-21 21:51:41 +02:00
Laurent Destailleur
6702a452e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-21 20:58:58 +02:00
Laurent Destailleur
6014e4407f
Clean code
2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc
Debug emailcollector
2021-06-21 19:47:43 +02:00
damien clochard
05bb2c720d
FIX #17996 : Avoid implicit type casts for llx_adherent_type.subscription
...
The llx_adherent_type.subscription column is VARCHAR so we need to
compare it with a string, not an int.
2021-06-21 18:24:52 +02:00
Laurent Destailleur
31db1dc412
Fix management of visibility of export/import templates.
2021-06-21 15:03:45 +02:00
Laurent Destailleur
5697e86c09
Fix columns for export/import profile
2021-06-21 14:12:33 +02:00
Laurent Destailleur
ac8564dc34
Fix disable token renewal on .css.php, .js.php and .json.php
2021-06-21 13:06:40 +02:00
Laurent Destailleur
aca190d977
Fix css
2021-06-21 12:46:24 +02:00
Laurent Destailleur
9c0ab1960b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-21 12:46:15 +02:00
Laurent Destailleur
ab2e50ef49
Fix css
2021-06-21 12:46:03 +02:00
Laurent Destailleur
561e75d0f8
Merge pull request #17992 from frederic34/patch-8
...
fix warnings
2021-06-21 11:39:40 +02:00
Laurent Destailleur
6ed1cd31d0
Merge pull request #17991 from frederic34/patch-7
...
fix warning
2021-06-21 11:38:28 +02:00
Laurent Destailleur
bb8d5cec1b
More complete management of
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:36:28 +02:00
Laurent Destailleur
30e5f5f96a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-21 11:24:14 +02:00
Laurent Destailleur
5bfd82e528
Clean code
2021-06-21 11:23:53 +02:00
Laurent Destailleur
59a7d5b89d
Introduce option
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:13:30 +02:00
Frédéric FRANCE
9fd06537b7
move admin warnings on top instead bottom
2021-06-21 10:42:20 +02:00
Laurent Destailleur
0dc16b135d
FIX allow disabling of a module (not dangerous) even if pb with token.
2021-06-21 00:05:01 +02:00
Alexandre SPANGARO
c8326c1365
FIX Accoutancy Limit date payment not register on purchases operations
2021-06-20 21:55:48 +02:00
Maxime Kohlhaas
2d9d46b9b5
Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_mo_stuff
2021-06-20 21:08:28 +02:00
Frédéric FRANCE
c9c3cef5d7
Update syslog.php
2021-06-20 20:15:19 +02:00
Frédéric FRANCE
9ee9556200
Update user.php
2021-06-20 18:37:43 +02:00
Frédéric FRANCE
6fb17b9777
fix warnings
2021-06-20 18:28:25 +02:00
Frédéric FRANCE
cff5edd604
Update syslog.php
2021-06-20 18:24:00 +02:00
Frédéric FRANCE
40afa5b1cc
fix warning
...
there is already an array called $option
2021-06-20 18:21:10 +02:00
Laurent Destailleur
21edb498c0
Merge pull request #17987 from daraelmin/daraelmin-patch-1
...
Fix 17986 error on comparing integer and string in strict sql
2021-06-20 17:26:56 +02:00
Laurent Destailleur
002471b1fe
Update adherentstats.class.php
2021-06-20 17:25:58 +02:00
Laurent Destailleur
b40b3df86e
Merge pull request #17990 from frederic34/patch-9
...
remove not used var and fix php warnings
2021-06-20 17:22:16 +02:00
Laurent Destailleur
c78f4a9248
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 17:20:24 +02:00
Laurent Destailleur
65110411ac
Doc
2021-06-20 17:20:12 +02:00
daraelmin
cfd7c610db
Use dolSqlDateFilter instead of SQL function YEAR
2021-06-20 17:14:28 +02:00
Frédéric FRANCE
c820193d11
remove not used var and fix php warnings
2021-06-20 17:01:41 +02:00
Laurent Destailleur
f486595e13
Fix dolSqlDateFilter
2021-06-20 16:55:22 +02:00
Laurent Destailleur
7ec3ff4bdc
Merge pull request #17989 from frederic34/patch-8
...
fix php warnings
2021-06-20 16:40:34 +02:00
Laurent Destailleur
3b09cc8e16
Merge pull request #17988 from frederic34/patch-7
...
fix php warning
2021-06-20 16:40:25 +02:00
Laurent Destailleur
5ad999e46d
css
2021-06-20 16:39:30 +02:00
Laurent Destailleur
6aeba1b79d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 16:36:05 +02:00
Laurent Destailleur
68b8a6a916
css
2021-06-20 16:35:49 +02:00
Frédéric FRANCE
4e7af173a6
fix php warnings
2021-06-20 16:33:41 +02:00
Frédéric FRANCE
4739694ad7
fix php warning
2021-06-20 16:24:58 +02:00
daraelmin
a54a955a65
Use year() instead of date_format
2021-06-20 15:40:32 +02:00
daraelmin
831cc4f4b7
Fix 17986 error on comparing integer and string in strict sql
2021-06-20 14:19:05 +02:00
Laurent Destailleur
23c0edf854
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking
...
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-20 12:55:30 +02:00
Laurent Destailleur
ab34a105c7
Merge pull request #17985 from grandoc/new_branch_20_06_2021
...
internationalization
2021-06-20 12:54:18 +02:00
Laurent Destailleur
a9dd5e8764
Fix css hidoneprint
2021-06-20 12:52:04 +02:00
Laurent Destailleur
633a6081fc
Merge pull request #17984 from atm-john/fix_search_drop_down
...
Fix : search drop down
2021-06-20 12:44:56 +02:00
Philippe GRAND
ebe7b696a6
internationalization
2021-06-20 12:02:52 +02:00
Philippe GRAND
5bde0dbc16
internationalization
2021-06-20 12:00:27 +02:00
Philippe GRAND
ae293d61c6
internationalization
2021-06-20 11:59:02 +02:00
Philippe GRAND
fb13d74467
internationalization
2021-06-20 11:56:49 +02:00
Philippe GRAND
dbee213db1
internationalization
2021-06-20 11:54:51 +02:00
Philippe GRAND
1480123f7d
internationalization
2021-06-20 11:53:21 +02:00
Philippe GRAND
e33db2876a
internationalization
2021-06-20 11:51:02 +02:00
Philippe GRAND
c06fcd36fb
internationalization
2021-06-20 11:48:30 +02:00
Philippe GRAND
d60d15883f
internationalization
2021-06-20 11:46:22 +02:00
Philippe GRAND
a4e63a1a26
internationalization
2021-06-20 11:43:05 +02:00
Philippe GRAND
057e78d8c3
internationalization
2021-06-20 11:40:54 +02:00
Philippe GRAND
b07d2f257a
internationalization
2021-06-20 11:37:51 +02:00
Philippe GRAND
14af45057c
internationalization
2021-06-20 11:35:37 +02:00
Philippe GRAND
748c10c2f9
internationalization
2021-06-20 11:32:25 +02:00
Philippe GRAND
1207944761
internationalization
2021-06-20 11:29:47 +02:00
Philippe GRAND
9ccc9d0d3d
internationalization
2021-06-20 11:27:49 +02:00
Philippe GRAND
93512fd501
internationalization
2021-06-20 11:26:25 +02:00
Philippe GRAND
ddaa9ecfc1
internationalization
2021-06-20 11:24:36 +02:00
Philippe GRAND
9acbb984a1
internationalization
2021-06-20 11:22:17 +02:00
Philippe GRAND
e5083d18af
internationalization
2021-06-20 11:20:20 +02:00
Philippe GRAND
5977fe23e7
internationalization
2021-06-20 11:18:07 +02:00
Philippe GRAND
f8187eb70e
internationalization
2021-06-20 11:16:03 +02:00
Philippe GRAND
0d60323e41
internationalization
2021-06-20 11:13:31 +02:00
Philippe GRAND
e2ef205036
internationalization
2021-06-20 11:11:41 +02:00
Philippe GRAND
d3a9b03c89
internationalization
2021-06-20 11:08:53 +02:00
Philippe GRAND
f4199ca99e
internationalization
2021-06-20 11:06:04 +02:00
Philippe GRAND
e5f43cc678
internationalization
2021-06-20 11:03:28 +02:00
Philippe GRAND
33ffb8b943
internationalization
2021-06-20 11:01:38 +02:00
Philippe GRAND
fa3e75c68a
internationalization
2021-06-20 10:58:20 +02:00
Philippe GRAND
e61d60e125
internationalization
2021-06-20 10:49:05 +02:00
Laurent Destailleur
e3e2dfd764
Fix generation of ODT (test if temporary directory is writable)
2021-06-20 05:11:46 +02:00
Laurent Destailleur
1a6647e690
Debug v14
2021-06-20 04:10:25 +02:00
Laurent Destailleur
ce818d4f44
Debug doc templates of ODF
2021-06-20 03:41:45 +02:00
Laurent Destailleur
6e27ae6029
Fix path
2021-06-20 01:56:26 +02:00
Laurent Destailleur
4b6427f920
Fix menu entry
2021-06-20 01:55:56 +02:00
Laurent Destailleur
2efd432946
Fix list of security events enabled
2021-06-20 01:54:55 +02:00
Laurent Destailleur
597bdee0bc
Trans
2021-06-20 01:39:07 +02:00
Laurent Destailleur
8df9815049
Add warning to help understand bug of post_max_size.
2021-06-20 01:04:16 +02:00
Laurent Destailleur
0e80784de9
Add warning to help understand bug of post_max_size.
2021-06-20 00:32:25 +02:00
Laurent Destailleur
bf460526c0
Add warning when submiting file larger than post_max_size.
2021-06-20 00:27:24 +02:00
Laurent Destailleur
4a3da84098
Clean code
2021-06-19 23:52:52 +02:00
Laurent Destailleur
414b5e612f
Better info on upload size limit
2021-06-19 22:11:16 +02:00
Laurent Destailleur
edb4cf4130
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
README.md
htdocs/filefunc.inc.php
2021-06-19 20:05:25 +02:00
Laurent Destailleur
5d6b26ddb7
Fix css
2021-06-19 19:45:13 +02:00
Laurent Destailleur
77ee317f8a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-19 19:24:46 +02:00
Laurent Destailleur
bbb2cdfbdf
Prepare 13.0.4
2021-06-19 19:24:32 +02:00
Laurent Destailleur
94ab340bba
Fix css
2021-06-19 19:23:56 +02:00
ATM john
8cc2cec560
Fix search drop down
2021-06-19 16:56:08 +02:00
Laurent Destailleur
6911cc93d1
Fix: do not open the section to link files automatically after submit
2021-06-19 15:53:36 +02:00
Laurent Destailleur
f303e6664b
Fix reposition do not add several times the page_y parameter.
2021-06-19 15:32:20 +02:00
Laurent Destailleur
1067d91f12
Merge pull request #17975 from OPEN-DSI/fix-17965
...
FIX 17965 - Keep enter key only to submit expense lines form
2021-06-19 15:02:42 +02:00
stickler-ci
26f72b7fff
Fixing style errors.
2021-06-19 12:58:08 +00:00
Laurent Destailleur
3669600242
Update commande.class.php
2021-06-19 14:55:41 +02:00
Laurent Destailleur
194637cfda
Merge branch 'develop' into oldline
2021-06-19 14:54:44 +02:00
Laurent Destailleur
dfa5c419b3
Update commande.class.php
2021-06-19 14:52:06 +02:00
Laurent Destailleur
8372a79c1d
Clean code
2021-06-19 14:22:41 +02:00
Laurent Destailleur
0fd200083f
Merge pull request #17970 from a-schild/develop
...
Allow to update ref_ext via webservices
2021-06-19 14:20:28 +02:00
Laurent Destailleur
d529f8071f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-19 14:16:46 +02:00
Laurent Destailleur
7046791377
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-19 14:16:39 +02:00
Marc GUENNEUGUES
4346958455
Correct rights in core/ajax/row.php
2021-06-18 20:03:03 +02:00
Laurent Destailleur
ad105e97d1
Allow creation of client
2021-06-18 13:57:08 +02:00
Laurent Destailleur
b026c28cee
Hide pass
2021-06-18 13:20:55 +02:00
Frédéric FRANCE
9b4a8aca1b
fix typo can't set mandatory
2021-06-18 11:00:00 +02:00
lvessiller
af634b7f2b
FIX 17965 - Keep enter key only to submit expense lines form
2021-06-18 10:51:39 +02:00
Laurent Destailleur
53295a0cb1
Fix phpcs
2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795
Fix PHPCS
2021-06-18 00:59:18 +02:00
Laurent Destailleur
ceaa2a9c5e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/ticket/class/actions_ticket.class.php
2021-06-17 22:06:26 +02:00
Laurent Destailleur
10dadb2247
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-17 22:02:29 +02:00
Laurent Destailleur
51eaecdc6b
Fix phpcs
2021-06-17 22:02:06 +02:00
Laurent Destailleur
62cbea6bca
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-17 21:35:42 +02:00
Laurent Destailleur
5063f29532
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/mailing/class/mailing.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/replenish.php
2021-06-17 21:35:31 +02:00
Laurent Destailleur
98a0959b64
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-17 21:31:00 +02:00
Laurent Destailleur
e4056b8a1d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-17 21:30:50 +02:00
stickler-ci
d4fa284f67
Fixing style errors.
2021-06-17 16:18:55 +00:00
a-schild
597e8ef671
Allow to update ref_ext via webservices
...
See issue #17967
2021-06-17 18:17:08 +02:00
Laurent Destailleur
c8a25c9dad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-17 18:02:45 +02:00
Laurent Destailleur
5b8c93b090
FIX #17967
2021-06-17 18:01:31 +02:00
Laurent Destailleur
bbc6e9d8ac
Merge pull request #17965 from OPEN-DSI/new-expensereport-prevent-submit-on-enter-key
...
NEW prevent default submit form on enter key in expense card
2021-06-17 17:51:56 +02:00
stickler-ci
047b9715fb
Fixing style errors.
2021-06-17 15:26:31 +00:00
Georg Meißner
3134f5be8f
Make some product fields hidable
...
This commit allows to hide some more fields in the product card (e.g. you can hide SIZE but not WEIGHT).
To allow the product card to be customized a bit better, following new variables can be set to hide the corresponding fields:
PRODUCT_DISABLE_PUBLIC_URL
PRODUCT_DISABLE_STOCK_LEVELS
PRODUCT_DISABLE_NATURE
PRODUCT_DISABLE_WEIGHT
PRODUCT_DISABLE_PRICES
PRODUCT_DISABLE_ACCOUNTING
The documentation has to be adapted accordingly.
2021-06-17 17:22:37 +02:00
lvessiller
7fb19b3ef9
NEW prevent default submit form on enter key in expense card
2021-06-17 15:27:17 +02:00
Laurent Destailleur
ce9dbfccd7
Merge pull request #17953 from atm-gauthier/fix_trackingnumber_line_not_displaied_if_empty
...
FIX : Tracking number label shouldn't be displaied on "espadon" model…
2021-06-17 13:36:42 +02:00
Laurent Destailleur
ac6bbc1914
Merge pull request #17961 from Hystepik/develop#1
...
Fix #17906 : fix access denied
2021-06-17 13:30:45 +02:00
Laurent Destailleur
3ff4f7c722
Merge pull request #17959 from dolibit-ut/patch-360
...
Update month_report.php
2021-06-17 13:30:15 +02:00
Laurent Destailleur
378184564a
Merge pull request #17957 from dolibit-ut/patch-358
...
Update define_holiday.php
2021-06-17 13:30:03 +02:00
Laurent Destailleur
70309d8a3e
Merge pull request #17956 from dolibit-ut/patch-357
...
Update card.php
2021-06-17 13:29:52 +02:00
Laurent Destailleur
de1f21082f
Merge pull request #17955 from dolibit-ut/patch-356
...
Update llx_00_c_country.sql
2021-06-17 13:29:29 +02:00
Laurent Destailleur
2f4f8648af
Merge pull request #17960 from dolibit-ut/patch-361
...
Update view_log.php
2021-06-17 13:29:09 +02:00
Gauthier PC portable 024
50bc832532
FIX : better correction
2021-06-17 10:48:48 +02:00
atm-lena
9769e33eab
notigger parameter
2021-06-17 10:41:55 +02:00
atm-lena
5b8a6f1d71
Add Trigger "MAILING_DELETE"
2021-06-17 10:41:03 +02:00
Juanjo Menent
eeef78760a
fix: Bad position of the printFieldListWhere hook
2021-06-17 10:29:43 +02:00
lmarcouiller
cf3761eb2e
Fix #17906 : fix access denied
2021-06-17 10:09:07 +02:00
Juanjo Menent
99655eeb39
FIX: styles failure in tickets with very long messages
2021-06-17 09:28:45 +02:00
UT from dolibit
23b24c589e
Update view_log.php
...
$title
2021-06-17 09:15:24 +02:00
UT from dolibit
789a2744f2
Update month_report.php
...
$title
2021-06-17 09:13:54 +02:00
UT from dolibit
c1297d561d
Update document.php
2021-06-17 09:11:07 +02:00
UT from dolibit
e62e6d9696
Update define_holiday.php
...
$title
2021-06-17 09:08:59 +02:00
UT from dolibit
053f8f8338
Update card.php
2021-06-17 09:07:17 +02:00
UT from dolibit
e67062aea1
Update llx_00_c_country.sql
...
Ouganda -> Uganda
Ukraine = Ukraine
United Arab Emirates (is yet EN)
Iles mineures éloignées des États-Unis -> United States Minor Outlying Islands
Uruguay = Uruguay
Ouzbékistan -> Uzbekistan
Vanuatu = Vanuatu
Vénézuela -> Venezuela
Viêt Nam -> Vietnam
Iles Vierges britanniques -> British Virgin Islands
Iles Vierges américaines -> Virgin Islands of the United States (also called: American Virgin Islands)
Wallis-et-Futuna -> Wallis and Futuna
Sahara occidental -> Western Sahara
Yémen -> Yemen
Zambie -> Zambia
Zimbabwe = Zimbabwe
Guernesey -> Guernsey
Ile de Man -> Isle of Man
Jersey = Jersey
Monténégro -> Montenegro
Saint-Barthélemy (Saint Barthélemy)
Saint-Martin (Saint Martin)
Kosovo = Kosovo
2021-06-17 09:04:41 +02:00
Laurent Destailleur
61bd572a9c
Fix token for ajax call
2021-06-17 03:37:52 +02:00
Laurent Destailleur
3754c2c3c9
Fix name of field
2021-06-17 00:59:11 +02:00
Laurent Destailleur
e04cf7d53a
css
2021-06-16 22:17:44 +02:00
Laurent Destailleur
c4e8866727
Clean code
2021-06-16 21:20:27 +02:00
Laurent Destailleur
f850f058fa
Look and feel v14
2021-06-16 21:06:55 +02:00
Laurent Destailleur
834fc289b6
Fix look and feel v14
2021-06-16 20:35:55 +02:00
Laurent Destailleur
ac1e6c9966
FIX sql error on strict mysql
2021-06-16 20:17:21 +02:00
Laurent Destailleur
19ddfc8fc6
Fix warning
2021-06-16 19:44:58 +02:00
Laurent Destailleur
8db0ecd4db
Add fix of corrupted data
2021-06-16 19:40:43 +02:00
Laurent Destailleur
8c18837095
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-16 19:01:03 +02:00
Laurent Destailleur
f6998d7c32
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2021-06-16 19:00:52 +02:00
Gauthier PC portable 024
657972b79b
FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty
2021-06-16 16:49:24 +02:00
Laurent Destailleur
3020cce9ee
Merge pull request #17951 from frederic34/patch-7
...
fix warning
2021-06-16 14:32:36 +02:00
Laurent Destailleur
b2221d2c3a
Update extrafields.class.php
2021-06-16 14:31:22 +02:00
Antonin MARCHAL
d5cb81982d
fix wrong display on extrafields type = double
2021-06-16 14:21:23 +02:00
Frédéric FRANCE
11a1cba68a
fix warning
2021-06-16 12:10:21 +02:00
Laurent Destailleur
daff2c25f7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-16 12:08:47 +02:00
Laurent Destailleur
06b09f614a
Fix var not defined
2021-06-16 12:08:34 +02:00
Laurent Destailleur
d8e144808f
Merge pull request #17950 from frederic34/patch-9
...
fix unknown right
2021-06-16 12:04:29 +02:00
Laurent Destailleur
89442c9ab5
Merge pull request #17949 from frederic34/patch-8
...
fix php warning
2021-06-16 12:02:54 +02:00
Frédéric FRANCE
cf9c595568
fix unknown right
...
supprimer doesn't exists
2021-06-16 12:01:52 +02:00
Frédéric FRANCE
fca75a5842
fix php warning
2021-06-16 11:54:33 +02:00
Frédéric FRANCE
5d79143401
fix php warning
2021-06-16 11:50:52 +02:00
Laurent Destailleur
0baa992ded
Merge pull request #17945 from dolibit-ut/patch-354
...
Update llx_00_c_country.sql
2021-06-16 11:31:33 +02:00
Laurent Destailleur
b28395dd05
Merge pull request #17942 from aspangaro/14a26
...
Look & feel v14
2021-06-16 11:31:16 +02:00
UT from dolibit
b8824435d2
Update llx_00_c_country.sql
...
Taïwan -> Taiwan
Tadjikistan -> Tajikistan
Tanzanie -> Tanzania
Thaïlande -> Thailand
Timor Oriental -> East Timor / Timor-Leste
Tokélaou -> Tokelau
Tonga = Tonga
Trinité-et-Tobago -> Trinidad and Tobago
Turquie -> Turkey
Turkménistan -> Turkmenistan
Iles Turks-et-Caicos -> Turks and Caicos Islands
Tuvalu = Tuvalu
2021-06-16 09:40:45 +02:00
Alexandre SPANGARO
7f0d2b009e
FIX SQL Error on automatic binding with functionality "company per entity" activated
2021-06-16 06:23:50 +02:00
Alexandre SPANGARO
e848579495
Look & feel v14
2021-06-16 06:00:00 +02:00
Laurent Destailleur
e503f73e95
Comment dead code
2021-06-15 22:28:39 +02:00
Laurent Destailleur
8b238c43ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:23:46 +02:00
Laurent Destailleur
b6f90c3299
Merge pull request #17939 from Hystepik/develop#2
...
Fix #17930 : input boxes can be empty as previously on survey
2021-06-15 22:20:03 +02:00
Laurent Destailleur
244ff0b35a
Merge pull request #17937 from Hystepik/develop#1
...
Close #17890 : produceandconsume into api finished
2021-06-15 22:19:21 +02:00
Laurent Destailleur
df41691377
Merge pull request #17936 from dolibit-ut/patch-352
...
Update index.php
2021-06-15 22:18:38 +02:00
Laurent Destailleur
36f599519e
Merge pull request #17935 from frederic34/patch-8
...
fix php warning
2021-06-15 22:18:26 +02:00
Laurent Destailleur
6bf8e425c5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/contacts.tpl.php
2021-06-15 22:17:53 +02:00
Laurent Destailleur
5cccf901c8
Merge pull request #17931 from dolibit-ut/patch-350
...
Update llx_00_c_country.sql
2021-06-15 22:12:56 +02:00
Laurent Destailleur
2a3b330e1e
Fix newToken()
2021-06-15 22:10:59 +02:00
Laurent Destailleur
1aad151e19
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-15 22:08:50 +02:00
Laurent Destailleur
ac7ad64737
Merge pull request #17934 from frederic34/patch-7
...
fix php warning
2021-06-15 22:08:37 +02:00
stickler-ci
26cae49faf
Fixing style errors.
2021-06-15 20:06:48 +00:00
Laurent Destailleur
5ddf12b29c
Fix set language
2021-06-15 22:06:26 +02:00
Laurent Destailleur
78f41bf60e
Update card.php
2021-06-15 22:04:31 +02:00
Laurent Destailleur
dc6512e5af
Merge pull request #17940 from Hystepik/develop#3
...
Fix #17907 : import of the undefined function
2021-06-15 22:00:17 +02:00
Laurent Destailleur
f1cd3a7044
Merge pull request #17941 from frederic34/recruitement
...
replace recruitement by recruitment
2021-06-15 21:59:56 +02:00
Laurent Destailleur
1c87420895
Fix #yogosha6411
2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679
Clean code
2021-06-15 20:16:05 +02:00
Frédéric FRANCE
f79e16e3b1
replace recruitement by recruitment
2021-06-15 19:08:08 +02:00
Laurent Destailleur
adfbb9d7d5
Fix VAT column missing
2021-06-15 17:53:25 +02:00
Laurent Destailleur
f6274b8418
Fix nb of holidays can be float
2021-06-15 16:29:42 +02:00
Laurent Destailleur
d0173044ac
css
2021-06-15 16:18:15 +02:00
lmarcouiller
674bd53b32
Fix #17907 : import of the undefined function
2021-06-15 16:11:25 +02:00
Laurent Destailleur
162da2a5b1
css
2021-06-15 15:24:12 +02:00
Laurent Destailleur
83ec4cbd71
Reponsive
2021-06-15 15:19:46 +02:00
lmarcouiller
d070c5b75d
Fix #17930 : input boxes can be empty as previously
2021-06-15 15:13:25 +02:00
Laurent Destailleur
5f7dddbdcb
Fix permissions
2021-06-15 14:49:08 +02:00
Laurent Destailleur
43c5dd2aea
Fix permissions
2021-06-15 14:29:07 +02:00
Laurent Destailleur
3cd4f3e4af
Fix permissions
2021-06-15 14:26:59 +02:00
Laurent Destailleur
80760d7960
Fix permissions
2021-06-15 14:18:09 +02:00
Laurent Destailleur
7f3c8b4cd5
Fix user can't edit record
2021-06-15 13:54:52 +02:00
Laurent Destailleur
d1ffd4fcc8
Trans
2021-06-15 13:48:00 +02:00
kevin
9ff0efbcc2
FIX fatal error when adding message to a ticket
2021-06-15 12:04:24 +02:00
lmarcouiller
2688b902b6
Close #17890 : produceandconsume into api finished
2021-06-15 11:35:41 +02:00
UT from dolibit
77f0645c0e
Update index.php
2021-06-15 10:30:58 +02:00
Frédéric FRANCE
5ceb957059
fix php warning
2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php
2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning
2021-06-15 08:31:08 +02:00
Laurent Destailleur
a1e6236df0
Fix regression sql error
2021-06-15 02:15:45 +02:00
Laurent Destailleur
3b9936f7e2
Fix responsive
2021-06-15 01:18:17 +02:00
UT from dolibit
41549af751
Update llx_00_c_country.sql
...
Iles Salomon -> Solomon Islands
Somalie -> Somalia
South Africa
Iles Géorgie du Sud et Sandwich du Sud -> South Georgia and the South Sandwich Islands
Sri Lanka = Sri Lanka
Soudan -> Sudan
Suriname = Suriname
Iles Svalbard et Jan Mayen -> Svalbard and Jan Mayen
Swaziland = Swaziland & new also: Eswatini
Syrie -> Syria
2021-06-14 21:45:11 +02:00
stickler-ci
82f195dc30
Fixing style errors.
2021-06-14 19:15:53 +00:00
ATM john
be367c589f
WIP - create validation method for common object
2021-06-14 21:12:48 +02:00
ATM john
23765bf459
WIP - create validation method for common object
2021-06-14 20:59:46 +02:00
Laurent Destailleur
7e7800c110
Fix phpcs
2021-06-14 20:37:21 +02:00
Laurent Destailleur
347c6ae8a8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/projet/class/project.class.php
htdocs/projet/list.php
2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344
FIX Collector to create lead was broken
2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02
Add info to allow debug of email collector
2021-06-14 19:58:12 +02:00
Laurent Destailleur
165d0d76d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 19:29:03 +02:00
Laurent Destailleur
8b0c2d997c
Clean code
2021-06-14 19:28:38 +02:00
stickler-ci
745ad8b403
Fixing style errors.
2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2
FIX : method exists
2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347
FIX : same thing on supplier orders
2021-06-14 17:01:59 +02:00
Laurent Destailleur
5fade1148d
Merge pull request #17829 from aspangaro/14b12
...
NEW Add field date start/end from/to in expense report list
2021-06-14 16:11:13 +02:00
Laurent Destailleur
dd27d38d5e
Merge pull request #17869 from aspangaro/14b13
...
NEW Add field date from/to in supplier invoice list
2021-06-14 16:02:50 +02:00
Laurent Destailleur
4b7292e405
Merge pull request #17928 from dolibit-ut/patch-349
...
Update card.php
2021-06-14 15:47:44 +02:00
Laurent Destailleur
b64f54c86f
Merge pull request #17927 from dolibit-ut/patch-348
...
Update card.php
2021-06-14 15:46:49 +02:00
stickler-ci
afa1e117c5
Fixing style errors.
2021-06-14 13:37:39 +00:00
Scrutinizer Auto-Fixer
55c9f37ffa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
d04fe12ce9
# WARNING: head commit changed in the meantime
...
Clean code
2021-06-14 15:05:54 +02:00
Laurent Destailleur
261bc88545
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:50:26 +02:00
Laurent Destailleur
617338cccd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee
Clean code
2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line
...
FIX clone invoice with acount line
2021-06-14 14:41:05 +02:00
Laurent Destailleur
9a820ba974
Merge pull request #17925 from dolibit-ut/patch-347
...
Update agenda.php
2021-06-14 14:27:56 +02:00
Laurent Destailleur
094315d708
Merge pull request #17926 from daraelmin/daraelmin-patch-1
...
Clean code (use Adh constant and precise comment)
2021-06-14 14:27:40 +02:00
Laurent Destailleur
3cacad795f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:26:07 +02:00
UT from dolibit
d2a19b530f
Update card.php
2021-06-14 14:24:21 +02:00
Laurent Destailleur
988dbd25b3
Fix sql syntax error
2021-06-14 14:24:18 +02:00
Laurent Destailleur
d0b033548c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
2021-06-14 14:21:53 +02:00
Laurent Destailleur
46752186fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:15:53 +02:00
Laurent Destailleur
f988f4c352
Fix contact
2021-06-14 14:15:32 +02:00
UT from dolibit
45e0f8a7ee
Update card.php
2021-06-14 14:11:21 +02:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0
...
Fix create image thumbs on php 8.0
2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php
2021-06-14 14:05:48 +02:00
Laurent Destailleur
91933dda4e
Merge pull request #17924 from dolibit-ut/patch-346
...
Update bom_agenda.php
2021-06-14 14:03:24 +02:00
Laurent Destailleur
5cc86d2319
Fix #yogosha6370
2021-06-14 13:51:09 +02:00
daraelmin
023453e73b
Update geo.php
2021-06-14 12:45:13 +02:00
daraelmin
8423ad823b
Update list.php
2021-06-14 12:41:32 +02:00
daraelmin
80f4278c42
Clean code
2021-06-14 12:24:58 +02:00
daraelmin
f5ec96bfce
Clean code (use Adh constant and precise comment)
2021-06-14 12:19:24 +02:00
UT from dolibit
2143395d70
Update agenda.php
2021-06-14 11:02:43 +02:00
UT from dolibit
ba4f7a66d3
Update bom_agenda.php
2021-06-14 10:55:29 +02:00
Adrien Raze
0f91c4cfa2
FIX : Allow to set bookmarks on list filtered by multiselect fields
2021-06-14 10:02:44 +02:00
Laurent Destailleur
046215f64a
Fix PHP8
2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c
Debug v14
2021-06-14 01:33:01 +02:00
Laurent Destailleur
aceeb9558f
css
2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3
Look and feel v14
2021-06-14 01:11:39 +02:00
Laurent Destailleur
465ee6e643
Fix security check on public pages
2021-06-13 20:37:53 +02:00
Laurent Destailleur
3eea92c6e6
Clean code
2021-06-13 20:36:12 +02:00
Laurent Destailleur
6f97a551ef
Clean code
2021-06-13 20:32:11 +02:00
Laurent Destailleur
67e00e5cf5
Fix regression. Missing rollback.
2021-06-13 19:05:48 +02:00
Laurent Destailleur
95ee0f630d
Fix phpcs
2021-06-13 18:10:04 +02:00
Francis Appels
a019996bc8
Fix create image thumbs on php 8.0
2021-06-13 17:36:51 +02:00
Laurent Destailleur
a72f66b456
Fix: dictionnaries are edited per entity
2021-06-13 16:32:06 +02:00
Laurent Destailleur
e0abbb2525
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-13 16:24:21 +02:00
Laurent Destailleur
0cbcba7bc4
Merge pull request #17916 from frederic34/patch-16
...
fix warnings
2021-06-13 16:21:44 +02:00
Laurent Destailleur
205a6fac98
Merge pull request #17910 from frederic34/patch-11
...
fix PDF BACKGROUND not found
2021-06-13 16:21:05 +02:00
Laurent Destailleur
e9dc9b87b2
Merge pull request #17911 from frederic34/patch-12
...
Update pdf_standard_recruitmentjobposition.modules.php
2021-06-13 16:20:34 +02:00
Laurent Destailleur
48b604e4d5
Merge pull request #17905 from aspangaro/14a26
...
Accountancy - Maxi debug of new functionnality date validation
2021-06-13 16:19:44 +02:00
Laurent Destailleur
bc00a1a0f3
Merge pull request #17903 from dolibit-ut/patch-342
...
Update llx_c_chargesociales.sql
2021-06-13 16:17:04 +02:00
Laurent Destailleur
6708800d54
Merge pull request #17902 from frederic34/patch-9
...
fix warnings
2021-06-13 16:16:21 +02:00
Laurent Destailleur
172f1b5260
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-13 16:16:17 +02:00
Laurent Destailleur
1c7f141f06
Merge pull request #17901 from frederic34/patch-8
...
fix warning
2021-06-13 16:16:06 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7
...
fix warnings
2021-06-13 16:15:58 +02:00
Laurent Destailleur
ec87115177
Merge pull request #17915 from frederic34/patch-15
...
fix warning
2021-06-13 16:15:51 +02:00
Laurent Destailleur
56a943b2ea
Merge pull request #17914 from frederic34/patch-14
...
fix warnings
2021-06-13 16:15:44 +02:00
Laurent Destailleur
c4cba43bad
FIX Broken Access Control reported by Ahsan Aziz.
2021-06-13 16:15:05 +02:00
Frédéric FRANCE
20f6a34249
Update list.php
2021-06-13 16:12:46 +02:00
Frédéric FRANCE
d774e19afe
fix warnings
2021-06-13 16:10:45 +02:00
Frédéric FRANCE
791e4ab056
fix warning
2021-06-13 15:59:22 +02:00
Frédéric FRANCE
519d7f1d0f
fix warnings
2021-06-13 15:47:42 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning
2021-06-13 15:37:54 +02:00
Laurent Destailleur
497e9edbb2
Trans
2021-06-13 15:17:47 +02:00
Laurent Destailleur
abfc87c1de
Fix separator extrafields must not appear as selected fields
2021-06-13 13:32:41 +02:00
Frédéric FRANCE
8a6517efb5
Merge remote-tracking branch 'upstream/develop' into patch-9
2021-06-13 08:54:57 +02:00
Frédéric FRANCE
e9913fa9d0
Merge remote-tracking branch 'upstream/develop' into patch-8
2021-06-13 08:53:44 +02:00
Alexandre SPANGARO
cf723d5120
Look a feel v14 CSS Amount
2021-06-13 06:37:44 +02:00
Alexandre SPANGARO
11959ec1ab
Fix some date problems
2021-06-13 06:07:01 +02:00
Alexandre SPANGARO
94850cd25b
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-06-13 06:06:33 +02:00
Laurent Destailleur
bb48da988b
css
2021-06-13 01:32:14 +02:00
Laurent Destailleur
8b9af8f5ab
Responsive
2021-06-13 01:27:04 +02:00
Frédéric FRANCE
6ff97ca2c6
Update pdf_standard_recruitmentjobposition.modules.php
2021-06-12 19:28:58 +02:00
Frédéric FRANCE
74e06353e9
fix PDF BACKGROUND not found
2021-06-12 19:25:47 +02:00
Laurent Destailleur
9ba0fe07f0
Fix phpcs
2021-06-12 18:47:29 +02:00
Frédéric FRANCE
a723a8f93e
remove phpcs warning
2021-06-12 18:40:00 +02:00
Laurent Destailleur
7cb647e5b5
Complete log
2021-06-12 17:02:24 +02:00
Laurent Destailleur
a8401ca30d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-12 15:47:18 +02:00
Laurent Destailleur
f13dcb5376
Fix merge
2021-06-12 15:44:03 +02:00
Alexandre SPANGARO
53d0909a7c
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-06-12 14:20:00 +02:00
Alexandre SPANGARO
7444ff5412
Update notified
2021-06-12 14:18:44 +02:00
ATM john
43ecba2e63
WIP - create validation method for common object
2021-06-12 14:16:40 +02:00
ATM john
578dc9adde
WIP - create validation method for common object
2021-06-12 12:58:20 +02:00
UT from dolibit
c3a27b5ab9
Update llx_c_chargesociales.sql
2021-06-12 10:32:42 +02:00
Frédéric FRANCE
4138353d7f
fix warnings
2021-06-12 09:11:12 +02:00
Frédéric FRANCE
3ca8de8fab
fix warning
2021-06-12 07:20:41 +02:00
Frédéric FRANCE
56afefd6ad
fix warnings
2021-06-12 07:12:45 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm
...
New : Missing hook for stock movements list
2021-06-11 19:58:21 +02:00
Laurent Destailleur
306b7779ff
Merge branch 'develop' into 11p1
2021-06-11 19:55:37 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts
...
add more capabilities for zapier
2021-06-11 19:51:01 +02:00
Laurent Destailleur
d3815cbb93
css
2021-06-11 19:42:36 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
...
Adding hooks on product stat in order to allow to expand stat on othe…
2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php
2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php
2021-06-11 19:32:25 +02:00
Laurent Destailleur
c4d0086b8a
Fix hook context names
2021-06-11 19:24:26 +02:00
Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod
...
Fix jointure cabyprod
2021-06-11 19:12:29 +02:00
Laurent Destailleur
663cf28eba
Fix lost code during previous merge
2021-06-11 19:05:33 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
cfbf051fca
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-11 18:47:09 +02:00
Laurent Destailleur
4fd9d36eb9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-06-11 18:46:51 +02:00
Laurent Destailleur
65f8405ca4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-11 18:44:45 +02:00
Laurent Destailleur
6bf9a72dab
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-11 18:44:37 +02:00
Laurent Destailleur
eefc6ddf83
Fix phpcs
2021-06-11 18:44:01 +02:00
Laurent Destailleur
06201fa9bb
Merge pull request #17848 from atm-greg/FIX_update_only_vat_on_multiprice
...
verify vat change to update multiprice
2021-06-11 18:22:40 +02:00
Laurent Destailleur
4e66e134bd
Update price.php
2021-06-11 18:21:00 +02:00
Laurent Destailleur
4cde4f6162
Merge pull request #17875 from OPEN-DSI/new-doactions-hook-on-bank-card
...
NEW do actions hook on bank card
2021-06-11 18:18:06 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice
...
remove useless check on invoice line content when generating pdf
2021-06-11 18:13:58 +02:00
Laurent Destailleur
a8f11fec31
Update perweek.php
2021-06-11 18:12:39 +02:00
Laurent Destailleur
057d91698f
Update perday.php
2021-06-11 18:11:55 +02:00
Laurent Destailleur
0315f45198
Update permonth.php
2021-06-11 18:10:57 +02:00
Laurent Destailleur
bdded2af17
Update movement_list.php
2021-06-11 18:09:17 +02:00
Laurent Destailleur
c1745c6fc3
Merge pull request #17881 from frederic34/patch-9
...
fix warnings
2021-06-11 18:03:54 +02:00
Laurent Destailleur
9e6890c719
Merge pull request #17884 from frederic34/patch-12
...
fix warning
2021-06-11 18:02:54 +02:00
Laurent Destailleur
ffb879d152
Merge pull request #17880 from frederic34/patch-8
...
fix warning
2021-06-11 18:02:45 +02:00
Laurent Destailleur
fbe970c739
Merge pull request #17879 from frederic34/patch-7
...
try to fix
2021-06-11 18:02:29 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13
...
fix warnings
2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2
FIX #17649
2021-06-11 17:58:52 +02:00
Laurent Destailleur
92dc0d28ce
Fix disallow reserved values for field name
2021-06-11 17:50:52 +02:00
Laurent Destailleur
ac965bf49a
FIX #16551
2021-06-11 17:40:04 +02:00
Laurent Destailleur
73a1119b26
Clean code
2021-06-11 15:21:24 +02:00
Laurent Destailleur
c2b910f6ed
Clean code
2021-06-11 15:08:54 +02:00
Laurent Destailleur
1605564d5e
Clean code
2021-06-11 14:54:18 +02:00
John BOTELLA
99cada2d43
Fix missing hooks
2021-06-11 14:42:51 +02:00
Laurent Destailleur
52f0de00f6
Fix missing fields
2021-06-11 13:17:22 +02:00
Laurent Destailleur
a88efc9065
Fix permission on produce and consume
...
Missing API to produce
2021-06-11 09:58:03 +02:00
Laurent Destailleur
e17ab1cca6
Clean code
2021-06-11 09:22:01 +02:00
Laurent Destailleur
b0b2bb4d86
Fix trans
2021-06-11 09:20:59 +02:00
Marc de Lima Lucio
3f72f9b544
FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment
2021-06-10 23:29:37 +02:00
Marc de Lima Lucio
96656ff148
FIX: project time spent by day/week: quote mismatch is SQL query to assign to check task assigment
2021-06-10 23:26:33 +02:00
Frédéric FRANCE
f58cf14ae9
Update html.formmail.class.php
2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0
fix warnings
2021-06-10 22:26:58 +02:00
Frédéric FRANCE
acc41adb8d
fix warning
2021-06-10 22:22:24 +02:00
stickler-ci
82feb57fcf
Fixing style errors.
2021-06-10 19:56:03 +00:00
Marc de Lima Lucio
1e7df0ba9f
NEW: holiday: handle monthly updates with cronjob
2021-06-10 21:53:06 +02:00
Frédéric FRANCE
759472f5d1
fix warning
2021-06-10 20:58:56 +02:00
Frédéric FRANCE
86eea2c4fc
Update list.php
2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings
2021-06-10 20:53:29 +02:00
Frédéric FRANCE
3cb17d7535
fix warning
2021-06-10 20:40:10 +02:00
Frédéric FRANCE
648c1ef3a6
try to fix
2021-06-10 20:32:45 +02:00
Laurent Destailleur
77efbda148
Fix responsive
2021-06-10 20:04:21 +02:00
Laurent Destailleur
4e87a08282
Try fix for #17866
2021-06-10 19:02:53 +02:00
Laurent Destailleur
e938d875fb
FIX #17855
2021-06-10 18:34:43 +02:00
Alexis LAURIER
1a2434818d
remove useless check on deposit line content when generating pdf
2021-06-10 18:00:49 +02:00
Laurent Destailleur
8065283f28
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-10 16:53:27 +02:00
Laurent Destailleur
1bf63c7862
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
c44a368213
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2021-06-10 16:47:45 +02:00
Laurent Destailleur
f3b6c8bf17
Merge pull request #17876 from AlexisLaurier/bugfix/supplierBankTransfertWrongCodeCheckMassAction
...
bugfix/supplierBankTransfertWrongCodeCheckMassAction
2021-06-10 16:44:32 +02:00
Laurent Destailleur
693ac3eab6
Code comment
2021-06-10 16:38:09 +02:00
Laurent Destailleur
1950e50c89
Fix test
2021-06-10 16:31:28 +02:00
Laurent Destailleur
548e11d3d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-10 16:30:46 +02:00
Alexis LAURIER
03cd88d145
bugfix/supplierBankTransfertWrongCodeCheckMassAction
2021-06-10 16:29:56 +02:00
Laurent Destailleur
c8c9fb7700
FIX #17847
2021-06-10 16:29:30 +02:00
lvessiller
ed53301cec
NEW do actions hook on bank card
2021-06-10 16:18:20 +02:00
Laurent Destailleur
1798707cce
Merge pull request #17703 from tuxgasy/Fix_new_honorific_title_label
...
No try to translate label field in dictionary for new
2021-06-10 15:38:55 +02:00
Laurent Destailleur
5d6735f364
Merge pull request #17826 from ptibogxiv/patch-428
...
Fix date_start of last subscription
2021-06-10 13:01:07 +02:00
Laurent Destailleur
8cfe957962
Merge branch 'develop' into patch-7
2021-06-10 13:00:16 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade
...
FIX : childtablesoncascade doc
2021-06-10 12:59:19 +02:00
Laurent Destailleur
b7ba9df6b4
Update societe.class.php
2021-06-10 12:59:04 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php
2021-06-10 12:58:42 +02:00
Laurent Destailleur
c013b397a7
Merge pull request #17833 from frederic34/patch-8
...
fix warning
2021-06-10 12:53:24 +02:00
Laurent Destailleur
4fb568e5aa
Merge pull request #17838 from dolibit-ut/patch-340
...
Update llx_c_chargesociales.sql
2021-06-10 12:52:24 +02:00
Laurent Destailleur
5a6a3561b3
Merge pull request #17834 from frederic34/knowledge
...
clean code
2021-06-10 12:52:00 +02:00
Laurent Destailleur
0c6f3a2616
Merge pull request #17862 from atm-gauthier/fix_rounding_on_formatted_tags
...
FIX : auto rounding on "_FORMATED_" tags
2021-06-10 12:50:50 +02:00
Laurent Destailleur
d3c4cf50ca
Merge pull request #17846 from frederic34/patch-9
...
avoid fatal error
2021-06-10 12:22:36 +02:00
Laurent Destailleur
1666e1277b
Merge pull request #17851 from atm-john/13.0_fix_php7_warning
...
Fix php 7 warning : Only variables should be passed by reference
2021-06-10 12:20:26 +02:00
Laurent Destailleur
95bea52984
Merge pull request #17854 from frederic34/patch-11
...
add warning if outstanding limit is exceeded
2021-06-10 12:19:50 +02:00
Laurent Destailleur
f5be9b6244
Merge pull request #17859 from aspangaro/12p14
...
FIX Missing link to language file
2021-06-10 12:19:19 +02:00
Laurent Destailleur
85a8a66545
Merge pull request #17856 from FHenry/dev_fix_imagnethumbnail_project_files
...
fix : #17827
2021-06-10 12:18:21 +02:00
Laurent Destailleur
9ed7a3a5c5
Merge pull request #17863 from marc-dll/11.0_FIX_holiday_massaction_delete_right
...
FIX: holiday list: bad right for mass deletion
2021-06-10 12:13:10 +02:00
Laurent Destailleur
729c12a8e4
Merge pull request #17864 from DorianVabre/FIX_11.0_CSMSFile_count
...
Fix: using strlen() instead of count() to measure a message length on CSMSFile
2021-06-10 12:12:43 +02:00
Laurent Destailleur
32491dc668
Merge pull request #17868 from prolyfix/patch-1
...
bug resolution: exception
2021-06-10 12:09:20 +02:00
Laurent Destailleur
c4dcad5e6b
Fix regression
2021-06-10 11:57:42 +02:00
Laurent Destailleur
c0c773dd1d
css
2021-06-10 11:32:09 +02:00
Alexandre SPANGARO
08186fdff1
Fix warning - search_societe is already present
2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60
FIX Customer invoice list - Pagination lost search_date_xxx information
2021-06-10 06:22:03 +02:00
stickler-ci
17bdd0b5bc
Fixing style errors.
2021-06-10 04:03:51 +00:00
Alexandre SPANGARO
3d26ad4cf8
NEW Add field date from/to in supplier invoice list
2021-06-10 05:59:29 +02:00
Laurent Destailleur
53af424a3d
Fix total tva
2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b
Fix total -> total_ht
2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5
Fix missing user creation/modif of template invoice
2021-06-10 01:56:20 +02:00
Laurent Destailleur
4c89a1146c
Fix popup
2021-06-10 01:13:50 +02:00
Laurent Destailleur
ea0db5a574
Fix popup of invoice
2021-06-10 01:10:35 +02:00
Laurent Destailleur
c40bc085b2
Fix v14
2021-06-10 00:55:10 +02:00
Laurent Destailleur
9afe8e54a7
Fix
2021-06-10 00:41:15 +02:00
Laurent Destailleur
3cc478b133
Fix use of get url
2021-06-10 00:13:23 +02:00
Laurent Destailleur
067f37e22e
Clean code
2021-06-10 00:09:38 +02:00
Laurent Destailleur
7b31ef0ff3
Fix warnings
2021-06-10 00:00:49 +02:00
Laurent Destailleur
9b7795dc44
Debug v14
2021-06-09 23:55:56 +02:00
Laurent Destailleur
f3d54aada5
Clean code
2021-06-09 23:48:28 +02:00
prolyfix
e4d3fd4861
bug resolution: exception
...
when a user test the send mail functionality, an exception is thrown: $object is null in the method_exists's function. and thus not allowed.
Adding is_object resolve the problem
2021-06-09 23:09:31 +02:00
Laurent Destailleur
c00bef83a8
Fix php unit
2021-06-09 18:05:56 +02:00
Laurent Destailleur
16f1210e8a
Fix phpcs
2021-06-09 17:51:22 +02:00
Laurent Destailleur
f472ff4fd9
Add phpunit for dol_eval
2021-06-09 17:47:27 +02:00
Laurent Destailleur
f1c94ac659
NEW Reduce scope of dol_eval function.
2021-06-09 17:44:42 +02:00
lvessiller
c37c371392
FIX clone invoice with acount line
2021-06-09 17:18:01 +02:00
Laurent Destailleur
0b7b12685f
Clean code
2021-06-09 16:41:43 +02:00
Laurent Destailleur
2681d58107
FIx CVE ID: CVE-2021-33816
2021-06-09 16:41:31 +02:00
Nicolas
4e1fe23b7e
FIX: add check display payment link if invoice module is enabled
2021-06-09 15:48:31 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Dorian Vabre
0a23cf029d
using strlen instead of count
2021-06-09 14:13:50 +02:00
Laurent Destailleur
d4ca6bf42a
Clean code
2021-06-09 13:56:03 +02:00
Laurent Destailleur
e915e3403c
Trans
2021-06-09 13:36:37 +02:00
Laurent Destailleur
458ef9f8da
Fix security test
2021-06-09 13:31:00 +02:00
Laurent Destailleur
997674aebc
Fix trans
2021-06-09 13:15:47 +02:00
Laurent Destailleur
a78d29bb71
Fix trans
2021-06-09 13:05:32 +02:00
Laurent Destailleur
14e3d04e25
Add more info on security page
2021-06-09 13:02:17 +02:00
Laurent Destailleur
c375668ab6
Clean code
2021-06-09 12:41:53 +02:00
Marc de Lima Lucio
5d9aa40065
FIX: holiday list: bad right for mass deletion
2021-06-09 12:40:34 +02:00
Gauthier PC portable 024
4b6fb7dd47
FIX : auto rounding on "_FORMATED_" tags
2021-06-09 12:26:28 +02:00
stickler-ci
c62c668c68
Fixing style errors.
2021-06-09 09:29:22 +00:00
Marc de Lima Lucio
d383941596
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop_NEW_project_block_timesheet
2021-06-09 11:24:17 +02:00
Marc de Lima Lucio
7317aad41f
FIX: projet time spent: also restrict to X months back for update and delete
2021-06-09 11:08:38 +02:00
Marc de Lima Lucio
4c6dfd8d5c
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop
2021-06-09 11:03:04 +02:00
MOREAU FRANCK
a141d722ad
Adding hooks on product stat in order to allow to expand stat on other modules
...
stickler-ci test corrections
2021-06-09 08:39:06 +02:00
Alexandre SPANGARO
a4f3792cec
FIX Missing link to language file
2021-06-09 07:42:05 +02:00
Laurent Destailleur
cfa268e0d3
Fix we must add total vat on cash fence receipts (Ticket Z)
2021-06-09 04:13:57 +02:00
Laurent Destailleur
f17e7a6979
Add more info
2021-06-09 03:54:19 +02:00
Laurent Destailleur
27f803cab0
Fix receipt of cash fence must contains more legal information
2021-06-09 03:35:22 +02:00
Florian HENRY
71dbb8733d
fix : #17827
2021-06-08 20:18:31 +02:00
Marc de Lima Lucio
6733d278d8
NEW: project time spent: conf to prevent recording time after X months
2021-06-08 18:13:18 +02:00
MOREAU FRANCK
4b8dfc1abe
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 18:11:59 +02:00
Frédéric FRANCE
af6bbe23ca
add warning if outstanding limit is exceeded
2021-06-08 17:39:13 +02:00
Laurent Destailleur
fa4786a3f6
Fix permission
2021-06-08 16:19:21 +02:00
Laurent Destailleur
facf594b2d
FIX Date of invoice generated from membership must be current date
2021-06-08 16:01:26 +02:00
Laurent Destailleur
6eab0f5661
Fix css
2021-06-08 15:49:26 +02:00
MOREAU FRANCK
2e66509245
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 15:47:20 +02:00
Laurent Destailleur
1aeb91eb9a
FIX entry menus that has been lost in v13
...
Look and feel v14
2021-06-08 13:44:11 +02:00
John BOTELLA
5131ab5199
Fix php 7 warning : Only variables should be passed by reference
2021-06-08 12:36:08 +02:00
MOREAU FRANCK
207dc1df55
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 12:34:26 +02:00
Frédéric FRANCE
4e530c2486
Update card.php
2021-06-08 12:05:45 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php
2021-06-08 12:01:05 +02:00
Laurent Destailleur
7e95c5ec20
Clean code
2021-06-08 11:40:50 +02:00
atm-greg
37433ffee7
verify vat change to update multiprice
2021-06-08 11:39:04 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error
2021-06-08 10:38:34 +02:00
Gauthier PC portable 024
e64c27e1c3
FIX : need to add payment sum to getlibstatus function in object linked block
2021-06-08 10:27:33 +02:00
Laurent Destailleur
cac63ddd3f
Add missing translation
2021-06-07 12:16:11 +02:00
Laurent Destailleur
0144d6c0fd
Inventory is now stable feature
2021-06-07 11:30:46 +02:00
Quentin VIAL-GOUTEYRON
2a4f6882c5
Merge branch 'FIX_jointure_cabyprod' of github.com:atm-quentin/dolibarr into FIX_jointure_cabyprod
2021-06-07 10:11:19 +02:00
Quentin VIAL-GOUTEYRON
af913cd29f
remove and
2021-06-07 10:10:42 +02:00
stickler-ci
98aa374185
Fixing style errors.
2021-06-07 08:10:05 +00:00
Laurent Destailleur
4f6a5cf5f7
Debug v14
2021-06-07 10:08:31 +02:00
Quentin VIAL-GOUTEYRON
80af5e2216
keep where but remove join
2021-06-07 10:05:24 +02:00
UT from dolibit
2dbf9537b3
Update llx_c_chargesociales.sql
2021-06-07 08:59:47 +02:00
Laurent Destailleur
beca3c8ad3
Debug v14
2021-06-07 01:51:56 +02:00
Laurent Destailleur
d6cbb9007f
Debug ticket form to add a local file
2021-06-07 01:43:24 +02:00
Laurent Destailleur
242f8b2544
Debug v14
2021-06-07 01:23:34 +02:00
Maxime Kohlhaas
a63d3364b4
Fix links in box last MO
2021-06-06 22:51:27 +02:00
ATM john
801f6cab2d
WIP - create validation method for common object
2021-06-06 21:58:59 +02:00
ATM john
f1b1dcd1b1
WIP - create validation method for common object
2021-06-06 21:53:17 +02:00
Frédéric FRANCE
a06fb441d3
clean code
2021-06-06 21:40:47 +02:00
Alexandre SPANGARO
86331c1b7e
Merge branch '11.0' into 11p1
2021-06-06 21:36:30 +02:00
Frédéric FRANCE
a586afd8b3
clean code
2021-06-06 21:35:39 +02:00
Alexandre SPANGARO
ffb1b232d4
Fix Withdraw - link is missing in llx_bank_url when the debit is rejected
2021-06-06 21:27:48 +02:00
Frédéric FRANCE
f3a3ce90e1
Update partnership_card.php
2021-06-06 21:18:23 +02:00
ATM john
aa94d40ad0
WIP - create validation method for common object
2021-06-06 21:12:03 +02:00
Frédéric FRANCE
d54d4da8cd
Update setup.php
2021-06-06 19:18:02 +02:00
Frédéric FRANCE
a47df82468
fix warning
2021-06-06 19:14:42 +02:00
Frédéric FRANCE
8401fa3ce7
add trigger member
2021-06-06 17:57:48 +02:00
Frédéric FRANCE
8a359c9009
Update partnership.class.php
2021-06-06 17:34:03 +02:00
Frédéric FRANCE
ccc35326a5
Update partnershiputils.class.php
2021-06-06 17:25:44 +02:00
Frédéric FRANCE
594cd90c4b
Update partnershipindex.php
2021-06-06 17:22:20 +02:00
Frédéric FRANCE
b1ff123155
Update partnership_note.php
2021-06-06 17:19:20 +02:00
Frédéric FRANCE
0eb61a6063
Update partnership_list.php
2021-06-06 17:17:50 +02:00
Frédéric FRANCE
4ac3576a74
Update partnership_document.php
2021-06-06 17:16:27 +02:00
Frédéric FRANCE
5fecaa2a5b
Update partnership_contact.php
2021-06-06 17:15:36 +02:00
Frédéric FRANCE
83cd127f0b
Update partnership_card.php
2021-06-06 17:14:02 +02:00
Frédéric FRANCE
cc24013d42
Update partnership_agenda.php
2021-06-06 17:13:18 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts
2021-06-06 17:09:35 +02:00
Laurent Destailleur
46a06f8e95
Fix phpcs
2021-06-06 16:37:45 +02:00
Laurent Destailleur
9f177a0c63
Debug v14
2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da
Debug v14
2021-06-06 15:29:49 +02:00
ATM john
1aca7efce3
Fix childtablesoncascade doc
2021-06-06 13:15:03 +02:00
Frédéric FRANCE
efb5ec2901
search by name or email
2021-06-06 10:32:04 +02:00
Alexandre SPANGARO
c1757bdbd8
Remove warning
2021-06-06 06:28:38 +02:00
Alexandre SPANGARO
51bce78e6e
NEW Add field date start/end from/to in expense report list
2021-06-06 06:05:47 +02:00
Laurent Destailleur
92b6425ce0
Debug v14
2021-06-05 18:20:07 +02:00
Laurent Destailleur
70af18148b
Debug modulebuilder v14
2021-06-05 17:49:01 +02:00
Laurent Destailleur
273c4c2880
Fix typo
2021-06-05 15:28:41 +02:00
Laurent Destailleur
fb0d2cdddc
Debug v14
2021-06-05 15:27:49 +02:00
Laurent Destailleur
1e657b8621
Fix value of showoncombobox
2021-06-05 15:14:10 +02:00
ptibogxiv
36accba5c9
Fix date_start of last subscription
2021-06-05 14:43:40 +02:00
Laurent Destailleur
4695bbbd60
Trans
2021-06-05 12:59:19 +02:00
Laurent Destailleur
be97d66f5b
Look and feel v14
2021-06-05 12:58:14 +02:00
Laurent Destailleur
ddbfb5d734
Fix translation of note of product
2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836
Fix bad name of var
2021-06-05 11:07:38 +02:00
Frédéric FRANCE
f6bc1c6414
add trigger contact
2021-06-05 09:37:38 +02:00
Alexandre SPANGARO
a92bd31ce1
Fix search_datexxx
2021-06-05 07:39:15 +02:00
Alexandre SPANGARO
6922359114
Merge remote-tracking branch 'upstream/develop' into 14b10
2021-06-05 07:22:38 +02:00
Alexandre SPANGARO
7608ac2ded
Merge remote-tracking branch 'upstream/develop' into 14b11
2021-06-05 07:20:31 +02:00
Alexandre SPANGARO
466bc26256
Fix with search_date_startxxx
2021-06-05 07:16:43 +02:00
Laurent Destailleur
865bf3b849
CSS
2021-06-05 02:42:49 +02:00
Laurent Destailleur
b6ba1de3b3
Fix remove use of captcha on backoffice for ticket creation
2021-06-05 02:18:45 +02:00
Laurent Destailleur
b77f2be2e1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-05 02:14:16 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks
...
New Hooks to rename Supplier Orders statuses
2021-06-05 02:11:29 +02:00
Laurent Destailleur
39adaec7eb
Fix var not found
2021-06-05 01:29:24 +02:00
Laurent Destailleur
3e53ab5bfe
Fix scrutinizer
2021-06-05 01:17:16 +02:00
Laurent Destailleur
5d063ab880
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-05 01:11:16 +02:00
Laurent Destailleur
f0118183c8
Clean code
2021-06-05 01:11:05 +02:00
Laurent Destailleur
6ae4a75ac2
Update fournisseur.commande.class.php
2021-06-05 01:04:09 +02:00
Laurent Destailleur
246cb09ba5
Update newpayment.php
2021-06-05 00:56:28 +02:00
Laurent Destailleur
420bf440ef
Update newpayment.php
2021-06-05 00:53:07 +02:00
daraelmin
c94946b934
Fix #17743 - token was hashed with membersubscription
...
#Fix #17743 - token was hashed with membersubscription
for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
2021-06-04 23:14:31 +02:00
TuxGasy
56bb2bbd14
On dict, test $obj->code if empty before translation
2021-06-04 17:10:26 +02:00
Laurent Destailleur
0147ffa737
Fix css
2021-06-04 14:38:22 +02:00
Laurent Destailleur
e8aec4824b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 14:37:05 +02:00
Laurent Destailleur
2182e7fd54
Look and feel v14
2021-06-04 14:36:52 +02:00
Laurent Destailleur
27018bd4b4
Fix group by
2021-06-04 14:25:32 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest
...
new: working on conference or booth object and event type #FoundationFunding
2021-06-04 13:12:32 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2
...
Fix #17743 newpayement source membersubscription is member
2021-06-04 13:04:17 +02:00
Laurent Destailleur
bcd028c040
Merge pull request #17739 from fbosman/patch-6
...
Update card.php
2021-06-04 12:57:51 +02:00
Laurent Destailleur
8b5922a0df
Update card.php
2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php
2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php
2021-06-04 12:55:03 +02:00
Laurent Destailleur
2feffa8ab3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 12:48:27 +02:00
Laurent Destailleur
34955b1cf9
Fix sql
2021-06-04 12:48:18 +02:00
Laurent Destailleur
3fb0dabae3
Merge pull request #17745 from FHenry/fix_dev_inventory_rollbac
...
fix: bad syntax "rollbac" instead of "rollback"
2021-06-04 12:43:09 +02:00
Laurent Destailleur
d0fb90feed
Merge pull request #17736 from frederic34/patch-9
...
fix warnings
2021-06-04 12:42:53 +02:00
Laurent Destailleur
ff61a027e5
Merge pull request #17735 from frederic34/patch-8
...
fix warnings
2021-06-04 12:42:44 +02:00
Laurent Destailleur
8d77f498a8
Merge pull request #17734 from frederic34/patch-7
...
fix warning
2021-06-04 12:42:36 +02:00
Laurent Destailleur
d1d305e470
Merge pull request #17738 from frederic34/patch-11
...
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-06-04 12:42:26 +02:00
Laurent Destailleur
c29347b0f8
Merge pull request #17740 from dolibit-ut/patch-334
...
Update llx_c_email_templates.sql
2021-06-04 12:40:33 +02:00
Francis Appels
01f5a5fb18
Fix update receipt eatby
2021-06-04 12:38:04 +02:00
Laurent Destailleur
8d5c419f92
Merge pull request #17744 from fappels/14_fix_trigger_delete_dispatch
...
Fix dispatch receipt edit and delete
2021-06-04 12:37:05 +02:00
Laurent Destailleur
a48b18aced
Merge pull request #17741 from dolibit-ut/patch-335
...
Update llx_c_chargesociales.sql
2021-06-04 12:35:37 +02:00
Laurent Destailleur
a94ef88549
Merge pull request #17748 from frederic34/patch-13
...
Update pdf_canelle.modules.php
2021-06-04 12:34:27 +02:00
Laurent Destailleur
5f3296fa70
Merge pull request #17737 from frederic34/patch-10
...
fix warnings
2021-06-04 12:34:07 +02:00
Laurent Destailleur
5a3d7663d1
Merge pull request #17764 from Hystepik/develop#3
...
Fix of a bug on mass mailing
2021-06-04 12:32:48 +02:00
Laurent Destailleur
f656214a66
Merge pull request #17746 from frederic34/patch-12
...
doxygen
2021-06-04 12:32:26 +02:00
Laurent Destailleur
e5ab721660
Fix sanitize
2021-06-04 12:30:46 +02:00
Laurent Destailleur
920f8b0b58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 12:29:04 +02:00
Laurent Destailleur
3dd53f58f9
Merge pull request #17759 from Hystepik/develop#1
...
Fix inventory/inventory.php
2021-06-04 12:28:55 +02:00
lmarcouiller
c77dee0922
changes to fetch after send
2021-06-04 12:27:50 +02:00
Laurent Destailleur
e26f0f155f
Update inventory.php
2021-06-04 12:00:54 +02:00
Laurent Destailleur
1136e7dec5
Update inventory.php
2021-06-04 11:57:59 +02:00
Laurent Destailleur
84f2e06b91
Merge pull request #17754 from frederic34/patch-16
...
fix warnings
2021-06-04 11:55:14 +02:00
Laurent Destailleur
08b44b3348
Merge pull request #17755 from frederic34/patch-17
...
fix warning
2021-06-04 11:54:58 +02:00
Laurent Destailleur
900cfb7a9d
Merge pull request #17756 from frederic34/patch-18
...
fix warnings
2021-06-04 11:54:38 +02:00
Laurent Destailleur
f7c5a9e13a
Merge pull request #17757 from frederic34/patch-19
...
fix warning
2021-06-04 11:54:26 +02:00
Laurent Destailleur
4d460b1383
Merge pull request #17763 from FHenry/13_fix_paiementpage_badgetpost_test
...
13 fix paiementpage bad GETPOST test
2021-06-04 11:54:14 +02:00
Laurent Destailleur
ca1da3c83c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:53:21 +02:00
Laurent Destailleur
e73dad30bb
Warning
2021-06-04 11:53:12 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20
...
fix warnings
2021-06-04 11:52:53 +02:00
Laurent Destailleur
5650deec58
Merge branch 'develop' into patch-15
2021-06-04 11:52:29 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14
...
fix warnings
2021-06-04 11:51:01 +02:00
Laurent Destailleur
bd72edc534
Merge pull request #17760 from Hystepik/develop#2
...
Fix error name of menu knowledge management system
2021-06-04 11:50:46 +02:00
Laurent Destailleur
c3ed30345e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:45:24 +02:00
Laurent Destailleur
8e80d65b7e
Merge pull request #17765 from softwehrler/fix-subledger-label
...
Fix label of subaccount
2021-06-04 11:42:35 +02:00
Laurent Destailleur
25a169e15b
Merge pull request #17766 from FHenry/fix_uploaddir_productlot
...
fix: uploaddir for productlot (fix #17675 )
2021-06-04 11:27:46 +02:00
Laurent Destailleur
2586fcd1a3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commandestats.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/holiday/month_report.php
htdocs/product/class/product.class.php
htdocs/product/stock/class/mouvementstock.class.php
htdocs/societe/list.php
2021-06-04 11:20:38 +02:00
Laurent Destailleur
131d666d1d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-04 11:05:08 +02:00
Laurent Destailleur
6f1c49abcc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/commande/class/commandestats.class.php
htdocs/user/class/usergroup.class.php
2021-06-04 11:04:18 +02:00
Laurent Destailleur
86a5eead5a
Merge pull request #17769 from frederic34/patch-21
...
force reload css after activate/desactivate module
2021-06-04 10:40:34 +02:00
Laurent Destailleur
b31b210324
Merge pull request #17773 from Hystepik/develop#4
...
New : add of a new param in selectGroupTicket
2021-06-04 10:37:18 +02:00
Laurent Destailleur
ede911361d
Merge pull request #17774 from dolibit-ut/patch-336
...
Update llx_00_c_country.sql
2021-06-04 10:36:09 +02:00
Laurent Destailleur
82757f0989
Merge pull request #17775 from dolibit-ut/patch-337
...
Update list.php
2021-06-04 10:35:51 +02:00
Laurent Destailleur
3a201fa017
Merge pull request #17776 from dolibit-ut/patch-338
...
Update card.php
2021-06-04 10:35:28 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339
...
Update card.php
2021-06-04 10:35:11 +02:00
Laurent Destailleur
7608f0b383
Merge pull request #17778 from tuxgasy/fix_check_stock_with_batch
...
Fix: Do a strict comparison when check if stock is enough
2021-06-04 10:34:29 +02:00
Laurent Destailleur
174c6f8a45
Update mouvementstock.class.php
2021-06-04 10:33:13 +02:00
Laurent Destailleur
2069eeceda
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 10:30:02 +02:00
Laurent Destailleur
8c9bec3e3b
Code comment
2021-06-04 10:29:30 +02:00
Laurent Destailleur
47eb2471f1
Merge pull request #17779 from OGPayet/fix/addMissingHooksInSocieteList
...
add missing hooks in societe list.php
2021-06-04 10:10:54 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note
...
ADD note to supplier order refusal
2021-06-04 10:10:17 +02:00
Laurent Destailleur
402d90554a
Clean code
2021-06-04 10:04:56 +02:00
Laurent Destailleur
9b0605f979
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-04 09:41:35 +02:00
Laurent Destailleur
5f74e378a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 09:39:36 +02:00
Laurent Destailleur
164fe9fb4a
Merge pull request #17786 from FHenry/12_fix_ordersupplierstats
...
FIX: order supplier stats by category now display figures
2021-06-04 09:39:17 +02:00
Laurent Destailleur
6c8341a43f
Merge pull request #17787 from Hystepik/develop#5
...
Fix #17726 : holliday with advanced perms works
2021-06-04 09:37:32 +02:00
Laurent Destailleur
c7e21daee7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 09:36:20 +02:00
Laurent Destailleur
621aa9e6f3
Fix typo
2021-06-04 09:27:33 +02:00
Laurent Destailleur
d8aa7a7f33
Merge pull request #17792 from Hystepik/develop#6
...
Fix #17791 : Error when loading chart of accounts
2021-06-04 09:25:24 +02:00
Laurent Destailleur
935ba6ae18
Merge pull request #17796 from atm-john/13.0_fix_warehouse_id
...
FIX Warehouse id
2021-06-04 09:09:18 +02:00
Laurent Destailleur
81cc8cef75
Merge pull request #17797 from Hystepik/develop#7
...
Fix propal/index.php error on thirdparty display
2021-06-04 09:07:53 +02:00
Laurent Destailleur
d79be7615c
Merge pull request #17799 from atm-john/13.0_fix_wrong_context
...
FIX : wrong hook context
2021-06-04 09:07:02 +02:00
Laurent Destailleur
5e0eef68d0
Merge pull request #17809 from atm-gauthier/fix_status_holiday_list
...
FIX : field name is search_status and not search_statut
2021-06-04 08:59:07 +02:00
Laurent Destailleur
ce64ebc167
Merge pull request #17805 from frederic34/patch-22
...
fix warning
2021-06-04 08:58:53 +02:00
Laurent Destailleur
c39c7d6a81
Merge pull request #17806 from frederic34/patch-23
...
fix warning
2021-06-04 08:58:43 +02:00
Laurent Destailleur
3ae3137eaf
Missing picto
2021-06-04 08:57:48 +02:00
Laurent Destailleur
8ba651bb88
Merge pull request #17812 from frederic34/patch-24
...
fix warning
2021-06-04 08:57:10 +02:00
Laurent Destailleur
a8aacb3150
Merge pull request #17818 from frederic34/setmodetransport
...
debug intracomm report transport mode
2021-06-04 08:41:42 +02:00
Laurent Destailleur
350a421544
Update card.php
2021-06-04 08:41:26 +02:00
Laurent Destailleur
b674835d89
Merge pull request #17813 from frederic34/patch-25
...
fix warning
2021-06-04 08:39:20 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode
2021-06-03 21:47:10 +02:00
Frédéric FRANCE
0b28587e65
fix warnings
2021-06-03 15:28:47 +02:00
Frédéric FRANCE
e83e399cb6
fix warning
2021-06-03 15:19:54 +02:00
Frédéric FRANCE
ee55a5568f
fix warning
2021-06-03 15:14:31 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm
2021-06-03 14:36:47 +02:00
Gauthier PC portable 024
093705a1b5
FIX : field name is search_status and not search_statut
2021-06-03 11:32:41 +02:00
ATM john
a7300d01b0
WIP - create validation method for common object
2021-06-03 09:49:07 +02:00
lmarcouiller
71856984a3
Fix #17791 : fix for at account
2021-06-03 09:35:31 +02:00
lmarcouiller
fa71402a9b
Fix 17791 : fix for at account
2021-06-03 09:34:49 +02:00
lmarcouiller
8f7daf7f57
Fix 17791 : fix for at account
2021-06-03 09:32:58 +02:00
lmarcouiller
583acfbad4
Fix #17791 : fix at account
2021-06-03 09:29:12 +02:00
lmarcouiller
aa1ade5224
Fix #17791 : fix for SKR03
2021-06-03 09:13:48 +02:00
Frédéric FRANCE
c3d58ad044
fix warning
2021-06-03 08:36:50 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning
2021-06-03 08:33:44 +02:00
Laurent Destailleur
456356ded7
Fix migration
2021-06-02 18:45:48 +02:00
Nicolas
e46faacac1
FIX : Add process payment with online link order
2021-06-02 18:11:47 +02:00
ATM john
38423ba260
Fix wrong hook context
2021-06-02 16:31:31 +02:00
Laurent Destailleur
1468761073
Fix select
2021-06-02 16:29:38 +02:00
Laurent Destailleur
da7d821a3e
css
2021-06-02 15:32:39 +02:00
lmarcouiller
431691cec4
Fix propal/index.php error on thirdparty display
2021-06-02 15:18:45 +02:00
Laurent Destailleur
db5bcd1b99
Fix css
2021-06-02 13:41:08 +02:00
Laurent Destailleur
b5680a91d0
css
2021-06-02 13:03:20 +02:00
ATM john
3aca9bdb9e
Fix warehouse id
2021-06-02 12:02:27 +02:00
Quentin VIAL-GOUTEYRON
b8b30a9af6
wrong where cabyprodserv
2021-06-02 10:53:04 +02:00
Quentin VIAL-GOUTEYRON
89f6b66c2a
wrong join, request too long
2021-06-02 10:32:30 +02:00
atm-greg
f875bcfe09
update ->nom field if different from ->name
2021-06-02 10:30:48 +02:00
lmarcouiller
6d049f5c2e
Fix #17791 : Error when loading chart of accounts
2021-06-02 09:31:04 +02:00
Christian Foellmann
68579f9cda
fix html linebreak
2021-06-02 08:17:34 +02:00
Laurent Destailleur
33a4c98dc3
Fix popup
2021-06-02 04:34:10 +02:00
Laurent Destailleur
5a260865dc
FIX Creation of reception (missing extrafields). Lose data if error.
...
Conflicts:
htdocs/reception/card.php
2021-06-02 04:23:19 +02:00
Laurent Destailleur
bda42403b2
FIX Creation of reception (missing extrafields). Lose data if error.
2021-06-02 04:15:21 +02:00
Alexandre SPANGARO
c35124f036
NEW Add field date from/to in supplier payment list
2021-06-01 23:23:00 +02:00
Alexandre SPANGARO
3744ccdd28
Look & feel v14
2021-06-01 22:50:55 +02:00
Alexandre SPANGARO
b5904e49a0
NEW Add field date from/to in customer payment list
2021-06-01 22:43:43 +02:00
ATM john
f13388122c
Add fetch stock order
2021-06-01 21:43:05 +02:00
Laurent Destailleur
49f4de8728
Fix massaction on cron
2021-06-01 16:57:55 +02:00
lmarcouiller
af509742e6
Fix #17726 : holliday with advanced perms works
2021-06-01 16:34:39 +02:00
Florian HENRY
c91b9d613a
FIX: order supplier stats by category now display figures
2021-06-01 15:30:17 +02:00
stickler-ci
3cc65989c1
Fixing style errors.
2021-06-01 07:25:29 +00:00
ATM john
cf9c9ec882
fix condition
2021-06-01 09:07:05 +02:00
ATM john
a5c2ce1727
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-01 08:45:45 +02:00
Laurent Destailleur
d18c1ea0c0
css
2021-06-01 00:41:51 +02:00
Laurent Destailleur
9d44df8a64
Fix escape
2021-06-01 00:05:43 +02:00
Laurent Destailleur
2dc9ca334f
CSS
2021-05-31 23:36:37 +02:00
Laurent Destailleur
c19f624eb5
Code comment
2021-05-31 16:00:03 +02:00
Laurent Destailleur
0071d63fbb
Fix for ro-md language
2021-05-31 13:35:03 +02:00
Pierre Payet
90ae16372c
add missing hooks in societe list.php
2021-05-31 12:11:16 +02:00
Laurent Destailleur
ffc7ae0389
Fix missing test
2021-05-31 12:02:03 +02:00
TuxGasy
e1de510c38
Do a strict comparison when check if stock is enough
2021-05-31 11:06:52 +02:00
Christian Foellmann
55d48077a3
ADD note to supplier order refusal
2021-05-31 10:45:34 +02:00
UT from dolibit
7aae5be54a
Update card.php
2021-05-31 10:36:43 +02:00
UT from dolibit
fed7878d18
Update card.php
...
$lineid was duplicate
2021-05-31 10:33:36 +02:00
UT from dolibit
a97efdbdfa
Update list.php
...
$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
2021-05-31 10:31:25 +02:00
UT from dolibit
2c6eee2528
Update llx_00_c_country.sql
...
Roumanie -> Romania
Rwanda = Rwanda
Sainte-Hélène -> Saint Helena
Saint-Christophe-et-Niévès -> Saint Kitts and Nevis
Sainte-Lucie -> Saint Lucia
Saint-Pierre-et-Miquelon -> Saint Pierre and Miquelon
Saint-Vincent-et-les-Grenadines -> Saint Vincent and the Grenadines
Samoa = Samoa
Saint-Marin -> San Marino
Sao Tomé-et-Principe -> Saint Thomas and Prince
Serbie -> Serbia
Seychelles = Seychelles
Sierra Leone = Sierra Leone
Slovaquie -> Slovakia
Slovénie -> Slovenia
2021-05-31 10:26:05 +02:00
lmarcouiller
301d6ecd57
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-05-31 09:31:58 +02:00
lmarcouiller
ab64f467f5
add of a new param in selectGroupTicket
2021-05-31 09:31:38 +02:00
Laurent Destailleur
ea21e1dbfb
Fix color selection for ticket graph
2021-05-30 20:19:02 +02:00
Laurent Destailleur
356e349944
Fix reposition
2021-05-30 20:01:29 +02:00
Laurent Destailleur
d2bda7ad09
Set a maxlength on fields
2021-05-30 19:01:43 +02:00
Laurent Destailleur
2f969f154e
More examples
2021-05-30 17:10:38 +02:00
Laurent Destailleur
1834d642b3
Fix phpcs
2021-05-30 17:04:12 +02:00
Frédéric FRANCE
baea57ec05
force reload css after activate/desactivate module
2021-05-30 08:38:07 +02:00
Laurent Destailleur
48867c39aa
Fix missing link to edit translation
2021-05-29 04:54:53 +02:00
Laurent Destailleur
ab4941a558
Fix not visible button when missing permission
2021-05-29 02:22:30 +02:00
Laurent Destailleur
4f6385338a
Fix option CAT_HIGH_QUALITY_IMAGES
2021-05-28 18:15:26 +02:00
Florian HENRY
f33869bf1c
fix: uploaddir for productlot
2021-05-28 18:08:01 +02:00
Laurent Destailleur
81a94f5642
FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE
2021-05-28 18:04:45 +02:00
Laurent Destailleur
94467ea8cf
Fix selection
2021-05-28 17:05:26 +02:00
Laurent Destailleur
1c75ce8862
Code comment
2021-05-28 14:12:22 +02:00
Matthias Haberl
fed5db032a
Fix label of subaccount
2021-05-28 11:26:55 +02:00
Florian HENRY
c4f7a8194c
remove space
2021-05-28 10:32:53 +02:00
Florian HENRY
11bbd2ace3
fix: bad GETPOST test on payment module configuration
2021-05-28 10:31:54 +02:00
lmarcouiller
05a966b93e
Fix of a bug on mass mailing
2021-05-28 10:29:46 +02:00
lmarcouiller
e3a5abe20e
Fix error name of menu knowledge management system
2021-05-28 10:02:48 +02:00
lmarcouiller
e87d175041
Fix inventory/inventory.php
2021-05-28 09:57:21 +02:00
Florian Mortgat
e6deab5c85
FIX proposed new feature: autocomplete for accounting account groups
2021-05-28 08:42:38 +02:00
Florian Mortgat
c29d5fa747
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_autocomplete_accounting_account_groups
2021-05-28 08:19:55 +02:00
Frédéric FRANCE
ca0654323f
fix warnings
2021-05-27 23:11:05 +02:00
Frédéric FRANCE
d0b8a80c7a
fix warning
2021-05-27 22:56:20 +02:00
Frédéric FRANCE
4c1503a93b
fix warnings
2021-05-27 22:50:56 +02:00
Frédéric FRANCE
0b6457d83f
fix warning
2021-05-27 22:44:05 +02:00
Frédéric FRANCE
e1a427f160
fix warnings
2021-05-27 22:40:26 +02:00
Frédéric FRANCE
3b381dccc3
fix warnings
2021-05-27 22:33:25 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings
2021-05-27 22:28:59 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member
...
Fix #17743 newpayement source membersubscription is not valid anymore
@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
2021-05-27 21:09:49 +02:00
Frédéric FRANCE
f1b32dce17
Update pdf_canelle.modules.php
2021-05-27 17:07:59 +02:00
Frédéric FRANCE
00d60aa65a
doxygen
2021-05-27 16:54:41 +02:00
Florian HENRY
14fdd4d0c6
fix rollback to rollbac
2021-05-27 16:43:49 +02:00
stickler-ci
dfb2e54750
Fixing style errors.
2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php
2021-05-27 16:23:33 +02:00
Francis Appels
48f5cea917
Fix update receipt eatby
2021-05-27 16:03:17 +02:00
Francis Appels
8ed24d6796
Add missing trigger LINERECEPTION_DELETE
2021-05-27 16:02:12 +02:00
Laurent Destailleur
819e6e1122
Fix duplicate
2021-05-27 14:59:44 +02:00
Laurent Destailleur
a33f6a8977
css
2021-05-27 14:57:16 +02:00
Laurent Destailleur
cc0560c73d
css
2021-05-27 14:47:06 +02:00
Laurent Destailleur
e7f9d317c3
css
2021-05-27 14:45:16 +02:00
Laurent Destailleur
e9cf33dac5
css
2021-05-27 14:35:20 +02:00
Laurent Destailleur
61138b8210
Fix look and feel v14
2021-05-27 14:25:00 +02:00
UT from dolibit
d0a8dc9df9
Update llx_c_chargesociales.sql
...
idea: fk_pays at first - id as second (based on fk_pays)
2021-05-27 13:25:00 +02:00
UT from dolibit
ca7e52d861
Update llx_c_email_templates.sql
...
- formatting
- removed *tms* at eventorganization
2021-05-27 13:09:03 +02:00
stickler-ci
c31530e7ed
Fixing style errors.
2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php
...
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
2021-05-27 12:20:42 +02:00
Laurent Destailleur
5a5fa1edbb
Fix regression amount was always empty.
2021-05-27 11:57:17 +02:00
Laurent Destailleur
531dee31fd
Fix securekey
2021-05-27 11:16:23 +02:00
Laurent Destailleur
2caaa52e85
Doc
2021-05-27 02:52:51 +02:00
Laurent Destailleur
4f61286ae2
Small perf fix
2021-05-27 02:36:16 +02:00
Laurent Destailleur
240ca50a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-27 01:53:06 +02:00
Laurent Destailleur
7983ce941e
Fix performance page
2021-05-27 01:52:52 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-05-27 00:02:01 +02:00
Frédéric FRANCE
4237b374dd
Update list.php
2021-05-26 23:45:45 +02:00
Frédéric FRANCE
223ece5ca5
Update list.php
2021-05-26 23:43:14 +02:00
Frédéric FRANCE
0d62d3bace
fix warnings
2021-05-26 23:36:36 +02:00
Frédéric FRANCE
879a401724
fix warnings
2021-05-26 20:00:23 +02:00
Frédéric FRANCE
9b51699228
fix warnings
2021-05-26 19:55:47 +02:00
Frédéric FRANCE
60250443a1
fix warning
2021-05-26 18:55:48 +02:00
Frédéric FRANCE
371f2e4f37
fix warnings
2021-05-26 18:24:06 +02:00
Laurent Destailleur
5372912b0b
Merge pull request #17642 from Givriz/dev
...
Compatibility phpv8
2021-05-26 18:22:46 +02:00
Laurent Destailleur
3187c096c3
Merge pull request #17731 from atm-adrien/FIX_add_parameters_for_user_DoActions_hook
...
FIX : Add parameters (object and action) for user list DoActions hook
2021-05-26 17:48:42 +02:00
Laurent Destailleur
9720dddc9f
Merge pull request #17730 from ibuiv/patch-form-fourn-products
...
Fix param in select_produits_fournisseur_list
2021-05-26 17:47:32 +02:00
Laurent Destailleur
9952fdb6d3
FIX #17648 #17712
2021-05-26 17:45:45 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php
2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php
2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018
lint(stickler)
2021-05-26 17:10:12 +02:00
Adrien Raze
9c83bdff51
FIX : Add parameters (object and action) for user list DoActions hook
2021-05-26 17:02:34 +02:00
Antonin MARCHAL
8dd2af42df
fix(param) select_produits_fournisseur_list
2021-05-26 16:44:35 +02:00
Laurent Destailleur
421681cda4
FIX Navigation in list of holiday
...
Conflicts:
htdocs/holiday/view_log.php
2021-05-26 15:25:44 +02:00
Laurent Destailleur
48945533e4
Clean code
2021-05-26 15:22:56 +02:00
Laurent Destailleur
7c41be7f0a
FIX Navigation in list of holiday
2021-05-26 15:22:49 +02:00
Maxime Kohlhaas
b3a6bcd34f
Fix Winfic accountancy export for due date
2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19
Fix Quadra accountancy export for due date
2021-05-26 14:59:28 +02:00
Laurent Destailleur
38ef028310
Clean code. Fix check for lot that must be unique.
2021-05-26 12:44:15 +02:00
Laurent Destailleur
83fdc2841a
Merge pull request #17725 from frederic34/patch-7
...
fix warning
2021-05-26 10:55:47 +02:00
Dorian Vabre
fe6b25ede6
fix on $value
2021-05-26 09:48:13 +02:00
Frédéric FRANCE
60196c0417
Update card.php
2021-05-26 08:53:17 +02:00