Commit Graph

2889 Commits

Author SHA1 Message Date
Laurent Destailleur
bb8d5cec1b More complete management of
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:36:28 +02:00
Laurent Destailleur
59a7d5b89d Introduce option
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:13:30 +02:00
Laurent Destailleur
4a3da84098 Clean code 2021-06-19 23:52:52 +02:00
Laurent Destailleur
83ec4cbd71 Reponsive 2021-06-15 15:19:46 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
ATM john
43ecba2e63 WIP - create validation method for common object 2021-06-12 14:16:40 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Frédéric FRANCE
648c1ef3a6
try to fix 2021-06-10 20:32:45 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
c4dcad5e6b Fix regression 2021-06-10 11:57:42 +02:00
Laurent Destailleur
ea0db5a574 Fix popup of invoice 2021-06-10 01:10:35 +02:00
Laurent Destailleur
f472ff4fd9 Add phpunit for dol_eval 2021-06-09 17:47:27 +02:00
Laurent Destailleur
f1c94ac659 NEW Reduce scope of dol_eval function. 2021-06-09 17:44:42 +02:00
Gauthier PC portable 024
4b6fb7dd47 FIX : auto rounding on "_FORMATED_" tags 2021-06-09 12:26:28 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
Laurent Destailleur
70af18148b Debug modulebuilder v14 2021-06-05 17:49:01 +02:00
Laurent Destailleur
0071d63fbb Fix for ro-md language 2021-05-31 13:35:03 +02:00
Laurent Destailleur
b9de8561a9 Fix regression 2021-05-25 15:59:36 +02:00
Laurent Destailleur
dd48c3ee9d Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__) 2021-05-25 00:08:06 +02:00
Laurent Destailleur
92ccf5982a Fix responsive 2021-05-19 14:38:39 +02:00
Laurent Destailleur
8f5c898dae CSS 2021-05-19 14:13:42 +02:00
Laurent Destailleur
78cf2b59c8 Debug feature copy-paste on smarpthone 2021-05-19 11:47:58 +02:00
Laurent Destailleur
271ba884db css 2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918 css 2021-05-18 17:00:20 +02:00
Laurent Destailleur
c2cb055b0a Fix look and feel v14 2021-05-18 14:00:29 +02:00
Laurent Destailleur
ba0e95a4ff FIX huntr CWE-79 2021-05-17 23:47:16 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1
Fix  #17475 : Add of List-Unsubscribe in mass emailing
2021-05-17 10:23:21 +02:00
Laurent Destailleur
a665ff5bda Copy-Paste works also for hidden fields 2021-05-12 11:51:39 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
Laurent Destailleur
6499270619 v14 2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Laurent Destailleur
19bae333c9 Add option MAIN_SHOW_PASSWORD_INTO_LOG 2021-05-09 22:07:08 +02:00
lmarcouiller
bf64bde571 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 15:22:10 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
f4291dc985 commit missing file 2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead
complete $template['head'] in module and return 0 to not replace instead return $head and replace
2021-05-06 22:28:03 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
2021-05-06 17:07:44 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/societe/consumption.php
2021-05-06 16:52:36 +02:00
lmarcouiller
7d649dd90e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-06 16:26:30 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership
Dolibarr partnership
2021-05-06 16:11:13 +02:00
Laurent Destailleur
19f78b2e8f More compact gui 2021-05-05 19:13:40 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
Laurent Destailleur
bf52b54db6 Add date in error message 2021-05-04 19:43:33 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
a54e60d345 Look and feel v14 2021-05-02 13:13:55 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Francis Appels
773b16928d only if no token 2021-04-30 11:15:01 +02:00
Francis Appels
05a96b3ee2 FIX missing token on dolGetButtonAction for action delete 2021-04-30 10:46:05 +02:00
Laurent Destailleur
e7e2953a9e Look and feel 2021-04-29 15:49:44 +02:00
Laurent Destailleur
e3767557d8 Fix phpcs 2021-04-29 12:33:49 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
Laurent Destailleur
6f1f26096e Debug partnership module 2021-04-28 23:25:26 +02:00
Laurent Destailleur
64374f46da Debug v14 2021-04-28 23:01:20 +02:00
Laurent Destailleur
95ecb95ff1 FIX dol_print_date for %a and %b with some timezone 2021-04-28 20:47:28 +02:00
Laurent Destailleur
18e911a636 FIX dol_print_date for %a and %b with some Timezone 2021-04-28 20:44:22 +02:00
Laurent Destailleur
cb72a010cd FIX notifications for expense report has disappeared. 2021-04-27 22:14:19 +02:00
Laurent Destailleur
3e013ebad0 Fix mass action delete of cron jobs 2021-04-27 03:16:11 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
Laurent Destailleur
9f03054fc4 Fix #yogosha5877 2021-04-24 20:52:48 +02:00
Alexandre SPANGARO
f60df8964a NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD 2021-04-24 08:05:00 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module 2021-04-19 21:26:01 +02:00
NextGestion
263e110ca3 Enhance module Member 2021-04-19 13:19:32 +01:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
ATM john
781756913b Fix code Stickler 2021-04-18 22:38:18 +02:00
ATM john
7794927a64 New check update for modules 2021-04-18 20:12:24 +02:00
Laurent Destailleur
cad7ea0b92 css 2021-04-18 15:07:22 +02:00
Laurent Magnin
4aab805b4e FIX:Add ticket substition template 2021-04-16 12:39:39 +02:00
Laurent Destailleur
db5dcd3e52 NEW When a doc file is shared, link is visible from main page of doc. 2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba Show link to shared file if it exists. 2021-04-15 17:09:15 +02:00
Laurent Destailleur
7e4f7f7200 Nicer page of widget setup 2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9 Nicer page of widget setup 2021-04-15 13:22:03 +02:00
Laurent Destailleur
a68a5b0c04 Look and feel v14 2021-04-14 15:11:26 +02:00
Laurent Destailleur
7f62b6c49b Look and feel v14 2021-04-13 22:58:37 +02:00
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
Laurent Destailleur
f4d56c710b Fix log levels 2021-04-07 12:43:28 +02:00
Laurent Destailleur
38f3693fc7 Look and feel v14 2021-04-06 18:18:07 +02:00
Laurent Destailleur
685c880e6c Debug module workstation 2021-04-05 14:56:47 +02:00
Laurent Destailleur
354adbde54 Look and feel v14 2021-04-01 12:27:02 +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
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
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
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
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
Laurent Destailleur
84ec032cc0 Look and feel v14 2021-03-26 17:58:00 +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
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
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
e3b019f923 Clean code 2021-03-23 01:32:17 +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
Frédéric FRANCE
4c5ddc44dc
get conf global function 2021-03-19 17:58:01 +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
ac6b6f22e7 Enhance sanitizing of data 2021-03-18 11:39:23 +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
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
Frédéric FRANCE
d4eecf3eb2
fix php8 warning 2021-03-15 13:51:54 +01:00
Laurent Destailleur
2129adf129 Add more fields to llx_oauth_token 2021-03-15 13:25:08 +01:00
Laurent Destailleur
26e8a9c795 Code comment 2021-03-15 10:08:02 +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
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
Laurent Destailleur
af5db0f5fa Look and feel v14 2021-03-12 15:34:31 +01:00
Regis Houssin
5375add08c FIX just add mp4 2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0 FIX wrong extension 2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7 FIX missing video mime 2021-03-12 08:35:13 +01:00
Laurent Destailleur
cf30e90b93 Work on inventory 2021-03-09 15:35:10 +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
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
dcff298c5f FIX #16533 2021-03-04 15:57:03 +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
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
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1 fix warning 2021-03-02 22:55:43 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
2021-03-02 14:45:05 +01:00
Florian HENRY
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
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
0832c25b5b Look and feel v14 2021-02-28 11:48:35 +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
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
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
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
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
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
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
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
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
Frédéric FRANCE
5096c5bf2d
cache socialnetworks array 2021-02-21 10:18:05 +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
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +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
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
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
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
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
e802dd87f4
Merge branch 'develop' into dev_EventOrganisation_setuppage 2021-02-14 21:37:45 +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
Florian HENRY
5958373f47 set icon fa 2021-02-14 17:31:30 +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
Laurent Destailleur
af4d3767ea css 2021-02-08 19:56:38 +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
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
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
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
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +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
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
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
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
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
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
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +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
f9f84f84ba Fix rounding of foreign amount 2021-01-11 13:46:23 +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
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
ATM john
92a4314779 Fix security mecanism generating data loss 2021-01-06 10:45:54 +01:00
Laurent Destailleur
ef76c067e0 Add limit to 25000 2021-01-04 13:37:21 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +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
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +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
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +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
bf606ede12 Enhance remote ip detection 2020-12-23 13:27:30 +01:00
Laurent Destailleur
0a1387e673 Debug v13 2020-12-20 18:41:54 +01:00
Laurent Destailleur
ef4a816c56 CSS 2020-12-19 15:56:21 +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
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
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
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
0968c68cf9 Enhance widget 2020-12-12 12:45:43 +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
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
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
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
0536ed87a2 Avoid to process too large user agent 2020-12-04 21:38:33 +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
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