Commit Graph

94691 Commits

Author SHA1 Message Date
Marc de Lima Lucio
161edea6f3 FIX: deposit payment terms: adapt to v16 2022-03-08 15:22:19 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations.
Fix reponsive
2022-03-03 09:41:15 +01:00
Laurent Destailleur
88944656be Doc 2022-03-03 02:05:13 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/doleditor.class.php
2022-03-03 00:16:55 +01:00
Laurent Destailleur
a9a2928e63 Responsive 2022-03-03 00:13:35 +01:00
Laurent Destailleur
c452428d12 Fix label of menu 2022-03-02 22:20:05 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
Laurent Destailleur
940417efe2 FIX payment not completed when using Paypal. 2022-03-02 15:13:17 +01:00
Laurent Destailleur
a7cb3fa492 Clean log 2022-03-02 14:44:14 +01:00
Laurent Destailleur
66b0f253b6 Clean code 2022-03-02 12:41:21 +01:00
Laurent Destailleur
d15c303590 Fix missing button 2022-03-02 11:57:19 +01:00
Laurent Destailleur
5ffac5f3ee Fix typo 2022-03-02 11:38:32 +01:00
Laurent Destailleur
8051128665 Split section experimental and stable 2022-03-02 11:37:19 +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
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
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
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