';
@@ -1583,6 +1604,16 @@ if ($action=='create')
print '';
}
+ // Multicurrency
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print '';
+ print '| '.fieldLabel('Currency','multicurrency_code').' | ';
+ print '';
+ print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+ print ' |
';
+ }
+
print '| '.$langs->trans('NotePublic').' | ';
print '';
$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
@@ -1624,6 +1655,13 @@ if ($action=='create')
}
print ' |
| ' . $langs->trans('TotalTTC') . ' | ' . price($objectsrc->total_ttc) . " |
";
+
+ if (!empty($conf->multicurrency->enabled))
+ {
+ print '| ' . $langs->trans('MulticurrencyTotalHT') . ' | ' . price($objectsrc->multicurrency_total_ht) . ' |
';
+ print '| ' . $langs->trans('MulticurrencyTotalVAT') . ' | ' . price($objectsrc->multicurrency_total_tva) . ' |
';
+ print '| ' . $langs->trans('MulticurrencyTotalTTC') . ' | ' . price($objectsrc->multicurrency_total_ttc) . ' |
';
+ }
}
// Other options
@@ -1648,7 +1686,7 @@ if ($action=='create')
if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
{
$title = $langs->trans('ProductsAndServices');
- print load_fiche_titre($title,'','');
+ print load_fiche_titre($title);
print '';
@@ -1915,6 +1953,44 @@ elseif (! empty($object->id))
$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print '';
+
+ // Multicurrency
+ if (! empty($conf->multicurrency->enabled))
+ {
+ // Multicurrency code
+ print '';
+ print '| ';
+ print '';
+ print ' | ';
+ if ($action == 'editmulticurrencycode') {
+ $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+ } else {
+ $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+ }
+ print ' |
';
+
+ // Multicurrency rate
+ print '';
+ print '| ';
+ print '';
+ print ' | ';
+ if ($action == 'editmulticurrencyrate') {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+ }
+ print ' |
';
+ }
// Bank Account
if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
@@ -2049,6 +2125,24 @@ elseif (! empty($object->id))
print '| '.$langs->trans("AmountTTC").' | '.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).' | ';
print '
';
+ if (!empty($conf->multicurrency->enabled))
+ {
+ // Multicurrency Amount HT
+ print '| ' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' | ';
+ print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print '
';
+
+ // Multicurrency Amount VAT
+ print '| ' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' | ';
+ print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print '
';
+
+ // Multicurrency Amount TTC
+ print '| ' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' | ';
+ print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print '
';
+ }
+
print "
";
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 9d0c27cf2b3..2b38f915869 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -267,3 +267,19 @@ ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_amount doubl
ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_ht double(24,8) NOT NULL;
ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_tva double(24,8) DEFAULT 0 NOT NULL;
ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_ttc double(24,8) DEFAULT 0 NOT NULL;
+
+
+
+ALTER TABLE llx_supplier_proposal ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index e271d36ffe5..43f26ee0459 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -51,5 +51,12 @@ CREATE TABLE llx_supplier_proposal (
date_livraison date DEFAULT NULL,
fk_shipping_method integer DEFAULT NULL,
import_key varchar(14) DEFAULT NULL,
- extraparams varchar(255) DEFAULT NULL
+ extraparams varchar(255) DEFAULT NULL,
+
+ fk_multicurrency integer,
+ multicurrency_code varchar(255),
+ multicurrency_tx double(24,8) DEFAULT 1,
+ multicurrency_total_ht double(24,8) DEFAULT 0,
+ multicurrency_total_tva double(24,8) DEFAULT 0,
+ multicurrency_total_ttc double(24,8) DEFAULT 0
) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
index 81b6f2ef2cc..22467c63e26 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
@@ -44,5 +44,12 @@ CREATE TABLE llx_supplier_proposaldet (
fk_product_fournisseur_price integer DEFAULT NULL,
special_code integer DEFAULT 0,
rang integer DEFAULT 0,
- ref_fourn varchar(30) DEFAULT NULL
+ ref_fourn varchar(30) DEFAULT NULL,
+
+ fk_multicurrency integer,
+ multicurrency_code varchar(255),
+ multicurrency_subprice double(24,8) DEFAULT 0,
+ multicurrency_total_ht double(24,8) DEFAULT 0,
+ multicurrency_total_tva double(24,8) DEFAULT 0,
+ multicurrency_total_ttc double(24,8) DEFAULT 0
) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index c03d3edadaa..e0ba1c18dd5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -270,6 +270,12 @@ if (empty($reshook))
$object->origin = GETPOST('origin');
$object->origin_id = GETPOST('originid');
+ // Multicurrency
+ if (!empty($conf->multicurrency->enabled))
+ {
+ $object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+ }
+
for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++)
{
if ($_POST['idprod' . $i]) {
@@ -909,6 +915,16 @@ if (empty($reshook))
else if ($action == 'setmode' && $user->rights->supplier_proposal->creer) {
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
}
+
+ // Multicurrency Code
+ else if ($action == 'setmulticurrencycode' && $user->rights->supplier_proposal->creer) {
+ $result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+ }
+
+ // Multicurrency rate
+ else if ($action == 'setmulticurrencyrate' && $user->rights->supplier_proposal->creer) {
+ $result = $object->setMulticurrencyRate(GETPOST('multicurrency_tx', 'int'));
+ }
/*
* Ordonnancement des lignes
@@ -1133,7 +1149,17 @@ if ($action == 'create')
print '';
print '';
}
-
+
+ // Multicurrency
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print '';
+ print '| '.fieldLabel('Currency','multicurrency_code').' | ';
+ print '';
+ $currency_code = (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : ($object->multicurrency_code ? $object->multicurrency_code : $conf->currency));
+ print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+ print ' |
';
+ }
// Other attributes
$parameters = array('colspan' => ' colspan="3"');
@@ -1468,6 +1494,43 @@ if ($action == 'create')
print '';
}
+ // Multicurrency
+ if (! empty($conf->multicurrency->enabled))
+ {
+ // Multicurrency code
+ print '';
+ print '| ';
+ print '';
+ print ' | ';
+ if ($action == 'editmulticurrencycode') {
+ $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+ } else {
+ $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+ }
+ print ' |
';
+
+ // Multicurrency rate
+ print '';
+ print '| ';
+ print '';
+ print ' | ';
+ if ($action == 'editmulticurrencyrate') {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+ }
+ print ' |
';
+ }
if ($soc->outstanding_limit)
{
@@ -1542,6 +1605,24 @@ if ($action == 'create')
print '' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
print ' | ';
+ if (!empty($conf->multicurrency->enabled))
+ {
+ // Multicurrency Amount HT
+ print '| ' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' | ';
+ print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print '
';
+
+ // Multicurrency Amount VAT
+ print '| ' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' | ';
+ print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print '
';
+
+ // Multicurrency Amount TTC
+ print '| ' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' | ';
+ print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print '
';
+ }
+
// Statut
print '| ' . $langs->trans('Status') . ' | ' . $object->getLibStatut(4) . ' |
';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 97f52526e66..abbaed6d5f4 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
/**
* Class to manage price ask supplier
@@ -130,7 +131,14 @@ class SupplierProposal extends CommonObject
var $specimen;
-
+ // Multicurrency
+ var $fk_multicurrency;
+ var $multicurrency_code;
+ var $multicurrency_tx;
+ var $multicurrency_total_ht;
+ var $multicurrency_total_tva;
+ var $multicurrency_total_ttc;
+
/**
* Constructor
*
@@ -371,13 +379,18 @@ class SupplierProposal extends CommonObject
$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
$txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate.
- $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
+ $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
$total_ht = $tabprice[0];
$total_tva = $tabprice[1];
$total_ttc = $tabprice[2];
$total_localtax1 = $tabprice[9];
$total_localtax2 = $tabprice[10];
+ // MultiCurrency
+ $multicurrency_total_ht = $tabprice[16];
+ $multicurrency_total_tva = $tabprice[17];
+ $multicurrency_total_ttc = $tabprice[18];
+
// Rang to use
$rangtouse = $rang;
if ($rangtouse == -1)
@@ -436,6 +449,14 @@ class SupplierProposal extends CommonObject
}
$this->line->pa_ht = $pa_ht;
+ // Multicurrency
+ $this->line->fk_multicurrency = $this->fk_multicurrency;
+ $this->line->multicurrency_code = $this->multicurrency_code;
+ $this->line->multicurrency_subprice = price2num($pu_ht * $this->multicurrency_tx);
+ $this->line->multicurrency_total_ht = $multicurrency_total_ht;
+ $this->line->multicurrency_total_tva = $multicurrency_total_tva;
+ $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
+
// Mise en option de la ligne
if (empty($qty) && empty($special_code)) $this->line->special_code=3;
@@ -531,13 +552,18 @@ class SupplierProposal extends CommonObject
$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
$txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate.
- $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
+ $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
$total_ht = $tabprice[0];
$total_tva = $tabprice[1];
$total_ttc = $tabprice[2];
$total_localtax1 = $tabprice[9];
$total_localtax2 = $tabprice[10];
+ // MultiCurrency
+ $multicurrency_total_ht = $tabprice[16];
+ $multicurrency_total_tva = $tabprice[17];
+ $multicurrency_total_ttc = $tabprice[18];
+
// Anciens indicateurs: $price, $remise (a ne plus utiliser)
$price = $pu;
if ($remise_percent > 0)
@@ -603,6 +629,12 @@ class SupplierProposal extends CommonObject
if (is_array($array_option) && count($array_option)>0) {
$this->line->array_options=$array_option;
}
+
+ // Multicurrency
+ $this->line->multicurrency_subprice = price2num($pu * $this->multicurrency_tx);
+ $this->line->multicurrency_total_ht = $multicurrency_total_ht;
+ $this->line->multicurrency_total_tva = $multicurrency_total_tva;
+ $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
$result=$this->line->update();
if ($result > 0)
@@ -705,6 +737,15 @@ class SupplierProposal extends CommonObject
}
}
+ // Multicurrency
+ if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+ if (empty($this->fk_multicurrency))
+ {
+ $this->multicurrency_code = $conf->currency;
+ $this->fk_multicurrency = 0;
+ $this->multicurrency_tx = 1;
+ }
+
$this->db->begin();
// Insert into database
@@ -729,6 +770,9 @@ class SupplierProposal extends CommonObject
$sql.= ", fk_shipping_method";
$sql.= ", fk_projet";
$sql.= ", entity";
+ $sql.= ", fk_multicurrency";
+ $sql.= ", multicurrency_code";
+ $sql.= ", multicurrency_tx";
$sql.= ") ";
$sql.= " VALUES (";
$sql.= $this->socid;
@@ -751,6 +795,9 @@ class SupplierProposal extends CommonObject
$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
$sql.= ", ".($this->fk_project?$this->fk_project:"null");
$sql.= ", ".$conf->entity;
+ $sql.= ", ".(int) $this->fk_multicurrency;
+ $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+ $sql.= ", ".(double) $this->multicurrency_tx;
$sql.= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1028,6 +1075,7 @@ class SupplierProposal extends CommonObject
$sql.= ", p.fk_mode_reglement";
$sql.= ', p.fk_account';
$sql.= ", p.fk_shipping_method";
+ $sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
$sql.= ", c.label as statut_label";
$sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
$sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
@@ -1090,6 +1138,14 @@ class SupplierProposal extends CommonObject
$this->user_valid_id = $obj->fk_user_valid;
$this->user_close_id = $obj->fk_user_cloture;
+ // Multicurrency
+ $this->fk_multicurrency = $obj->fk_multicurrency;
+ $this->multicurrency_code = $obj->multicurrency_code;
+ $this->multicurrency_tx = $obj->multicurrency_tx;
+ $this->multicurrency_total_ht = $obj->multicurrency_total_ht;
+ $this->multicurrency_total_tva = $obj->multicurrency_total_tva;
+ $this->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
+
if ($obj->fk_statut == 0)
{
$this->brouillon = 1;
@@ -1113,6 +1169,7 @@ class SupplierProposal extends CommonObject
$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
$sql.= ' d.ref_fourn as ref_produit_fourn';
+ $sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
$sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
@@ -1130,7 +1187,8 @@ class SupplierProposal extends CommonObject
$line = new SupplierProposalLine($this->db);
- $line->rowid = $objp->rowid;
+ $line->rowid = $objp->rowid; // deprecated
+ $line->id = $objp->rowid;
$line->fk_supplier_proposal = $objp->fk_supplier_proposal;
$line->fk_parent_line = $objp->fk_parent_line;
$line->product_type = $objp->product_type;
@@ -1170,6 +1228,14 @@ class SupplierProposal extends CommonObject
$line->ref_fourn = $objp->ref_produit_fourn;
+ // Multicurrency
+ $line->fk_multicurrency = $objp->fk_multicurrency;
+ $line->multicurrency_code = $objp->multicurrency_code;
+ $line->multicurrency_subprice = $objp->multicurrency_subprice;
+ $line->multicurrency_total_ht = $objp->multicurrency_total_ht;
+ $line->multicurrency_total_tva = $objp->multicurrency_total_tva;
+ $line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
+
$this->lines[$i] = $line;
$i++;
@@ -2300,6 +2366,7 @@ class SupplierProposal extends CommonObject
$sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
$sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn';
+ $sql.= ' ,pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
$sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
@@ -2346,6 +2413,14 @@ class SupplierProposal extends CommonObject
$this->lines[$i]->rang = $obj->rang;
$this->lines[$i]->ref_fourn = $obj->ref_produit_fourn;
+
+ // Multicurrency
+ $this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
+ $this->lines[$i]->multicurrency_code = $obj->multicurrency_code;
+ $this->lines[$i]->multicurrency_subprice = $obj->multicurrency_subprice;
+ $this->lines[$i]->multicurrency_total_ht = $obj->multicurrency_total_ht;
+ $this->lines[$i]->multicurrency_total_tva = $obj->multicurrency_total_tva;
+ $this->lines[$i]->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
$i++;
}
@@ -2394,49 +2469,6 @@ class SupplierProposal extends CommonObject
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
-
- function printOriginLinesList()
- {
- global $langs, $hookmanager;
-
- print '';
- print '| '.$langs->trans('Ref').' | ';
- print ''.$langs->trans('Description').' | ';
- print ''.$langs->trans('VAT').' | ';
- print ''.$langs->trans('PriceUHT').' | ';
- print ''.$langs->trans('Qty').' | ';
- print ''.$langs->trans('ReductionShort').' |
';
-
- $num = count($this->lines);
- $var = true;
- $i = 0;
-
- foreach ($this->lines as $line)
- {
- if (empty($line->subprice) || $line->qty <= 0)
- continue;
-
- $var=!$var;
-
- if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
- {
- if (empty($line->fk_parent_line))
- {
- $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
- $action='';
- $reshook=$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- }
- }
- else
- {
- $this->printOriginLine($line,$var);
- }
-
- $i++;
- }
- }
-
-
}
@@ -2455,7 +2487,8 @@ class SupplierProposalLine extends CommonObject
var $oldline;
// From llx_supplier_proposaldet
- var $rowid;
+ var $rowid; // deprecated
+ var $id;
var $fk_supplier_proposal;
var $fk_parent_line;
var $desc; // Description ligne
@@ -2546,6 +2579,14 @@ class SupplierProposalLine extends CommonObject
var $skip_update_total; // Skip update price total for special lines
var $ref_fourn;
+
+ // Multicurrency
+ var $fk_multicurrency;
+ var $multicurrency_code;
+ var $multicurrency_subprice;
+ var $multicurrency_total_ht;
+ var $multicurrency_total_tva;
+ var $multicurrency_total_ttc;
/**
* Class line Contructor
@@ -2570,7 +2611,8 @@ class SupplierProposalLine extends CommonObject
$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
$sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
$sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
- $sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn';
+ $sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
+ $sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
$sql.= ' WHERE pd.rowid = '.$rowid;
@@ -2580,7 +2622,8 @@ class SupplierProposalLine extends CommonObject
{
$objp = $this->db->fetch_object($result);
- $this->rowid = $objp->rowid;
+ $this->rowid = $objp->rowid; // deprecated
+ $this->id = $objp->rowid;
$this->fk_supplier_proposal = $objp->fk_supplier_proposal;
$this->fk_parent_line = $objp->fk_parent_line;
$this->label = $objp->custom_label;
@@ -2617,6 +2660,14 @@ class SupplierProposalLine extends CommonObject
$this->product_desc = $objp->product_desc;
$this->ref_fourn = $objp->ref_produit_forun;
+
+ // Multicurrency
+ $this->fk_multicurrency = $objp->fk_multicurrency;
+ $this->multicurrency_code = $objp->multicurrency_code;
+ $this->multicurrency_subprice = $objp->multicurrency_subprice;
+ $this->multicurrency_total_ht = $objp->multicurrency_total_ht;
+ $this->multicurrency_total_tva = $objp->multicurrency_total_tva;
+ $this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
$this->db->free($result);
}
@@ -2683,7 +2734,8 @@ class SupplierProposalLine extends CommonObject
$sql.= ' subprice, remise_percent, ';
$sql.= ' info_bits, ';
$sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
- $sql.= ' ref_fourn)';
+ $sql.= ' ref_fourn';
+ $sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
$sql.= " VALUES (".$this->fk_supplier_proposal.",";
$sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -2710,6 +2762,12 @@ class SupplierProposalLine extends CommonObject
$sql.= ' '.$this->special_code.',';
$sql.= ' '.$this->rang.',';
$sql.= " '".$this->db->escape($this->ref_fourn)."'";
+ $sql.= ", ".($this->fk_multicurrency > 0?$this->fk_multicurrency:'null');
+ $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+ $sql.= ", ".$this->multicurrency_subprice;
+ $sql.= ", ".$this->multicurrency_total_ht;
+ $sql.= ", ".$this->multicurrency_total_tva;
+ $sql.= ", ".$this->multicurrency_total_ttc;
$sql.= ')';
dol_syslog(get_class($this).'::insert', LOG_DEBUG);
@@ -2717,10 +2775,10 @@ class SupplierProposalLine extends CommonObject
if ($resql)
{
$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
-
+ $this->id=$this->rowid;
+
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- $this->id=$this->rowid;
$result=$this->insertExtraFields();
if ($result < 0)
{
@@ -2878,6 +2936,13 @@ class SupplierProposalLine extends CommonObject
$sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
$sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
+
+ // Multicurrency
+ $sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+ $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+ $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+ $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+
$sql.= " WHERE rowid = ".$this->rowid;
dol_syslog(get_class($this)."::update", LOG_DEBUG);