2
0
forked from Wavyzz/dolibarr
Commit Graph

81180 Commits

Author SHA1 Message Date
Laurent Destailleur
2d73dc8f5c Fix new line 2019-11-16 12:17:37 +01:00
Frédéric FRANCE
5c0976a778 doxygen accountancy class 2019-11-16 09:58:14 +01:00
Alexandre SPANGARO
3937b45c5f Core - Fix accountancy write social contribution in bookkeeping (Need for FEC format) 2019-11-16 07:51:38 +01:00
Laurent Destailleur
7af6fa199c Merge pull request #12452 from c3do/patch-2
Implement categorie field ref_ext
2019-11-16 00:53:28 +01:00
Laurent Destailleur
df9737f3d4 Merge pull request #12445 from c3do/patch-1
API New get categories linked to an object
2019-11-16 00:51:42 +01:00
Laurent Destailleur
07be51c2fc Merge pull request #12447 from hregis/develop_mc
FIX better look compatibility with Multicompany
2019-11-16 00:49:37 +01:00
Laurent Destailleur
8f9ad0c5fb Merge pull request #12441 from frederic34/patch-6
Update api_thirdparties.class.php
2019-11-16 00:46:04 +01:00
Laurent Destailleur
e5daa73a9e Merge pull request #12444 from frederic34/doxygen_menubase
doxygen menubase class
2019-11-16 00:45:30 +01:00
Laurent Destailleur
8a5e1a5a36 Merge pull request #12440 from OPEN-DSI/new-api-users-get-info
NEW get user connected informations in REST API
2019-11-16 00:44:41 +01:00
Laurent Destailleur
bb493c6515 Merge pull request #12438 from atm-gauthier/8.0_invoice_createfromclone
FIX : wrong invoice id for fetchObjetctLinked
2019-11-16 00:43:18 +01:00
Laurent Destailleur
b44354af44 Merge pull request #12439 from ptibogxiv/patch-278
Fix adherent type v11
2019-11-16 00:42:22 +01:00
Laurent Destailleur
d2aa4ba54e Update adherent_type.class.php 2019-11-16 00:41:55 +01:00
Laurent Destailleur
f8d54561cc Merge pull request #12443 from frederic34/patch-8
doxygen
2019-11-16 00:39:53 +01:00
Laurent Destailleur
81aed6a1f7 Merge pull request #12442 from frederic34/patch-7
doxygen
2019-11-16 00:39:40 +01:00
Laurent Destailleur
3898db3956 FIX #12446 2019-11-16 00:39:23 +01:00
stickler-ci
17667d6a1b Fixing style errors. 2019-11-15 22:08:56 +00:00
Cédric
4332834ff7 Add all types everywhere 2019-11-15 23:08:25 +01:00
Cédric
71a6836588 Implement categorie field ref_ext 2019-11-15 16:12:35 +01:00
stickler-ci
cc6d8f159b Fixing style errors. 2019-11-15 13:47:40 +00:00
Cédric
fa3c63ea28 API New can include childs when get a category 2019-11-15 14:47:08 +01:00
Regis Houssin
bb8a4e9efc FIX better look compatibility with Multicompany 2019-11-15 09:02:21 +01:00
Cédric
0c9b4fe16b Add all types 2019-11-14 22:36:16 +01:00
Cédric
0f907fbc29 $type is mandatory 2019-11-14 22:26:15 +01:00
Cédric
100827ae0b Fix error process 2019-11-14 22:16:08 +01:00
Cédric
88692fe95d Doc for $page 2019-11-14 22:00:46 +01:00
stickler-ci
b2d18a8e0c Fixing style errors. 2019-11-14 20:56:31 +00:00
Cédric
837c7276ab API New get categories linked to an object 2019-11-14 21:57:21 +01:00
Laurent Destailleur
1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Frédéric FRANCE
7100328116 doxygen menubase class 2019-11-14 21:25:12 +01:00
Laurent Destailleur
7e52c70321 FIX Advisory ID: usd20190067 2019-11-14 21:16:18 +01:00
ptibogxiv
332c91aa11 Update adherent_type.class.php 2019-11-14 20:10:14 +01:00
ptibogxiv
fc2e0d4f95 Update adherent_type.class.php 2019-11-14 20:09:36 +01:00
stickler-ci
f369fa06a6 Fixing style errors. 2019-11-14 19:04:18 +00:00
ptibogxiv
892b61f1c2 Update adherent_type.class.php 2019-11-14 20:02:44 +01:00
Frédéric FRANCE
67d05cae1b doxygen 2019-11-14 19:06:14 +01:00
Frédéric FRANCE
e73202c2af Update user.class.php 2019-11-14 18:47:16 +01:00
Frédéric FRANCE
91eb6eb7d7 Update user.class.php 2019-11-14 18:44:18 +01:00
Frédéric FRANCE
1936b11db8 doxygen 2019-11-14 18:40:30 +01:00
Frédéric FRANCE
fc55123af0 Update api_thirdparties.class.php 2019-11-14 18:31:09 +01:00
VESSILLER
4ea3fe7609 NEW get user connected informations in REST API 2019-11-14 17:57:29 +01:00
Laurent Destailleur
8ef9728470 Fix permission on file 2019-11-14 17:28:23 +01:00
stickler-ci
07880dd835 Fixing style errors. 2019-11-14 16:00:08 +00:00
Laurent Destailleur
f7ab1498a7 FIX Advisory ID: usd20190053 2019-11-14 17:00:02 +01:00
ptibogxiv
fee8e33e2b Update type.php 2019-11-14 16:58:17 +01:00
stickler-ci
280c0a56b6 Fixing style errors. 2019-11-14 15:37:54 +00:00
ptibogxiv
ae2ddb1f1e Fix adherent type v11 2019-11-14 16:36:07 +01:00
Laurent Destailleur
80b3e27341 Fix bad name of constant 2019-11-14 14:23:48 +01:00
Laurent Destailleur
7e0ae4bf0e FIX The pdf templates were using the large logo making PDF too large 2019-11-14 14:17:22 +01:00
Laurent Destailleur
4fc7b8c3b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
2019-11-14 12:49:42 +01:00
Laurent Destailleur
a29adc94f3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/card.php
	htdocs/langs/en_US/admin.lang
2019-11-14 12:48:33 +01:00