diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 43dc38ea4bb..9ebdea5fefc 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -47,31 +47,33 @@ $accounting = new AccountingAccount($db); // Action if ($action == 'add') { - $sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS; - - dol_syslog('accountancy/admin/card.php:: $sql=' . $sql); - $result = $db->query($sql); - $obj = $db->fetch_object($result); - - $accounting->fk_pcg_version = $obj->pcg_version; - $accounting->pcg_type = GETPOST('pcg_type'); - $accounting->pcg_subtype = GETPOST('pcg_subtype'); - $accounting->account_number = GETPOST('account_number', 'int'); - $accounting->account_parent = GETPOST('account_parent', 'int'); - $accounting->label = GETPOST('label', 'alpha'); - $accounting->active = 1; - - $res = $accounting->create($user); - - if ($res == 0) { - } else { - if ($res == - 3) { - $_error = 1; - $action = "create"; - } - if ($res == - 4) { - $_error = 2; - $action = "create"; + if (! GETPOST('cancel', 'alpha')) { + $sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS; + + dol_syslog('accountancy/admin/card.php:: $sql=' . $sql); + $result = $db->query($sql); + $obj = $db->fetch_object($result); + + $accounting->fk_pcg_version = $obj->pcg_version; + $accounting->pcg_type = GETPOST('pcg_type'); + $accounting->pcg_subtype = GETPOST('pcg_subtype'); + $accounting->account_number = GETPOST('account_number', 'int'); + $accounting->account_parent = GETPOST('account_parent', 'int'); + $accounting->label = GETPOST('label', 'alpha'); + $accounting->active = 1; + + $res = $accounting->create($user); + + if ($res == 0) { + } else { + if ($res == - 3) { + $_error = 1; + $action = "create"; + } + if ($res == - 4) { + $_error = 2; + $action = "create"; + } } } Header("Location: account.php"); diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index 4354cd90cc3..b350aa8e590 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -61,7 +61,7 @@ if ($_POST["action"] == 'import') { $accounting = new AccountingAccount($db); - $monLabel = GETPOST('intitule' . $maLigneCochee); + $monLabel = GETPOST('label' . $maLigneCochee); $monParentAccount = GETPOST('AccountParent' . $maLigneCochee); $monType = GETPOST('pcgType' . $maLigneCochee); $monSubType = GETPOST('pcgSubType' . $maLigneCochee); @@ -146,7 +146,7 @@ if ($result) { print ''; print ''; - print ''; + print ''; print ''; // Colonne choix du compte @@ -164,7 +164,7 @@ if ($result) { // Colonne choix ligne a ventiler - $checked = ('intitule' == 'O') ? ' checked=checked' : ''; + $checked = ('label' == 'O') ? ' checked=checked' : ''; print ''; print ''; diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php index dd9f18e82a4..120d08db09c 100644 --- a/htdocs/accountancy/bookkeeping/balancebymonth.php +++ b/htdocs/accountancy/bookkeeping/balancebymonth.php @@ -76,7 +76,7 @@ $y = $year_current; $var = true; print ''; -print ''; +print ''; $sql = "SELECT bk.numero_compte AS 'compte',"; $sql .= " ROUND(SUM(IF(MONTH(bk.doc_date)=1,bk.montant,0)),2) AS 'Janvier',"; diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index c782797b9cb..9e109c7feeb 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -26,7 +26,7 @@ require '../../main.inc.php'; // Class -require_once DOL_DOCUMENT_ROOT.'accountancy/class/bookkeeping.class.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php'; // Langs $langs->load("accounting"); diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 12cf9559d8d..de3bbf5c1db 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -91,9 +91,9 @@ else if ($action == 'export_csv') { else { - llxHeader('', $langs->trans("Accounting") . ' - ' . $langs->trans("Bookkeeping")); + llxHeader('', $langs->trans("Bookkeeping")); - /* +/* * List */ diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php index 070f9a8071a..7ce2134d0d2 100644 --- a/htdocs/accountancy/class/accountancysystem.class.php +++ b/htdocs/accountancy/class/accountancysystem.class.php @@ -57,8 +57,8 @@ class AccountancySystem $now = dol_now(); $sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_system"; - $sql .= " (date_creation, fk_user_author, numero,intitule)"; - $sql .= " VALUES (" . $this->db->idate($now) . "," . $user->id . ",'" . $this->numero . "','" . $this->intitule . "')"; + $sql .= " (date_creation, fk_user_author, numero, label)"; + $sql .= " VALUES (" . $this->db->idate($now) . "," . $user->id . ",'" . $this->numero . "','" . $this->label . "')"; dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG); $resql = $this->db->query($sql); diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 08dc4b05bd9..91a0eb5df8b 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -47,16 +47,23 @@ if (! $user->rights->accounting->access) * Actions */ -if ($action == 'ventil' && $user->rights->accounting->access) { - $sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet"; - $sql .= " SET fk_code_ventilation = " . $codeventil; - $sql .= " WHERE rowid = " . $id; +if ($action == 'ventil' && $user->rights->accounting->access) +{ + if (! GETPOST('cancel', 'alpha')) + { + $sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet"; + $sql .= " SET fk_code_ventilation = " . $codeventil; + $sql .= " WHERE rowid = " . $id; - dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG); - $resql = $db->query($sql); - if (! $resql) { - setEventMessage($db->lasterror(), 'errors'); - } + dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG); + $resql = $db->query($sql); + if (! $resql) { + setEventMessage($db->lasterror(), 'errors'); + } + } else { + header("Location: ./lines.php"); + exit(); + } } llxHeader("", "", "FicheVentilation"); @@ -101,7 +108,8 @@ if (! empty($id)) { print ''; print ''; - print_fiche_titre($langs->trans("Ventilation")); + $linkback=''.$langs->trans("Back").''; + print_fiche_titre($langs->trans('AccountingVentilationCustomer'),$linkback,'setup'); print '
' . $langs->trans("Intitule") . '' . $langs->trans("JanuaryMin") . '' . $langs->trans("FebruaryMin") . '' . $langs->trans("MarchMin") . '' . $langs->trans("AprilMin") . '' . $langs->trans("MayMin") . '' . $langs->trans("JuneMin") . '' . $langs->trans("JulyMin") . '' . $langs->trans("AugustMin") . '' . $langs->trans("SeptemberMin") . '' . $langs->trans("OctoberMin") . '' . $langs->trans("NovemberMin") . '' . $langs->trans("DecemberMin") . 'Total
' . $langs->trans("Label") . '' . $langs->trans("JanuaryMin") . '' . $langs->trans("FebruaryMin") . '' . $langs->trans("MarchMin") . '' . $langs->trans("AprilMin") . '' . $langs->trans("MayMin") . '' . $langs->trans("JuneMin") . '' . $langs->trans("JulyMin") . '' . $langs->trans("AugustMin") . '' . $langs->trans("SeptemberMin") . '' . $langs->trans("OctoberMin") . '' . $langs->trans("NovemberMin") . '' . $langs->trans("DecemberMin") . 'Total
'; @@ -119,9 +127,11 @@ if (! empty($id)) { print ''; - print ''; - print '
' . $langs->trans("NewAccount") . ''; print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1); print '
 
'; + + print '
    '; + print ''; } else { print "Error"; diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index a9723b72497..2df4d675b20 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -28,6 +28,7 @@ require '../../main.inc.php'; // Class require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; // Langs $langs->load("compta"); @@ -118,7 +119,7 @@ $var = true; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -169,7 +170,7 @@ if ($resql) { while ( $i < $num ) { $row = $db->fetch_row($resql); - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index b67069cdf69..02602262e2c 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -27,9 +27,9 @@ require '../../main.inc.php'; // Class -require_once DOL_DOCUMENT_ROOT.'compta/facture/class/facture.class.php'; -require_once DOL_DOCUMENT_ROOT.'product/class/product.class.php'; -require_once DOL_DOCUMENT_ROOT.'accountancy/class/html.formventilation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php'; // Langs $langs->load("compta"); diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 4a57482a2d7..f2d5a586b37 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -264,7 +264,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->fk_docdet = $val["fk_bank"]; $bookkeeping->code_tiers = $tabcompany[$key]['code_client']; $bookkeeping->numero_compte = $k; - $bookkeeping->label_compte = $compte->intitule; + $bookkeeping->label_compte = $compte->label; $bookkeeping->montant = ($mt < 0 ? - $mt : $mt); $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C'; $bookkeeping->debit = ($mt >= 0 ? $mt : 0); diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php index f278a458ab5..33b1e4359c1 100644 --- a/htdocs/accountancy/journal/cashjournal.php +++ b/htdocs/accountancy/journal/cashjournal.php @@ -244,7 +244,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->fk_docdet = $val["fk_bank"]; $bookkeeping->code_tiers = $tabcompany[$key]['code_client']; $bookkeeping->numero_compte = $k; - $bookkeeping->label_compte = $compte->intitule; + $bookkeeping->label_compte = $compte->label; $bookkeeping->montant = ($mt < 0 ? - $mt : $mt); $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C'; $bookkeeping->debit = ($mt >= 0 ? $mt : 0); diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index f1f61b0062a..3fb8cbc6927 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -34,7 +34,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php'; require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 3136be313e6..67426f8adb6 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -27,6 +27,7 @@ require '../../main.inc.php'; // Class require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; // Langs $langs->load("compta"); @@ -93,7 +94,7 @@ llxHeader('', $langs->trans("SuppliersVentilation")); $textprevyear = "" . img_previous() . ""; $textnextyear = " " . img_next() . ""; -print_fiche_titre($langs->trans("VentilationComptableSupplier") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); +print_fiche_titre($langs->trans("AccountingVentilationSupplier") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); print '' . $langs->trans("DescVentilSupplier") . ''; print '
' . $langs->trans("ValidateHistory") . '
'; @@ -104,7 +105,7 @@ $var = true; print '
' . $langs->trans("Account") . '' . $langs->trans("Intitule") . '' . $langs->trans("Label") . '' . $langs->trans("JanuaryMin") . '' . $langs->trans("FebruaryMin") . '' . $langs->trans("MarchMin") . '
' . $row[0] . '
' . length_accountg($row[0]) . '' . $row[1] . '' . price($row[2]) . '' . price($row[3]) . '
'; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -157,7 +158,7 @@ if ($resql) { $row = $db->fetch_row($resql); - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 2ca71223ff2..1ea86faad11 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -868,13 +868,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/customer/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->read); if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/customer/lines.php",$langs->trans("Dispatched"),1,$user->rights->accounting->ventilation->read); - $newmenu->add("/accountancy/supplier/index.php?leftmenu=ventil_supplier",$langs->trans("SuppliersVentilation"),0,$user->rights->accounting->ventilation->read, '', $mainmenu, 'ventil_supplier'); - if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/supplier/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->read); - if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/supplier/lines.php",$langs->trans("Dispatched"),1,$user->rights->accounting->ventilation->read); + if (! empty($conf->fournisseur->enabled)) + { + $newmenu->add("/accountancy/supplier/index.php?leftmenu=ventil_supplier",$langs->trans("SuppliersVentilation"),0,$user->rights->accounting->ventilation->read, '', $mainmenu, 'ventil_supplier'); + if (empty($leftmenu) || $leftmenu=="ventil_supplier") $newmenu->add("/accountancy/supplier/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->read); + if (empty($leftmenu) || $leftmenu=="ventil_supplier") $newmenu->add("/accountancy/supplier/lines.php",$langs->trans("Dispatched"),1,$user->rights->accounting->ventilation->read); + } - $newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=bookkeeping",$langs->trans("Bookkeeping"),0,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookeeping'); - if (empty($leftmenu) || $leftmenu=="bookeeping") $newmenu->add("/accountancy/bookkeeping/listbyyear.php",$langs->trans("ByYear"),1,$user->rights->accounting->mouvements->lire); - if (empty($leftmenu) || $leftmenu=="bookeeping") $newmenu->add("/accountancy/bookkeeping/balancebymonth.php.php",$langs->trans("AccountBalanceByMonth"),1,$user->rights->accounting->mouvements->lire); + $newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=bookkeeping",$langs->trans("Bookkeeping"),0,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping'); + if (empty($leftmenu) || $leftmenu=="bookkeeping") $newmenu->add("/accountancy/bookkeeping/listbyyear.php",$langs->trans("ByYear"),1,$user->rights->accounting->mouvements->lire); + if (empty($leftmenu) || $leftmenu=="bookkeeping") $newmenu->add("/accountancy/bookkeeping/balancebymonth.php",$langs->trans("AccountBalanceByMonth"),1,$user->rights->accounting->mouvements->lire); } // Rapports diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql index 856d4d058d7..54f24b1ea80 100644 --- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql +++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql @@ -35,5 +35,5 @@ CREATE TABLE llx_accounting_bookkeeping fk_user_author integer NOT NULL, import_key varchar(14), code_journal varchar(10) DEFAULT NULL, - piece_num integer NOT NULL + piece_num integer NOT NULL ) ENGINE=innodb; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 1dabe2cf8e3..3d06c7f28b6 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -20,6 +20,7 @@ Selectmodelcsv=Select a model of export Modelcsv_normal=Classic export Modelcsv_CEGID=Export towards CEGID Expert BackToChartofaccounts=Return chart of accounts +Back=Return Definechartofaccounts=Define a chart of accounts Selectchartofaccounts=Select a chart of accounts @@ -46,9 +47,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -VentilationComptable=Accounting ventilation -VentilationComptableSupplier=Accounting ventilation supplier -Intitule=Label +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer Line=Line CAHTF=Total purchase supplier HT diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index da8251cd96d..8c83a64fd84 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -22,6 +22,7 @@ Selectmodelcsv=Seleccione una plantilla de exportación Modelcsv_normal=Exportación clásica Modelcsv_CEGID=Exportar a Cegid Expert BackToChartofaccounts=Volver al plan contable +Back=Volver Definechartofaccounts=Definir la contabilidad Selectchartofaccounts=Seleccione un plan contable @@ -49,14 +50,9 @@ WriteBookKeeping=Registrar los asientos en el libro mayor Bookkeeping=libro mayor AccountBalanceByMonth=Saldo Mensual -VentilationComptable=desglose de Contabilidad -VentilationComptableSupplier=Proveedor de cuentas de ventilación -Intitule=título -Line=línea - -VentilationComptable=desglose de Contabilidad -VentilationComptableSupplier=Contabilización compras -Intitule=título +AccountingVentilation=desglose de Contabilidad +AccountingVentilationSupplier=Proveedor de cuentas de ventilación +AccountingVentilationCustomer=Cliente de cuentas de ventilación Line=línea Ventilate=contabilizar diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 9ee15ac2720..227915195eb 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -20,6 +20,7 @@ Selectmodelcsv=Sélectionnez un modèle d'export Modelcsv_normal=Export classique Modelcsv_CEGID=Export vers CEGID Expert BackToChartofaccounts=Retour plan comptable +Back=Retour Definechartofaccounts=Définir un plan comptable Selectchartofaccounts=Sélectionnez un plan comptable @@ -46,9 +47,9 @@ WriteBookKeeping=Comptabiliser les écritures dans le grand livre Bookkeeping=Grand livre AccountBalanceByMonth=Balance mensuelle -VentilationComptable=Ventilation comptable -VentilationComptableSupplier=Ventilation comptable fournisseur -Intitule=Intitulé +AccountingVentilation=Ventilation comptable +AccountingVentilationSupplier=Ventilation comptable fournisseur +AccountingVentilationCustomer=Ventilation comptable client Line=Ligne CAHTF=Total achat fournisseur HT
' . $langs->trans("Account") . '' . $langs->trans("Intitule") . '' . $langs->trans("Label") . '' . $langs->trans("JanuaryMin") . '' . $langs->trans("FebruaryMin") . '' . $langs->trans("MarchMin") . '
' . $row[0] . '
' . length_accountg($row[0]) . '' . $row[1] . '' . price($row[2]) . '' . price($row[3]) . '