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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Maxime Kohlhaas 2017-12-06 23:45:37 +01:00
commit 2a64eb2983
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -437,8 +437,8 @@ class FactureRec extends CommonInvoice
// Retreive all extrafield for line // Retreive all extrafield for line
// fetch optionals attributes and labels // fetch optionals attributes and labels
require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
$extrafieldsline=new ExtraFields($line->db); $extrafieldsline=new ExtraFields($this->db);
$extrafieldsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true); $extrafieldsline=$extrafieldsline->fetch_name_optionals_label('facturedet_rec',true);
$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx, '; $sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx, ';
$sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,'; $sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';

3
htdocs/core/class/commoninvoice.class.php
View File

@ -319,7 +319,8 @@ abstract class CommonInvoice extends CommonObject
// TODO If there is payment in bookkeeping, check payment is not dispatched in accounting // TODO If there is payment in bookkeeping, check payment is not dispatched in accounting
// ... // ...
if ($this->situation_cycle_ref) { if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
{
$last = $this->is_last_in_cycle(); $last = $this->is_last_in_cycle();
if (! $last) return -3; if (! $last) return -3;
} }