Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

according to new tree directory

Browse Source
This commit is contained in:
Philippe Grand
2010-04-28 08:35:57 +00:00
parent c13edd1e2a
commit faf19c91ae
23 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev/initdata/generate-commande.php
View File

@@ -40,7 +40,7 @@ include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
/* /*

2
dev/initdata/generate-produit.php
View File

@@ -40,7 +40,7 @@ include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
/* /*

2
dev/initdata/generate-societe.php
View File

@@ -40,7 +40,7 @@ include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono"); $villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
$prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie"); $prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");

2
htdocs/comm/fiche.php
View File

@@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php"); if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php");
$langs->load("companies"); $langs->load("companies");

2
htdocs/comm/index.php
View File

@@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/client.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/client.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
if (!$user->rights->societe->lire) if (!$user->rights->societe->lire)

2
htdocs/compta/facture.php
View File

@@ -40,7 +40,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT.'/contrat/contrat.class.php'); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
$langs->load('bills'); $langs->load('bills');

0
htdocs/contrat/contrat.class.php → htdocs/contrat/class/contrat.class.php
View File

2
htdocs/contrat/contact.php
View File

@@ -26,7 +26,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');

2
htdocs/contrat/document.php
View File

@@ -29,7 +29,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");

2
htdocs/contrat/fiche.php
View File

@@ -30,7 +30,7 @@ require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
$langs->load("contracts"); $langs->load("contracts");

2
htdocs/contrat/index.php
View File

@@ -26,7 +26,7 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once (DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$langs->load("products"); $langs->load("products");
$langs->load("companies"); $langs->load("companies");

2
htdocs/contrat/info.php
View File

@@ -26,7 +26,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$langs->load("contracts"); $langs->load("contracts");

2
htdocs/contrat/liste.php
View File

@@ -26,7 +26,7 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once (DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$langs->load("contracts"); $langs->load("contracts");
$langs->load("products"); $langs->load("products");

2
htdocs/contrat/note.php
View File

@@ -26,7 +26,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";

2
htdocs/contrat/services.php
View File

@@ -26,7 +26,7 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once (DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once (DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once (DOL_DOCUMENT_ROOT."/product/product.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe/societe.class.php"); require_once (DOL_DOCUMENT_ROOT."/societe/societe.class.php");

2
htdocs/includes/boxes/box_contracts.php
View File

@@ -62,7 +62,7 @@ class box_contracts extends ModeleBoxes {
$this->max=$max; $this->max=$max;
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$contractstatic=new Contrat($db); $contractstatic=new Contrat($db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max)); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max));

2
htdocs/includes/boxes/box_services_vendus.php
View File

@@ -62,7 +62,7 @@ class box_services_vendus extends ModeleBoxes {
$this->max=$max; $this->max=$max;
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$contratlignestatic=new ContratLigne($db); $contratlignestatic=new ContratLigne($db);
$this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract",$max)); $this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract",$max));

6
htdocs/index.php
View File

@@ -136,7 +136,7 @@ if ($user->societe_id == 0)
DOL_DOCUMENT_ROOT."/commande/class/commande.class.php", DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php", DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php", DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php",
DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
// Name class containing the method load_state_board for each line // Name class containing the method load_state_board for each line
$classes=array('Client', $classes=array('Client',
'Prospect', 'Prospect',
@@ -372,7 +372,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
{ {
$langs->load("contracts"); $langs->load("contracts");
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$board=new Contrat($db); $board=new Contrat($db);
$board->load_board($user,"inactives"); $board->load_board($user,"inactives");
@@ -398,7 +398,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
{ {
$langs->load("contracts"); $langs->load("contracts");
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$board=new Contrat($db); $board=new Contrat($db);
$board->load_board($user,"expired"); $board->load_board($user,"expired");

2
htdocs/install/upgrade2.php
View File

@@ -34,7 +34,7 @@ require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_
require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php");
require_once($dolibarr_main_document_root . '/compta/facture/class/facture.class.php'); require_once($dolibarr_main_document_root . '/compta/facture/class/facture.class.php');
require_once($dolibarr_main_document_root . '/comm/propal/propal.class.php'); require_once($dolibarr_main_document_root . '/comm/propal/propal.class.php');
require_once($dolibarr_main_document_root . '/contrat/contrat.class.php'); require_once($dolibarr_main_document_root . '/contrat/class/contrat.class.php');
require_once($dolibarr_main_document_root . '/commande/class/commande.class.php'); require_once($dolibarr_main_document_root . '/commande/class/commande.class.php');
require_once($dolibarr_main_document_root . '/fourn/fournisseur.commande.class.php'); require_once($dolibarr_main_document_root . '/fourn/fournisseur.commande.class.php');
require_once($dolibarr_main_document_root . '/lib/price.lib.php'); require_once($dolibarr_main_document_root . '/lib/price.lib.php');

2
htdocs/product/stats/contrat.php
View File

@@ -27,7 +27,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
$langs->load("contracts"); $langs->load("contracts");

2
htdocs/projet/element.php
View File

@@ -34,7 +34,7 @@ if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"); if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
if ($conf->fichinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php"); if ($conf->fichinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php");
if ($conf->deplacement->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); if ($conf->deplacement->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");

2
htdocs/public/paybox/newpayment.php
View File

@@ -384,7 +384,7 @@ if ($_REQUEST["amount"] == 'contractline')
$found=true; $found=true;
$langs->load("contracts"); $langs->load("contracts");
require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$contractline=new ContratLigne($db); $contractline=new ContratLigne($db);
$result=$contractline->fetch('',$_REQUEST["ref"]); $result=$contractline->fetch('',$_REQUEST["ref"]);

2
test/ContratTest.php
View File

@@ -28,7 +28,7 @@ global $conf,$user,$langs,$db;
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
require_once 'PHPUnit/Framework.php'; require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__).'/../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../htdocs/master.inc.php';
require_once dirname(__FILE__).'/../htdocs/contrat/contrat.class.php'; require_once dirname(__FILE__).'/../htdocs/contrat/class/contrat.class.php';
if (empty($user->id)) if (empty($user->id))
{ {