Indelog
4d60fe8ff9
Fix empty $sublang dolSavePageAlias
...
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
2021-04-06 22:21:00 +02:00
Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Laurent Destailleur
7ff74768eb
Fix pb with renaming field total
2021-04-06 20:16:14 +02:00
Laurent Destailleur
0377508100
Fix sql
2021-04-06 20:10:29 +02:00
Laurent Destailleur
b7cd3270cb
Merge pull request #17118 from ptibogxiv/patch-424
...
FIX uniformization of external link
2021-04-06 19:36:26 +02:00
Laurent Destailleur
d1df327284
Add tab for import/export profiles
2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7
Look and feel v14
2021-04-06 18:18:07 +02:00
Laurent Destailleur
10fb793fb1
Enhance the security page
2021-04-06 13:56:33 +02:00
Ahmad Hadeed
f2f2aed6cd
Fix 3 weekend holiday behavior after adding support to Friday as a holiday.
2021-04-05 22:05:22 +03:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
stickler-ci
caa2facd47
Fixing style errors.
2021-04-05 17:09:25 +00:00
Ahmad Hadeed
235725b528
Add support for Friday as a holiday and some comment alignment fixes
2021-04-05 19:57:33 +03:00
Laurent Destailleur
685c880e6c
Debug module workstation
2021-04-05 14:56:47 +02:00
ptibogxiv
1b3b2ca023
Update payments.lib.php
2021-04-05 13:52:09 +02:00
Laurent Destailleur
6fc19c626d
Try fix for #17094
2021-04-04 17:05:01 +02:00
Laurent Destailleur
1a70aebba6
NEW Can set a target image in dolcropresize function.
2021-04-04 01:12:25 +02:00
Givriz
5ed01f6733
Fix errors phpv8
2021-04-03 17:09:14 +02:00
Laurent Destailleur
17437670b1
Set include of js as async
2021-04-03 13:24:34 +02:00
Laurent Destailleur
5ce9bc5801
FIX #yogosha5748
2021-04-02 23:23:44 +02:00
Laurent Destailleur
39fc2e6e60
NEW Save old page with .old in edition of a website page
2021-04-01 19:49:36 +02:00
Laurent Destailleur
354adbde54
Look and feel v14
2021-04-01 12:27:02 +02:00
Laurent Destailleur
8e14b4d434
FIX #yogosha5775
2021-04-01 11:27:39 +02:00
Alexandre SPANGARO
b5702fcb13
Merge branch '13.0' into 13p31
2021-04-01 04:38:08 +02:00
Alexandre SPANGARO
530b122f1e
FIX: Periodicity by default on fiscal year, according to the date, we have plus 1 year added
2021-04-01 04:37:47 +02:00
Florian HENRY
73d7eefdcf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-31 20:09:44 +02:00
Laurent Destailleur
6aa1229c19
FIX #yogosha5791
2021-03-31 12:44:13 +02:00
Laurent Destailleur
cdd3e385e7
Merge branch 'new-propal-signature-date-and-user' of
...
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user
# Conflicts:
# htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-03-30 19:34:25 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
lvessiller
85fff685db
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:04:19 +02:00
Laurent Destailleur
843e0a2c39
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/html.formother.class.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
htdocs/projet/tasks/time.php
htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
Florian HENRY
11dcf656c6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 20:30:31 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28
...
NEW: Add company info in dropdown login menu
2021-03-29 19:02:12 +02:00
Florian HENRY
e18c010490
fix bug on list
2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 15:49:43 +02:00
Laurent Destailleur
e03fbda96a
Avoid to obfuscate attributes with html tags inside
2021-03-29 14:50:44 +02:00
Laurent Destailleur
4cacca413e
FIX #yogosha5757
2021-03-29 14:43:40 +02:00
Laurent Destailleur
e382d49299
Fix bad permission
2021-03-29 13:49:24 +02:00
Florian HENRY
2def98809c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 11:55:26 +02:00
Laurent Destailleur
2a431d4951
Protect backtourl from using external urls
2021-03-28 21:39:18 +02:00
Laurent Destailleur
95a7e13e3a
Debug establishment
2021-03-27 14:54:09 +01:00
Laurent Destailleur
5b64a517ea
Fix label
2021-03-27 14:30:10 +01:00
Laurent Destailleur
1bb07c0eb1
Look and feel v14
2021-03-27 13:59:50 +01:00
Alexandre SPANGARO
c1ceefb70f
Update with new functionality
2021-03-27 04:44:20 +01:00
Alexandre SPANGARO
6809dab2c0
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-27 04:12:15 +01:00
Florian HENRY
f87711bf2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-26 18:30:08 +01:00
lvessiller
05bf3cdab1
FIX stickler-ci errors
2021-03-26 17:59:16 +01:00
Laurent Destailleur
84ec032cc0
Look and feel v14
2021-03-26 17:58:00 +01:00
lvessiller
8a2e49d6e7
NEW date and user signature on proposal (Issue 16062)
2021-03-26 17:44:41 +01:00
Laurent Destailleur
cfd992b930
Add call of rebuild_sequence with pgsql.
2021-03-26 13:10:06 +01:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
ksar
ccd6d28f6f
FIX #16843
...
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4
fa-mail-forward => fa-share
2021-03-25 14:39:42 +01:00
Laurent Destailleur
5ddd98cd39
Move module intracomm as experimental
2021-03-25 11:24:46 +01:00
Laurent Destailleur
ff52b1ee41
Merge pull request #16620 from altairisfr/pr_batch_masks
...
Define Masks for Batch Products Equipments
2021-03-25 08:36:36 +01:00
Laurent Destailleur
594c94feb2
Clean code. Allow iframes into the external frame module.
2021-03-25 03:44:38 +01:00
Laurent Destailleur
b011a67698
Fix remove var_dump
2021-03-25 00:03:31 +01:00
Laurent Destailleur
cc54b7fe29
Fix dol_string_onlythesehtmlattributes
2021-03-25 00:03:09 +01:00
Laurent Destailleur
6f01869bcb
Enhance the WAF
2021-03-24 23:14:22 +01:00
Laurent Destailleur
d1fa46089f
Removed not used page.
...
Enhance the WAF
2021-03-24 22:54:40 +01:00
Florian HENRY
373a52063d
add commit
2021-03-24 20:13:30 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
86c7ab922a
Fix #yogosha5728
2021-03-24 18:57:23 +01:00
Alexandre SPANGARO
34abb53c25
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-24 14:09:46 +01:00
Laurent Destailleur
4d1fdd8763
Fix #yogosha5725
2021-03-23 21:45:37 +01:00
Laurent Destailleur
28ca2990f0
CSS
2021-03-23 20:09:26 +01:00
Laurent Destailleur
3857daed94
Fix remove log
2021-03-23 18:08:44 +01:00
Laurent Destailleur
5ff9038e4e
Fix permissions on BOMs
2021-03-23 18:02:52 +01:00
Laurent Destailleur
cfa39597c3
FIX #yogosha5707
2021-03-23 17:28:38 +01:00
Laurent Destailleur
7c69b45c68
FIX #yogosha5707
2021-03-23 17:27:43 +01:00
Laurent Destailleur
e3b019f923
Clean code
2021-03-23 01:32:17 +01:00
Laurent Destailleur
cce4ebdb8c
Clean code
2021-03-22 18:50:47 +01:00
Laurent Destailleur
5a8d757a30
Add missing data
2021-03-22 18:23:29 +01:00
Laurent Destailleur
5d6fb0cfea
Perf: Enhance performance of VAT report
2021-03-22 18:11:44 +01:00
Laurent Destailleur
897d653144
Debug default date for vat reports
2021-03-22 16:09:18 +01:00
Laurent Destailleur
6a0e0f4c06
Fix #ygosha5698
2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
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
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
Laurent Destailleur
767f07d02e
Debug function to show list of files in ECM module
2020-11-11 22:47:06 +01:00
Laurent Destailleur
64428f34a0
Fix error message
2020-11-11 05:04:15 +01:00
Laurent Destailleur
617da2ec5f
Fix error message
2020-11-11 04:55:44 +01:00
jcp
50d530733e
NEW: ICS fields moved into bank account table
2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
129c53342a
Fix warning
2020-11-07 20:01:28 +01:00
Laurent Destailleur
d8eb9f8096
Merge pull request #15259 from frederic34/show_ticket_messaging
...
optimize show_ticket_messaging
2020-11-07 19:07:44 +01:00
Laurent Destailleur
b386faebd8
Add noopenenr on links to dolibarr website
2020-11-07 12:49:38 +01:00
Laurent Destailleur
62ba731823
Fix the follow/nofollow was not propagated
2020-11-07 12:47:42 +01:00
Laurent Destailleur
4535d81964
Fix CSS for holiday. Fix #15266
2020-11-05 19:09:58 +01:00
Laurent Destailleur
38f1431534
HOLIDAY_HIDE_FOR_NON_SALARIES replaces !HOLIDAY_FOR_NON_SALARIES_TOO
2020-11-05 19:01:00 +01:00
Laurent Destailleur
a313c35f5b
Fix php8
2020-11-05 11:29:23 +01:00
Laurent Destailleur
9e509a805a
Merge pull request #15289 from frederic34/patch-16
...
can't input two lines address
2020-11-04 18:55:08 +01:00
Laurent Destailleur
32ed5cc07f
Merge pull request #15286 from frederic34/patch-15
...
The function each() has been deprecated: 7.2
2020-11-04 18:36:49 +01:00
Laurent Destailleur
7294a47ef5
Fix generation of user from member, contact, applications for job
2020-11-04 13:33:52 +01:00
Frédéric FRANCE
7c7a1b5512
Update functions.lib.php
2020-11-04 09:45:02 +01:00
Frédéric FRANCE
7caac9ebe7
The function each() has been deprecated: 7.2
2020-11-03 21:35:23 +01:00
Laurent Destailleur
b0e2d40533
Debug and fix v13
2020-11-03 14:19:54 +01:00
Frédéric FRANCE
d84be819da
Merge remote-tracking branch 'upstream/develop' into show_ticket_messaging
2020-11-02 12:50:42 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Frédéric FRANCE
1b992a725f
use assignment
2020-11-02 11:30:07 +01:00
Frédéric FRANCE
3cd11c4e8b
optimize show_ticket_messaging
2020-11-02 00:26:26 +01:00
Laurent Destailleur
41965381fd
Better compatibility with PHP8
2020-11-01 21:27:56 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Laurent Destailleur
e5a5f37b3f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/bills.lang
2020-10-31 15:09:26 +01:00
Laurent Destailleur
41b938047d
Fix doc
2020-10-31 14:51:32 +01:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate
...
# New multi-currency exchange rate editor
2020-10-31 13:55:42 +01:00
Laurent Destailleur
9113ecedfa
code comment
2020-10-31 12:55:26 +01:00
Laurent Destailleur
623cb54480
Prepare a more complete fix for #15016
2020-10-31 12:30:47 +01:00
Laurent Destailleur
a4d2927f82
Fix for #15016
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-10-31 12:18:54 +01:00
Laurent Destailleur
fcb3245295
Fix for #15016
2020-10-31 12:11:41 +01:00
Laurent Destailleur
0a9c7fc577
Look and feel v13
2020-10-31 04:19:22 +01:00
Laurent Destailleur
d4daf8b9ce
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security2.lib.php
2020-10-30 05:59:45 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Laurent Destailleur
b3333da5c1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/main.inc.php
2020-10-30 04:39:41 +01:00
Laurent Destailleur
1a02504792
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/security2.lib.php
2020-10-30 04:26:09 +01:00
Laurent Destailleur
f51b02026c
Fix regression
2020-10-30 04:24:06 +01:00
Laurent Destailleur
ec0c8e0c79
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/tpl/advtarget.tpl.php
2020-10-30 03:35:40 +01:00
Laurent Destailleur
f22017080d
Fix for php8
2020-10-30 03:25:33 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Florian HENRY
4b7707cc7c
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 17:17:52 +01:00
Laurent Destailleur
4cf32824bf
Merge pull request #15187 from frederic34/patch-6
...
Make MAIN_ALL_TO_UPPER utf8 compliant
2020-10-28 17:17:18 +01:00
Laurent Destailleur
77dfda1a2d
Merge pull request #15194 from ptibogxiv/patch-391
...
FIX display variants card
2020-10-28 17:10:34 +01:00
Laurent Destailleur
e3f848238d
Merge pull request #15195 from frederic34/cachecompanylib
...
add cache
2020-10-28 17:09:27 +01:00
Marc de Lima Lucio
ca2ed2ef74
NEW: ref in product customer price: look for products with customer ref
2020-10-28 11:04:15 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Frédéric FRANCE
0d65ab0c96
add cache
2020-10-28 00:34:59 +01:00
ptibogxiv
6fd996381e
FIX display variant card
2020-10-27 23:07:05 +01:00
Frédéric FRANCE
7a7a6f8018
fix phpcs
2020-10-27 21:28:26 +01:00
Frédéric FRANCE
991273bd10
Update functions.lib.php
2020-10-27 20:44:17 +01:00
Frédéric FRANCE
7d30a11a26
Update functions.lib.php
2020-10-27 20:06:49 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
7d291d075e
Merge pull request #15184 from frederic34/formcolor
...
formcolor parameter is deprecated
2020-10-27 19:03:29 +01:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36
Fix scrutinizer
2020-10-27 18:55:55 +01:00
Frédéric FRANCE
900452a47d
formcolor parameter is deprecated
2020-10-27 18:46:42 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c
More secured getURLContent method. Add PHPUnit on getURLContent
2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1
More secured getURLContent method. Add PHPUnit on getURLContent
2020-10-27 15:06:16 +01:00
Laurent Destailleur
4adaf67d47
Hide setup we don't need if email are disabled globally
...
CSS
2020-10-27 11:40:30 +01:00
Laurent Destailleur
d2a2d74f7e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/langs/am_ET/mrp.lang
htdocs/langs/ar_SA/mrp.lang
htdocs/langs/az_AZ/mrp.lang
htdocs/langs/bg_BG/mrp.lang
htdocs/langs/bn_BD/mrp.lang
htdocs/langs/bn_IN/mrp.lang
htdocs/langs/bs_BA/mrp.lang
htdocs/langs/ca_ES/mrp.lang
htdocs/langs/cs_CZ/mrp.lang
htdocs/langs/da_DK/mrp.lang
htdocs/langs/de_DE/mrp.lang
htdocs/langs/el_GR/mrp.lang
htdocs/langs/en_US/mrp.lang
htdocs/langs/es_ES/mrp.lang
htdocs/langs/et_EE/mrp.lang
htdocs/langs/eu_ES/mrp.lang
htdocs/langs/fa_IR/mrp.lang
htdocs/langs/fi_FI/mrp.lang
htdocs/langs/fr_FR/mrp.lang
htdocs/langs/gl_ES/mrp.lang
htdocs/langs/he_IL/mrp.lang
htdocs/langs/hi_IN/mrp.lang
htdocs/langs/hr_HR/mrp.lang
htdocs/langs/hu_HU/mrp.lang
htdocs/langs/id_ID/mrp.lang
htdocs/langs/is_IS/mrp.lang
htdocs/langs/it_IT/mrp.lang
htdocs/langs/ja_JP/mrp.lang
htdocs/langs/ka_GE/mrp.lang
htdocs/langs/km_KH/mrp.lang
htdocs/langs/kn_IN/mrp.lang
htdocs/langs/ko_KR/mrp.lang
htdocs/langs/lo_LA/mrp.lang
htdocs/langs/lt_LT/mrp.lang
htdocs/langs/lv_LV/mrp.lang
htdocs/langs/mk_MK/mrp.lang
htdocs/langs/mn_MN/mrp.lang
htdocs/langs/nb_NO/mrp.lang
htdocs/langs/ne_NP/mrp.lang
htdocs/langs/nl_NL/mrp.lang
htdocs/langs/pl_PL/mrp.lang
htdocs/langs/pt_PT/mrp.lang
htdocs/langs/ro_RO/mrp.lang
htdocs/langs/ru_RU/mrp.lang
htdocs/langs/sk_SK/mrp.lang
htdocs/langs/sl_SI/mrp.lang
htdocs/langs/sq_AL/mrp.lang
htdocs/langs/sr_RS/mrp.lang
htdocs/langs/sv_SE/mrp.lang
htdocs/langs/sw_SW/mrp.lang
htdocs/langs/th_TH/mrp.lang
htdocs/langs/tr_TR/mrp.lang
htdocs/langs/uk_UA/mrp.lang
htdocs/langs/uz_UZ/mrp.lang
htdocs/langs/vi_VN/mrp.lang
htdocs/langs/zh_CN/mrp.lang
htdocs/langs/zh_HK/mrp.lang
htdocs/langs/zh_TW/mrp.lang
htdocs/mrp/class/mo.class.php
htdocs/mrp/mo_agenda.php
htdocs/mrp/mo_card.php
htdocs/mrp/mo_document.php
htdocs/mrp/mo_movements.php
htdocs/mrp/mo_note.php
htdocs/mrp/mo_production.php
2020-10-27 02:55:22 +01:00
Laurent Destailleur
313273f462
Doc
2020-10-27 02:19:43 +01:00
Alfredo Altamirano
214cd2c99b
Update references of MO translation string
2020-10-26 15:44:26 -06:00
Frédéric FRANCE
4a0dd3b4bc
add small photo in picto link
2020-10-26 22:05:40 +01:00
Laurent Destailleur
a8fccc67ba
Merge pull request #15148 from frederic34/patch-6
...
doxygen
2020-10-26 19:28:11 +01:00
Florian HENRY
9aa3368627
syntax
2020-10-26 16:33:13 +01:00
Florian HENRY
76824c868b
clean get price for fourn and labal for supplier coducment
2020-10-26 16:31:07 +01:00
stickler-ci
541dab5737
Fixing style errors.
2020-10-26 13:40:05 +00:00
Marc de Lima Lucio
bb850ad0d0
NEW: ref in product customer price: add ref in PDFs + hidden conf to choose refs to show
2020-10-26 13:05:07 +01:00
Laurent Destailleur
6c1f60f6c0
Fix regression
2020-10-25 17:19:15 +01:00
Laurent Destailleur
8578a7cd7c
Fix regressions
2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Frédéric FRANCE
1f4bd8476b
doxygen
2020-10-25 15:42:15 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
cc17f08409
Merge pull request #15131 from frederic34/patch-13
...
doxygen
2020-10-25 14:45:24 +01:00
Laurent Destailleur
180d01e76e
Merge pull request #15132 from frederic34/patch-14
...
doxygen
2020-10-25 14:34:04 +01:00
Frédéric FRANCE
000fa91235
fix variable
2020-10-24 13:39:59 +02:00
Frédéric FRANCE
adf1cd1fb7
doxygen
2020-10-24 09:42:52 +02:00
Frédéric FRANCE
e476678a54
doxygen
2020-10-24 09:32:39 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
jpb
63c82b47fe
Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate
2020-10-23 12:27:14 +02:00
jpb
1ecff0a608
add list and crud
2020-10-23 11:58:25 +02:00
Frédéric FRANCE
82c3f63c5c
replace deprecated
2020-10-22 22:54:29 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
9699bdc0fa
Fix phpcs
2020-10-22 21:31:34 +02:00
Laurent Destailleur
8074d2cc1d
NEW Add validation of MX domain for emails
2020-10-22 20:01:59 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/product/composition/card.php
2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2020-10-22 17:34:48 +02:00
Laurent Destailleur
31f1ab73b1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-10-22 17:31:29 +02:00
Laurent Destailleur
c09e71962e
Merge pull request #15060 from grandoc/new_branch_19_10_2020
...
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/…
2020-10-22 16:11:47 +02:00
Laurent Destailleur
763d0baa14
Merge pull request #15066 from louiscarrese/develop
...
CLOSE #15065 Put the product label in bold in the PDF templates if co…
2020-10-22 15:53:43 +02:00
Laurent Destailleur
2a31d43938
FIX Show errors in session on login page
2020-10-20 18:41:26 +02:00
Florian Mortgat
529dfb8dfb
FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched
2020-10-20 16:37:15 +02:00
Louis Carrese
693e345cab
CLOSE #15065 Fix formatting
...
Had spaces instead of tabs...
2020-10-20 14:34:17 +02:00
Louis Carrese
f377456132
CLOSE #15065 Put the product label in bold in the PDF templates if configured
...
The global configuration variable PDF_BOLD_PRODUCT_LABEL is checked to put the product label in bold in the PDF
templates.
This modification is based on the same behaviour for the product reference, found at line 1373 of the same file.
The products table of the invoices / commercial propositions is produced in the PDF library, hence we have to modify
this library to style the invoices.
Producing a new template would mean duplicating code from the library with the maintenace implications.
2020-10-20 14:19:37 +02:00
Philippe Grand
85513318d0
Update functions.lib.php
2020-10-20 09:30:41 +02:00
Philippe GRAND
5233c6064f
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/.../domains/httpdocs/core/lib/functions.lib.php on line 4379
2020-10-19 16:30:12 +02:00
Laurent Destailleur
4fe857f5d2
Change picto to close a widget
2020-10-17 17:54:09 +02:00
Laurent Destailleur
885e6caaa1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2020-10-16 15:53:31 +02:00
Laurent Destailleur
6bba249935
FIX pdf_getlinetotalwithtax must show total incl tax
2020-10-16 15:50:51 +02:00
Laurent Destailleur
e74b833d7f
Look and feel v13
2020-10-16 15:40:52 +02:00
Laurent Destailleur
4dea8c4bb7
Fix missing token
2020-10-16 13:36:05 +02:00
Laurent Destailleur
5905d3be64
Fix phpcs
2020-10-16 00:06:26 +02:00
Laurent Destailleur
24f7a8aeed
Merge pull request #15028 from FHenry/fix_intracom
...
fix table creation for intracom and change reserved name column name
2020-10-15 20:19:05 +02:00
Laurent Destailleur
14a26c499f
Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type
...
FIX : Use table_element instead of element
2020-10-15 20:14:39 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d
css
2020-10-15 13:16:17 +02:00
Florian HENRY
a0d1e96bfd
fix table creation for intracom and change reserved name column name
2020-10-15 11:37:44 +02:00
ATM-Nicolas
20aee01fd8
FIX : Use table_element instead of element
2020-10-15 11:14:20 +02:00
Laurent Destailleur
20d5098ce2
Fix regression in dol_getdate()
2020-10-14 19:42:17 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields
...
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php
2020-10-14 17:35:14 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM
...
NEW display stat for BOM on "object referent"/linked Object product tab
2020-10-14 17:14:47 +02:00
Laurent Destailleur
e8ea7125e5
Removed the FIXME. The dol_getdate can now use a timezone.
2020-10-14 17:11:22 +02:00
ATM-Nicolas
98eb11be62
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 16:59:05 +02:00
Laurent Destailleur
3cf2b6b5eb
Doc comment.
2020-10-14 15:01:50 +02:00
stickler-ci
8bfb04ea7f
Fixing style errors.
2020-10-14 08:34:30 +00:00
Florian HENRY
ee67d2b1a8
fixnhish bom product stats
2020-10-14 10:30:39 +02:00
Florian HENRY
6ff58aafdc
Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM
2020-10-14 08:43:07 +02:00
Florian HENRY
74155a49be
finish BOM stat referent object
2020-10-14 08:42:57 +02:00
Laurent Destailleur
4a3a3190ea
Standardize pdf templates
2020-10-14 01:46:49 +02:00
Laurent Destailleur
bc6b5d919a
Better responsive
2020-10-13 10:51:51 +02:00
Florian HENRY
4bf428fbf8
Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM
2020-10-13 08:13:54 +02:00
Laurent Destailleur
75997bb8f5
Minor fixes
2020-10-12 14:01:15 +02:00
Florian HENRY
739de365c0
load stat_bom
2020-10-12 13:52:50 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Laurent Destailleur
cc82a15688
css
2020-10-09 18:43:24 +02:00
Laurent Destailleur
b6fc33c454
Fix avoid error when we sumbit form to change page on conciliation
2020-10-09 11:13:02 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Laurent Destailleur
24d35ff9b5
CSS
2020-10-08 11:52:58 +02:00
Laurent Destailleur
70fa262293
CSS
2020-10-08 09:30:15 +02:00
Laurent Destailleur
ff739dcbd2
Increase size of small image (used by PDF)
2020-10-07 19:39:17 +02:00
Laurent Destailleur
561ca757d7
phpcs
2020-10-07 17:17:13 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
96ab66ea5a
Add function
2020-10-07 14:58:54 +02:00
Laurent Destailleur
d1c2772ee7
NEW Add function dolButtonToOpenUrlInDialogPopup() to be able to open
...
any url into a dialog popup.
2020-10-07 12:31:15 +02:00
Laurent Destailleur
47c80f0d14
Merge pull request #14942 from TobiasSekan/ShowProjectOverviewCount
...
Show count on project overview tab
2020-10-06 23:34:43 +02:00
Laurent Destailleur
13ec304b79
Update project.lib.php
2020-10-06 23:30:51 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697
2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697
2020-10-06 15:57:50 +02:00
Laurent Destailleur
95f67309e2
Clean code
2020-10-06 15:11:45 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697
2020-10-06 13:32:02 +02:00
Laurent Destailleur
254d9edbb9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-06 13:18:58 +02:00
Laurent Destailleur
6933b7ec9c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/agenda.lib.php
2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-10-06 13:13:31 +02:00
Sekan, Tobias
3ceb5c217f
Show count on project overview tab
2020-10-06 12:56:28 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
Aurélien
140200213e
change table into DB and ref #14697
2020-10-06 11:04:31 +02:00
Alexandre SPANGARO
d83d9895e0
NEW Vat report - Invert constant to show by default zero vat in reports
2020-10-05 20:52:31 +02:00
Aurélien
c1b0c1f6a2
rename folder ref to Module Delivery
2020-10-05 15:32:29 +02:00
Laurent Destailleur
afd6da3b94
Better error management
2020-10-05 14:51:28 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697
2020-10-05 13:59:59 +02:00
Laurent Destailleur
cfc3c01815
Factorize code to know if a parameter is used to store a secret
2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1
NEW Can force the antivirus from conf file or autoprepend ini setup.
2020-10-05 05:00:59 +02:00
ptibogxiv
dd1904c521
Fix multicompany in last action box
2020-10-04 13:58:46 +02:00
Laurent Destailleur
9b3cd421ee
Fix doc
2020-10-03 14:56:04 +02:00
Laurent Destailleur
3b34c496cc
Code
2020-10-03 14:11:47 +02:00
Laurent Destailleur
581a3d8808
FIX Add a better message when file size is too large
2020-10-03 14:02:53 +02:00
Laurent Destailleur
50ca9f4145
Clean code
2020-10-02 19:10:30 +02:00
Laurent Destailleur
00cb3277ec
Merge pull request #14891 from inoveaconseil/Newhidelabelvariant
...
NEW hide label in pdf for variants
2020-10-02 13:45:52 +02:00
Laurent Destailleur
7e414fe9da
Merge pull request #14889 from frederic34/ecm_extrafields
...
NEW Add extrafields support on ECM module
2020-10-02 13:44:45 +02:00
Laurent Destailleur
0893f0250a
Minor bug fixes
2020-10-02 12:54:56 +02:00
Nicolas
9e4e027495
Hide label
2020-10-02 09:39:42 +02:00
Nicolas
85dfb5bf3c
Hide the label into pdf document for variants
2020-10-02 09:27:01 +02:00
Nicolas
e72fbbfe17
Hide the label into pdf document for variants
2020-10-02 09:21:44 +02:00
Laurent Destailleur
813deee4a5
Fix phpcs
2020-10-02 01:14:43 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm
2020-10-02 00:21:13 +02:00
stickler-ci
e14c971b69
Fixing style errors.
2020-09-30 13:29:20 +00:00
ptibogxiv
9624a33e53
FIX date and user cloture / closing display
...
temporary fix while convert french to english term in dolibarr
2020-09-30 15:27:16 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Laurent Destailleur
1e176fad8f
Fix GETPOST on array
2020-09-29 21:28:07 +02:00
Laurent Destailleur
fba8fdae6e
Merge pull request #14856 from bafbes/abb120146
...
new:bankline_prepare_head for bank lines
2020-09-29 16:40:51 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00
bahfir abbes
9662c4110a
new:bankline_prepare_head for bank lines
2020-09-29 01:28:39 +01:00
Laurent Destailleur
1a28d7f641
Fix missing token
2020-09-28 16:33:27 +02:00
Laurent Destailleur
2e79064098
Clean code
2020-09-28 11:07:53 +02:00
Laurent Destailleur
1aaf1fe357
Try catch on eval
2020-09-27 21:10:27 +02:00
Laurent Destailleur
5c9ad3ec9b
Update files.lib.php
2020-09-27 18:55:09 +02:00
Florian HENRY
5ff7e37696
review code
2020-09-27 18:05:19 +02:00
Florian HENRY
b6b2553501
Merge branch '11.0' into 11.0_fixmultidiroutput
2020-09-27 18:02:22 +02:00
Laurent Destailleur
68a6239322
Clean code
2020-09-26 04:25:14 +02:00
Laurent Destailleur
611684a9a7
FIX Substitution for member subscription was not done
2020-09-26 02:39:19 +02:00
Laurent Destailleur
d3e9815cfa
Fix phpunit
2020-09-25 17:48:04 +02:00
Laurent Destailleur
48632bbb3f
Clean code
2020-09-25 17:23:42 +02:00
Laurent Destailleur
1b83b55995
Fix to exclude possible sql injection
2020-09-25 17:11:54 +02:00
Laurent Destailleur
0d797a793a
On technical error, return http code 500
2020-09-25 15:01:15 +02:00
Laurent Destailleur
95cf3d2f51
NEW Can use desired stock of a given warehouse for replenishment
2020-09-23 23:02:31 +02:00
Laurent Destailleur
09c6761dae
NEW Include the tag editor of page as a popup into website editor
2020-09-23 16:36:19 +02:00
Laurent Destailleur
5a1c05735f
Fix phpcs
2020-09-22 15:55:30 +02:00
Laurent Destailleur
fea6fca7d1
Fix phpunit
2020-09-22 15:31:09 +02:00
Laurent Destailleur
d21ee07afc
NEW Can define date range of validity of a login during creation
2020-09-22 14:45:19 +02:00
Laurent Destailleur
5f4547bf7c
Prepare table for future features
2020-09-22 10:38:16 +02:00
Laurent Destailleur
438e884c01
Fix phpcs
2020-09-21 14:17:05 +02:00
Laurent Destailleur
3ca379c9e6
FIX Restore multiselect (selection of prospect level)
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc
FIX Restore multiselect (selection of prospect level)
2020-09-21 12:16:22 +02:00
Laurent Destailleur
43376b3abc
Removed warning
2020-09-20 21:27:11 +02:00
Laurent Destailleur
2fcc0791ac
Fix regression on backtopage
2020-09-20 19:55:44 +02:00
Laurent Destailleur
b024ce799c
Merge pull request #14782 from b92/patch-1
...
FIX: Members substitution variable not substituted if empty
2020-09-20 17:13:29 +02:00
Laurent Destailleur
2eb46b4900
Enhance antiXSS by excluding non printable chars used to obfuscate hack
2020-09-20 04:56:45 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
b5703350da
Fix escape
2020-09-19 22:41:05 +02:00
Laurent Destailleur
54c0f742b1
Fix escape
2020-09-19 21:19:04 +02:00
Laurent Destailleur
3bd94d52a1
Fix css
2020-09-19 15:15:49 +02:00
Laurent Destailleur
b1985950a6
Use POST to make the ajax set/del constant
2020-09-19 12:50:47 +02:00
Laurent Destailleur
e142b42f19
Clean code
2020-09-19 04:14:49 +02:00
Laurent Destailleur
93b7956156
Fix sanitizing of backtopage
2020-09-19 02:12:08 +02:00
Laurent Destailleur
a0b230fa46
Fix #yogosha4534
2020-09-19 01:58:46 +02:00
Laurent Destailleur
6a45545ec1
Prepare for fix
2020-09-19 01:53:22 +02:00
Laurent Destailleur
b7a97b2c81
Prepare for fix
2020-09-19 01:45:40 +02:00
Laurent Destailleur
f62d52f89a
Fix tooltip for linkto object.
...
Fix security of ajax selectobject.php
2020-09-19 00:44:47 +02:00
Laurent Destailleur
63bc3aa48a
Better sanitizing
2020-09-19 00:05:29 +02:00
Laurent Destailleur
6d2d5d7cae
Fix #yogosha4529
2020-09-19 00:02:38 +02:00
Bernard Saulme
d86f541b35
FIX|members substitution variable not substituted if empty
...
Members substitution variables not substituted if empty for the __MEMBER_ ... variables, the variable is showed instead.
Change to display '' instead
2020-09-18 18:29:52 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +02:00
Laurent Destailleur
72d5850a5f
Fix regression
2020-09-18 15:45:26 +02:00
Laurent Destailleur
cf8e8ee68b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:54:20 +02:00
Laurent Destailleur
f09aea90df
Fix bad test
2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b
Fix
2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:46:23 +02:00
Laurent Destailleur
2fe9514b6b
Doc
2020-09-18 14:01:00 +02:00
Laurent Destailleur
9134892c71
Fix remove useless code
2020-09-18 13:58:09 +02:00
Laurent Destailleur
534846c5c7
NEW Framework is ready for CSRF token protection on explicit GET URLs.
2020-09-18 04:30:24 +02:00
Laurent Destailleur
5744b1e0a3
Fix #yogosha4512
2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8
Fix dol_string_nohtmltag: the decode of entity must be done before split
2020-09-17 21:09:16 +02:00
Laurent Destailleur
0f0e4feeaf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2020-09-17 19:33:29 +02:00
Laurent Destailleur
eae5410ced
Protect md file
2020-09-17 16:57:39 +02:00
Laurent Destailleur
7cc75ac873
Fix: removing also " when removing " from a received parameter.
2020-09-17 14:43:58 +02:00
Laurent Destailleur
2f100fdf79
Fix alpha into alphanohtml
2020-09-17 12:53:58 +02:00
Laurent Destailleur
33cefacf91
Fix missing global
2020-09-17 12:17:14 +02:00
Laurent Destailleur
05636c39bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-17 11:39:58 +02:00
Laurent Destailleur
939433706b
FIX #yogosha4465
2020-09-17 11:37:41 +02:00
Laurent Destailleur
5e3f6ce736
Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup
...
Use new table function for comm/propal + cleanup
2020-09-17 11:20:31 +02:00
Laurent Destailleur
d92e482841
FIX #yogosha transversal path when unzipping file
2020-09-17 11:09:43 +02:00
Alexandre SPANGARO
bc457ebb66
Stickler
2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913
FIX Yogosha report 4425 (backport)
2020-09-16 20:55:28 +02:00
Laurent Destailleur
4630887591
Fix css
2020-09-16 20:09:40 +02:00
Laurent Destailleur
47031cb656
Fix phpcs
2020-09-16 18:51:19 +02:00
Laurent Destailleur
d7aa376c3c
FIX Yogosha report 4425
2020-09-16 14:37:05 +02:00
Sekan, Tobias
91641e593f
MAIN_DASHBOARD_USE_TOTAL_HT + more clean
2020-09-16 14:03:41 +02:00
Laurent Destailleur
09558d0ce9
Fix MAIN_OPTIMIZEFORTEXTBROWSER
2020-09-16 13:15:57 +02:00
Sekan, Tobias
ac1fdb4a59
Use new table function for comm/propal + cleanup
2020-09-16 10:51:19 +02:00
Laurent Destailleur
7bcf2c9089
css
2020-09-15 14:45:51 +02:00
Laurent Destailleur
cc24e9b155
Look and feel v13
2020-09-15 13:27:48 +02:00
Laurent Destailleur
3fd041e861
Update functions.lib.php
2020-09-15 11:28:49 +02:00
Alexandre SPANGARO
4137e92430
Time to enable fontawesome icons on weather feature
2020-09-15 03:42:35 +02:00
Laurent Destailleur
b7b1de4580
Fix position of GPAO must be after Product.
...
CSS
2020-09-15 02:41:08 +02:00
Laurent Destailleur
f626bd70d0
Look and feel v13
2020-09-14 20:53:42 +02:00
Laurent Destailleur
8afd448def
Add warning if a hidden option is on to encourage to remove it.
2020-09-14 15:05:35 +02:00
Laurent Destailleur
33d61333b1
Fix picto
2020-09-14 12:50:07 +02:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
4b525f6826
Debug notifications on browser
2020-09-12 04:12:39 +02:00
Laurent Destailleur
9dad8f0fb7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-12 03:02:27 +02:00
Laurent Destailleur
f45054df06
Close #14604 Merge manually change to get notification to show
...
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
2020-09-12 03:02:08 +02:00
Laurent Destailleur
fab3a774d2
Merge pull request #14636 from TobiasSekan/AddTableHelperMethod
...
NEW Add helper function for table headers with numbers
2020-09-12 01:21:24 +02:00
Laurent Destailleur
c4383747a1
Look and feel v13
2020-09-11 13:57:16 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Laurent Destailleur
753396ec20
Look and feel v13
2020-09-11 12:19:40 +02:00
Laurent Destailleur
0d124730a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/list.php
2020-09-10 18:05:18 +02:00
Laurent Destailleur
0cccaa7271
FIX look and feel v12
2020-09-10 18:02:49 +02:00
Laurent Destailleur
7e7dec9306
FIX Look and feel v12
2020-09-10 18:02:06 +02:00
Laurent Destailleur
8d93b76258
Clean code
2020-09-10 17:49:05 +02:00
Laurent Destailleur
ed6a16a3c7
FIX look and feel v12
2020-09-10 17:17:31 +02:00
Laurent Destailleur
8c9f2b8458
Fix trans, add log
2020-09-10 17:08:51 +02:00
Laurent Destailleur
bcab13c395
Fix typo
2020-09-10 15:52:47 +02:00
Laurent Destailleur
ed3f1c29ef
more log
2020-09-10 15:52:09 +02:00
Laurent Destailleur
1da99a8fcd
Add log to debug travis error
2020-09-10 15:49:13 +02:00
Sekan, Tobias
747d8c32e2
Fix Sticker CI (again :'-( )
2020-09-10 12:29:01 +02:00
Sekan, Tobias
2292f83258
fix sticker ci
2020-09-10 11:26:17 +02:00
Sekan, Tobias
3f8b2153ea
fix sticker Ci and add missing doc
2020-09-10 11:25:35 +02:00
Sekan, Tobias
d2903c5de6
adress feedback + massive cleanup
2020-09-10 11:04:41 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11
2020-09-09 19:12:08 +02:00
Laurent Destailleur
5c34b26f39
FIX Look and feel v12: First tab must be name of object
2020-09-09 13:57:35 +02:00
Sekan, Tobias
49d009502c
fix sticker CI
2020-09-09 08:16:26 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
Sekan, Tobias
bd96e0fe42
finished helper method and usage of it
2020-09-08 11:15:33 +02:00
Alexandre SPANGARO
d1ba6b9476
Merge remote-tracking branch 'upstream/develop' into 13a11
2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
6a04f39fbe
Wrong language key
2020-09-08 04:58:42 +02:00
Alexandre SPANGARO
8c75f0b95b
Code optimize
2020-09-07 21:38:39 +02:00
Laurent Destailleur
c95e54843c
Update lib debugbar
...
Update php-parallel-lint
2020-09-07 21:00:40 +02:00
Laurent Destailleur
b1e45aef46
Debug opensurvey. Look and feel v13. Removed deprecated properties.
2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
d700649fb9
The deprecated subsitution key __SIGNATURE__ has been removed. Replace
...
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
2020-09-06 19:25:25 +02:00
Laurent Destailleur
84efd70dcb
FIX Clean tooltip of help for substition for long notes
2020-09-06 19:19:55 +02:00
Sekan, Tobias
0375f5fd37
Add helper function for table headers with numbers
2020-09-04 15:24:45 +02:00
lvessiller
27c754e6c8
NEW add send context for ticket
2020-09-02 15:33:18 +02:00
atm-lena
f8c79db4a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-08-31 14:14:27 +02:00
Laurent Destailleur
02f108835d
Fix tooltip
2020-08-30 19:45:46 +02:00
Laurent Destailleur
0d4f7cb485
Fix responsive and title of reports
2020-08-30 17:42:49 +02:00
Laurent Destailleur
e030b2089a
Look and feel v13
2020-08-30 13:14:28 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
723a263cd3
Fix phpcs
2020-08-29 05:07:23 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Laurent Destailleur
b6e9ba8ed6
Merge pull request #14535 from aspangaro/13a6
...
Some fix on assets
2020-08-27 20:01:33 +02:00
atm-lena
e3ce3cbb7c
Function sendEmailsReminder()
2020-08-27 15:49:56 +02:00
atm-lena
69459e3429
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-27 11:13:21 +02:00
Laurent Destailleur
180a49601b
Use CSS to define size of logo on public pages.
2020-08-27 11:01:41 +02:00
atm-lena
4ef2644300
Use date.lib.php functions
2020-08-27 10:29:23 +02:00
Alexandre SPANGARO
eebe888377
Some fix on assets
2020-08-24 09:47:37 +02:00
Laurent Destailleur
f010e44a71
WIP
2020-08-23 22:13:06 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
8115acbf82
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-23 19:25:05 +02:00
Laurent Destailleur
f819509442
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a
Fix include regression
2020-08-23 19:22:01 +02:00
Laurent Destailleur
38d53cc03d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2020-08-23 19:20:50 +02:00
Laurent Destailleur
4fa6d86127
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-23 19:17:01 +02:00
Laurent Destailleur
7a183ea026
Update pdf.lib.php
2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9
Update pdf.lib.php
2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684
Update pdf.lib.php
2020-08-23 19:11:19 +02:00
Laurent Destailleur
c784c002fd
Merge pull request #14517 from aspangaro/13.0_a5
...
Some fix on complete_head_from_modules
2020-08-23 18:09:15 +02:00
Laurent Destailleur
34d2d9a7c6
Look and feel v13
2020-08-23 15:17:22 +02:00
Laurent Destailleur
ca2a34a4c9
Standardize code: Rename fields date_m into tms. All timestamp fields
...
are now name "tms".
2020-08-23 15:15:47 +02:00
Laurent Destailleur
23cda5f464
Enhance recruitment module
2020-08-22 14:37:09 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Alexandre SPANGARO
f1f579ad67
Some fix on complete_head_from_modules
2020-08-20 22:17:34 +02:00
Laurent Destailleur
afe8f76a4a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/stock.php
2020-08-18 15:41:57 +02:00
Laurent Destailleur
d4a502629e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/stock.php
htdocs/core/lib/ajax.lib.php
2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d
FIX Setup of stock increase/decrease
2020-08-18 15:27:17 +02:00
Laurent Destailleur
58e25768a7
NEW Add PDF document templates for warehouses (list of stock)
2020-08-18 14:02:36 +02:00
Laurent Destailleur
bd65e5612f
Fix duplicate id
2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
John Botella
6e1702c1a5
Fix infinite fetch object linked loop
2020-08-17 15:00:31 +02:00
Laurent Destailleur
86a31d17a5
Better test
2020-08-17 04:34:53 +02:00
Laurent Destailleur
5987504fa5
Better test
2020-08-17 04:34:03 +02:00
asolslk
5a6f459db5
Update accounting.lib.php
2020-08-17 04:09:12 +02:00
Laurent Destailleur
75f8fe8276
Merge pull request #14427 from asolslk/patch-2
...
FIX Visible 0 on accounting account
2020-08-17 01:34:57 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
Bernard Saulme
52b84a3ea2
Update functions.lib.php
2020-08-14 18:08:59 +02:00
Laurent Destailleur
65ceaac42e
Better message
2020-08-14 12:56:17 +02:00
Laurent Destailleur
a916f6af59
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
74da63c0e4
Merge pull request #14448 from 418sec/develop
...
Security Fix for Cross-site Scripting (XSS) - huntr.dev
2020-08-14 03:17:35 +02:00
lvessiller
f385e02c53
FIX title button attribute id empty
2020-08-13 17:43:18 +02:00
Laurent Destailleur
88c07e86ad
Organization of setup for Takepos bar features
2020-08-13 13:46:53 +02:00
florian HENRY
c4d8a25c5a
fix external module multidiroutput
2020-08-10 13:40:55 +02:00
asolslk
ea829913b0
Update accounting.lib.php
2020-08-08 19:07:55 +08:00
Laurent Destailleur
ada7b74ba1
Fix phpcs
2020-08-07 14:56:30 +02:00
Laurent Destailleur
5482a3134a
Merge pull request #14355 from fmarcet/10.0
...
Fix: User can see events that are not assigned to it
2020-08-07 14:54:39 +02:00
Laurent Destailleur
6fd433167f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-08-07 11:59:55 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
...
FIX : JS CRASH - bad usage of moreparam
2020-08-07 10:10:09 +02:00
Laurent Destailleur
16828b8cec
Merge pull request #14403 from FHenry/12.0
...
fix: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method (resolve conflict)
2020-08-07 09:58:49 +02:00
Laurent Destailleur
c2b03e49e1
Fix logo not visible in setup page
2020-08-06 17:28:57 +02:00
Laurent Destailleur
c6ee80eefd
FIX Disable svg as supported image by default. Set
...
MAIN_ALLOW_SVG_FILES_AS_IMAGES to 1 to have svg working.
2020-08-06 17:16:09 +02:00
florian HENRY
46cafcc445
Merge branch '11.0' into 12.0
2020-08-06 16:54:49 +02:00
Laurent Destailleur
43b23994e4
WIP Recruitment module
2020-08-06 15:55:04 +02:00
Laurent Destailleur
37f1b27bd2
Fix phpcs
2020-08-06 03:55:47 +02:00
Laurent Destailleur
cd89538ee9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-06 03:04:46 +02:00
Laurent Destailleur
5b0d04609c
Fix number to string
2020-08-06 03:03:18 +02:00
Laurent Destailleur
b40177a8c8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 03:00:16 +02:00
Laurent Destailleur
fbcf95ba02
Fix number to string
2020-08-06 02:59:46 +02:00
Laurent Destailleur
641d9a6565
Fix number to string
2020-08-06 02:58:07 +02:00
Laurent Destailleur
ce960c8d0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 02:53:19 +02:00
Laurent Destailleur
0b7aec1fa0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functionsnumtoword.lib.php
2020-08-06 02:52:54 +02:00
Laurent Destailleur
73ea5b0e2d
Fix function to convert price to string
2020-08-06 02:50:24 +02:00
Laurent Destailleur
d2eb1cc47d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:20:49 +02:00
Laurent Destailleur
12b9a73ca5
Fix phpcs
2020-08-06 02:18:34 +02:00
Laurent Destailleur
9d79e984dd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
1cf3422e05
FIX Bad adress of vendor in PDF for PDF of supplier payment
...
FIX dol_convertToWord() Bad conversion of number into a string
2020-08-06 01:56:42 +02:00
spooky360
a94fa93973
Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr )
2020-08-05 17:11:19 +02:00
spooky360
b9513255fd
Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr ).
2020-08-05 17:02:59 +02:00
stickler-ci
8d88217434
Fixing style errors.
2020-08-04 14:48:15 +00:00
Ferran Marcet
70ad2fcee0
Fix: User can see events that are not assigned to it
2020-08-04 16:45:57 +02:00
Ferran Marcet
7a077a2d99
Fix: User can see events that are not assigned to it
2020-08-04 16:45:04 +02:00
Ferran Marcet
1a62a36b86
Merge remote-tracking branch 'origin/10.0' into 10.0
2020-08-04 16:40:01 +02:00
Ferran Marcet
7b6ef7aca8
Merge branch '10.0up' into 10.0
2020-08-04 16:39:40 +02:00
John Botella
11f14b8fe5
Fix bad usage of moreparam
2020-08-04 14:13:52 +02:00
Laurent Destailleur
c09827248b
Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default
...
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
2020-08-04 12:27:31 +02:00
Florian Mortgat
ce18a4f029
FIX 12.0 - in dol_string_onlythesehtmltags, remove the class attribute by default
2020-08-03 12:28:12 +02:00
stickler-ci
9926eac192
Fixing style errors.
2020-08-03 09:26:36 +00:00
quentin
72b2fb442b
fix test libelle
2020-08-03 11:17:39 +02:00
Ferran Marcet
63b15dd1b6
Fix: User can see events that are not assigned to it
2020-08-03 11:17:30 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
04903460b1
Add contact on job page
2020-08-02 18:09:53 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
367914015c
NEW Add a counter of number of words of pages in website module
2020-08-02 15:53:34 +02:00
Laurent Destailleur
d08c42a205
CSS Better visibility for buttons and status
2020-08-02 00:15:21 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
8b879ee23b
FIX Edit extrafield of type long text loose carriage returns
2020-07-30 14:49:00 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
2020-07-29 13:50:31 +02:00
Laurent Destailleur
566f683c54
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:40:19 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags
...
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
2020-07-29 13:34:45 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d
Fix several trouble with diret debit module and credit transfer module
2020-07-27 19:33:24 +02:00
VERDOL Gauthier
25994e61bc
FIX : We need to see unit line on PDF even though it's an option
2020-07-27 16:04:21 +02:00
Laurent Destailleur
d945ef67e1
FIX Picto of HRM module
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4
FIX Picto of HRM module
2020-07-26 20:51:49 +02:00
Laurent Destailleur
b63a6bc72a
NEW Can use dynamic code into the 'enabled' property of DAO fields
2020-07-26 20:45:54 +02:00
Laurent Destailleur
dd86c21382
FIX dolGetElementUrl and agenda page for external modules
2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f
FIX locataxes lost on lines when cloning a vendor invoice
2020-07-25 02:59:49 +02:00
FlorianMortgat
c48a294a2b
FIX: allow more harmless html tags
2020-07-25 00:57:40 +02:00
Laurent Destailleur
3ed4773d7f
Fix tab popup when there is 2 head tabs in same page
2020-07-24 18:31:14 +02:00
Laurent Destailleur
93fea8591c
Fix phpcs
2020-07-24 12:17:02 +02:00
Laurent Destailleur
6e36fba4f3
NEW Development of module Recruitment
2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1
FIX dolGetElementUrl and agenda page for external modules
2020-07-24 11:53:44 +02:00
Laurent Destailleur
aefb1483e3
NEW Can change size of logo on PDF documents
2020-07-24 03:36:44 +02:00
Laurent Destailleur
895fe63d3b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-24 01:53:51 +02:00
Laurent Destailleur
34a9eee7a6
Minor fix in translation
2020-07-24 01:50:57 +02:00
Laurent Destailleur
431b207dab
Fix to solve sql error on some databases
2020-07-24 01:02:07 +02:00
Laurent Destailleur
a46f4df147
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/clicktodial.php
2020-07-24 00:15:56 +02:00
Laurent Destailleur
42234ba506
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
Laurent Destailleur
0890b15077
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70
FIX ClickToDial tab of users has disappeared
2020-07-24 00:06:18 +02:00
Laurent Destailleur
f26a64fb88
FIX If using a rounding step, localtax1+2 not included in total
2020-07-19 01:47:17 +02:00
Laurent Destailleur
ac92a9fa40
Doc more complete
2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82
Fix comment
2020-07-18 19:41:11 +02:00
Laurent Destailleur
8b5f4fe9a6
Fix massaction delete on events
2020-07-11 12:21:53 +02:00
Laurent Destailleur
bd63b84f8e
Fix label of social contribution and button date
2020-07-09 23:18:19 +02:00
Laurent Destailleur
fd95551940
Fix upload of file in import module
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-07-09 21:52:27 +02:00
Laurent Destailleur
e6b241a083
NEW Show tags and status in search list of website pages
2020-07-09 14:07:41 +02:00
Laurent Destailleur
b2bd90ae1a
Fix link to list of event
2020-07-09 12:33:28 +02:00
Laurent Destailleur
9592fdb3fc
CSS
2020-07-09 11:55:16 +02:00
Laurent Destailleur
0a708e46bf
css
2020-07-09 00:46:59 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Laurent Destailleur
7d7ef1e72a
FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
...
Fix setup of product
2020-07-06 15:34:26 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06
Fix trans
2020-07-04 13:04:53 +02:00
Laurent Destailleur
fce81a4bf1
Rename var and fix position of checkbox
2020-07-03 01:30:53 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
...
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846
Update company.lib.php
2020-07-03 00:57:15 +02:00
andreubisquerra
9e4d7627f3
Fix travis
2020-07-01 22:55:00 +02:00
jove@bisquerra.com
76f3724191
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-01 22:34:35 +02:00
Laurent Destailleur
e2a9743dd4
Debug module credit transfer
2020-07-01 14:19:47 +02:00
quentin
39651953b3
FIX refacto
2020-07-01 14:04:41 +02:00
quentin
267aa7605b
Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab
2020-07-01 14:00:49 +02:00
Laurent Destailleur
9bb0ef04f5
Fix upload of file in import module
2020-06-29 18:07:51 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
5b3670f300
FIX SQL syntax error when editing extrafields
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-06-29 14:28:53 +02:00
Laurent Destailleur
7c5b0be6a3
FIX SQL syntax error when editing extrafields
2020-06-29 13:48:00 +02:00
Laurent Destailleur
a5893db106
FIX upload documents into manual ECM was reported a permission error
2020-06-28 22:05:55 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
95729e2375
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
lvessiller
c689b91539
FIX upload file in import module
2020-06-25 16:59:48 +02:00
Florian Mortgat
ccfe6f18fe
FIX 10.0 - fatal with postgres
...
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
daba55762f
Fix missing filter on status enabled
2020-06-22 13:07:34 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning
...
fix: warning and clean old code about multiselect category for advtarget tpl
2020-06-20 12:18:35 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
florian HENRY
29c049e358
set correct global conf
2020-06-19 09:49:43 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
531bfe217b
Merge fields
2020-06-18 15:11:35 +02:00
Laurent Destailleur
eef07afc90
Try to solve pb with too many columns. Merge 2 columns of amounts in 1
2020-06-18 03:32:13 +02:00
Laurent Destailleur
a5ce3ada0a
Keep feature experimental as it need a lot of change
2020-06-18 02:35:08 +02:00
Laurent Destailleur
c0b269b9ee
Fix Permissions on MO and API for MO
2020-06-18 01:09:30 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 13:42:38 +02:00
Laurent Destailleur
6660923e94
FIX Privilege escalation reported by wizlynx WLX-2020-011
2020-06-17 13:29:43 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2
2020-06-16 22:40:45 +02:00
Laurent Destailleur
1736ecfa26
Fix phpcs
2020-06-15 04:32:59 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
stickler-ci
79a7e4c149
Fixing style errors.
2020-06-13 07:44:48 +00:00
DEMAREST Maxime (Indelog)
9217ec47dc
Fix replace loan_calcmens() by loanCalcMonthlyPayment()
2020-06-13 09:33:02 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2
Fix and improvement on Loan module
...
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
with the new value.
* Can't modify interest in payment if schedule is used (causes the
inconsistency for value in schedule).
* User right verification on schedule page.
2020-06-13 09:32:44 +02:00
Laurent Destailleur
c9cb978c39
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 15:21:06 +02:00
Laurent Destailleur
9bb5135317
Fix We never add .noexe of files into medias dir
2020-06-12 15:20:28 +02:00
Laurent Destailleur
6e81542148
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:11 +02:00
Laurent Destailleur
5d5fb46af6
Fix We never add .noexe of files into medias dir
2020-06-12 14:35:50 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
78204f92e6
Fix tag
2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a
Fix tag at bad place
2020-06-11 16:59:24 +02:00
Laurent Destailleur
503206af88
Fix analytics tag
2020-06-11 16:38:58 +02:00
Laurent Destailleur
6a3547f8af
css
2020-06-11 02:11:17 +02:00
Florian Mortgat
5bc80f8626
FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax
2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d
FIX Sharing buttons
2020-06-10 12:45:02 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
764b8a15de
FIX Sharing buttons
2020-06-10 00:01:41 +02:00
Laurent Destailleur
c175fbd697
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/website/class/website.class.php
htdocs/website/index.php
2020-06-09 22:09:57 +02:00
Laurent Destailleur
a9b85222c0
NEW The global header of a website can also have dynamic content
2020-06-09 22:07:06 +02:00
Laurent Destailleur
756ef0b583
Fix disallow < > into meta info
...
Fix message page regenerated
2020-06-09 21:43:42 +02:00
stickler-ci
b4dd11ec98
Fixing style errors.
2020-06-08 14:00:57 +00:00
atm-quentin
3dd7c81f54
FIX stickler
2020-06-08 15:58:20 +02:00
atm-quentin
69db790cf5
NEW multiselect type and date to date filter
2020-06-08 14:43:14 +02:00
Laurent Destailleur
aed5e8a4ce
fix url
2020-06-08 12:25:17 +02:00
Laurent Destailleur
7ce7905d31
Fix check for mrp
2020-06-07 23:03:58 +02:00
Laurent Destailleur
87a60a501f
Security on disabling a web page
2020-06-07 23:00:38 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
2a1d547267
Celan dead code
2020-06-07 18:44:37 +02:00
Laurent Destailleur
88aaec63f7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 18:57:41 +02:00
Laurent Destailleur
e31e889595
Add url in error message
2020-06-06 18:30:04 +02:00
Laurent Destailleur
bd56210e97
doc
2020-06-03 19:24:26 +02:00
Laurent Destailleur
7f1fea1e09
Add json-ld structure 'qa'
2020-06-03 19:23:36 +02:00
Laurent Destailleur
474860d546
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59
Fix webp support
2020-06-03 14:05:18 +02:00
Laurent Destailleur
a37a4031e9
FIX Delete of website page need permission. Conflict with mass action.
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1
FIX Delete of website page need permission. Conflict with mass action.
2020-06-03 00:46:09 +02:00
Laurent Destailleur
838a13cec1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-01 02:41:11 +02:00
Laurent Destailleur
e83b754e6f
Debug modulebuilder
2020-05-31 23:32:36 +02:00
Laurent Destailleur
f63aa7f527
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
2020-05-31 23:27:20 +02:00
Laurent Destailleur
3349144f5e
Fix lose enabled and default when editing field signatures in
...
modulebuilder
2020-05-31 23:23:42 +02:00
Laurent Destailleur
9224061aed
Fix test to upload a file
2020-05-29 03:20:44 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
1838cf92ef
Look and feel v12
2020-05-28 11:51:49 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984
Debug credit transfer
2020-05-27 22:35:55 +02:00
Laurent Destailleur
16625af34e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/ecm/class/ecmfiles.class.php
htdocs/ecm/index.php
2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2
FIX XSS using the renaming of .noexe files - reported by Nolan.
2020-05-27 13:12:18 +02:00
Laurent Destailleur
c0ce584487
Look and feel v12
2020-05-27 00:26:04 +02:00
Laurent Destailleur
c607c2daa0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 22:31:47 +02:00
Laurent Destailleur
91ecd3455f
Fix CSS
2020-05-26 22:30:11 +02:00
Laurent Destailleur
05ac3de2f0
Enhance search / filter
2020-05-26 12:46:51 +02:00
Laurent Destailleur
2d30d33303
NEW Can filter on container type, language and tags in the list of pages
...
of website module.
2020-05-26 12:25:41 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
d08fc174c4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:23:51 +02:00
Laurent Destailleur
2fe8e03ed6
Fix missing quote
2020-05-25 22:23:22 +02:00
Laurent Destailleur
41d5d9b6f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:21:52 +02:00
Laurent Destailleur
ba047428e2
Fix duplicate \n
2020-05-25 22:21:36 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
19bcdb6418
Fix structured data
2020-05-25 22:19:28 +02:00
Laurent Destailleur
056206098b
CSS
2020-05-25 12:51:17 +02:00
Laurent Destailleur
9e77dc0a26
CSS
2020-05-25 12:50:29 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
8e113888d8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 17:02:27 +02:00
Laurent Destailleur
64f72daa7e
Fix hreflang if canonical page
2020-05-23 17:01:22 +02:00
Laurent Destailleur
aec5200a98
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Laurent Destailleur
7c92bb218e
Fix no hreflang if not a canonical page
2020-05-23 15:33:04 +02:00
Laurent Destailleur
acaab1fd45
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:49:15 +02:00
gael.langlais
af5de05a31
Change some curly braces #13929
2020-05-23 13:38:50 +02:00
Laurent Destailleur
d4b1485c97
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:11:30 +02:00
Laurent Destailleur
755c47f900
Fix save of wrapper missing
2020-05-23 13:10:33 +02:00
Laurent Destailleur
333ae9d496
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 12:58:18 +02:00
Laurent Destailleur
f2c02f5559
FIX Language for RSS
2020-05-23 12:41:06 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-22 08:27:12 +02:00
Laurent Destailleur
5d78f6dac5
NEW Add link to edit property from search result of website pages
2020-05-22 00:38:01 +02:00
Frédéric FRANCE
5940d3705a
add new rule
2020-05-21 16:00:12 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Frédéric FRANCE
416e6dd90d
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-21 01:11:45 +02:00
Frédéric FRANCE
ccadb1ec7a
add new rule
2020-05-21 00:47:16 +02:00
Laurent Destailleur
64ebc665c7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:32:59 +02:00
Laurent Destailleur
de11fb2783
Fix phpcs
2020-05-20 23:32:13 +02:00
Laurent Destailleur
88c939562e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 12:39:01 +02:00
Laurent Destailleur
66df82f9e0
Better management of absolute url for canonical link tag
2020-05-20 12:38:38 +02:00
Laurent Destailleur
2f7786f50f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 10:37:43 +02:00
Laurent Destailleur
c5e341883d
Fix popup of supplier invoice
2020-05-19 23:22:40 +02:00
Laurent Destailleur
346082b153
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 19:59:24 +02:00
Laurent Destailleur
00d7947ee8
Fix link replaced twice
2020-05-19 19:55:28 +02:00
Laurent Destailleur
d89c9abcb6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 00:53:01 +02:00
Laurent Destailleur
7b29ce036a
Fix input of virtual host and canonical url
2020-05-19 00:50:30 +02:00
Laurent Destailleur
9f9dfb94f0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 22:40:52 +02:00
Laurent Destailleur
76663ae3e8
Fix canonical tag
2020-05-18 22:40:32 +02:00
Laurent Destailleur
d60598b848
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 14:53:57 +02:00
Laurent Destailleur
d3ac33ce20
Fix json-ld file
2020-05-18 14:53:35 +02:00
Laurent Destailleur
729cc4fd6f
Fix do not show full path
2020-05-18 13:26:33 +02:00
Laurent Destailleur
02d4ecb21c
Fix url for youtube
2020-05-17 20:08:01 +02:00
Laurent Destailleur
9370f71d01
Fix hardcoded value
2020-05-17 20:03:56 +02:00
Laurent Destailleur
bd564486ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-17 20:03:09 +02:00
Laurent Destailleur
8a6ae84fb0
Fix getStructuredData for organization
2020-05-17 20:02:01 +02:00
Laurent Destailleur
6be60efaba
Fix bad link in json-ld
2020-05-17 19:09:22 +02:00
Laurent Destailleur
af46108cc4
Look and feel v12
2020-05-17 13:34:16 +02:00
Laurent Destailleur
70fc74008a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
2020-05-15 17:19:43 +02:00
Laurent Destailleur
9fb1766266
CSS
2020-05-15 17:14:28 +02:00
Laurent Destailleur
5fe9c45fb2
Fix look and feel v12
2020-05-15 16:07:39 +02:00
Laurent Destailleur
5933aba38c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
ad906fc508
Fix use SVG logo instead of PNG
2020-05-15 12:43:48 +02:00
Laurent Destailleur
40d30f9a60
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 18:37:47 +02:00
Laurent Destailleur
1bf677f537
Can set status of a websitepage
2020-05-14 18:14:55 +02:00
Laurent Destailleur
499c2ea30a
FIX #13855
2020-05-14 16:52:21 +02:00
Laurent Destailleur
3d26351c6b
Fix function if hours.
2020-05-14 16:03:31 +02:00
Laurent Destailleur
ae0e6e4dc8
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Laurent Destailleur
44d36815bd
Look and feel v12
2020-05-11 19:00:27 +02:00
Laurent Destailleur
a2bc46f1c0
CSS
2020-05-11 12:50:24 +02:00
Laurent Destailleur
a8dcd2d09b
Clean code
2020-05-11 11:53:13 +02:00
Laurent Destailleur
c511af69fe
Debug look and feel v12
2020-05-10 21:07:49 +02:00
Laurent Destailleur
501f1ba2c4
Fix look and feel v12
2020-05-10 15:45:07 +02:00
Laurent Destailleur
42ee755ea5
Look and feel v12
2020-05-08 02:52:55 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Laurent Destailleur
0cd05887ce
FIX count of open day when date and start are not open should be 0
2020-05-07 17:21:27 +02:00
Frédéric FRANCE
c28e6630bb
Update functions.lib.php
2020-05-07 15:41:21 +02:00
Frédéric FRANCE
dd1d29f983
add some substitutions for date datetime
2020-05-07 15:37:32 +02:00
Laurent Destailleur
b09f179a16
NEW Website logs are now into a separated log file.
2020-05-06 04:32:48 +02:00
Laurent Destailleur
30fede216c
Fix Add '_pw' var as var sensibles.
2020-05-06 04:03:07 +02:00
Laurent Destailleur
247acdd274
Fix position of custom groups of modules
2020-05-06 03:47:28 +02:00
Laurent Destailleur
eacb1b3b2e
Debug modulebuilder
2020-05-05 21:45:10 +02:00
Laurent Destailleur
e354e71425
Fix link to themes on dolistore
2020-05-05 18:19:48 +02:00
Laurent Destailleur
49f9e88cc1
Look and feel v12
2020-05-05 18:16:30 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6
...
links color for table title line is equal to Text color for table title line
2020-05-05 18:12:07 +02:00
Laurent Destailleur
b2a9791dca
Fix pagination on pages "Related items"
2020-05-05 16:33:02 +02:00
Laurent Destailleur
5e4ef9266e
Fix update template to use for notifications
2020-05-04 20:30:02 +02:00
Laurent Destailleur
f0f6d6e314
Merge pull request #13793 from andreubisquerra/master
...
NEW tab for Bar Restaurant parameters and new AUTO ORDER
2020-05-03 21:45:08 +02:00
Laurent Destailleur
da91a857a5
Fix pb of lang subdir in cloning website
2020-05-03 14:49:06 +02:00
stickler-ci
5c1eb08b3f
Fixing style errors.
2020-05-03 08:42:45 +00:00
Anthony Berton
87d86f32ee
Update usergroups.lib.php
2020-05-03 10:40:52 +02:00
andreubisquerra
fe98e430ce
Fix travis
2020-05-03 00:10:12 +02:00
jove@bisquerra.com
81c808692e
NEW Bar Restaurant tab and Auto order
2020-05-02 22:00:04 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
62a2469c71
Fix position of modules
2020-05-02 00:41:27 +02:00
Laurent Destailleur
75dd5f268f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
b41b22996f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
5948d385a3
Look and feel v12
2020-04-30 14:46:49 +02:00
Laurent Destailleur
82ace4b4ef
FIX Several pb in export of documents
...
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2020-04-30 11:52:30 +02:00
Laurent Destailleur
478bd60ad2
Merge pull request #13760 from ptibogxiv/patch-336
...
FIX files download by API/entity
2020-04-28 18:01:42 +02:00
Laurent Destailleur
aa9ee060d5
Look and feel v12
2020-04-28 17:34:11 +02:00
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact
2020-04-28 09:03:17 +02:00
ptibogxiv
9764c85ee3
FIX files download by API/entity
...
TODO need more clean of this file with multicompany
2020-04-27 19:15:17 +02:00
Laurent Destailleur
a8613661fc
Fix sql
2020-04-27 19:03:04 +02:00
Laurent Destailleur
12e090eed6
Fix search in correct language
2020-04-27 18:48:35 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
5ce3174181
Look and feel v12
2020-04-25 03:31:47 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109
Look and feel v12
2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Frédéric FRANCE
1aafd4667b
fix countable php7 warning
2020-04-24 11:57:23 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
39c454d07b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
7bc8a70b0a
FIX #13670
2020-04-22 18:23:48 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
9a5986e190
css
2020-04-22 12:40:11 +02:00
Laurent Destailleur
f52408cec1
Look and feel v12
2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b
Look and feel v12
2020-04-22 00:50:04 +02:00
Laurent Destailleur
cadb52c5b3
Look and feel v12
2020-04-20 19:39:34 +02:00
Laurent Destailleur
230fe26b58
Look and feel v12
2020-04-20 18:38:25 +02:00
Laurent Destailleur
acc7c371cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/vcard.php
htdocs/core/boxes/box_birthdays.php
htdocs/core/boxes/box_birthdays_members.php
htdocs/core/lib/date.lib.php
2020-04-20 16:10:19 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Laurent Destailleur
fe674f08d9
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
2020-04-20 03:00:10 +02:00
Laurent Destailleur
8d59ce2e03
Look and feel v12
2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df
Look and feel v12
2020-04-20 02:14:43 +02:00
Maxime Kohlhaas
817e16d652
Fix birthdays boxes and filter on month
2020-04-18 20:01:18 +02:00
Laurent Destailleur
965bdf733d
FIX Can overwrite file if exists in file manager
2020-04-17 13:10:18 +02:00
Laurent Destailleur
15e3601336
Fix str_replace
2020-04-17 00:49:22 +02:00
Laurent Destailleur
d4c18c79fb
Add option WEBSITE_ADD_CSS_TO_BODY to add a CSS on body tag
2020-04-17 00:42:01 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Scrutinizer Auto-Fixer
d021559b16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-15 22:42:57 +00:00
Laurent Destailleur
86eaa78f1e
FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
...
DOL_DOCUMENT_DIR.
2020-04-15 20:00:27 +02:00
Laurent Destailleur
0d97d88da0
Increase size of small image
2020-04-15 18:12:34 +02:00
Laurent Destailleur
6e9cbe5b70
Fix RSS for blogs
2020-04-15 03:32:49 +02:00
Laurent Destailleur
5772057723
Page to import template easier to understand.
2020-04-13 22:52:34 +02:00
Laurent Destailleur
0878ee3a0f
Look and feel v12
2020-04-13 17:55:25 +02:00
Laurent Destailleur
3740d59848
Look and feel v12
2020-04-13 04:14:28 +02:00
Laurent Destailleur
47b034079a
Look and feel v12
2020-04-13 03:14:01 +02:00
Laurent Destailleur
d0dbf323ed
css
2020-04-13 01:42:10 +02:00
Laurent Destailleur
549b126eff
Look and feel v12
2020-04-12 21:36:57 +02:00
Laurent Destailleur
ed51ce8734
Look and feel v12
2020-04-12 19:56:50 +02:00
Frédéric FRANCE
ea78fc48a8
The variable $rep seems to be never defined.
2020-04-12 18:03:51 +02:00
Laurent Destailleur
38a8cf9bc9
Merge pull request #13575 from frederic34/catmod
...
NEW Show creator, last update user of category/tag in the infoirmation tab
2020-04-12 17:21:04 +02:00
Laurent Destailleur
7d430c08d0
Look and feel v12
2020-04-12 16:36:25 +02:00
Laurent Destailleur
0916017519
Fix addreplace hook
2020-04-12 15:29:13 +02:00
Laurent Destailleur
d7784887d1
More font awesome picto
2020-04-12 14:58:50 +02:00
Frédéric FRANCE
b05ea6573e
info categorie
2020-04-12 00:37:05 +02:00
Laurent Destailleur
ca8e1f3ea5
NEW Can replace a string into all pages in website module
2020-04-11 18:18:53 +02:00
Maxime Kohlhaas
f5ab957faf
FIX #13535 : state in italian address
2020-04-11 17:56:23 +02:00
Laurent Destailleur
33a5288125
Add log
2020-04-11 16:34:59 +02:00
Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
Laurent Destailleur
d8e0036817
css
2020-04-11 12:41:53 +02:00
Laurent Destailleur
069fb27ced
Look and feel v12
2020-04-10 12:27:34 +02:00
Laurent Destailleur
5ff981bf61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
5f00f0133e
Merge pull request #13529 from bb2a/patch-4
...
Display Phone link and separ personalise in const
2020-04-09 19:54:48 +02:00
Laurent Destailleur
bc2a1d653d
Merge pull request #13542 from ptibogxiv/patch-325
...
FIX pencil with font awesome 5.13
2020-04-09 19:35:35 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
ptibogxiv
5bba22aeeb
FIX pencil with font awesome 5.13
2020-04-09 14:58:42 +02:00
Laurent Destailleur
5819aadf75
Clean html code (replace table into table with div)
2020-04-09 13:40:26 +02:00
Laurent Destailleur
02436c1e84
NEW The module selection uses a KanBan view by default.
2020-04-08 17:04:23 +02:00
Laurent Destailleur
fe614658c8
Look and feel v12
2020-04-08 16:13:29 +02:00
Anthony Berton
97153fd57d
Update functions.lib.php
2020-04-08 15:13:19 +02:00
Laurent Destailleur
18f2087cc6
Fix look and feel v12
2020-04-08 15:13:01 +02:00
Laurent Destailleur
1adee36314
Upgrade to font awesome 5.13
2020-04-07 21:11:18 +02:00
Laurent Destailleur
9d9364256b
More picto using fontawesome.
2020-04-07 16:45:08 +02:00
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
Laurent Destailleur
0933fefa1d
More fontawesome logo
2020-04-06 18:36:33 +02:00
Laurent Destailleur
665dc6f8d2
More fontawesome logo
2020-04-06 18:16:21 +02:00
Laurent Destailleur
809c741d11
Can use font awesome as picto of object and modules.
2020-04-06 15:34:28 +02:00
Laurent Destailleur
81f289619d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:47:46 +02:00
Laurent Destailleur
47987f239d
Fix trans
2020-04-05 15:42:39 +02:00
Laurent Destailleur
03b09f1d28
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:14:03 +02:00
Laurent Destailleur
13b47774e2
FIX #13424
2020-04-05 11:55:43 +02:00
Scrutinizer Auto-Fixer
612bac6598
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-05 00:44:59 +00:00
Laurent Destailleur
28a1b7af35
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-03 18:07:24 +02:00
Laurent Destailleur
a13287e285
Fix: validate of object is ok even if some fields are missing
2020-04-03 14:56:15 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
f6b216eafc
Fix travis
2020-04-01 23:32:44 +02:00
Laurent Destailleur
70706d9ea7
FIX Missing token and take into account max date when it can.
2020-04-01 18:48:45 +02:00
Laurent Destailleur
d2de6a22eb
WIP Can set values in extra languages
2020-04-01 18:11:28 +02:00
Laurent Destailleur
4727800206
Can show technical ID of any object in banner.
2020-04-01 16:51:45 +02:00
Laurent Destailleur
e75e49426f
Look and feel v12
2020-03-31 13:52:02 +02:00
Laurent Destailleur
416d1ce3f0
Fix phpcs
2020-03-31 00:11:31 +02:00
Laurent Destailleur
9fcbec9f02
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-30 19:36:07 +02:00
Laurent Destailleur
d2bfc5f6dc
Merge pull request #13437 from pstructures/develop
...
Add the ability to add tabs from module for company admin setup
2020-03-30 19:25:37 +02:00
Laurent Destailleur
06277ec6e0
Update company.lib.php
2020-03-30 19:24:00 +02:00
Laurent Destailleur
95de8d1992
Update admin.lib.php
2020-03-30 19:23:25 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields
...
NEW : Project task list, add column selector and extrafields
2020-03-30 18:53:42 +02:00
Francis Appels
3eda785ca5
Add newline end of file
2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab
Add token functions to improve modulebuilder compatiblity with maintained versions.
2020-03-30 10:28:20 +02:00
Laurent Destailleur
d5b107211f
Look and feel v12
2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944
Move more icon definition into CSS
2020-03-28 13:38:25 +01:00
Matt Sidnell
6f07b87cde
Update admin.lib.php
2020-03-27 23:22:02 +00:00
