diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index ed467ec91f4..f5cb98c1199 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -629,4 +629,38 @@ class Localtax extends CommonObject
return '';
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs, $db;
+ $return = '
';
+ $return .= '
';
+ $return .= '
';
+ $return .= img_picto('', $this->picto);
+ $return .= '';
+ $return .= '
';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+ if (property_exists($this, 'label')) {
+ $return .= ' | '.$this->label.'';
+ }
+ if (property_exists($this, 'datev')) {
+ $return .= '
'.$langs->trans("DateEnd").' : '.dol_print_date($db->jdate($this->datev), 'day').'';
+ }
+ if (property_exists($this, 'datep')) {
+ $return .= '
'.$langs->trans("DatePayment", '', '', '', '', 5).' : '.dol_print_date($db->jdate($this->datep), 'day').'';
+ }
+ if (property_exists($this, 'amount')) {
+ $return .= '
'.$langs->trans("Amount").' : '.price($this->amount).'';
+ }
+ $return .= '
';
+ $return .= '
';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index ee2e13e1d57..42f4d326811 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -35,7 +35,7 @@ if ($user->socid) {
}
$result = restrictedArea($user, 'tax', '', '', 'charges');
$ltt = GETPOST("localTaxType", 'int');
-
+$mode = GETPOST('mode', 'alpha');
/*
* View
@@ -49,7 +49,14 @@ $url = DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt
if (!empty($socid)) {
$url .= '&socid='.$socid;
}
-$newcardbutton = dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?localTaxType='.$ltt.'&mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?localTaxType='.$ltt.'&mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'title_accountancy');
@@ -77,19 +84,36 @@ if ($result) {
while ($i < $num) {
$obj = $db->fetch_object($result);
- print '';
-
+ $localtax_static->label = $obj->label;
$localtax_static->id = $obj->rowid;
$localtax_static->ref = $obj->rowid;
- print "| ".$localtax_static->getNomUrl(1)." | \n";
- print "".dol_trunc($obj->label, 40)." | \n";
- print ''.dol_print_date($db->jdate($obj->datev), 'day')." | \n";
- print ''.dol_print_date($db->jdate($obj->datep), 'day')." | \n";
+ $localtax_static->datev = $obj->datev;
+ $localtax_static->datep = $obj->datep;
+ $localtax_static->amount = $obj->amount;
+
$total = $total + $obj->amount;
- print ''.price($obj->amount).' | ';
- print "
\n";
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print '| ';
+ print ' ';
+ }
+ // Output Kanban
+ print $localtax_static->getKanbanView('');
+ if ($i == ($num - 1)) {
+ print ' ';
+ print ' |
';
+ }
+ } else {
+ print '';
+ print "| ".$localtax_static->getNomUrl(1)." | \n";
+ print "".dol_trunc($obj->label, 40)." | \n";
+ print ''.dol_print_date($db->jdate($obj->datev), 'day')." | \n";
+ print ''.dol_print_date($db->jdate($obj->datep), 'day')." | \n";
+ print ''.price($obj->amount).' | ';
+ print "
\n";
+ }
$i++;
}
print '| '.$langs->trans("Total").' | ';