Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work on integrating Composer #10491

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
328 changes: 164 additions & 164 deletions ChangeLog

Large diffs are not rendered by default.

32 changes: 30 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
"config": {
"vendor-dir": "htdocs/includes"
},
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
"php": ">=5.3.0",
"ext-curl": "*",
Expand All @@ -31,8 +33,28 @@
"mike42/escpos-php": "1.2.1",
"mobiledetect/mobiledetectlib": "2.8.17",
"phpoffice/phpexcel": "1.8.1",
"phpoffice/phpspreadsheet": "*",
"restler/framework": "3.0.0-RC6",
"tecnickcom/tcpdf": "6.2.12"
"tecnickcom/tcpdf": "6.2.12",
"econea/nusoap": "~0.9.5.1",
"geoip/geoip": "*",
"mike42/escpos.php": "*",
"erusev/parsedown": "*",
"globalcitizen/php-iban": "2.6.9",
"webit/eval-math": "*",
"stiwl/php-print-ipp": "*",
"psr/psr-simple-cache": "*",
"luracast/restler":"3.*",
"sabre/dav": "*",
"sabre/event": "*",
"sabre/http": "*",
"sabre/uri": "*",
"sabre/vobject": "*",
"sabre/xml": "*",
"stripe/stripe-php": "*",
"swiftmailer/swiftmailer": "*",
"doctrine/lexer": "*",
"propa/tcpdi": "^1.1"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0",
Expand All @@ -56,5 +78,11 @@
"ext-zip": "ODT and Excel support",
"ext-xml": "Excel support",
"firephp/firephp-core": "Logging to Firebug console support"
}
},
"repositories": [
{
"type": "composer",
"url": "https://asset-packagist.org"
}
]
}
13 changes: 5 additions & 8 deletions htdocs/compta/facture/list.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* Copyright (C) 2015-2016 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2017 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Markus Welters <markus@welters.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -683,13 +684,11 @@

// Filters lines
print '<tr class="liste_titre_filter">';
// Ref
if (! empty($arrayfields['f.ref']['checked']))
{
// Ref show always
print '<td class="liste_titre" align="left">';
print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
print '</td>';
}

// Ref customer
if (! empty($arrayfields['f.ref_client']['checked']))
{
Expand Down Expand Up @@ -856,7 +855,7 @@
print "</tr>\n";

print '<tr class="liste_titre">';
if (! empty($arrayfields['f.ref']['checked'])) print_liste_field_titre($arrayfields['f.ref']['label'],$_SERVER['PHP_SELF'],'f.ref','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($arrayfields['f.ref']['label'],$_SERVER['PHP_SELF'],'f.ref','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['f.ref_client']['checked'])) print_liste_field_titre($arrayfields['f.ref_client']['label'],$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['f.type']['checked'])) print_liste_field_titre($arrayfields['f.type']['label'],$_SERVER["PHP_SELF"],'f.type','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['f.date']['checked'])) print_liste_field_titre($arrayfields['f.date']['label'],$_SERVER['PHP_SELF'],'f.datef','',$param,'align="center"',$sortfield,$sortorder);
Expand Down Expand Up @@ -938,8 +937,6 @@
}

print '<tr class="oddeven">';
if (! empty($arrayfields['f.ref']['checked']))
{
print '<td class="nowrap">';

print '<table class="nobordernopadding"><tr class="nocellnopadd">';
Expand All @@ -958,7 +955,7 @@

print "</td>\n";
if (! $i) $totalarray['nbfield']++;
}


// Customer ref
if (! empty($arrayfields['f.ref_client']['checked']))
Expand Down
2 changes: 1 addition & 1 deletion htdocs/expedition/class/expedition.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ function fetch($id, $ref='', $ref_ext='', $ref_int='')
$this->getUrlTrackingStatus($obj->tracking_number);

/*
* Thirparty
* Thirdparty
*/
$result=$this->fetch_thirdparty();

Expand Down
2 changes: 1 addition & 1 deletion htdocs/reception/class/reception.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ function fetch($id, $ref='', $ref_ext='', $ref_int='')
$this->getUrlTrackingStatus($obj->tracking_number);

/*
* Thirparty
* Thirdparty
*/
$result=$this->fetch_thirdparty();

Expand Down
2 changes: 1 addition & 1 deletion htdocs/societe/class/societe.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1445,7 +1445,7 @@ function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='
* Delete a third party from database and all its dependencies (contacts, rib...)
*
* @param int $id Id of third party to delete
* @param User $fuser User who ask to delete thirparty
* @param User $fuser User who ask to delete thirdparty
* @param int $call_trigger 0=No, 1=yes
* @return int <0 if KO, 0 if nothing done, >0 if OK
*/
Expand Down