2
0
forked from Wavyzz/dolibarr
Commit Graph

18964 Commits

Author SHA1 Message Date
andreubisquerra
b2e995279e Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php 2019-11-25 19:29:07 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Laurent Destailleur
bc5270ce76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:15:25 +01:00
Laurent Destailleur
712ae48e4e Fix default setup 2019-11-24 18:07:38 +01:00
Laurent Destailleur
cf0311dd6a FIX Hook getAccessForbiddenMessage was missing parameters 2019-11-22 16:13:22 +01:00
Laurent Destailleur
32f590f274 Merge pull request #12485 from aspangaro/12.0_a2
NEW Add shipment widget
2019-11-22 14:39:56 +01:00
Laurent Destailleur
e2009ceff0 Fix extrafields of line for receptions 2019-11-22 14:22:35 +01:00
Laurent Destailleur
00ad95c01e Figth against useless dependencies: Remove library the core never use. 2019-11-22 14:06:43 +01:00
Laurent Destailleur
1ed2eacbef Debug add email profile 2019-11-22 12:40:17 +01:00
Laurent Destailleur
6191307865 Debug v11 2019-11-22 12:22:27 +01:00
Alexandre SPANGARO
f4e1361d06 NEW small fix 2019-11-22 06:53:05 +01:00
Laurent Destailleur
92a65a8039 Log 2019-11-21 21:36:03 +01:00
Laurent Destailleur
5fdd6f698d More complete error message
Conflicts:
	htdocs/core/class/CMailFile.class.php
2019-11-21 20:46:27 +01:00
Laurent Destailleur
b46362dff9 More complete error message 2019-11-21 20:45:19 +01:00
Laurent Destailleur
e8bc8b68c1 Fix missing field in migration 2019-11-21 18:17:40 +01:00
Anthony Berton
496aa0c065 Update functions.lib.php 2019-11-21 10:38:59 +01:00
Alexandre SPANGARO
2f064567ef NEW Add shipment widget 2019-11-21 07:50:44 +01:00
Laurent Destailleur
58c38912ab Fix action into actionlogin to avoid conflict 2019-11-20 16:42:18 +01:00
Laurent Destailleur
2f3b4d239b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:12 +01:00
Laurent Destailleur
6bfb76d40d Merge pull request #12464 from bb2a/patch-6
Update getfullname
2019-11-19 10:55:47 +01:00
Scrutinizer Auto-Fixer
cd7523318d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
5b6f0cb101 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
Laurent Destailleur
918f476c2b Fix backport fix not checking mandatory extrafields of type select 2019-11-18 19:02:12 +01:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00
Laurent Destailleur
b69a7f9709 css 2019-11-17 20:25:39 +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
Anthony Berton
7a5883588c Update commonobject.class.php 2019-11-17 14:07:01 +01:00
Anthony Berton
fe3c921152 Merge branch 'develop' into patch-4 2019-11-17 10:17:47 +01: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
Anthony Berton
e1f36ae107 Update functions.lib.php 2019-11-16 17:37:18 +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
c5b83ca3d8 Fix link translation of 2019-11-16 12:43:44 +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
3898db3956 FIX #12446 2019-11-16 00:39:23 +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
Laurent Destailleur
f7ab1498a7 FIX Advisory ID: usd20190053 2019-11-14 17:00:02 +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
7d997990fa Fix phpcs 2019-11-14 12:44:15 +01:00
Laurent Destailleur
8db4eff108 Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
2019-11-14 12:10:44 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:46 +00:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
411e9c87e3 Debug feature to set sender profiles 2019-11-14 11:53:28 +01:00
Laurent Destailleur
52787b56b2 Fix when limit = 0
Look and feel v11
2019-11-14 11:00:49 +01:00
Laurent Destailleur
75667833fe Fix missing ->msgid 2019-11-14 10:01:05 +01:00
Laurent Destailleur
95a6d7f8f5 Doxyen 2019-11-14 09:13:15 +01:00
Laurent Destailleur
56f2463a15 Merge branch 'develop' into patch-6 2019-11-14 08:53:53 +01:00
Laurent Destailleur
171b94fc5c Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00