Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,721 Commits 36 Branches 189 Tags
3a8bde227b199167f1c16f3670a675eb7b1560eb
Commit Graph

30 Commits

Author SHA1 Message Date
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Laurent Destailleur
489e766cbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:22:50 +02:00
Laurent Destailleur
86d8513138 Merge pull request #9309 from frederic34/trimtrailing2 
last trimtrailing
 2018-08-29 17:57:05 +02:00
ptibogxiv
b9179f27a0 Fix multicompany in ticket/list.php 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2018-08-29 17:55:55 +02:00
Laurent Destailleur
8fc289b7bb Merge pull request #9324 from ptibogxiv/patch-43 
Fix multicompany in ticket/list.php
 2018-08-29 17:53:28 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
ptibogxiv
5f94bffa25 Fix multicompany in ticket/list.php 2018-08-29 12:26:31 +02:00
Frédéric FRANCE
1182f29864 trimtrailing 2018-08-28 08:33:02 +02:00
Laurent Destailleur
7219bac0b2 Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
1842a4bb41 Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Laurent Destailleur
14dc748523 Update actions_ticket.class.php 2018-08-28 01:40:27 +02:00
Philippe GRAND
30992f2730 Standardize and update code 2018-08-23 18:52:47 +02:00
Philippe GRAND
74ce0bfea6 Standardize and update code 2018-08-23 16:54:24 +02:00
Philippe GRAND
80b7229174 Standardize and update code 2018-08-23 11:34:55 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Frédéric FRANCE
f815915318 Update actions_ticket.class.php 2018-08-22 22:51:09 +02:00
Philippe GRAND
0c75c41e7b Update and standardize code 2018-08-22 19:56:24 +02:00
Laurent Destailleur
5c712a6cd3 Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
d25fa61998 return comment 2018-08-14 13:14:55 +02:00
Frédéric FRANCE
6f74ecceaf Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
79aaddbb66 test phpcs v3 2018-08-09 14:46:00 +02:00
Frédéric FRANCE
5f4d54ede5 correct space 2018-08-07 17:17:58 +02:00
Juanjo Menent
37a9a2df56 Merge pull request #9167 from frederic34/include 
Include and co are statements
 2018-08-02 11:03:44 +02:00
Philippe GRAND
4eacad52f2 Clean and update code 2018-07-27 10:06:56 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Philippe GRAND
010c5af245 Clean and update code 2018-07-19 16:48:20 +02:00
Laurent Destailleur
8df834bd2a Debug module ticket 2018-07-16 12:13:34 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00