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

107037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6c1b22eb48 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-12 19:08:15 +02:00
Laurent Destailleur
dfb5bb0936 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-12 19:07:35 +02:00
Laurent Destailleur
d0a2017639
Merge pull request #21491 from atm-lena/13.0_FIX_DisplayLineExtrafieldsEmpty_PDF 
No display extrafield line on PDF if empty
 2022-07-12 19:05:58 +02:00
Laurent Destailleur
c2712242be Fix css 2022-07-12 17:42:20 +02:00
stickler-ci
3434460cc3 Fixing style errors. 2022-07-11 09:55:39 +00:00
atm-lena
851416a61e No display extrafield line on PDF if empty 2022-07-11 11:48:37 +02:00
Laurent Destailleur
88543c85ba Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-10 19:22:15 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
Laurent Destailleur
840d9b182b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:19:08 +02:00
Laurent Destailleur
52661e09c7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/modResource.class.php
 2022-07-10 19:18:59 +02:00
Laurent Destailleur
d7c1ca1083
Merge pull request #21461 from atm-gauthier/FIX/fetchByProductCombination2ValuePairs 
FIX : We must remove empty values from $features array in fetchByProduc…
 2022-07-10 18:57:31 +02:00
Laurent Destailleur
e78cc17848
Merge pull request #21477 from atm-gauthier/14.0_fix_extrafields_chkbxlst_cannot_be_emptied 
FIX : backport commit 5b3fcc5e43, chkbx…
 2022-07-10 18:46:04 +02:00
Laurent Destailleur
fcbe09b790
Merge pull request #21480 from atm-jpb/13.0_fix_massaction_create_invoice_on_multiorders 
FIX : rank duplicate on mass action invoice from multiple orders
 2022-07-10 18:43:36 +02:00
Laurent Destailleur
c16cd502d0
Update actions_massactions.inc.php 2022-07-10 18:43:25 +02:00
Laurent Destailleur
2a9aac930e
Merge pull request #21485 from FHenry/15_fix_bad_amount_count 
15 fix bad amount count
 2022-07-10 18:15:53 +02:00
Florian HENRY
56c4817d6d fix: Bad amount calc on Invoice index 2022-07-08 17:30:15 +02:00
jpb
226488b7ed rank change. if we only have one order we leave the origin rank otherwhise we pass -1 2022-07-08 12:32:17 +02:00
Laurent Destailleur
61f1595f8c Fix look and feel v15 2022-07-08 11:21:54 +02:00
Laurent Destailleur
9db3c1bbd6 Fix currency missing 2022-07-08 10:56:36 +02:00
Gauthier PC portable 024
d375c9fbbe FIX : backport commit 5b3fcc5e43, chkbxlst cannot be emptied 2022-07-08 10:35:43 +02:00
stickler-ci
04fd17347e Fixing style errors. 2022-07-08 07:36:09 +00:00
Gauthier PC portable 024
787f52fd7f FIX : with callback function 2022-07-08 09:32:20 +02:00
Laurent Destailleur
7741826d34 phpcs 2022-07-07 23:09:39 +02:00
Laurent Destailleur
63ce535deb
Merge pull request #21448 from atm-jpb/patch-1 
# FIX : rank duplicate on mass action
 2022-07-07 20:57:51 +02:00
Laurent Destailleur
5afe1dbb84
Update actions_massactions.inc.php 2022-07-07 20:57:29 +02:00
Laurent Destailleur
1820276ac7
Merge pull request #21462 from atm-jpb/fix_export_resource_type 
fix export resource type filter
 2022-07-07 20:56:34 +02:00
Laurent Destailleur
77b1bccea9 Restore old version to fix serious regressions and sql errors 2022-07-07 20:05:22 +02:00
Laurent Destailleur
e60c6ae96d Revert "FIX count elements in invoice list (Issue #21444)" 
This reverts commit db863e4db6.
 2022-07-07 20:00:03 +02:00
Laurent Destailleur
e10820a350 Revert "FIX sql order" 
This reverts commit 3eb3c700b9.
 2022-07-07 19:59:37 +02:00
Laurent Destailleur
f9d13290d5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/compta/facture/list.php
 2022-07-07 19:15:58 +02:00
Laurent Destailleur
b2e4b6ab5d FIX Send remind to pay invoice only on validated invoices 2022-07-07 19:10:46 +02:00
jpb
ea52403339 rank change. if we only have one order we leave the origin rank otherwise we leave the -1 and let the class set the max rank. 2022-07-07 11:08:01 +02:00
jpb
f10788e4c6 fix export resource type filter 2022-07-07 10:24:39 +02:00
Gauthier PC portable 024
77552fa32a FIX : We must remove empty values of $features array in fetchByProductCombination2ValuePairs() because some products can use only several attributes in their variations and not necessarily all. In this case, fetch doesn't work without my correction 2022-07-07 10:17:56 +02:00
Laurent Destailleur
b2cbdde1ce
Merge pull request #21458 from Dolibarr/revert-21394-PR/improve-page-titles 
Revert "fix page titles"
 2022-07-06 19:10:10 +02:00
Laurent Destailleur
4c5d43b42e
Merge pull request #21459 from Easya-Solutions/14.0_fix-invoice-list-count-element 
FIX count elements in invoice list (Issue #21444)
 2022-07-06 19:09:58 +02:00
lvessiller
3eb3c700b9 FIX sql order 2022-07-06 18:28:40 +02:00
lvessiller
db863e4db6 FIX count elements in invoice list (Issue #21444) 2022-07-06 17:58:01 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
a0caf7be71
Merge pull request #21394 from cfoellmann/PR/improve-page-titles 
fix page titles
 2022-07-06 15:55:10 +02:00
Laurent Destailleur
cd0e85d54d
Merge pull request #21398 from FHenry/14_fix_lost_filter_on_replannish 
fix: replannish view lost filter and sort on pagination and sorting
 2022-07-06 15:51:45 +02:00
Laurent Destailleur
09adf703f4
Merge pull request #21452 from atm-quentin/14_add_shipment_thead_and_id 
FIX : add missing thead, th and id on table
 2022-07-06 10:01:13 +02:00
Laurent Destailleur
661e189d12
Merge pull request #21454 from simnandez/15.0 
Fix: PHP Fatal error:  Call to undefined function getOnlineSignatureUrl
 2022-07-06 10:00:39 +02:00
Laurent Destailleur
f6b0710baf FIX Can convert a partially closed down payment when close for 
bankcharge
 2022-07-05 21:04:24 +02:00
Juanjo Menent
4f091c4394 Fix: PHP Fatal error: Call to undefined function getOnlineSignatureUrl() 2022-07-05 17:11:02 +02:00
Quentin VIAL-GOUTEYRON
2e065e1702 FIW : add missing thead on table 2022-07-05 13:11:36 +02:00
stickler-ci
244a3fc819 Fixing style errors. 2022-07-04 15:22:40 +00:00
boudet jean pascal
5dabcec767
rank duplicate on mass action 
#### rank duplicate on mass action  invoice from multiple orders

we have to  define the max rank for each line which makes it possible not to have a duplicate on the rank field in the case of several order massaction request.
 2022-07-04 17:17:55 +02:00
Laurent Destailleur
591f297399
Merge pull request #21418 from atm-gauthier/15.0_fix_trads_payment_method 
FIX : french traductions for payment methods
 2022-07-01 17:22:56 +02:00
Laurent Destailleur
8ac9de38de Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-01 14:19:52 +02:00