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

Fix: move class to class directory

Browse Source 
Fix: mutualize code
This commit is contained in:
Regis Houssin 2010-04-28 17:30:59 +00:00
parent 172d0c78b6
commit e4ea54f315
37 changed files with 78 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
require ($path."../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");

2
htdocs/admin/propale.php
View File

@ -31,7 +31,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
$langs->load("admin");
$langs->load("bills");

2
htdocs/comm/addpropal.php
View File

@ -27,7 +27,7 @@
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');

2
htdocs/comm/fiche.php
View File

@ -33,7 +33,7 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
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->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.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/class/contrat.class.php");
if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php");

2
htdocs/comm/index.php
View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/societe/client.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.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/class/propal.class.php");
if (!$user->rights->societe->lire)
accessforbidden();

2
htdocs/comm/propal.php
View File

@ -43,7 +43,7 @@ $langs->load('orders');
$langs->load('products');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];

2
htdocs/comm/propal/apercu.php
View File

@ -27,7 +27,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");

2
htdocs/comm/propal/propal.class.php → htdocs/comm/propal/class/propal.class.php
View File

@ -24,7 +24,7 @@
*/
/**
* \file htdocs/propal.class.php
* \file htdocs/comm/propal/class/propal.class.php
* \brief Fichier de la classe des propales
* \author Rodolphe Qiedeville
* \author Eric Seigne

2
htdocs/comm/propal/contact.php
View File

@ -25,7 +25,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');

2
htdocs/comm/propal/document.php
View File

@ -27,7 +27,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");

2
htdocs/comm/propal/info.php
View File

@ -27,7 +27,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
$langs->load('propal');

2
htdocs/comm/propal/note.php
View File

@ -27,7 +27,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
$langs->load('propal');

2
htdocs/comm/propal/stats/propalestats.class.php
View File

@ -26,7 +26,7 @@
*/
include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
include_once DOL_DOCUMENT_ROOT . "/comm/propal/propal.class.php";
include_once DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php";
/**

2
htdocs/comm/prospect/fiche.php
View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php");
require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.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/class/propal.class.php");
$langs->load('companies');
$langs->load('projects');

2
htdocs/commande/apercu.php
View File

@ -29,7 +29,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.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/class/propal.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
if (!$user->rights->commande->lire) accessforbidden();

2
htdocs/commande/fiche.php
View File

@ -38,7 +38,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.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->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
if (!$user->rights->commande->lire) accessforbidden();

6
htdocs/compta/commande/fiche.php
View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.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/class/propal.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
if (! $user->rights->commande->lire) accessforbidden();
@ -548,12 +548,12 @@ if ($id > 0 || ! empty($ref))
if ($commande->statut > 0 && $user->rights->facture->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;commandeid='.$commande->id.'&amp;socid='.$commande->socid.'">'.$langs->trans("CreateBill").'</a>';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$commande->element.'&amp;originid='.$commande->id.'&amp;socid='.$commande->socid.'">'.$langs->trans("CreateBill").'</a>';
}
if ($commande->statut > 0 && $user->rights->commande->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/commande/fiche.php?action=facturee&amp;id='.$commande->id.'">'.$langs->trans("ClassifyBilled").'</a>';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=facturee&amp;id='.$commande->id.'">'.$langs->trans("ClassifyBilled").'</a>';
}
print '</div>';
}

112
htdocs/compta/facture.php
View File

@ -39,7 +39,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
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.'/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/class/propal.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');
@ -1553,9 +1553,12 @@ if ($_GET['action'] == 'create')
$object = new $classname($db);
$object->fetch($_GET['originid']);
$object->fetch_client();
$projectid = (!empty($object->fk_project)?$object->fk_project:'');
$ref_client = (!empty($object->ref_client)?$object->ref_client:'');
$soc = $object->client;
$cond_reglement_id = (!empty($object->cond_reglement_id)?$object->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:0));
$cond_reglement_id = (!empty($object->cond_reglement_id)?$object->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
$mode_reglement_id = (!empty($object->mode_reglement_id)?$object->mode_reglement_id:(!empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
$remise_percent = (!empty($object->remise_percent)?$object->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
$remise_absolue = (!empty($object->remise_absolue)?$object->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
@ -1571,7 +1574,6 @@ if ($_GET['action'] == 'create')
$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
}
$absolute_discount=$soc->getAvailableDiscounts();
if (empty($cond_reglement_id)) $cond_reglement_id=1;
print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -1806,17 +1808,9 @@ if ($_GET['action'] == 'create')
print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
print '<td valign="top" colspan="2">';
print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">';
if (is_object($propal))
if (is_object($object))
{
print $propal->note_public;
}
if (is_object($commande))
{
print $commande->note_public;
}
if (is_object($contrat))
{
print $contrat->note_public;
print $object->note_public;
}
print '</textarea></td></tr>';
@ -1827,74 +1821,24 @@ if ($_GET['action'] == 'create')
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
print '<td valign="top" colspan="2">';
print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
if (is_object($propal))
if (is_object($object))
{
print $propal->note;
}
if (is_object($commande))
{
print $commande->note;
}
if (is_object($contrat))
{
print $contrat->note;
print $object->note;
}
print '</textarea></td></tr>';
}
if ($_GET['propalid'] > 0)
{
print "\n<!-- Propal info -->";
print '<input type="hidden" name="amount" value="'.$propal->total_ht.'">'."\n";
print '<input type="hidden" name="total" value="'.$propal->total_ttc.'">'."\n";
print '<input type="hidden" name="tva" value="'.$propal->total_tva.'">'."\n";
//print '<input type="hidden" name="remise_absolue" value="'.$propal->remise_absolue.'">'."\n";
//print '<input type="hidden" name="remise_percent" value="'.$propal->remise_percent.'">'."\n";
print '<input type="hidden" name="propalid" value="'.$propal->id.'">';
print '<tr><td>'.$langs->trans('Proposal').'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.img_object($langs->trans("ShowPropal"),'propal').' '.$propal->ref.'</a></td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($propal->total_ht).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($propal->total_tva)."</td></tr>";
print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($propal->total_ttc)."</td></tr>";
}
elseif ($_GET['commandeid'] > 0)
{
print "\n<!-- Order info -->";
print "\n";
print '<input type="hidden" name="amount" value="'.$commande->total_ht.'">'."\n";
print '<input type="hidden" name="total" value="'.$commande->total_ttc.'">'."\n";
print '<input type="hidden" name="tva" value="'.$commande->total_tva.'">'."\n";
//print '<input type="hidden" name="remise_absolue" value="'.$commande->remise_absolue.'">'."\n";
//print '<input type="hidden" name="remise_percent" value="'.$commande->remise_percent.'">'."\n";
print '<input type="hidden" name="commandeid" value="'.$commande->id.'">';
print '<tr><td>'.$langs->trans('Order').'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$commande->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref.'</a></td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($commande->total_ht).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($commande->total_tva)."</td></tr>";
print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($commande->total_ttc)."</td></tr>";
}
elseif ($_GET['contratid'] > 0)
{
// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
$contrat->remise_absolue=$remise_absolue;
$contrat->remise_percent=$remise_percent;
$contrat->update_price();
print "\n<!-- Contract info -->";
print '<input type="hidden" name="amount" value="'.$contrat->total_ht.'">'."\n";
print '<input type="hidden" name="total" value="'.$contrat->total_ttc.'">'."\n";
print '<input type="hidden" name="tva" value="'.$contrat->total_tva.'">'."\n";
// print '<input type="hidden" name="remise_absolue" value="'.$contrat->remise_absolue.'">'."\n";
// print '<input type="hidden" name="remise_percent" value="'.$contrat->remise_percent.'">'."\n";
print '<input type="hidden" name="contratid" value="'.$contrat->id.'">';
print '<tr><td>'.$langs->trans('Contract').'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$contrat->id.'">'.img_object($langs->trans("ShowContract"),'contract').' '.$contrat->ref.'</a></td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($contrat->total_ht).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($contrat->total_tva)."</td></tr>";
print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($contrat->total_ttc)."</td></tr>";
}
elseif ($_GET['originid'] > 0)
if (is_object($object))
{
// TODO for compatibility
if ($_GET['origin'] == 'contrat')
{
// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
$object->remise_absolue=$remise_absolue;
$object->remise_percent=$remise_percent;
$object->update_price();
}
print "\n<!-- ".$classname." info -->";
print "\n";
print '<input type="hidden" name="amount" value="'.$object->total_ht.'">'."\n";
@ -1971,8 +1915,8 @@ if ($_GET['action'] == 'create')
print "</form>\n";
// Si creation depuis un propal
if ($_GET['propalid'])
// TODO deplacer dans la classe
if ($_GET['origin'] == 'propal')
{
$title=$langs->trans('ProductsAndServices');
@ -1982,10 +1926,11 @@ if ($_GET['action'] == 'create')
$sql.= ' p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
$sql.= ' WHERE pt.fk_propal = '.$_GET['propalid'];
$sql.= ' WHERE pt.fk_propal = '.$object->id;
$sql.= ' ORDER BY pt.rang ASC, pt.rowid';
}
if ($_GET['commandeid'])
// TODO deplacer dans la classe
if ($_GET['origin'] == 'order')
{
$title=$langs->trans('Products');
@ -1994,10 +1939,11 @@ if ($_GET['action'] == 'create')
$sql.= ' p.label as product, p.ref, p.rowid as prodid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as pt';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
$sql.= ' WHERE pt.fk_commande = '.$commande->id;
$sql.= ' WHERE pt.fk_commande = '.$object->id;
$sql.= ' ORDER BY pt.rowid ASC';
}
if ($_GET['contratid'])
// TODO deplacer dans la classe
if ($_GET['origin'] == 'contrat')
{
$title=$langs->trans('Services');
@ -2007,10 +1953,10 @@ if ($_GET['action'] == 'create')
$sql.= ' p.label as product, p.ref, p.rowid as prodid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'contratdet as pt';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
$sql.= ' WHERE pt.fk_contrat = '.$contrat->id;
$sql.= ' WHERE pt.fk_contrat = '.$object->id;
$sql.= ' ORDER BY pt.rowid ASC';
}
if ($_GET['propalid'] || $_GET['commandeid'] || $_GET['contratid'])
if ($_GET['origin'] && $_GET['originid'])
{
print '<br>';
print_titre($title);

8
htdocs/compta/fiche.php
View File

@ -443,19 +443,19 @@ if ($socid > 0)
if ($user->rights->facture->creer)
{
$langs->load("bills");
if ($societe->client != 0) print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/facture.php?action=create&socid=$societe->id\">".$langs->trans("AddBill")."</a>";
else print "<a class=\"butActionRefused\" title=\"".dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer"))."\" href=\"#\">".$langs->trans("AddBill")."</a>";
if ($societe->client != 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid=$societe->id">'.$langs->trans("AddBill").'</a>';
else print '<a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a>';
}
else
{
print "<a class=\"butActionRefused\" title=\"".dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer"))."\" href=\"#\">".$langs->trans("AddBill")."</a>";
print '<a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a>';
}
}
if ($conf->deplacement->enabled)
{
$langs->load("trips");
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/deplacement/fiche.php?socid=$societe->id&amp;action=create\">".$langs->trans("AddTrip")."</a>";
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/fiche.php?socid=$societe->id&amp;action=create">'.$langs->trans("AddTrip").'</a>';
}
}

10
htdocs/compta/propal.php
View File

@ -1,8 +1,8 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
@ -30,7 +30,7 @@
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
@ -500,13 +500,13 @@ if ($id > 0 || ! empty($ref))
{
if ($propal->statut == 2 && $user->rights->facture->creer)
{
print '<a class="butAction" href="facture.php?propalid='.$propal->id."&action=create&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BuildBill")."</a>";
print '<a class="butAction" href="facture.php?action=create&origin='.$propal->element.'&originid='.$propal->id.'&socid='.$propal->socid.'">'.$langs->trans("BuildBill").'</a>';
}
$arraypropal=$propal->getInvoiceArrayList();
if ($propal->statut == 2 && is_array($arraypropal) && sizeof($arraypropal) > 0)
{
print '<a class="butAction" href="propal.php?propalid='.$propal->id."&action=setstatut&statut=4&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("ClassifyBilled")."</a>";
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&action=setstatut&statut=4&socid='.$propal->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
}
}
print "</div>";

4
htdocs/contrat/fiche.php
View File

@ -29,7 +29,7 @@
require ("../main.inc.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->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.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");
@ -1302,7 +1302,7 @@ else
if ($conf->facture->enabled && $contrat->statut > 0)
{
$langs->load("bills");
if ($user->rights->facture->creer) print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;contratid='.$contrat->id.'&amp;socid='.$contrat->societe->id.'">'.$langs->trans("CreateBill").'</a>';
if ($user->rights->facture->creer) print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$contrat->element.'&amp;originid='.$contrat->id.'&amp;socid='.$contrat->societe->id.'">'.$langs->trans("CreateBill").'</a>';
else print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a>';
}

4
htdocs/contrat/note.php
View File

@ -37,9 +37,9 @@ $langs->load("companies");
$langs->load("contracts");
// Security check
$contactid = isset($_GET["id"])?$_GET["id"]:'';
$id = isset($_GET["id"])?$_GET["id"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'contact',$contactid,'');
$result = restrictedArea($user, 'contrat',$id,'');
$contrat = new Contrat($db);

2
htdocs/expedition/class/expedition.class.php
View File

@ -26,7 +26,7 @@
*/
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.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/class/propal.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

2
htdocs/expedition/fiche.php
View File

@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/html.formproduct.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/product.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/class/propal.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");

2
htdocs/expedition/shipment.php
View File

@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/product.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/class/propal.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");

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

@ -63,7 +63,7 @@ class box_propales extends ModeleBoxes {
$this->max=$max;
include_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
$propalstatic=new Propal($db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastPropals",$max));

2
htdocs/includes/triggers/interface_modPropale_Exportsynchro.class.php-NORUN
View File

@ -110,7 +110,7 @@ class InterfaceExportsynchro
function _create_csv_files($action,$object,$user,$langs,$conf)
{
include_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
include_once(DOL_DOCUMENT_ROOT."/societe.class.php");
$propal_filename = $conf->propale->dir_temp.'/propal_exportsynchro.csv';

6
htdocs/index.php
View File

@ -132,7 +132,7 @@ if ($user->societe_id == 0)
DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
DOL_DOCUMENT_ROOT."/product/product.class.php",
DOL_DOCUMENT_ROOT."/product/service.class.php",
DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php",
DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php",
@ -321,7 +321,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
{
$langs->load("propal");
include_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
$board=new Propal($db);
$board->load_board($user,"opened");
@ -346,7 +346,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
{
$langs->load("propal");
include_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
$board=new Propal($db);
$board->load_board($user,"signed");

2
htdocs/install/upgrade2.php
View File

@ -33,7 +33,7 @@ if (! file_exists($conffile))
require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility
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 . '/comm/propal/propal.class.php');
require_once($dolibarr_main_document_root . '/comm/propal/class/propal.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 . '/fourn/class/fournisseur.commande.class.php');

2
htdocs/lib/company.lib.php
View File

@ -620,7 +620,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
if ($conf->agenda->enabled || ($conf->mailing->enabled && $objcon->email))
{
require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
$actionstatic=new ActionComm($db);

2
htdocs/livraison/class/livraison.class.php
View File

@ -29,7 +29,7 @@
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.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/class/propal.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

2
htdocs/product/fiche.php
View File

@ -32,7 +32,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/html.formproduct.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

2
htdocs/product/fournisseurs.php
View File

@ -28,7 +28,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php";
$langs->load("products");

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

@ -25,7 +25,7 @@
s*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
// Security check
if ($user->societe_id) $socid=$user->societe_id;

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

@ -28,7 +28,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
$langs->load("products");

2
htdocs/projet/element.php
View File

@ -28,7 +28,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
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/class/propal.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-rec.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

2
test/PropalTest.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
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__).'/../htdocs/master.inc.php';
require_once dirname(__FILE__).'/../htdocs/comm/propal/propal.class.php';
require_once dirname(__FILE__).'/../htdocs/comm/propal/class/propal.class.php';
if (empty($user->id))
{