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

Merge branch '3.1'

Browse Source
This commit is contained in:
Regis Houssin 2011-10-25 10:18:06 +02:00
commit b2981d41df
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/comm/action/class/actioncomm.class.php
View File

@ -129,10 +129,15 @@ class ActionComm extends CommonObject
# Get id from code
$cactioncomm=new CActionComm($this->db);
$result=$cactioncomm->fetch($this->type_code);
if ($result)
if ($result > 0)
{
$this->type_id=$cactioncomm->id;
}
else if ($result == 0)
{
$this->error='Failed to get record with code AC_OTH from dictionnary "type of events"';
return -1;
}
else
{
$this->error=$cactioncomm->error;
@ -148,7 +153,7 @@ class ActionComm extends CommonObject
}
$this->db->begin("ActionComm::add");
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm";
$sql.= "(datec,";
@ -208,13 +213,13 @@ class ActionComm extends CommonObject
// Fin appel triggers
}
$this->db->commit("ActionComm::add");
$this->db->commit();
return $this->id;
}
else
{
$this->error=$this->db->lasterror().' sql='.$sql;
$this->db->rollback("ActionComm::add");
$this->db->rollback();
return -1;
}

10
htdocs/langs/nl_NL/main.lang
View File

@ -5,13 +5,13 @@ SeparatorDecimal = ,
SeparatorThousand = .
FormatDateShort = %d-%m-%Y
FormatDateShortJava = dd-MM-yyyy
FormatHourShort = %U:%M
FormatHourShortDuration = %U:%M
FormatHourShort = %H:%M
FormatHourShortDuration = %H:%M
FormatDateTextShort = %d %b %Y
FormatDateText = %d %B %Y
FormatDateHourShort = %d-%m-%Y %U:%M
FormatDateHourTextShort = %d %b %Y %U:%M
FormatDateHourText = %d %B %Y %U:%M
FormatDateHourShort = %d-%m-%Y %H:%M
FormatDateHourTextShort = %d %b %Y %H:%M
FormatDateHourText = %d %B %Y %H:%M
DatabaseConnection = Databaseverbinding
NoError = Geen fout
Error = Fout