Commit Graph

1522 Commits

Author SHA1 Message Date
Laurent Destailleur
a483af70df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/contrat/index.php
2022-05-17 23:27:11 +02:00
Laurent Destailleur
c475789433 Debug v16 2022-05-17 23:23:50 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Florian HENRY
61f7c4395b fix: module builder template bad error message affactation 2022-05-17 11:55:57 +02:00
Laurent Destailleur
4cc1f67632 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/line.php
2022-05-16 16:03:07 +02:00
Laurent Destailleur
775a8c5334 Look and feel v16 2022-05-12 20:18:58 +02:00
Laurent Destailleur
7a361a3bde More info to help debug 2022-05-12 14:28:17 +02:00
Laurent Destailleur
7f1e8384dc Clean code 2022-05-12 02:02:04 +02:00
Laurent Destailleur
fc718e68ee css 2022-05-10 11:38:56 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
fea8b263f9 NEW Add a tab with list of application on the jobposition file. 2022-05-05 21:56:59 +02:00
Laurent Destailleur
62dd7244a3 css 2022-05-05 18:29:36 +02:00
Laurent Destailleur
2c8830a798
Merge pull request #20655 from bb2a/Move-checkbox-column-as-first-column-on-modulebuilder
Move checkbox column as first column on modulebuilder
2022-05-04 20:40:29 +02:00
Anthony Berton
ff696acab8
Update myobject_list.php 2022-05-04 08:43:14 +02:00
Laurent Destailleur
d7398f573c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-01 20:49:43 +02:00
Laurent Destailleur
6308b700d5 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-05-01 20:47:54 +02:00
Laurent Destailleur
755850d646 Debug v16 2022-05-01 17:44:26 +02:00
Laurent Destailleur
08d78dd33b NEW More feature that can be modifed after module generation 2022-05-01 15:05:25 +02:00
Laurent Destailleur
7b8e08bbf6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-30 17:28:55 +02:00
Laurent Destailleur
819568bfbf Fix generation of specimen pdf for modulebuilder and recruitment module 2022-04-30 17:19:18 +02:00
Laurent Destailleur
17a2aa8f1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
2022-04-29 17:27:12 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
Aloïs Micard
fb7f0545e4 Fix error reporting in getLinesArray() 2022-04-27 17:56:31 +02:00
BB2A Anthony Berton
4688b96d93 Add option MAIN_CHECKBOX_LEFT_COLUMN 2022-04-15 15:19:14 +02:00
BB2A Anthony Berton
6b264733e4 Move-checkbox-column-as-first-column-on-modulebuilder 2022-04-15 11:21:02 +02:00
Laurent Destailleur
b8c8d2af93 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:56:42 +02:00
Florian HENRY
291002fe11 fix: bad poermission int modulebuilder template 2022-04-07 10:31:54 +02:00
Laurent Destailleur
af45691c9d Clean import profiles 2022-04-04 13:35:08 +02:00
Laurent Destailleur
2690f4459f NEW Enhance the import. Can use 'auto' for the ref (import of orders) 2022-04-04 13:17:45 +02:00
Laurent Destailleur
d514d72ac5 Doxygen 2022-04-03 12:35:30 +02:00
Laurent Destailleur
867883e9b1 Clean code for kanban view 2022-03-31 18:06:39 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Laurent Destailleur
7212d6bb03 Fix phpunit 2022-03-28 14:52:46 +02:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +01:00
Laurent Destailleur
6a7309305b Fix out of memory with a lot of contracts 2022-03-19 14:41:10 +01:00
Laurent Destailleur
4c293aa49b Update doc 2022-03-19 13:06:30 +01:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
Laurent Destailleur
dc9d8336f5 Fix typo 2022-03-11 17:07:23 +01:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2022-03-11 17:04:23 +01:00
Laurent Destailleur
11d18fae4a Clean code 2022-03-11 13:36:58 +01:00
Laurent Destailleur
f2d5221784 Debug ModuleBuilder 2022-03-11 11:26:54 +01:00
Laurent Destailleur
6100bc86f8 FIX css not saved in modulebuilder 2022-03-11 10:32:06 +01:00
Laurent Destailleur
5516eae056 FIX type smallint in module builder and case in values of a property 2022-03-10 21:31:09 +01:00
Laurent Destailleur
6bb49797f8
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo
Fix: typo in template name
2022-03-07 14:55:02 +01:00
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
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
John Livingston
1ece554c92
Fix: typo in template name
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
88f1ae9c13 NEW A module can embed a sql script run at each Dolibarr upgrade 2022-02-23 12:55:15 +01:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +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
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
1ede8a30b2 Missing NOSESSION 2022-02-16 17:49:05 +01:00
Laurent Destailleur
69266ae61f Fix text 2022-02-16 14:14:30 +01:00
Frédéric FRANCE
c8640f329e
add missing global 2022-02-15 18:31:05 +01:00
Laurent Destailleur
ce1a08baf6 Fix phpcs 2022-02-09 16:59:40 +01:00
Laurent Destailleur
47800aebfa Fix phpunit and mode save after opening a ref 2022-02-09 15:21:25 +01:00
Laurent Destailleur
3653e8244b NEW Implement the generic method for Kaban views 2022-02-09 13:22:23 +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
2991f992dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-06 13:28:30 +01:00
Laurent Destailleur
cd491280cf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-06 13:06:27 +01:00
Laurent Destailleur
bd3218b460 Fix remove dead code 2022-02-06 13:06:12 +01:00
ATM john
ba46d04d6e Fix logic for form setup 2022-02-04 21:51:33 +01:00
Laurent Destailleur
3e1cfc2997 NEW Add status "Obsolete" to KM articles 2022-01-26 11:29:27 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
ba6033da8e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
2022-01-04 09:38:11 +01:00
Laurent Destailleur
ce05130384 Typo 2022-01-03 04:01:02 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
2021-12-30 17:51:25 +01:00
Laurent Destailleur
7bdfc998bf Fix regression 2021-12-30 17:49:53 +01:00
Maxime Kohlhaas
d82c1f34e0 Fix modulebuilder params for updatemask action 2021-12-25 11:33:26 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +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
2fc51b9758 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 17:21:04 +01:00
Laurent Destailleur
30107837a5
Merge pull request #19588 from Hystepik/develop#2
Fix php 8.0 warnings of modulebuilder
2021-12-09 17:19:42 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
lmarcouiller
8b2002fbfb Fix php 8.0 warnings of modulebuilder 2021-12-09 15:17:18 +01:00
Laurent Destailleur
9462481e83 Doc 2021-12-09 14:51:35 +01:00
Philippe Grand
6d89e4b199
Update mymodulewidget1.php 2021-12-04 15:23:21 +01:00
stickler-ci
9465fc17e6 Fixing style errors. 2021-12-04 14:20:38 +00:00
Philippe GRAND
30505cc564 update code : use loadlangs function 2021-12-04 15:19:45 +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
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
ATM john
a75ae6a8cf Fix missing formsetup elements 2021-11-28 12:11:03 +01:00
Laurent Destailleur
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Laurent Destailleur
5af241371a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-11-15 12:32:09 +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
dbdf34c7da
Update setup.php 2021-11-15 12:09:58 +01:00
Laurent Destailleur
f7d9975b66
Update setup.php 2021-11-15 12:00:37 +01:00
Laurent Destailleur
74e30f292c
Update setup.php 2021-11-15 11:58:48 +01:00
Laurent Destailleur
83cb6b6753
Update setup.php 2021-11-15 11:54:08 +01:00
Laurent Destailleur
9a7c14199d Doc 2021-11-13 14:06:59 +01:00
Laurent Destailleur
e113fe468f Clean code 2021-11-12 14:57:36 +01:00
Philippe GRAND
85a3bbba3d Translations 2021-11-08 13:51:03 +01:00
Philippe GRAND
d06d6c51cd MD041 - First line in a file should be a top-level heading 2021-11-08 13:44:46 +01:00
Laurent Destailleur
2234522519 Debug module parnership. Add the type of partnership. 2021-11-07 13:51:31 +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
Laurent Destailleur
bea85db413 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 17:20:09 +01:00
John BOTELLA
cdf1538ffa fix save using template 2021-10-30 16:36:51 +02:00
John BOTELLA
5179f2c90b Add demo data 2021-10-30 13:03:23 +02:00
John BOTELLA
3a86221290 add more customisation 2021-10-30 12:54:13 +02:00
Florian HENRY
89ba133c61 fix: categorie display if none 2021-10-26 14:11:51 +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
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Florian HENRY
6c71cc1e14 better correction from modulebuilder source of #19081 2021-10-22 11:03:35 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
e1f5a39f48 Fix phpcs 2021-10-06 19:40:18 +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
Laurent Destailleur
b630b15991 Add missing line to remove a tab in modulebuilder 2021-10-06 13:33:13 +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
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +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
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +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
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
0168a9860b Fix tooltip on website syntax disappear
Fix backard compatibility of getLabelStatus
2021-09-18 12:09:08 +02:00
Laurent Destailleur
bf173fdbf1 Debug module event organization 2021-09-16 21:19:16 +02:00
Laurent Destailleur
0c0ef7b683 Debug module event organization 2021-09-16 20:56:14 +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
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +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
248e68aada Code comment 2021-09-03 13:39:08 +02:00
Laurent Destailleur
92defbc449 Fix warning 2021-08-29 19:39:37 +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
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
3ce5674b76 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-28 18:01:06 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +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
lmarcouiller
ce7a301896 Fix #18519 : Modulebuilder api permission 2021-08-27 11:48:56 +02: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
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
366fa13fc0 NEW Add property "copytoclipboard" in modulebuilder 2021-08-24 13:19:53 +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
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +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
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
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object 2021-08-17 19:35:36 +02:00
Laurent Destailleur
1a8ad5abfa Propagate $outputlangs to getExtrafieldContent method. 2021-08-17 15:50:28 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
eba87ab295 FIX filter on status Draft in modulebuilder 2021-08-17 02:09:38 +02:00
Laurent Destailleur
23083427e8 NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:36:30 +02:00
Laurent Destailleur
06a0d922cc NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:01:58 +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
4c505619e3 FIX look and field v14 2021-07-23 00:02:14 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop
NEW add hookmanager on note pages
2021-07-11 20:25:16 +02:00
ATM john
a9a7315ce1 WIP - create validation method for common object 2021-07-11 13:30:30 +02:00
stickler-ci
21e213507f Fixing style errors. 2021-07-11 07:49:56 +00:00
fr69400
35c0008fa0
Update myobject_note.php 2021-07-11 09:49:42 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object 2021-07-02 12:04:14 +02:00
Laurent Destailleur
7aeb652c66 Better sanitizing, fix phpcs 2021-06-29 18:22:36 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Francis Appels
09382e0505 FIX #17919 pictures in docs.
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
2021-06-24 10:12:34 +02:00
Laurent Destailleur
594f7c8e9e Fix code for v14 2021-06-24 09:54:30 +02:00
Laurent Destailleur
acce226c05 Debug cash fence feature (missing report per vat rate) 2021-06-23 13:00:50 +02:00
Laurent Destailleur
28d416a00d Try fix of phpunit 2021-06-23 00:58:27 +02:00
Laurent Destailleur
ecd028d124 Clean code 2021-06-22 17:33:43 +02:00
ATM john
4d043b713c WIP - create validation method for common object 2021-06-21 21:54:03 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
Philippe GRAND
5bde0dbc16 internationalization 2021-06-20 12:00:27 +02:00
Philippe GRAND
fa3e75c68a internationalization 2021-06-20 10:58:20 +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
ce818d4f44 Debug doc templates of ODF 2021-06-20 03:41:45 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
ATM john
578dc9adde WIP - create validation method for common object 2021-06-12 12:58:20 +02:00
Laurent Destailleur
e938d875fb FIX #17855 2021-06-10 18:34:43 +02:00
Laurent Destailleur
7b31ef0ff3 Fix warnings 2021-06-10 00:00:49 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
92b6425ce0 Debug v14 2021-06-05 18:20:07 +02:00
Laurent Destailleur
70af18148b Debug modulebuilder v14 2021-06-05 17:49:01 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
f3803bab91 Responsive 2021-05-18 16:28:30 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Laurent Destailleur
35c27b8eb8
Merge pull request #17588 from frederic34/completeTabHead
add sample completeTabHead for template modulebuilder
2021-05-17 10:29:51 +02:00
Laurent Destailleur
8dc6241aee Clean dead code 2021-05-17 08:58:02 +02:00
Frédéric FRANCE
23fe7d1b63
add sample completeTabHead 2021-05-12 18:29:56 +02:00
Laurent Destailleur
36d50c940a Clean code 2021-05-06 21:21:11 +02:00
Laurent Destailleur
f655cab5eb Clean code 2021-05-06 21:11:39 +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
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop
FIX formAddObjectLine cant be overloaded by hook
2021-05-03 13:16:45 +02:00
Laurent Destailleur
76a669a13f Only en_US must exists into template 2021-05-03 13:12:09 +02:00
Laurent Destailleur
2400da497c Exclude binary zip files 2021-05-02 16:42:22 +02:00
stickler-ci
8fda2ba2b4 Fixing style errors. 2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +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
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
Laurent Destailleur
6f1f26096e Debug partnership module 2021-04-28 23:25:26 +02:00
Laurent Destailleur
4926ac1e24 Fix make protected method not visible 2021-04-28 15:25:06 +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
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
ac68599fab Fix #yogosha5877 2021-04-24 21:02:48 +02:00
stickler-ci
7f9f67e7ef Fixing style errors. 2021-04-23 15:12:34 +00:00
Florian HENRY
95c7657ace add gitingore for modulebuilders 2021-04-20 20:21:24 +02:00
Dorian Vabre
208478906c add type product in modulebuilder 2021-04-15 16:10:01 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
97292d6843 Fix phpcs 2021-04-13 20:28:25 +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
Laurent Destailleur
946a93dcd9
Update myobject_agenda.php 2021-04-13 15:55:50 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
UT from dolibit
488e80e959
Update myobject_agenda.php 2021-04-12 19:28:32 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
bbb75bd3c3
Merge pull request #17195 from FHenry/fix_dev_right_def_id
fix: right definition id in modulebuilder
2021-04-09 11:55:11 +02:00
Laurent Destailleur
5eb9acf3e1
Update modMyModule.class.php 2021-04-09 11:50:34 +02:00
Dorian Vabre
056143450b NEW: add config type securekey module builder 2021-04-09 10:58:33 +02:00
Florian HENRY
5555807104 fix: right definition id in modulebuilder 2021-04-09 08:51:09 +02:00
Laurent Destailleur
4ef425da69
Merge pull request #17175 from dolibit-ut/patch-248
Create index.html
2021-04-08 13:29:59 +02:00
Laurent Destailleur
5ffcc9f5f4
Merge pull request #17174 from dolibit-ut/patch-247
Create index.html
2021-04-08 13:18:34 +02:00
Laurent Destailleur
30355d05c9
Merge pull request #17176 from dolibit-ut/patch-249
Create index.html
2021-04-08 13:18:26 +02:00
Laurent Destailleur
d395c21152
Merge pull request #17177 from dolibit-ut/patch-250
Create index.html
2021-04-08 13:18:14 +02:00
UT from dolibit
2f349146ed
Create index.html 2021-04-07 19:44:39 +02:00
UT from dolibit
6d8bbaeeae
Create index.html 2021-04-07 19:42:47 +02:00
UT from dolibit
c9c7a55748
Create index.html 2021-04-07 19:42:11 +02:00
UT from dolibit
c910fb7594
Create index.html 2021-04-07 19:40:46 +02:00
UT from dolibit
6fce28e7d0
Create index.html 2021-04-07 19:39:29 +02:00
Laurent Destailleur
a16f70ca09 Enhance sample code 2021-04-06 14:59:03 +02:00
UT from dolibit
fa1e46cc6a
Create index.html 2021-04-03 16:48:03 +02:00
Laurent Destailleur
5b22eae3a3
Merge pull request #17071 from FHenry/fix_13_right_definition_ID_in_modulebuilder
fix: Right ID defenition in module builder
2021-04-02 01:34:16 +02:00
Laurent Destailleur
17b5228bd3
Update modMyModule.class.php 2021-04-02 01:34:04 +02:00
Laurent Destailleur
5fa6aa0ac1
Update modMyModule.class.php 2021-04-02 01:32:46 +02:00
Florian HENRY
b1562cffb1 better doc comment 2021-04-01 17:20:14 +02:00
Florian HENRY
03ee7ec433 fix: Right ID defenition in module builder 2021-04-01 17:08:26 +02:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +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
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Florian HENRY
5fe6aa429d Merge branch 'dev_EventOrganisation_draft' into dev_EventOrganisation 2021-03-29 12:08:02 +02:00
Laurent Destailleur
95a7e13e3a Debug establishment 2021-03-27 14:54:09 +01:00
Florian HENRY
47675d28d7 add filter for select list attendees 2021-03-26 19:47:48 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
3c8bf2167b Debug permissions 2021-03-21 18:01:43 +01:00
Laurent Destailleur
1540f62df0 FIX #yogosha5678 2021-03-19 14:25:59 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Frédéric FRANCE
3de108aea2
doxygen 2021-03-16 19:07:07 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +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
Laurent Destailleur
1d2929e3f5 Clean code 2021-03-15 00:01:55 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
82d5c7289d Add property widgettype 2021-03-10 17:02:39 +01:00
Laurent Destailleur
fbe5ec8bb2 Complete test on setup 2021-03-10 13:12:28 +01:00
Florian HENRY
ccf71cd980 fix modulebuilder boxes showboxes 2021-03-10 11:56:44 +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
Florian HENRY
5221b59539 set correct field name as conference or booth are in actioncomm table 2021-02-27 15:34:28 +01:00
stickler-ci
6aaf1c2962 Fixing style errors. 2021-02-26 17:28:25 +00:00
Frédéric FRANCE
f73c0abec1
code syntax m... directories 2021-02-26 18:26:44 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
b6211a7990 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:12:00 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
Laurent Destailleur
36e0deba3f Look and feel v14 2021-02-17 17:56:08 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
stickler-ci
d636aa6cfa Fixing style errors. 2021-02-14 15:48:44 +00:00
Florian HENRY
5c8e7b224f add feature to setup pages 2021-02-14 16:44:42 +01:00
Florian HENRY
85a450cdd2 setup page feature 2021-02-14 15:02:05 +01:00
Laurent Destailleur
ec394a93f6
Merge pull request #16191 from grandoc/develop
fix typo
2021-02-07 19:59:54 +01:00
Frédéric FRANCE
eaaefe1382
5.5 to 5.6 2021-02-06 14:12:22 +01:00
Philippe GRAND
b77398b476 fix typo 2021-02-06 13:12:39 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/categories/viewcat.php
2021-02-06 01:17:05 +01:00
werewolf7160
83f24e6fd2 call to createCommon() return int and not bool
with generated Object, the post request call to createCommon() in it and taht function return a int (id or -1 if error).
but the test on the returned value is a '!', that don't return false on "-1".
a post request with an sql error for example(foreign key error for my test), will always return 200 instead of 500 with the error
2021-02-06 00:21:53 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
2021-01-24 15:29:53 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
2021-01-22 13:40:00 +01:00
Laurent Destailleur
039cb0685b Fix default filter 2021-01-21 14:43:57 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
David Bensel
85d63891d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-01-18 17:33:22 +03:00
David Bensel
b777a0660c FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 17:31:49 +03:00