lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107,206 Commits 43 Branches 150 Tags 886 MiB
079fcacf13
Commit Graph

107206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ee0ffae407 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
 2022-03-17 00:15:01 +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
3346d64416
Merge pull request #20305 from fmarcet/14.0 
Fix: Error whem generating supplier payment pdf
 2022-03-16 22:46:53 +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
54da09bb71
Merge pull request #20310 from ymollard/15.0 
Restoring missing VATIsNotUsed label (15.0)
 2022-03-16 22:38:52 +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
Laurent Destailleur
38a8f52e8b Missing init of model 2022-03-16 22:21:04 +01:00
Sylvain Legrand
e97932301b DLC and DLUO are reversed in the called function 2022-03-16 22:15:49 +01:00
Laurent Destailleur
62f84f0357
Merge pull request #20325 from hregis/fix_missing_multientity_managed 
FIX missing multientity managed
 2022-03-16 22:10:16 +01:00
Laurent Destailleur
983bfc4ca9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2022-03-16 22:02:40 +01:00
Laurent Destailleur
f0161d1939 Fix revert a change was not a bug fix but a new feature 2022-03-16 21:59:58 +01:00
Laurent Destailleur
b0720902d6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:53:28 +01:00
Laurent Destailleur
b0525c7a7f
Merge pull request #20358 from atm-greg/FIX_missing_hooks_for_dictionaryadmin 
add more specific context and doAction hook
 2022-03-16 21:52:25 +01:00
Laurent Destailleur
ab2018e9b4
Merge pull request #20376 from oscim/patch-45 
Update notify.class.php
 2022-03-16 21:46:15 +01:00
Laurent Destailleur
e0106e1080
Merge pull request #20370 from FHenry/14_fix_default_values_project_card 
fix: prededefault setup values for public field (visibility) works
 2022-03-16 21:45:45 +01:00
Laurent Destailleur
d9907fe074
Merge pull request #20369 from aspangaro/14p34 
FIX Reception - Error on trackid
 2022-03-16 21:45:15 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
d8bb5c2040 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:27:59 +01:00
Laurent Destailleur
4ad6425d76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-03-16 21:27:34 +01:00
Laurent Destailleur
922a0e58a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-16 21:22:45 +01:00
Laurent Destailleur
31167f5c0a
Merge pull request #20371 from marc-dll/13.0_FIX_holiday_month_report_ui 
FIX: holiday monthly report: display inconsistencies
 2022-03-16 21:22:31 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +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
4ec58006d8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 20:32:23 +01:00
Laurent Destailleur
6c210f72dc Fix missing var declaration and constructor 2022-03-16 20:31:40 +01:00
Laurent Destailleur
89aab0e9d5
Merge pull request #20379 from hregis/new_add_kooks_in_thirdparty_index 
NEW add hooks in thirdparty index page
 2022-03-16 20:14:42 +01:00
Laurent Destailleur
abbc2ca909
Merge pull request #20377 from aspangaro/14p31 
FIX Update icon of module reception
 2022-03-16 20:13:55 +01:00
Laurent Destailleur
279b60dca6
Merge pull request #20378 from Hystepik/develop#4 
Fix : website preview on closed status page
 2022-03-16 20:13:30 +01:00
Laurent Destailleur
600657223b
Update functions.lib.php 2022-03-16 20:12:01 +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
Laurent Destailleur
3800f2c860 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-03-16 20:08:44 +01:00
Laurent Destailleur
178cb81037
Merge pull request #20380 from atm-gauthier/fix_allow_operators_in_custom_groups_report 
FIX : allow all maths classical operators in custom groups accountancy report
 2022-03-16 20:08:35 +01:00
Laurent Destailleur
800c490c12 Fix travis 2022-03-16 20:07:50 +01:00
Laurent Destailleur
4ec0804f84 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 20:05:50 +01:00
Laurent Destailleur
cd79b61ace
Merge pull request #20381 from hregis/new_add_hooks_in_product_reassort 
NEW add printFieldListWhere hook in product reassort card
 2022-03-16 20:04:16 +01:00
Laurent Destailleur
abe542f49e Fix removed the cache.manifest file (useless and pb with some browsers) 2022-03-16 19:45:39 +01:00
Regis Houssin
7437be3578 FIX wrong hooks name 2022-03-16 19:22:48 +01:00
Regis Houssin
cdc3f43a01 NEW add printFieldListWhere hook in product reassort card 2022-03-16 19:09:16 +01:00
Laurent Destailleur
055e080a37 Test travis 2022-03-16 17:33:22 +01:00
Gauthier PC portable 024
4731ce9f1d FIX : allow all maths classical operators in custom groups accountancy report 2022-03-16 16:40:08 +01:00
Laurent Destailleur
a17e3c347a Try to fix travis pb 2022-03-16 16:33:36 +01:00
Regis Houssin
629028a435 NEW add hooks in thirdparty index page 2022-03-16 16:27:25 +01:00
Laurent Destailleur
319f21ef69 Fix regression 2022-03-16 16:23:27 +01:00
Laurent Destailleur
57ad3a789b
Merge pull request #20375 from atm-john/14.0_fix_crabe_multientity 
FIX crabe multidir output
 2022-03-16 16:04:29 +01:00
Laurent Destailleur
0102832679 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 16:01:55 +01:00
Laurent Destailleur
149f3e6517 Fix for #20372 2022-03-16 16:01:03 +01:00
lmarcouiller
133721904d add pre-commit changes 2022-03-16 15:57:04 +01:00