Laurent Destailleur
|
b0f538387e
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
|
2022-02-18 21:50:08 +01:00 |
|
Laurent Destailleur
|
e948db69f2
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-02-18 21:46:01 +01:00 |
|
Laurent Destailleur
|
28d8a28be6
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-02-18 21:45:54 +01:00 |
|
Laurent Destailleur
|
959aa0ce59
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2022-02-18 21:44:34 +01:00 |
|
Laurent Destailleur
|
c770e232ff
|
Merge pull request #20120 from RomainDeschamps/14.0
Add ticket page in user personal landpage
|
2022-02-18 21:09:23 +01:00 |
|
Laurent Destailleur
|
1c129fd3ea
|
Merge pull request #20038 from atm-quentin/FIX_12_sort_ht_amount
FIX sort amount ht on cabyprodserv.php
|
2022-02-18 21:04:52 +01:00 |
|
Laurent Destailleur
|
b5c9899a60
|
Merge pull request #20103 from dolibit-ut/patch-370
Update README
|
2022-02-18 20:48:17 +01:00 |
|
Laurent Destailleur
|
3e4279f37b
|
Merge pull request #20083 from ATM-Consulting/FIX_VacantPosition
FIX : HRM | Vacant position option
|
2022-02-18 20:47:54 +01:00 |
|
Laurent Destailleur
|
72df61b175
|
Merge pull request #20107 from henrynopo/patch-2
Fix bug - List of supplier order - to show total line
|
2022-02-18 20:42:30 +01:00 |
|
Laurent Destailleur
|
86f722c05d
|
Merge pull request #20104 from dolibit-ut/patch-371
Update dolibarr.pl
|
2022-02-18 20:25:26 +01:00 |
|
Laurent Destailleur
|
6c9f5f3f7d
|
Merge pull request #20105 from dolibit-ut/patch-372
Update README
|
2022-02-18 20:23:29 +01:00 |
|
Laurent Destailleur
|
f295fa8ad4
|
Merge pull request #20108 from atm-maxime/fix_15_missing_hooks
Fix : add missing formobjectoptions hook on 3 cards
|
2022-02-18 20:23:09 +01:00 |
|
Laurent Destailleur
|
91eafaea98
|
Merge pull request #20109 from aspangaro/14p33
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
|
2022-02-18 20:21:43 +01:00 |
|
Laurent Destailleur
|
19f51347ea
|
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency
fix rounding for price and display currency
|
2022-02-18 20:19:02 +01:00 |
|
Laurent Destailleur
|
38ddfda95c
|
Merge pull request #20114 from dolibit-ut/patch-373
add GitHub
|
2022-02-18 20:14:59 +01:00 |
|
Laurent Destailleur
|
d27a530173
|
Merge pull request #20119 from Easya-Solutions/14.0_fix-fec-import-rule-compute
FIX compute rule in FEC import
|
2022-02-18 20:14:23 +01:00 |
|
Romain DESCHAMPS
|
5eb4d3408c
|
Update param_ihm.php
|
2022-02-18 19:31:42 +01:00 |
|
Laurent Destailleur
|
0517e2e2d3
|
Fix error
|
2022-02-18 18:35:21 +01:00 |
|
lvessiller
|
1107a60b58
|
FIX compute rule in FEC import
|
2022-02-18 16:53:55 +01:00 |
|
Laurent Destailleur
|
3b6f7bff66
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-02-18 16:32:51 +01:00 |
|
Laurent Destailleur
|
3d9cdbf136
|
FIX Debug v15
|
2022-02-18 16:24:11 +01:00 |
|
Laurent Destailleur
|
cd9c1acafe
|
Fix missing token
|
2022-02-18 16:09:23 +01:00 |
|
Laurent Destailleur
|
f4f03d03f2
|
Fix link
|
2022-02-18 15:23:13 +01:00 |
|
Laurent Destailleur
|
87a5defbd3
|
Comment
|
2022-02-18 15:11:54 +01:00 |
|
Laurent Destailleur
|
e41e0f069a
|
Fix creator in PDF. Add log to help to find strange bug
|
2022-02-18 15:09:52 +01:00 |
|
Atm-Gregr
|
30cde100ff
|
trad us
|
2022-02-18 14:41:29 +01:00 |
|
Laurent Destailleur
|
61e91656e0
|
FIX setup of member module
FIX generation of business cards
|
2022-02-18 14:14:34 +01:00 |
|
Laurent Destailleur
|
694ea8830b
|
Fix missing name and type into template
|
2022-02-18 13:46:12 +01:00 |
|
Laurent Destailleur
|
dee5d8f9e8
|
Standardize name of button
|
2022-02-18 13:45:28 +01:00 |
|
UT from dolibit
|
8a0ee772d3
|
add GitHub
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'github', 'GitHub', 'https://www.github.com/{socialid}', '', 0);
|
2022-02-18 13:10:38 +01:00 |
|
Laurent Destailleur
|
3ab2308124
|
Clean code
|
2022-02-18 12:36:05 +01:00 |
|
Laurent Destailleur
|
aec2579c41
|
Clean code
|
2022-02-18 12:22:53 +01:00 |
|
stickler-ci
|
b5afa27774
|
Fixing style errors.
|
2022-02-18 10:09:38 +00:00 |
|
atm-greg
|
12c825ba84
|
fix rounding for price and display currency
|
2022-02-18 10:50:00 +01:00 |
|
Alexandre SPANGARO
|
3f109aa911
|
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
|
2022-02-18 09:24:12 +01:00 |
|
Maxime Kohlhaas
|
7a457478d5
|
Fix : add missing formobjectoptions hook on 3 cards
|
2022-02-18 08:23:12 +01:00 |
|
Henry
|
c32cc660a3
|
Update list.php
|
2022-02-18 08:16:56 +08:00 |
|
Laurent Destailleur
|
b01fbba039
|
Fix packages
|
2022-02-17 23:41:31 +01:00 |
|
UT from dolibit
|
9fd34b264f
|
Update README
https://doxygen.dolibarr.org/
|
2022-02-17 21:05:23 +01:00 |
|
Laurent Destailleur
|
6b8312aab0
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-02-17 20:51:25 +01:00 |
|
Laurent Destailleur
|
d19aca7192
|
# WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-02-17 20:50:03 +01:00 |
|
Laurent Destailleur
|
28e6acdae3
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-02-17 20:46:36 +01:00 |
|
Laurent Destailleur
|
aacd439765
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/api/class/api_setup.class.php
|
2022-02-17 20:46:20 +01:00 |
|
Laurent Destailleur
|
80f1cd8857
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2022-02-17 20:43:51 +01:00 |
|
Laurent Destailleur
|
edc984c6e3
|
# WARNING: head commit changed in the meantime
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2022-02-17 20:43:22 +01:00 |
|
Laurent Destailleur
|
120a4a608e
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-02-17 20:41:20 +01:00 |
|
Laurent Destailleur
|
b013c9a15f
|
Fix duplicate div
|
2022-02-17 20:37:39 +01:00 |
|
UT from dolibit
|
3ad95d55a5
|
Update dolibarr.pl
return ( "14.0.5", "13.0.5", "12.0.5", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
$ver >= 14.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
$ver >= 13.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
|
2022-02-17 20:36:07 +01:00 |
|
UT from dolibit
|
4fb651817e
|
Update README
http://pad.asp-software.org/padgen.php
|
2022-02-17 20:27:19 +01:00 |
|
Laurent Destailleur
|
21ebedc755
|
Fix trans
|
2022-02-17 20:10:09 +01:00 |
|