Alexandre SPANGARO
|
cd018b2b65
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a4
|
2019-11-18 06:08:49 +01:00 |
|
Laurent Destailleur
|
b69a7f9709
|
css
|
2019-11-17 20:25:39 +01:00 |
|
Laurent Destailleur
|
20b07529cb
|
css
|
2019-11-17 17:45:00 +01:00 |
|
Laurent Destailleur
|
16d67a1a8e
|
Fix several trouble with some types in modulebuilder
Fix difference between null and 0
|
2019-11-17 17:36:36 +01:00 |
|
Laurent Destailleur
|
502626156e
|
Work on MRP module
|
2019-11-17 01:23:19 +01:00 |
|
Laurent Destailleur
|
662c622432
|
Debug MRP
|
2019-11-17 00:37:08 +01:00 |
|
Laurent Destailleur
|
e15963688a
|
Merge pull request #12435 from OPEN-DSI/fix-product-virtual-stock-stats-sending
FIX add product qty in shipment already sent only if reel stock was d…
|
2019-11-16 23:34:44 +01:00 |
|
Laurent Destailleur
|
7a4647b3fb
|
Merge pull request #12458 from frederic34/doxygen_accountancy
doxygen accountancy class
|
2019-11-16 23:31:56 +01:00 |
|
Laurent Destailleur
|
168ec0955c
|
Merge pull request #12461 from Dolibarr/scrutinizer-patch-9
Scrutinizer Auto-Fixes
|
2019-11-16 23:29:32 +01:00 |
|
Laurent Destailleur
|
023f359328
|
Fix php compatibility
|
2019-11-16 23:28:56 +01:00 |
|
Scrutinizer Auto-Fixer
|
eba082320c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:25:24 +00:00 |
|
Scrutinizer Auto-Fixer
|
1648fc142e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:24:29 +00:00 |
|
Laurent Destailleur
|
e7276f9044
|
Fix scrutinizer error
|
2019-11-16 23:22:28 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Laurent Destailleur
|
6dcd1f6275
|
Fix css
|
2019-11-16 13:50:12 +01:00 |
|
Laurent Destailleur
|
f40fdad06c
|
Fix link between translations
|
2019-11-16 12:54:05 +01:00 |
|
Laurent Destailleur
|
c5b83ca3d8
|
Fix link translation of
|
2019-11-16 12:43:44 +01:00 |
|
Laurent Destailleur
|
53bbfcff6b
|
Fix link translation of
|
2019-11-16 12:43:32 +01:00 |
|
Laurent Destailleur
|
6cf368189f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-16 12:18:13 +01:00 |
|
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 |
|
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
|
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 |
|