Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,088 Commits 36 Branches 189 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

10509 Commits

Author SHA1 Message Date
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
c035ee6f2a Look and feel v16 2022-04-11 19:21:04 +02:00
Laurent Destailleur
7028e82cf7 Merge pull request #20551 from Easya-Solutions/new-common-generate-document-show-errors 
NEW display errors in a message box after generating documents
 2022-04-11 16:33:58 +02:00
Laurent Destailleur
40720fad25 Fix php8 compatibility 2022-04-11 02:01:32 +02:00
Laurent Destailleur
6169f76a34 Add log for debug. Make new method for stripe payment an option. 2022-04-08 12:38:49 +02:00
Laurent Destailleur
623f15711d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-07 19:26:07 +02:00
Laurent Destailleur
0e36097eba Save result of some methods into cached properties. 2022-04-07 19:16:50 +02:00
Laurent Destailleur
6f413e03d8 Merge pull request #20523 from ATM-Consulting/NEW_16.0_consistency_mechanism_for_trigger_names 
NEW 16.0 - proposal for a prefix-based consistency mechanism for trigger names
 2022-04-07 18:25:03 +02:00
Laurent Destailleur
746cec015b Fix remove warning on chartjs 3.5 2022-04-07 17:50:18 +02:00
Laurent Destailleur
37fbe859df FIX country not visible into list of states 2022-04-07 16:33:19 +02:00
lvessiller
e6a0ca5042 FIX errors to catch 2022-04-07 16:32:08 +02:00
Laurent Destailleur
a120f65521 FIX country not visible into list of states 2022-04-07 16:32:03 +02:00
Laurent Destailleur
637f73a833 Merge pull request #17966 from cfoellmann/quickadd 
quickadd menu like bookmarks
 2022-04-07 15:41:57 +02:00
Laurent Destailleur
26c3e235cf Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
atm-florian
4ced0bac89 replace throw new Exception(…) with dol_print_error + exit 2022-04-07 14:39:14 +02:00
atm-florian
5953c3cd38 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_16.0_consistency_mechanism_for_trigger_names 2022-04-07 14:33:22 +02:00
Laurent Destailleur
0d121148c0 Merge pull request #20534 from ATM-Consulting/NEW_optimize_PDF_generation 
avoid fetch_objectlinked for each page of the document
 2022-04-07 14:25:10 +02:00
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