diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index d18794975e8..8716ac20a27 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -473,7 +473,12 @@ if ($account || $_GET["ref"]) if ($result) { $total = 0; - $time = dol_now('tzserver'); + + $now=dol_now('tzserver'); + $nows=dol_date('Ymd',$now); + + //$html->load_cache_types_paiements(); + //$html->cache_types_paiements $var=true; @@ -489,10 +494,12 @@ if ($account || $_GET["ref"]) $var=!$var; // Is it a transaction in future ? - if ($db->jdate($objp->do) > $time && !$sep) // Yes, we show a subtotal + $dos=dol_date('Ymd',$db->jdate($objp->do)); + //print "dos=".$dos." nows=".$nows; + if ($dos > $nows && !$sep) // Yes, we show a subtotal { $sep = 1 ; - print ''; + print ''; print $langs->trans("CurrentBalance"); print ''; print "".price($total - $objp->amount).""; @@ -506,7 +513,11 @@ if ($account || $_GET["ref"]) print "".dol_print_date($db->jdate($objp->dv),"day")."\n"; - print "".$langs->trans($objp->fk_type)."\n"; + // Payment type + print ""; + if ($objp->fk_type == 'SOLD') print ' '; + else print $langs->trans("PaymentTypeShort".$objp->fk_type); + print "\n"; print ''.($objp->num_chq?$objp->num_chq:"")."\n"; // Description diff --git a/htdocs/langs/en_IN/bills.lang b/htdocs/langs/en_IN/bills.lang index 97d39550d6d..3aaefcdc094 100755 --- a/htdocs/langs/en_IN/bills.lang +++ b/htdocs/langs/en_IN/bills.lang @@ -1,3 +1,18 @@ -# Dolibarr language file - en_US - bills +# Dolibarr language file - en_IN - bills CHARSET=UTF-8 RelatedCommercialProposals=Related quotations +ChequeNumber=Cheque N° +ChequeOrTransferNumber=Cheque/Transfer N° +ChequeMaker=Cheque transmitter +ChequeBank=Bank of Cheque +PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration. +PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to +PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to +MenuChequeDeposits=Cheques deposits +MenuCheques=Cheques +MenuChequesReceipts=Cheques receipts +ChequesReceipts=Cheques receipts +ChequesArea=Cheques deposits area +ChequeDeposits=Cheques deposits +Cheques=Cheques +PaymentTypeShortCHQ=Cheque