lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-27 09:36:31 +02:00
commit e35aed0c28
27 changed files with 7857 additions and 7833 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/card.php
View File

@ -4463,6 +4463,7 @@ else if ($id > 0 || ! empty($ref))
print '<tr class="liste_titre nodrag nodrop">';
// Adds a line numbering column
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
print '<td align="center" width="5">&nbsp;</td>';
}
@ -4486,6 +4487,7 @@ else if ($id > 0 || ! empty($ref))
print '<td width="10">&nbsp;</td>';
print "</tr>\n";
// Adds a line numbering column
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
print '<td align="center" width="5">&nbsp;</td>';
}

5
htdocs/core/class/antivir.class.php
View File

@ -40,7 +40,10 @@ class AntiVir
*/
public $errors = array();
var $output;
/**
* @var string Used to return message
*/
public $output;
/**
* @var DoliDB Database handler.

14
htdocs/core/class/canvas.class.php
View File

@ -43,15 +43,15 @@ class Canvas
*/
public $errors = array();
var $actiontype;
public $actiontype;
var $dirmodule; // Module directory
var $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
var $canvas; // Name of canvas (ex: company, individual, product, service, ...)
var $card; // Tab (sub-canvas)
public $dirmodule; // Module directory
public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
public $card; // Tab (sub-canvas)
var $template_dir; // Initialized by getCanvas with templates directory
var $control; // Initialized by getCanvas with controller instance
public $template_dir; // Initialized by getCanvas with templates directory
public $control; // Initialized by getCanvas with controller instance
/**

1
htdocs/core/class/commonobject.class.php
View File

@ -3825,6 +3825,7 @@ abstract class CommonObject
print '<tr class="liste_titre nodrag nodrop">';
// Adds a line numbering column
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
// Description

54
htdocs/core/class/dolgraph.class.php
View File

@ -39,46 +39,46 @@
*/
class DolGraph
{
var $type=array(); // Array with type of each series. Example: array('bars', 'lines', ...)
var $mode='side'; // Mode bars graph: side, depth
public $type=array(); // Array with type of each series. Example: array('bars', 'lines', ...)
public $mode='side'; // Mode bars graph: side, depth
private $_library='jflot'; // Graphic library to use (jflot, artichow)
//! Array of data
var $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
var $title; // Title of graph
var $cssprefix=''; // To add into css styles
var $width=380;
var $height=200;
var $MaxValue=0;
var $MinValue=0;
var $SetShading=0;
public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
public $title; // Title of graph
public $cssprefix=''; // To add into css styles
public $width=380;
public $height=200;
public $MaxValue=0;
public $MinValue=0;
public $SetShading=0;
var $PrecisionY=-1;
public $PrecisionY=-1;
var $horizTickIncrement=-1;
var $SetNumXTicks=-1;
var $labelInterval=-1;
public $horizTickIncrement=-1;
public $SetNumXTicks=-1;
public $labelInterval=-1;
var $hideXGrid=false;
var $hideYGrid=false;
public $hideXGrid=false;
public $hideYGrid=false;
var $Legend=array();
var $LegendWidthMin=0;
var $showlegend=1;
var $showpointvalue=1;
var $showpercent=0;
var $combine=0; // 0.05 if you want to combine records < 5% into "other"
var $graph; // Objet Graph (Artichow, Phplot...)
public $Legend=array();
public $LegendWidthMin=0;
public $showlegend=1;
public $showpointvalue=1;
public $showpercent=0;
public $combine=0; // 0.05 if you want to combine records < 5% into "other"
public $graph; // Objet Graph (Artichow, Phplot...)
/**
* @var string Error code (or message)
*/
public $error='';
var $bordercolor; // array(R,G,B)
var $bgcolor; // array(R,G,B)
var $bgcolorgrid=array(255,255,255); // array(R,G,B)
var $datacolor; // array(array(R,G,B),...)
public $bordercolor; // array(R,G,B)
public $bgcolor; // array(R,G,B)
public $bgcolorgrid=array(255,255,255); // array(R,G,B)
public $datacolor; // array(array(R,G,B),...)
private $stringtoshow; // To store string to output graph into HTML page

3
htdocs/core/lib/functions.lib.php
View File

@ -5214,8 +5214,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
}
// Si (vendeur en France et acheteur hors Communaute europeenne et acheteur particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
if (! empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee) && !$thirdparty_buyer->isACompany())
{
if (! empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee) && !$thirdparty_buyer->isACompany()) {
return get_product_vat_for_country($idprod,$thirdparty_seller,$idprodfournprice);
}

4
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -116,9 +116,9 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**

4
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -105,9 +105,9 @@ class pdf_rouget extends ModelePdfExpedition
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**

4
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -107,9 +107,9 @@ class pdf_standard extends ModeleExpenseReport
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**

4
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -40,9 +40,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**
* @var array() Minimum version of PHP required by module.

4
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -117,9 +117,9 @@ class pdf_crabe extends ModelePDFFactures
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**
* @var bool Situation invoice type

4
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -107,9 +107,9 @@ class pdf_soleil extends ModelePDFFicheinter
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**
* Constructor

4
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -108,9 +108,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**
* Constructor

4
htdocs/core/modules/project/doc/pdf_baleine.modules.php
View File

@ -107,9 +107,9 @@ class pdf_baleine extends ModelePDFProjects
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**
* Constructor

4
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -56,9 +56,9 @@ class doc_generic_task_odt extends ModelePDFTask
{
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**
* @var array() Minimum version of PHP required by module.

4
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -39,9 +39,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
{
/**
* Issuer
* @var Societe
* @var Company object that emits
*/
public $emetteur; // Objet societe qui emet
public $emetteur;
/**
* @var array() Minimum version of PHP required by module.

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -115,7 +115,7 @@ class pdf_azur extends ModelePDFPropales
/**
* Issuer
* @var Objet societe qui emet
* @var Company object that emits
*/
public $emetteur;

2
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -106,7 +106,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
/**
* Issuer
* @var Objet societe qui emet
* @var Company object that emits
*/
public $emetteur;

2
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -110,7 +110,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
/**
* Issuer
* @var Objet societe qui emet
* @var Company object that emits
*/
public $emetteur;

4
htdocs/core/tpl/login.tpl.php
View File

@ -213,7 +213,9 @@ if ($forgetpasslink || $helpcenterlink)
echo '<br>';
echo '<div class="center" style="margin-top: 15px;">';
if ($forgetpasslink) {
echo '<a class="alogin" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam.'">';
$url=DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam;
if (! empty($conf->global->MAIN_PASSWORD_FORGOTLINK)) $url=$conf->global->MAIN_PASSWORD_FORGOTLINK;
echo '<a class="alogin" href="'.dol_escape_htmltag($url).'">';
echo $langs->trans('PasswordForgotten');
echo '</a>';
}

1
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -160,6 +160,7 @@ if ($nolinesbefore) {
?>
<tr class="pair nodrag nodrop nohoverpair<?php echo ($nolinesbefore || $object->element=='contrat')?'':' liste_titre_create'; ?>">
<?php
// Adds a line numbering column
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
$coldisplay=2;
?>

4
htdocs/expedition/card.php
View File

@ -2010,7 +2010,7 @@ else if ($id || $ref)
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
// #
// Adds a line numbering column
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
print '<td width="5" align="center">&nbsp;</td>';
@ -2142,7 +2142,7 @@ else if ($id || $ref)
print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
print '<tr class="oddeven">';
// #
// Adds a line numbering column
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
print '<td align="center">'.($i+1).'</td>';

15524
htdocs/install/mysql/data/llx_accounting_account_de.sql
View File

File diff suppressed because it is too large Load Diff

11
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
View File

@ -72,9 +72,18 @@ ALTER TABLE llx_categorie ADD COLUMN ref_ext varchar(255);
ALTER TABLE llx_societe ADD COLUMN twitter varchar(255) after skype;
ALTER TABLE llx_societe ADD COLUMN facebook varchar(255) after skype;
ALTER TABLE llx_societe ADD COLUMN instagram varchar(255) after skype;
ALTER TABLE llx_societe ADD COLUMN snapchat varchar(255) after skype;
ALTER TABLE llx_societe ADD COLUMN googleplus varchar(255) after skype;
ALTER TABLE llx_societe ADD COLUMN youtube varchar(255) after skype;
ALTER TABLE llx_societe ADD COLUMN whatsapp varchar(255) after skype;
ALTER TABLE llx_socpeople ADD COLUMN twitter varchar(255) after skype;
ALTER TABLE llx_socpeople ADD COLUMN facebook varchar(255) after skype;
ALTER TABLE llx_socpeople ADD COLUMN instagram varchar(255) after skype;
ALTER TABLE llx_socpeople ADD COLUMN snapchat varchar(255) after skype;
ALTER TABLE llx_socpeople ADD COLUMN googleplus varchar(255) after skype;
ALTER TABLE llx_socpeople ADD COLUMN youtube varchar(255) after skype;
ALTER TABLE llx_socpeople ADD COLUMN whatsapp varchar(255) after skype;
ALTER TABLE llx_website CHANGE COLUMN fk_user_create fk_user_creat integer;
ALTER TABLE llx_website_page CHANGE COLUMN fk_user_create fk_user_creat integer;

5
htdocs/install/mysql/tables/llx_societe.sql
View File

@ -53,6 +53,11 @@ create table llx_societe
skype varchar(255), --
twitter varchar(255), --
facebook varchar(255), --
instagram varchar(255), --
snapchat varchar(255), --
googleplus varchar(255), --
youtube varchar(255), --
whatsapp varchar(255), --
fk_effectif integer DEFAULT 0, --
fk_typent integer DEFAULT 0, --
fk_forme_juridique integer DEFAULT 0, -- juridical status

5
htdocs/install/mysql/tables/llx_socpeople.sql
View File

@ -45,6 +45,11 @@ create table llx_socpeople
skype varchar(255),
twitter varchar(255), --
facebook varchar(255), --
instagram varchar(255), --
snapchat varchar(255), --
google+ varchar(255), --
youtube varchar(255), --
whatsapp varchar(255), --
photo varchar(255),
no_email smallint NOT NULL DEFAULT 0,
priv smallint NOT NULL DEFAULT 0,

11
htdocs/multicurrency/class/multicurrency.class.php
View File

@ -20,15 +20,14 @@
*/
/**
* \file dev/skeletons/skeleton_class.class.php
* \ingroup mymodule othermodule1 othermodule2
* \brief This file is an example for a CRUD class file (Create/Read/Update/Delete)
* Put some comments here
* \file htdocs/multicurrency/class/multicurrency.class.php
* \ingroup multicurrency
* \brief This file is a CRUD class file (Create/Read/Update/Delete) for multicurrency
*/
// Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
/**
* Class Currency