lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

380 Commits

Author SHA1 Message Date
Laurent Destailleur
37795b1955 Trans 2019-10-08 15:40:07 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
Laurent Destailleur
b053663fe6 Look and feel v11 2019-10-05 13:13:11 +02:00
Laurent Destailleur
031c5523d4 NEW Add link to the public interface on the ticket card. 2019-10-05 11:52:30 +02:00
Laurent Destailleur
a06b1b9f3f Fix escaping chars 2019-10-05 11:43:28 +02:00
Laurent Destailleur
8bf9afb7ca FIX Attachement of linked files on ticket when sending a message 2019-10-04 19:41:35 +02:00
Laurent Destailleur
c3fa770871 FIX Filter "Open all" of ticket was ko. 2019-10-04 13:06:24 +02:00
altairis
699a3391c9 FCKeditor setup for tickets 2019-10-03 16:51:05 +02:00
Laurent Destailleur
f89701b4d4 Fix technical id align on left 2019-10-02 18:55:18 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
2d42afc686 FIX Filter on project on ticket list 2019-10-01 12:36:39 +02:00
Laurent Destailleur
800da4f30a FIX Filter on project on ticket list 2019-10-01 12:36:22 +02:00
Laurent Destailleur
9b607a3105 FIX navigation on ticket tab of projects 2019-10-01 12:29:58 +02:00
Laurent Destailleur
b08df75adb FIX navigation on ticket tab of projects 2019-10-01 12:28:56 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1 Fix bad name of trigger 2019-10-01 11:28:10 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
ATM john
e08fc2213c FIX : action com redirect 2019-09-30 20:44:56 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
d65af06d20
Merge pull request #11869 from atm-john/new_ticket_messaging_page 
New ticket messaging page design
 2019-09-30 15:34:35 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
John Botella
010e58d957 Add switch view behavior 2019-09-16 13:56:07 +02:00
Laurent Destailleur
84640d0cd5
Update messaging.php 2019-09-15 10:21:38 +02:00
stickler-ci
aed1c31158 Fixing style errors. 2019-09-12 19:19:49 +00:00
ATM john
859904587f add private support and title buttons 2019-09-12 21:17:48 +02:00
John Botella
7dcb871048 Fix private message type 2019-09-12 18:39:29 +02:00
ATM john
907669bb51 New ticket messaging page 2019-09-11 23:30:09 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Juanjo Menent
b45d3ea1a0 FIX #11804 2019-09-02 17:38:59 +02:00
Laurent Destailleur
48db5c2a44 Replace deprecated actioncomm->note into actioncomm->note_private 2019-08-31 02:46:39 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
ptibogxiv
7a2e08a681
Fix author in message / ticket API 2019-08-02 11:41:40 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
d495f7969f FIX #11412 2019-08-01 13:11:20 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
b8de18596a FIX #11543 2019-08-01 12:40:51 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
2867e31a63 Fix CSS 2019-07-27 01:13:39 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
feee437471 FIX Closing ticket from public interface 2019-07-19 23:43:49 +02:00
Laurent Destailleur
ec34ce1e64 Maxi debug of module ticket 2019-07-19 23:11:00 +02:00
Laurent Destailleur
e742c3eb20 Debug module ticket 2019-07-19 20:06:02 +02:00
Laurent Destailleur
327e5ebe78 FIX Show list of events on tickets 2019-07-19 19:09:38 +02:00
Laurent Destailleur
e5c3945ec3 FIX delete of links between objects 2019-07-19 18:10:45 +02:00
Laurent Destailleur
bd193b26f6 FIX Block to link with tickets 2019-07-19 18:02:39 +02:00
Laurent Destailleur
361fc53685 FIX div not balanced 2019-07-19 17:47:54 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Regis Houssin
c9fe91138d FIX better compatibility with Multicompany 2019-07-16 12:39:43 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook 2019-06-20 03:04:32 +02:00
Laurent Destailleur
f32b2e9f1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/includes/odtphp/odf.php
 2019-06-19 13:18:01 +02:00
Laurent Destailleur
8e8199cc0f Fix scrutinizer 2019-06-19 13:17:02 +02:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
969e139d5c Fix parameters of accessforbidden 2019-06-04 12:21:27 +02:00
Laurent Destailleur
410932f3f2 Trans 2019-05-26 12:01:08 +02:00
Laurent Destailleur
18f1952e2d Fix set of properties 2019-05-22 14:49:18 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
a75223c850 Debug ticket module 2019-05-02 13:53:13 +02:00
Laurent Destailleur
1ac2c5f6f3
Merge pull request #11083 from madx666/fix-ticket 
Fix ticket search and display
 2019-05-02 13:47:19 +02:00
Laurent Destailleur
3a8d645fb9 Debug module ticket 2019-05-01 20:55:46 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194 Debug ticket module 2019-05-01 17:53:41 +02:00
Laurent Destailleur
a75c6a81d1 FIX Follow rule to create a new page 2019-05-01 17:15:42 +02:00
Ludovic Canivet
e3af373cd3 Fix tms date format on ticket list 2019-04-29 15:43:34 +02:00
Ludovic Canivet
dfd0e97d20 Search ticket by thirdparty name instead of id 2/2 2019-04-29 11:46:14 +02:00
Ludovic Canivet
cef5bb15b1 Search ticket by thirdparty name instead of id 2019-04-29 11:43:25 +02:00
Ludovic Canivet
8f6f3d764f Display category/Severity/type label instead of code 2019-04-29 10:58:00 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
ATM john
684879d73c apply appli btn to more elements 2019-04-16 21:49:26 +02:00
Laurent Destailleur
0da871ac75 Removed dead code 2019-04-11 19:20:55 +02:00
Laurent Destailleur
4f2a3d6bdd Debug ticket module 2019-04-10 16:23:16 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
1f6f6f6edb Track action close for ticket 2019-04-10 13:21:06 +02:00
Laurent Destailleur
ed00391428 Fix debug ticket module 2019-04-10 12:43:26 +02:00
Laurent Destailleur
5e363e936c Fix debug ticket module 2019-04-10 12:35:27 +02:00
Laurent Destailleur
ac25003d33 Dolibarize module ticket 2019-04-10 11:39:54 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
917b9d69fa Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and 
not recommanded to use in Dolibarr.
 2019-04-08 14:55:31 +02:00
Laurent Destailleur
22ca858b36 Enhance setup of email collector 2019-04-07 18:32:01 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
cd6a0bacdd Look and feel v10 2019-03-22 14:32:15 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
39e5c6238d
Merge pull request #10739 from frederic34/patch-3 
Update list.php
 2019-03-05 18:43:36 +01:00
Laurent Destailleur
ec15f9251d
Merge pull request #10738 from frederic34/patch-2 
phpcs fix
 2019-03-05 18:42:22 +01:00
Frédéric FRANCE
0c2a77cb53
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:14:15 +01:00
ptibogxiv
2ebffb2ffe
FIX: date in ticket.class.php 
dolibarize date
 2019-03-05 16:29:53 +01:00
Laurent Destailleur
1e95802a41 Fix phpcs 2019-03-05 16:29:24 +01:00
Laurent Destailleur
b851911708 Dolibarize module ticket 2019-03-05 12:18:46 +01:00
Frédéric FRANCE
023992f2e1
Update list.php 2019-03-04 23:06:23 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility 2019-03-01 18:28:51 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
58e2901d14 Fix phpcs 2019-02-27 00:54:07 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
404f497ca4
replace html code by html5 in ticket 2019-02-23 19:27:42 +01:00
Laurent Destailleur
f0e56abac7 NEW Module ticket is available as a stable module 2019-02-11 19:16:37 +01:00
Laurent Destailleur
8014d72dd5 progress before status 2019-02-11 18:12:27 +01:00
Laurent Destailleur
9b8a13cfe6 Dolibarrize module ticket 2019-02-11 15:41:07 +01:00
Laurent Destailleur
5eceeef3aa Dolibarrize module ticket 2019-02-11 14:51:45 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019 
update with html5 compliant code
 2019-01-21 18:05:40 +01:00
Laurent Destailleur
daa2fccd73 Fix delete of ticket 2019-01-21 16:42:34 +01:00
Philippe GRAND
4bf5a52f4b update with html5 compliant code 2019-01-21 10:12:28 +01:00
Laurent Destailleur
5c825310a3 Fix bad link and css 2019-01-19 14:49:44 +01:00
Laurent Destailleur
b1e51835f5 Fix bad link and css 2019-01-19 14:49:26 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Regis Houssin
1a15698f96 FIX replace deprecated "print_titre" with "load_fiche_titre" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:36:42 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
57c41bac56 Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
919443a101 Fix merge lost 2018-12-11 18:23:45 +01:00
Laurent Destailleur
024e1673e3 Fix merge lost 2018-12-11 18:18:47 +01:00
Laurent Destailleur
bbcb2aa983 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-10 00:15:54 +01:00
Laurent Destailleur
ff8f235b7e Fix regression when disabling table 2018-12-10 00:15:22 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
eaa7fe5d14 Removed deprecated code 2018-12-08 11:41:55 +01:00
Laurent Destailleur
a44dca7e71 Removed deprecated table 2018-12-08 11:37:47 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Philippe GRAND
bbf3b3baac fix :#9967 2018-12-01 16:27:14 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Frédéric FRANCE
c2ee9ba9db
Update actions_ticket.class.php 2018-11-10 07:38:55 +01:00
Frédéric FRANCE
2514cf4a96
Update actions_ticket.class.php 2018-11-10 07:32:22 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
7430a35533
Merge pull request #9966 from madx666/contrib 
Fix public ticket website
 2018-11-08 19:54:36 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
madx666
2ff69bb3fc Fix viewTicketMessages for ticket module 2018-11-07 10:11:28 +01:00
madx666
c76c2e0d3e Fix newMessagePublic for ticket module 2018-11-07 10:08:38 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Frédéric FRANCE
488ac8c8f0
Update index.php 2018-11-03 23:44:25 +01:00
Frédéric FRANCE
c01113e28b
typo 2018-11-03 22:49:30 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
4bdde9ad56
Update ticketlogs.class.php 2018-10-19 12:51:14 +02:00
Frédéric FRANCE
456bdb5b8c
do not trim int 2018-10-17 20:04:48 +02:00
ptibogxiv
0e6d3a0f48
FIX delete dictionnary in ticket API 2018-10-16 20:59:06 +02:00
Philippe GRAND
ba40ad4aab Standardize and update code 2018-10-12 12:23:45 +02:00
Laurent Destailleur
873f43db94 Uniformize interface for tickets 2018-10-01 03:19:21 +02:00
Philippe GRAND
b183054073 Standardize and update code 2018-09-28 15:57:13 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
56b0a5f1ed FIX Mixing tickets of different thirdparties 2018-09-14 13:07:27 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
bdcac95761
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 15:15:23 +02:00
Philippe GRAND
42565e722e Standardize and update code 2018-09-04 13:37:00 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Laurent Destailleur
dc5d1432b1 Fix code not reachable 2018-09-04 01:23:46 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore 2018-09-03 00:03:17 +02:00
Frédéric FRANCE
489074af5c
move phpcs:ignore 2018-09-02 23:25:10 +02:00
Philippe GRAND
bb18982f78 Standardize and Update code 2018-09-01 23:24:59 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Frédéric FRANCE
a676f4f64f
function Comment Missing 2018-08-31 21:54:40 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-30 10:42:47 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +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
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +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
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +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