Commit Graph

103861 Commits

Author SHA1 Message Date
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
Laurent Destailleur
bede1116a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-22 15:42:32 +02:00
Laurent Destailleur
b5929fb7c4 Fix phpcs 2021-10-22 15:42:18 +02:00
Laurent Destailleur
6c9cddaa9c
Merge pull request #19092 from rfranks-securenet/14.0
Fixed ref_ext missing from supplier invoice in REST API
2021-10-22 14:24:36 +02:00
Laurent Destailleur
42dceeafd4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 11:58:17 +02:00
Laurent Destailleur
f354427b3c Fix warning 2021-10-22 11:58:00 +02:00
Laurent Destailleur
0f6cafb719
Merge pull request #19088 from frederic34/fixdoubleextrafieldbug
fix more than one extrafield cause bug sql
2021-10-22 11:45:49 +02:00
rfranks-securenet
7ba8cad2aa
Merge branch 'Dolibarr:14.0' into 14.0 2021-10-22 10:42:00 +01:00
Laurent Destailleur
52d3c2aa57
Merge pull request #19084 from dpriskorn/patch-12
api_supplier_invoices.class.php: Add 2 examples
2021-10-22 11:41:37 +02:00
Laurent Destailleur
8137612b61
Merge pull request #19080 from frederic34/patch-2
fix missing code comment
2021-10-22 11:40:46 +02:00
Laurent Destailleur
e4a757ff9e
Merge pull request #19086 from FHenry/14_fix_various_warning
fix: fix various php warning
2021-10-22 11:39:48 +02:00
Richard Franks
98eb07d6f2 FIX #18695 Added ref_ext to supplier invoice
Added ref_ext to the fields for create, fetch and update functions
on fournisseur.facture class. This enables the REST API to use
this field for additional information.
2021-10-22 10:39:14 +01:00
Laurent Destailleur
8289eec510
Merge pull request #19087 from FHenry/14_fix_moduilebuilder
fix: bad comma SQL request in modulebuilder template list
2021-10-22 11:33:09 +02:00
Laurent Destailleur
ce1880b12d
Merge pull request #19090 from evarisk-theo/fix-delete-categories-when-linked-to-some-objects
Fix: can't delete categories when linked to some objects
2021-10-22 11:32:39 +02:00
Theo
0d868aa0d9 Fix: can't delete categories when linked to some objects 2021-10-22 11:14:04 +02:00
Frédéric FRANCE
c789b12715 fix more than one extrafield cause bug sql 2021-10-22 11:07:38 +02:00
Florian HENRY
6c71cc1e14 better correction from modulebuilder source of #19081 2021-10-22 11:03:35 +02:00
Florian HENRY
0c770b8810 fix various warning 2021-10-22 10:54:33 +02:00
Florian HENRY
9a9ed8989e fix various warning 2021-10-22 10:50:54 +02:00
Florian HENRY
444f7703a6 fix various warning 2021-10-22 10:50:24 +02:00
stickler-ci
ba8ef15916 Fixing style errors. 2021-10-22 08:50:15 +00:00
Florian HENRY
64bb2e6ece fix various warning 2021-10-22 10:49:47 +02:00
Laurent Destailleur
f0394c42d5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-22 10:49:29 +02:00
Laurent Destailleur
962aa9f977 Fix #yogosha7494 2021-10-22 10:49:01 +02:00
stickler-ci
4d63586e2a Fixing style errors. 2021-10-22 08:22:23 +00:00
Dennis Priskorn
e2e3e8ef7b
Update api_supplier_invoices.class.php
Add 2 examples
2021-10-22 10:18:23 +02:00
Laurent Destailleur
6af889d26f
Merge pull request #19081 from frederic34/patch-4
fix sql error
2021-10-22 10:09:13 +02:00
Frédéric FRANCE
0adb910e56
fix sql error 2021-10-22 07:27:10 +02:00
Frédéric FRANCE
d1c9877c41
fix missing code comment 2021-10-22 07:02:44 +02:00
Laurent Destailleur
8bb8e92ff2
Merge pull request #19034 from prietojc/patch-17
FIX card.php
2021-10-22 00:02:35 +02:00
Laurent Destailleur
f7b12208d1
Merge pull request #18802 from javieralapps4up/14.0
Close: #18801 Jan-30 + 1m IS NOT Mar-2
2021-10-22 00:01:42 +02:00
Laurent Destailleur
0562744fd3
Merge pull request #19074 from atm-maxime/fix_expense_report_rules2
Fix expense report warning display + translations
2021-10-21 23:57:50 +02:00
Maxime Kohlhaas
860fb21d2d Fix expense report warning display + translations 2021-10-21 23:52:05 +02:00
Laurent Destailleur
80aebef63f
Merge pull request #19024 from daraelmin/daraelmin-patch-5
Fix adhtype amount as default on new subscription
2021-10-21 23:48:58 +02:00
Laurent Destailleur
2741e12376
Merge pull request #19033 from hregis/fix_wrong_sql_index
FIX compatibility with Multicompany
2021-10-21 23:47:44 +02:00
Laurent Destailleur
2d2d1538a5
Merge pull request #19038 from frederic34/patch-1
doxygen
2021-10-21 23:35:44 +02:00
Laurent Destailleur
9f6cfc5a07
Merge pull request #19036 from hregis/fix_missing_sql_filter_by_entity
FIX missing sql filter by entity
2021-10-21 23:35:29 +02:00
Laurent Destailleur
18e421448c
Merge pull request #19041 from frederic34/patch-5
doxygen
2021-10-21 23:34:42 +02:00
Laurent Destailleur
15dd0f7ab3 New feature 2021-10-21 23:34:25 +02:00
Laurent Destailleur
556a6eaaf3
Merge pull request #19040 from frederic34/patch-4
doxygen
2021-10-21 23:22:06 +02:00
Laurent Destailleur
0b5d63aabe
Merge pull request #19043 from frederic34/patch-7
doxygen
2021-10-21 23:21:55 +02:00
Laurent Destailleur
0d4d192b3c
Merge pull request #19071 from ns-info90/patch-1
Fix can't generate pdf last_main_doc
2021-10-21 23:21:39 +02:00
Laurent Destailleur
9a989ca308
Merge pull request #19044 from frederic34/patch-8
doxygen
2021-10-21 23:20:32 +02:00
Laurent Destailleur
16d2a9c1bd
Merge pull request #19046 from frederic34/patch-10
doxygen
2021-10-21 23:20:17 +02:00
Laurent Destailleur
988f208dff
Merge pull request #19042 from frederic34/patch-6
doxygen
2021-10-21 23:20:03 +02:00
Laurent Destailleur
82be96e254
Merge pull request #19039 from frederic34/patch-2
doxygen
2021-10-21 23:07:13 +02:00
Laurent Destailleur
42fa0c3025
Merge pull request #19048 from frederic34/patch-12
doxygen
2021-10-21 23:05:20 +02:00
Laurent Destailleur
7ea993e448
Merge pull request #19045 from frederic34/patch-9
doxygen
2021-10-21 23:03:55 +02:00
Laurent Destailleur
47ae8dbde0
Merge pull request #19047 from frederic34/patch-11
doxygen
2021-10-21 23:03:32 +02:00
Laurent Destailleur
e71f3e6d80
Merge pull request #19049 from frederic34/patch-13
doxygen
2021-10-21 23:03:22 +02:00