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

clean deprecated modelpdf to model_pdf

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-02-08 18:30:35 +01:00
parent 815f3602e3
commit 148bbb3997
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/class/propal.class.php
View File

@ -1630,7 +1630,7 @@ class Propal extends CommonObject
$sql .= " fk_input_reason=".(isset($this->demand_reason_id) ? $this->demand_reason_id : "null").","; $sql .= " fk_input_reason=".(isset($this->demand_reason_id) ? $this->demand_reason_id : "null").",";
$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").","; $sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").","; $sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").","; $sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null").""; $sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
$sql .= " WHERE rowid=".$this->id; $sql .= " WHERE rowid=".$this->id;

60
test/phpunit/BuildDocTest.php
View File

@ -200,56 +200,56 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->date_lim_reglement = dol_now() + 3600 * 24 *30; $localobject->date_lim_reglement = dol_now() + 3600 * 24 *30;
// Crabe (english) // Crabe (english)
$localobject->modelpdf='crabe'; $localobject->model_pdf='crabe';
$result = $localobject->generateDocument($localobject->modelpdf, $langs); $result = $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// Crabe (japanese) // Crabe (japanese)
$newlangs1=new Translate("", $conf); $newlangs1=new Translate("", $conf);
$newlangs1->setDefaultLang('ja_JP'); $newlangs1->setDefaultLang('ja_JP');
$localobject->modelpdf='crabe'; $localobject->model_pdf='crabe';
$result = $localobject->generateDocument($localobject->modelpdf, $newlangs1); $result = $localobject->generateDocument($localobject->model_pdf, $newlangs1);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// Crabe (saudiarabia) // Crabe (saudiarabia)
$newlangs2a=new Translate("", $conf); $newlangs2a=new Translate("", $conf);
$newlangs2a->setDefaultLang('sa_SA'); $newlangs2a->setDefaultLang('sa_SA');
$localobject->modelpdf='crabe'; $localobject->model_pdf='crabe';
$result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a); $result = $localobject->generateDocument($localobject->model_pdf, $newlangs2a);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// Crabe (english_saudiarabia) // Crabe (english_saudiarabia)
$newlangs2b=new Translate("", $conf); $newlangs2b=new Translate("", $conf);
$newlangs2b->setDefaultLang('en_SA'); $newlangs2b->setDefaultLang('en_SA');
$localobject->modelpdf='crabe'; $localobject->model_pdf='crabe';
$result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b); $result = $localobject->generateDocument($localobject->model_pdf, $newlangs2b);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// Crabe (greek) // Crabe (greek)
$newlangs3=new Translate("", $conf); $newlangs3=new Translate("", $conf);
$newlangs3->setDefaultLang('el_GR'); $newlangs3->setDefaultLang('el_GR');
$localobject->modelpdf='crabe'; $localobject->model_pdf='crabe';
$result = $localobject->generateDocument($localobject->modelpdf, $newlangs3); $result = $localobject->generateDocument($localobject->model_pdf, $newlangs3);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// Crabe (chinese) // Crabe (chinese)
$newlangs4=new Translate("", $conf); $newlangs4=new Translate("", $conf);
$newlangs4->setDefaultLang('zh_CN'); $newlangs4->setDefaultLang('zh_CN');
$localobject->modelpdf='crabe'; $localobject->model_pdf='crabe';
$result = $localobject->generateDocument($localobject->modelpdf, $newlangs4); $result = $localobject->generateDocument($localobject->model_pdf, $newlangs4);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// Crabe (russian) // Crabe (russian)
$newlangs5=new Translate("", $conf); $newlangs5=new Translate("", $conf);
$newlangs5->setDefaultLang('ru_RU'); $newlangs5->setDefaultLang('ru_RU');
$localobject->modelpdf='crabe'; $localobject->model_pdf='crabe';
$result = $localobject->generateDocument($localobject->modelpdf, $newlangs5); $result = $localobject->generateDocument($localobject->model_pdf, $newlangs5);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
@ -274,8 +274,8 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
// Canelle // Canelle
$localobject->modelpdf='canelle'; $localobject->model_pdf='canelle';
$result = $localobject->generateDocument($localobject->modelpdf, $langs); $result = $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
@ -301,8 +301,8 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
// Einstein // Einstein
$localobject->modelpdf='einstein'; $localobject->model_pdf='einstein';
$result = $localobject->generateDocument($localobject->modelpdf, $langs); $result = $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
@ -329,8 +329,8 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
// Muscadet // Muscadet
$localobject->modelpdf='muscadet'; $localobject->model_pdf='muscadet';
$result= $localobject->generateDocument($localobject->modelpdf, $langs); $result= $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
@ -356,8 +356,8 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
// Azur // Azur
$localobject->modelpdf='azur'; $localobject->model_pdf='azur';
$result = $localobject->generateDocument($localobject->modelpdf, $langs); $result = $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
@ -382,8 +382,8 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
// Baleine // Baleine
$localobject->modelpdf='baleine'; $localobject->model_pdf='baleine';
$result = $localobject->generateDocument($localobject->modelpdf, $langs); $result = $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
@ -409,8 +409,8 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
// Soleil // Soleil
$localobject->modelpdf='soleil'; $localobject->model_pdf='soleil';
$result=fichinter_create($db, $localobject, $localobject->modelpdf, $langs); $result=fichinter_create($db, $localobject, $localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
@ -436,15 +436,15 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
// Merou // Merou
$localobject->modelpdf='merou'; $localobject->model_pdf='merou';
$result= $localobject->generateDocument($localobject->modelpdf, $langs); $result= $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// Rouget // Rouget
$localobject->modelpdf='rouget'; $localobject->model_pdf='rouget';
$result= $localobject->generateDocument($localobject->modelpdf, $langs); $result= $localobject->generateDocument($localobject->model_pdf, $langs);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";