Laurent Destailleur
|
87ff94fc64
|
Add generic fields
|
2020-04-05 03:59:23 +02:00 |
|
Laurent Destailleur
|
50790a7f36
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/filefunc.inc.php
|
2020-04-05 03:44:06 +02:00 |
|
Laurent Destailleur
|
eac75497c0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-04-05 03:42:12 +02:00 |
|
Laurent Destailleur
|
d0c4af5855
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-04-05 03:42:05 +02:00 |
|
Laurent Destailleur
|
8a14652eae
|
Merge pull request #13449 from atm-quentin/FIX_missing_default_accountancy_product_buy_code
FIX missing default accountancy product buy code
|
2020-04-05 03:41:46 +02:00 |
|
Laurent Destailleur
|
25320e5a36
|
Merge pull request #13494 from ptibogxiv/patch-321
NEW display weight in shipment list
|
2020-04-05 03:20:56 +02:00 |
|
Laurent Destailleur
|
0aee0028c2
|
Merge pull request #13489 from andreubisquerra/develop
Receipt compatibility with receipt printer module
|
2020-04-05 03:20:14 +02:00 |
|
Laurent Destailleur
|
b6a0432589
|
Merge pull request #13495 from atm-maxime/new_report_supplier_turnover
New report supplier turnover
|
2020-04-05 03:19:18 +02:00 |
|
Laurent Destailleur
|
165df931f1
|
Complete fix #13491
|
2020-04-05 03:14:12 +02:00 |
|
Laurent Destailleur
|
aba401e37e
|
Merge pull request #13497 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2020-04-05 02:55:10 +02:00 |
|
Laurent Destailleur
|
22a8c207f4
|
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
|
2020-04-05 02:54:41 +02:00 |
|
Scrutinizer Auto-Fixer
|
612bac6598
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-05 00:44:59 +00:00 |
|
Laurent Destailleur
|
2f1b25c67a
|
Fix property not defined
|
2020-04-05 02:43:30 +02:00 |
|
Laurent Destailleur
|
683ddac0d4
|
Merge pull request #13493 from ptibogxiv/patch-320
FIX child categories only with good entity rights
|
2020-04-05 02:40:43 +02:00 |
|
Laurent Destailleur
|
a8710c2109
|
Merge pull request #13481 from frederic34/patch-6
fix tooltip for list.php
|
2020-04-05 02:40:10 +02:00 |
|
Laurent Destailleur
|
a41f54c82f
|
Fix css
|
2020-04-05 02:39:40 +02:00 |
|
Laurent Destailleur
|
ed0f6b56b9
|
FIX: The "test smtp connectivity" failed on page to setup mass emailing
|
2020-04-05 00:29:34 +02:00 |
|
Laurent Destailleur
|
5583ad9c38
|
Fix
|
2020-04-04 23:39:44 +02:00 |
|
Laurent Destailleur
|
64aa231e33
|
Avoid password in files
|
2020-04-04 23:32:02 +02:00 |
|
Laurent Destailleur
|
716e037761
|
Fix previous login if first login
|
2020-04-04 23:31:17 +02:00 |
|
Maxime Kohlhaas
|
fd5b2ba391
|
New supplier turnover by product service report
|
2020-04-04 23:29:45 +02:00 |
|
Laurent Destailleur
|
a89b873bd1
|
Look and feel v12
|
2020-04-04 19:30:16 +02:00 |
|
Laurent Destailleur
|
647d09050b
|
Clean not required vars
|
2020-04-04 19:25:36 +02:00 |
|
Laurent Destailleur
|
8454598722
|
WIP Add tables to manage categories of website pages.
|
2020-04-04 18:59:26 +02:00 |
|
Maxime Kohlhaas
|
60bd0e49ec
|
Fix missing token
|
2020-04-04 18:57:51 +02:00 |
|
Laurent Destailleur
|
9849afd3dd
|
WIP Add tables to manage categories of website pages.
|
2020-04-04 18:53:38 +02:00 |
|
Maxime Kohlhaas
|
fe876b96fe
|
Fix links + getEntity
|
2020-04-04 18:49:30 +02:00 |
|
Maxime Kohlhaas
|
79e5099c6d
|
Add menu entries
|
2020-04-04 18:45:33 +02:00 |
|
Laurent Destailleur
|
9307e3821f
|
Fix import_key was erased after update
|
2020-04-04 18:35:40 +02:00 |
|
Laurent Destailleur
|
c22a6ad98c
|
Add sections intro and content
|
2020-04-04 18:18:58 +02:00 |
|
Laurent Destailleur
|
493a6d9709
|
Fix trans
|
2020-04-04 17:46:41 +02:00 |
|
Maxime Kohlhaas
|
1adfe5c21f
|
New supplier turnover by product service report
|
2020-04-04 15:45:32 +02:00 |
|
Maxime Kohlhaas
|
863f8dd1d6
|
New supplier turnover by thirdparty report
|
2020-04-04 15:38:22 +02:00 |
|
Maxime Kohlhaas
|
67f9b218c5
|
New supplier turnover report
|
2020-04-04 15:38:01 +02:00 |
|
stickler-ci
|
a87755390d
|
Fixing style errors.
|
2020-04-04 10:48:12 +00:00 |
|
ptibogxiv
|
101fd8e07b
|
NEW display weight in shipment list
usefull to prepare truck before delivery
|
2020-04-04 12:46:02 +02:00 |
|
ptibogxiv
|
c7cdb64087
|
FIX child categories only with good entity rights
fix v9 to develop
display only categories with good entity rights ( intradolibarr or via REST API)
|
2020-04-04 11:07:48 +02:00 |
|
Laurent Destailleur
|
221f20e13f
|
Fix merge
|
2020-04-03 19:24:16 +02:00 |
|
Laurent Destailleur
|
28a1b7af35
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-04-03 18:07:24 +02:00 |
|
Laurent Destailleur
|
e6641b5369
|
Fix doc
|
2020-04-03 18:01:54 +02:00 |
|
Laurent Destailleur
|
d46417c8bd
|
FIX #13482
|
2020-04-03 17:53:17 +02:00 |
|
Laurent Destailleur
|
372d719693
|
#13482
|
2020-04-03 15:48:54 +02:00 |
|
Laurent Destailleur
|
e9bddf5c26
|
Fix enable/disable of module
|
2020-04-03 15:36:41 +02:00 |
|
Laurent Destailleur
|
d7e4e5f18c
|
Fix modulebuilder clone message
|
2020-04-03 15:14:59 +02:00 |
|
Laurent Destailleur
|
a13287e285
|
Fix: validate of object is ok even if some fields are missing
|
2020-04-03 14:56:15 +02:00 |
|
Laurent Destailleur
|
a5a5fe55f6
|
Code simpler
|
2020-04-03 14:55:46 +02:00 |
|
atm-lena
|
bc0d98b91c
|
FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation
|
2020-04-03 14:24:59 +02:00 |
|
Laurent Destailleur
|
f7b6895dc6
|
Fix option to not generate doc in modulebuilder.
|
2020-04-03 14:02:37 +02:00 |
|
ptibogxiv
|
99e53f6b18
|
FIX preg_math
|
2020-04-03 13:12:00 +02:00 |
|
Laurent Destailleur
|
71910b2181
|
Fix warning
|
2020-04-03 13:01:17 +02:00 |
|