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

Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2

Browse Source
This commit is contained in:
lmarcouiller 2021-05-10 10:41:56 +02:00
commit d293be56ce
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/bank/class/account.class.php
View File

@ -1689,8 +1689,7 @@ class Account extends CommonObject
{
$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
if (!$db->query($sql))
{
if (! $db->query($sql)) {
//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
//$this->errors = $db->lasterror();
return false;

2
htdocs/societe/class/societe.class.php
View File

@ -1518,7 +1518,7 @@ class Societe extends CommonObject
$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
if ($rowid) {
$sql .= ' AND s.rowid = '.$rowid;
$sql .= ' AND s.rowid = '.((int) $rowid);
}
if ($ref) {
$sql .= " AND s.nom = '".$this->db->escape($ref)."'";

11
htdocs/webservices/server_thirdparty.php
View File

@ -210,7 +210,7 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
$server->register(
'getThirdParty',
// Entry values
array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'barcode'=>'xsd:string', 'profid1'=>'xsd:string', 'profid2'=>'xsd:string'),
// Exit values
array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
$ns,
@ -286,13 +286,16 @@ $server->register(
* @param string $id internal id
* @param string $ref internal reference
* @param string $ref_ext external reference
* @param string $barcode barcode
* @param string $profid1 profid1
* @param string $profid2 profid2
* @return array Array result
*/
function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $barcode = '', $profid1 = '', $profid2 = '')
{
global $db, $conf;
dol_syslog("Function: getThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
dol_syslog("Function: getThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext." barcode=".$barcode." profid1=".$profid1." profid2=".$profid2);
if ($authentication['entity']) $conf->entity = $authentication['entity'];
@ -317,7 +320,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
if ($fuser->rights->societe->lire)
{
$thirdparty = new Societe($db);
$result = $thirdparty->fetch($id, $ref, $ref_ext);
$result = $thirdparty->fetch($id, $ref, $ref_ext, $barcode, $profid1, $profid2);
if ($result > 0) {
$thirdparty_result_fields = array(
'id' => $thirdparty->id,

3
test/phpunit/CodingPhpTest.php
View File

@ -191,7 +191,8 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
'multicurrency.class.php',
'productbatch.class.php',
'reception.class.php',
'societe.class.php'
'societe.class.php',
'account.class.php'
))) {
// Must must not found $db->
$ok=true;