From 95573e86080ed9de82fa491324263631738f03f2 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 19 Jun 2017 21:39:43 +0200 Subject: [PATCH] Fix : Accountancy - Debug --- htdocs/accountancy/admin/index.php | 1 + htdocs/accountancy/bookkeeping/card.php | 191 ++++++++++++------ .../accountancy/class/bookkeeping.class.php | 6 +- .../journal/expensereportsjournal.php | 2 +- htdocs/accountancy/journal/sellsjournal.php | 7 +- 5 files changed, 136 insertions(+), 71 deletions(-) diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 0e1f67a0e61..2d6ee046bbc 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -31,6 +31,7 @@ require '../../main.inc.php'; // Class require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; $langs->load("compta"); $langs->load("bills"); diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 680a2d25470..3c6d2faec94 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -1,7 +1,7 @@ - * Copyright (C) 2013-2017 Florian Henry - * Copyright (C) 2013-2017 Alexandre Spangaro +/* Copyright (C) 2013-2017 Olivier Geffroy + * Copyright (C) 2013-2017 Florian Henry + * Copyright (C) 2013-2017 Alexandre Spangaro * * 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 @@ -40,16 +40,19 @@ if ($user->societe_id > 0) { $action = GETPOST('action'); $mode = GETPOST('mode'); $piece_num = GETPOST("piece_num"); + $mesg = ''; + $account_number = GETPOST('account_number'); -$code_tiers = GETPOST('code_tiers'); -if ($code_tiers == - 1) { - $code_tiers = null; +$subledger_account = GETPOST('subledger_account'); +if ($subledger_account == - 1) { + $subledger_account = null; } $label_compte = GETPOST('label_compte'); $label_operation= GETPOST('label_operation'); $debit = price2num(GETPOST('debit')); $credit = price2num(GETPOST('credit')); + $save = GETPOST('save'); if (! empty($save)) { $action = 'add'; @@ -60,23 +63,28 @@ if (! empty($update)) { } $object = new BookKeeping($db); if ($action == "confirm_update") { + $error = 0; + if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) { setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors'); $error ++; } + if (empty($error)) { $book = new BookKeeping($db); + $result = $book->fetch($id, null, $mode); if ($result < 0) { setEventMessages($book->error, $book->errors, 'errors'); } else { $book->numero_compte = $account_number; - $book->code_tiers = $code_tiers; + $book->subledger_account = $subledger_account; $book->label_compte = $label_compte; $book->label_operation= $label_operation; $book->debit = $debit; $book->credit = $credit; + if (floatval($debit) != 0.0) { $book->montant = $debit; $book->sens = 'D'; @@ -85,6 +93,7 @@ if ($action == "confirm_update") { $book->montant = $credit; $book->sens = 'C'; } + $result = $book->update($user, false, $mode); if ($result < 0) { setEventMessages($book->error, $book->errors, 'errors'); @@ -95,16 +104,20 @@ if ($action == "confirm_update") { } } } + else if ($action == "add") { $error = 0; + if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) { setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors'); $error ++; } + if (empty($error)) { $book = new BookKeeping($db); + $book->numero_compte = $account_number; - $book->code_tiers = $code_tiers; + $book->subledger_account = $subledger_account; $book->label_compte = $label_compte; $book->label_operation= $label_operation; $book->debit = $debit; @@ -116,14 +129,17 @@ else if ($action == "add") { $book->code_journal = GETPOST('code_journal'); $book->fk_doc = GETPOST('fk_doc'); $book->fk_docdet = GETPOST('fk_docdet'); + if (floatval($debit) != 0.0) { $book->montant = $debit; $book->sens = 'D'; } + if (floatval($credit) != 0.0) { $book->montant = $credit; $book->sens = 'C'; } + $result = $book->createStd($user, false, $mode); if ($result < 0) { setEventMessages($book->error, $book->errors, 'errors'); @@ -133,10 +149,13 @@ else if ($action == "add") { } } } + else if ($action == "confirm_delete") { $book = new BookKeeping($db); + $result = $book->fetch($id, null, $mode); $piece_num = $book->piece_num; + if ($result < 0) { setEventMessages($book->error, $book->errors, 'errors'); } else { @@ -147,41 +166,47 @@ else if ($action == "confirm_delete") { } $action = ''; } + else if ($action == "confirm_create") { - $error = 0; - $book = new BookKeeping($db); + $error = 0; + + $book = new BookKeeping($db); + if (! GETPOST('next_num_mvt')) { - setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors'); - $error++; + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors'); + $error++; } + if (! $error) { - $book->label_compte = ''; - $book->debit = 0; - $book->credit = 0; - $book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear')); - $book->doc_type = GETPOST('doc_type'); - $book->piece_num = GETPOST('next_num_mvt'); - $book->doc_ref = GETPOST('doc_ref'); - $book->code_journal = GETPOST('code_journal'); - $book->fk_doc = 0; - $book->fk_docdet = 0; - $book->montant = 0; - $result = $book->createStd($user,0, $mode); - if ($result < 0) { - setEventMessages($book->error, $book->errors, 'errors'); - } else { - setEventMessages($langs->trans('Saved'), null, 'mesgs'); - $action = 'update'; - $id=$book->id; - $piece_num = $book->piece_num; - } + $book->label_compte = ''; + $book->debit = 0; + $book->credit = 0; + $book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear')); + $book->doc_type = GETPOST('doc_type'); + $book->piece_num = GETPOST('next_num_mvt'); + $book->doc_ref = GETPOST('doc_ref'); + $book->code_journal = GETPOST('code_journal'); + $book->fk_doc = 0; + $book->fk_docdet = 0; + $book->montant = 0; + + $result = $book->createStd($user,0, $mode); + if ($result < 0) { + setEventMessages($book->error, $book->errors, 'errors'); + } else { + setEventMessages($langs->trans('Saved'), null, 'mesgs'); + $action = 'update'; + $id=$book->id; + $piece_num = $book->piece_num; + } } } + if ($action == 'setdate') { $datedoc = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear')); - $result = $object->upddateByMvt($piece_num,'doc_date',$db->idate($datedoc),$mode); + $result = $object->updateByMvt($piece_num,'doc_date',$db->idate($datedoc),$mode); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } else { @@ -189,12 +214,13 @@ if ($action == 'setdate') { $action = ''; } } + if ($action == 'setjournal') { $journaldoc = trim(GETPOST('code_journal')); if (!empty($journaldoc)) { $journaldoc='\''.$journaldoc.'\''; } - $result = $object->upddateByMvt($piece_num,'code_journal',$journaldoc,$mode); + $result = $object->updateByMvt($piece_num,'code_journal',$journaldoc,$mode); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } else { @@ -202,12 +228,13 @@ if ($action == 'setjournal') { $action = ''; } } + if ($action == 'setdocref') { $refdoc = trim(GETPOST('doc_ref')); if (!empty($refdoc)) { $refdoc='\''.$refdoc.'\''; } - $result = $object->upddateByMvt(doc_ref,'code_journal',$refdoc,$mode); + $result = $object->updateByMvt(doc_ref,'code_journal',$refdoc,$mode); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } else { @@ -215,6 +242,7 @@ if ($action == 'setdocref') { $action = ''; } } + if ($action == 'valid') { $result = $object->transformTransaction(0,$piece_num); if ($result < 0) { @@ -224,6 +252,7 @@ if ($action == 'valid') { exit; } } + /* * View */ @@ -237,47 +266,61 @@ if ($action == 'delete') { $formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id.'&mode='. $mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1); print $formconfirm; } + if ($action == 'create') { print load_fiche_titre($langs->trans("CreateMvts")); + $book = new BookKeeping($db); $next_num_mvt = $book->getNextNumMvt('_tmp'); - if (empty($next_num_mvt)) - { - dol_print_error('', 'Failed to get next piece number'); - } + + if (empty($next_num_mvt)) + { + dol_print_error('', 'Failed to get next piece number'); + } + print '
'; print '' . "\n"; print '' . "\n"; print '' . "\n"; + dol_fiche_head(); + print ''; print ''; print ''; print ''; print ''; + print ''; print ''; print ''; print ''; + print ''; print ''; print ''; print ''; + print ''; print ''; - print ''; + print ''; print ''; + print ''; print ''; - print ''; + print ''; print ''; + print '
' . $langs->trans("NumPiece") . '' . $next_num_mvt . '
' . $langs->trans("Docdate") . ''; print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1); print '
' . $langs->trans("Codejournal") . '' . $formaccounting->select_journal(GETPOST('code_journal'),'code_journal',0,0,array(),1,1) . '
' . $langs->trans("Docref") . '
' . $langs->trans("Doctype") . '
'; + dol_fiche_end(); + print '
'; print '     '; print '
'; + print '
'; } else { $book = new BookKeeping($db); @@ -286,16 +329,21 @@ if ($action == 'create') { setEventMessages($book->error, $book->errors, 'errors'); } if (! empty($book->piece_num)) { + print load_fiche_titre($langs->trans("UpdateMvts"), '' . $langs->trans('BackToList') . ''); + dol_fiche_head(); + print '
'; print '
'; print ''; - // account mouvment + + // account movement print ''; print ''; print ''; print ''; + // date print '
' . $langs->trans("NumMvts") . '' . $book->piece_num . '
'; print ''; print ''; print '
'; @@ -368,11 +416,14 @@ if ($action == 'create') { print '' . $book->doc_type . '
'; + print ''; + print '
'; print '
'; print ''; - //Validate + + // Validate print ''; print ''; print ''; @@ -413,11 +464,14 @@ if ($action == 'create') { print ''; print '
'; print '
'; + $result = $book->fetchAllPerMvt($piece_num, $mode); if ($result < 0) { setEventMessages($book->error, $book->errors, 'errors'); } else { + print load_fiche_titre($langs->trans("ListeMvts"), '', ''); + print ''; print '' . "\n"; print '' . "\n"; @@ -426,30 +480,37 @@ if ($action == 'create') { print '' . "\n"; print '' . "\n"; print '' . "\n"; + print "
' . $langs->trans("Status") . ''; @@ -394,17 +445,17 @@ if ($action == 'create') { if ($book->doc_type == 'customer_invoice') { $sqlmid = 'SELECT rowid as ref'; - $sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac"; - $sqlmid .= " WHERE fac.rowid=" . $book->fk_doc; - dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG); - $resultmid = $db->query($sqlmid); - if ($resultmid) { - $objmid = $db->fetch_object($resultmid); - $invoicestatic = new Facture($db); - $invoicestatic->fetch($objmid->ref); - $ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1); - } - else dol_print_error($db); + $sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac"; + $sqlmid .= " WHERE fac.rowid=" . $book->fk_doc; + dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG); + $resultmid = $db->query($sqlmid); + if ($resultmid) { + $objmid = $db->fetch_object($resultmid); + $invoicestatic = new Facture($db); + $invoicestatic->fetch($objmid->ref); + $ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1); + } + else dol_print_error($db); } */ print '' . $ref .'
"; if (count($book->linesmvt) > 0) { + $total_debit = 0; $total_credit = 0; + print ''; + print_liste_field_titre($langs->trans("AccountAccountingShort")); - print_liste_field_titre($langs->trans("Code_tiers")); + print_liste_field_titre($langs->trans("Subledger_account")); print_liste_field_titre($langs->trans("Labelcompte")); print_liste_field_titre($langs->trans("Labeloperation")); print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="center"'); print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="center"'); print_liste_field_titre($langs->trans("Action"), "", "", "", "", 'width="60" align="center"'); + print "\n"; + foreach ( $book->linesmvt as $line ) { $var = ! $var; print ''; $total_debit += $line->debit; $total_credit += $line->credit; + if ($action == 'update' && $line->id == $id) { print ''; print ''; print ''; print ''; @@ -461,34 +522,37 @@ if ($action == 'create') { print ''; } else { print ''; - print ''; + print ''; print ''; print ''; print ''; print ''; + print ''; } print "\n"; } + if ($total_debit != $total_credit) { setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings'); } + if ($action == "" || $action == 'add') { - $var = ! $var; - print ''; + print ''; print ''; print ''; print ''; print ''; @@ -510,6 +574,7 @@ if ($action == 'create') { print load_fiche_titre($langs->trans("NoRecords")); } } + dol_fiche_end(); llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index a441b79dbb2..843e15a5dd7 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -1060,10 +1060,10 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return number <0 if KO, >0 if OK */ - public function upddateByMvt($piece_num='', $field='', $value='', $mode='') { + public function updateByMvt($piece_num='', $field='', $value='', $mode='') { $this->db->begin(); - $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element.$mode." as ab"; - $sql .= ' SET ab.'.$field.'=' . $value; + $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . $mode . " as ab"; + $sql .= ' SET ab.' . $field . '=' . $value; $sql .= ' WHERE ab.piece_num=' . $piece_num ; $resql = $this->db->query($sql); if (! $resql) { diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index 6dba1443ae1..f751d78b1a6 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -91,7 +91,7 @@ $idpays = $mysoc->country_id; $sql = "SELECT er.rowid, er.ref, er.date_debut as de,"; $sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation, erd.vat_src_code, "; $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,"; -$sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,"; +$sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte"; //$sql .= " ct.accountancy_code_buy as account_tva"; $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd"; //$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'"; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index a50f8be7fb9..e374ab62c5c 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -152,7 +152,7 @@ if ($result) { // Define array to display all VAT rates that use this accounting account $compta_tva if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code)) { - $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')); + $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')); } // Situation invoices handling @@ -591,7 +591,7 @@ if (empty($action) || $action == 'view') { print ""; print ""; print ""; - print ""; + print ""; print ""; print ""; print "\n"; @@ -617,7 +617,6 @@ if (empty($action) || $action == 'view') { $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; $companystatic->client = $tabcompany[$key]['code_client']; - $companystatic->client = $tabcompany[$key]['code_client']; print ""; - print ""; + print ""; // ' '.join(', ',$def_tva[$key][$k]). // print ""; print ""; print "";
'; print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, ''); print ''; - print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1); + print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1); print '' . length_accountg($line->numero_compte) . '' . length_accounta($line->code_tiers) . '' . length_accounta($line->subledger_account) . '' . $line->label_compte . '' . $line->label_operation. '' . price($line->debit) . '' . price($line->credit) . ''; - print ''; + print 'id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">'; print img_edit(); print ' '; - print ''; + print 'id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">'; print img_delete(); + print ''; print '
'; print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, ''); print ''; - print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1); + print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1); print '" . $langs->trans("Date") . "" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")" . $langs->trans("AccountAccounting") . "" . $langs->trans("Type") . "" . $langs->trans("Label") . "" . $langs->trans("Debit") . "" . $langs->trans("Credit") . "
"; $accountoshow = length_accounta($k); if (empty($accountoshow) || $accountoshow == 'NotDefined') @@ -675,7 +674,7 @@ if (empty($action) || $action == 'view') { } else print $accountoshow; print "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.join(', ',$def_tva[$key][$k]). "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . "" . $langs->trans("VAT") . "" . ($mt < 0 ? price(- $mt) : '') . "" . ($mt >= 0 ? price($mt) : '') . "