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

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-08-27 19:12:31 +02:00
commit 10f9b53557
6 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/codesniffer/jenkins_ruleset.xml
View File

@ -200,6 +200,10 @@
<rule ref="PEAR.Functions.FunctionCallSignature" />
<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
<severity>0</severity>
</rule>
<rule ref="PEAR.Functions.ValidDefaultValue" />
<rule ref="PEAR.NamingConventions.ValidClassName" />

4
dev/codesniffer/ruleset.xml
View File

@ -200,6 +200,10 @@
<rule ref="PEAR.Functions.FunctionCallSignature" />
<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
<severity>0</severity>
</rule>
<rule ref="PEAR.Functions.ValidDefaultValue" />
<rule ref="PEAR.NamingConventions.ValidClassName" />

5
htdocs/compta/localtax/class/localtax.class.php
View File

@ -25,10 +25,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
/**
* \class Localtax
* \brief Put here description of your class
* Class to manage local tax
*/
class localtax extends CommonObject
class Localtax extends CommonObject
{
var $id;
var $ref;

8
htdocs/compta/localtax/fiche.php
View File

@ -40,13 +40,13 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
/*
* Actions
* Actions
*/
//add payment of localtax
if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
{
$localtax = new localtax($db);
$localtax = new Localtax($db);
$db->begin();
@ -78,7 +78,7 @@ if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
//delete payment of localtax
if ($_GET["action"] == 'delete')
{
$localtax = new localtax($db);
$localtax = new Localtax($db);
$result=$localtax->fetch($_GET['id']);
if ($localtax->rappro == 0)
@ -131,7 +131,7 @@ $form = new Form($db);
if ($id)
{
$vatpayment = new localtax($db);
$vatpayment = new Localtax($db);
$result = $vatpayment->fetch($id);
if ($result <= 0)
{

2
htdocs/compta/localtax/reglement.php
View File

@ -38,7 +38,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
llxHeader();
$localtax_static = new localtax($db);
$localtax_static = new Localtax($db);
print_fiche_titre($langs->transcountry("LT2Payments",$mysoc->country_code));

76
htdocs/core/class/rssparser.class.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2011-2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,7 +18,11 @@
/**
* \file htdocs/core/class/rssparser.class.php
* \ingroup core
* \brief File of class to parse rss feeds
* \brief File of class to parse RSS feeds
*/
/**
* Class to parse RSS files
*/
class RssParser
{
@ -38,20 +42,38 @@ class RssParser
private $_lastfetchdate; // Last successful fetch
private $_rssarray=array();
// For parsing with xmlparser
var $stack = array(); // parser stack
var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
/**
* Constructor
*
* @param DoliDB $db Database handler
*/
public function __construct($db)
{
$this->db=$db;
}
/**
* getFormat
*
* @return string
*/
public function getFormat() {
public function getFormat()
{
return $this->_format;
}
/**
* getUrlRss
*
* @return string
*/
public function getUrlRss() {
public function getUrlRss()
{
return $this->_urlRSS;
}
/**
@ -59,7 +81,8 @@ class RssParser
*
* @return string
*/
public function getLanguage() {
public function getLanguage()
{
return $this->_language;
}
/**
@ -67,7 +90,8 @@ class RssParser
*
* @return string
*/
public function getGenerator() {
public function getGenerator()
{
return $this->_generator;
}
/**
@ -75,7 +99,8 @@ class RssParser
*
* @return string
*/
public function getCopyright() {
public function getCopyright()
{
return $this->_copyright;
}
/**
@ -83,7 +108,8 @@ class RssParser
*
* @return string
*/
public function getLastBuildDate() {
public function getLastBuildDate()
{
return $this->_lastbuilddate;
}
/**
@ -91,7 +117,8 @@ class RssParser
*
* @return string
*/
public function getImageUrl() {
public function getImageUrl()
{
return $this->_imageurl;
}
/**
@ -99,7 +126,8 @@ class RssParser
*
* @return string
*/
public function getLink() {
public function getLink()
{
return $this->_link;
}
/**
@ -107,7 +135,8 @@ class RssParser
*
* @return string
*/
public function getTitle() {
public function getTitle()
{
return $this->_title;
}
/**
@ -115,7 +144,8 @@ class RssParser
*
* @return string
*/
public function getDescription() {
public function getDescription()
{
return $this->_description;
}
/**
@ -123,7 +153,8 @@ class RssParser
*
* @return string
*/
public function getLastFetchDate() {
public function getLastFetchDate()
{
return $this->_lastfetchdate;
}
/**
@ -131,24 +162,9 @@ class RssParser
*
* @return string
*/
public function getItems() {
return $this->_rssarray;
}
// For parsing with xmlparser
var $stack = array(); // parser stack
var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
/**
* Constructor
*
* @param DoliDB $db Database handler
*/
public function __construct($db)
public function getItems()
{
$this->db=$db;
return $this->_rssarray;
}