Merge pull request #156 from viniciusvgn/develop

Updates: Tax Brasil and link to filter only those bills late

htdocs/fourn/facture/impayees.php

@@ -3,6 +3,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2012-2012  Vinicius Nogueira       <viniciusvgn@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +37,7 @@ $langs->load("bills");
 
 
 $socid=GETPOST('socid','int');
+$option = GETPOST('option');
 
 // Security check
 if ($user->societe_id > 0)
@@ -53,6 +55,8 @@ $now=dol_now();
 
 llxHeader('',$langs->trans("BillsSuppliersUnpaid"));
 
+$title=$langs->trans("BillsSuppliersUnpaid");
+
 $facturestatic=new FactureFournisseur($db);
 $companystatic=new Societe($db);
 
@@ -87,6 +91,7 @@ if ($user->rights->fournisseur->facture->lire)
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn ";
 	$sql.= " WHERE f.fk_soc = s.rowid";
 	$sql.= " AND f.paye = 0 AND f.fk_statut = 1";
+	if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql .= " AND s.rowid = ".$socid;
 
@@ -146,8 +151,22 @@ if ($user->rights->fournisseur->facture->lire)
 			$soc->fetch($socid);
 		}
 		
+		$param="";
+		$param.=($option?"&amp;option=".$option:"");
+		if ($late)               $param.='&amp;late='.urlencode($late);
+		$urlsource.=str_replace('&amp;','&',$param);
+
 		$titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->nom):$langs->trans("BillsSuppliersUnpaid"));
-		print_barre_liste($titre,$page,"impayees.php","&amp;socid=$socid",$sortfield,$sortorder,'',0);	// We don't want pagination on this page
+		
+		if ($option == 'late') $titre.=' ('.$langs->trans("Late").')';
+	else $titre.=' ('.$langs->trans("All").')';
+	
+		$link='';
+		if (empty($option)) $link='<a href="'.$_SERVER["PHP_SELF"].'?option=late">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
+			elseif ($option == 'late') $link='<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("ShowUnpaidAll").'</a>';
+		print_fiche_titre($titre,$link);
+
+		print_barre_liste('','',"impayees.php","&amp;socid=$socid",$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 		$i = 0;
 		print '<table class="liste" width="100%">';
 		print '<tr class="liste_titre">';

htdocs/install/mysql/data/llx_c_tva.sql

@@ -48,6 +48,9 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (41
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (412, 41,  '10','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (413, 41,   '0','0','VAT Rate 0',1);
 
+-- BRASIL (id country=59)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (561, 56,  '0','0','VAT reduced rate',1);
+
 -- BULGARIA (id country=59)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (591, 59,  '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (592, 59,   '7','0','VAT reduced rate', 1);

htdocs/langs/pt_BR/bills.lang

@@ -353,8 +353,8 @@ ChequeDeposits=Depósito de Cheques
 Cheques=Cheques
 CreditNoteConvertedIntoDiscount=Este depósito converteu-se em %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilizar o endereço do contato de cliente de faturação da fatura em vez do endereço do Fornecedor como destinatário das faturas
-ShowUnpayedAll=Ver todos os não remunerados
+ShowUnpaidAll=Mostrar todas as faturas
-ShowUnpayedLateOnly=Mostrar apenas os não remunerados
+ShowUnpaidLateOnly=Mostrar apenas faturas em Atraso
 PaymentInvoiceRef=Pagamento Fatura %s
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Não é possível excluir pagamento de uma Fatura fechada.
 CustomerBillsUnpaid=Faturas de Clientes Pendentes de Cobrança