Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

11027 Commits

Author SHA1 Message Date
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge 2021-11-28 21:14:12 +01:00
Frédéric FRANCE
5473dbd3f0
add direct print for contracts 2021-11-28 20:55:17 +01:00
Laurent Destailleur
c41578a3c3 Fix php compatibility 2021-11-28 15:43:22 +01:00
ATM john
e97e0e4f17 Fix remove not used propertie 2021-11-28 12:18:09 +01:00
ATM john
29437a22b9 Fix comment and remove not use global 2021-11-28 12:15:31 +01:00
ATM john
a75ae6a8cf Fix missing formsetup elements 2021-11-28 12:11:03 +01:00
Laurent Destailleur
6e273e47e5 css 2021-11-27 12:35:30 +01:00
Frédéric FRANCE
3301790647
clean code 2021-11-23 23:56:52 +01:00
Frédéric FRANCE
21a3a6cc7a
clean code 2021-11-23 23:55:01 +01:00
Frédéric FRANCE
d9bcd27764
can merge products but experimental 2021-11-23 21:55:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Laurent Destailleur
0dcbd458b8 FIX default_vat_code was not returned in some Ajax services of products 2021-11-23 13:08:00 +01:00
Giovanni Vella
f7abf59a07
Merge branch 'Dolibarr:develop' into develop 2021-11-23 08:48:52 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
 2021-11-19 23:14:39 +01:00
Laurent Destailleur
071042b449 Code comment 2021-11-19 22:28:35 +01:00
Florian HENRY
c90082925c fix 2021-11-19 14:30:33 +01:00
Florian HENRY
9685081967 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_enhance_trad_select_dictionnary 2021-11-19 14:27:46 +01:00
Florian HENRY
be44e5b0ca NEW: for developper select_dictionnry can now deal with label translated 2021-11-19 14:27:29 +01:00
Laurent Destailleur
cdc160b9a9 FIX column alignement on valid confirm page of shipment 2021-11-19 11:12:53 +01:00
Laurent Destailleur
8b1c45d0fe
Merge pull request #19413 from FHenry/dev_add_hook_marginDisplay 
new: add hook for displayMarginInfos
 2021-11-18 20:05:32 +01:00
Laurent Destailleur
d24120d6f9 Clean code 2021-11-18 19:27:40 +01:00
Laurent Destailleur
0649dc598d Clean code 2021-11-18 19:25:07 +01:00
Laurent Destailleur
8477c0a3f1
Merge pull request #17998 from OPEN-DSI/fix_00008 
FIX: Reload values of the specified entity when change entity in the execution of cron jobs
 2021-11-18 18:41:06 +01:00
Laurent Destailleur
e652b93878 Autoswitch on inventory tab on validation of inventory 
Fix disabled button when some data are available.
 2021-11-18 12:58:31 +01:00
Florian HENRY
0f402897a4 add add_replace 2021-11-18 10:55:05 +01:00
Florian HENRY
d48df1d2c3 new: add hook for displayMarginInfos 2021-11-18 10:50:03 +01:00
Laurent Destailleur
649bf38c05 Responsive 2021-11-17 11:14:12 +01:00
Laurent Destailleur
cd2a09de42
Merge pull request #19170 from atm-john/new_setup_form_help_class 
NEW : setup form class to help setup page creation
 2021-11-15 12:12:25 +01:00
Laurent Destailleur
7a6d84f0d5
Merge pull request #19365 from hregis/fix_add_ldap_hash_type_select 
NEW add ldap password hash type select
 2021-11-15 11:16:33 +01:00
lmarcouiller
238996b351 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-11-15 10:13:27 +01:00
Laurent Destailleur
a368200036 Add MAIN_MEMORY_LIMIT_ARCHIVE_DATAROOT and MAIN_MEMORY_LIMIT_DUMP 2021-11-13 01:45:38 +01:00
Regis Houssin
e839d9da02 FIX syntax error 2021-11-12 16:56:26 +01:00
Regis Houssin
317060d915 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_add_ldap_hash_type_select 2021-11-12 16:53:39 +01:00
Laurent Destailleur
715a65eab2 Clean code for md theme 2021-11-12 13:33:59 +01:00
Regis Houssin
1169ae551f FIX remove debug 2021-11-12 13:12:49 +01:00
Regis Houssin
968ffbcef0 FIX add ldap hash algo 2021-11-12 13:06:41 +01:00
Regis Houssin
084a3f48c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
fix_add_ldap_hash_type_select
 2021-11-12 10:10:04 +01:00
Laurent Destailleur
c5f3f42867 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-11 15:13:39 +01:00
Laurent Destailleur
e46e622049
Merge pull request #19349 from BitKFu/total_discount 
Added -Propal- as a missing class name to the commondocgenerator.class.php
 2021-11-11 15:03:02 +01:00
Laurent Destailleur
c6ecf87a8a
Update commondocgenerator.class.php 2021-11-11 15:02:51 +01:00
Laurent Destailleur
da2f3e7b40 Code comment 2021-11-11 14:55:59 +01:00
stickler-ci
7c5810dee6 Fixing style errors. 2021-11-10 14:19:14 +00:00
Gerhard Stephan
285bd67d90 Added -Propal- as a missing class name to the commondocgenerator.class.php 2021-11-10 15:16:36 +01:00
ptibogxiv
0afaf080ee
FIX bug if multicompany disabled 
avoid bad constantes
 2021-11-10 14:53:17 +01:00
Giovanni Vella
78df3f54c4
Merge branch 'Dolibarr:develop' into develop 2021-11-10 13:55:18 +01:00
Laurent Destailleur
13e8e3d33c Look and feel v15 2021-11-08 19:15:02 +01:00
Laurent Destailleur
f4b2a6ec92 Fix negative colors for bars 2021-11-08 14:51:14 +01:00
Laurent Destailleur
c464a1cfd2 Fix colors 2021-11-08 14:37:21 +01:00
Gerhard Stephan
b34fb95f4f Load product data optional fields to the line -> enables to use "line_options_{extrafield}" 2021-11-08 10:59:04 +01:00
Laurent Destailleur
a94b2b4f7e Clean code 2021-11-08 03:22:49 +01:00
Laurent Destailleur
be1ca6ebab Clean code 2021-11-08 03:21:15 +01:00
Giovanni Vella
e36d2b5398
Merge branch 'Dolibarr:develop' into develop 2021-11-07 21:53:52 +01:00
Laurent Destailleur
66f85d674d Fix warning scrutinizer 2021-11-07 17:43:17 +01:00
Laurent Destailleur
1934a37676 Escape to avoid false positive, even if it should be useless. 2021-11-07 17:35:43 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
Laurent Destailleur
65105a3e05 Better log 2021-11-06 19:27:50 +01:00
Laurent Destailleur
77864f2c2c NEW Can set value for EHLO smtp command in MAIL_SMTP_USE_FROM_FOR_HELO 2021-11-06 19:11:47 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
Laurent Destailleur
e430fe5f94
Merge pull request #19302 from FHenry/dev_addhook_dolbanner 
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
 2021-11-05 13:28:39 +01:00
Christian Foellmann
58ae45a88b fix DocumentPreview on holiday documents 2021-11-04 13:58:38 +01:00
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +01:00
Florian HENRY
a4c4732d5d NEW: for developpers add hook for moreHTMLRef in dol_banner_tab 2021-11-03 16:18:03 +01:00
John BOTELLA
12b046cb68 Fix class name 2021-11-02 14:11:36 +01:00
John BOTELLA
bbe71c9c32 Rename var 2021-11-02 14:07:36 +01:00
John BOTELLA
b98efd7e44 Add rank item management and add Hook 2021-11-02 13:55:12 +01:00
Regis Houssin
c5e6893289 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
fix_add_ldap_hash_type_select

Conflicts:
	htdocs/core/class/ldap.class.php
 2021-11-01 11:16:33 +01:00
Regis Houssin
772c3eb43a Works on ldap password hash type 2021-11-01 11:13:44 +01:00
John BOTELLA
ea641b707d Factoring 2021-11-01 10:32:37 +01:00
John BOTELLA
4c016cc3be integrate fix from V14 2021-11-01 10:11:43 +01:00
John BOTELLA
c28e9f5f7c Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class 2021-11-01 10:08:37 +01:00
Laurent Destailleur
6acc8a6582 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/ldap.class.php
 2021-11-01 03:17:51 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server 
FIX show connected server if we have a primary and secondary ldap server
 2021-11-01 02:46:28 +01:00
Laurent Destailleur
1b336456ce Code comment 2021-11-01 02:44:14 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist 
fix warnings in propal list
 2021-10-31 17:51:52 +01:00
Laurent Destailleur
0e4c113e7f Fix phpcs 2021-10-31 17:11:23 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
John BOTELLA
ca766c2e71 Factoring 2021-10-31 09:29:20 +01:00
Alexandre SPANGARO
54b81312b5 FIX Ticket - Duplicate field project when we create ticket from project 2021-10-30 22:49:32 +02:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
John BOTELLA
cdf1538ffa fix save using template 2021-10-30 16:36:51 +02:00
John BOTELLA
41beffccde Merge branch 'new_setup_form_help_class' of github.com:atm-john/dolibarr into new_setup_form_help_class 2021-10-30 12:55:26 +02:00
John BOTELLA
3a86221290 add more customisation 2021-10-30 12:54:13 +02:00
Giovanni Vella
badf52b295
Merge branch 'Dolibarr:develop' into develop 2021-10-29 15:35:56 +02:00
Marc de Lima Lucio
15455ed470 FIX: deposit payment terms: correctly store default deposit percent value if not defined 2021-10-28 16:54:47 +02:00
Marc de Lima Lucio
7e059c0a22 NEW: deposit payment terms: futureproof evolutions by storing field as a string 2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
Regis Houssin
390d5eccaf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_see_ldap_connected_server 2021-10-28 15:47:31 +02:00
Regis Houssin
f497492e62 FIX compatibility with php8 2021-10-28 15:40:05 +02:00
Laurent Destailleur
ffc07efb64 Look and feel v15 2021-10-28 14:28:24 +02:00
Regis Houssin
72484961ab FIX show connected server if we have a primary and secondary ldap server 2021-10-28 12:13:28 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
f12c709ec1 Fix checkbox 2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470 Fix look and feel v14 2021-10-27 03:06:50 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02:00
Laurent Destailleur
f5562177e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-25 13:06:33 +02:00
Frédéric FRANCE
677ac4635d
fix warnings in propal list 2021-10-24 14:34:47 +02:00
Laurent Destailleur
55d30884b8 Remove strange code 2021-10-24 13:15:01 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification 
[NEW]  Add option for notification in message form
 2021-10-24 13:00:39 +02:00
Giovanni Vella
a855ef1329 current date default format string 
Added a default format for date/time tag DOL_PRINT_CURR_DATE
 2021-10-24 12:07:23 +02:00
Giovanni Vella
037c36abf0
Merge branch 'Dolibarr:develop' into develop 2021-10-24 11:54:48 +02:00
Maxime Kohlhaas
6abd4cc120 Fix #8716 : tasks were not shown in ecm auto tree 2021-10-24 11:38:45 +02:00
stickler-ci
61576dad53 Fixing style errors. 2021-10-24 00:17:18 +00:00
John BOTELLA
fdcb9674d8 Remove prints 2021-10-24 02:09:49 +02:00
John BOTELLA
aaa7fd5b3a Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class 2021-10-24 01:38:42 +02:00
John BOTELLA
d3d3a87ce9 Add new class to help setup generation 2021-10-24 01:38:13 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
 2021-10-24 00:02:15 +02:00
Laurent Destailleur
fc29aa7d3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:00 +02:00
Laurent Destailleur
06c1d79c05
Update html.form.class.php 2021-10-23 22:36:55 +02:00
Lucas Marcouiller
aec5e41656 Fix : fix php 8.0 warnings 2021-10-23 19:09:23 +02:00
Lucas Marcouiller
bc4373a5de Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-10-23 11:47:06 +02:00
Lucas Marcouiller
6ccd8ce83a Fix : PHP errors 8.0 2021-10-23 11:45:06 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes 
fix warnings
 2021-10-23 11:38:03 +02:00
Laurent Destailleur
7b496add01
Merge pull request #19137 from Hystepik/develop#3 
Fix: PHP 8.0 Warnings
 2021-10-23 11:22:04 +02:00
Laurent Destailleur
98f1637e0f
Merge pull request #19116 from evarisk-theo/fix-link-object-to-categories 
Fix link object to categories
 2021-10-23 11:21:41 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3 2021-10-23 10:59:36 +02:00
Lucas Marcouiller
953a56b08c Fix: PHP 8.0 Warnings 2021-10-23 10:57:03 +02:00
Giovanni Vella
d624928a5d
Merge branch 'Dolibarr:develop' into develop 2021-10-23 10:56:54 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
John BOTELLA
55cdb8ac6f Fix numeric value 2021-10-23 01:00:24 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
fafabe3be2
fix multiple warnings 2021-10-22 22:22:55 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Theo
a36c966f15 add: quick link categories to adherent 2021-10-22 16:13:54 +02:00
Laurent Destailleur
ef0b527379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 15:57:16 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Theo
29f847c13a add: quick link categories to project 2021-10-22 15:48:39 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines 
FIX Content line substitution in email
 2021-10-22 15:37:45 +02:00
Laurent Destailleur
808e9e030a
Merge pull request #19094 from Hystepik/scrutinizerfix 
Fix: scrutinizer errors + boxes activation
 2021-10-22 15:37:17 +02:00
Giovanni Vella
c77d1206d3 NEW: receipt beep alternative and current date/time 
I have added the alternative command for the beep (when that does not work) and the possibility to print the current date and time on the receipt.
 2021-10-22 14:45:28 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +02:00
Laurent Destailleur
c1b2778ffc
Merge pull request #19093 from Hystepik/develop#3 
Fix : Error on fetchAll on line
 2021-10-22 14:23:05 +02:00
Lucas Marcouiller
75b1518611 Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix 2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7 Fix: scrutinizer errors + boxes activation 2021-10-22 12:01:46 +02:00
Laurent Destailleur
f354427b3c Fix warning 2021-10-22 11:58:00 +02:00
Lucas Marcouiller
b3f15167dc Fix : Error on fetchAll on line 2021-10-22 11:55:21 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
96722d55ef fix scrutinzer 2021-10-21 19:13:05 +02:00
atm-lena
bdc8854baa Clean 2021-10-21 18:54:07 +02:00
atm-lena
03765528e1 Contract line : update boolean 2021-10-21 18:42:06 +02:00
Florian HENRY
85ec2c408c fix scrutinizer 2021-10-21 18:15:15 +02:00
Lucas Marcouiller
4d2b96d029 fix inventory scan 2021-10-21 18:08:20 +02:00
Lucas Marcouiller
1f64b09430 WIP : fix inventory scan 2021-10-21 18:07:54 +02:00
Florian HENRY
4795190a75 fix: scrutinizer 2021-10-21 17:09:48 +02:00
Florian HENRY
e9fe668725 fix: scrutinizer 2021-10-21 16:48:04 +02:00
atm-lena
806c53d4c4 FIX Ret PR 2021-10-21 09:49:14 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23 
NEW Add sortorder on units list
 2021-10-20 12:50:32 +02:00
kamel
7b41d1d87f Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into fix_00008 2021-10-20 09:35:30 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
4764075cc7
Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants 
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
 2021-10-19 19:04:09 +02:00
kamel
f328bb32f6 Corrections 2021-10-19 17:34:03 +02:00
lmarcouiller
f5942300e0 fix CI bot error 2021-10-19 16:09:06 +02:00
lmarcouiller
d8cd6b6f55 Fix autoselect multilevel 2021-10-19 15:54:25 +02:00
Regis Houssin
db01fed447 FIX error when defining an already existing constant 2021-10-19 12:36:33 +02:00
Regis Houssin
acbae5cafb FIX add possibility to bypass MAIN_ANTIVIRUS_* constants 2021-10-19 12:14:42 +02:00
lmarcouiller
dd6457b259 FIX: boxes php 8.0 errors and warnings 2021-10-19 10:24:59 +02:00
lvessiller
98a613edec FIX show end hours in events linked to objects 2021-10-18 14:31:37 +02:00
kamel
152aab4903 Add test if actual entity is different to the entity provided 2021-10-18 10:10:31 +02:00
Laurent Destailleur
099b2da2dc FIX #18974 2021-10-17 18:58:34 +02:00
Laurent Destailleur
0aa90e82ea Clean code 2021-10-17 15:47:29 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
stickler-ci
9fa6a8daa7 Fixing style errors. 2021-10-17 10:05:58 +00:00
Regis Houssin
84e4bd8820 NEW add zstd compression 2021-10-17 11:59:25 +02:00
Laurent Destailleur
94c48d3573 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-16 19:40:22 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
1bee543eef
Merge pull request #18987 from atm-gauthier/NEW_more_param_on_function_deleteByParentField 
NEW : we need to be able to put more filters on deleteByParentField() function
 2021-10-16 19:11:52 +02:00
Laurent Destailleur
9469c0dc2b
Update commonobject.class.php 2021-10-16 19:10:50 +02:00
Laurent Destailleur
bbe867a7a9
Update commonobject.class.php 2021-10-16 19:06:50 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Gauthier PC portable 024
5ef681ef91 FIX : stickler 2021-10-15 10:36:47 +02:00
Gauthier PC portable 024
412746ec8f NEW : we need to be able to put more filters on deleteByParentField() function 2021-10-15 10:18:32 +02:00
atm-lena
ff7727466a Function updateExtrafield : replace empty value to null 2021-10-14 17:13:44 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Laurent Destailleur
4fc93ca7fa Fix css 2021-10-13 02:36:23 +02:00
Laurent Destailleur
faf3700dcc
Merge pull request #18947 from altairisfr/TICKETS_MESSAGE_FORCE_MAIL 
NEW : add constant TICKETS_MESSAGE_FORCE_MAIL
 2021-10-12 12:38:20 +02:00
Laurent Destailleur
791a7206ee Fix var not defined 2021-10-12 11:48:51 +02:00
Laurent Destailleur
4e9c7c9efb FIX Attachment of pdf into shipment when sending email 2021-10-11 20:04:45 +02:00
Christophe Battarel
96bdd61684 NEW : add constant TICKETS_MESSAGE_FORCE_MAIL 2021-10-11 17:36:31 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom 
Fix creataing invoice originating for custom module object
 2021-10-11 15:26:07 +02:00
Indelog
94875cdc77 Fix : Re-add bloc to set $withtargettype and $withsourcetype 2021-10-11 13:37:37 +02:00
Laurent Destailleur
33e811ee96
Merge pull request #18926 from FHenry/fix_get_thirdparties_option_select 
fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies
 2021-10-11 11:50:35 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Laurent Destailleur
a57925b0b7 FIX edition of fields on credit transfer tab 2021-10-11 01:43:36 +02:00
Laurent Destailleur
7180f5eeff css 2021-10-10 21:25:46 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
Florian HENRY
5d393f201c fix sql 2021-10-08 13:17:09 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Indelog
18fb3a352b Add hook to overide sourcetype and targettype for linked object 
This add hook `setLinkedObjectSourceTargetType` in
`CommonObject::showLinkToObjectBlock()` and in
`CommonObject::fetchObjectLinked()` to allow overiding sourcetype and
targettype by custom modules.
 2021-10-06 17:18:45 +02:00
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
4be2d1414e Fix regression 2021-10-06 14:03:10 +02:00
Indelog
45e6ea45dc Fix stickler 2021-10-06 12:19:10 +02:00
Indelog
fb775e2c6e Fix Add module part in llx_element_element on CommonObject::add_object_linked() 
Add module part to target type if object has $module property and is'nt
in core modules.
 2021-10-06 12:14:46 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Marc de Lima Lucio
fb13b666b8 FIX: deposit payment terms: susbstitute percentage in payment term label with bespoke substitution key 2021-10-05 15:26:43 +02:00
Marc de Lima Lucio
6ed9e00b4d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-05 13:35:50 +02:00
Marc de Lima Lucio
f4c22c0ae7 FIX: deposit payment terms: PHPDoc 2021-10-05 13:02:12 +02:00
Indelog
6c82b1d0e1 Fix creataing invoice originating for custom module 
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.

This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
 2021-10-05 11:35:43 +02:00
Marc de Lima Lucio
54782f5d4c FIX: deposit payment terms: don't show percentage input on lists 2021-10-05 11:11:27 +02:00
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +02:00
Marc de Lima Lucio
337531f832 FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices 2021-10-05 10:54:22 +02:00
Laurent Destailleur
f0703b414a css 2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop 
New : Add showdocument hook
 2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php 2021-10-04 19:20:37 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI 2021-10-04 18:09:24 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/index.php
 2021-10-02 20:09:06 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
c664b78800 MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:30:24 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
ee79df9bc7
Merge pull request #18839 from indelog/fix_list_of_autoecmfiles 
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
 2021-09-30 13:39:16 +02:00
Laurent Destailleur
ae9643bbef
Update html.formfile.class.php 2021-09-30 13:38:38 +02:00
Laurent Destailleur
3deb424b4f
Merge pull request #18845 from indelog/fix_doc_prev_ecm 
Fix show for external module in ecm index auto page
 2021-09-30 13:36:49 +02:00
Laurent Destailleur
98d8bad955
Merge pull request #18843 from indelog/fix_ecm_deletion 
Fix append module suffix on src_object_type when create ecm file
 2021-09-30 13:32:42 +02:00
Laurent Destailleur
4fe9a4fd30
Merge pull request #18846 from hregis/fix_avoid_warning_if_not_an_array 
FIX avoid warning if $categories is an id
 2021-09-30 13:30:37 +02:00
Laurent Destailleur
a9805fbfc1 NEW The protection MAIN_SECURITY_CSRF_WITH_TOKEN=1 is on by default 2021-09-29 17:34:31 +02:00
Marc de Lima Lucio
b0aa502ed4 NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company 2021-09-29 14:51:30 +02:00
Laurent Destailleur
0f55eea276 css 2021-09-29 14:48:50 +02:00
Marc de Lima Lucio
4d6c1d892b NEW: deposit payment terms: set deposit percentage in company card 2021-09-29 14:03:35 +02:00
Marc de Lima Lucio
4b3fc4d7f3 NEW: deposit payment terms: add input in payment conditions form 2021-09-29 13:02:32 +02:00
Laurent Destailleur
9fe72597ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-29 12:43:27 +02:00
Regis Houssin
6e08ecde04 FIX indentation 2021-09-29 08:47:22 +02:00
Laurent Destailleur
baadf2dc6c Fix reposition 2021-09-29 01:51:34 +02:00
Laurent Destailleur
1e840fe7ed Code comment 2021-09-28 18:07:04 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Regis Houssin
43a47999d7 FIX avoid warning if $categories is an id 2021-09-28 16:35:01 +02:00
Indelog
fae0337b3e Fix show for external module in ecm index auto page 
This set the correct `modulepart` parameter for link generated to
`document.php` of ecm auto index page if `src_object_type` for
ecm document has a module suffix (`@modulename`).
 2021-09-28 16:22:28 +02:00
Indelog
5b8b55cfba Fix append module suffix on src_object_type when create ecm file 
Files added to `llx_ecm_files` for externals modules never be removed on
object deletion.

When `CommonObject::deleteEcmFiles()` is called with `mode=1`, it  use
this sql filter to find the file related to the object which is removed
:

```
$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
```

We see it append `'@'.$this->module` to `$this->table_element` but when
file is add to the `llx_ecm_files` by
`CommonObject::commonGenerateDocument()` , it added whiteout the
`'@'.$this->module` suffix. So the file is never remove from
`llx_ecm_files` when object is deleted.

This fix it by appending module suffix on `src_object_type` if object
has `module` property when add document to the `llx_ecm_files`.
 2021-09-28 15:26:08 +02:00
Laurent Destailleur
a70f5dd90e Doc 2021-09-28 12:12:11 +02:00
Indelog
2472dff67b Fix FormFile::list_of_autoecmfiles object_instance classname after hook 
FormFile::list_of_autoecmfiles() can instantiate object with parameters
resulting of hook `addSectionECMAuto` but for do this,
it use `${$hookmanager->resArray['classname']}` which return a
`null`. Instead we should do this
`$hookmanager->resArray['classname']`.
 2021-09-28 12:08:45 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
9a3d6679f0
Merge pull request #18778 from Hystepik/develop#1 
Fix : KM articles in public/ticket/create_ticket.php
 2021-09-24 13:35:17 +02:00
Laurent Destailleur
4706ebe004 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-09-24 02:34:59 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes 
another set of cleanup for action buttons
 2021-09-24 01:55:25 +02:00
Laurent Destailleur
f98d425064
Merge branch 'develop' into Link-to-MO 2021-09-24 01:54:21 +02:00
Laurent Destailleur
9d5f6fbc1b Code comment 2021-09-23 13:39:48 +02:00
Laurent Destailleur
b08b7d2f68 NEW Can show progression of task into combo list of tasks 2021-09-23 13:20:42 +02:00
Laurent Destailleur
4a43ed2852 Fix scrutinizer 2021-09-23 12:05:55 +02:00
Laurent Destailleur
2538ebec03 Better test 2021-09-23 11:40:29 +02:00
Ilias Patsiaouras
977db0a2ba add MO to the list of possible object to link 2021-09-23 11:38:50 +02:00
Laurent Destailleur
a48a8231a1 Fix scrutinizer 2021-09-23 11:33:58 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
2824c8b8ab FIX support of localtax on expense report 2021-09-22 15:11:18 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
stickler-ci
49fd1b761c Fixing style errors. 2021-09-21 20:27:33 +00:00
fr69400
73b0d8079c Update html.formfile.class.php 2021-09-21 22:23:14 +02:00
stickler-ci
12be914d04 Fixing style errors. 2021-09-21 16:49:00 +00:00
fr69400
c4dd6be9f8 Add showdocument hook 2021-09-21 18:47:34 +02:00
lmarcouiller
a7ff9d4889 Fix : KM articles in public/ticket/create_ticket.php 2021-09-21 11:26:49 +02:00
Yannick Warnier
35e70e7936 Fix method visibility 2021-09-20 23:58:38 +02:00
stickler-ci
d919ef9c4c Fixing style errors. 2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd Add turnover homepage box 2021-09-20 19:41:13 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
c75fbb7642 FIX fetch of product with modulebuilder load too much data 2021-09-20 16:00:11 +02:00
Laurent Destailleur
0eff2fa15b FIX default language defined for IN country 2021-09-20 13:20:54 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
052511d081 Fix sql error 2021-09-18 15:05:31 +02:00
Laurent Destailleur
5fa62f25fa Fix registration of attendee 2021-09-18 12:39:26 +02:00
Laurent Destailleur
b1c6a6e8d1 Fix show/hide combo when next combo has no item inside. 2021-09-17 19:38:55 +02:00
Laurent Destailleur
68a391b395 Fix not empty second level combo if first one not yet defined 2021-09-17 19:19:41 +02:00
Laurent Destailleur
7ed9e21266 Fix sql error 2021-09-17 19:16:46 +02:00
Laurent Destailleur
91cd991828 Simplify the selectgroupTicket. 2021-09-17 16:52:42 +02:00
Lucas Marcouiller
20e8dd4c54 Fix error on html.for.class on ismultientitymanaged test 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-09-17 11:30:45 +02:00
Lucas Marcouiller
0191e3b6ea Fix error on html.for.class on ismultientitymanaged test 2021-09-17 11:23:16 +02:00
stickler-ci
46e8f1bebf Fixing style errors. 2021-09-17 10:59:42 +02:00
antonin_tdj
5f19291285 Avoir Error 19 Constraint Violation (in case of password unchanged) 2021-09-17 10:59:35 +02:00
antonin_tdj
8f3ff32c82 fix ldap passw bug with activedirectory 
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
 2021-09-17 10:59:09 +02:00
Laurent Destailleur
6a73fc6e44
Merge pull request #18724 from ibuiv/patch-1 
Fix ldap passw bug with activedirectory
 2021-09-17 10:54:05 +02:00
Laurent Destailleur
775544d47d
Merge pull request #18727 from Hystepik/develop#4 
Close #18677 : new show articles of KM
 2021-09-17 10:51:38 +02:00
Laurent Destailleur
3a8a813c4e
Merge pull request #18730 from esion-net/patch-2 
NEW Expose bank account holder, label and number
 2021-09-17 10:50:11 +02:00
Laurent Destailleur
bed697c98d
Merge pull request #18732 from esion-net/patch-2 
NEW Expose bank account holder, label and number
 2021-09-17 10:49:51 +02:00
Laurent Destailleur
7cbb7d7f44
Merge pull request #18733 from esion-net/patch-3 
NEW Expose bank account holder, label and number
 2021-09-17 10:48:52 +02:00
Florian HENRY
47efccad75 remove debug 2021-09-16 17:13:34 +02:00
Florian HENRY
820a007731 NEW: add MRP into Object Linked Box 2021-09-16 17:10:06 +02:00
Florian
b9e637a2b2
Expose bank account holder, label and number 
NEW Expose bank account holder, label and number
 2021-09-16 15:52:19 +02:00
Florian
3091448d1a
Expose bank account holder, label and number 
Useful for automated texts on invoices to have those values available as well.
 2021-09-16 15:40:25 +02:00
Laurent Destailleur
49ef24edcb Fix trans 2021-09-16 15:16:18 +02:00
Laurent Destailleur
b70764af88 Fix translation of ticket categories 2021-09-16 15:08:04 +02:00
Laurent Destailleur
e9a3cca609 Fix lang file 2021-09-16 14:50:38 +02:00
Laurent Destailleur
1177e86f2e Fix language of group of tickets 2021-09-16 14:46:14 +02:00
Laurent Destailleur
d9751704c8 Fix ambiguous field 2021-09-16 14:37:38 +02:00
Laurent Destailleur
086754e149 Fix translation of category codes 2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
lmarcouiller
04a024570c update fetchKnowledge and html.formticket 2021-09-16 13:19:43 +02:00
stickler-ci
9d3b680259 Fixing style errors. 2021-09-16 07:31:23 +00:00
antonin_tdj
8c1b3efc47
Avoir Error 19 Constraint Violation (in case of password unchanged) 2021-09-16 09:31:00 +02:00
Laurent Destailleur
aab8d4a628 css 2021-09-16 02:24:25 +02:00
antonin_tdj
2c73c19bd5
fix ldap passw bug with activedirectory 
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
 2021-09-15 18:26:32 +02:00
lmarcouiller
b26e9be36f Close #18677 : new show articles of KM 2021-09-15 15:36:57 +02:00
Laurent Destailleur
21462d0b82 Fix can reset filter in setup 2021-09-14 17:24:53 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00
Laurent Destailleur
f8b1e4d482 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 20:56:15 +02:00
Laurent Destailleur
edb1f31a19 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2021-09-10 20:55:52 +02:00
Laurent Destailleur
9dcf3e49d0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2021-09-10 20:50:34 +02:00
Laurent Destailleur
2f4463c983 FIX Collapsing of extrafields has disappeared. 2021-09-10 20:49:22 +02:00
Laurent Destailleur
3980e4a32b
Merge pull request #18681 from FHenry/14_fix_extrafield_separator_type 
fix: show display/hide icon on extrafield type separator
 2021-09-10 19:49:26 +02:00
Laurent Destailleur
d50c518b70
Merge pull request #18676 from FHenry/14_fix_ajax_company_ambious_column 
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
 2021-09-10 19:49:12 +02:00
Vincent Dieltiens
b3984798ba Add product-id and price-id in dataset of product select 2021-09-10 15:32:16 +02:00
Florian HENRY
f3a555ec69 fix: show display/hide icon on extrafield type separator 2021-09-10 15:17:09 +02:00
Christian Foellmann
29820f446d fix import of product desc without wrong linebreaks 2021-09-10 13:37:42 +02:00
Florian HENRY
c66181a00e fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken 2021-09-10 13:25:40 +02:00
Christian Foellmann
e5192de9f2 fix import of product desc without wrong linebreaks 2021-09-10 11:36:08 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
402757bdfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 14:41:51 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects 
NEW : mass action delete, no more break if at least one object has child
 2021-09-09 14:38:49 +02:00
Laurent Destailleur
7eba2f6f39 Code comment 2021-09-09 14:32:59 +02:00
Laurent Destailleur
ac8dfb2dd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 04:41:55 +02:00
Laurent Destailleur
d42492c67b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
 2021-09-09 04:41:39 +02:00
Laurent Destailleur
6d7cb01951
Merge pull request #18645 from atm-adrien/FIX_add_token 
FIX : Add token to remove error when removing widget
 2021-09-09 04:31:03 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
e0fa4e4b5c Fix phpcs 2021-09-08 21:19:01 +02:00
Laurent Destailleur
57a2ea3a53 Fix sql error 2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5 Fix sql error 2021-09-08 19:45:55 +02:00
Laurent Destailleur
b92784c04b Fix autoselect of thirdparty 2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df Debug event module 2021-09-07 23:19:36 +02:00
Laurent Destailleur
3df005778c Debug event module 2021-09-07 19:48:32 +02:00
Gauthier PC portable 024
938092d67c NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted 2021-09-07 16:46:48 +02:00
ksar
e26e6288c2
FIX #18591 : Remove double quotes of SQL Queries 
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
 2021-09-07 15:22:02 +02:00
Adrien Raze
948d2bc4e9 FIX : Add token when remove the last widget on home page 2021-09-07 14:43:37 +02:00
Laurent Destailleur
586e5c8b5b Can set sort order in the ->fields description array for foreign key 2021-09-07 14:10:26 +02:00
Laurent Destailleur
2d6b9a2a0a CSS 2021-09-06 03:26:27 +02:00
Laurent Destailleur
f288f36b71 NEW Can use textarea field into confirm popup. 
Reponsive
 2021-09-06 01:42:54 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
8ea1a9602b NEW Add import / export of MO and BOMLines - Close #18499 2021-09-02 21:00:31 +02:00
Laurent Destailleur
67db0f1bdb Add link "Now" on date selection when cloning social contribution 2021-09-02 19:15:21 +02:00
Laurent Destailleur
51b1cd583b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-09-02 18:48:20 +02:00
Laurent Destailleur
7017a98071
Merge pull request #18446 from henrynopo/patch-6 
Added function - using list of location_incoterms
 2021-09-02 18:47:15 +02:00
Laurent Destailleur
fd2bfc82f2 Fix #18581 Fix #18582 2021-09-02 17:20:14 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f Fix sql request when using encrypt 2021-09-02 13:45:44 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2 
Compatibility phpv8
 2021-09-01 18:06:06 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
ef2bb99476
Update commonobject.class.php 2021-09-01 16:29:08 +02:00
Laurent Destailleur
b66bd781a4 Clean code 2021-09-01 16:26:59 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Laurent Destailleur
c7444865a1 Fix css 2021-08-31 13:16:37 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
60832c6e87 css 2021-08-30 21:48:46 +02:00
Laurent Destailleur
b78771f8c4 Fix select empty value for thirdparties select combo 2021-08-30 18:56:52 +02:00
Adrien Raze
709a297563 NEW : Allow drag and drop on kits 2021-08-30 14:45:42 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021 
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
 2021-08-28 18:35:40 +02:00
Laurent Destailleur
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
bb94ea7334 Fix debug car reception: Fill/reset link, colspan, translation 2021-08-28 17:24:05 +02:00
Laurent Destailleur
0e38e1e2c4 NEW Add hook hookGetEntity. 
Change name and param of hook
 2021-08-28 14:51:49 +02:00
Laurent Destailleur
9bed2557f5
Merge pull request #18514 from cfoellmann/PR/hook-functionGetEntity 
add hook 'functionGetEntity'
 2021-08-28 14:46:32 +02:00
Laurent Destailleur
c02fb6b9a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 03:15:47 +02:00
Laurent Destailleur
acf0386a9b Fix css 2021-08-28 03:14:48 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
ac7f0f8a4e add hook 'functionGetEntity' to manipulate entities for queries on the fly 2021-08-26 15:04:59 +02:00
Laurent Destailleur
65629711d0 FIX #18484 2021-08-25 14:53:14 +02:00
GurvanKervern
8c99291638 Fix undef vars 5 
To remove PHP8 warnings
 2021-08-25 18:28:32 +08:00
Laurent Destailleur
e4cbc2140e Fix doc and token renewal with NOSESSION 2021-08-24 21:48:38 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
e0fd8b5eb8 Simplify code 2021-08-24 15:28:59 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
983d7e5177 FIX Add option $noescapecommand in executeCLI for better compatibility 2021-08-23 12:26:16 +02:00
Laurent Destailleur
227f01b000 Fix can add a redirection into the executeCLI method. 2021-08-23 12:25:48 +02:00
Laurent Destailleur
b0817e132f FIX Add option $noescapecommand in executeCLI for better compatibility 2021-08-23 12:19:16 +02:00
Laurent Destailleur
eec5fba333 Fix can add a redirection into the executeCLI method. 2021-08-23 11:51:08 +02:00
Philippe GRAND
7baf98dbfa fix : Undefined property: Conf:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\html.form.class.php on line 7957 2021-08-22 23:15:36 +02:00
Philippe GRAND
538b2e2a5f fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\commonobject.class.php on line 1705 2021-08-22 19:47:06 +02:00
Philippe GRAND
2e3b9fce49 fix : Undefined array key 4 in C:\wamp64\www\dolibarr-140\htdocs\core\class\extrafields.class.php on line 1721 2021-08-22 12:18:26 +02:00
Christian Foellmann
3f895f7dc5 correct codestyle 2021-08-21 19:57:52 +02:00
Christian Foellmann
7ca490088a fix codestyle issues 2021-08-21 19:51:31 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
henrynopo
0933b6c39f
Update html.form.class.php 2021-08-20 20:04:53 +08:00
henrynopo
b2252106c3
Added function - using list of location_incoterms 
Added function to call for list of location_incoterms from the existing order records or table of location_incoterms.

Accordingly, an dditional ajex file namely "locationincoterms.php" and a database table namely c_location_incoterms are required.
 2021-08-20 10:43:34 +08:00
Laurent Destailleur
eb70cb2ecc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-19 02:49:24 +02:00
Laurent Destailleur
13e64d2f79 Fix replace file_get_contents with getURLContent 2021-08-18 19:46:37 +02:00
Laurent Destailleur
82db3ae1a9 NEW Use lang selector when using a field key 'lang' in modulebuilder 2021-08-18 01:54:13 +02:00
Laurent Destailleur
bbcea38793 Fix phpcs 2021-08-17 21:58:06 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object 2021-08-17 19:35:36 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice 
NEW : mass action paid customer invoice
 2021-08-17 19:10:49 +02:00
Laurent Destailleur
fb1e5f72d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:11:08 +02:00
Laurent Destailleur
284207aeb3
Merge pull request #18429 from atm-quentin/NEW_hook_after_rank_update 
NEW hook after rank update
 2021-08-17 16:15:44 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php 2021-08-17 16:12:45 +02:00
Laurent Destailleur
1a8ad5abfa Propagate $outputlangs to getExtrafieldContent method. 2021-08-17 15:50:28 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf NEW hook after rank update 2021-08-17 09:33:50 +02:00
Alexandre SPANGARO
f88abb9a6f Add parenthesis 2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
0d467972cd Merge branch '12.0' into 12p18 2021-08-15 07:19:33 +02:00
lainwir3d
cd60d09d9e FIX #18399 Fix shipment validation email template override. 
Object type name for shipment was apparently wrong.
 2021-08-12 16:16:45 +04:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Laurent Destailleur
1cdab44252
Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine 
Remove strange check on hook printOriginObjectLine.
 2021-08-11 15:55:55 +02:00
Laurent Destailleur
6fbd93999f css 2021-08-11 13:33:51 +02:00
Laurent Destailleur
f48a9aa3ad Optimize size of html 2021-08-10 19:44:55 +02:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Laurent Destailleur
4faf6f5d84 Fix crlf 2021-08-10 19:28:06 +02:00
Laurent Destailleur
bef0989b15 Missing declaration 2021-08-10 13:34:21 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Francis Appels
91ef2a44fd Remove strange check on hook printOriginObjectLine. 
Now need reshook.
 2021-08-09 11:17:11 +02:00
Laurent Destailleur
029da815b2 Code comment 2021-08-08 12:35:52 +02:00
Laurent Destailleur
fec5a22c65 Fix filter to find files of a ref. 2021-08-06 13:26:01 +02:00
Laurent Destailleur
4c3c613568 Fix filter to find files of a ref. 2021-08-06 13:24:40 +02:00
Laurent Destailleur
c0c46fb704 FIX Link of download main doc on vat list 2021-08-06 12:20:12 +02:00
Laurent Destailleur
6cefd0a756 FIX Link of download main doc on vat list 2021-08-06 12:18:51 +02:00
Laurent Destailleur
5becf13f2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-03 17:09:09 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-08-03 17:08:49 +02:00
Laurent Destailleur
1c981ccb9d Fix look and feel v14 2021-08-03 17:03:34 +02:00
Laurent Destailleur
ce38ccc121
Merge pull request #18184 from ksar-ksar/patch-5 
FIX #18181
 2021-08-03 15:35:20 +02:00
lmarcouiller
c8fd7ccbb6 Close #18043 : fk_user_assign in create ticket 2021-08-03 15:06:53 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
d8a9a0cfb8
Merge pull request #18188 from frederic34/patch-11 
fix php8 warnings
 2021-08-01 23:42:17 +02:00
Laurent Destailleur
957b373ecd
Merge pull request #18200 from frederic34/notify 
notify class indent
 2021-08-01 23:27:49 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Laurent Destailleur
85a02c5615
Merge pull request #18288 from FHenry/14_deveventorg 
NEW: EventOrganization Module #FoundationFunding
 2021-07-31 16:57:07 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
0c024ca96b
Merge pull request #18297 from cfoellmann/hook-menu 
NEW add hook 'menuLeftMenuItems' to filter the leftmenu items
 2021-07-31 16:13:49 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2 
New : Inventory scanner tool implemented
 2021-07-31 13:27:18 +02:00
Laurent Destailleur
5995e01bd1
Merge pull request #18280 from ptibogxiv/patch-439 
Fix for php 8
 2021-07-30 15:19:54 +02:00
Christian Foellmann
055a5c4ab6 fix hook name 2021-07-30 15:19:05 +02:00
Christian Foellmann
0102e73306 add hook 'menu_LeftMenuArray' to filter the leftmenu items 2021-07-30 13:15:01 +02:00
Florian HENRY
510cf36bbd Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-30 09:26:55 +02:00
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Alexandre SPANGARO
ca6dd8850a FIX: Manage credit note on situation invoice for calculate margin 2021-07-29 15:24:08 +02:00
ptibogxiv
da482018d2
Fix for php 8 2021-07-29 10:51:51 +02:00
Frédéric FRANCE
ae5d17815f Update dolreceiptprinter.class.php 2021-07-28 19:39:17 +02:00
Laurent Destailleur
9b73fac947
Merge pull request #18245 from frederic34/patch-12 
Update dolreceiptprinter.class.php
 2021-07-28 19:38:29 +02:00
lmarcouiller
df8f099857 Fix a bug in ecm for v14 2021-07-28 15:57:12 +02:00
kamel
2cd7513936 NEW: add link to a element by ref 2021-07-28 12:18:35 +02:00
Lenin Rivas
6038ef6bba
Add filter select company 
Add filter with name alias and tva intra
 2021-07-27 12:28:18 -05:00
Frédéric FRANCE
bc8be62809
Update dolreceiptprinter.class.php 2021-07-27 10:26:51 +02:00
Laurent Destailleur
079b014b14 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e Fix #yogosha6704 2021-07-26 00:37:47 +02:00
Florian HENRY
e93a362a0d fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm 2021-07-23 18:33:18 +02:00
Frédéric FRANCE
44fa70c7c7
notify class indent 2021-07-22 09:24:14 +02:00
Frédéric FRANCE
5e6c942caf
notify class indent 2021-07-22 09:22:42 +02:00
Frédéric FRANCE
828e65c724
Update html.form.class.php 2021-07-20 20:56:01 +02:00
Frédéric FRANCE
71b95f3511
fix php8 warnings 2021-07-20 20:54:27 +02:00
ksar
4d6b63dbed
FIX #18181 
FIX #18181
 2021-07-20 16:14:47 +02:00
lmarcouiller
dd9eb28230 Barcode scanner tool update 2021-07-20 14:43:36 +02:00
lmarcouiller
b309af0ab8 First push new scan quanty inventory 2021-07-19 13:43:48 +02:00
BENKE Charlene
09954a3047
Update html.formcompany.class.php 2021-07-19 11:01:06 +02:00
Laurent Destailleur
0ccc2d9033 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:01:11 +02:00
Laurent Destailleur
ce27feda84 Debug v14 
Fix email collector (Creation of thirparty, set of extrafields)
 2021-07-16 00:12:58 +02:00
Laurent Destailleur
9aad07f20c Remove log 2021-07-15 21:57:32 +02:00
Laurent Destailleur
5da40d80f7 Fix css 2021-07-15 16:35:06 +02:00
Laurent Destailleur
a773652c04 Fix phpcs 2021-07-14 14:37:07 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio 
fix showInputField checkbox and radio type
 2021-07-14 13:55:53 +02:00
Laurent Destailleur
21f295565a
Merge pull request #18144 from Hystepik/develop#1 
Fix : remove of a button which was forgotten
 2021-07-14 13:50:42 +02:00
Alexis LAURIER
cd5e1d603e fix showInputField checkbox and radio type 2021-07-14 12:02:03 +02:00
Laurent Destailleur
724d00fc6c Fix phpcs 2021-07-14 02:20:15 +02:00
lmarcouiller
9a12b5e424 Fix : remove of a button which was forgotten 2021-07-13 15:17:01 +02:00
evarisk-theo
f0599095ee
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-13 14:04:14 +02:00
Théo David
66f38d0012 fix: rename select_tickets_list into selectTicketsList 2021-07-13 14:00:16 +02:00
Laurent Destailleur
e755d68b06 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:22:20 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/functions.lib.php
 2021-07-13 13:14:27 +02:00
Laurent Destailleur
bbce0f9c1b
Update html.form.class.php 2021-07-13 13:01:34 +02:00
Laurent Destailleur
f1c7207514
Merge pull request #18135 from Hystepik/develop#1 
Fix #18110 : update of formticket.class.php
 2021-07-13 11:48:36 +02:00
Laurent Destailleur
d3f324c2d4 Try a better fix for #18105 2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c Fixing style errors. 2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c Fix #18110 : update of formticket.class.php 2021-07-12 16:12:28 +02:00
Théo David
12e327d6b4 fix: remove phpcs:enable tag 2021-07-12 14:37:07 +02:00
Théo David
b59c1f1a34 fix: rename select_tickets into selectTickets 2021-07-12 14:17:30 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
 2021-07-12 12:01:53 +02:00
David
642d84a844 fix: code syntax 2021-07-12 09:26:18 +02:00
evarisk-theo
41b0735150
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-12 09:10:15 +02:00
ATM john
7ad1738944 Fix setError 2021-07-11 15:58:34 +02:00
ATM john
19ab5ce420 Fix comments 2021-07-11 14:13:24 +02:00
Laurent Destailleur
e7b3280c17 Debug v14 with nojs 2021-07-11 01:12:52 +02:00
Laurent Destailleur
64bd4ef784 Fix component to select ticket groups 2021-07-10 20:09:51 +02:00
Laurent Destailleur
d9475b8b2b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 23:46:35 +02:00
Laurent Destailleur
463fadb776 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-07-08 23:45:26 +02:00
Laurent Destailleur
12b1f5b23b Fix sql 2021-07-08 21:05:56 +02:00
Laurent Destailleur
797797d38b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 20:59:48 +02:00
Laurent Destailleur
1209253d57 Sanitize data 2021-07-08 18:12:15 +02:00
Alexandre SPANGARO
eaa6987e8b Fix: formconfim if type radio must be :checked to get correct value 2021-07-08 17:15:03 +02:00
Laurent Destailleur
856d6eab4a
Merge pull request #18102 from altairisfr/expe_extra 
FIX display of extrafields on shipping lines
 2021-07-08 16:35:38 +02:00
Laurent Destailleur
752b55ac98 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d Fix type of param 
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
 2021-07-08 13:59:04 +02:00
Laurent Destailleur
16ee47b12c Fix warning. 
Reduce memory need for getmin/max on large graphs.
 2021-07-08 11:13:15 +02:00
Laurent Destailleur
34c7295cbc Make code more jquery compliant 2021-07-07 21:01:30 +02:00
Christophe Battarel
7e174412b7 FIX display of extrafields on shipping lines 2021-07-07 10:30:01 +02:00
Florian Mortgat
9f7be989c2 FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter() 2021-07-06 17:38:37 +02:00
Laurent Destailleur
5444d45e68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8 Fix phpunit 2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877 Fix function not found 2021-07-06 15:55:43 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object 2021-07-02 12:04:14 +02:00
Théo David
079608fe00 NEW #18046 Add ticket ticket categories functions 2021-07-02 10:26:03 +02:00
Frédéric FRANCE
3aa24cccff
fix can't remove extrafield date or datetime value 2021-07-01 15:15:35 +02:00
Laurent Destailleur
aec4d6016c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:40 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Christophe Battarel
3b4ea5c5af use formintervention 2021-06-30 10:56:09 +02:00
Christophe Battarel
27e2c62cab Merge branch 'develop' into timespent2inter 2021-06-30 10:34:22 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Francis Appels
051bb3f3ef Fix some core php8 warnings. 
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
 2021-06-29 16:37:07 +02:00
lmarcouiller
3d41c00199 New : selectGroupTicket multilevel >1 level 2021-06-29 16:13:03 +02:00
Christophe Battarel
c8f55907eb stickler 2021-06-29 15:52:50 +02:00
Christophe Battarel
d423e47d3b stickler 2021-06-29 15:50:41 +02:00
Christophe Battarel
ef8aaa7fd7 generate intervention from time spent 2021-06-29 15:26:04 +02:00
Francis Appels
9b59f264fd Fix some php 8 warning 2021-06-28 20:00:10 +02:00
Laurent Destailleur
2fd47615eb Fix load of conf when using alternative $db 2021-06-26 01:46:14 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
4327d53c60 Fix closing linkto section when js on. 2021-06-23 14:38:24 +02:00
Laurent Destailleur
82ee5c2825 Clean code 2021-06-23 10:42:27 +02:00
Laurent Destailleur
40b35cc44a Fix upload file form has disappear 2021-06-23 02:45:06 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
Laurent Destailleur
62822c424c Fix php8 2021-06-23 01:34:14 +02:00
Laurent Destailleur
12748640a5 Add log 2021-06-22 18:04:06 +02:00
Laurent Destailleur
bcffbe3d67 Test fix 2021-06-22 17:09:02 +02:00
ATM john
b8244edb89 Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object 2021-06-21 21:54:53 +02:00
ATM john
4d043b713c WIP - create validation method for common object 2021-06-21 21:54:03 +02:00
Laurent Destailleur
6014e4407f Clean code 2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
kamel
488d875854 Correction 2021-06-21 16:51:54 +02:00
kamel
dd61c49722 Correction 2021-06-21 16:44:31 +02:00
kamel
ba7b6a8d51 FIX: Reload values of the specified entity when change entity in the execution of cron job 2021-06-21 16:38:36 +02:00
Laurent Destailleur
31db1dc412 Fix management of visibility of export/import templates. 2021-06-21 15:03:45 +02:00
Frédéric FRANCE
4739694ad7
fix php warning 2021-06-20 16:24:58 +02:00
Laurent Destailleur
a9dd5e8764 Fix css hidoneprint 2021-06-20 12:52:04 +02:00
Laurent Destailleur
e3e2dfd764 Fix generation of ODT (test if temporary directory is writable) 2021-06-20 05:11:46 +02:00
Laurent Destailleur
1a6647e690 Debug v14 2021-06-20 04:10:25 +02:00
Laurent Destailleur
8df9815049 Add warning to help understand bug of post_max_size. 2021-06-20 01:04:16 +02:00
Laurent Destailleur
4a3da84098 Clean code 2021-06-19 23:52:52 +02:00
Laurent Destailleur
414b5e612f Better info on upload size limit 2021-06-19 22:11:16 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
3754c2c3c9 Fix name of field 2021-06-17 00:59:11 +02:00
Laurent Destailleur
f850f058fa Look and feel v14 2021-06-16 21:06:55 +02:00
Laurent Destailleur
b2221d2c3a
Update extrafields.class.php 2021-06-16 14:31:22 +02:00
Antonin MARCHAL
d5cb81982d fix wrong display on extrafields type = double 2021-06-16 14:21:23 +02:00
Laurent Destailleur
1c87420895 Fix #yogosha6411 2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679 Clean code 2021-06-15 20:16:05 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
stickler-ci
82f195dc30 Fixing style errors. 2021-06-14 19:15:53 +00:00
ATM john
be367c589f WIP - create validation method for common object 2021-06-14 21:12:48 +02:00
ATM john
23765bf459 WIP - create validation method for common object 2021-06-14 20:59:46 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
ATM john
43ecba2e63 WIP - create validation method for common object 2021-06-12 14:16:40 +02:00
ATM john
578dc9adde WIP - create validation method for common object 2021-06-12 12:58:20 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13 
fix warnings
 2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2 FIX #17649 2021-06-11 17:58:52 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
1605564d5e Clean code 2021-06-11 14:54:18 +02:00
Frédéric FRANCE
f58cf14ae9
Update html.formmail.class.php 2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0
fix warnings 2021-06-10 22:26:58 +02:00
Frédéric FRANCE
759472f5d1
fix warning 2021-06-10 20:58:56 +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
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade 
FIX : childtablesoncascade doc
 2021-06-10 12:59:19 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php 2021-06-10 12:58:42 +02:00
Laurent Destailleur
067f37e22e Clean code 2021-06-10 00:09:38 +02:00
Laurent Destailleur
2681d58107 FIx CVE ID: CVE-2021-33816 2021-06-09 16:41:31 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Dorian Vabre
0a23cf029d using strlen instead of count 2021-06-09 14:13:50 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
ATM john
801f6cab2d WIP - create validation method for common object 2021-06-06 21:58:59 +02:00
ATM john
f1b1dcd1b1 WIP - create validation method for common object 2021-06-06 21:53:17 +02:00
ATM john
aa94d40ad0 WIP - create validation method for common object 2021-06-06 21:12:03 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
Laurent Destailleur
fb0d2cdddc Debug v14 2021-06-05 15:27:49 +02:00
Laurent Destailleur
b6ba1de3b3 Fix remove use of captcha on backoffice for ticket creation 2021-06-05 02:18:45 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20 
fix warnings
 2021-06-04 11:52:53 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14 
fix warnings
 2021-06-04 11:51:01 +02:00
Laurent Destailleur
b31b210324
Merge pull request #17773 from Hystepik/develop#4 
New : add of a new param in selectGroupTicket
 2021-06-04 10:37:18 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
ATM john
a7300d01b0 WIP - create validation method for common object 2021-06-03 09:49:07 +02:00
lmarcouiller
ab64f467f5 add of a new param in selectGroupTicket 2021-05-31 09:31:38 +02:00
Frédéric FRANCE
ca0654323f
fix warnings 2021-05-27 23:11:05 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings 2021-05-27 22:28:59 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php 2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php 2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018 lint(stickler) 2021-05-26 17:10:12 +02:00
Antonin MARCHAL
8dd2af42df fix(param) select_produits_fournisseur_list 2021-05-26 16:44:35 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5 
fix allowed preview
 2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php 2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php 2021-05-25 22:09:58 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1 
Compatibility phpv8
 2021-05-25 20:36:56 +02:00
Laurent Destailleur
80e77f597d
Merge pull request #17701 from FHenry/13.0_fix_formconfirm 
fix: formconfim if type radio must be :checked to get correct value
 2021-05-25 20:03:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1 2021-05-25 19:55:31 +02:00
Laurent Destailleur
67372ff7d4
Merge branch 'develop' into patch-1 2021-05-25 19:45:56 +02:00
Laurent Destailleur
bb64a25638 Fix CWE-269 - huntr - Fix set of email without edit user permission 2021-05-24 22:11:24 +02:00
Laurent Destailleur
d4310f49c4 FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES 2021-05-24 19:46:19 +02:00
gmilad
89f150dd95
Fix #16100 Update utils.class.php 
Fix #16100
End French Forum : 

https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
 2021-05-22 21:28:45 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Florian HENRY
609d405685 fix: formconfim if type radio must be :checked to get correct value 2021-05-21 15:38:03 +02:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Laurent Destailleur
5191a419d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
 2021-05-20 15:05:30 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1 
Compatibility phpv8
 2021-05-20 14:29:18 +02:00
Florian HENRY
62bc6e9e1f on going 2021-05-20 13:15:32 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +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
173ef6e877 Look and feel v14 2021-05-19 14:04:01 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
Laurent Destailleur
75f7ab41f0 css 2021-05-19 12:13:21 +02:00
Givriz
1cf7d0cee7 Compatibility phpv8 2021-05-18 20:13:26 +02:00
Florian Mortgat
6cccd77508 FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance) 2021-05-18 17:57:23 +02:00
Laurent Destailleur
271ba884db css 2021-05-18 17:24:17 +02:00
Laurent Destailleur
303d60a0bd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-18 12:45:34 +02:00
Laurent Destailleur
0c4884bb2c Fix sql error 2021-05-18 12:44:56 +02:00
Laurent Destailleur
5babd107a0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:43:52 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php 2021-05-18 12:35:30 +02:00
Bastien Schils
1a38d075a6 html.form.class.php: Fixed SQL error (projects) 
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
 2021-05-17 18:35:50 +02:00
Laurent Destailleur
082ae2e627 Fix trans 2021-05-17 11:11:17 +02:00
Laurent Destailleur
40106ff767
Update html.formmail.class.php 2021-05-17 08:35:29 +02:00
Laurent Destailleur
09a6946281
Update html.formmail.class.php 2021-05-17 08:34:58 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3 
avoid sql error with sql_mode=only_full_group_by
 2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php 2021-05-17 07:11:41 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Frédéric FRANCE
cff0b69ce0
avoid sql error with sql_mode=only_full_group_by 
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
 2021-05-14 18:30:56 +02:00
Laurent Destailleur
f504cbcec4 Fix log 2021-05-12 19:18:51 +02:00
Laurent Destailleur
aa2d85276e Debug v14 2021-05-12 18:38:22 +02:00
Laurent Destailleur
cfded75d11 Debug v14 2021-05-12 09:27:04 +02:00
Laurent Destailleur
b8254186ce Clean code 2021-05-12 09:07:36 +02:00
Laurent Destailleur
f84817f0f6 FIX rss module on servers with allow_url_fopen=0 2021-05-11 23:49:33 +02:00
Frédéric FRANCE
a948fc4ed8
Update extrafields.class.php 2021-05-11 22:12:15 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey 
New substitution key for member new form url in mailing
 2021-05-11 19:41:12 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class 2021-05-11 18:34:43 +02:00
Pierre Payet
ff178667a3 add thirdparty customer code to substitutionarray 2021-05-11 12:33:35 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
stickler-ci
3ee26fc881 Fixing style errors. 2021-05-09 21:37:58 +00:00
andreubisquerra
8aa8c14323
Fix 2021-05-09 22:53:05 +02:00
andreubisquerra
5a5811a716
NEW DOL_VALUE_PLACE tag in TakePOS template 
Very important in restaurant orders
 2021-05-09 22:37:00 +02:00
daraelmin
bfac47c84e
Too much underscore 2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050
Add tooltip 2021-05-07 17:14:33 +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
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2 
New 5 substitutions keys "online payment link" in mailing
 2021-05-06 16:36:10 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
daraelmin
729a5677ad
Group tooltip by key type 2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01
Add tooltip for new substitution keys 2021-05-04 01:41:32 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
a806a18455 Reduce sql 2021-05-03 13:35:10 +02:00
Laurent Destailleur
39e27b6f38 Minor perf enhancement 2021-05-03 12:32:31 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
ATM john
6e4962bb39 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection 2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8 Fix checkbox multiselect pre-selected value from get/post 2021-04-30 12:20:43 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
a2245bd7db Fix add of box 2021-04-29 10:13:43 +02:00
Anthony Berton
bb5a11ff75 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/17185 2021-04-29 00:06:35 +02:00
Anthony Berton
c1e6109c4b Update 2021-04-29 00:03:16 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
Laurent Destailleur
5bb2531364 Enhance ticket module 2021-04-27 02:52:24 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect 
13 fix combo prospect
 2021-04-27 01:18:57 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423 
NEW : Update doleditor.class.php for easily activate SCAYT
 2021-04-26 23:38:23 +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
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options 
Add parameter "option" to hook formattachOptions
 2021-04-26 21:00:12 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
stickler-ci
ebd3b00016 Fixing style errors. 2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect 2021-04-26 09:21:32 +02:00
Robin
04c97d2695 FIX combo Prospect / Customers / Supplier in society list 2021-04-26 09:05:47 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
2fd2c67139 Clean edit of user card 2021-04-25 15:21:31 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD 2021-04-24 08:05:00 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Dorian Vabre
b441c600bb fixing error introduced in a previous commit 2021-04-23 10:32:28 +02:00
gmilad
b9c33fc8b6
Update doleditor.class.php for 
(English below)
Bonjour,

Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT)  de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Amicalement,
Gaëtan.

(English below)
Hello,

Here is a proposal to add functionality to easily activate the  SpellCheckAsYouType (SCAYT)  plugins of CKEditor, for the history see this thread on the Dolibarr forum:

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Kind regards,
Gaëtan.
 2021-04-23 00:45:07 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +02:00
Dorian Vabre
a500d83c0b linked invoice and attendee 2021-04-20 16:09:22 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
cad7ea0b92 css 2021-04-18 15:07:22 +02:00
Laurent Destailleur
4abf7d1c91 Better error management for SMTPS sending method 2021-04-17 13:53:52 +02:00
Laurent Destailleur
a31efd248f
Merge pull request #17280 from andreubisquerra/develop 
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
 2021-04-16 20:29:58 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project 
Warehouses in project
 2021-04-16 20:29:21 +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
altairis-noe
3fe0eb54c7 association of warehouses to projects 2021-04-15 09:59:08 +02:00
andreubisquerra
662caadd18
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS 2021-04-14 23:32:08 +02:00
Laurent Destailleur
25a6aa1388 NEW Add data-eec=1 for EEC countries on select for js interaction 2021-04-13 22:50:50 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Robin
0839ee25cd FIX missing parameter in select for POP 
All options can be modified for selector in pop
 2021-04-13 10:44:14 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
8fa943edc3 Fix select field in multiselect of languages 2021-04-12 14:26:09 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Gauthier PC portable 024
c35c15e782 FIX : test must be === and not == 2021-04-09 11:31:50 +02:00
stickler-ci
c2cd54325f Fixing style errors. 2021-04-08 11:44:24 +00:00
Anthony Berton
f613688b28 add_option 2021-04-08 13:37:09 +02:00
Laurent Destailleur
93269bab9e
Merge pull request #17183 from OPEN-DSI/fix_00005 
FIX : Fix warning
 2021-04-08 13:14:53 +02:00
kamel
1ec6317b80 FIX : Fix warning (function errorHandler() is not defined in this class so let the class handle the errors) 2021-04-08 10:33:27 +02:00
Laurent Destailleur
59c8e70fd2 Fix #yogosha4510 2021-04-07 23:43:10 +02:00
Günter Lukas
04a55a3df3 Fix #17146 2021-04-07 09:08:34 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Laurent Destailleur
95de241245 FIx #yogosha5774 2021-04-05 15:21:17 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
d4f14183b7 Code comment 2021-04-01 13:15:23 +02:00
Florian Mortgat
f5617a6247 FIX 13.0 warning - missing quotes around 'label' 2021-04-01 12:33:23 +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
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-31 22:29:39 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Frédéric FRANCE
1823fb34bb
Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4 2021-03-31 18:41:49 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
14c7ce7492 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/reception/card.php
 2021-03-31 13:59:21 +02:00
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
 2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
UT from dolibit
34077d5b8a
Update canvas.class.php 2021-03-30 18:31:36 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
6c98276ead FIX #yogosha5782 2021-03-30 11:26:49 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
9edb2fd857 Fix sql error 2021-03-30 02:13:57 +02:00
Laurent Destailleur
3616d2ba44 FIX #yogosha5770 2021-03-29 23:24:52 +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
Laurent Destailleur
ae0468e107 FIX #yogosha5765 2021-03-29 21:04:33 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +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
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Florian HENRY
5926db2704 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft1 2021-03-29 12:10:35 +02:00
Laurent Destailleur
85f6a15678 Fix position of users in combo list 2021-03-29 11:58:51 +02:00
Laurent Destailleur
a5d84200dc Clean code for invoice list 2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Laurent Destailleur
1d48b883a7 Look and feel v14 2021-03-27 13:17:56 +01:00
Florian HENRY
3e12820f0e fix comment 2021-03-26 18:37:11 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
Laurent Destailleur
84ec032cc0 Look and feel v14 2021-03-26 17:58:00 +01:00
Laurent Destailleur
02ba8810cf Better error message 2021-03-26 12:23:42 +01:00
Laurent Destailleur
44cb9dca67 FIX must use getUrlContent to get external url in RSS module 2021-03-25 19:05:01 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
a4aa806e44
Merge pull request #16933 from daraelmin/daraelmin-patch-2 
Fix #16794 V13 order by status instead of statut
 2021-03-25 08:31:44 +01:00
Laurent Destailleur
5af02d96cd Show entity for user only if different than current entity 2021-03-25 03:58:54 +01:00
Laurent Destailleur
930742dadf
Merge pull request #16846 from ptibogxiv/patch-418 
NEW auto notification with templated emails
 2021-03-25 01:48:44 +01:00
Laurent Destailleur
3f8d71d024
Merge pull request #16950 from code42fr/fix_translation_tag_#16941 
Fix translation tag #16941
 2021-03-25 00:26:48 +01:00
Laurent Destailleur
87bb84310d
Update translate.class.php 2021-03-25 00:26:16 +01:00
Laurent Destailleur
eeba9e4d50 Code comment 2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
211c5b53eb NEW Can set if a ticket group is visible on public interface or not. 2021-03-24 13:16:17 +01:00
hugo
8a1cd3e471 FIX #16941 langs trans escape tag <i 2021-03-24 10:08:19 +01:00
Florian HENRY
d043c8f4ba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-23 21:05:11 +01:00
Florian HENRY
cc78e7c685 add field on conf or booth tabs 2021-03-23 21:04:38 +01:00
Laurent Destailleur
02509ccbc4 Responsive 2021-03-23 20:39:11 +01:00
Laurent Destailleur
538547acfe Add currency into combo of bank account (for a future use in js) 2021-03-23 16:26:31 +01:00
Laurent Destailleur
00e48aa922 Clean and secured code for ajax/row.php 2021-03-23 16:09:02 +01:00
Laurent Destailleur
b275789223 Fix regression 2021-03-23 12:22:30 +01:00
Laurent Destailleur
f7ba0ee381 Fix set of parent company with ajax 2021-03-22 22:50:43 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +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
daraelmin
6ba878725e
Fix #16794 V13 order by status instead of statut 2021-03-22 07:28:16 +01:00
ptibogxiv
6d26b4aec3
Update notify.class.php 2021-03-21 21:11:39 +01:00
Laurent Destailleur
800eeef868 Clean code 2021-03-21 18:20:37 +01:00
Laurent Destailleur
af199189b3 NEW Add color and picto for direction of movement 2021-03-21 13:46:01 +01:00
Laurent Destailleur
eeb1c5d884 Replace deprecated code 2021-03-20 21:46:10 +01:00
Laurent Destailleur
9900429fd0
Merge pull request #16889 from frederic34/adherent_to_member 
rename files from adherent to member
 2021-03-20 20:37:44 +01:00
Laurent Destailleur
8f6f8248a3
Merge pull request #16885 from daraelmin/daraelmin-patch-4 
#Fix #16767 unremovable attached file in mailmodel
 2021-03-20 19:51:26 +01:00
Frédéric FRANCE
d2f7d3064d
can use $conf->member 2021-03-20 19:09:49 +01:00
daraelmin
cb71936ccd
#Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 make default attached file of a mail model selected removable
 2021-03-20 14:10:56 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 unremovable attached file in mailmodel
 2021-03-20 14:04:20 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
2da85a9ca2
Merge pull request #16842 from hregis/fix_avoid_warning_php8 
FIX avoid php8 warning in products list
 2021-03-20 11:48:53 +01:00
Laurent Destailleur
3cc8a8e2ee
Merge pull request #16850 from frederic34/patch-4 
fix php8 warning
 2021-03-20 11:28:47 +01:00
Laurent Destailleur
685ec0bc63
Merge pull request #16872 from frederic34/patch-22 
fix doxygen
 2021-03-20 11:15:32 +01:00
Frédéric FRANCE
8142d76394
fix php8 warnings 2021-03-20 10:50:02 +01:00
Frédéric FRANCE
49ff44e414
fix doxygen 2021-03-20 10:21:23 +01:00
Frédéric FRANCE
93ae7a3fed
fix php8 warning 2021-03-19 17:01:14 +01:00
Laurent Destailleur
aef2f1713e FIX #yogosha5673 2021-03-19 13:25:58 +01:00
stickler-ci
08727a86b0 Fixing style errors. 2021-03-19 10:53:06 +00:00
ptibogxiv
d38f7f7dfe
NEW auto notification with templated emails 2021-03-19 11:50:15 +01:00
stickler-ci
ee701bb480 Fixing style errors. 2021-03-19 09:05:20 +00:00
Regis Houssin
a1f6886e97 FIX avoid php8 warning in products list 2021-03-19 10:01:40 +01:00
Laurent Destailleur
5037de49c4
Merge pull request #16773 from frederic34/patch-5 
fix php8 warning
 2021-03-18 23:19:32 +01:00
Laurent Destailleur
b66173a111
Merge pull request #16771 from frederic34/projet_task_stats 
fix php8 warnings
 2021-03-18 23:15:37 +01:00
Laurent Destailleur
1ecb2ed342
Merge pull request #16780 from frederic34/patch-11 
fix php8 warning
 2021-03-18 23:09:54 +01:00
Frédéric FRANCE
b584adf299
fix project replace projet 2021-03-18 21:10:55 +01:00
Frédéric FRANCE
c43d3dff92
fix project replace projet 2021-03-18 20:51:40 +01:00
Laurent Destailleur
ac6b6f22e7 Enhance sanitizing of data 2021-03-18 11:39:23 +01:00
Frédéric FRANCE
22ac6c79b3
fix php8 warning 2021-03-17 22:29:33 +01:00
Laurent Destailleur
31478d5ac0 Look and feel v14 2021-03-17 22:01:25 +01:00
Frédéric FRANCE
fced63e93b
fix php8 warning 2021-03-17 20:11:22 +01:00
Laurent Destailleur
24576897ef
Merge pull request #16750 from frederic34/restrictiononfksoc 
fix php8 warnings
 2021-03-17 17:05:23 +01:00
Laurent Destailleur
36cb213a83
Merge pull request #16764 from hregis/fix_php_8_warning_again 
FIX avoid php 8.x warning
 2021-03-17 16:50:21 +01:00
Regis Houssin
4d149dc3fe FIX avoid php 8.x warning 2021-03-17 15:15:51 +01:00
Regis Houssin
bb4c8d9114 FIX avoid warning with php 8 2021-03-17 12:48:59 +01:00
Laurent Destailleur
8de1b4c94e Factorize code 2021-03-17 11:34:19 +01:00
Frédéric FRANCE
4e8ea5c07e
fix php8 warnings 2021-03-16 21:13:15 +01:00
Laurent Destailleur
017120f017
Merge pull request #16697 from frederic34/patch-3 
fix syntax
 2021-03-16 10:42:49 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-16 10:34:55 +01:00
Laurent Destailleur
897f4be033
Merge pull request #16712 from frederic34/patch-9 
fix php8 warnings
 2021-03-16 10:33:01 +01:00
Laurent Destailleur
401aeb8a7f
Merge pull request #16706 from frederic34/htmlforcc 
decompose code
 2021-03-16 10:32:44 +01:00
Laurent Destailleur
462164a5a8
Merge pull request #16709 from frederic34/patch-5 
fix php8 warnings
 2021-03-16 10:31:53 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Frédéric FRANCE
2d741a33f0
fix php8 warning 2021-03-15 21:03:54 +01:00
Frédéric FRANCE
f7d43ce4fb
fix php8 warnings 2021-03-15 20:55:59 +01:00
Frédéric FRANCE
a0e6f454ff
fix php8 warnings 2021-03-15 20:31:55 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +01:00
Frédéric FRANCE
e89cfc3753
decompose code 2021-03-15 20:17:01 +01:00
Frédéric FRANCE
910b4f1daf
Update html.formmail.class.php 2021-03-15 18:58:35 +01:00
Frédéric FRANCE
dd4b8f2880
Update html.formmail.class.php 2021-03-15 18:22:50 +01:00
Laurent Destailleur
a8c34a5b05 Invert MAIN_EXTRAFIELDS_USE_SELECT2 into 
MAIN_EXTRAFIELDS_DISABLE_SELECT2
 2021-03-15 14:16:55 +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
bbb0d9acc4
fix php8 warning 2021-03-14 20:31:13 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
af5db0f5fa Look and feel v14 2021-03-12 15:34:31 +01:00
Florian HENRY
f17aa47ad6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-03-11 22:03:51 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev 
Replace gender and civility by a picto
 2021-03-11 21:36:16 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Damien BENOIT
420a3a73dd
Update html.form.class.php 2021-03-11 18:15:22 +01:00
lmarcouiller
9aa20585be Fix #16617 : fix event add when removing boxes 2021-03-11 10:10:20 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop 
Update fork
 2021-03-10 16:53:35 +01:00
Damien BENOIT
93675082d7
Update html.form.class.php 2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
b1f4c29fde Fix missing alias 2021-03-09 20:12:14 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList 
Dev allow alias in common object get filed list
 2021-03-09 16:54:22 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php 2021-03-09 15:13:20 +01:00
Laurent Destailleur
1b3aae1984 Fix regression 2021-03-09 12:17:32 +01:00
Laurent Destailleur
53f8ff060a Fix phpcs 2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList 2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a allow table alias into commonObject getFieldList 2021-03-09 10:21:32 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Laurent Destailleur
3b80b9dd75 Fix regression 2021-03-08 16:37:52 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex 2021-03-08 16:34:05 +01:00
Laurent Destailleur
24a0700426
Merge pull request #16573 from frederic34/box_index_societe 
can add box on thirparties index
 2021-03-08 16:25:46 +01:00
Laurent Destailleur
1aba0c2bc9 NEW Can set order of execution of hooks 2021-03-08 15:56:41 +01:00
Laurent Destailleur
ab89d85095 Fix for php8 2021-03-08 11:33:07 +01:00
ksar
ec8baa6bff Update commondocgenerator.class.php 
#16341
 2021-03-08 10:00:19 +01:00
Frédéric FRANCE
92754760f4
can add box on thirparties index 2021-03-06 16:38:07 +01:00
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0 
fix: set class attribute at right place
 2021-03-06 11:18:02 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter 
NEW: LDAP: usergroup search can be filtered
 2021-03-06 11:08:24 +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
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
stickler-ci
06cabb35ec Fixing style errors. 2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
396fb3fae3 FIX: ldap: bad function comment 2021-03-05 11:21:04 +01:00
Marc de Lima Lucio
f731545af4 NEW: ldap: filter search on usergroups 2021-03-05 11:14:21 +01:00
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +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
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
43e58f70a1
Merge pull request #16528 from frederic34/patch-4 
remove unused code
 2021-03-03 15:10:58 +01:00
Frédéric FRANCE
d05c0b749a
remove unused code 2021-03-03 13:11:10 +01:00
Frédéric FRANCE
2d9f00eb57
Update commonobject.class.php 2021-03-03 12:24:44 +01:00
Frédéric FRANCE
a8bf47b9ce
fix unknown constant and variable 2021-03-03 12:02:48 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
lvessiller
66ad8fbb24 FIX select list dependancies on common object (FIX #16510) 2021-03-02 17:21:55 +01:00
Laurent Destailleur
c81d5ff4d0 Introduce a variable to cache some data. 2021-03-02 16:13:00 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +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
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +01:00
Laurent Destailleur
1f25f2bb7e Fix phpcs 2021-03-02 15:09:29 +01:00
Laurent Destailleur
cdfb9254b3
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields 
FIX : select list dependencies now work for ModuleBuilder sellist field
 2021-03-02 14:51:53 +01:00
Laurent Destailleur
3982a36a3e
Update commonobject.class.php 2021-03-02 14:47:35 +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
27c354567a FIX : select list dependencies now work for ModuleBuilder sellist field 2021-03-02 14:06:11 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
1132ed306c
Merge pull request #16506 from andreubisquerra/patch-1 
Avoid php errors if negative var in Receipt Module
 2021-03-02 12:50:57 +01:00
Laurent Destailleur
a161edefb1 Look and feel v14 2021-03-02 12:33:55 +01:00
Florian HENRY
812d3279b3 Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:05:20 +01:00
Frédéric FRANCE
cb507a61b9
backup with utf8mb4 2021-03-02 09:54:52 +01:00
Laurent Destailleur
7f209f7cc7 Clean code 2021-03-02 02:55:24 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Laurent Destailleur
f1f950e8b7 Close #16395 - Can filter on proposal source in list 2021-03-02 00:11:15 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 00:09:44 +01:00
andreubisquerra
5bb7c521aa
Update dolreceiptprinter.class.php 2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775
Avoid php errors if negative var in Receipt Module 
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
 2021-03-01 23:09:07 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule 2021-03-01 21:22:34 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00: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
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab default envent status 2021-03-01 19:54:30 +01:00
Florian HENRY
0edae6e19a add class default values 2021-03-01 18:25:23 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
 2021-03-01 17:46:36 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +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