fix php 8
This commit is contained in:
parent
2ba114bed4
commit
efc8f94019
4 changed files with 9 additions and 7 deletions
|
|
@ -260,11 +260,11 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
|
|||
'pid' =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
|
||||
'pref' =>isset($x_coll[$my_coll_thirdpartyid]['pref'][$id])?$x_coll[$my_coll_thirdpartyid]['pref'][$id]:'',
|
||||
'ptype' =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
|
||||
'pstatus' =>$x_paye[$my_coll_thirdpartyid]['pstatus'][$id],
|
||||
'pstatusbuy'=>$x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id],
|
||||
'pstatus' =>isset($x_paye[$my_coll_thirdpartyid]['pstatus'][$id])?$x_paye[$my_coll_thirdpartyid]['pstatus'][$id]:'',
|
||||
'pstatusbuy'=>isset($x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id])?$x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id]:'',
|
||||
|
||||
'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
|
||||
'payment_ref'=>$x_coll[$my_coll_thirdpartyid]['payment_ref'][$id],
|
||||
'payment_ref'=>isset($x_coll[$my_coll_thirdpartyid]['payment_ref'][$id])?$x_coll[$my_coll_thirdpartyid]['payment_ref'][$id]:'',
|
||||
'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
|
||||
'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
|
||||
'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
|
||||
|
|
|
|||
|
|
@ -131,6 +131,7 @@ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '',
|
|||
$period .= ' - ';
|
||||
$period .= $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
|
||||
$prevyear = $date_start_year;
|
||||
$q=0;
|
||||
$prevquarter = $q;
|
||||
if ($prevquarter > 1) {
|
||||
$prevquarter--;
|
||||
|
|
@ -250,7 +251,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
|
|||
$company_static->name = $x_coll[$my_coll_rate]['company_name'][$id];
|
||||
$company_static->name_alias = $x_coll[$my_coll_rate]['company_alias'][$id];
|
||||
$company_static->email = $x_coll[$my_coll_rate]['company_email'][$id];
|
||||
$company_static->tva_intra = $x_coll[$my_coll_rate]['tva_intra'][$id];
|
||||
$company_static->tva_intra = isset($x_coll[$my_coll_rate]['tva_intra'][$id])?$x_coll[$my_coll_rate]['tva_intra'][$id]:0;
|
||||
$company_static->client = $x_coll[$my_coll_rate]['company_client'][$id];
|
||||
$company_static->fournisseur = $x_coll[$my_coll_rate]['company_fournisseur'][$id];
|
||||
$company_static->status = $x_coll[$my_coll_rate]['company_status'][$id];
|
||||
|
|
|
|||
|
|
@ -757,7 +757,8 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
|
|||
$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";
|
||||
$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";
|
||||
$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
|
||||
$sql .= " 0 as payment_id, '' as payment_ref, 0 as payment_amount";
|
||||
$sql .= " 0 as payment_id, '' as payment_ref, 0 as payment_amount,";
|
||||
$sql .= " '' as datep";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";
|
||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
|
||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture."=f.rowid";
|
||||
|
|
|
|||
|
|
@ -829,7 +829,7 @@ if ($id > 0) {
|
|||
if ($action != 'classify') {
|
||||
$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
|
||||
}
|
||||
$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
|
||||
$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, null, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
|
||||
} else {
|
||||
if (!empty($object->fk_project)) {
|
||||
$proj = new Project($db);
|
||||
|
|
@ -1065,7 +1065,7 @@ if ($id > 0) {
|
|||
if (empty($user->socid)) {
|
||||
$canSendMail = true;
|
||||
|
||||
print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail, $params);
|
||||
print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue