Alexandre SPANGARO
17e0cc4bad
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-21 22:59:41 +01:00
Alexandre SPANGARO
ea938f64da
NEW: Add company info in dropdown login menu
2021-03-21 22:58:21 +01:00
Laurent Destailleur
3c8bf2167b
Debug permissions
2021-03-21 18:01:43 +01:00
Laurent Destailleur
2b3599dba5
Clean code
2021-03-20 21:29:36 +01:00
Laurent Destailleur
70be2dbcf0
Fix regression in tests
2021-03-20 20:51:19 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member
2021-03-20 19:06:15 +01:00
Frédéric FRANCE
4c5ddc44dc
get conf global function
2021-03-19 17:58:01 +01:00
Laurent Destailleur
8462c4d3d3
Clean menu
2021-03-19 13:37:43 +01:00
Laurent Destailleur
78aec3daae
Removed option MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES. The
...
implmentation did not make any test on subsidiaries. It has same effect
than being an internal user.
2021-03-19 00:00:06 +01:00
Laurent Destailleur
3785346835
Revert " fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject"
2021-03-18 23:57:48 +01:00
Laurent Destailleur
ce4aadba84
Merge branch 'develop' into abb120359
2021-03-18 23:54:27 +01:00
Laurent Destailleur
dc0482e98c
Merge pull request #16774 from frederic34/php8-fix-functionlib
...
fix php8 warnings
2021-03-18 23:13:12 +01:00
Laurent Destailleur
0c882739e3
Merge pull request #16777 from frederic34/patch-8
...
fix php8 warning
2021-03-18 23:10:59 +01:00
Laurent Destailleur
63b78af05f
Merge pull request #16778 from frederic34/patch-9
...
fix php8 warning
2021-03-18 23:10:20 +01:00
Laurent Destailleur
ac6b6f22e7
Enhance sanitizing of data
2021-03-18 11:39:23 +01:00
Frédéric FRANCE
00cd4cd953
fix php8 warning
2021-03-17 22:19:40 +01:00
Frédéric FRANCE
da3fcf3ca5
fix php8 warning
2021-03-17 22:16:54 +01:00
Laurent Destailleur
31478d5ac0
Look and feel v14
2021-03-17 22:01:25 +01:00
Laurent Destailleur
35869f1449
Add function dol_string_onlythesehtmlattributes() and option
...
MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to enable it.
2021-03-17 21:39:28 +01:00
Frédéric FRANCE
9609c3095a
fix php8 warnings
2021-03-17 20:13:20 +01:00
Laurent Destailleur
09f8ccd882
Merge pull request #16753 from frederic34/patch-12
...
fix php8 warning
2021-03-17 16:56:10 +01:00
Laurent Destailleur
8de1b4c94e
Factorize code
2021-03-17 11:34:19 +01:00
Frédéric FRANCE
dde51a23f0
fix php8 warning
...
sometimes $size == '' and cause warnings later in the code
2021-03-16 22:01:59 +01:00
Laurent Destailleur
e366d2c379
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Bahfir Abbes
9c51e62d0f
Update security.lib.php
...
MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES
2021-03-16 12:25:17 +01:00
Laurent Destailleur
71e7f10a54
FIX #16698
2021-03-16 10:39:10 +01:00
Frédéric FRANCE
d4eecf3eb2
fix php8 warning
2021-03-15 13:51:54 +01:00
Laurent Destailleur
3964801d40
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-03-15 13:26:20 +01:00
Laurent Destailleur
2129adf129
Add more fields to llx_oauth_token
2021-03-15 13:25:08 +01:00
Laurent Destailleur
85eaec48e1
Merge pull request #16307 from aspangaro/14a15
...
NEW: VAT report - Optimisation & collapse by rate
2021-03-15 11:56:06 +01:00
Christophe Battarel
090dc4f28a
Merge branch 'develop' into pr_batch_masks
2021-03-15 11:42:33 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-15 11:37:57 +01:00
Frédéric FRANCE
15c751ae89
Merge remote-tracking branch 'upstream/develop' into php8-fix
2021-03-15 11:18:41 +01:00
Laurent Destailleur
21400b96fa
Merge pull request #16656 from frederic34/patch-11
...
remove dol_buildpath
2021-03-15 11:08:01 +01:00
Laurent Destailleur
b7c7bd8d94
Merge pull request #16666 from frederic34/patch-21
...
fix php8 warning
2021-03-15 11:03:20 +01:00
Laurent Destailleur
57f9607e3e
Update accounting.lib.php
2021-03-15 11:01:01 +01:00
Laurent Destailleur
26e8a9c795
Code comment
2021-03-15 10:08:02 +01:00
Frédéric FRANCE
abd9a639a2
fix php8 warning
2021-03-14 23:41:06 +01:00
Laurent Destailleur
9aa8916a9c
Disallow use of &# into dol_sanitizeUrl()
2021-03-14 20:35:55 +01:00
Laurent Destailleur
45579edd43
Enhance WAF and dol_sanitizeUrl
2021-03-14 18:57:18 +01:00
Frédéric FRANCE
220b1539f7
Update cron.lib.php
2021-03-14 17:36:27 +01:00
Laurent Destailleur
c2a86e71be
fix phpv8
2021-03-14 16:44:11 +01:00
Laurent Destailleur
4965ce8768
Fix method to sanitize an URL
2021-03-14 16:14:24 +01:00
Laurent Destailleur
74a61d559f
FIX sanitizing with GETPOST(alphanohtml) #yogosha5629
2021-03-14 15:39:59 +01:00
Laurent Destailleur
72766c830d
FIX #Yogosha5631
2021-03-14 15:06:40 +01:00
Laurent Destailleur
95006ec94c
Fix sanitizing backtopage
2021-03-14 12:58:37 +01:00
Laurent Destailleur
0a542ad9f9
Fix redirect to external website. Bad sanitizing of backtopage parameter
2021-03-14 11:38:42 +01:00
Laurent Destailleur
bcfe711544
Fix redirect to extern url
2021-03-13 19:20:34 +01:00
Laurent Destailleur
5faecef0e1
Look and feel v14
2021-03-13 18:56:02 +01:00
Frédéric FRANCE
c3c03e9de3
fix php8 fatal error
2021-03-13 18:42:50 +01:00
Laurent Destailleur
aa26f873ff
Merge pull request #16634 from mrtnnbr/develop
...
Add UPC support to built-in barcode generator
2021-03-12 20:16:45 +01:00
Laurent Destailleur
af5db0f5fa
Look and feel v14
2021-03-12 15:34:31 +01:00
Martin Neubauer
85eb82c8c3
Tweak offsets for UPC barcode text
2021-03-12 14:44:04 +01:00
Martin Neubauer
09cedb5a5e
ISBN might start with 979 these days
2021-03-12 13:55:39 +01:00
Martin Neubauer
5aaeb6742c
Add UPC support to built-in barcode generator
2021-03-12 13:54:27 +01:00
Martin Neubauer
7b59a3ac2b
Factor out generating EAN bars
2021-03-12 13:11:17 +01:00
Regis Houssin
5375add08c
FIX just add mp4
2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0
FIX wrong extension
2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7
FIX missing video mime
2021-03-12 08:35:13 +01:00
Florian HENRY
862926316a
working on list
2021-03-11 19:09:42 +01:00
stickler-ci
345fe648b3
Fixing style errors.
2021-03-11 15:37:27 +00:00
Laurent Destailleur
c596eb91a8
Merge branch 'develop' into abb120358
2021-03-11 16:35:21 +01:00
Christophe Battarel
2c711f1a2d
add masks for batch
2021-03-11 10:02:31 +01:00
Bahfir Abbes
0158cbb893
Update security.lib.php
2021-03-11 04:02:30 +01:00
Laurent Destailleur
cf30e90b93
Work on inventory
2021-03-09 15:35:10 +01:00
Alexandre SPANGARO
2f86971f84
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-08 09:56:57 +01:00
Laurent Destailleur
3cbced439a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
6eafc3b774
Clean code
2021-03-04 17:23:12 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Laurent Destailleur
beb8dbcc01
Update project.lib.php
2021-03-04 16:48:25 +01:00
Laurent Destailleur
dcff298c5f
FIX #16533
2021-03-04 15:57:03 +01:00
Laurent Destailleur
ffa0e6c391
FIX Timezone management for datetime on list of events
2021-03-04 15:34:29 +01:00
stickler-ci
47dd477c61
Fixing style errors.
2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d
Fix #16523 : return to backward compatibility
2021-03-04 10:33:18 +01:00
Florian HENRY
bf775855f6
avoid warning into modulebuilder
2021-03-04 10:28:41 +01:00
lmarcouiller
500f192a05
Fix #16523 : New column Contact assigned
2021-03-04 10:15:41 +01:00
Alexandre SPANGARO
59a2fb8ed5
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-03 14:08:40 +01:00
Laurent Destailleur
da8b67da83
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-03 12:07:42 +01:00
Laurent Destailleur
5f8b52ffc9
Code comment
2021-03-03 12:05:43 +01:00
Laurent Destailleur
093eab188e
Code comment
2021-03-03 12:02:57 +01:00
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
889a496661
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-03 11:31:55 +01:00
Laurent Destailleur
b5d1e36ece
Fix include
2021-03-03 11:31:40 +01:00
Laurent Destailleur
6fcec3e99b
Merge pull request #16522 from FHenry/13.0
...
fix: warning on install
2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c
Update functions.lib.php
2021-03-02 23:57:37 +01:00
Laurent Destailleur
7abf572f2d
Merge pull request #16512 from Hystepik/develop#1
...
Fix #16432 : Update of getCountriesinEEC
2021-03-02 23:56:37 +01:00
Laurent Destailleur
348b8d2ffe
More phpunit tests
2021-03-02 23:55:41 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1
fix warning
2021-03-02 22:55:43 +01:00
lmarcouiller
2eaa6ad6c6
Fix #16432 : Add cache use in function
2021-03-02 16:21:43 +01:00
stickler-ci
b374a8a00b
Fixing style errors.
2021-03-02 15:03:36 +00:00
lmarcouiller
fc86784cfc
Fix #16432 : update with eldy advices
2021-03-02 16:03:14 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
lmarcouiller
c5ac79e34c
Fix #16432 : Update of getCountriesinEEX
2021-03-02 15:24:55 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
...
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
2021-03-02 14:45:05 +01:00
Laurent Destailleur
ef99b0f98c
Update modulebuilder.lib.php
2021-03-02 12:38:17 +01:00
Florian HENRY
593ae78761
avoid php wrning
2021-03-02 10:55:23 +01:00
Florian HENRY
32ef55cd9e
working default status/percent for event actioncomm
2021-03-01 20:58:02 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Gauthier PC portable 024
6da28f5e44
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-03-01 11:12:03 +01:00
Frédéric FRANCE
1b046f25cf
add new rule
2021-03-01 00:19:52 +01:00
Laurent Destailleur
490faec547
FIX Timezone problems
...
Conflicts:
htdocs/core/lib/date.lib.php
test/phpunit/DateLibTest.php
2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c
FIX Timezone problems
2021-02-28 22:44:11 +01:00
Alexandre SPANGARO
706aad3b68
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-28 21:33:59 +01:00
Laurent Destailleur
886cbc61c8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2021-02-28 13:37:45 +01:00
Laurent Destailleur
0bb304ec33
Merge pull request #16473 from frederic34/patch-3
...
fix variable name
2021-02-28 13:25:20 +01:00
Laurent Destailleur
0832c25b5b
Look and feel v14
2021-02-28 11:48:35 +01:00
Alexandre SPANGARO
ad95caac7e
Merge branch 'develop' into 14a15
2021-02-28 07:12:24 +01:00
Alexandre SPANGARO
6e1d67084d
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-28 07:09:30 +01:00
Laurent Destailleur
753b1d1e11
FIX status on tooltip on widgets
2021-02-27 19:43:56 +01:00
Laurent Destailleur
9cf4222d3a
Look and feel v14
2021-02-27 17:15:40 +01:00
Laurent Destailleur
5c0ea476e1
Look and feel v14
2021-02-27 12:45:07 +01:00
Laurent Destailleur
34d00e5d5e
Look and feel v14
2021-02-27 02:44:52 +01:00
Laurent Destailleur
8e632d08b8
NEW Add link picto to the stock movement on the detail of production
2021-02-27 00:31:29 +01:00
Frédéric FRANCE
5d4004d3f4
fix cache
2021-02-26 23:06:33 +01:00
Frédéric FRANCE
94aa116fa8
fix variable name
2021-02-26 23:01:18 +01:00
Gauthier PC portable 024
e598b49545
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 15:33:36 +01:00
Laurent Destailleur
a5925cc2cb
Merge branch 'develop' into count_project_head
2021-02-26 13:02:54 +01:00
Laurent Destailleur
f5406d487b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/product.lib.php
htdocs/product/stock/productlot_card.php
test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
34ed5519fd
Merge pull request #16435 from altairisfr/batchevents_pr
...
add event management to batch products
2021-02-26 11:50:48 +01:00
Gauthier PC portable 024
c996871f98
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 11:50:18 +01:00
Laurent Destailleur
0f44bdb90f
Fix sql error
2021-02-26 11:27:03 +01:00
Laurent Destailleur
adc0313543
Fix lang
2021-02-26 11:09:15 +01:00
Laurent Destailleur
7b70d4b1de
Merge pull request #16415 from frederic34/core_code_syntax
...
code syntax core directory
2021-02-26 10:29:23 +01:00
Christophe Battarel
445974a003
add event management to batch products
2021-02-25 15:47:14 +01:00
Alexandre SPANGARO
85d63e05d1
Move to INNER JOIN
2021-02-25 05:07:26 +01:00
Alexandre SPANGARO
e177ac566c
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-25 05:02:03 +01:00
Laurent Destailleur
ebb4f03788
Prepare public page for autocreate contact-lead
2021-02-24 12:19:28 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory
2021-02-23 22:03:23 +01:00
Gauthier PC portable 024
c0160a5f3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:20:15 +01:00
Laurent Destailleur
b7e2c7d87a
FIX #16393 Do not sanitize <!DOCTYPE html>
2021-02-23 12:58:43 +01:00
Frédéric FRANCE
f50ce6f91f
add cache on project head
2021-02-23 12:19:49 +01:00
Laurent Destailleur
34dcebea78
Code comment
2021-02-23 11:03:34 +01:00
Florian HENRY
fa65956801
Merge branch 'develop' into dev_EventOrganisation_draft
2021-02-22 21:02:22 +01:00
Laurent Destailleur
7677edf41d
Merge pull request #16357 from bb2a/ADD_SUBSTITUTION_DELIVRY_DATE
...
Add substitution for delivry date
2021-02-22 14:23:37 +01:00
Laurent Destailleur
38465ea591
Fix website editor
2021-02-22 11:51:43 +01:00
Anthony Berton
566c3ada55
Update functions.lib.php
2021-02-22 11:30:00 +01:00
Gauthier PC portable 024
939d406ab1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:10:24 +01:00
Anthony Berton
3256a17280
Update functions.lib.php
2021-02-21 23:52:22 +01:00
Laurent Destailleur
97ce13bf84
Merge pull request #16369 from frederic34/doltrunc
...
replace ... by one char in dol_trunc
2021-02-21 20:16:07 +01:00
Laurent Destailleur
c9f67b27b2
Merge pull request #16364 from frederic34/memcacheexpire
...
memcached can set expire
2021-02-21 20:14:09 +01:00
Frédéric FRANCE
71d32a7422
fix tests
2021-02-21 15:59:19 +01:00
Frédéric FRANCE
5ceb8163de
fix tests
2021-02-21 15:40:03 +01:00
Laurent Destailleur
0a7e692fbf
Wip website module
2021-02-21 14:46:52 +01:00
Frédéric FRANCE
548820011a
fix tests
2021-02-21 13:39:59 +01:00
Frédéric FRANCE
6e3a1a1d41
fix tests
2021-02-21 13:32:54 +01:00
Frédéric FRANCE
d3a98c7680
replace ... by one char in dol_trunc
2021-02-21 13:00:31 +01:00
Florian HENRY
be34fb4541
tab event ok
2021-02-21 12:32:16 +01:00
Frédéric FRANCE
5096c5bf2d
cache socialnetworks array
2021-02-21 10:18:05 +01:00
Frédéric FRANCE
41b89ae677
add files and links
2021-02-21 09:50:58 +01:00
Florian HENRY
556ba2b369
statart card
2021-02-20 23:17:48 +01:00
Frédéric FRANCE
518826ad3d
add project
2021-02-20 22:03:11 +01:00
Frédéric FRANCE
65925e60b9
memcached can set expire
2021-02-20 20:48:59 +01:00
Frédéric FRANCE
da37497a38
memcached can set expire
2021-02-20 20:47:01 +01:00
Laurent Destailleur
91d0652476
Clean code of cache
2021-02-20 18:32:16 +01:00
Laurent Destailleur
1dd1dcefc5
Rename cache keys
2021-02-20 18:25:48 +01:00
Laurent Destailleur
341cd06252
Clean code for cache feature
2021-02-20 18:21:10 +01:00
Laurent Destailleur
07578fc518
Merge branch 'develop' into countactioncomm
2021-02-20 17:24:22 +01:00
Laurent Destailleur
cfccc49235
Code comment
2021-02-20 17:23:03 +01:00
Frédéric FRANCE
57e15eb46d
try to apply the advice
2021-02-20 17:12:06 +01:00
Laurent Destailleur
ade5d98d56
Rename script to run cron by url to avoid confusion with script from cli
2021-02-20 17:03:27 +01:00
Frédéric FRANCE
ec1dd40a8a
enhance caching
2021-02-20 15:52:45 +01:00
Frédéric FRANCE
99fa13cbad
enhance caching
2021-02-20 15:41:57 +01:00
Frédéric FRANCE
a63daaa8e1
Merge remote-tracking branch 'upstream/develop' into countactioncomm
2021-02-19 23:31:09 +01:00
Frédéric FRANCE
3238dbec92
Merge remote-tracking branch 'upstream/develop' into countactioncomm
2021-02-19 23:24:53 +01:00
Frédéric FRANCE
1e3ae8348a
use cache
2021-02-19 23:16:56 +01:00
Laurent Destailleur
581d137aa8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 22:06:56 +01:00
Laurent Destailleur
712c2f20df
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7
FIX date selector when using reduced year (like on smartphone)
2021-02-19 22:00:44 +01:00
Laurent Destailleur
eeedbccc71
Merge pull request #16351 from aspangaro/14a16
...
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-19 18:20:17 +01:00
Laurent Destailleur
3ab80469ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 16:11:36 +01:00
Laurent Destailleur
574c0df427
Merge pull request #16338 from aspangaro/13p5
...
Fix module asset in development
2021-02-19 16:05:35 +01:00
Laurent Destailleur
efb32c7d0b
Fix test pages
2021-02-19 15:06:36 +01:00
Laurent Destailleur
b6211a7990
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 14:12:00 +01:00
Laurent Destailleur
8265f7a07e
Code comment
2021-02-19 14:05:46 +01:00
Laurent Destailleur
5340c30db3
FIX missing security test on payment page
...
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
Anthony Berton
a858666b15
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into ADD_SUBSTITUTION_DELIVRY_DATE
2021-02-19 09:13:37 +01:00
Laurent Destailleur
485dd07f67
NEW Can show the holidays on the agenda view.
2021-02-18 23:13:55 +01:00
Alexandre SPANGARO
f462455e89
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-18 21:39:25 +01:00
Frédéric FRANCE
354872b47c
Merge remote-tracking branch 'upstream/develop' into countactioncomm
2021-02-18 18:40:16 +01:00
Anthony Berton
bacafd326e
Update functions.lib.php
2021-02-18 16:13:40 +01:00
Laurent Destailleur
2904cc803f
Fix selection in combo
2021-02-18 13:56:13 +01:00
Frédéric FRANCE
45e947ee2b
count actioncomm for thirdparty tab agenda
2021-02-17 22:16:07 +01:00
Frédéric FRANCE
933a944603
count actioncomm for thirdparty tab agenda
2021-02-17 22:14:21 +01:00
Laurent Destailleur
36e0deba3f
Look and feel v14
2021-02-17 17:56:08 +01:00
Gauthier PC portable 024
134d7e00ec
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-17 16:56:50 +01:00
Laurent Destailleur
bfe71e8509
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-17 14:28:19 +01:00
Laurent Destailleur
c8824ccea0
Look and feel v14
2021-02-16 17:05:38 +01:00
Laurent Destailleur
6f25f7c2cb
Clean code
2021-02-16 11:43:26 +01:00
Alexandre SPANGARO
8079105aaf
NEW: VAT report - Optimisation & collapse by rate
2021-02-16 04:28:55 +01:00
Laurent Destailleur
54640199af
Fix deletion if permission on dir is not write.
2021-02-15 23:43:56 +01:00
Laurent Destailleur
4ffdfe110a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-15 22:07:11 +01:00
Laurent Destailleur
00642ffb48
Fix label of invoice
2021-02-15 22:04:35 +01:00
Laurent Destailleur
32370bf63d
Look and feel v14
2021-02-15 20:13:38 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
...
wip : Event Organization module - PR-1 - setup page #FoundationFunding
2021-02-15 15:59:19 +01:00
Laurent Destailleur
b98a654321
NEW The setup for mandatory field can be done on combo list too.
2021-02-15 15:37:43 +01:00
Laurent Destailleur
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Laurent Destailleur
e802dd87f4
Merge branch 'develop' into dev_EventOrganisation_setuppage
2021-02-14 21:37:45 +01:00
Laurent Destailleur
4d526569a7
Merge pull request #16292 from frederic34/patch-5
...
Use dictionary to display social network icon
2021-02-14 21:34:13 +01:00
Laurent Destailleur
2cc4632a39
Fix js error
2021-02-14 21:32:19 +01:00
Frédéric FRANCE
917f15a781
Use dictionary to display social network icon
2021-02-14 21:30:54 +01:00
Laurent Destailleur
9e16cd5b77
Look and feel v14
2021-02-14 20:47:57 +01:00
Laurent Destailleur
66c7770146
Factorize some common code for type of event
2021-02-14 20:12:43 +01:00
abb
e6d35039c9
fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject
2021-02-14 18:02:30 +01:00
Florian HENRY
5958373f47
set icon fa
2021-02-14 17:31:30 +01:00
Florian HENRY
21a8d4d470
ok for setup pages
2021-02-14 17:06:49 +01:00
Florian HENRY
d7dfb9138a
working on setup
2021-02-14 15:00:20 +01:00
abb
d82c62c40d
New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users
2021-02-12 23:53:45 +01:00
Laurent Destailleur
4a2cd0d509
Merge pull request #16253 from AlexisLaurier/13.0
...
contract - uses of multidir_output for file path
2021-02-11 19:00:20 +01:00
Florian HENRY
13522fdf5f
start module dev
2021-02-11 17:05:04 +01:00
Laurent Destailleur
0849ce288c
Fix phpcs
2021-02-10 14:04:06 +01:00
Alexis LAURIER
5b2779a5f9
contract - use multidir_output
2021-02-10 13:27:42 +01:00
Alexis LAURIER
05b1171e90
Merge branch '13.0' of https://github.com/AlexisLaurier/dolibarr into 13.0
2021-02-10 13:19:47 +01:00
LAURIER Alexis
cb4295b702
dol_check_secure_access_document contrat multidir_
...
Use multidir_output for contracts document check to manage entity on each contract
2021-02-10 13:02:13 +01:00
Laurent Destailleur
667963094f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-10 02:17:14 +01:00
Laurent Destailleur
c875ad9a1c
FIX #16240
2021-02-10 02:17:01 +01:00
Laurent Destailleur
2c30680157
Merge pull request #16244 from AlexisLaurier/13.0
...
fix regression of #16118 - entity not check on object in checkUserAccessToObject
2021-02-10 01:25:19 +01:00
LAURIER Alexis
0ae0eb5758
fix regression of #16118 - entity not check
...
Entity is not anymore check for user having permission $user->rights->societe->client->voir on the current entity. Then we can open object from any entity with current permissions and the entity field of objects are not anymore checked.
2021-02-09 20:13:13 +01:00
Gauthier PC portable 024
d106fe7e90
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-09 09:50:46 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec
2021-02-08 20:21:46 +01:00
Laurent Destailleur
af4d3767ea
css
2021-02-08 19:56:38 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf
2021-02-08 18:30:09 +01:00
Laurent Destailleur
c0aa7e7db5
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
...
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
2021-02-08 17:19:40 +01:00
Laurent Destailleur
fe9d23e90b
Update functions.lib.php
2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05
Update functions.lib.php
2021-02-08 15:10:07 +01:00
Laurent Destailleur
d0bbf5bf35
Update functions.lib.php
2021-02-08 15:08:24 +01:00
Gauthier PC portable 024
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57
Fix module asset in development
2021-02-08 05:39:07 +01:00
Frédéric FRANCE
c83ccb1e0f
Update functions.lib.php
2021-02-08 00:46:46 +01:00
Laurent Destailleur
1f32d4a815
Avoid warning
2021-02-07 21:21:21 +01:00
Laurent Destailleur
45789ec21c
Fix TZ problems
...
Conflicts:
htdocs/core/lib/company.lib.php
2021-02-07 19:47:33 +01:00
Laurent Destailleur
8c71c8335e
Fix TZ problems
2021-02-07 19:44:22 +01:00
Laurent Destailleur
7b72ac5a7a
Look and feel v14
2021-02-06 12:10:27 +01:00
Laurent Destailleur
3dedd81f37
Same width for all picto of menu
2021-02-06 11:56:27 +01:00
Laurent Destailleur
fd3354142b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
2021-02-06 01:17:05 +01:00
Laurent Destailleur
ac83cea83a
Fix avoid to run import twice by clicking on tab step6
...
Fix timeout for real import step
2021-02-05 14:34:04 +01:00
Laurent Destailleur
c441b54521
NEW If not logo defined, can use squarred logo on login page
2021-02-05 12:07:39 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Laurent Destailleur
21a9a69ba1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
test/phpunit/SecurityTest.php
2021-02-04 23:38:42 +01:00
Laurent Destailleur
4a2f26415e
Fix GETPOST accept < if followed with a number
2021-02-04 23:36:41 +01:00
Laurent Destailleur
a4f6c2d0c6
More log
2021-02-04 22:03:58 +01:00
Laurent Destailleur
2a48529aea
Look and feel v14
2021-02-04 20:44:38 +01:00
Laurent Destailleur
964fa7a72d
Look and feel v14
2021-02-04 20:29:57 +01:00
Laurent Destailleur
1b7ee97082
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-04 19:49:32 +01:00
Laurent Destailleur
726ef265f2
Look and feel v14
2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Laurent Destailleur
a6b08b241f
Doc
2021-02-04 17:13:00 +01:00
Laurent Destailleur
eee49b9132
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/delais.php
2021-02-04 13:50:07 +01:00
Laurent Destailleur
524b28d8c3
Fix missing tab info on holiday
2021-02-04 12:15:31 +01:00
Laurent Destailleur
eca010937f
FIX Trigger on expense report was not fired
...
FIX Bad dates on info tabs
2021-02-04 11:56:53 +01:00
Laurent Destailleur
4d029194d3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/ajax.lib.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
2021-02-02 13:22:23 +01:00
Laurent Destailleur
b80de4aeaf
FIX CSRF errors on margin forms
2021-02-02 13:04:41 +01:00
Laurent Destailleur
2e9656a5b2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8
FIX #16118 Timezone problem on some fields
2021-02-02 00:19:41 +01:00
Gauthier PC portable 024
1eb4968a29
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-01 12:00:04 +01:00
Laurent Destailleur
7887d4cc8e
Fix price2num on all GETPOST('remise_percent')
2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
2021-01-31 12:03:39 +01:00
Laurent Destailleur
ca7738c9b3
FIX #16107
2021-01-30 13:57:42 +01:00
Laurent Destailleur
db9b6b53da
NEW Can set a label as placeholder for combo lists.
2021-01-28 16:31:32 +01:00
Laurent Destailleur
9ec5ba46fb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2021-01-28 14:47:06 +01:00
Laurent Destailleur
3eebbc6426
NEW Add function showValueWithClipboardCPButton() to add a copy/paste
...
button on a text.
2021-01-28 12:44:45 +01:00
Laurent Destailleur
ce3279c462
NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste
...
button on a text.
2021-01-28 12:34:54 +01:00
Laurent Destailleur
cf4a12d715
FIX Missing language ico
...
Conflicts:
htdocs/core/lib/functions.lib.php
2021-01-28 12:04:04 +01:00
Laurent Destailleur
1a7f3938f2
FIX Missing language ico
2021-01-28 12:02:16 +01:00
Laurent Destailleur
4fbf2fff6f
Merge pull request #16034 from Hystepik/develop#2
...
Close #16027 New Feature copy Code Client
2021-01-28 11:17:10 +01:00
Laurent Destailleur
4d5cda20e7
Update functions.lib.php
2021-01-28 11:15:11 +01:00
Laurent Destailleur
9d0945bbe2
FIX #16077
2021-01-28 10:30:09 +01:00
Gauthier PC portable 024
8a5588e518
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-28 10:28:36 +01:00
Laurent Destailleur
f462e353e9
FIX #16079
2021-01-28 09:59:13 +01:00
Laurent Destailleur
b488bca020
FIX 16084
2021-01-28 08:53:13 +01:00
Laurent Destailleur
a4c0459c1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Laurent Destailleur
3e4a9b1bfc
Merge pull request #16070 from aspangaro/13p3
...
Fix: Fa-icon on stock movement
2021-01-27 19:24:31 +01:00
Laurent Destailleur
1637b6af7d
Look and feel v14
2021-01-26 15:16:06 +01:00
Laurent Destailleur
aa2d581b41
Fix rename of alias
2021-01-26 13:38:41 +01:00
Laurent Destailleur
d7bf173f0d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/lib/functions.lib.php
test/phpunit/SecurityTest.php
2021-01-26 12:12:35 +01:00
Laurent Destailleur
977e4dde86
Fix regression
2021-01-26 12:08:54 +01:00
Laurent Destailleur
8db80ff44d
Fix reponsive
2021-01-26 11:19:13 +01:00
Alexandre SPANGARO
0ef02880eb
Fix: Fa-icon on movement
2021-01-26 08:54:21 +01:00
Laurent Destailleur
13378897a8
FIX Report by Ricardo Matias
...
Conflicts:
test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f
FIX Report by Ricardo Matias
2021-01-25 22:46:09 +01:00
Laurent Destailleur
c5cda97c19
FIX Generation of aliases (main alias and alt alias into subdirs)
2021-01-24 14:34:29 +01:00
Laurent Destailleur
005292054d
FIX Generation of aliases (main alias and alt alias into subdirs)
2021-01-24 14:31:29 +01:00
Laurent Destailleur
d9908efdef
Code comment
2021-01-24 13:29:38 +01:00
Laurent Destailleur
15b818da30
Code comment
2021-01-24 13:27:52 +01:00
Laurent Destailleur
8bd7ddee6b
Clean code
2021-01-23 13:55:56 +01:00
lmarcouiller
cfcd51f291
style errors update
2021-01-22 17:03:39 +01:00
lmarcouiller
7685dee5f6
style changes
2021-01-22 16:59:34 +01:00
lmarcouiller
5a95cc16aa
update clipboardcopypaste with jquery
2021-01-22 16:58:47 +01:00
lmarcouiller
76ce77f7ba
stickler-ci edit
2021-01-22 09:13:04 +01:00
lmarcouiller
64d08544b2
move of function showValueWithCopyPasteButton in function.lib.php
2021-01-22 09:09:46 +01:00
Laurent Destailleur
113ef1a02b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Gauthier PC portable 024
e2abbbcece
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6
NEW : add real payments on vat objects
2021-01-18 17:08:17 +01:00
Laurent Destailleur
5a4ab3d00e
Fix look and feel v13
2021-01-18 12:07:40 +01:00
Laurent Destailleur
8b9287055e
Update functions.lib.php
2021-01-16 18:34:25 +01:00
Laurent Destailleur
de6f6c9b5d
Update functions.lib.php
2021-01-16 16:51:47 +01:00
zuiko
32b5aa7790
Update functions.lib.php
...
Fix #15820
function price2num
add underscore and - in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used.
I don't know if other characters have to be added to this pattern.
2021-01-16 16:51:27 +01:00
Laurent Destailleur
d00eb5b533
Merge pull request #15989 from zuiko/patch-3
...
Fix #15820 Bug: Unable to edit the pricing in Sales Order
2021-01-16 16:50:49 +01:00
Laurent Destailleur
e5c932d3f4
Update functions.lib.php
2021-01-16 16:50:34 +01:00
Laurent Destailleur
c7c74e8ed1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2021-01-15 19:53:46 +01:00
Laurent Destailleur
d36c406074
Code comment
2021-01-15 19:24:53 +01:00
Laurent Destailleur
80ed651c5e
Fix GETPOST
2021-01-15 19:23:56 +01:00
Laurent Destailleur
0e636031ba
Add option
...
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:07:00 +01:00
Laurent Destailleur
9350774808
Add option
...
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:06:22 +01:00
zuiko
dd9031432a
Update functions.lib.php
...
Fix #15820
function price2num
add underscore and - in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used.
I don't know if other characters have to be added to this pattern.
2021-01-15 10:29:31 +01:00
zuiko
fd5948f716
Update functions.lib.php
...
Fix #15820
Fix #15820
function price2num
add underscore in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
it seems that some constantes use also "-" so I added it in the pattern.
I don't know if other characters have to be added to this pattern.
2021-01-14 15:00:53 +01:00
zuiko
727751e0c1
Update functions.lib.php
...
Fix #15820
function price2num
add underscore in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
I don't know if other characters have to be added to this pattern.
2021-01-14 14:44:32 +01:00
Laurent Destailleur
aaddda9a6e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/accountancy/class/accountancyexport.class.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
015c5a028b
Doxygen
2021-01-13 12:45:23 +01:00
Laurent Destailleur
958b255822
Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param.
2021-01-12 21:06:02 +01:00
Marc de Lima Lucio
82b0f18378
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-12 15:10:15 +01:00
Laurent Destailleur
f6de607889
Fix warning
2021-01-11 16:07:02 +01:00
Laurent Destailleur
9a5ae77615
Merge pull request #15926 from FHenry/develop
...
fix : remove php warning on install pages
2021-01-11 16:04:04 +01:00
Laurent Destailleur
ed00f6bfb9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:46:50 +01:00
Laurent Destailleur
f9f84f84ba
Fix rounding of foreign amount
2021-01-11 13:46:23 +01:00
Laurent Destailleur
5bd59cd6d1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c
Fix rounding of currency unit prices
2021-01-11 13:36:53 +01:00
Florian HENRY
c7cddb19be
fix stickler
2021-01-10 11:58:22 +01:00
Florian HENRY
7c08e3330c
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-01-07 17:54:49 +01:00
Florian HENRY
04d8a679a7
fix warning message on install
2021-01-07 17:51:45 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product
...
NEW: preload product description on selection for customer propal/order/invoice
2021-01-07 11:19:53 +01:00
Laurent Destailleur
07ca12b26d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 20:48:23 +01:00
Laurent Destailleur
123bd81721
Trim no more required
2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b
FIX #15892 #15017
2021-01-06 20:41:40 +01:00
Regis Houssin
f80a476bc5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-06 11:37:56 +01:00
ATM john
92a4314779
Fix security mecanism generating data loss
2021-01-06 10:45:54 +01:00
Laurent Destailleur
ba68c958e1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 19:12:57 +01:00
Marc de Lima Lucio
f03f5701f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-05 16:01:31 +01:00
Laurent Destailleur
4b45c5e723
Trans
2021-01-05 12:29:13 +01:00
Laurent Destailleur
ed25b252b9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:14 +01:00
Regis Houssin
ec6c14beb8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-05 09:41:52 +01:00
Laurent Destailleur
4d09d3a576
Merge pull request #15860 from fappels/13_debug_shipments
...
Some debug on Shipments and reception.
2021-01-04 14:06:52 +01:00
Laurent Destailleur
ef76c067e0
Add limit to 25000
2021-01-04 13:37:21 +01:00
Laurent Destailleur
8baa4c67ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-04 12:34:09 +01:00
Laurent Destailleur
5c104e344c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/ticket/list.php
2021-01-04 12:17:59 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php
2021-01-04 12:02:41 +01:00
Laurent Destailleur
b0738643fb
FIX Solve problem with TZ
2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3
Fix dict contact type element list
2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/db/DoliDB.class.php
2021-01-03 15:26:31 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Francis Appels
ade0e008e9
Some debug on Shipments.
...
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
2021-01-02 17:42:33 +01:00
Regis Houssin
3b7f5a92cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 17:20:24 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe
Debug v13
2021-01-02 16:18:16 +01:00
Regis Houssin
e36ae4ac90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 13:14:30 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
...
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1
2021-01-01 20:52:43 +01:00
stickler-ci
327ec211c4
Fixing style errors.
2020-12-31 09:49:27 +00:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Regis Houssin
7c5248d105
FIX and the world turn again
2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc
FIX again and again
2020-12-29 17:48:52 +01:00
Laurent Destailleur
cefd66c18f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-29 16:56:39 +01:00
Laurent Destailleur
af41c06822
Fix warnings
2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f
Fix phpunits
2020-12-29 03:48:11 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Laurent Destailleur
4b3cd947f2
Fix name of function
2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae
Fix warning
2020-12-28 12:30:59 +01:00
Laurent Destailleur
7178918cb4
Merge pull request #15476 from StephaneLesage/fix-edit-category
...
Fix edition of tag/category which used type parameter instead of object's type
2020-12-27 15:08:50 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10
...
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Florian HENRY
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Florian HENRY
79fe5ee34c
actioncomm ok
2020-12-24 14:35:40 +01:00
Laurent Destailleur
3586da75a2
Fix warning
2020-12-24 02:52:49 +01:00
Laurent Destailleur
02daf09928
Fix for php8
2020-12-23 23:06:34 +01:00
Laurent Destailleur
1c73d38093
Fix api to download for shipments
2020-12-23 19:16:15 +01:00
Laurent Destailleur
bf606ede12
Enhance remote ip detection
2020-12-23 13:27:30 +01:00
Laurent Destailleur
dfb632f2d5
Fix phpunit
2020-12-21 17:56:31 +01:00
Laurent Destailleur
14223d74bd
Fix css
2020-12-21 15:00:29 +01:00
Laurent Destailleur
0a1387e673
Debug v13
2020-12-20 18:41:54 +01:00
Laurent Destailleur
361f13154b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/card.php
htdocs/margin/tabs/thirdpartyMargins.php
htdocs/societe/card.php
htdocs/societe/note.php
htdocs/societe/notify/card.php
htdocs/societe/societecontact.php
htdocs/ticket/list.php
2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703
FIX Check of customer/vendor code fails in some cases
2020-12-20 13:54:02 +01:00
Laurent Destailleur
ef4a816c56
CSS
2020-12-19 15:56:21 +01:00
Laurent Destailleur
b6bb08ec2e
Fix management of hreflang
2020-12-19 13:44:15 +01:00
Laurent Destailleur
0eaf924d3b
Add warning on non https website to axplain why features is broken
2020-12-18 15:08:00 +01:00
Laurent Destailleur
832db82fce
Fix warnings
2020-12-18 14:40:45 +01:00
Laurent Destailleur
075181a8d5
Look and feel v13
2020-12-17 12:25:50 +01:00
Laurent Destailleur
d0cc93c608
Fix look and feel v13
2020-12-17 12:09:12 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
36e0f07090
Remove warning
2020-12-17 08:52:39 +01:00
Laurent Destailleur
82710e54a8
Fix get custom odt templates
2020-12-16 18:10:40 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
834058a816
Debug api to create a document
2020-12-16 02:33:21 +01:00
StephaneLesage
49225f3f57
Fix /categories/info.php navigation
2020-12-15 20:17:37 +01:00
Laurent Destailleur
a2bd920371
Fix translation of units
2020-12-15 11:39:18 +01:00
Laurent Destailleur
55deccf364
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-14 23:20:21 +01:00
Laurent Destailleur
5f9b53004b
Fix warning
2020-12-14 17:40:40 +01:00
Laurent Destailleur
e612f53494
Fix warning
2020-12-14 13:01:25 +01:00
Laurent Destailleur
b0e3f1678f
Debug v13
2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b
Fix code
2020-12-14 10:44:51 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
427fb16256
Fix warning
2020-12-13 13:29:47 +01:00
Laurent Destailleur
16ae3b83f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-13 13:02:59 +01:00
Laurent Destailleur
8a0d3e3f6f
Fix warning
2020-12-13 12:38:47 +01:00
Frédéric FRANCE
6c3a9cbc40
clean
2020-12-12 21:27:56 +01:00
Laurent Destailleur
75570cc984
Merge pull request #15743 from frederic34/mycompanysocialnetworks
...
Mycompany social networks separate tab
2020-12-12 19:21:29 +01:00
Laurent Destailleur
d19cdae980
Merge pull request #15727 from frederic34/patch-8
...
add option hide topmenu in Config/Display
2020-12-12 18:48:11 +01:00
Frédéric FRANCE
621f246d58
my company social networks in a separate tab
2020-12-12 18:26:54 +01:00
Frédéric FRANCE
643b507a96
ucfirst
2020-12-12 17:31:10 +01:00
Frédéric FRANCE
46bf871127
target
2020-12-12 17:23:42 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links
2020-12-12 17:00:23 +01:00
Laurent Destailleur
7fdae69546
Fix warning
2020-12-12 14:11:50 +01:00
Laurent Destailleur
0968c68cf9
Enhance widget
2020-12-12 12:45:43 +01:00
Frédéric FRANCE
0b3a5dc796
fix style
2020-12-11 18:09:37 +01:00
Laurent Destailleur
8a0c065163
Debug v13
2020-12-11 16:30:45 +01:00
Laurent Destailleur
1f6f434a9c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export_files.php
test/phpunit/SecurityTest.php
2020-12-11 15:56:19 +01:00
Laurent Destailleur
4fcd3fe493
Fix disallow -- string into filename for security purpose. Vulnerability
...
reported by Yılmaz Değirmenci
2020-12-11 15:12:42 +01:00
Laurent Destailleur
df4d2e1b24
Fix path of user photo
2020-12-10 18:13:30 +01:00
Laurent Destailleur
2c37fe13d6
Fix substitution var keys
2020-12-10 12:14:58 +01:00
Laurent Destailleur
155fa43dc6
Fix substitution var __AMOUNT_TEXT__
2020-12-10 12:01:22 +01:00
Laurent Destailleur
10a0c98f94
Debug v13
2020-12-09 19:26:41 +01:00
Laurent Destailleur
a0d9d98402
Fix phpcs
2020-12-09 18:03:02 +01:00
Laurent Destailleur
70b772cf74
Kit must show details on PDF.
2020-12-08 21:56:48 +01:00
Laurent Destailleur
c26efd756f
FIX #15704 #15565 #15694
2020-12-08 20:53:42 +01:00
Laurent Destailleur
0234df6224
Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty
...
Fix boxes third-parties information
2020-12-08 17:58:09 +01:00
Laurent Destailleur
240648d540
css
2020-12-08 17:09:48 +01:00
Stephane Lesage
376e4d150a
Third-party details in comm action lists
2020-12-08 15:56:42 +01:00
Stephane Lesage
5d8dfadd09
Third-party details in Lists in project index
2020-12-08 15:47:22 +01:00
Laurent Destailleur
64e2ddbd80
Merge pull request #15666 from Zebedeu/develop
...
New #8472 personal and professional titles added
2020-12-07 22:40:01 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template
...
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
3fb63e6a4b
Look and feel v13
2020-12-07 15:51:22 +01:00
Laurent Destailleur
e0d656e0c8
Fix phpcs
2020-12-06 18:01:23 +01:00
Laurent Destailleur
a87ef49172
Fix remove warning
2020-12-06 17:59:49 +01:00
Laurent Destailleur
de61a7cfd3
Fix cleaning html tags with trans and with GETPOST.
2020-12-06 17:30:27 +01:00
Zebedeu
dadb257c85
Fix #15675 fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:58:46 +01:00
Zebedeu
50b80785f5
Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 35ea990cff
2020-12-06 07:56:18 +01:00
Zebedeu
35ea990cff
Fix #15675 fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:49:22 +01:00
Zebedeu
e38c6e4322
Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 3b7e510e61
2020-12-06 07:42:45 +01:00
Zebedeu
3b7e510e61
Fix #15675 fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:31:54 +01:00
Zebedeu
2a4fe639ae
Revert "fix | fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 8697fda78b
2020-12-06 07:28:18 +01:00
Zebedeu
8697fda78b
fix | fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:22:06 +01:00
Zebedeu
f708065445
Revert "Fix | fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 1a1850c6f1
2020-12-06 07:14:11 +01:00
Zebedeu
1a1850c6f1
Fix | fixed the error of installation start of version 13.0.0-beta
2020-12-05 20:28:55 +01:00
Zebedeu
1917d9b508
Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 7a8d031d56
2020-12-05 20:23:31 +01:00
Zebedeu
7a8d031d56
Fix #15675 fixed the error of installation start of version 13.0.0-beta
2020-12-05 20:17:57 +01:00
Laurent Destailleur
6c2d520e21
FIX caluclation of open days must not depends on TZ.
2020-12-05 17:41:05 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho
2020-12-05 15:35:52 +01:00
Laurent Destailleur
cb9d6318e7
Fix warning
2020-12-05 14:09:51 +01:00
Laurent Destailleur
5860bf69ce
fix warning
2020-12-05 13:48:51 +01:00
Laurent Destailleur
3b55eb1d82
FIX master must be after session_start but dol_getprefix must be before
...
and after filefunc.inc.php.
2020-12-05 13:26:58 +01:00
Laurent Destailleur
bb0c33a49e
Merge pull request #15654 from frederic34/commonkanban
...
keep common if wanted
2020-12-04 22:25:51 +01:00
Laurent Destailleur
0536ed87a2
Avoid to process too large user agent
2020-12-04 21:38:33 +01:00
Frédéric FRANCE
a2eab824c1
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-12-04 20:42:22 +01:00
stickler-ci
d89970ddd1
Fixing style errors.
2020-12-04 19:31:53 +00:00
Frédéric FRANCE
c8407b2f91
keep common if wanted
2020-12-04 20:28:05 +01:00
Laurent Destailleur
10bef6eb03
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
atm-lena
d22646e6ae
pricetonum() - preg-replace() delete "-" negativ number
2020-12-04 16:06:10 +01:00
Laurent Destailleur
f06d920460
FIX #15583
2020-12-03 16:22:03 +01:00
Laurent Destailleur
5bd6d6f388
Look and feel v13
2020-12-03 14:34:15 +01:00
Laurent Destailleur
1ec3d4cfdf
CSS
2020-12-03 13:19:35 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
99e4aab46e
CSS
2020-11-30 20:31:22 +01:00
Frédéric FRANCE
765df41918
introduce GETPOSTINT
2020-11-30 15:44:29 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
6af9c9f857
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-11-30 07:50:26 +01:00
Laurent Destailleur
b6ccfaf180
css
2020-11-30 07:50:14 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
58eaef37d2
Fix regression
2020-11-29 21:29:22 +01:00
Laurent Destailleur
d3a2aa664f
FIX #15572
2020-11-29 20:27:40 +01:00
Laurent Destailleur
404634919d
Look and feel v13
2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
41984f9934
Clean code
2020-11-28 14:00:35 +01:00
Laurent Destailleur
b1603ed1f5
Fix warning
2020-11-28 12:12:31 +01:00
Laurent Destailleur
7c4599a5c5
Look and feel v13
2020-11-28 01:15:23 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-27 11:18:04 +01:00
Laurent Destailleur
47a5037155
Fix dolGetFirstLastname() for 4 and 5
2020-11-27 01:18:01 +01:00
Laurent Destailleur
2cf005d22c
Removed warning
2020-11-27 00:39:49 +01:00
Laurent Destailleur
b3b511a6d4
FIX #15546
2020-11-26 22:44:11 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
c7e5b0dcc1
Fix warning
2020-11-26 10:12:24 +01:00
Laurent Destailleur
e272130a6a
Fix phpcs
2020-11-26 08:40:08 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-25 12:59:32 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files
2020-11-24 18:54:59 +01:00
Laurent Destailleur
47ca74965b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-24 12:26:50 +01:00
Laurent Destailleur
d2f8b65dbf
Prepare use of session in db
2020-11-24 12:26:32 +01:00
Laurent Destailleur
817de18a5d
Fix remove log
2020-11-24 12:25:32 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
53208e620e
Use of . as thousand separator. Can use it for decimal if not 3 digits.
2020-11-24 10:56:05 +01:00
Laurent Destailleur
1e70790cd6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/price.php
2020-11-23 19:55:13 +01:00
Laurent Destailleur
c5278197fb
More phpunit test for price2num
2020-11-23 19:45:11 +01:00
Laurent Destailleur
9b4b11b4bd
Fix var not defined
2020-11-22 14:49:30 +01:00
Laurent Destailleur
e5e320fd90
Fix null
2020-11-22 01:26:58 +01:00
Laurent Destailleur
97e36502f0
Fix warning
2020-11-21 23:37:42 +01:00
Laurent Destailleur
73a3a03398
Fix for smartphone
2020-11-21 23:36:20 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
bf94ce6aad
Fix warnings
2020-11-21 16:49:54 +01:00
Laurent Destailleur
95b79094df
Fix warning.
...
Module cron is more clear.
2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Laurent Destailleur
aa7383f3d4
Fix warning
2020-11-19 18:15:40 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
0760a268f6
Fix warning
2020-11-18 22:25:03 +01:00
Laurent Destailleur
95460e6372
Merge pull request #15422 from frederic34/patch-10
...
add optional tag which list all other tags in odt substitutions
2020-11-18 12:44:25 +01:00
Laurent Destailleur
2529448f1b
Fix path to files
2020-11-18 12:37:18 +01:00
Laurent Destailleur
3e4c6b9222
Fix warning
2020-11-17 13:13:11 +01:00
Frédéric FRANCE
3b1f50d5fc
Update functions.lib.php
2020-11-17 11:58:11 +01:00
Frédéric FRANCE
fb5385180f
Update functions.lib.php
2020-11-17 11:54:18 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
ca02ac9e45
Remove warning for php8
2020-11-16 13:00:18 +01:00
Laurent Destailleur
b3e03c6991
Fix css for public pages
2020-11-14 18:11:46 +01:00
