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
|
|
@ -22,6 +22,7 @@ require_once('class_own.php');
|
|||
require_once('class_acc_account_ledger.php');
|
||||
require_once('class_action.php');
|
||||
require_once('class_acc_tva.php');
|
||||
require_once('class_user.php');
|
||||
|
||||
/*! \file
|
||||
* \brief Class Document corresponds to the table document
|
||||
|
|
@ -455,7 +456,7 @@ class Document
|
|||
* - [VEN_TVA]
|
||||
* - [TOTAL_VEN_HTVA]
|
||||
* - [DATE]
|
||||
* - [NUMBER_ID]
|
||||
* - [NUMBER]
|
||||
* - [MY_NAME]
|
||||
* - [MY_CP]
|
||||
* - [MY_COMMUNE]
|
||||
|
|
@ -467,6 +468,10 @@ class Document
|
|||
* - BON_COMMANDE
|
||||
* - OTHER_INFO
|
||||
* - CUST_NUM
|
||||
* - CUST_BANQUE_NAME
|
||||
* - CUST_BANQUE_NO
|
||||
* - USER
|
||||
* - REFERENCE
|
||||
*
|
||||
* \param $p_tag TAG
|
||||
* \return String which must replace the tag
|
||||
|
|
@ -613,7 +618,10 @@ class Document
|
|||
$r=$this->d_number;
|
||||
break;
|
||||
|
||||
|
||||
case 'USER' :
|
||||
return $_SESSION['use_name'].', '.$_SESSION['use_first_name'];
|
||||
|
||||
break;
|
||||
case 'REFERENCE':
|
||||
$act=new action($this->db);
|
||||
$act->ag_id=$this->ag_id;
|
||||
|
|
@ -708,6 +716,8 @@ class Document
|
|||
$qt='e_quant'.$counter;
|
||||
$price='e_march'.$counter.'_price' ;
|
||||
$tva='e_march'.$counter.'_tva_id';
|
||||
/* if we do not use vat this var. is not set */
|
||||
if ( !isset(${$tva}) ) return '';
|
||||
if ( !isset (${'e_march'.$counter}) ) return "";
|
||||
// check that something is sold
|
||||
if ( ${$price} == 0 || ${$qt} == 0
|
||||
|
|
@ -715,7 +725,7 @@ class Document
|
|||
|| strlen(trim($qt)) ==0)
|
||||
return "";
|
||||
$a_tva=GetTvaRate($this->db,${$tva});
|
||||
echo_debug('class_document',__LINE__,'Tva :'.var_export($a_tva,true));
|
||||
echo_debug('class_document',__LINE__,'Tva :'.var_eanalyticxport($a_tva,true));
|
||||
// if no vat returns 0
|
||||
if ( sizeof($a_tva) == 0 ) return "";
|
||||
$r=round(${$price},2)*${$qt}*$a_tva['tva_rate'];
|
||||
|
|
@ -787,10 +797,6 @@ class Document
|
|||
|| strlen(trim( ${'e_march'.$counter.'_price'} )) ==0
|
||||
|| strlen(trim(${'e_quant'.$counter})) ==0)
|
||||
return "";
|
||||
/*!\todo verify that price and quant are numeric
|
||||
*/
|
||||
/*!\todo carefull round problem ?
|
||||
*/
|
||||
|
||||
$r=round(${$id}*${$quant},2);
|
||||
break;
|
||||
|
|
@ -805,14 +811,15 @@ class Document
|
|||
// check that something is sold
|
||||
if ( ${'e_march'.$counter.'_price'} == 0 || ${'e_quant'.$counter} == 0 )
|
||||
return "";
|
||||
/*!\todo verify that price and quant are numeric
|
||||
*/
|
||||
/*!\todo carefull round problem ?
|
||||
*/
|
||||
$r=${$id}*${$quant};
|
||||
$tva=GetTvaRate($this->db,${'e_march'.$counter.'_tva_id'});
|
||||
$tva='e_march'.$counter.'_tva_id';
|
||||
/* if we do not use vat this var. is not set */
|
||||
if ( !isset(${$tva}) ) return $r;
|
||||
|
||||
$tva=GetTvaRate($this->db,${$tva});
|
||||
// if there is no vat we return now
|
||||
if ( $tva == null || $tva == 0 ) return $r;
|
||||
|
||||
// we compute with the vat included
|
||||
$r=$r+$r*$tva['tva_rate'];
|
||||
$r=round($r,2);
|
||||
|
|
@ -849,9 +856,15 @@ class Document
|
|||
$sum=0.0;
|
||||
for ($i=0;$i<$nb_item;$i++)
|
||||
{
|
||||
$tva=GetTvaRate($this->db,${'e_march'.$i.'_tva_id'});
|
||||
$tva_rate=( $tva == null || $tva == 0 )?0.0:$tva['tva_rate'];
|
||||
echo_debug('class_document',__LINE__,' :'.$i.' sur '.$nb_item);
|
||||
$tva='e_march'.$counter.'_tva_id';
|
||||
$tva_rate=0;
|
||||
/* if we do not use vat this var. is not set */
|
||||
if ( isset(${$tva}) )
|
||||
{
|
||||
$tva=GetTvaRate($this->db,${'e_march'.$i.'_tva_id'});
|
||||
$tva_rate=( $tva == null || $tva == 0 )?0.0:$tva['tva_rate'];
|
||||
echo_debug('class_document',__LINE__,' :'.$i.' sur '.$nb_item);
|
||||
}
|
||||
$sell=${'e_march'.$i.'_price'};
|
||||
$qt=${'e_quant'.$i};
|
||||
echo_debug('class_document',__LINE__,'sell :'.$sell.' qt = '.$qt);
|
||||
|
|
@ -864,6 +877,10 @@ class Document
|
|||
break;
|
||||
case 'TOTAL_TVA':
|
||||
extract($_POST);
|
||||
$tva='e_march'.$counter.'_tva_id';
|
||||
/* if we do not use vat this var. is not set */
|
||||
if ( !isset(${$tva}) ) return '0';
|
||||
|
||||
$sum=0.0;
|
||||
for ($i=0;$i<$nb_item;$i++)
|
||||
{
|
||||
|
|
@ -886,14 +903,22 @@ class Document
|
|||
else
|
||||
return "";
|
||||
break;
|
||||
case 'PJ':
|
||||
if ( isset($_REQUEST['e_pj']))
|
||||
return $_REQUEST['e_pj'];
|
||||
else
|
||||
return "";
|
||||
|
||||
case 'OTHER_INFO':
|
||||
if ( isset($_REQUEST['other_info']))
|
||||
return $_REQUEST['other_info'];
|
||||
else
|
||||
return "";
|
||||
break;
|
||||
|
||||
|
||||
case 'COMMENT':
|
||||
if ( isset($_REQUEST['e_comm']))
|
||||
return $_REQUEST['e_comm'];
|
||||
break;
|
||||
}
|
||||
return $r;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue