Commit Graph

63227 Commits

Author SHA1 Message Date
elarifr
c7129cdd71 quadra format date is wrong
need amount in cent without decimal symbol
need to remove accent as it give two ascii and break import
2017-11-19 19:42:16 +01:00
Laurent Destailleur
4ad0d5df43 Fix scrutinizer issues 2017-11-19 16:55:28 +01:00
Laurent Destailleur
248a359ac9 Fix phpcs 2017-11-19 16:30:05 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
Laurent Destailleur
4938a0ba2a Add param forcenowrap on tooltip function 2017-11-19 12:41:37 +01:00
Laurent Destailleur
47afe470eb Merge small js into lib_header.js.php
Move filemanager.tpl.php
CSS enhancement
2017-11-19 12:22:01 +01:00
Laurent Destailleur
9f5b73f4e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/website/index.php
2017-11-18 22:19:15 +01:00
Laurent Destailleur
9b1470dab5 Work on generic filemanager component 2017-11-18 22:13:19 +01:00
Laurent Destailleur
7288c18574 Work on generic filemanager component 2017-11-18 15:41:30 +01:00
Laurent Destailleur
90684750c1 CSS 2017-11-18 13:09:12 +01:00
Laurent Destailleur
bcaccb1829 Add layout into link of sub resources to solve undesired cache effect 2017-11-18 12:35:25 +01:00
Laurent Destailleur
f284cd6c0f Fix phpcs 2017-11-18 02:15:56 +01:00
Laurent Destailleur
14946a0dfa Fix sort on status 2017-11-18 02:14:04 +01:00
Laurent Destailleur
a00353f332 Fix link to create invoice from template on list 2017-11-18 02:07:52 +01:00
Laurent Destailleur
56036d3024 Fix css 2017-11-18 02:03:10 +01:00
Laurent Destailleur
fc1441086c Fix status in template invoice 2017-11-18 02:01:04 +01:00
Laurent Destailleur
80bdb45be8 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:48:16 +01:00
Laurent Destailleur
7ddf1669ef Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:34:20 +01:00
Laurent Destailleur
742bf29c65 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:29:42 +01:00
Laurent Destailleur
03cc685037 NEW Add a status enabled/disabled on recurring invoices 2017-11-18 00:54:23 +01:00
Laurent Destailleur
cf0d67d71c Generation of pdf become default value 2017-11-17 23:57:32 +01:00
Laurent Destailleur
2caeafc03b NEW Compatibility with PHP 7.2 2017-11-17 18:32:37 +01:00
Laurent Destailleur
bbf755f0b1 Fix for PHP7.2 2017-11-17 18:20:24 +01:00
Laurent Destailleur
b07895a26a Fix for php7.2 2017-11-17 18:04:55 +01:00
Laurent Destailleur
ede1f3fdfc PHP7.2 2017-11-17 17:53:20 +01:00
Laurent Destailleur
5d8674a9f4 Fix php7.2 2017-11-17 17:35:29 +01:00
Laurent Destailleur
9a70f6eed6 Fix for php 7.2 2017-11-17 17:29:21 +01:00
Laurent Destailleur
2d23d71489 Add php uniu version 2017-11-17 17:27:02 +01:00
Laurent Destailleur
7349b5d793 Fix php 7.2 2017-11-17 17:23:56 +01:00
Laurent Destailleur
0b349bef60 Test php 7.2 2017-11-17 17:15:23 +01:00
Laurent Destailleur
87bfe3292c Add php 7.2 2017-11-17 17:13:30 +01:00
Laurent Destailleur
e7121cda81 Disable some test with php 7.2 2017-11-17 17:11:35 +01:00
Laurent Destailleur
0be11e5e45 Fix phpunit 2017-11-17 16:06:55 +01:00
Laurent Destailleur
2705030006 Code comment 2017-11-17 15:34:15 +01:00
Laurent Destailleur
2cb190fc5c Fix return code 2017-11-17 15:27:59 +01:00
Laurent Destailleur
77a0762fc1 Fix comment 2017-11-17 15:07:32 +01:00
Laurent Destailleur
2f6dfc2387
Merge pull request #7800 from atm-maxime/new_deposit_convert_unpaid
NEW deposits can be converted even if unpaid
2017-11-17 15:05:33 +01:00
Laurent Destailleur
ead629708c Look and feel v6 2017-11-17 14:57:14 +01:00
Laurent Destailleur
405275693f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/replenishorders.php
	htdocs/projet/activity/perday.php
2017-11-17 14:20:08 +01:00
Laurent Destailleur
a6e4e4ddb0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/product/stock/replenishorders.php
2017-11-17 14:17:49 +01:00
Laurent Destailleur
c3c14277e1 Merge 2017-11-17 14:15:07 +01:00
Laurent Destailleur
42b7d80567 FIX #7824
Conflicts:
	htdocs/product/stock/replenishorders.php
2017-11-17 14:12:53 +01:00
Laurent Destailleur
fde33594a2 FIX #7824 2017-11-17 14:06:08 +01:00
Laurent Destailleur
7f28c9fff6 FIX #7824
Conflicts:
	htdocs/product/stock/replenishorders.php
2017-11-17 14:01:21 +01:00
Laurent Destailleur
57a6ada2a3 FIX #7824 2017-11-17 13:57:40 +01:00
Laurent Destailleur
25a2e6f577 FIX #7824 2017-11-17 13:56:41 +01:00
Laurent Destailleur
97d38f32ad
Merge pull request #7822 from atm-maxime/new_contract_replicate_extraf
New extrafields replicated on contract creation
2017-11-17 13:20:10 +01:00
Laurent Destailleur
68f477eaf7
Merge pull request #7818 from dolibarr95/patch-29
Fix : syntax error in dol_print_graph()
2017-11-17 13:18:11 +01:00
Laurent Destailleur
7946f4a612
Merge pull request #7817 from grandoc/new_branch_15_11_17
better handle of errors
2017-11-17 13:09:35 +01:00
Laurent Destailleur
2077f7ad96
Update expensereport.class.php 2017-11-17 13:09:03 +01:00