[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4737 - in phpcompta/trunk: . html/js include
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r4737 - in phpcompta/trunk: . html/js include |
|
Date: |
Fri, 3 Feb 2012 11:00:00 +0100 (CET) |
Author: danydb
Date: 2012-02-03 11:00:00 +0100 (Fri, 03 Feb 2012)
New Revision: 4737
Modified:
phpcompta/trunk/
phpcompta/trunk/html/js/acc_ledger.js
phpcompta/trunk/include/class_acc_ledger_fin.php
phpcompta/trunk/include/class_acc_ledger_purchase.php
phpcompta/trunk/include/class_acc_ledger_sold.php
phpcompta/trunk/include/class_fiche.php
phpcompta/trunk/include/user.inc.php
phpcompta/trunk/include/user_detail.inc.php
Log:
Merged revisions 4728-4736 via svnmerge from
file:///home/developper/svn/phpcompta/tags/rel600
........
r4728 | danydb | 2012-01-23 10:50:01 +0100 (Mon, 23 Jan 2012) | 2 lines
Renamed
........
r4729 | danydb | 2012-01-24 13:42:20 +0100 (Tue, 24 Jan 2012) | 2 lines
Bug 517 : impossible d'effacer un utilisateur
........
r4730 | danydb | 2012-01-24 13:49:31 +0100 (Tue, 24 Jan 2012) | 2 lines
typo
........
r4731 | danydb | 2012-01-25 00:42:14 +0100 (Wed, 25 Jan 2012) | 1 line
probleme mise ?\195?\160 jour fiche avec double poste comptable
........
r4732 | danydb | 2012-01-25 00:44:06 +0100 (Wed, 25 Jan 2012) | 1 line
Esthetique : document g?\195?\169n?\195?\169r?\195?\169
........
r4733 | danydb | 2012-01-25 00:56:11 +0100 (Wed, 25 Jan 2012) | 1 line
Probl?\195?\168me ajout ligne dans VEN / ACH si non assujetti TVA
........
r4734 | danydb | 2012-01-25 01:46:43 +0100 (Wed, 25 Jan 2012) | 1 line
order in user
........
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
- /phpcompta/tags/rel600:1-4727
+ /phpcompta/tags/rel600:1-4736
Modified: phpcompta/trunk/html/js/acc_ledger.js
===================================================================
--- phpcompta/trunk/html/js/acc_ledger.js 2012-02-03 09:59:06 UTC (rev
4736)
+++ phpcompta/trunk/html/js/acc_ledger.js 2012-02-03 10:00:00 UTC (rev
4737)
@@ -163,7 +163,7 @@
}
catch (e)
{
- alert("success_update_bank".e.message);
+ alert("success_update_bank"+e.message);
}
}
/**
@@ -265,11 +265,12 @@
*/
function ledger_add_row()
{
+ try{
style='class="input_text"';
var mytable=g("sold_item").tBodies[0];
var ofirstRow=mytable.rows[1];
var line=mytable.rows.length;
- var nCell=9;
+ var nCell=mytable.rows[1].cells.length;
var row=mytable.insertRow(line);
var nb=g("nb_item");
for (var e=0;e<nCell;e++)
@@ -290,11 +291,12 @@
g("e_march"+nb.value+"_price").value='0';
g("e_march"+nb.value).value="";
g("e_quant"+nb.value).value="1";
- g("e_march"+nb.value+"_tva_amount").value=0;
+ if ($("e_march"+nb.value+"_tva_amount"))
g("e_march"+nb.value+"_tva_amount").value=0;
nb.value++;
new_tt.evalScripts();
+ } catch(e) { alert(e.message);}
}
/**
Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_fin.php 2012-02-03 09:59:06 UTC
(rev 4736)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php 2012-02-03 10:00:00 UTC
(rev 4737)
@@ -269,7 +269,7 @@
if ( $this->bank_id == "" )
{
echo h2("Journal de banque non configuré
".$this->get_name(),' class="error"');
- echo '<span class="error"> vous devez donner à ce
journal un compte en banque (fiche), modifiez dans CFGLEDGER</span>';
+ echo '<span class="error"> vous devez donner à ce
journal un compte en banque (fiche), modifiez dans CFGLED</span>';
alert ("Journal de banque non configuré
".$this->get_name());
}
Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php 2012-02-03
09:59:06 UTC (rev 4736)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2012-02-03
10:00:00 UTC (rev 4737)
@@ -723,7 +723,7 @@
if ( isset($_POST['gen_invoice']) )
{
$ref_doc= $this->create_document($internal,$p_array);
- $this->doc= _('Document généré')." : ";
+ $this->doc= _('Document généré')." : "."<br>";
$this->doc.='<A style="line"
HREF="show_pj.php?'.dossier::get().'&jr_grpt_id='.$seq.'&jrn='.$this->id.'">'.$ref_doc.'</A>';
}
Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php 2012-02-03 09:59:06 UTC
(rev 4736)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php 2012-02-03 10:00:00 UTC
(rev 4737)
@@ -498,7 +498,7 @@
if ( isset($_POST['gen_invoice']))
{
$file=$this->create_document($internal,$p_array);
- $this->doc= _('Document généré')." : ";
+ $this->doc= _('Document généré')." : "."<br>";
$this->doc.='<A class="line"
HREF="show_pj.php?'.dossier::get().'&jr_grpt_id='.$seq.'&jrn='.$this->id.'">'.$file.'</A>';
}
}
Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php 2012-02-03 09:59:06 UTC (rev
4736)
+++ phpcompta/trunk/include/class_fiche.php 2012-02-03 10:00:00 UTC (rev
4737)
@@ -934,47 +934,51 @@
}
// account
- if ( $id == ATTR_DEF_ACCOUNT )
- {
- $v=sql_string($value);
- if ( trim($v) != '' )
- {
- if ( strpos($v,',') != 0)
- {
- $v=$this->cn->get_value('select
format_account($1)',
- array($v));
- }
- $sql=sprintf("select account_update(%d,'%s')",
- $this->id,$v);
- try
- {
- $this->cn->exec_sql($sql);
- }
- catch (Exception $e)
- {
- throw new Exception(__LINE__."Erreur : ce compte
[$v] n'a pas de compte parent.".
- "L'opération est
annulée");
- }
- continue;
- }
- if ( strlen (trim($v)) == 0 )
- {
+ if ($id == ATTR_DEF_ACCOUNT)
+ {
+ $v = sql_string($value);
+ if (trim($v) != '')
+ {
+ if (strpos($v, ',') != 0)
+ {
+ $ac_array =
explode(",", $v);
+ if (count($ac_array) <>
2)
+ throw new
Exception('Désolé, il y a trop de virgule dans le poste comptable ' . h($v));
+ $part1 = $ac_array[0];
+ $part2 = $ac_array[1];
+ $part1 =
$this->cn->get_value('select format_account($1)', array($part1));
+ $part2 =
$this->cn->get_value('select format_account($1)', array($part2));
+ $v = $part1 . ',' .
$part2;
+ }
+ $sql = sprintf("select
account_update(%d,'%s')", $this->id, $v);
+ try
+ {
+
$this->cn->exec_sql($sql);
+ }
+ catch (Exception $e)
+ {
+ throw new
Exception(__LINE__ . "Erreur : ce compte [$v] n'a pas de compte parent." .
+
"L'opération est annulée");
+ }
+ continue;
+ }
+ if (strlen(trim($v)) == 0)
+ {
- $sql=sprintf("select account_update(%d,null)",
- $this->id);
- try
- {
- $Ret=$this->cn->exec_sql($sql);
- }
- catch (Exception $e)
- {
- throw new Exception(__LINE__."Erreur : ce compte
[$v] n'a pas de compte parent.".
- "L'opération est annulée");
- }
+ $sql = sprintf("select
account_update(%d,null)", $this->id);
+ try
+ {
+ $Ret =
$this->cn->exec_sql($sql);
+ }
+ catch (Exception $e)
+ {
+ throw new
Exception(__LINE__ . "Erreur : ce compte [$v] n'a pas de compte parent." .
+
"L'opération est annulée");
+ }
- continue;
- }
- }
+ continue;
+ }
+ }
// TVA
if ( $id == ATTR_DEF_TVA )
{
Modified: phpcompta/trunk/include/user.inc.php
===================================================================
--- phpcompta/trunk/include/user.inc.php 2012-02-03 09:59:06 UTC (rev
4736)
+++ phpcompta/trunk/include/user.inc.php 2012-02-03 10:00:00 UTC (rev
4737)
@@ -101,7 +101,7 @@
$header=new Sort_Table();
$url=basename($_SERVER['PHP_SELF'])."?action=".$_REQUEST['action'];
$header->add("Login", $url," order by use_login asc", "order by use_login
desc","la", "ld");
-$header->add("Nom", $url," order by use_login asc", "order by use_login
desc","na", "nd");
+$header->add("Nom", $url," order by use_name asc,use_first_name asc", "order
by use_name desc,use_first_name desc","na", "nd");
$header->add('Dossier',$url,' order by ag_dossier asc','order by ag_dossier
desc',
'da','dd');
$header->add("Actif", $url," order by use_active asc", "order by use_active
desc","aa", "ad");
Modified: phpcompta/trunk/include/user_detail.inc.php
===================================================================
--- phpcompta/trunk/include/user_detail.inc.php 2012-02-03 09:59:06 UTC (rev
4736)
+++ phpcompta/trunk/include/user_detail.inc.php 2012-02-03 10:00:00 UTC (rev
4737)
@@ -86,12 +86,11 @@
if (isset($_POST["DELETE"]))
{
$cn = new Database();
- $Res = $cn->exec_sql("delete from priv_user where priv_jnt in ( select
jnt_id from jnt_use_dos where use_id=$1", array($uid));
+ $Res = $cn->exec_sql("delete from priv_user where priv_jnt in ( select
jnt_id from jnt_use_dos where use_id=$1)", array($uid));
$Res = $cn->exec_sql("delete from jnt_use_dos where use_id=$1",
array($uid));
$Res = $cn->exec_sql("delete from ac_users where use_id=$1",
array($uid));
- echo "<center><H2 class=\"info\"> User " . h($_POST['fname']) . " " .
h($_POST['lname']) . " (" .
- h($_POST['login']) . ") est effacé</H2></CENTER>";
+ echo "<center><H2 class=\"info\"> User " . h($_POST['fname']) . " " .
h($_POST['lname']) . " est effacé</H2></CENTER>";
require_once("class_iselect.php");
require_once("user.inc.php");
return;
- [Phpcompta-dev] r4737 - in phpcompta/trunk: . html/js include,
phpcompta-dev <=