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 |
|