diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 2bb37f85e32..ea3833432f6 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -393,7 +393,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer) print ''; - print ''; + print ''; print '     '; print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 27c9a96dc7c..777572e3360 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -1,5 +1,6 @@ + * Copyright (C) 2007 Laurent Destailleur * * 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 @@ -137,7 +138,7 @@ if ($_GET['action'] == 'new') $hselected = $h; $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CheckReceipt")); + dolibarr_fiche_head($head, $hselected, $langs->trans("Cheques")); } else { @@ -153,7 +154,7 @@ else // $head[$h][1] = $langs->trans("Info"); // $h++; - dolibarr_fiche_head($head, $hselected, $langs->trans("CheckReceipt")); + dolibarr_fiche_head($head, $hselected, $langs->trans("Cheques")); /* * Confirmation de la suppression du bordereau @@ -271,17 +272,22 @@ else $next_id = $remise->next_id ? ''.img_next().'':''; print ''; - print '\n"; + print '"; + print "\n"; - print ''; + print ''; - print ''; - print ''; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 371792d147e..e32934d31a6 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2007 Laurent Destailleur * * 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 @@ -53,9 +54,9 @@ $accountstatic=new Account($db); * Affichage */ -llxHeader('',$langs->trans("CheckReceipt")); +llxHeader('',$langs->trans("ChequesArea")); -print_fiche_titre($langs->trans("CheckReceipt") ); +print_fiche_titre($langs->trans("ChequesArea") ); print '
'.$langs->trans('Numero').''.$remise->number.''; - print $previous_id.' '.$next_id; - print "
'.$langs->trans('Numero').''; + if ($previous_id || $next_id) print '
'; +// print ''; + print $remise->number; + //print $previous_id.' '.$next_id; + if ($previous_id || $next_id) print ''.$previous_id.''.$next_id.'
'; + print "
'.$langs->trans('Date').''.dolibarr_print_date($remise->date_bordereau).'
'.$langs->trans('Date').''.dolibarr_print_date($remise->date_bordereau).'
'.$langs->trans('Account').''; + print '
'.$langs->trans('Account').''; print $accountstatic->getNomUrl(1); print '
'.$langs->trans('Total').''; + print '
'.$langs->trans('Total').''; print price($remise->amount); print '
'; @@ -82,7 +83,9 @@ if ($resql) } print ""; print ''; - print ''; + print ''; print "
'.$langs->trans("BankChecksToReceipt").''.$num.'
'; + print ''.$num.''; + print '
\n"; } else @@ -106,8 +109,9 @@ $resql = $db->query($sql); if ($resql) { print ''; - print '"; + print ''; print ''; + print '"; print ''; print ''; print ''; @@ -126,14 +130,10 @@ if ($resql) $var=!$var; print "\n"; - print ''; - print ''; - + print ''; print ''; - print ''; - print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index ae86661290d..a49f7b2ba0c 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -63,7 +63,7 @@ $accountstatic=new Account($db); * Affichage */ -llxHeader('',$langs->trans("CheckReceipt")); +llxHeader('',$langs->trans("ChequesReceipts")); $sql = "SELECT bc.rowid, bc.number, ".$db->pdate("bc.date_bordereau") ." as dp, bc.amount, bc.statut,"; $sql.= " ba.rowid as bid, ba.label"; @@ -85,7 +85,7 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print_barre_liste($langs->trans("CheckReceipt"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("ChequesReceipts"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); print ''; print '
'.$langs->trans("Date")."
'.$langs->trans("Numero").''.$langs->trans("Date")."'.$langs->trans("Account").''.$langs->trans("Amount").''.$langs->trans("Status").'
'.dolibarr_print_date($objp->db,'day').''.$checkdepositstatic->getNomUrl(1).''.dolibarr_print_date($objp->db,'day').''.$accountstatic->getNomUrl(1).''.price($objp->amount).''.$checkdepositstatic->LibStatut($objp->statut,3).'
'; @@ -136,10 +136,6 @@ if ($resql) // Statut print '\n"; $i++; diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index 997f041fdb3..9283c90d759 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -37,7 +37,7 @@ function llxHeader($head = "", $title="") $menu->add("/compta/paiement/liste.php",$langs->trans("Payments")); - $menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("CheckReceipt")); + $menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("MenuChequeDeposits")); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?action=new",$langs->trans("NewCheckDeposit")); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php",$langs->trans("List")); diff --git a/htdocs/compta/paiement/pre.inc.php b/htdocs/compta/paiement/pre.inc.php index cec12034e25..83e53f0e26c 100644 --- a/htdocs/compta/paiement/pre.inc.php +++ b/htdocs/compta/paiement/pre.inc.php @@ -38,7 +38,7 @@ function llxHeader($head = "", $title="") { $menu->add("liste.php",$langs->trans("Payments")); $menu->add_submenu("liste.php",$langs->trans("List")); - $menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("CheckReceipt")); + $menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("MenuChequeDeposits")); $menu->add("rapport.php",$langs->trans("Reportings")); diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 4420c95a54d..c924b41fc2b 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -323,7 +323,7 @@ class MenuLeft { /* - * Menu COMPTA + * Menu COMPTA-FINANCIAL */ if ($mainmenu == 'accountancy') { @@ -390,14 +390,9 @@ class MenuLeft { if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/avalider.php?leftmenu=customers_bills_payments",$langs->trans("MenuToValid"),3,$user->rights->facture->lire); if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/rapport.php?leftmenu=customers_bills_payments",$langs->trans("Reportings"),3,$user->rights->facture->lire); - - if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=customers_bills_checks",$langs->trans("CheckReceipt"),2,$user->rights->facture->lire); - if (eregi("customers_bills_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=customers_bills_checks&action=new",$langs->trans("NewCheckDeposit"),3,$user->rights->facture->lire); - if (eregi("customers_bills_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=customers_bills_checks",$langs->trans("List"),3,$user->rights->facture->lire); - if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/index.php?leftmenu=customers_bills", $langs->trans("Statistics"),2,$user->rights->facture->lire); } - + // Propal if ($conf->propal->enabled) { @@ -488,6 +483,15 @@ class MenuLeft { if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer); } + // Gestion cheques + if ($conf->facture->enabled) + { + $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->facture->lire); + if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->facture->creer); + if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->facture->lire); + + } + // Bank-Caisse if ($conf->banque->enabled) { @@ -694,23 +698,30 @@ class MenuLeft { $user->getrights("adherent"); $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Members"),0,$user->rights->adherent->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php",$langs->trans("List"),1,$user->rights->adherent->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1",$langs->trans("MenuMembersToValidate"),1,$user->rights->adherent->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersValidated"),1,$user->rights->adherent->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),1,$user->rights->adherent->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate"),1,$user->rights->adherent->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated"),1,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?leftmenu=members&action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&statut=-1",$langs->trans("MenuMembersToValidate"),1,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&statut=1",$langs->trans("MenuMembersValidated"),1,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),1,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate"),1,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&statut=0",$langs->trans("MenuMembersResiliated"),1,$user->rights->adherent->lire); $langs->load("compta"); - $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=accountancy&mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1,1&leftmenu=accountancy&mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/cotisations.php?leftmenu=accountancy",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire); + $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&statut=-1,1&mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/cotisations.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire); + $langs->load("bills"); + $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=members_checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->adherent->cotisation->lire); + if (eregi("members_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=members_checks&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->adherent->cotisation->creer); + if (eregi("members_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=members_checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->adherent->cotisation->lire); + + + if ($conf->banque->enabled) { $langs->load("banks"); - $newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=accountancy",$langs->trans("Banks"),0,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=members",$langs->trans("Banks"),0,$user->rights->adherent->lire); } $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=export&mainmenu=members",$langs->trans("Exports"),0,$user->rights->adherent->export); diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index fbbe3dfff66..60e63247942 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -96,5 +96,9 @@ TransferDesc=Transfer from one account to another one, Dolibarr will write two r TransferFrom=From TransferTo=To CheckTransmitter=Transmitter + + +BankChecks=Bank cheques +BankChecksToReceipt=Cheques waiting for deposit DeleteTransaction=Delete transaction ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 7bf23a92af6..cf40cdd2d84 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -219,12 +219,10 @@ PaymentTypeCB=Credit card PaymentTypeShortCB=Credit card PaymentTypeCHQ=Cheque PaymentTypeShortCHQ=Cheque - -PaymentTypeTYP=TIP -PaymentTypeShortTYP=TIP +PaymentTypeTIP=TIP +PaymentTypeShortTIP=TIP PaymentTypeVAD=On line payment PaymentTypeShortVAD=On line payment - BankDetails=Bank details BankCode=Bank code DeskCode=Desk code @@ -258,6 +256,14 @@ LawApplicationPart4=leurs prix. VATDischarged=TVA acquittée sur les débits. LimitedLiabilityCompanyCapital=SARL au Capital de UseDiscount=Use discount +MenuChequeDeposits=Cheques deposits +MenuCheques=Cheques +MenuChequesReceipts=Cheques receipts +NewChequeDeposit=New deposit +ChequesReceipts=Cheques receipts +ChequesArea=Cheques deposits area +ChequeDeposits=Cheques deposits +Cheques=Cheques # oursin PDF model Of=du diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index a2be5f555c8..b2f0f6bdc5a 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -256,6 +256,14 @@ LawApplicationPart4=leurs prix. VATDischarged=TVA acquittée sur les débits. LimitedLiabilityCompanyCapital=SARL au Capital de UseDiscount=Appliquer remise +MenuChequeDeposits=Remises de chèques +MenuCheques=Gestion chèques +MenuChequesReceipts=Bordereaux +NewChequeDeposit=Nouveau dépot +ChequesReceipts=Bordereaux de remise de chèques +ChequesArea=Espace remises de chèques +ChequeDeposits=Dépots de chèques +Cheques=Chèques # oursin PDF model Of=du diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 6b2d40a728a..20f0352a20d 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -58,7 +58,7 @@ SalesTurnover=Chiffre d'affaire 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=Remise de chèques +CheckReceipt=Bordereau de remise de chèques NewCheckReceipt=Nouvelle remise NewCheckDeposit=Nouveau dépôt NewCheckDepositOn=Nouveau dépôt sur compte: %s
'; - if ($objp->statut == 0) - { - print ''.$langs->trans("ToValidate").''; - } print $checkdepositstatic->LibStatut($objp->statut,5); print "