lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little debug of accounting module

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-03 11:54:03 +02:00
parent 36ed1c9a88
commit ce2e5e7862
8 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/accountancy/admin/account.php
View File

@ -173,11 +173,12 @@ if ($result) {
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
$var = true; $var = false;
$accountstatic=new AccountingAccount($db); $accountstatic=new AccountingAccount($db);
while ( $i < min($num, $limit) ) { while ( $i < min($num, $limit) )
{
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$accountstatic->id=$obj->rowid; $accountstatic->id=$obj->rowid;

7
htdocs/accountancy/admin/export.php
View File

@ -99,12 +99,13 @@ print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup
$head = admin_accounting_prepare_head(); $head = admin_accounting_prepare_head();
dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">'; print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
$var = true; $var = true;
@ -169,7 +170,9 @@ if ($num)
print "</table>\n"; print "</table>\n";
} }
print '<br><div style="text-align:center"><input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '" name="button"></div>'; dol_fiche_end();
print '<div class="center"><input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '" name="button"></div>';
print '</form>'; print '</form>';

9
htdocs/accountancy/admin/index.php
View File

@ -157,12 +157,13 @@ print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup
$head = admin_accounting_prepare_head($accounting); $head = admin_accounting_prepare_head($accounting);
dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
// Cas du parametre ACCOUNTING_MODE // Cas du parametre ACCOUNTING_MODE
@ -291,7 +292,11 @@ print '</tr>';
print "</table>\n"; print "</table>\n";
print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>'; dol_fiche_end();
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
print '</form>'; print '</form>';
llxFooter(); llxFooter();
$db->close(); $db->close();

18
htdocs/accountancy/admin/journaux.php → htdocs/accountancy/admin/journal.php
View File

@ -22,7 +22,7 @@
*/ */
/** /**
* \file htdocs/accountancy/admin/journaux.php * \file htdocs/accountancy/admin/journal.php
* \ingroup Accounting Expert * \ingroup Accounting Expert
* \brief Setup page to configure accounting expert module * \brief Setup page to configure accounting expert module
*/ */
@ -87,12 +87,12 @@ print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup
$head = admin_accounting_prepare_head(null); $head = admin_accounting_prepare_head(null);
dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">'; print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">' . $langs->trans('Journaux') . '</td>'; print '<td colspan="3">' . $langs->trans('Journaux') . '</td>';
@ -115,10 +115,9 @@ foreach ( $list as $key ) {
print "</table>\n"; print "</table>\n";
print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
print '</form>';
print '<br />'; print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -164,9 +163,12 @@ $db->free($resql);
print "</table>\n"; print "</table>\n";
print '</div>'; dol_fiche_end();
print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
print '</form>';
print '<br>';
llxFooter(); llxFooter();
$db->close(); $db->close();

7
htdocs/accountancy/admin/productaccount.php
View File

@ -287,8 +287,9 @@ if ($result) {
print '<th align="left">' . $langs->trans("Accountancy_code_sell_suggest") . '</td>'; print '<th align="left">' . $langs->trans("Accountancy_code_sell_suggest") . '</td>';
} }
// print_liste_field_titre(''); // print_liste_field_titre('');
print '<td align="center">' . $langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label>/<label id="unselect-all">' . $langs->trans('None') . '</label>' . '</td>'; print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label> / <label id="unselect-all">' . $langs->trans('None') . '</label>');
print '</tr>'; print '</tr>';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_ref" value="' . $search_ref . '"></td>'; print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_ref" value="' . $search_ref . '"></td>';
print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>'; print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
@ -359,7 +360,7 @@ if ($result) {
// print '<td align="left">' . $compta_prodbuy . '</td>'; // print '<td align="left">' . $compta_prodbuy . '</td>';
// TODO: we shoul set a user defined value to adjust user square / wide screen size // TODO: we shoul set a user defined value to adjust user square / wide screen size
// $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50; // $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
print '<td align="center">'; print '<td align="left">';
print $form->select_account($compta_prodbuy_id, 'codeventil_'.$product_static->id, 1); print $form->select_account($compta_prodbuy_id, 'codeventil_'.$product_static->id, 1);
print '</td>'; print '</td>';
} else { } else {
@ -369,7 +370,7 @@ if ($result) {
// TODO: replace by select // TODO: replace by select
// TODO: we shoul set a user defined value to adjust user square / wide screen size // TODO: we shoul set a user defined value to adjust user square / wide screen size
// $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50; // $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
print '<td align="center">'; print '<td align="left">';
print $form->select_account($compta_prodsell_id, 'codeventil_'.$product_static->id, 1); print $form->select_account($compta_prodsell_id, 'codeventil_'.$product_static->id, 1);
print '</td>'; print '</td>';
} }

4
htdocs/accountancy/journal/bankjournal.php
View File

@ -571,7 +571,7 @@ else
// Title // Title
print '<tr>'; print '<tr>';
print '<td valign="top" width="110">'.$langs->trans("ReportName").'</td>'; print '<td width="110">'.$langs->trans("ReportName").'</td>';
print '<td colspan="3">'.$namereport.'</td>'; print '<td colspan="3">'.$namereport.'</td>';
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -588,7 +588,7 @@ else
// Description // Description
print '<tr>'; print '<tr>';
print '<td valign="top">'.$langs->trans("ReportDescription").'</td>'; print '<td>'.$langs->trans("ReportDescription").'</td>';
print '<td colspan="3">'.$description.'</td>'; print '<td colspan="3">'.$description.'</td>';
print '</tr>'; print '</tr>';

6
htdocs/core/lib/accounting.lib.php
View File

@ -47,12 +47,12 @@ function admin_accounting_prepare_head(AccountingAccount $object=null)
// $this->tabs = array('entity:-tabname); to remove a tab // $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_admin'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_admin');
$head[$h][0] = dol_buildpath('/accountancy/admin/journaux.php', 1); $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journal.php';
$head[$h][1] = $langs->trans("Journaux"); $head[$h][1] = $langs->trans("Journaux");
$head[$h][2] = 'journal'; $head[$h][2] = 'journal';
$h ++; $h ++;
$head[$h][0] = dol_buildpath('/accountancy/admin/export.php', 1); $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/export.php';
$head[$h][1] = $langs->trans("Export"); $head[$h][1] = $langs->trans("Export");
$head[$h][2] = 'export'; $head[$h][2] = 'export';
$h ++; $h ++;
@ -75,7 +75,7 @@ function accounting_prepare_head(AccountingAccount $object)
$h = 0; $h = 0;
$head = array (); $head = array ();
$head[$h][0] = dol_buildpath('/accountancy/admin/card.php', 1) . '?id=' . $object->id; $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
$head[$h][1] = $langs->trans("Card"); $head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card'; $head[$h][2] = 'card';
$h ++; $h ++;

6
htdocs/core/lib/report.lib.php
View File

@ -61,7 +61,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
// Ligne de titre // Ligne de titre
print '<tr>'; print '<tr>';
print '<td valign="top" width="110">'.$langs->trans("ReportName").'</td>'; print '<td width="110">'.$langs->trans("ReportName").'</td>';
if (! $variantexxx) print '<td colspan="3">'; if (! $variantexxx) print '<td colspan="3">';
else print '<td>'; else print '<td>';
print $nom; print $nom;
@ -73,7 +73,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
if ($calcmode) if ($calcmode)
{ {
print '<tr>'; print '<tr>';
print '<td valign="top" width="110">'.$langs->trans("CalculationMode").'</td>'; print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
if (! $variante) print '<td colspan="3">'; if (! $variante) print '<td colspan="3">';
else print '<td>'; else print '<td>';
print $calcmode; print $calcmode;
@ -94,7 +94,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
// Ligne de description // Ligne de description
print '<tr>'; print '<tr>';
print '<td valign="top">'.$langs->trans("ReportDescription").'</td>'; print '<td>'.$langs->trans("ReportDescription").'</td>';
print '<td colspan="3">'.$description.'</td>'; print '<td colspan="3">'.$description.'</td>';
print '</tr>'; print '</tr>';