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

FIX Search criteria on vat

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-20 05:45:42 +01:00
parent 6ef3b330e4
commit 0a00bdcb73
3 changed files with 58 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
htdocs/accountancy/customer/lines.php
View File

@ -113,7 +113,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
$db->begin(); $db->begin();
$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l"; $sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l";
$sql1 .= " SET l.fk_code_ventilation=" . $account_parent; $sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent','int');
$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')'; $sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
dol_syslog('accountancy/customer/lines.php::changeaccount sql= ' . $sql1); dol_syslog('accountancy/customer/lines.php::changeaccount sql= ' . $sql1);
@ -204,7 +204,7 @@ if (strlen(trim($search_account))) {
$sql .= natural_search("aa.account_number", $search_account); $sql .= natural_search("aa.account_number", $search_account);
} }
if (strlen(trim($search_vat))) { if (strlen(trim($search_vat))) {
$sql .= natural_search("fd.tva_tx", $search_vat); $sql .= natural_search("fd.tva_tx", price2num($search_vat), 1);
} }
if ($search_month > 0) if ($search_month > 0)
{ {
@ -223,7 +223,7 @@ if (strlen(trim($search_country))) {
$sql .= natural_search("co.label", $search_country); $sql .= natural_search("co.label", $search_country);
} }
if (strlen(trim($search_tvaintra))) { if (strlen(trim($search_tvaintra))) {
$sql .= natural_search("s.tva_intra", $search_tva_intra); $sql .= natural_search("s.tva_intra", $search_tvaintra);
} }
$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
$sql .= $db->order($sortfield, $sortorder); $sql .= $db->order($sortfield, $sortorder);
@ -245,28 +245,19 @@ if ($result) {
$i = 0; $i = 0;
$param=''; $param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($search_invoice) if ($search_invoice) $param .= "&search_invoice=" . urlencode($search_invoice);
$param .= "&search_invoice=" . $search_invoice; if ($search_ref) $param .= "&search_ref=" . urlencode($search_ref);
if ($search_ref) if ($search_label) $param .= "&search_label=" . urlencode($search_label);
$param .= "&search_ref=" . $search_ref; if ($search_desc) $param .= "&search_desc=" . urlencode($search_desc);
if ($search_label) if ($search_account) $param .= "&search_account=" . urlencode($search_account);
$param .= "&search_label=" . $search_label; if ($search_vat) $param .= "&search_vat=" . urlencode($search_vat);
if ($search_desc) if ($search_day) $param .= '&search_day='.urlencode($search_day);
$param .= "&search_desc=" . $search_desc; if ($search_month) $param .= '&search_month='.urlencode($search_month);
if ($search_account) if ($search_year) $param .= '&search_year='.urlencode($search_year);
$param .= "&search_account=" . $search_account; if ($search_country) $param .= "&search_country=" . urlencode($search_country);
if ($search_vat) if ($search_tvaintra) $param .= "&search_tvaintra=" . urlencode($search_tvaintra);
$param .= "&search_vat=" . $search_vat;
if ($search_day) $param.='&search_day='.urlencode($search_day);
if ($search_month) $param.='&search_month='.urlencode($search_month);
if ($search_year) $param.='&search_year='.urlencode($search_year);
if ($search_country)
$param .= "&search_country=" . $search_country;
if ($search_tvaintra)
$param .= "&search_tvaintra=" . $search_tvaintra;
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n"; print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
print '<input type="hidden" name="action" value="ventil">'; print '<input type="hidden" name="action" value="ventil">';
@ -370,7 +361,7 @@ if ($result) {
print '</a>'; print '</a>';
print '</td>'; print '</td>';
print '<td align="center">' . $objp->country .'</td>'; print '<td>' . $objp->country .'</td>';
print '<td>' . $objp->tva_intra . '</td>'; print '<td>' . $objp->tva_intra . '</td>';

48
htdocs/accountancy/expensereport/lines.php
View File

@ -61,10 +61,10 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
$sortfield = GETPOST('sortfield', 'alpha'); $sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha');
$page = GETPOST('page', 'int'); $page = GETPOST('page', 'int');
if ($page < 0) $page = 0; if (empty($page) || $page < 0) $page = 0;
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
$offset = $limit * $page;
if (! $sortfield) if (! $sortfield)
$sortfield = "erd.date, erd.rowid"; $sortfield = "erd.date, erd.rowid";
if (! $sortorder) { if (! $sortorder) {
@ -170,19 +170,19 @@ if (strlen(trim($search_expensereport))) {
$sql .= " AND er.ref like '%" . $search_expensereport . "%'"; $sql .= " AND er.ref like '%" . $search_expensereport . "%'";
} }
if (strlen(trim($search_label))) { if (strlen(trim($search_label))) {
$sql .= " AND f.label like '%" . $search_label . "%'"; $sql .= natural_search("f.label", $search_label);
} }
if (strlen(trim($search_desc))) { if (strlen(trim($search_desc))) {
$sql .= " AND er.comments like '%" . $search_desc . "%'"; $sql .= natural_search("er.comments", $search_desc);
} }
if (strlen(trim($search_amount))) { if (strlen(trim($search_amount))) {
$sql .= " AND erd.total_ht like '%" . $search_amount . "%'"; $sql .= natural_search("erd.total_ht", $search_amount, 1);
} }
if (strlen(trim($search_account))) { if (strlen(trim($search_account))) {
$sql .= " AND aa.account_number like '%" . $search_account . "%'"; $sql .= natural_search("aa.account_number", $search_account);
} }
if (strlen(trim($search_vat))) { if (strlen(trim($search_vat))) {
$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')"; $sql .= natural_search("erd.tva_tx", price2num($search_vat), 1);
} }
if ($search_month > 0) if ($search_month > 0)
{ {
@ -219,25 +219,18 @@ if ($result) {
$i = 0; $i = 0;
$param=''; $param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($search_expensereport) if ($search_expensereport) $param .= "&search_expensereport=" . urlencode($search_expensereport);
$param .= "&search_expensereport=" . $search_expensereport; if ($search_label) $param .= "&search_label=" . urlencode($search_label);
if ($search_label) if ($search_desc) $param .= "&search_desc=" . urlencode($search_desc);
$param .= "&search_label=" . $search_label; if ($search_account) $param .= "&search_account=" . urlencode($search_account);
if ($search_desc) if ($search_vat) $param .= "&search_vat=" . urlencode($search_vat);
$param .= "&search_desc=" . $search_desc; if ($search_day) $param .= '&search_day='.urlencode($search_day);
if ($search_account) if ($search_month) $param .= '&search_month='.urlencode($search_month);
$param .= "&search_account=" . $search_account; if ($search_year) $param .= '&search_year='.urlencode($search_year);
if ($search_vat) if ($search_country) $param .= "&search_country=" . urlencode($search_country);
$param .= "&search_vat=" . $search_vat; if ($search_tvaintra) $param .= "&search_tvaintra=" . urlencode($search_tvaintra);
if ($search_day) $param.='&search_day='.urlencode($search_day);
if ($search_month) $param.='&search_month='.urlencode($search_month);
if ($search_year) $param.='&search_year='.urlencode($search_year);
if ($search_country)
$param .= "&search_country=" . $search_country;
if ($search_tvaintra)
$param .= "&search_tvaintra=" . $search_tvaintra;
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n"; print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
print '<input type="hidden" name="action" value="ventil">'; print '<input type="hidden" name="action" value="ventil">';
@ -297,7 +290,6 @@ if ($result) {
$expensereport_static = new ExpenseReport($db); $expensereport_static = new ExpenseReport($db);
$var = True;
while ( $i < min($num_lines, $limit) ) { while ( $i < min($num_lines, $limit) ) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label; $codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
@ -347,7 +339,7 @@ if ($result) {
print '</form>'; print '</form>';
} else { } else {
print $db->error(); print $db->lasterror();
} }

50
htdocs/accountancy/supplier/lines.php
View File

@ -65,8 +65,8 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
$sortfield = GETPOST('sortfield', 'alpha'); $sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha');
$page = GETPOST('page', 'int'); $page = GETPOST('page', 'int');
if ($page < 0) $page = 0; if (empty($page) || $page < 0) $page = 0;
$offset = $conf->liste_limit * $page; $offset = $limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
if (! $sortfield) if (! $sortfield)
@ -195,10 +195,10 @@ if (strlen(trim($search_amount))) {
$sql .= natural_search("l.total_ht", $search_amount, 1); $sql .= natural_search("l.total_ht", $search_amount, 1);
} }
if (strlen(trim($search_account))) { if (strlen(trim($search_account))) {
$sql .= natural_search("aa.account_number", $search_account, 1); $sql .= natural_search("aa.account_number", $search_account);
} }
if (strlen(trim($search_vat))) { if (strlen(trim($search_vat))) {
$sql .= natural_search("l.tva_tx", $search_vat, 1); $sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
} }
if ($search_month > 0) if ($search_month > 0)
{ {
@ -214,10 +214,10 @@ else if ($search_year > 0)
$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'"; $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
} }
if (strlen(trim($search_country))) { if (strlen(trim($search_country))) {
$sql .= " AND (co.label like'" . $search_country . "%')"; $sql .= natural_search("co.label", $search_country);
} }
if (strlen(trim($search_tvaintra))) { if (strlen(trim($search_tvaintra))) {
$sql .= " AND (s.tva_intra like'" . $search_tvaintra . "%')"; $sql .= natural_search("s.tva_intra", $search_tvaintra);
} }
$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")"; // We don't share object for accountancy $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")"; // We don't share object for accountancy
@ -241,27 +241,19 @@ if ($result) {
$i = 0; $i = 0;
$param=''; $param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($search_invoice) if ($search_invoice) $param .= "&search_invoice=" . urlencode($search_invoice);
$param .= "&search_invoice=" . $search_invoice; if ($search_ref) $param .= "&search_ref=" . urlencode($search_ref);
if ($search_ref) if ($search_label) $param .= "&search_label=" . urlencode($search_label);
$param .= "&search_ref=" . $search_ref; if ($search_desc) $param .= "&search_desc=" . urlencode($search_desc);
if ($search_label) if ($search_account) $param .= "&search_account=" . urlencode($search_account);
$param .= "&search_label=" . $search_label; if ($search_vat) $param .= "&search_vat=" . urlencode($search_vat);
if ($search_desc) if ($search_day) $param .= '&search_day='.urlencode($search_day);
$param .= "&search_desc=" . $search_desc; if ($search_month) $param .= '&search_month='.urlencode($search_month);
if ($search_account) if ($search_year) $param .= '&search_year='.urlencode($search_year);
$param .= "&search_account=" . $search_account; if ($search_country) $param .= "&search_country=" . urlencode($search_country);
if ($search_vat) if ($search_tvaintra) $param .= "&search_tvaintra=" . urlencode($search_tvaintra);
$param .= "&search_vat=" . $search_vat;
if ($search_day) $param.='&search_day='.urlencode($search_day);
if ($search_month) $param.='&search_month='.urlencode($search_month);
if ($search_year) $param.='&search_year='.urlencode($search_year);
if ($search_country)
$param .= "&search_country=" . $search_country;
if ($search_tvaintra)
$param .= "&search_tvaintra=" . $search_tvaintra;
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n"; print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
print '<input type="hidden" name="action" value="ventil">'; print '<input type="hidden" name="action" value="ventil">';
@ -277,7 +269,7 @@ if ($result) {
print $langs->trans("DescVentilDoneSupplier") . '<br>'; print $langs->trans("DescVentilDoneSupplier") . '<br>';
print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>'; print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1); print $formaccounting->select_account($account_parent, 'account_parent', 1);
print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>'; print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
$moreforfilter = ''; $moreforfilter = '';
@ -389,7 +381,7 @@ if ($result) {
print '</form>'; print '</form>';
} else { } else {
print $db->error(); print $db->lasterror();
} }