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

Add missing data

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-22 18:23:29 +01:00
parent 5d6fb0cfea
commit 5a8d757a30
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/compta/tva/clients.php
View File

@ -248,9 +248,13 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
'id' =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
'descr' =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
'pid' =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
'pref' =>$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],
'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
@ -291,9 +295,13 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
'id' =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
'descr' =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
'pid' =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
'pref' =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
'ptype' =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
'pstatus' =>$x_paye[$my_paye_thirdpartyid]['pstatus'][$id],
'pstatusbuy' =>$x_paye[$my_paye_thirdpartyid]['pstatusbuy'][$id],
'payment_id' =>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
'payment_amount' =>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
'ftotal_ttc' =>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
@ -328,9 +336,13 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
'id' =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
'descr' =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
'pid' =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
'pref' =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
'ptype' =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
'pstatus' =>$x_paye[$my_paye_thirdpartyid]['pstatus'][$id],
'pstatusbuy'=>$x_paye[$my_paye_thirdpartyid]['pstatusbuy'][$id],
'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
@ -450,6 +462,9 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$product_static->id = $fields['pid'];
$product_static->ref = $fields['pref'];
$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
$product_static->status = $fields['pstatus'];
$product_static->status_buy = $fields['pstatusbuy'];
print $product_static->getNomUrl(1);
if (dol_string_nohtmltag($fields['descr'])) {
print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);

8
htdocs/core/lib/tax.lib.php
View File

@ -148,7 +148,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";
$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 .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";
$sql .= " 0 as payment_id, 0 as payment_amount";
$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
$sql .= " ".MAIN_DB_PREFIX."societe as s,";
@ -193,7 +193,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";
$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 .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";
$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
$sql .= " pa.datep as datep";
$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
@ -333,7 +333,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";
$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 .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";
$sql .= " 0 as payment_id, 0 as payment_amount";
$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
$sql .= " ".MAIN_DB_PREFIX."societe as s,";
@ -378,7 +378,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";
$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 .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";
$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
$sql .= " pa.datep as datep";
$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";