diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index bf9595c2aa3..2b06c75843c 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -163,35 +163,35 @@ else - $h=0; - $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?id='.$_GET["id"]; - $head[$h][1] = $langs->trans("CheckReceipt"); - $hselected = $h; - $h++; - // $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$_GET["id"]; - // $head[$h][1] = $langs->trans("Info"); - // $h++; + $h=0; + $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?id='.$_GET["id"]; + $head[$h][1] = $langs->trans("CheckReceipt"); + $hselected = $h; + $h++; + // $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/info.php?id='.$_GET["id"]; + // $head[$h][1] = $langs->trans("Info"); + // $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("Cheques")); + dolibarr_fiche_head($head, $hselected, $langs->trans("Cheques")); - /* - * Confirmation de la suppression du bordereau - */ - if ($_GET['action'] == 'delete') - { - $html->form_confirm('fiche.php?id='.$remisecheque->id, $langs->trans("DeleteCheckReceipt"), 'Etes-vous sûr de vouloir supprimer ce bordereau ?', 'confirm_delete'); - print '
'; - } - - /* - * Confirmation de la validation du bordereau - */ - if ($_GET['action'] == 'valide') - { - $facid = $_GET['facid']; - $html->form_confirm('fiche.php?id='.$remisecheque->id, $langs->trans("ValidateCheckReceipt"), 'Etes-vous sûr de vouloir valider ce bordereau, auncune modification n\'est possible une fois le bordereau validé ?', 'confirm_valide'); - print '
'; - } + /* + * Confirmation de la suppression du bordereau + */ + if ($_GET['action'] == 'delete') + { + $html->form_confirm('fiche.php?id='.$remisecheque->id, $langs->trans("DeleteCheckReceipt"), 'Etes-vous sûr de vouloir supprimer ce bordereau ?', 'confirm_delete'); + print '
'; + } + + /* + * Confirmation de la validation du bordereau + */ + if ($_GET['action'] == 'valide') + { + $facid = $_GET['facid']; + $html->form_confirm('fiche.php?id='.$remisecheque->id, $langs->trans("ValidateCheckReceipt"), 'Etes-vous sûr de vouloir valider ce bordereau, auncune modification n\'est possible une fois le bordereau validé ?', 'confirm_valide'); + print '
'; + } } if ($mesg) print $mesg.'
'; @@ -219,7 +219,6 @@ if ($_GET['action'] == 'new') $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC;"; $resql = $db->query($sql); - if ($resql) { $i = 0; @@ -310,7 +309,7 @@ else // Liste des cheques $sql = "SELECT b.rowid,b.amount,"; - $sql.= " b.num_chq,b.emetteur,".$db->pdate("b.dateo")." as date,b.banque,"; + $sql.= " b.num_chq,b.emetteur,".$db->pdate("b.dateo")." as date,".$db->pdate("b.datec")." as datec,b.banque,"; $sql.= " p.rowid as pid"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid"; @@ -319,7 +318,6 @@ else $sql.= " ORDER BY $sortfield $sortorder"; $resql = $db->query($sql); - if ($resql) { $num = $db->num_rows($resql); @@ -329,13 +327,13 @@ else $param="&id=".$remisecheque->id; print ''; ''.$langs->trans("Num").''; - print ''.$langs->trans("Position").''; - print_liste_field_titre($langs->trans("Num"),$_SERVER["PHP_SELF"],"b.num_chq", "",$param,'align="center"',$sortfield,$sortorder); + print ''.$langs->trans("Cheque").''; + print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"b.num_chq", "",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CheckTransmitter"),$_SERVER["PHP_SELF"],"b.emetteur", "",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Bank"),$_SERVER["PHP_SELF"],"b.banque", "",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"b.amount", "",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("LineRecord"),$_SERVER["PHP_SELF"],"b.rowid", "",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateOperation"),$_SERVER["PHP_SELF"],"b.dateo", "",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateChequeReceived"),$_SERVER["PHP_SELF"],"b.datec", "",$param,'align="center"',$sortfield,$sortorder); print " \n"; $i=1; $var=false; @@ -361,7 +359,7 @@ else print ' '; } print ''; - print ''.dolibarr_print_date($objp->date).''; + print ''.dolibarr_print_date($objp->datec,'day').''; if($remisecheque->statut == 0) { print ''.img_delete().''; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 33aff27af82..54d8f67fd9e 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -110,7 +109,7 @@ if ($resql) { print ''; print ''; - print ''; + print ''; print '"; print ''; print ''; diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index d12824fd4d1..10f38170414 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -44,10 +44,6 @@ ListPayment=List of payments ListOfPayments=List of payments ListOfCustomerPayments=List of customer payments ListOfSupplierPayments=List of supplier payments -RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses. -RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses anf VAT.
-RulesCADue=- It includes the clients' due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
-RulesCAIn=- It includes all the effective payments of invoices received from clients.
- It is based on the payment date of these invoices
DatePayment=Payment date NewVATPayment=New VAT payment VATPayment=VAT Payment @@ -65,13 +61,25 @@ ByUserAuthorOfInvoice=By invoice author AccountancyExport=Accountancy export ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of suppliers' products. -CheckReceipt=Check receipt +CheckReceipt=Check deposit +CheckReceiptShort=Check deposit NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=New check deposit on account: %s NoWaitingChecks=No checks waiting for deposit. +DateChequeReceived=Cheque reception input date PaySocialContribution=Pay a social contribution ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as payed? DeleteSocialContribution=Delete a social contribution ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution? ExportDataset_tax_1=Social contributions and payments +AnnualSummaryDueDebtMode=Bilan des recettes et dépenses, résumé annuel, en mode %sCréances-Dettes%s dit comptabilité d'engagement. +AnnualSummaryInputOutputMode=Bilan des recettes et dépenses, résumé annuel, en mode %sRecettes-Dépenses%s dit comptabilité de caisse. +AnnualByCompaniesDueDebtMode=Bilan des recettes et dépenses, détail par tiers, en mode %sCréances-Dettes%s dit comptabilité d'engagement. +AnnualByCompaniesInputOutputMode=Bilan des recettes et dépenses, détail par tiers, en mode %sRecettes-Dépenses%s dit comptabilité de caisse. +SeeReportInInputOutputMode=Voir le rapport %sRecettes-Dépenses%s dit comptabilité de caisse pour un calcul sur les factures effectivement payées +SeeReportInDueDebtMode=Voir le rapport %sCréances-Dettes%s dit comptabilité d'engagement pour un calcul sur les factures non encore payées +RulesResultDue=- Amounts shown are with all taxes included
- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses. +RulesResultInOut=- Amounts shown are with all taxes included
- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses anf VAT.
+RulesCADue=- It includes the clients' due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
+RulesCAIn=- It includes all the effective payments of invoices received from clients.
- It is based on the payment date of these invoices
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 0712e9c6a57..72a7c895030 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -62,10 +62,12 @@ AccountancyExport=Export comptable ErrorWrongAccountancyCodeForCompany=Code compta client incorrect pour %s SuppliersProductsSellSalesTurnover=Chiffres d'affaire générés par la vente des produits des fournisseurs CheckReceipt=Bordereau de remise de chèques +CheckReceiptShort=Bordereau NewCheckReceipt=Nouvelle remise NewCheckDeposit=Nouveau dépôt NewCheckDepositOn=Nouveau dépôt sur compte: %s NoWaitingChecks=Pas de chèque en attente de dépots. +DateChequeReceived=Date saisie réception chèque PaySocialContribution=Payer une charge sociale ConfirmPaySocialContribution=Etes-vous sûr de vouloir classer cette charge sociale à payé ? DeleteSocialContribution=Effacer charge sociale diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index 796d0902bae..52b3b74fb95 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -875,7 +875,10 @@ create table llx_fichinterdet ALTER TABLE llx_fichinter ADD COLUMN model_pdf varchar(50) after note_public; -ALTER TABLE llx_bordereau_cheque MODIFY number integer; +ALTER TABLE llx_bordereau_cheque MODIFY number varchar(16) NOT NULL; +ALTER TABLE llx_bordereau_cheque MODIFY amount double(24,8) NOT NULL; +ALTER TABLE llx_bordereau_cheque MODIFY nbcheque smallint NOT NULL; +ALTER TABLE llx_bordereau_cheque MODIFY statut smallint(1) NOT NULL DEFAULT 0; ALTER TABLE llx_facturedet ADD COLUMN special_code tinyint(4) unsigned default 0; ALTER TABLE llx_facturedet MODIFY special_code tinyint(4) unsigned default 0; diff --git a/mysql/tables/llx_bordereau_cheque.sql b/mysql/tables/llx_bordereau_cheque.sql index f1f3289ad6c..e8c19b0fd50 100644 --- a/mysql/tables/llx_bordereau_cheque.sql +++ b/mysql/tables/llx_bordereau_cheque.sql @@ -25,13 +25,13 @@ create table llx_bordereau_cheque ( rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - date_bordereau date, - number integer, - amount float(12,2), - nbcheque smallint UNSIGNED DEFAULT 0, + datec datetime NOT NULL, + date_bordereau date, -- A quoi sert cette date ? + number varchar(16) NOT NULL, + amount double(24,8) NOT NULL, + nbcheque smallint NOT NULL, fk_bank_account integer, fk_user_author integer, note text, - statut tinyint(1) UNSIGNED DEFAULT 0 + statut smallint(1) NOT NULL DEFAULT 0 )type=innodb;
'.$langs->trans("Numero").''.$langs->trans("CheckReceiptShort").''.$langs->trans("Date")."'.$langs->trans("Account").''.$langs->trans("Amount").'