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

7374 Commits

Author SHA1 Message Date
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
c79fa4d3d0 NEW Add workflow action close purchase order on reception validation 
NEW Add workflow action close purchase order on reception closing
 2021-11-19 23:03:12 +01:00
Laurent Destailleur
53de97a52f
Merge pull request #19191 from moreauftheobald/develop 
NEW|New Ajout d'un collecteur de pièce jointes a Email collecto
 2021-11-18 20:36:28 +01:00
Laurent Destailleur
649bf38c05 Responsive 2021-11-17 11:14:12 +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
Laurent Destailleur
67c9d55e88
Update ldap.php 2021-11-15 10:46:13 +01:00
Laurent Destailleur
5b5f41606a NEW PDF generation support format PDF/A-1b and PDF/A-3b 2021-11-15 09:02:01 +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
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
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
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
d591a83085 css 2021-11-08 00:57:00 +01:00
Laurent Destailleur
1d09ffa4c6 Fix scrutinizer 2021-11-07 18:59:11 +01:00
Laurent Destailleur
47451432a7 Fix warning 2021-11-07 18:49:58 +01:00
Laurent Destailleur
142e9473c5 Responsive 2021-11-07 18:28:59 +01:00
Laurent Destailleur
2234522519 Debug module parnership. Add the type of partnership. 2021-11-07 13:51:31 +01:00
Laurent Destailleur
e8a2fc33c3 Fix visiblity of dictionnary for MAIN_USE_EXPENSE_IK 2021-11-07 12:47:03 +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
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:04:17 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +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
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
58e55a3d86
Merge pull request #19263 from frederic34/displaydnsspf 
display spf info from dns
 2021-11-01 02:35:32 +01:00
Laurent Destailleur
3c69fb0ea3
Update mails.php 2021-11-01 02:35:15 +01:00
Frédéric FRANCE
8ce70aac5d
display spf info from dns 2021-10-31 18:43:11 +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
ksar
2b13c05d13
FIX #19214 2021-10-28 15:54:38 +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
36febed123 FIX syntax error 2021-10-28 15:46:52 +02:00
Regis Houssin
f497492e62 FIX compatibility with php8 2021-10-28 15:40:05 +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
5df25fece7 Trans and log 2021-10-27 11:15:26 +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
MOREAU FRANCK
74ec7c68a2 card Modif 2021-10-25 09:37:51 +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
Frédéric FRANCE
6d9ee78704
security page doesnt detect xdebug 2021-10-23 21:53:04 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Frédéric FRANCE
febb48d345
Update loan.php 2021-10-23 07:41:40 +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
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
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Frédéric FRANCE
054388be01
doxygen 2021-10-21 11:45:36 +02:00
Regis Houssin
71b9ac384f FIX only ones value is return for dictionaries 2021-10-21 08:43:20 +02:00
Regis Houssin
4b2b2328c3 FIX missing sql filter by entity 2021-10-20 21:33:18 +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
4a5293fc9c Rewrite getDictionaryValue (Use a cache file and consistent return code) 2021-10-20 14:41:40 +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
Laurent Destailleur
885e70ff03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-19 19:52:33 +02:00
Laurent Destailleur
9f9c1d2f7b css 2021-10-19 19:52:18 +02:00
Laurent Destailleur
99a939df57
Merge pull request #17518 from bb2a/add_option_pdf_global_with_picture 
[NEW] PDF width picture option
 2021-10-19 19:32:44 +02:00
Laurent Destailleur
58941e9a95
Update pdf_other.php 2021-10-19 19:31:06 +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
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Regis Houssin
db01fed447 FIX error when defining an already existing constant 2021-10-19 12:36:33 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
Laurent Destailleur
78523e852d css 2021-10-17 14:04:49 +02:00
Laurent Destailleur
30ba753b34 css 2021-10-17 14:02:37 +02: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
d60f4121ee
Merge pull request #18991 from FHenry/dev_new_option_pdfA_setting 
NEW: add setting to create PDF in PDF/A - 1b format #18990
 2021-10-16 19:04:52 +02:00
Laurent Destailleur
5dfbd3642f
Update pdf.php 2021-10-16 19:03:20 +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
Laurent Destailleur
52890c64c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/compta/prelevement/create.php
 2021-10-16 12:53:57 +02:00
Florian HENRY
26c50b9e2c add setting to create PDF in PDF/A - 1b format #18990 2021-10-15 11:59:12 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Laurent Destailleur
4d48be415c
Fight against inflation of minor options 2021-10-13 01:53:44 +02:00
Vincent Dieltiens
7f07d82d3f Rename FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER into SUPPLIER_ORDER_FORBID_EDIT_PROJECT 2021-10-12 23:34:00 +02:00
Vincent Dieltiens
8370973a9d Add an option to forbird changing the project of a supplier order if validated or if in draft but already has a reference (not ) 2021-10-12 15:17:14 +02:00
atm-lena
7c8bde885b hook createDictioaryFieldList : tr html tag to right place 2021-10-11 16:03:56 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code 
New : integration gpec, source code
 2021-10-11 15:39:54 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +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
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +02:00
Laurent Destailleur
f8d4e2bbf9 Fix phpcs 2021-10-07 04:14:38 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Laurent Destailleur
ad1cb443e4
Merge pull request #18520 from cfoellmann/PR/pdf-no-template 
allow supplier order to not generate pdfs
 2021-10-06 15:35:08 +02:00
Laurent Destailleur
de49e4e375
Merge branch 'develop' into NEW_expense_report_project_required 2021-10-06 14:34:58 +02:00
Laurent Destailleur
0cf18ded80
Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +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
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b559dc9053 css 2021-10-05 08:55:57 +02:00
Alexandre SPANGARO
e75d7b2206 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 06:25:53 +02:00
Laurent Destailleur
6d8276c9c8 Doc 2021-10-04 12:59:53 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Gauthier PC portable 024
a6c854cb59 FIX : restore link to hrm establishment tab 2021-10-03 12:34:47 +02:00
Laurent Destailleur
705644bf07
Merge branch 'develop' into NEW_expense_report_prefill_dates 2021-10-02 21:11:59 +02:00
Laurent Destailleur
e5c5d8d755
Merge pull request #18878 from frederic34/patch-4 
doxygen
 2021-10-02 21:00:39 +02:00
Laurent Destailleur
1a8cb9c4b5
Merge pull request #18864 from marc-dll/NEW_expense_report_force_amounts_including_taxes 
NEW: expense reports: conf to force amounts to be entered only including taxes
 2021-10-02 21:00:29 +02:00
Laurent Destailleur
dd68e8c36e
Merge pull request #18877 from frederic34/patch-2 
doxygen
 2021-10-02 20:44:15 +02:00
Laurent Destailleur
c4ca0bdc28
Merge pull request #18879 from frederic34/patch-5 
doxygen
 2021-10-02 20:44:09 +02:00
Laurent Destailleur
dfb1b1636f
Merge pull request #18881 from frederic34/patch-6 
doxygen
 2021-10-02 20:38:55 +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
2fe1b548ef Show label of permission as tooltip on list of modules/app 2021-10-02 19:45:58 +02:00
Frédéric FRANCE
10aa6106d2
doxygen 2021-10-02 13:34:08 +02:00
Frédéric FRANCE
5d181810da
doxygen 2021-10-02 13:31:54 +02:00
Frédéric FRANCE
c5871ac765
doxygen 
/home/dolibarr/htdocs/admin/eventorganization_confboothattendee_extrafields.php:23: warning: the name 'admin/conferenceorboothattendee_extrafields.php' supplied as the argument in the \file statement is not an input file
 2021-10-02 13:29:33 +02:00
Frédéric FRANCE
254fbb862b
doxygen 2021-10-02 13:27:25 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
d68719226b Fix can install module with name module_abc-x.y.z (w).zip 2021-10-01 14:10:50 +02:00
Laurent Destailleur
eada0f468f Set MAIN_SECURITY_CSRF_WITH_TOKEN recommended value to 1 2021-10-01 12:39:15 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Marc de Lima Lucio
2a85a32659 FIX: postgresql compatibility with camelcase fields 2021-09-30 18:30:22 +02:00
Marc de Lima Lucio
d3e90e8f76 NEW: expense reports: conf to force amounts to be entered only including taxes 2021-09-30 17:24:57 +02:00
Marc de Lima Lucio
0dae918b76 NEW: expense reports: make project field required on lines 2021-09-30 17:09:49 +02:00
Marc de Lima Lucio
c2c7d88520 NEW: NEW: expense reports: conf to pre-fill start/end dates with bounds of current month 2021-09-30 16:40:34 +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
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
620d7109b5
Update dict.php 2021-09-30 14:04:56 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +02:00
Laurent Destailleur
3d239e7528 Trans 2021-09-29 17:28:06 +02:00
Laurent Destailleur
a395ff5ee3 Css 2021-09-29 16:19:47 +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
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021 
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
 2021-09-28 12:56:43 +02:00
Laurent Destailleur
e6e224f33c Better translation 2021-09-28 11:53:00 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
5c8b893877 Doc 2021-09-27 12:50:51 +02:00
Laurent Destailleur
72be24a835 Doc 2021-09-27 12:37:10 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
6d92591358 Fix look and feel v15 2021-09-27 11:28:34 +02:00
Gauthier PC portable 024
fde0f1ac25 NEW : HRM integration, source code 2021-09-27 11:20:38 +02:00
Laurent Destailleur
4a85304572 Fix security 2021-09-26 21:01:34 +02:00
Laurent Destailleur
1436f0de7d Fix newToken 2021-09-26 20:26:20 +02:00
Laurent Destailleur
5497d7d730 Fix look and feel v15 2021-09-26 20:23:15 +02:00
Philippe Grand
a29ed0229b
Update barcode.php 2021-09-25 19:00:47 +02:00
Philippe GRAND
661f13adb3 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\admin\barcode.php on line 376 2021-09-25 18:58:06 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5631e8cc15 css 2021-09-19 15:01:57 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +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
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
6c37836b3e Show value of MAIN_SECURITY_CSRF_WITH_TOKEN in setup page 2021-09-18 18:28:02 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Laurent Destailleur
fd3418d91d NEW Can edit the translation key of an overwrote translation key. 2021-09-16 15:13:15 +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
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00