lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
106,329 Commits 43 Branches 150 Tags 886 MiB
3fa3cd28cd
Commit Graph

106329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3fa3cd28cd clean code 2022-02-06 15:21:49 +01:00
Laurent Destailleur
3e6d922cc0
Merge pull request #19938 from bb2a/border-table-2 
NEW - Border table
 2022-02-06 14:59:31 +01:00
Laurent Destailleur
6562b24e41 NEW Some core tables are created only at module activation 2022-02-06 13:31:44 +01:00
Laurent Destailleur
2991f992dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-06 13:28:30 +01:00
Laurent Destailleur
e022b00d1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-06 13:24:02 +01:00
Laurent Destailleur
c63ebfde29 Tables are loaded on module activation 2022-02-06 13:16:32 +01:00
Laurent Destailleur
cd491280cf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-06 13:06:27 +01:00
Laurent Destailleur
bd3218b460 Fix remove dead code 2022-02-06 13:06:12 +01:00
Laurent Destailleur
f2120a6463
Merge pull request #19994 from defrance/patch-177 
fix : duration in hour and min (not in second)
 2022-02-06 12:35:59 +01:00
Laurent Destailleur
d1f3411bac
Update list_print_total.tpl.php 2022-02-06 12:35:33 +01:00
Laurent Destailleur
3b36465210 Fix missing allowed_in_frames 2022-02-06 12:17:42 +01:00
Laurent Destailleur
9c0fc59166 Fix #yogosha8791 2022-02-05 19:42:43 +01:00
Laurent Destailleur
dcfaa977bc
Merge pull request #19996 from atm-john/15.0_fix_logic 
FIX : logic for form setup
 2022-02-05 19:02:17 +01:00
BENKE Charlene
9977761846
print the good format of totalisation 2022-02-05 12:12:37 +01:00
BENKE Charlene
1c87c6fd5d
Update list.php 
first introduce à type of totalisation
 2022-02-05 12:10:57 +01:00
ATM john
ba46d04d6e Fix logic for form setup 2022-02-04 21:51:33 +01:00
Laurent Destailleur
faa226d875 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 20:34:26 +01:00
Laurent Destailleur
c53bac831d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 20:33:32 +01:00
Laurent Destailleur
ba795310b5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 20:32:39 +01:00
Laurent Destailleur
7ade138590 Fix phpcs 2022-02-04 20:30:45 +01:00
Laurent Destailleur
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
Laurent Destailleur
4e7ad489b2
Merge pull request #19995 from bb2a/patch-2 
FIX - Hide ref subpruct
 2022-02-04 20:14:52 +01:00
Laurent Destailleur
20ddd04d14 Make around 15 tables not created by default but at first module init. 2022-02-04 20:06:09 +01:00
Laurent Destailleur
c9a685e09d Better error message 2022-02-04 19:21:47 +01:00
Laurent Destailleur
1e94ffa4d2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 19:07:26 +01:00
Laurent Destailleur
836ffc2b02 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 19:06:32 +01:00
Anthony Berton
07c7209c0c
Update pdf.lib.php 2022-02-04 19:05:22 +01:00
Laurent Destailleur
63d35ecffd Fix phpcs 2022-02-04 19:05:11 +01:00
BENKE Charlene
8d74b51009
fix : duration in hour and min (not in second) 
use convertSecondToTime for totalise duration
 2022-02-04 15:52:37 +01:00
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +01:00
BENKE Charlene
5f3c81daee FIX if we have PRODUCT_USE_UNITS, task fail 
we need 	public function getLabelOfUnit($type = 'long') fonction or printlineOriginLine fail
 2022-02-04 15:35:03 +01:00
Laurent Destailleur
e85051aaaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 15:32:50 +01:00
Laurent Destailleur
3884c7b25f
Merge pull request #19894 from defrance/patch-176 
FIX if we have PRODUCT_USE_UNITS, task fail
 2022-02-04 15:32:24 +01:00
Laurent Destailleur
8da089b4c1
Merge pull request #19993 from atm-gauthier/15.0_hrm_fix_position_extrafields 
FIX : extrafields are not used yet + fix ihm
 2022-02-04 15:30:04 +01:00
Gauthier PC portable 024
accf426f19 FIX : extrafields are not used yet + fix ihm 2022-02-04 15:14:30 +01:00
Laurent Destailleur
5249840402 FIX #yogosha8628 2022-02-04 15:14:10 +01:00
Laurent Destailleur
f99e19e729 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 13:19:55 +01:00
Laurent Destailleur
85e198283b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 13:18:26 +01:00
Laurent Destailleur
66430f6087 FIX #19939 2022-02-04 13:18:07 +01:00
Laurent Destailleur
e57bc01466 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-02-04 13:02:45 +01:00
Laurent Destailleur
7410d50b6b
Merge pull request #19986 from el-dge/13.0 
Issue on stock virtuel : fix Dolibarr/dolibarr#18634
 2022-02-04 12:56:05 +01:00
Laurent Destailleur
3f87db08d4
Update product.class.php 2022-02-04 12:55:31 +01:00
Laurent Destailleur
a81b437d04
Merge pull request #19971 from atm-quentin/NEW_exclude_natural_search 
NEW Can use ! to make a search that exclude a string
 2022-02-04 12:51:26 +01:00
Laurent Destailleur
4324558d67 FIX backup fails 2022-02-04 12:34:42 +01:00
El-dge
d09303d27c
Issue on stock virtuel : fix Dolibarr/dolibarr#18634 2022-02-04 12:31:40 +01:00
Laurent Destailleur
a7021008ba Update pdf.lib.php 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-04 12:27:13 +01:00
Laurent Destailleur
eb644bf6bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 12:18:05 +01:00
Laurent Destailleur
aef646bb2a Change order of options and removed useless option 2022-02-04 12:17:38 +01:00
Laurent Destailleur
bfea5cd69d
Merge pull request #19966 from habot-it/develop 
Fix "Warning: This option make TCPDF library being crazy sometime and…
 2022-02-04 12:14:26 +01:00
Laurent Destailleur
6894cb3925
Update pdf.lib.php 2022-02-04 12:14:11 +01:00