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

Fix merge

Browse Source
This commit is contained in:
Laurent Destailleur 2021-01-15 11:42:54 +01:00
parent 4c50f25c12
commit a16fa64596
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/accountancy/bookkeeping/listbysubaccount.php
View File

@ -724,21 +724,6 @@ while ($i < min($num, $limit)) {
} }
} }
<<<<<<< HEAD
// Piece number
if (!empty($arrayfields['t.piece_num']['checked'])) {
print '<td>';
$object->id = $line->id;
$object->piece_num = $line->piece_num;
print $object->getNomUrl(1, '', 0, '', 1);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
=======
>>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
// Document ref // Document ref
if (!empty($arrayfields['t.doc_ref']['checked'])) { if (!empty($arrayfields['t.doc_ref']['checked'])) {
if ($line->doc_type == 'customer_invoice') { if ($line->doc_type == 'customer_invoice') {