lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,710 Commits 43 Branches 150 Tags 886 MiB
6cb5ea6ec2
Commit Graph

100710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
7c2121c439 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2021-06-30 15:06:16 +02:00
Laurent Destailleur
068622bced Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-30 15:00:23 +02:00
Laurent Destailleur
a914ffa42c CSS 2021-06-30 15:00:04 +02:00
Laurent Destailleur
b6a538f439
Merge pull request #18056 from aspangaro/14b16 
FIX Accountancy - Clean virtual zero on the import
 2021-06-30 14:44:12 +02:00
Laurent Destailleur
51456741d9 FIX Can't edit replacement invoice 
FIX Status of invoice when making a replacement invoice
 2021-06-30 12:43:44 +02:00
Alexandre SPANGARO
f95b5be971 FIX Accountancy - Clean virtual zero on the import 2021-06-30 04:55:22 +02:00
Alexandre SPANGARO
6f12812329 FIX Accountancy - Clean virtual zero on the import 2021-06-29 23:07:20 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
5f019e0857 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-29 19:57:06 +02:00
Laurent Destailleur
7d8770305a
Merge pull request #17790 from aspangaro/14b11 
NEW Add field date from/to in supplier payment list
 2021-06-29 19:54:41 +02:00
Laurent Destailleur
04148dd5fb
Merge pull request #17789 from aspangaro/14b10 
NEW Add field date from/to in customer payment list
 2021-06-29 19:54:12 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet 
NEW: project time spent: conf to prevent recording time after X months
 2021-06-29 19:53:20 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Laurent Destailleur
11b5c044bc
Merge pull request #18052 from Hystepik/develop#3 
New : selectGroupTicket  multilevel >1 level
 2021-06-29 19:37:39 +02:00
Laurent Destailleur
2a876d139b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 19:25:09 +02:00
Laurent Destailleur
1804c36a05
Merge pull request #18047 from aspangaro/14b16 
Uniformize accounting displays
 2021-06-29 19:24:57 +02:00
Laurent Destailleur
c74060d02c Fix lost change in merge 2021-06-29 19:24:46 +02:00
Laurent Destailleur
d59dfcb08a
Update list.php 2021-06-29 19:21:35 +02:00
Laurent Destailleur
d379151da6 Fix doc 2021-06-29 19:19:38 +02:00
Laurent Destailleur
eab6fc9347
Merge pull request #18053 from fappels/14_fix_php8_part2 
Fix php8 warning
 2021-06-29 19:17:09 +02:00
Laurent Destailleur
2860e12b65
Update objectline_view.tpl.php 2021-06-29 19:16:29 +02:00
Laurent Destailleur
56787bc292
Update card.php 2021-06-29 19:14:03 +02:00
Laurent Destailleur
0f020d5b20 Fix for phpv8 2021-06-29 19:05:18 +02:00
Laurent Destailleur
0577229a8b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 18:22:53 +02:00
Laurent Destailleur
7aeb652c66 Better sanitizing, fix phpcs 2021-06-29 18:22:36 +02:00
Laurent Destailleur
796b2d201a Enhance the sanitizing. 2021-06-29 18:17:27 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef Fix some core php8 warnings. 
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
 2021-06-29 16:37:07 +02:00
Laurent Destailleur
0d7fccc7b3 Fix test 2021-06-29 16:33:53 +02:00
Francis Appels
e4f61d430f Invoice php 8 issue and warnings. 
Seems if ("" < 0) is true in php 8
 2021-06-29 16:33:24 +02:00
Francis Appels
b8f5dc74d7 Some order php 8 warning 2021-06-29 16:30:36 +02:00
Francis Appels
b83f57da48 Fix some proposal php 8 warning 2021-06-29 16:26:48 +02:00
lmarcouiller
3d41c00199 New : selectGroupTicket multilevel >1 level 2021-06-29 16:13:03 +02:00
Laurent Destailleur
9236d38821
Merge pull request #18035 from frederic34/patch-7 
fix php warning
 2021-06-29 16:03:11 +02:00
Laurent Destailleur
1982ab47ac
Merge branch '14.0' into patch-7 2021-06-29 16:02:47 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
 2021-06-29 15:58:26 +02:00
Laurent Destailleur
24fccc2b72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 15:53:22 +02:00
Laurent Destailleur
1cf3408f5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/class/contact.class.php
 2021-06-29 15:52:39 +02:00
Laurent Destailleur
ce18eff133 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-29 15:48:06 +02:00
Laurent Destailleur
e2c4a14939 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-29 15:47:58 +02:00
Laurent Destailleur
d788e58f67
Merge pull request #18036 from frederic34/codesample 
remove unused code
 2021-06-29 15:47:03 +02:00
Laurent Destailleur
6a877074a5
Merge pull request #18041 from Hystepik/develop#1 
Fix #18014 : update of compta/facture/card.php
 2021-06-29 15:46:24 +02:00
Laurent Destailleur
ba4a01dbea
Merge pull request #18037 from atm-maxime/fix_mo_stuff 
Fix MO and BOM links in boxes
 2021-06-29 15:42:09 +02:00
Laurent Destailleur
ab4dbcf5ae
Update box_mos.php 2021-06-29 15:41:48 +02:00
Laurent Destailleur
474df5fef2
Update box_boms.php 2021-06-29 15:41:21 +02:00
Laurent Destailleur
80759541b4
Merge pull request #18038 from atm-maxime/fix_order_delay_warning 
Fix #17836 : order delay warning in list was wrong
 2021-06-29 15:38:14 +02:00
Laurent Destailleur
0472ab4690
Merge pull request #18040 from OPEN-DSI/v11-fix-contact-update-perso-birthday-alert 
FIX update contact birthday alert
 2021-06-29 15:37:38 +02:00
Laurent Destailleur
ffef2191bd
Merge pull request #18042 from Hystepik/develop#2 
Fix CI bot error
 2021-06-29 15:36:40 +02:00