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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-03 18:19:58 +01:00
commit e309261140
8 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/journal/bankjournal.php
View File

@ -1223,7 +1223,7 @@ function getSourceDocRef($val, $typerecord)
$sqlmid = '';
if ($typerecord == 'payment')
{
$sqlmid = 'SELECT payfac.fk_facture as id, f.ref as ref';
$sqlmid = 'SELECT payfac.fk_facture as id, f.facnumber as ref';
$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=" . $val["paymentid"];
$ref = $langs->transnoentitiesnoconv("Invoice");

2
htdocs/accountancy/journal/purchasesjournal.php
View File

@ -94,7 +94,7 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)
$idpays = $mysoc->country_id;
$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
$sql = "SELECT f.rowid, f.facnumber as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
$sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";

1
htdocs/comm/mailing/class/mailing.class.php
View File

@ -319,6 +319,7 @@ class Mailing extends CommonObject
if ($result < 0)
{
$this->error=$object->error;
$this->errors=array_merge($this->errors, $object->errors);
$error++;
}

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

@ -1285,7 +1285,12 @@ class Propal extends CommonObject
// Create clone
$object->context['createfromclone']='createfromclone';
$result=$object->create($user);
if ($result < 0) $error++;
if ($result < 0)
{
$this->error = $object->error;
$this->errors = array_merge($this->errors, $object->errors);
$error++;
}
if (! $error)
{

2
htdocs/core/class/commonobject.class.php
View File

@ -5015,7 +5015,7 @@ abstract class CommonObject
if ($this->array_options[$key] === '') $mandatorypb=true;
if ($mandatorypb)
{
dol_syslog($this->error);
dol_syslog("Mandatory extra field ".$key." is empty");
$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);
return -1;
}

1
htdocs/product/class/productbatch.class.php
View File

@ -356,6 +356,7 @@ class Productbatch extends CommonObject
if ($result < 0)
{
$this->error=$object->error;
$this->errors=array_merge($this->errors, $object->errors);
$error++;
}

3
htdocs/product/class/productcustomerprice.class.php
View File

@ -924,7 +924,8 @@ class Productcustomerprice extends CommonObject
// Other options
if ($result < 0) {
$this->error = $object->error;
$error ++;
$this->errors=array_merge($this->errors, $object->errors);
$error++;
}
if (! $error) {

1
htdocs/product/class/propalmergepdfproduct.class.php
View File

@ -589,6 +589,7 @@ class Propalmergepdfproduct extends CommonObject
if ($result < 0)
{
$this->error=$object->error;
$this->errors=array_merge($this->errors, $object->errors);
$error++;
}