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

27056 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
dd6238cb2d Try to save on fetch 2022-04-11 15:24:39 +02:00
Laurent Destailleur
751b9efcd9 Merge pull request #20600 from javierybar/develop 
FIX Tax 2 is lost when order is invoiced
 2022-04-11 15:22:28 +02:00
Laurent Destailleur
40720fad25 Fix php8 compatibility 2022-04-11 02:01:32 +02:00
javierybar
d7da57960f FIX Tax 2 is lost when order is invoiced 2022-04-10 15:33:35 +02:00
Laurent Destailleur
c65b7fd2ff Fix regression php8 2022-04-09 02:51:40 +02:00
Laurent Destailleur
4ff8969bac Merge pull request #19393 from atm-gauthier/NEW/addline_with_position_choice_develop 
New/addline with position choice develop
 2022-04-08 16:09:44 +02:00
Frédéric FRANCE
284649fd4b Update objectonoff.php 2022-04-08 13:35:21 +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
1d879bc996 FIX numbering method when mask include {cccc} 2022-04-08 10:19:20 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
994b500a68 PHP 8.0 compatibility 2022-04-08 00:14:29 +02:00
Laurent Destailleur
3a2815a9c0 Debug and clean v16 2022-04-07 23:44:57 +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
e66b4a687d Close #19414 2022-04-07 19:23:45 +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
cbae64f9aa FIX Add a hack to fix a bug in jquery 3.6.0/select 2 2022-04-07 17:51:38 +02:00
Laurent Destailleur
746cec015b Fix remove warning on chartjs 3.5 2022-04-07 17:50:18 +02:00
Adrien Raze
41ee9739db FIX: Add 'recruitment' into check array 2022-04-07 17:16:02 +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
Laurent Destailleur
56d5df4387 Merge pull request #19997 from habot-it/pdf_pagefoot 
Add options in function pdf_pagefoot of pdf.lib.php
 2022-04-07 14:33:41 +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
Laurent Destailleur
d26c578e97 Merge pull request #20541 from FHenry/14.0_fix_bithday_date_displayed 
fix: Bad dirthday displayed date (d-1) in the Bithday Widget
 2022-04-07 14:22:15 +02:00
Laurent Destailleur
3e477f9bbb Merge pull request #20579 from atm-gauthier/NEW/Add_column_Total_HT_to_products_array_on_document_creation_card 
NEW : identification tr by data-id
 2022-04-07 14:04:22 +02:00
Laurent Destailleur
c3b3285340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-07 14:03:29 +02:00
Laurent Destailleur
4cac6b7e29 css 2022-04-07 14:03:14 +02:00
Laurent Destailleur
0ed7c643f8 Close #20547 2022-04-07 13:28:24 +02:00
Laurent Destailleur
485e163cf6 default value 2022-04-07 13:16:51 +02:00
Laurent Destailleur
a4b9883eac Use checkbox instead of combo to save clicks when adding a resource 2022-04-07 13:14:51 +02:00
Laurent Destailleur
133e86b903 Merge pull request #20566 from dolibit-ut/patch-387 
Update interface_80_modStripe_Stripe.class.php
 2022-04-07 11:35:40 +02:00
Laurent Destailleur
1b61c6e9ae Merge pull request #20568 from dolibit-ut/patch-388 
Update company.lib.php
 2022-04-07 11:35:01 +02:00
Gauthier PC portable 024
93777f81f3 NEW : identification tr by data-id 2022-04-07 11:23:27 +02:00
Gauthier PC portable 024
f1771af53c FIX : originproductline array td identification data-id 2022-04-07 11:03:25 +02:00
habot-it
49a0485427 Add options in function pdf_pagefoot of pdf.lib.php - Revision 2022-04-07 08:54:59 +00: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
Laurent Destailleur
ed1bdd26db Rename some jobs 2022-04-07 00:09:11 +02:00
UT from dolibit
9db2f2c3f2 Update company.lib.php 
add D of THIR-D-PARTIES

($conf->global->THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB)
 2022-04-06 20:12:35 +02:00
UT from dolibit
4f1e280355 Update interface_80_modStripe_Stripe.class.php 
add D at THIR-D-PARTY

if (!empty($conf->global->STRIPE_DELETE_STRIPE_ACCOUNT_WHEN_DELETING_THIRDPARTY))
 2022-04-06 20:09:50 +02:00