Commit Graph

10541 Commits

Author SHA1 Message Date
Gauthier PC portable 024
75b74a5fd3 FIX : identification new td 2022-04-07 10:43:31 +02:00
Gauthier PC portable 024
9ffe82e259 FIX : originproductline array td identification 2022-04-07 10:32:23 +02:00
Gauthier PC portable 024
dfaf985634 Merge branch '12.0_NEW_column_total_ht_to_array_products_on_document_creation_card' into NEW/Add_column_Total_HT_to_products_array_on_document_creation_card 2022-04-07 09:50:37 +02:00
atm-greg
ff7e1643e3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_optimize_PDF_generation 2022-04-06 09:08:25 +02:00
lvessiller
dd6706e521 NEW display errors in a message box after generating documents 2022-04-05 17:31:34 +02:00
Laurent Destailleur
d143b8bf6e Debug dol_uncompress and add phpunit tests 2022-04-05 17:19:12 +02:00
Laurent Destailleur
f17db2a919 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-05 15:33:29 +02:00
Laurent Destailleur
40ad12c3c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-05 15:29:54 +02:00
Laurent Destailleur
f0d163a4ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-05 15:28:54 +02:00
Laurent Destailleur
8e4c89673a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2022-04-05 15:28:43 +02:00
atm-greg
aa42df9961 just for glory 2022-04-05 15:11:37 +02:00
atm-greg
59fec7d094 implement cache managed by current object 2022-04-05 15:10:31 +02:00
atm-greg
ad145c94ca add comment 2022-04-04 17:23:34 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
atm-greg
2455d8fe52 avoid fetch_objectlinked for each page of the document 2022-04-04 14:31:48 +02:00
atm-florian
563716b633 16.0 - Proposal for trigger prefix consistency: instead of adding missing prefix, check that trigger starts with declared prefix 2022-04-04 10:00:10 +02:00
Laurent Destailleur
d514d72ac5 Doxygen 2022-04-03 12:35:30 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract
NEW: add a workflow to auto link contract on a ticket
2022-04-02 18:15:27 +02:00
Laurent Destailleur
f07e11179d
Merge pull request #20472 from hregis/fix_avoid_hooks_conflict
NEW add hooks contact tab badge and hooks parameter for avoid conflicts
2022-04-02 18:06:01 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
2022-04-02 10:31:58 +02:00
atm-florian
96c432566d NEW 16.0 - proposal for a prefix-based consistency mechanism for trigger names 2022-04-01 19:20:47 +02:00
Laurent Destailleur
0c27578e69
Merge pull request #20233 from marc-dll/13.0_FIX_clone_with_unique_extrafields
FIX: object cloning: set unique extrafield values to null to prevent duplicates
2022-04-01 14:49:25 +02:00
Laurent Destailleur
8349e48559 Reponsive 2022-04-01 11:24:45 +02:00
Laurent Destailleur
df4e5fe84d Fix missing param 2022-03-31 13:28:19 +02:00
Laurent Destailleur
7422fd9b07 css on separators 2022-03-30 18:20:09 +02:00
Laurent Destailleur
f7c5154cac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-30 13:04:50 +02:00
Laurent Destailleur
1304ed5763
Merge branch 'develop' into Notify 2022-03-30 12:41:57 +02:00
Laurent Destailleur
889c35e8df NEW Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 2022-03-30 12:02:20 +02:00
Laurent Destailleur
5108240ed5
Merge pull request #20456 from hregis/fix_mutlicompany_sharings_compatibility
FIX multicompany sharings compatibility
2022-03-29 13:56:43 +02:00
Regis Houssin
97a1774bf3 NEW add hooks contact tab badge and hooks parameter for avoid conflicts 2022-03-26 12:57:30 +01:00
Laurent Destailleur
453c8981e8 CSS 2022-03-26 12:24:28 +01:00
Regis Houssin
ffa79c59f9 FIX wrong alias of table if no parent and parentkey 2022-03-24 20:48:43 +01:00
Regis Houssin
391c02993d FIX better test for all usage 2022-03-24 20:26:47 +01:00
Regis Houssin
c38437f0de FIX wrong error message 2022-03-24 17:12:37 +01:00
Regis Houssin
6fdb140f04 FIX missing table alias 2022-03-24 16:54:02 +01:00
Regis Houssin
e8dae7a8db FIX Multiccompany sharings compatibility 2022-03-24 16:40:51 +01:00
Laurent Destailleur
a22d66b021 css 2022-03-24 13:31:03 +01:00
BB2A Anthony Berton
958b6abdaa pdf_path 2022-03-23 17:31:54 +01:00
Laurent Destailleur
0cfd374314
Merge pull request #20393 from hregis/new_add_hook_in_contact_list
NEW add selectCompaniesForNewContactListWhere hook
2022-03-23 16:07:50 +01:00
Laurent Destailleur
bc9ec3e2b9
Merge pull request #20395 from hregis/fix_uniformize_with_element_name
FIX uniformize with element name "contact"
2022-03-23 16:04:53 +01:00
Laurent Destailleur
1c7e2d3034
Merge pull request #20402 from Easya-Solutions/develop_remake_variants
NEW : Update variants to standard card and list
2022-03-23 16:02:08 +01:00
Regis Houssin
c23752b3d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_in_contact_list 2022-03-22 10:09:01 +01:00
Laurent Destailleur
cd37d4b403 Code comment 2022-03-21 00:14:42 +01:00
Laurent Destailleur
592a277091 FIX ZATCA Encoding 2022-03-19 19:17:22 +01:00
Laurent Destailleur
cb93ab472d FIX ZATCA Encoding 2022-03-19 19:14:12 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
Laurent Destailleur
62ca286ac9 Try a fix to solve backup that fails on large database 2022-03-18 12:07:00 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Regis Houssin
a2f1f4331e NEW add selectCompaniesForNewContactListWhere hook 2022-03-18 11:11:25 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
Thomas Negre
2cf433019e FormCategory : create method to select the product category 2022-03-17 16:05:35 +01:00
Laurent Destailleur
7d60eefb9a
Merge pull request #20386 from hregis/new_add_hook_in_select_product
NEW add hooks select product list and select thirdparty list function
2022-03-17 13:26:01 +01:00
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
Laurent Destailleur
4aa93b363a FIX #20387 2022-03-17 11:24:23 +01:00
Regis Houssin
a73b92c871 NEW add selectContactListWhere hook 2022-03-17 11:08:09 +01:00
Regis Houssin
dbd0dd7e97 NEW add selectThirdpartyListWhere hook 2022-03-17 10:54:09 +01:00
Regis Houssin
e8b5fa45f2 FIX missing global $hookmanager 2022-03-17 09:55:26 +01:00
Regis Houssin
b0fe8994e4 NEW add hook selectProductsListWhere in select_produits_list function 2022-03-17 09:32:45 +01:00
Laurent Destailleur
b1e826da15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-17 00:16:28 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/products.lang
2022-03-17 00:16:14 +01:00
Laurent Destailleur
5eb51979a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-17 00:12:17 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
5b2e1fc374
Merge pull request #20306 from fmarcet/15.0
Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work
2022-03-16 22:41:54 +01:00
Laurent Destailleur
090b5c41bf
Merge pull request #20316 from atm-gauthier/14.0_fix_round_unitprice_with_MU
FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT
2022-03-16 22:34:49 +01:00
Francis Appels
e55a1f2783 Remember origin for newbutton inside create form. 2022-03-16 21:59:34 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-03-16 20:34:30 +01:00
Laurent Destailleur
14578820ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-16 20:10:52 +01:00
Laurent Destailleur
3c9ebfbe32 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	.travis.yml
	htdocs/adherents/card.php
2022-03-16 20:10:35 +01:00
oscim
41fa1f968b
Update notify.class.php
add in var $parameters transmited in hook 
outputlangs and labeltouse for customise by hook
2022-03-16 12:30:30 +01:00
Laurent Destailleur
97fc58c799
Merge pull request #20354 from fappels/14_fix_set_move_stock_on_close_wehen_batch
FIX: Stock move on shipment close and reception close disabled for lot/serial type
2022-03-15 19:21:37 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Laurent Destailleur
69654b2b43 Fix sort not working on security page to test file upload 2022-03-15 12:14:46 +01:00
Florian HENRY
92bfd6893d fix:incoterm bad sql request 2022-03-15 09:10:41 +01:00
Francis Appels
207aba2e98 FIX: Stock move on shipment close and reception close also moves lot/serial type. 2022-03-14 17:59:18 +01:00
BB2A Anthony Berton
316380afd2 1 2022-03-12 23:41:16 +01:00
BB2A Anthony Berton
899598bbb3 Cop 2022-03-12 16:50:48 +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
f72f71a972 FIX Delete of doc and package in modulebuilder 2022-03-11 16:21:28 +01:00
BB2A Anthony Berton
80a2499844 Clean 2022-03-11 11:25:49 +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
BB2A Anthony Berton
1a5beb0664 Fix style 2022-03-09 19:55:55 +01:00
BB2A Anthony Berton
e1e573c532 Add Hook 2022-03-09 19:55:40 +01:00
BB2A Anthony Berton
3a5a74478f Add auther notif 2022-03-09 18:05:07 +01:00
Gauthier PC portable 024
f2aaa27d7b FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT 2022-03-09 17:41:48 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
Ferran Marcet
a14bf4b621 Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work 2022-03-08 18:02:55 +01:00
Laurent Destailleur
b339e1a883 Enhance phpunit on sql code testing 2022-03-07 19:37:53 +01:00
Laurent Destailleur
6e298a2cb4 Fix phpunit 2022-03-07 19:18:32 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump
NEW -  Add util function send backup by mail
2022-03-07 17:37:44 +01:00
Laurent Destailleur
5bde2b3489 Merge 2022-03-07 16:42:47 +01:00
Laurent Destailleur
c4036345b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 16:42:28 +01:00
Laurent Destailleur
dd9f10b1b6
Merge pull request #20186 from atm-kevin/FIX_Add_Id_In_Formproject
FIX : Add ID into formproject method
2022-03-07 16:34:04 +01:00
Laurent Destailleur
1ecdc7bc20 css 2022-03-07 16:30:39 +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
403db246bb
Merge pull request #20280 from Achicken7301/develop
Add unit price for {DOL_PRINT_OBJECT_LINES}
2022-03-07 13:44:03 +01:00