lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
106,821 Commits 43 Branches 150 Tags 886 MiB
6447c1e394
Commit Graph

10347 Commits

Author SHA1 Message Date
Laurent Destailleur
689f5dd1fe Fix use of reposition when nojs for confirmation popup 2021-12-11 18:13:03 +01:00
Laurent Destailleur
5bca7cf5f1 css 2021-12-10 15:57:10 +01:00
fr69400
611bae4c3a FIX - unasigned variable $action given to hook printOriginObjectSubLine 2021-12-10 14:20:04 +01:00
Laurent Destailleur
b2611e4cdb CSS 2021-12-10 13:56:51 +01:00
Laurent Destailleur
20a3fab437 Fix pb when several output hooks 2021-12-09 20:58:23 +01:00
Laurent Destailleur
c37377626e Revert change 2021-12-09 19:43:23 +01:00
Laurent Destailleur
eacc5f0f0a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2021-12-09 18:03:27 +01:00
lmarcouiller
8b2002fbfb Fix php 8.0 warnings of modulebuilder 2021-12-09 15:17:18 +01:00
Regis Houssin
1098426005 FIX wrong syntax of sql request 2021-12-09 10:31:02 +01:00
Laurent Destailleur
ea45fdce5c
Merge pull request #19535 from Hystepik/develop#4 
Fix : php 8.0 warnings
 2021-12-08 18:44:16 +01:00
Laurent Destailleur
8f7b222764 Fix phpcs 2021-12-08 18:37:07 +01:00
Laurent Destailleur
72dc560ce8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:27:28 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Laurent Destailleur
449cbcdf46
Merge pull request #19546 from javieralapps4up/develop 
FIX When you pay an invoice, you can send the payment multiple times.
 2021-12-08 16:31:40 +01:00
Laurent Destailleur
0fa82fbb4e
Merge pull request #19559 from fappels/debug_15_part2 
Extrafield showOutputField parameter 4 'extrafieldsobjectkey' is now required
 2021-12-08 15:43:01 +01:00
Laurent Destailleur
597ab407f8
Merge pull request #19568 from Hystepik/develop#2 
Fix inventory scanning function
 2021-12-08 15:30:55 +01:00
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5 
Fix php8.0 warnings
 2021-12-08 14:36:42 +01:00
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +01:00
Laurent Destailleur
5efa31204b FIX ECM module was mixing contributions and vat and not showing salaries 2021-12-07 02:00:34 +01:00
Francis Appels
fe40668f43 Parameter 4 extrafieldsobjectkey seems to be required now. 2021-12-06 20:32:44 +01:00
Francis Appels
f1524372ad Fix extrafield showOutputField old syntax always hidden. 2021-12-06 16:34:50 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
259b7dfe5a NEW: Add massaction to switch status on sale / on purchase of a product. 2021-12-06 02:48:34 +01:00
ATM john
5dc620b728 Merge branch 'fix_missing_formsetup_elements' of github.com:atm-john/dolibarr into fix_missing_formsetup_elements 2021-12-04 14:00:12 +01:00
ATM john
f640a9fbad Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_missing_formsetup_elements 2021-12-04 13:59:27 +01:00
javieralapps4up
b024bf20ed
Update html.form.class.php 
When you pay an invoice, you can send the payment multiple times.
 2021-12-03 13:57:34 +01:00
lmarcouiller
83ea868c9a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-12-03 10:19:28 +01:00
Laurent Destailleur
c171ba3a45 Fix regression in cron jobs 2021-12-02 16:07:33 +01:00
lmarcouiller
b732d80ca5 Fix php 8.0 warnings 2021-12-02 15:56:34 +01:00
Laurent Destailleur
a3493d0132 Clean code 2021-12-02 11:33:51 +01:00
Laurent Destailleur
ca6f222662 Fix notification (pb static var unknown) 2021-12-02 11:19:44 +01:00
John BOTELLA
c0d00a859f use dol_escape_htmltag 2021-12-01 16:59:30 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
Laurent Destailleur
3cb07fd1ec Doc 2021-12-01 15:37:31 +01:00
Laurent Destailleur
259418d1dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-12-01 12:10:14 +01:00
Laurent Destailleur
4575bbae82 Clean code for browser notifications 2021-12-01 12:00:19 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Laurent Destailleur
40491ca04e
Merge pull request #19419 from FHenry/dev_new_enhance_trad_select_dictionnary 
NEW : for developpers allow translation label in select_dictionnary
 2021-11-30 12:38:18 +01:00
Laurent Destailleur
ecdae02062
Merge pull request #19510 from frederic34/contractdirectprint 
add direct print for contracts
 2021-11-30 11:20:51 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
John BOTELLA
5bdaab8dcb Fix duplicated code 2021-11-29 14:30:04 +01:00
lmarcouiller
0d65fdad23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-11-29 10:38:11 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +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
Laurent Destailleur
0dcbd458b8 FIX default_vat_code was not returned in some Ajax services of products 2021-11-23 13:08:00 +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
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
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
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
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
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
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
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
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
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +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
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