Merged revisions 2258,2260-2262,2264-2268,2270-2283,2285-2297,2299-2322,2324-2340 via svnmerge from
svn+ssh://danydb@svn/svn/phpcompta/branches/rel430 ........ r2258 | danydb | 2008-12-18 23:21:00 +0100 (Thu, 18 Dec 2008) | 1 line Add debug ........ r2262 | danydb | 2008-12-19 22:38:25 +0100 (Fri, 19 Dec 2008) | 1 line Add a local admin ........ r2270 | danydb | 2008-12-21 20:11:26 +0100 (Sun, 21 Dec 2008) | 1 line Doc. remove the useless todo list ........ r2271 | danydb | 2008-12-22 21:18:46 +0100 (Mon, 22 Dec 2008) | 3 lines Remove obsolete functions insertRapt, deleteRapt and getconcerned Remove obsolete file user_update ........ r2272 | danydb | 2008-12-22 21:21:46 +0100 (Mon, 22 Dec 2008) | 2 lines Remove obsolete function isFicheOfJrn ........ r2273 | danydb | 2008-12-22 21:44:28 +0100 (Mon, 22 Dec 2008) | 1 line Improve Invoice : add the username ........ r2287 | danydb | 2009-01-13 21:37:07 +0100 (Tue, 13 Jan 2009) | 1 line Code cleaning replace GetConcerned by Acc_Reconciliation ........ r2288 | danydb | 2009-01-13 21:38:40 +0100 (Tue, 13 Jan 2009) | 1 line Add a comment on jrn operation ........ r2289 | danydb | 2009-01-13 21:40:13 +0100 (Tue, 13 Jan 2009) | 1 line Code cleaning : add comments to the code ........ r2290 | danydb | 2009-01-13 21:40:46 +0100 (Tue, 13 Jan 2009) | 1 line Code cleaning replace GetConcerned by Acc_Reconciliation ........ r2291 | danydb | 2009-01-13 21:41:35 +0100 (Tue, 13 Jan 2009) | 1 line Code cleaning replace GetConcerned by Acc_Reconciliation ........ r2292 | danydb | 2009-01-13 21:42:15 +0100 (Tue, 13 Jan 2009) | 1 line Add documentation about new tags ........ r2293 | danydb | 2009-01-13 21:43:22 +0100 (Tue, 13 Jan 2009) | 1 line Code cleaning start rewriting of the security part ........ r2294 | danydb | 2009-01-14 20:09:18 +0100 (Wed, 14 Jan 2009) | 1 line Improve : template of security + security code ........ r2295 | danydb | 2009-01-14 20:21:51 +0100 (Wed, 14 Jan 2009) | 1 line Improve security : add new variable ........ r2296 | danydb | 2009-01-14 20:39:58 +0100 (Wed, 14 Jan 2009) | 1 line Improve security : modify layout ........ r2297 | danydb | 2009-01-15 19:21:47 +0100 (Thu, 15 Jan 2009) | 1 line Improve security : user setting ........ r2299 | danydb | 2009-01-15 19:28:56 +0100 (Thu, 15 Jan 2009) | 2 lines Clean code : can_request doens't have a connx parameter ........ r2300 | danydb | 2009-01-16 19:12:47 +0100 (Fri, 16 Jan 2009) | 1 line Improve Ecriture directe libelle : new widget js_search_card_control ........ r2301 | danydb | 2009-01-16 22:29:39 +0100 (Fri, 16 Jan 2009) | 1 line Improve Quick Writing : remove span, and update the comment field ........ r2302 | danydb | 2009-01-16 23:01:24 +0100 (Fri, 16 Jan 2009) | 1 line Improve cosmetic : GL + remove the select topmenu ........ r2303 | danydb | 2009-01-19 08:41:09 +0100 (Mon, 19 Jan 2009) | 1 line Cosmetic : a inline ........ r2304 | danydb | 2009-01-20 23:03:59 +0100 (Tue, 20 Jan 2009) | 6 lines Code Cleaning Security : remove obsolete files & function Class_user : add new functions for the security Only the menu in text mode with a break line ........ r2305 | danydb | 2009-01-20 23:05:01 +0100 (Tue, 20 Jan 2009) | 1 line code cleaning rewriting of Security ........ r2306 | danydb | 2009-01-21 21:13:15 +0100 (Wed, 21 Jan 2009) | 1 line Security printing unicode and fix some bugs ........ r2309 | danydb | 2009-01-26 19:56:28 +0100 (Mon, 26 Jan 2009) | 1 line ADD : company without VAT ........ r2310 | danydb | 2009-01-26 23:33:14 +0100 (Mon, 26 Jan 2009) | 1 line Add : no vat for Purchase ledger ........ r2312 | danydb | 2009-01-28 19:57:30 +0100 (Wed, 28 Jan 2009) | 1 line Integration ........ r2313 | danydb | 2009-01-28 22:46:27 +0100 (Wed, 28 Jan 2009) | 1 line Work with or without VAT ........ r2314 | danydb | 2009-01-29 22:18:57 +0100 (Thu, 29 Jan 2009) | 2 lines Remove debug info ........ r2315 | danydb | 2009-01-29 23:23:14 +0100 (Thu, 29 Jan 2009) | 1 line ADD the possibility to enter a piece number ........ r2316 | danydb | 2009-01-31 23:20:00 +0100 (Sat, 31 Jan 2009) | 1 line Documentation ........ r2317 | danydb | 2009-02-04 20:14:54 +0100 (Wed, 04 Feb 2009) | 1 line Template for ledger ........ r2318 | danydb | 2009-02-05 15:52:58 +0100 (Thu, 05 Feb 2009) | 1 line Add PJ setting + default in Ledger, fix bug in listJrn ........ r2319 | danydb | 2009-02-05 17:09:56 +0100 (Thu, 05 Feb 2009) | 2 lines Search by PJ ........ r2320 | danydb | 2009-02-05 17:23:24 +0100 (Thu, 05 Feb 2009) | 1 line Finished with pj ........ r2321 | danydb | 2009-02-05 18:11:35 +0100 (Thu, 05 Feb 2009) | 1 line PJ is readonly ........ r2322 | danydb | 2009-02-05 20:10:34 +0100 (Thu, 05 Feb 2009) | 1 line Saldo : write the first saldo (ajax) ........ r2324 | danydb | 2009-02-06 00:07:50 +0100 (Fri, 06 Feb 2009) | 5 lines Add database script Cosmetic (menu) Fix Bug ........ r2325 | danydb | 2009-02-06 14:07:07 +0100 (Fri, 06 Feb 2009) | 1 line Improve Pj seq ........ r2326 | danydb | 2009-02-09 22:47:23 +0100 (Mon, 09 Feb 2009) | 6 lines Fix Bug privilege (compta_ven) Fix if the pj is empty do not increment the sequence (class_acc_operation) Fix remove PJ if pj is empty (modify_op.php) Cosmetic do not print PJ if pj is null or empty (listing) ........ r2327 | danydb | 2009-02-10 21:04:48 +0100 (Tue, 10 Feb 2009) | 5 lines Fix bug in PJ seq Fix bug in export jrn csv Improve avoid the removal of vat rate Add security for card ........ r2328 | danydb | 2009-02-12 20:26:36 +0100 (Thu, 12 Feb 2009) | 4 lines Cosmetic menu_tool Impression add tag PJ Cosmetic menu administration ........ r2329 | danydb | 2009-02-12 21:43:19 +0100 (Thu, 12 Feb 2009) | 5 lines filter the folder the local admin can access add a function check_dossier which must be implemented everywhere Printing with PJ NoAccess default = javascript ........ r2330 | danydb | 2009-02-14 18:11:49 +0100 (Sat, 14 Feb 2009) | 2 lines improve add libelle for balance csv ........ r2331 | danydb | 2009-02-14 19:10:56 +0100 (Sat, 14 Feb 2009) | 7 lines Balance csv add label Bug Financial ledger list BUG period access BUG stock access IMPROVE list ledger with PJ ........ r2332 | danydb | 2009-02-15 18:21:59 +0100 (Sun, 15 Feb 2009) | 1 line Bug order was not saved for report ........ r2333 | danydb | 2009-02-15 18:22:17 +0100 (Sun, 15 Feb 2009) | 1 line Add security for normal user ........ r2334 | danydb | 2009-02-15 18:23:24 +0100 (Sun, 15 Feb 2009) | 3 lines Bug forget to import class ........ r2335 | danydb | 2009-02-17 21:33:17 +0100 (Tue, 17 Feb 2009) | 5 lines Fix quick writing let write Fix card priv Remove button if no priv to add card or cancel an op ........ r2336 | danydb | 2009-02-19 21:01:36 +0100 (Thu, 19 Feb 2009) | 4 lines Check for CA common Bug with the repository ........ r2337 | danydb | 2009-02-19 21:50:35 +0100 (Thu, 19 Feb 2009) | 2 lines Test the parameter security part ........
This commit is contained in:
Dany De Bontridder
parent
56f66d3b87
commit
8834d14ee5
127 changed files with 3649 additions and 4181 deletions
|
|
@ -21,11 +21,18 @@
|
|||
/*! \file
|
||||
* \brief included file for customizing with the vat (account,rate...)
|
||||
*/
|
||||
require_once('class_own.php');
|
||||
|
||||
echo '<div class="content">';
|
||||
// Confirm remove
|
||||
if ( isset ($_POST['confirm_rm']))
|
||||
{
|
||||
ExecSql($cn,'select tva_delete('.pg_escape_string($_POST['tva_id']).')');
|
||||
if ( CountSql($cn,'select * from tva_rate') > 1 )
|
||||
ExecSqlParam($cn,'select tva_delete($1)',array($_POST['tva_id']));
|
||||
else
|
||||
echo '<p class="notice">Vous ne pouvez pas effacer tous taux'.
|
||||
' Si votre société n\'utilise pas la TVA, changer dans le menu société</p>';
|
||||
|
||||
}
|
||||
//-----------------------------------------------------
|
||||
// Record Change
|
||||
|
|
@ -82,7 +89,12 @@ echo '<div class="content">';
|
|||
echo "<script>alert ('$str_err'); </script>";;
|
||||
}
|
||||
}
|
||||
|
||||
// If company not use VAT
|
||||
$own=new Own($cn);
|
||||
if ( $own->MY_TVA_USE=='N' ){
|
||||
echo '<h2 class="error"> Vous n\'êtes pas assujetti à la TVA</h2>';
|
||||
exit();
|
||||
}
|
||||
//-----------------------------------------------------
|
||||
// Display
|
||||
$sql="select tva_id,tva_label,tva_rate,tva_comment,tva_poste from tva_rate order by tva_rate";
|
||||
|
|
@ -102,12 +114,13 @@ echo '<div class="content">';
|
|||
{
|
||||
// load value into an array
|
||||
$index=$row['tva_id'] ;
|
||||
$a[$index]=array(
|
||||
$tva_array[$index]=array(
|
||||
'tva_label'=> $row['tva_label'],
|
||||
'tva_rate'=>$row['tva_rate'],
|
||||
'tva_comment'=>$row['tva_comment'],
|
||||
'tva_poste'=>$row['tva_poste']
|
||||
);
|
||||
|
||||
echo "<TR>";
|
||||
echo '<FORM METHOD="POST">';
|
||||
|
||||
|
|
@ -180,10 +193,10 @@ if ( ! isset ($_POST['add'])
|
|||
<th>Poste</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> <?php echo $a[$index]['tva_label']; ?></td>
|
||||
<td> <?php echo $a[$index]['tva_rate']; ?></td>
|
||||
<td> <?php echo $a[$index]['tva_comment']; ?></td>
|
||||
<td> <?php echo $a[$index]['tva_poste']; ?></td>
|
||||
<td> <?php echo $tva_array[$index]['tva_label']; ?></td>
|
||||
<td> <?php echo $tva_array[$index]['tva_rate']; ?></td>
|
||||
<td> <?php echo $tva_array[$index]['tva_comment']; ?></td>
|
||||
<td> <?php echo $tva_array[$index]['tva_poste']; ?></td>
|
||||
</Tr>
|
||||
</table>
|
||||
<?php
|
||||
|
|
@ -241,21 +254,21 @@ if ( ! isset ($_POST['add'])
|
|||
?>
|
||||
<table>
|
||||
<tr> <td align="right"> Label (ce que vous verrez dans les journaux)</td>
|
||||
<td> <?php $w=new widget("text");$w->size=20; echo $w->IOValue('tva_label',$a[$index]['tva_label']) ?></td>
|
||||
<td> <?php $w=new widget("text");$w->size=20; echo $w->IOValue('tva_label',$tva_array[$index]['tva_label']) ?></td>
|
||||
</tr>
|
||||
<tr><td align="right"> Taux de tva </td>
|
||||
|
||||
<td> <?php $w=new widget("text");$w->size=5; echo $w->IOValue('tva_rate',$a[$index]['tva_rate']) ?></td>
|
||||
<td> <?php $w=new widget("text");$w->size=5; echo $w->IOValue('tva_rate',$tva_array[$index]['tva_rate']) ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="right"> Commentaire </td>
|
||||
<td> <?php $w=new widget("textarea"); $w->heigh=2;$w->width=20;
|
||||
echo $w->IOValue('tva_comment',$a[$index]['tva_comment']) ?></td>
|
||||
echo $w->IOValue('tva_comment',$tva_array[$index]['tva_comment']) ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="right">Poste comptable utilisés format :debit,credit</td>
|
||||
|
||||
<td> <?php $w=new widget("text");$w->size=5; echo $w->IOValue('tva_poste',$a[$index]['tva_poste']) ?></td>
|
||||
<td> <?php $w=new widget("text");$w->size=5; echo $w->IOValue('tva_poste',$tva_array[$index]['tva_poste']) ?></td>
|
||||
</Tr>
|
||||
</table>
|
||||
<input type="submit" value="Confirme" name="confirm_mod">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue