2
0
forked from Wavyzz/dolibarr
Commit Graph

449 Commits

Author SHA1 Message Date
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Quentin VIAL-GOUTEYRON
5d50a0e9d1 move row object 2022-05-11 15:19:50 +02:00
Quentin VIAL-GOUTEYRON
270ce3d169 FIX missing hook for row ordering 2022-05-11 15:07:39 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/index.php
2022-04-14 16:10:23 +02:00
Ferran Marcet
9547b9e7fe Fix: Online signature of proposals does not work well with multicompany 2022-04-11 18:01:25 +02:00
Frédéric FRANCE
284649fd4b Update objectonoff.php 2022-04-08 13:35:21 +02:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
2022-03-10 15:59:09 +01:00
Laurent Destailleur
fb2fb46d17 FIX Drag and drop line of files on join files tab 2022-03-07 16:04:55 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Laurent Destailleur
7c9b97d035 css 2022-01-28 16:29:27 +01:00
Laurent Destailleur
812f12ccc4 Fix tz message 2022-01-17 19:09:18 +01:00
Laurent Destailleur
a072c8911a Fix tz of message on popup 2022-01-17 19:07:02 +01:00
Laurent Destailleur
f0660b3c99 Fix db transaction 2022-01-04 13:27:26 +01:00
Laurent Destailleur
b19a148f4c Fix ip used to sing not saved 2022-01-04 13:25:02 +01:00
Laurent Destailleur
1d80b8394a Debug v15 2022-01-04 12:56:08 +01:00
Laurent Destailleur
7edba34107 Debug and secure the signature feature 2021-12-25 17:08:40 +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
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
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +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
Alexandre SPANGARO
9d2fb782fa FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12 2021-11-25 15:41:28 +01:00
Regis Houssin
8df90a1f54 FIX missing service access right 2021-10-29 08:28:41 +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
f5562177e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-25 13:06:33 +02:00
Maxime Kohlhaas
6abd4cc120 Fix #8716 : tasks were not shown in ecm auto tree 2021-10-24 11:38:45 +02:00
lmarcouiller
0c2cf9980d NEW: online propal signature 2021-10-18 14:28:30 +02:00
lmarcouiller
9eb8dadfd9 WIP : signature of propal 2021-10-15 16:58:59 +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
Alexandre SPANGARO
3f26ab195b HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
stickler-ci
c5ad75c7c1 Fixing style errors. 2021-09-30 12:27:01 +00:00
Laurent Destailleur
3565a47954 Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
9a3d6679f0 Merge pull request #18778 from Hystepik/develop#1
Fix : KM articles in public/ticket/create_ticket.php
2021-09-24 13:35:17 +02:00
lmarcouiller
68c9f4064b Fix sql in fetchKnowledgeRecord 2021-09-24 10:43:52 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/class/task.class.php
2021-09-24 02:33:48 +02:00
Laurent Destailleur
b09c4166b3 Fix set position of lines in tasks of a project 2021-09-24 02:24:04 +02:00
lmarcouiller
ef70cd680c fix to match sql syntax 2021-09-23 15:00:55 +02:00
lmarcouiller
a7ff9d4889 Fix : KM articles in public/ticket/create_ticket.php 2021-09-21 11:26:49 +02:00
Laurent Destailleur
0ae8403fb4 Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-17 12:10:03 +02:00
lmarcouiller
04a024570c update fetchKnowledge and html.formticket 2021-09-16 13:19:43 +02:00
lmarcouiller
b26e9be36f Close #18677 : new show articles of KM 2021-09-15 15:36:57 +02:00
lainwir3d
2fe85f2a86 CLOSE #18689 REST API module: add api key generate / modify right. 2021-09-12 15:47:56 +04:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
fr69400
ad0c4c518f Update row.php
right write doesn't exist for supplier_proposal

->line order dont works
2021-09-09 14:42:43 +02:00
Laurent Destailleur
3581c37b83 Merge pull request #18626 from fr69400/develop
FIX : line reorder dont work on supplier_proposal
2021-09-09 14:41:30 +02:00
Regis Houssin
7d8023fea7 FIX wrong table_element_line 2021-09-06 16:21:30 +02:00