From efba33eb13583d4a6185ebdc8aad38ae5bd12e12 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 18 Jul 2012 17:00:56 +0200 Subject: [PATCH] adapt to new module structure --- htdocs/marges/agentMargins.php | 10 +++++----- htdocs/marges/customerMargins.php | 10 +++++----- htdocs/marges/lib/marges.lib.php | 6 +++--- htdocs/marges/productMargins.php | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/htdocs/marges/agentMargins.php b/htdocs/marges/agentMargins.php index 98067830d5b..476207c952c 100644 --- a/htdocs/marges/agentMargins.php +++ b/htdocs/marges/agentMargins.php @@ -22,16 +22,16 @@ * \version $Id: facture.php,v 1.84 2011/08/08 16:07:47 eldy Exp $ */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT_ALT."/marges/lib/marges.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/marges/lib/marges.lib.php"); $langs->load("companies"); $langs->load("bills"); $langs->load("products"); -$langs->load("marges@marges"); +$langs->load("marges"); // Security check $agentid = isset($_REQUEST["agentid"])?$_REQUEST["agentid"]:''; @@ -133,7 +133,7 @@ $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, s.client, sc.fk_ $sql.= " u.login,"; $sql.= " f.facnumber, f.total as total_ht,"; $sql.= " sum(d.subprice * d.qty * (1 - d.remise_percent / 100)) as selling_price,"; -$sql.= " sum(d.pa_ht * d.qty) as buying_price, sum(((d.subprice * (1 - d.remise_percent / 100)) - d.pa_ht) * d.qty) as marge," ; +$sql.= " sum(d.buy_price_ht * d.qty) as buying_price, sum(((d.subprice * (1 - d.remise_percent / 100)) - d.buy_price_ht) * d.qty) as marge," ; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; diff --git a/htdocs/marges/customerMargins.php b/htdocs/marges/customerMargins.php index afb923525b4..68902c25034 100644 --- a/htdocs/marges/customerMargins.php +++ b/htdocs/marges/customerMargins.php @@ -22,16 +22,16 @@ * \version $Id: facture.php,v 1.84 2011/08/08 16:07:47 eldy Exp $ */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT_ALT."/marges/lib/marges.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/marges/lib/marges.lib.php"); $langs->load("companies"); $langs->load("bills"); $langs->load("products"); -$langs->load("marges@marges"); +$langs->load("marges"); // Security check $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; @@ -142,7 +142,7 @@ print ''; $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, s.client,"; $sql.= " f.facnumber, f.total as total_ht,"; $sql.= " sum(d.subprice * d.qty * (1 - d.remise_percent / 100)) as selling_price,"; -$sql.= " sum(d.pa_ht * d.qty) as buying_price, sum(((d.subprice * (1 - d.remise_percent / 100)) - d.pa_ht) * d.qty) as marge," ; +$sql.= " sum(d.buy_price_ht * d.qty) as buying_price, sum(((d.subprice * (1 - d.remise_percent / 100)) - d.buy_price_ht) * d.qty) as marge," ; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; diff --git a/htdocs/marges/lib/marges.lib.php b/htdocs/marges/lib/marges.lib.php index db8f699e5ee..f2837a62915 100644 --- a/htdocs/marges/lib/marges.lib.php +++ b/htdocs/marges/lib/marges.lib.php @@ -57,17 +57,17 @@ function marges_prepare_head($user) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT_ALT."/marges/productMargins.php"; + $head[$h][0] = DOL_URL_ROOT."/marges/productMargins.php"; $head[$h][1] = $langs->trans("ProductMargins"); $head[$h][2] = 'productMargins'; $h++; - $head[$h][0] = DOL_URL_ROOT_ALT."/marges/customerMargins.php"; + $head[$h][0] = DOL_URL_ROOT."/marges/customerMargins.php"; $head[$h][1] = $langs->trans("CustomerMargins"); $head[$h][2] = 'customerMargins'; $h++; - $head[$h][0] = DOL_URL_ROOT_ALT."/marges/agentMargins.php"; + $head[$h][0] = DOL_URL_ROOT."/marges/agentMargins.php"; $head[$h][1] = $langs->trans("AgentMargins"); $head[$h][2] = 'agentMargins'; $h++; diff --git a/htdocs/marges/productMargins.php b/htdocs/marges/productMargins.php index 9fe4fef4244..58dc2c0e41f 100644 --- a/htdocs/marges/productMargins.php +++ b/htdocs/marges/productMargins.php @@ -22,16 +22,16 @@ * \version $Id: facture.php,v 1.84 2011/08/08 16:07:47 eldy Exp $ */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT_ALT."/marges/lib/marges.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/marges/lib/marges.lib.php"); $langs->load("companies"); $langs->load("bills"); $langs->load("products"); -$langs->load("marges@marges"); +$langs->load("marges"); // Security check if (isset($_REQUEST["id"]) || isset($_REQUEST["ref"])) @@ -144,7 +144,7 @@ print ''; $sql = "SELECT distinct d.fk_product, p.label, p.rowid, p.fk_product_type, p.ref,"; $sql.= " f.facnumber, f.total as total_ht,"; $sql.= " sum(d.subprice * d.qty * (1 - d.remise_percent / 100)) as selling_price,"; -$sql.= " sum(d.pa_ht * d.qty) as buying_price, sum(((d.subprice * (1 - d.remise_percent / 100)) - d.pa_ht) * d.qty) as marge," ; +$sql.= " sum(d.buy_price_ht * d.qty) as buying_price, sum(((d.subprice * (1 - d.remise_percent / 100)) - d.buy_price_ht) * d.qty) as marge," ; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."product as p";