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

New: Cashdesk support multiprices

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-18 16:05:08 +00:00
parent 247e333a8d
commit 828ef2a8e3
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/cashdesk/facturation_verif.php
View File

@ -21,6 +21,11 @@ require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php');
require_once(DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'); require_once(DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php');
/** add Ditto */
require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
/** end add Ditto */
$obj_facturation = unserialize ($_SESSION['serObjFacturation']); $obj_facturation = unserialize ($_SESSION['serObjFacturation']);
unset ($_SESSION['serObjFacturation']); unset ($_SESSION['serObjFacturation']);
@ -59,6 +64,28 @@ switch ( $_GET['action'] )
$ret[$key] = $value; $ret[$key] = $value;
} }
/** add Ditto for MultiPrix*/
if ($conf->global->PRODUIT_MULTIPRICES)
{
$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
$productid = $ret['rowid'];
$societe = new Societe($db);
$societe->fetch($thirdpartyid);
$product = new Product($db, $productid);
if(isset($product->multiprices[$societe->price_level]))
{
$ret['price'] = $product->multiprices_ttc[$societe->price_level];
// $product->multiprices_min[$societe->price_level];
// $product->multiprices_min_ttc[$societe->price_level];
// $product->multiprices_base_type[$societe->price_level];
$ret['tva_tx'] = $product->multiprices_tva_tx[$societe->price_level];
}
}
/** end add Ditto */
$obj_facturation->id( $ret['rowid'] ); $obj_facturation->id( $ret['rowid'] );
$obj_facturation->ref( $ret['ref'] ); $obj_facturation->ref( $ret['ref'] );
$obj_facturation->stock( $ret['reel'] ); $obj_facturation->stock( $ret['reel'] );

30
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@ -3,6 +3,13 @@ $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$langs->load("cashdesk"); $langs->load("cashdesk");
?> ?>
<?php
/** add Ditto */
require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
/** end add Ditto */
?>
<!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net> <!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -34,12 +41,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
if ( $db->num_rows($res) ) { if ( $db->num_rows($res) ) {
$ret=array(); $i=0; $ret=array(); $i=0;
/** add Ditto for MultiPrix*/
$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
$societe = new Societe($db);
$societe->fetch($thirdpartyid);
/** end add Ditto */
while ( $tab = $db->fetch_array($res) ) while ( $tab = $db->fetch_array($res) )
{ {
foreach ( $tab as $cle => $valeur ) foreach ( $tab as $cle => $valeur )
{ {
$ret[$i][$cle] = $valeur; $ret[$i][$cle] = $valeur;
} }
/** add Ditto for MultiPrix*/
if($conf->global->PRODUIT_MULTIPRICES)
{
$product = new Product($db, $ret[$i]['id']);
if(isset($product->multiprices[$societe->price_level]))
{
$ret[$i]['price'] = $product->multiprices_ttc[$societe->price_level];
}
}
/** end add Ditto */
$i++; $i++;
} }
$tab = $ret; $tab = $ret;
@ -62,7 +90,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$remise = $tab[$i]['remise']; $remise = $tab[$i]['remise'];
echo ('<p>'.$tab[$i]['qte'].' x '.price2num( $tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->monnaie.' HT ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaie.' TTC)</p>'."\n"); echo ('<p>'.$tab[$i]['qte'].' x '.price2num( $tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->monnaie.' '.$langs->trans("HT").' ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaie.' '.$langs->trans("TTC").')</p>'."\n");
echo ('</div>'."\n"); echo ('</div>'."\n");
} }