Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

adapt to new module structure

Browse Source
This commit is contained in:
Christophe Battarel
2012-07-18 17:00:56 +02:00
parent 411bb993b5
commit efba33eb13
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/marges/agentMargins.php
View File

@@ -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";

10
htdocs/marges/customerMargins.php
View File

@@ -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 '</form>';
$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";

6
htdocs/marges/lib/marges.lib.php
View File

@@ -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++;

10
htdocs/marges/productMargins.php
View File

@@ -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 '</form>';
$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";