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-11-29 11:03:16 +01:00
commit 9e20d9e847
19 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/salaries.php
View File

@ -129,4 +129,4 @@ print '</form>';
// End of page
llxFooter();
$db->close();;
$db->close();

5
htdocs/comm/propal/list.php
View File

@ -11,7 +11,7 @@
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2016-2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2017 Charlene Benke <charlie@patas-monkey.com>
* Copyright (C) 2017-2018 Charlene Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
*
* This program is free software; you can redistribute it and/or modify
@ -175,9 +175,6 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
}
}
$object = new Propal($db); // To be passed as parameter of executeHooks that need
/*
* Actions
*/

2
htdocs/compta/localtax/quadri_detail.php
View File

@ -589,7 +589,7 @@ else
// Localtax
print '<td class="nowrap" align="right">';
$temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;;
$temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;
print price(price2num($temp_vat,'MT'),1);
//print price($fields['vat']);
print '</td>';

4
htdocs/compta/salaries/card.php
View File

@ -63,7 +63,7 @@ $hookmanager->initHooks(array('salarycard','globalcard'));
if ($cancel)
{
header("Location: index.php");
header("Location: list.php");
exit;
}
@ -139,7 +139,7 @@ if ($action == 'add' && empty($cancel))
if ($ret > 0)
{
$db->commit();
header("Location: index.php");
header("Location: list.php");
exit;
}
else

2
htdocs/core/actions_extrafields.inc.php
View File

@ -29,7 +29,7 @@ $mesg=array();
$extrasize=GETPOST('size','int');
$type=GETPOST('type','alpha');
$param=GETPOST('param','alpha');;
$param=GETPOST('param','alpha');
if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
if ($type=='date') $extrasize='';

2
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -796,7 +796,7 @@ class doc_generic_project_odt extends ModelePDFProjects
if (!empty($row['thm'])) {
$row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
$defaultvat = get_default_tva($mysoc, $mysoc);
$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');;
$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');
} else {
$row['amountht']=0;
$row['amountttc']=0;

2
htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
View File

@ -150,7 +150,7 @@ class pdf_stdmovement extends ModelePDFMovement
// Define position of columns
$this->wref = 15;
$this->posxidref = $this->marge_gauche;
$this->posxdatemouv = $this->marge_gauche+8;;
$this->posxdatemouv = $this->marge_gauche+8;
$this->posxdesc=37;
$this->posxlabel=50;
$this->posxtva=80;

2
htdocs/emailcollector/class/emailcollectoraction.class.php
View File

@ -83,7 +83,7 @@ class EmailCollectorAction extends CommonObject
*/
public $fields=array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollecotr.rowid'),
'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1),
'actionparam' => array('type'=>'varchar(255)', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),

1
htdocs/fichinter/class/fichinter.class.php
View File

@ -315,7 +315,6 @@ class Fichinter extends CommonObject
*/
function update($user, $notrigger=0)
{
global $conf;
if (! is_numeric($this->duration)) {
$this->duration = 0;
}

4
htdocs/fourn/facture/card.php
View File

@ -904,7 +904,7 @@ if (empty($reshook))
// FIXME Missing special_code into addline and updateline methods
$object->special_code = $lines[$i]->special_code;
// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
$result = $object->addline(
$desc,
@ -2717,7 +2717,7 @@ else
$paymentstatic->id=$objp->rowid;
$paymentstatic->datepaye=$db->jdate($objp->dp);
$paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid);;
$paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid);
$paymentstatic->num_paiement=$objp->num_paiement;
$paymentstatic->payment_code=$objp->payment_code;

2
htdocs/product/stock/product.php
View File

@ -868,7 +868,7 @@ if (! $variants) {
print '<td align="right">';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price * $obj->reel, 'MT'), 1) . '</td>';
else print $langs->trans("Variable");
print '</tr>';;
print '</tr>';
$total += $obj->reel;
if (price2num($object->pmp)) $totalwithpmp += $obj->reel;
$totalvalue = $totalvalue + ($object->pmp * $obj->reel);

2
htdocs/projet/activity/perday.php
View File

@ -544,7 +544,7 @@ print '<td class="center">'.$langs->trans("Note").'</td>';
print '<td class="center"></td>';
print "</tr>\n";
$colspan = 6+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);;
$colspan = 6+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
if ($conf->use_javascript_ajax)
{

2
htdocs/public/payment/newpayment.php
View File

@ -642,7 +642,7 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r
dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
// End of page
llxFooter();
$db->close();;
$db->close();
exit;
}

4
htdocs/societe/checkvat/checkVatPopup.php
View File

@ -57,7 +57,7 @@ else
$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
$countryCode=substr($vatNumber,0,2);
$vatNumber=substr($vatNumber,2);
print '<b>'.$langs->trans("Country").'</b>: '.$countryCode.'<br>';
print '<b>'.$langs->trans("VATIntraShort").'</b>: '.$vatNumber.'<br>';
print '<br>';
@ -176,4 +176,4 @@ if ($messagetoshow)
// End of page
llxFooter();
$db->close();;
$db->close();

6
htdocs/stripe/class/actions_stripe.class.php
View File

@ -25,7 +25,7 @@
* \ingroup stripe
* \brief File Class actionsstripeconnect
*/
require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';;
require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
$langs->load("stripe@stripe");
@ -44,8 +44,8 @@ class ActionsStripeconnect
private $config=array();
// For Hookmanager return
var $resprints;
var $results=array();
public $resprints;
public $results=array();
/**

2
htdocs/takepos/invoice.php
View File

@ -237,7 +237,7 @@ function Print(id){
function TakeposPrinting(id){
var receipt;
$.get("receipt.php?facid="+id, function(data, status){
receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');;
receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
$.ajax({
type: "POST",
url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER;?>:8111/print',

2
htdocs/theme/md/style.css.php
View File

@ -4705,7 +4705,7 @@ a span.select2-chosen
/* Special case for the select2 add widget */
#addbox .select2-container .select2-choice > .select2-chosen, #actionbookmark .select2-container .select2-choice > .select2-chosen {
text-align: <?php echo $left; ?>;;
text-align: <?php echo $left; ?>;
opacity: 0.3;
}
.select2-container--default .select2-selection--single .select2-selection__placeholder {

2
htdocs/user/class/user.class.php
View File

@ -2283,7 +2283,7 @@ class User extends CommonObject
$label.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
$label.= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
$label.= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
if ($conf->browser->layout == 'phone') $label.= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");;
if ($conf->browser->layout == 'phone') $label.= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
if (! empty($_SESSION["disablemodules"])) $label.= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));
}
if ($infologin < 0) $label='';

2
htdocs/variants/card.php
View File

@ -300,4 +300,4 @@ if ($action == 'edit') { ?>
// End of page
llxFooter();
$db->close();;
$db->close();