Commit Graph

113 Commits

Author SHA1 Message Date
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
8113321062 Start to work on email sender profiles 2017-10-13 12:02:26 +02:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
Laurent Destailleur
4e34c13e49 Debug 2017-10-09 16:49:17 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Laurent Destailleur
c65f794f87 Code comment 2017-09-24 10:29:48 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00
Laurent Destailleur
9875d20eaf Add more columns in list of invoices templates 2017-09-21 18:35:47 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
6ac1b6e82e Fix template 2017-09-18 15:48:04 +02:00
Laurent Destailleur
0cf67944fa Clean code 2017-09-16 13:14:46 +02:00
Laurent Destailleur
8dcd864477 Rename var $mode to avoid conflicts 2017-09-15 15:57:07 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
c9c91193de Code comment 2017-09-12 14:56:56 +02:00
Laurent Destailleur
bc15a0f8e0 Fix search criteria list 2017-09-12 14:50:12 +02:00
Laurent Destailleur
8cb9e8c2da Add $object into hooks 2017-09-11 16:26:01 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
7dbd0bd355 FIX Some page of admin were not responsive 2017-09-08 10:09:22 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
326d3df63f FIX select of category
FIX pb with extrafield list and key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e FIX select of category
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Laurent Destailleur
d511fed504 Enhance modulebuilder 2017-07-25 12:44:55 +02:00
Laurent Destailleur
13cd203502 Enhance modulebuilder 2017-07-25 01:54:54 +02:00
Laurent Destailleur
f6ab691c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 01:22:29 +02:00
Laurent Destailleur
e62a8d7bfa Debug modulebuilder 2017-07-25 01:22:06 +02:00
Laurent Destailleur
aff61fad7d Fix new generic classes system 2017-07-25 01:21:20 +02:00
Laurent Destailleur
4ae60284fb Debug modulebuilder 2017-07-25 00:03:29 +02:00
Laurent Destailleur
41c6d9cbfb Debug modulebuilder 2017-07-25 00:00:08 +02:00
Laurent Destailleur
8303cee676 Debug modulebuilder 2017-07-24 21:03:35 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +02:00
Laurent Destailleur
f64a9968a9 Debug modulebuilder 2017-07-22 01:00:43 +02:00
Laurent Destailleur
3db7bd7624 Fix look and feel v6 2017-07-13 17:44:12 +02:00
Laurent Destailleur
fb0298ff1c Fix template should work if module in root dir 2017-07-13 09:15:37 +02:00
Laurent Destailleur
0b4a1d9b65 Protection to avoid mass action execution when not required 2017-07-13 02:49:40 +02:00
Laurent Destailleur
9127892c71 Fix several minor bugs 2017-07-13 02:33:48 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
33ceb22b8b Fix error management into modulebuilder 2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15 Debug modulebuilder 2017-07-12 11:52:07 +02:00
Laurent Destailleur
11cc1f04c4 Work on modulebuilder 2017-07-12 01:55:07 +02:00
Laurent Destailleur
b016b1ca5f Fix typo 2017-07-11 23:19:47 +02:00
Laurent Destailleur
ceeb9d7f1b Debug modulebuilder 2017-07-11 20:47:49 +02:00
Laurent Destailleur
cf6745b1ae Debug module builder 2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888 Debug modulebuilder 2017-07-08 15:43:36 +02:00
Laurent Destailleur
0b7c768f29 FIX Usage of production mode with REST Api. 2017-06-25 18:18:17 +02:00
Laurent Destailleur
d2fd4d6978 Better path to laod main.inc.php 2017-06-23 23:36:25 +02:00
Laurent Destailleur
247803f894 Better templates 2017-06-23 20:03:15 +02:00
Laurent Destailleur
5ed8340d0e Fix no record found into lists 2017-06-22 15:22:44 +02:00
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00