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

106900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevin
c71bebfd21 Add Init Hooks on several project tabs 2022-03-02 20:48:46 +01:00
Laurent Destailleur
a7cb3fa492 Clean log 2022-03-02 14:44:14 +01:00
Laurent Destailleur
72965fdb2e # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-03-01 19:13:28 +01:00
Laurent Destailleur
0ee858a9a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-01 19:06:01 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
7c253c7e28 Clean code 2022-03-01 19:05:00 +01:00
Laurent Destailleur
762de973eb Fix sql injection 2022-03-01 18:43:16 +01:00
Laurent Destailleur
20a3a429ed Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:22:39 +01:00
Laurent Destailleur
2e38caa950 phpunit 2022-03-01 18:22:09 +01:00
Laurent Destailleur
e5fd841fe3 Make verifCond more robust against RCE 2022-03-01 18:21:30 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
Laurent Destailleur
b79ad197ec FIX Missing the field date start/end in export supplier invoice/order 2022-03-01 17:29:22 +01:00
Laurent Destailleur
237b6fc922 Fix value recommended 2022-03-01 17:07:28 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Laurent Destailleur
bd288f980d FIX On large proposal or invoice, fix n(n+1) sql into a n sql. 2022-03-01 14:52:47 +01:00
Laurent Destailleur
8c94c2f98c Fix collapse icon 2022-03-01 04:10:50 +01:00
Laurent Destailleur
e4e08c9903 Code simpler to manage collapse of separators. 2022-03-01 04:02:06 +01:00
Laurent Destailleur
54bef2e34f Fix phpcs 2022-03-01 01:57:38 +01:00
Laurent Destailleur
a08bbd6acd Fix regression 2022-03-01 00:11:30 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
 2022-02-28 22:30:17 +01:00
Laurent Destailleur
20a35147d4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-28 22:22:46 +01:00
Laurent Destailleur
df9fa39d34 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-28 22:22:10 +01:00
Laurent Destailleur
d101a457c1 Trans 2022-02-28 22:21:40 +01:00
Laurent Destailleur
81e0eb3af0
Merge pull request #20128 from atm-greg/FIX_14.0_missing_hook_receptionlist 
fix missing hooks and line total for totalizable extrafields
 2022-02-28 22:14:11 +01:00
Laurent Destailleur
2ed7a4431f Doxygen 2022-02-28 22:13:28 +01:00
Laurent Destailleur
641b1d1ab1
Merge pull request #20059 from aspangaro/16a12_assets_code 
NEW Asset module - Code - FPC21
 2022-02-28 22:12:12 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
a89fd3c818
Merge pull request #20198 from gdsoftdev/develop 
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
 2022-02-28 21:56:01 +01:00
Laurent Destailleur
8e1fd877f2
Update html.formaccounting.class.php 2022-02-28 21:55:30 +01:00
Laurent Destailleur
50602b1fbe
Update html.formaccounting.class.php 2022-02-28 21:53:05 +01:00
Laurent Destailleur
6447c1e394
Merge pull request #20076 from vincentjdc/html-field-moreparam-morecss 
Allow to add more CSS and more params on html fields
 2022-02-28 21:50:40 +01:00
Laurent Destailleur
835b0f5f19
Update doleditor.class.php 2022-02-28 21:45:04 +01:00
Laurent Destailleur
c1268a3e39
Merge pull request #20151 from aspangaro/14p34 
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
 2022-02-28 21:38:07 +01:00
Laurent Destailleur
b7d20ff20b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-28 21:34:17 +01:00
Laurent Destailleur
548cad0508 FIx #20110 2022-02-28 21:30:12 +01:00
Laurent Destailleur
280be9b29f
Merge pull request #20163 from SteveATM/FIX_replace_divbutaction_by_dolgetbuttonaction 
FIX: Replace User divbutaction by dolgetbuttonaction
 2022-02-28 21:25:25 +01:00
Laurent Destailleur
0bdf720ed4
Merge pull request #20224 from atm-greg/Fix_extrafields_view_and_perms_on_list 
Fix extrafields view and perms on list
 2022-02-28 21:17:19 +01:00
Laurent Destailleur
47ce7ef5ae
Merge pull request #20199 from fappels/15_fix_fk_shipping_method 
FIX: shipping list, e.shipping_method_id should be e.fk_shipping_method.
 2022-02-28 21:07:52 +01:00
Laurent Destailleur
19389ca018
Merge pull request #20200 from ymollard/default-type4tickets 
Set default ticket type to OTHER if no default exists
 2022-02-28 21:03:59 +01:00
Laurent Destailleur
253622acf6
Merge pull request #20206 from fappels/15_fix_product_photo_on_cornas_model 
FIX: Show product photo on Supplier order Cornas model.
 2022-02-28 21:03:20 +01:00
Laurent Destailleur
6a81ae1099
Merge pull request #20220 from hregis/fix_remove_duplicate_code 
FIX remove duplicated code
 2022-02-28 20:58:24 +01:00
Laurent Destailleur
e69b5ba086
Merge pull request #20223 from hregis/fix_no_special_code_option_for_invoice 
FIX options should not exists on invoices
 2022-02-28 20:36:36 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
5a24552930 Fix doc 2022-02-28 20:03:21 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00