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

10717 Commits

Author SHA1 Message Date
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Khang
9cada04261 Add unit price for "free-text product" receipt 2022-03-05 16:58:37 +07:00
Khang
d326fe02cf Feature: unit price for {DOL_PRINT_OBJECT_LINES} 
Module "Receipt printers":
add unit price for {DOL_PRINT_OBJECT_LINES} in tabs "template setup"
 2022-03-05 07:02:36 +07:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations. 
Fix reponsive
 2022-03-03 09:41:15 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
kevin
ad5a18996d Replace id by class 2022-03-02 21:00:07 +01:00
Laurent Destailleur
a7cb3fa492 Clean log 2022-03-02 14:44:14 +01:00
Laurent Destailleur
66b0f253b6 Clean code 2022-03-02 12:41:21 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Marc de Lima Lucio
e3aae6d2e1 FIX: object cloning: set unique extrafield values to null to prevent duplicates 2022-03-01 10:50:22 +01:00
Laurent Destailleur
8c94c2f98c Fix collapse icon 2022-03-01 04:10:50 +01:00
Laurent Destailleur
e4e08c9903 Code simpler to manage collapse of separators. 2022-03-01 04:02:06 +01:00
Laurent Destailleur
54bef2e34f Fix phpcs 2022-03-01 01:57:38 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
a89fd3c818
Merge pull request #20198 from gdsoftdev/develop 
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
 2022-02-28 21:56:01 +01:00
Laurent Destailleur
8e1fd877f2
Update html.formaccounting.class.php 2022-02-28 21:55:30 +01:00
Laurent Destailleur
50602b1fbe
Update html.formaccounting.class.php 2022-02-28 21:53:05 +01:00
Laurent Destailleur
6447c1e394
Merge pull request #20076 from vincentjdc/html-field-moreparam-morecss 
Allow to add more CSS and more params on html fields
 2022-02-28 21:50:40 +01:00
Laurent Destailleur
835b0f5f19
Update doleditor.class.php 2022-02-28 21:45:04 +01:00
Laurent Destailleur
6a81ae1099
Merge pull request #20220 from hregis/fix_remove_duplicate_code 
FIX remove duplicated code
 2022-02-28 20:58:24 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Regis Houssin
e63e53e081 FIX remove duplicated code 2022-02-28 14:10:35 +01:00
Laurent Destailleur
b598671484 NEW ACE Editor is restored at same cursor position after a save 2022-02-27 14:46:40 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
Laurent Destailleur
eba20957f3 Fix CSS 
Conflicts:
	htdocs/projet/list.php
 2022-02-25 21:47:25 +01:00
Laurent Destailleur
acf6d19500 Fix CSS 2022-02-25 21:45:29 +01:00
Laurent Destailleur
488049c6a6 FIX bad position of extrafields for interventions 2022-02-25 20:36:40 +01:00
stickler-ci
722b1de2b7 Fixing style errors. 2022-02-25 15:10:10 +00:00
Jé GDSOFT
073431543d accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 16:07:44 +01:00
Jé GDSOFT
1040555baf accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 11:26:56 +01:00
kevin
aabfdfa212 Format code 2022-02-25 09:20:36 +01:00
kevin
d2cbead203 Add an ID into formproject method to be able to target 2022-02-25 09:17:18 +01:00
Laurent Destailleur
ba3856f9e9 Fix regression 2022-02-24 14:21:28 +01:00
Laurent Destailleur
a6e7a41e98 FIX Reduce flash effect on collapse extrafield 
FIX Reduce flash effect on edit inline feature.
 2022-02-24 12:54:33 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
atm-lena
e5ba5b208e Correct Stickler 2022-02-22 11:36:41 +01:00
atm-lena
45fe83289f MoChild category 2022-02-22 11:32:33 +01:00
Laurent Destailleur
aa8932a3a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-22 10:59:02 +01:00
Laurent Destailleur
6b29b2d9dc Add preg_quote 2022-02-22 10:51:51 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
Laurent Destailleur
97ed94fbda NEW Support html content for multiselect component. 2022-02-21 16:54:07 +01:00
BB2A Anthony Berton
d28ba84cb3 Mail sendto default and add filter 2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee sens dump 2022-02-21 15:56:09 +01:00
Laurent Destailleur
9e6f782907 Clean code 2022-02-21 11:26:10 +01:00
atm-lena
e5039a67b0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-02-21 10:22:22 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
61e91656e0 FIX setup of member module 
FIX generation of business cards
 2022-02-18 14:14:34 +01:00
stickler-ci
b5afa27774 Fixing style errors. 2022-02-18 10:09:38 +00:00
atm-greg
12c825ba84 fix rounding for price and display currency 2022-02-18 10:50:00 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Laurent Destailleur
131ae92cc6 FIX #20063 2022-02-16 21:05:23 +01:00
Laurent Destailleur
60ada5fe72 Can filter on status purchase on list of products 2022-02-16 14:06:16 +01:00
Vincent Dieltiens
392f468a13 allow to add more CSS and more params on html fields 2022-02-16 10:01:55 +01:00
Laurent Destailleur
453871bf38 css 2022-02-15 23:01:14 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Laurent Destailleur
50853205bb Support placeholder on multiselect components 2022-02-15 16:43:47 +01:00
atm-lena
498d56319d Clean Code 2022-02-15 16:08:18 +01:00
atm-lena
0f4b1e1d7a WIP 2022-02-15 11:46:30 +01:00
Laurent Destailleur
1b53ed09f9 Work on custom report feature 2022-02-15 11:03:48 +01:00
Laurent Destailleur
f2d5e43381 Fix showempty for select_salesrepresentatives 2022-02-14 12:25:48 +01:00
Alexandre SPANGARO
6734a3575e Core 2022-02-14 04:52:39 +01:00
Laurent Destailleur
8000adb694 Fix test 2022-02-11 18:50:12 +01:00
Laurent Destailleur
eff2fc1e9e Complete option MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT 2022-02-11 18:19:50 +01:00
Laurent Destailleur
e0377d788c Send position x,y of cursor into an ACE editors on POST form 2022-02-10 14:34:04 +01:00
Laurent Destailleur
11bef4e681
Merge branch 'develop' into 14_fix_sql_extrafields 2022-02-10 10:13:24 +01:00
Laurent Destailleur
e210952f74
Update extrafields.class.php 2022-02-10 10:11:46 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR 
NEW Recurring vendor invoices
 2022-02-10 10:09:47 +01:00
Regis Houssin
cc8af7b1d0
FIX not active value are not hidden (missing filter of field) (#20032) 
* FIX not active value are not hidden (missing filter of field)

* FIX wrong category table and wrong object id
 2022-02-10 09:19:14 +01:00
Laurent Destailleur
3653e8244b NEW Implement the generic method for Kaban views 2022-02-09 13:22:23 +01:00
Florian HENRY
3f2c04a53c fix sql error return 2022-02-08 08:46:15 +01:00
Florian HENRY
e672b6f6e0 fix: in some case index do not exists and return an error 2022-02-07 16:41:45 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
02ec11ff64 css 2022-02-07 15:07:03 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Laurent Destailleur
19fdf3dc18 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9 Fix section of attached files for salaries 2022-02-07 09:50:07 +01:00
Laurent Destailleur
856b83a202 CSS 2022-02-07 09:26:03 +01:00
Laurent Destailleur
3fa3cd28cd clean code 2022-02-06 15:21:49 +01:00
Laurent Destailleur
2991f992dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-06 13:28:30 +01:00
Laurent Destailleur
9c0fc59166 Fix #yogosha8791 2022-02-05 19:42:43 +01:00
ATM john
ba46d04d6e Fix logic for form setup 2022-02-04 21:51:33 +01:00
Laurent Destailleur
7ade138590 Fix phpcs 2022-02-04 20:30:45 +01:00
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +01:00
Laurent Destailleur
4324558d67 FIX backup fails 2022-02-04 12:34:42 +01:00
Laurent Destailleur
5294a9ae2f
Merge pull request #19949 from hregis/fix_works_to_add_prefix_db_function 
Works on replace MAIN_DB_PREFIX by $db->prefix()
 2022-02-04 11:09:51 +01:00
Laurent Destailleur
3a9564ed88
Merge pull request #19976 from bb2a/patch-1 
FIX - Trigger in setPaymentMethods for order
 2022-02-04 09:23:11 +01:00
Laurent Destailleur
3db0a98594 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 18:26:15 +01:00
Laurent Destailleur
ef62cd0b18 css 2022-02-02 18:24:30 +01:00
Laurent Destailleur
ba77700619 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea Fix css 2022-02-02 17:57:20 +01:00
Anthony Berton
da91c5f5ef
Update commonobject.class.php 2022-02-02 12:38:22 +01:00
Laurent Destailleur
35ac8923dd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 16:14:12 +01:00
Laurent Destailleur
1ca1f111b3 Fix warnings 2022-02-01 16:12:51 +01:00
Laurent Destailleur
91be7b279e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 17:28:23 +01:00
Laurent Destailleur
723b9d101a FIX #yogosha8604 2022-01-30 17:24:10 +01:00
Regis Houssin
b2384b624a FIX regression 2022-01-30 11:40:12 +01:00
Regis Houssin
5f376685c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function 2022-01-30 11:28:29 +01:00
Laurent Destailleur
7f13561158 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 02:06:08 +01:00
Laurent Destailleur
9e86e5ce93 Fix creation of page 2022-01-30 01:46:14 +01:00
Laurent Destailleur
d72538506f
Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop 
NEW : Sub-bom
 2022-01-28 19:01:30 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop 
NEW #17123 added ExtraFields for Stock Mouvement
 2022-01-28 18:04:22 +01:00
Salvatore Chiariello
e70604c485 NEW|New #17123 added ExtraFields for Stock Mouvement 2022-01-28 14:57:36 +01:00
Regis Houssin
8196134345 FIX not use $this in static function 2022-01-27 14:17:14 +01:00
Regis Houssin
b07fff5754 FIX Travis avoid error "you should use $this->db-> inside a class file" 2022-01-27 13:06:43 +01:00
Regis Houssin
a1dc6e7e9b FIX travis error - use double quote instead simple quote 2022-01-27 12:52:13 +01:00
Regis Houssin
b6f9500d46 FIX uniformize code and remove unused global 2022-01-27 12:00:55 +01:00
Regis Houssin
153cd38c78 FIX uniformize and fix code 2022-01-27 10:57:20 +01:00
Regis Houssin
d78bcaa419 FIX avoid stickler Line exceeds 500 characters 2022-01-27 10:26:39 +01:00
Regis Houssin
399fffa81e FIX convert core class 2022-01-27 10:19:35 +01:00
Laurent Destailleur
932096f332 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-26 19:56:50 +01:00
Laurent Destailleur
538c5f14d3 Fix phpcs 2022-01-26 19:56:02 +01:00
Adrien Raze
e52fb89182 FIX : Fixing stickler returns 2022-01-26 16:36:58 +01:00
Adrien Raze
d38ff3ad9b FIX : Fixing stickler returns 2022-01-26 15:53:30 +01:00
Laurent Destailleur
0d66646052 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-26 14:08:20 +01:00
Laurent Destailleur
7ce6f13933 Fix php8 2022-01-26 14:07:13 +01:00
Laurent Destailleur
7b990a1a7f Fix phpcs 2022-01-26 11:30:19 +01:00
Anthony Berton
4f54149555
Update commonobject.class.php 2022-01-25 22:28:47 +01:00
Laurent Destailleur
243999d223
Merge pull request #19746 from atm-quentin/NEW_contact_pj_filter_list 
NEW : Contact filter project list
 2022-01-25 16:06:31 +01:00
Laurent Destailleur
34d3fdad02
Merge pull request #19699 from atm-john/new_convert_setup_to_new_setup 
NEW : convert situation setup to new setup system
 2022-01-25 15:17:14 +01:00
Adrien Raze
a5903abb5b FIX : Change display of the bom's select 2022-01-25 11:28:36 +01:00
Adrien Raze
4edbd5c4e3 NEW : Creation of the function select_bom() used to display bom select list 2022-01-25 10:31:45 +01:00
Laurent Destailleur
0e5907e220 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:35 +01:00
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
307338e3f4
Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test 
FIX :  lang load in validate class and fix test for numeric values
 2022-01-23 18:24:11 +01:00
Laurent Destailleur
ba404493a2
Merge pull request #19865 from hregis/fix_avoid_warning 
FIX avoid warning
 2022-01-23 12:33:52 +01:00
Laurent Destailleur
9dd3d970bf
Update commonobject.class.php 2022-01-23 12:31:30 +01:00
Laurent Destailleur
9424cebf0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-23 12:07:19 +01:00
Laurent Destailleur
9049134556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-23 12:07:11 +01:00
Laurent Destailleur
4981f418e8
Merge pull request #19899 from atm-jpb/fix_15.0_modelMailWidth 
FIX : 15.0 add minwidth to selectArray mail model
 2022-01-23 11:58:09 +01:00
Laurent Destailleur
66d7271c94
Merge pull request #19904 from hregis/fix_use_new_function_prefix 
NEW add modifications for new function "$db->prefix()"
 2022-01-23 11:57:42 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
6baa0939ce NEW Can add a tooltip after the combo list of doc templates 2022-01-22 14:03:39 +01:00
Regis Houssin
a3a856d0be NEW add modifications for new function "$db->prefix()" 2022-01-21 16:57:57 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
stickler-ci
3e84a99965 Fixing style errors. 2022-01-21 08:58:06 +00:00
jpb
15c39db35c add minwidth to selectArray 2022-01-21 09:55:14 +01:00
jpb
015cd543d6 add minwidth to selectArray 2022-01-21 09:52:52 +01:00
Laurent Destailleur
9276224422 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-20 21:49:33 +01:00
Laurent Destailleur
050b531403 Fix troubles in select_language when selected is array 2022-01-20 19:01:04 +01:00
Laurent Destailleur
de30b68f9e Code comment 2022-01-20 17:10:30 +01:00
Laurent Destailleur
c2c74f4849 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 02:02:52 +01:00
Laurent Destailleur
c469634101 Fix hook for emailcollector 2022-01-19 02:01:52 +01:00
Laurent Destailleur
09eb051bcc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-18 12:25:20 +01:00
Regis Houssin
08009bcec5 FIX avoid warning 2022-01-18 10:06:11 +01:00
Laurent Destailleur
70e4705149 Clean code 2022-01-17 22:52:56 +01:00
ATM john
a394713f1b Fix doc comment 2022-01-14 11:51:07 +01:00
ATM john
8ace96f495 Fix validate class lang load and test for numeric values 2022-01-14 11:46:31 +01:00
stickler-ci
2b64f69def Fixing style errors. 2022-01-14 09:12:30 +00:00
dolibarr95
5b3fcc5e43
Update extrafields.class.php 2022-01-14 10:10:10 +01:00
dolibarr95
e53d9d4320
Update extrafields.class.php 
fix #19739
 2022-01-14 08:52:04 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray 
add thirdparty customer code to substitutionarray
 2022-01-11 13:31:32 +01:00
Laurent Destailleur
da83d101db
Merge pull request #19778 from atm-john/fix_stuff_on_setup_class 
FIX :  Setup helper class
 2022-01-10 18:32:12 +01:00
Gauthier PC portable 024
04cc0a0480 NEW : Add column "Total HT" to products array on document creation card 2022-01-10 17:02:15 +01:00
Laurent Destailleur
cfec02aaae Debug v15 2022-01-10 14:27:43 +01:00
Laurent Destailleur
c81f46842b Fix too many load of objects 2022-01-10 13:36:28 +01:00
Laurent Destailleur
12044fa67a Debug v15 2022-01-10 03:24:01 +01:00
Laurent Destailleur
4af80507cb Fix #yogosha8282 2022-01-09 20:25:10 +01:00
ATM john
29e5fb0250 Merge branch 'fix_stuff_on_setup_class' into new_convert_setup_to_new_setup 2022-01-09 10:27:34 +01:00
ATM john
bb1ec5940d Fix setup class 2022-01-09 10:24:28 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
451fa396aa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-01-07 15:49:09 +01:00
Laurent Destailleur
265aeb76e6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-01-07 15:43:28 +01:00
Laurent Destailleur
53709cf509 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e FIX avoid infinite loop on dump with popen 2022-01-07 15:35:33 +01:00
Laurent Destailleur
144a56d073 Clean code 2022-01-06 18:12:02 +01:00
Laurent Destailleur
26e8496c46 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
 2022-01-06 16:15:58 +01:00
Laurent Destailleur
aee61cb470
Update ldap.class.php 2022-01-06 16:02:47 +01:00
Laurent Destailleur
718771fcf5
Merge pull request #19743 from andreubisquerra/develop 
Add dol_value_currentdate tag to TakePOS printer template
 2022-01-06 10:41:45 +01:00
Laurent Destailleur
1f36a31fe9 Fix css 2022-01-05 16:21:44 +01:00
Quentin VIAL-GOUTEYRON
446ba2a416 FIX stickler 2022-01-05 15:33:05 +01:00
Quentin VIAL-GOUTEYRON
7a4b0e38cd NEW : Contact filter project list 2022-01-05 14:35:11 +01:00
Laurent Destailleur
2aa3d60997 Debug v15 2022-01-05 14:04:02 +01:00
Laurent Destailleur
3581dda876 Fix trans 2022-01-05 09:43:51 +01:00
andreubisquerra
0c86ca6081
Add dol_value_currentdate tag to TakePOS template 2022-01-04 22:14:02 +01:00
Laurent Destailleur
0189d92139 Some country need qr code for legal issues. Add a hook to allow this. 2022-01-04 20:44:17 +01:00
Laurent Destailleur
0046cbbece Fix phpunit 2022-01-04 15:13:04 +01:00
Laurent Destailleur
1d80b8394a Debug v15 2022-01-04 12:56:08 +01:00
John BOTELLA
70a1975ad2
Merge branch 'develop' into new_convert_setup_to_new_setup 2022-01-03 21:53:45 +01:00
Laurent Destailleur
a49af456ce Debug page customreports.php 2022-01-03 04:47:17 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Vincent de Grandpré
6a52b967f4 Permettre de sortir de la fonction de connexion après authentification. 2022-01-02 16:37:07 -05:00
Laurent Destailleur
0c82577fc5 Look and feel v15 2022-01-02 19:04:12 +01:00
Laurent Destailleur
084a404870 Debug v15 2022-01-02 18:33:57 +01:00
Laurent Destailleur
3d8de7790c Fix restore color if we cancel color selection 2022-01-02 16:34:46 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Laurent Destailleur
3774eae510 Responsive 2022-01-02 15:08:46 +01:00
Laurent Destailleur
b41fdb6ec9 Fix tool for generic to sql filters. Must not be saved into api files. 2022-01-01 21:46:16 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
cd8613e9db
Merge pull request #19704 from atm-john/fix_validate_methode_call 
Fix wrong method call
 2021-12-30 12:46:12 +01:00
John BOTELLA
e20d669e34 Fix : prevent fatal error 2021-12-28 19:08:47 +01:00
John BOTELLA
9af621c6f8 Fix scrutinizerh 2021-12-28 18:43:04 +01:00
John BOTELLA
019b10c9eb Fix wrong method call 2021-12-28 18:27:29 +01:00
John BOTELLA
e9e100410a Fix empty value 2021-12-28 14:51:19 +01:00
John BOTELLA
817a9594ae Convert setup of situation invoice to new setup system + fix size 2021-12-28 14:32:57 +01:00
Laurent Destailleur
3fc0205d0b Fix responsive 2021-12-25 12:44:46 +01:00
Laurent Destailleur
4eb9a7625a Fix notification setup page. 2021-12-23 15:12:35 +01:00
Laurent Destailleur
d3b429bef6
Merge pull request #19663 from frederic34/patch-1 
add url in receipt printer options
 2021-12-21 15:52:25 +01:00
Laurent Destailleur
e2ee74f8e0 Clean code 2021-12-21 15:46:42 +01:00
Laurent Destailleur
bb436e556d Fix warnings 2021-12-21 15:23:56 +01:00
Laurent Destailleur
e3bb837313 Fix doxygen 2021-12-21 14:58:34 +01:00
Laurent Destailleur
55562eb1d8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formadmin.class.php
 2021-12-21 14:36:38 +01:00
Frédéric FRANCE
214feeb1f3
Update dolreceiptprinter.class.php 2021-12-21 10:05:06 +01:00
Frédéric FRANCE
520c296626
add url in receipt printer options 2021-12-20 16:04:32 +01:00
Christian Foellmann
03d4317302 add hook 'menuDropdownQuickaddItems' to manipulate dropdown menu 2021-12-20 10:20:14 +01:00
Laurent Destailleur
13b17fa0da FIX #19564 2021-12-19 20:28:27 +01:00
Laurent Destailleur
626cd24305 Clean code for #19639 2021-12-19 17:05:57 +01:00
Laurent Destailleur
ee3246bf65 Trans 2021-12-19 16:02:28 +01:00
Laurent Destailleur
19afcbbc40 css 2021-12-19 15:59:34 +01:00
Laurent Destailleur
015bc9ebca Fix mode 2021-12-19 03:45:36 +01:00
Laurent Destailleur
771805cd83 More complete error management. 2021-12-19 03:36:25 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
eb3eef9a61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-17 09:54:19 +01:00
Laurent Destailleur
3895438b85 Fix responsive 2021-12-16 23:53:05 +01:00
Laurent Destailleur
fd404c0438 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-16 19:01:28 +01:00
Laurent Destailleur
517355972a Fix duplicate table for online signature 2021-12-16 19:01:11 +01:00
Laurent Destailleur
fdf7749a54
Merge pull request #19508 from atm-john/fix_missing_formsetup_elements 
Fix missing formsetup elements
 2021-12-16 18:42:55 +01:00
Laurent Destailleur
2e68505fd1
Merge pull request #19594 from fr69400/develop 
FIX - unasigned variable $action given to hook printOriginObjectLine
 2021-12-16 17:59:27 +01:00
Laurent Destailleur
9b9cb6842e
Merge pull request #19599 from Je2fb/develop 
Fix #19418
 2021-12-16 17:38:38 +01:00
Laurent Destailleur
726fa41650
Merge pull request #19616 from atm-gauthier/fix_param_used_by_reference 
FIX : marginInfos array should be used by reference to allow to updat…
 2021-12-16 17:31:00 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Laurent Destailleur
f9e4266007 FIX debug inventory feature (missing link to mvt, bad label of mvt) 2021-12-14 19:37:44 +01:00
Gauthier PC portable 024
b971efb062 FIX : marginInfos array should be used by reference to allow to update it with a hook without draw again margin table 2021-12-14 12:25:43 +01:00
stickler-ci
66c486c878 Fixing style errors. 2021-12-14 11:12:54 +00:00
John BOTELLA
1d8cf297de
Update html.formsetup.class.php 2021-12-14 12:10:09 +01:00
fr69400
2419784bdb Update commonobject.class.php 2021-12-13 16:54:42 +01:00
Je2fb
df9b337a57
Fix #19418 2021-12-13 09:44:00 +01:00
Laurent Destailleur
388500794b Fix for ckeditor 2021-12-13 01:19:48 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
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
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