2
0
forked from Wavyzz/dolibarr
Commit Graph

17941 Commits

Author SHA1 Message Date
Laurent Destailleur
1264857211 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/js/timesheet.js
2019-04-24 10:24:32 +02:00
Laurent Destailleur
0090b26946 Merge pull request #11049 from frederic34/patch-5
Update mod_expedition_ribera.php
2019-04-24 10:10:11 +02:00
Laurent Destailleur
ad9dfc826a Merge pull request #11051 from frederic34/patch-7
Update mod_commande_saphir.php
2019-04-24 10:09:58 +02:00
Laurent Destailleur
7ad214b2f1 Merge pull request #11052 from frederic34/patch-8
Update mod_chequereceipt_thyme.php
2019-04-24 10:09:38 +02:00
Laurent Destailleur
49c7d07e8c Merge pull request #11050 from frederic34/patch-6
Update mod_contract_magre.php
2019-04-24 10:09:28 +02:00
Laurent Destailleur
a1bff2ca36 Merge pull request #11048 from frederic34/patch-2
Update mod_bom_advanced.php
2019-04-24 10:09:07 +02:00
Laurent Destailleur
6d397316d6 Merge pull request #11053 from frederic34/patch-9
In export modules, id is string
2019-04-24 10:08:30 +02:00
Regis Houssin
41a82023e3 FIX missing compatibility with multicompany 2019-04-24 08:17:10 +02:00
Laurent Destailleur
684e09fdcd NEW Add function isValidVATID() 2019-04-23 22:49:33 +02:00
Laurent Destailleur
742de5c777 Fix pdf of expense report 2019-04-23 16:04:53 +02:00
Laurent Destailleur
633eb1d6c6 Remove warning 2019-04-23 13:28:42 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
8d0825910a Fix warnings 2019-04-23 10:38:20 +02:00
Laurent Destailleur
7c7c4f0d93 Removed warnings 2019-04-23 10:24:16 +02:00
Laurent Destailleur
f19d96bf8d NEW Show enabled modules in dol_print_error 2019-04-23 10:24:05 +02:00
Laurent Destailleur
a50fc9189b Fix phpcs 2019-04-22 15:45:44 +02:00
Laurent Destailleur
9e91826dea Can set length of random password 2019-04-22 14:12:58 +02:00
Laurent Destailleur
be726c2376 Code comment 2019-04-22 12:44:25 +02:00
Laurent Destailleur
24572e2f82 Remove warnings 2019-04-22 12:42:46 +02:00
Laurent Destailleur
6da42941a8 NEW Add attached document on bank account visible in automatic ECM. 2019-04-21 19:54:30 +02:00
Frédéric FRANCE
53c851de7b Update export_csv.modules.php 2019-04-20 11:42:25 +02:00
Frédéric FRANCE
a0ce52bb23 Update export_excel.modules.php 2019-04-20 11:41:37 +02:00
Frédéric FRANCE
73b32f0679 Update export_excel2007.modules.php 2019-04-20 11:41:19 +02:00
Frédéric FRANCE
06a8513575 Update export_excel2007new.modules.php 2019-04-20 11:40:59 +02:00
Frédéric FRANCE
b05a5e49ff Update export_tsv.modules.php 2019-04-20 11:39:38 +02:00
Frédéric FRANCE
e5559ac2f9 Update mod_chequereceipt_thyme.php
The property db does not exist on mod_chequereceipt_thyme.
2019-04-20 09:36:47 +02:00
Frédéric FRANCE
fbf718f330 Update mod_commande_saphir.php 2019-04-20 09:34:23 +02:00
Frédéric FRANCE
bed3ed705c Update mod_contract_magre.php
The property db does not exist on mod_contract_magre.
2019-04-20 09:31:53 +02:00
Frédéric FRANCE
9b9d4ddc45 Update mod_expedition_ribera.php
The property db does not exist on mod_bom_advanced.
2019-04-20 09:29:24 +02:00
Frédéric FRANCE
e9b13baac2 Update mod_bom_advanced.php
The property db does not exist on mod_bom_advanced.
2019-04-20 09:27:15 +02:00
Laurent Destailleur
734b1ca7c1 Fix phpcs 2019-04-19 22:18:08 +02:00
Laurent Destailleur
a0cd053206 Merge branch 'develop' into patch-2 2019-04-19 13:04:52 +02:00
Laurent Destailleur
6ed616a969 Merge pull request #11042 from aspangaro/10.0_assets
Assets - Debug - Look & field v10
2019-04-19 13:02:50 +02:00
Laurent Destailleur
31167857b5 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-19 13:01:14 +02:00
Laurent Destailleur
a438f688fb Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-19 13:00:37 +02:00
Laurent Destailleur
99f5bf2a6c Merge pull request #11027 from AXeL-dev/patch-8
Fix debugbar module class
2019-04-19 13:00:37 +02:00
Laurent Destailleur
ecf3bc6402 Fix phpcs 2019-04-19 13:00:10 +02:00
florian HENRY
83cf08f2eb fix php warning 2019-04-18 20:37:27 +02:00
Frédéric FRANCE
315349a681 replace @public by @var 2019-04-18 18:41:02 +02:00
Alexandre SPANGARO
3729e32368 Assets - Debug - Look & field v10 2019-04-18 14:13:48 +02:00
Frédéric FRANCE
4912c69d8a Update functions2.lib.php 2019-04-18 10:12:00 +02:00
florian HENRY
2b6cdd2e33 Fix workfolow module launch trigger on order close 2019-04-18 10:01:05 +02:00
Christophe Battarel
0b5cb9770f use dol_escapa_js 2019-04-18 09:59:39 +02:00
Christophe Battarel
79fc351cbd credentials 2019-04-17 09:26:45 +02:00
Alexandre SPANGARO
3091288ed7 Revert "Move to Warning an alert on hook when method return a string than a int"
This reverts commit cc5727bc7b.
2019-04-17 07:27:38 +02:00
Alexandre SPANGARO
660a1cea1d NEW Accounting - Add rights on export, delete operations in ledger 2019-04-17 07:26:39 +02:00
AXeL-dev
bef38c9abe debugbar module class: remove unreached part of code (may generate errors on call) 2019-04-17 00:33:49 +01:00
Laurent Destailleur
b5bf6830e9 Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
ATM john
945e3db952 remove text 2019-04-16 22:03:11 +02:00
ATM john
965c973bda Change class name 2019-04-16 22:02:23 +02:00