diff --git a/ChangeLog b/ChangeLog index 3ab27db8be6..712f14dd3f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,7 +25,7 @@ Fix: Edit propal line was losing product supplier price id Fix: Delete linked element to supplier invoice when deleted Fix: [ bug #1061 ] Bad info shipped products Fix: [ bug #1062 ] Documents lost in propals and contracts validating -Fix: Supplier price displayed on document lines didnt take discount +Fix: Supplier price displayed on document lines and margin infos didnt take discount Qual: Add travis-ci integration diff --git a/build/debian/get-orig-source.sh b/build/debian/get-orig-source.sh index e3d201d672f..57f87ab1999 100755 --- a/build/debian/get-orig-source.sh +++ b/build/debian/get-orig-source.sh @@ -1,6 +1,6 @@ #!/bin/sh -# run with -# debian/get-orig-source.sh [x.y.z] +# Scan for new official sources and download file +# run with debian/get-orig-source.sh [x.y.z] tmpdir=$(mktemp -d) echo "tmpdir = $tmpdir" @@ -12,29 +12,12 @@ uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_ cd $tmpdir -tgzfile=$(echo *.tar.gz) -version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr_//; s/\.zip$//; s/_/./g; s/\+nmu1//; s/$/+dfsg/;') - -# Extract the zip file -tar -xvf $tgzfile -srcdir=$(find . -maxdepth 1 -mindepth 1 -type d | sed -e 's/\.\///') - -if [ ! -d "$srcdir" ]; then - echo "ERROR: Failed to identify the extracted directory in $tmpdir (got $srcdir)" >&2 - rm -rf $tmpdir - exit 1 -fi - -# Repack as tar.xz -tar Jcf dolibarr_${version}.orig.tar.xz $srcdir +tgzfile=$(echo *.tgz) +version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr-//; s/\.tgz$//; s/_/./g; s/\+nmu1//; ') cd - >/dev/null -if [ -e ../dolibarr_${version}.orig.tar.xz ]; then - echo "Not overwriting ../dolibarr_${version}.orig.tar.xz"; -else - echo "Created ../dolibarr_${version}.orig.tar.xz" - mv $tmpdir/dolibarr_${version}.orig.tar.xz ../ -fi +mv $tmpdir/dolibarr-${version}.tgz ../ +echo "File ../dolibarr-${version}.tgz is ready for git-import" -#rm -rf $tmpdir +rm -rf $tmpdir diff --git a/build/debian/watch b/build/debian/watch index 0f84815a48e..a5b736c1f65 100644 --- a/build/debian/watch +++ b/build/debian/watch @@ -1,4 +1,5 @@ # watch control file for uscan version=3 + #http://sf.net/dolibarr/dolibarr-(.+)\.tgz -http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.tar\.gz +http://www.dolibarr.org/files/stable/standard/dolibarr-(.+)\.tgz diff --git a/build/tgz/tar_exclude.txt b/build/tgz/tar_exclude.txt index 8cbde2f1903..3f3ff2e27fb 100644 --- a/build/tgz/tar_exclude.txt +++ b/build/tgz/tar_exclude.txt @@ -37,8 +37,6 @@ htdocs/customleave htdocs/customgoogle htdocs/document htdocs/documents -htdocs/includes/ckeditor/_source -htdocs/includes/ckeditor/*_source.js htdocs/includes/fckeditor/_samples htdocs/includes/fckeditor/_testcases htdocs/includes/nusoap/samples diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 407a5398dc5..62ef1957f45 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -71,7 +71,7 @@ if ($_POST["action"] == 'add') $account->currency_code = trim($_POST["account_currency_code"]); - $account->state_id = $_POST["account_departement_id"]; + $account->state_id = $_POST["account_state_id"]; $account->country_id = $_POST["account_country_id"]; $account->min_allowed = $_POST["account_min_allowed"]; diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 565e63fd749..91616065284 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -95,7 +95,8 @@ class FactureRec extends Facture // Clean parameters $this->titre=trim($this->titre); - + $this->usenewprice=empty($this->usenewprice)?0:$this->usenewprice; + $this->db->begin(); // Charge facture modele @@ -122,9 +123,9 @@ class FactureRec extends Facture $sql.= ", usenewprice"; $sql.= ") VALUES ("; $sql.= "'".$this->titre."'"; - $sql.= ", '".$facsrc->socid."'"; + $sql.= ", ".$facsrc->socid; $sql.= ", ".$conf->entity; - $sql.= ", ".$this->db->idate($now); + $sql.= ", '".$this->db->idate($now)."'"; $sql.= ", ".(!empty($facsrc->amount)?$facsrc->amount:'0'); $sql.= ", ".(!empty($facsrc->remise)?$this->remise:'0'); $sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); @@ -133,7 +134,7 @@ class FactureRec extends Facture $sql.= ", ".(! empty($facsrc->fk_project)?"'".$facsrc->fk_project."'":"null"); $sql.= ", '".$facsrc->cond_reglement_id."'"; $sql.= ", '".$facsrc->mode_reglement_id."'"; - $sql.= ", '".$this->usenewprice."'"; + $sql.= ", ".$this->usenewprice; $sql.= ")"; if ($this->db->query($sql)) @@ -575,5 +576,28 @@ class FactureRec extends Facture return $result; } + + /** + * Initialise an instance with random values. + * Used to build previews or test instances. + * id must be 0 if object instance is a specimen. + * + * @param string $option ''=Create a specimen invoice with lines, 'nolines'=No lines + * @return void + */ + function initAsSpecimen($option='') + { + global $user,$langs,$conf; + + $now=dol_now(); + $arraynow=dol_getdate($now); + $nownotime=dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']); + + parent::initAsSpecimen($option); + + $this->usenewprice = 1; + + } + } ?> diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 27df3ad5c74..3d8fdf6be94 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3104,7 +3104,7 @@ abstract class CommonObject if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price) { $product = new ProductFournisseur($this->db); if ($product->fetch_product_fournisseur_price($line->fk_fournprice)) - $line->pa_ht = $product->fourn_unitprice; + $line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100); if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == "2" && $product->fourn_unitcharges > 0) $line->pa_ht += $product->fourn_unitcharges; } diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php index 481208efd02..c5237d219c5 100644 --- a/htdocs/margin/lib/margins.lib.php +++ b/htdocs/margin/lib/margins.lib.php @@ -103,7 +103,7 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; $product = new ProductFournisseur($db); if ($product->fetch_product_fournisseur_price($fk_pa)) { - $paht_ret = $product->fourn_unitprice; + $paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100); if ($conf->global->MARGIN_TYPE == "2" && $product->fourn_unitcharges > 0) $paht_ret += $product->fourn_unitcharges; } diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index ca4d35b5669..b19a19a4ab1 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -77,7 +77,7 @@ if ($mode == 'search') $sql = "SELECT s.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; - if ($search_sale || !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We'll need this table joined to the select in order to filter by categ if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; @@ -195,7 +195,7 @@ if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_societe"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,"; $sql.= " ".MAIN_DB_PREFIX."c_stcomm as st"; // We'll need this table joined to the select in order to filter by sale -if ($search_sale || !$user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; +if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We'll need this table joined to the select in order to filter by categ if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs"; $sql.= " WHERE s.fk_stcomm = st.id"; diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index b22dd5b1ea2..6d830ec90f6 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -121,6 +121,8 @@ class AllTests $suite->addTestSuite('ContratTest'); require_once dirname(__FILE__).'/FactureTest.php'; $suite->addTestSuite('FactureTest'); + require_once dirname(__FILE__).'/FactureRecTest.php'; + $suite->addTestSuite('FactureRecTest'); require_once dirname(__FILE__).'/FactureTestRounding.php'; $suite->addTestSuite('FactureTestRounding'); require_once dirname(__FILE__).'/FactureFournisseurTest.php'; diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php new file mode 100644 index 00000000000..f7183bc2634 --- /dev/null +++ b/test/phpunit/FactureRecTest.php @@ -0,0 +1,199 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file test/phpunit/FactureRecTest.php + * \ingroup test + * \brief PHPUnit test + * \remarks To run this script as CLI: phpunit filename.php + */ + +global $conf,$user,$langs,$db; +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +require_once 'PHPUnit/Autoload.php'; +require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; +require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php'; +require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture-rec.class.php'; + +if (empty($user->id)) +{ + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); +} +$conf->global->MAIN_DISABLE_ALL_MAILS=1; + + +/** + * Class for PHPUnit tests + * + * @backupGlobals disabled + * @backupStaticAttributes enabled + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + */ +class FactureRecTest extends PHPUnit_Framework_TestCase +{ + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; + + /** + * Constructor + * We save global variables into local variables + * + * @return FactureTest + */ + function __construct() + { + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + public static function tearDownAfterClass() + { + global $conf,$user,$langs,$db; + $db->rollback(); + + print __METHOD__."\n"; + } + + /** + * Init phpunit tests + * + * @return void + */ + protected function setUp() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + print __METHOD__."\n"; + } + + /** + * End phpunit tests + * + * @return void + */ + protected function tearDown() + { + print __METHOD__."\n"; + } + + /** + * testFactureCreate + * + * @return int + */ + public function testFactureRecCreate() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $localobjectinv=new Facture($this->savdb); + $localobjectinv->initAsSpecimen(); + $localobjectinv->create($user); + + $localobject=new FactureRec($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user, $localobjectinv->id); + + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; + return $result; + } + + + + + + + /** + * Edit an object to test updates + * + * @param mixed &$localobject Object Facture + * @return void + */ + public function changeProperties(&$localobject) + { + $localobject->note_private='New note'; + //$localobject->note='New note after update'; + } + + /** + * Compare all public properties values of 2 objects + * + * @param Object $oA Object operand 1 + * @param Object $oB Object operand 2 + * @param boolean $ignoretype False will not report diff if type of value differs + * @param array $fieldstoignorearray Array of fields to ignore in diff + * @return array Array with differences + */ + public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id')) + { + $retAr=array(); + + if (get_class($oA) !== get_class($oB)) + { + $retAr[]="Supplied objects are not of same class."; + } + else + { + $oVarsA=get_object_vars($oA); + $oVarsB=get_object_vars($oB); + $aKeys=array_keys($oVarsA); + foreach($aKeys as $sKey) + { + if (in_array($sKey,$fieldstoignorearray)) continue; + if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) + { + $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]); + } + if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey]) + { + $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]); + } + } + } + return $retAr; + } +} +?> \ No newline at end of file