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-29 08:50:46 +00:00
parent 72625da6fe
commit 391c595dda
24 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/cashdesk/tpl/menu.tpl.php
View File

@@ -20,7 +20,7 @@
include_once(DOL_DOCUMENT_ROOT.'/societe/societe.class.php');
include_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
include_once(DOL_DOCUMENT_ROOT.'/product/stock/entrepot.class.php');
include_once(DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php');
if (!empty($conf->global->CASHDESK_ID_THIRDPARTY))
{

4
htdocs/commande/class/commande.class.php
View File

@@ -277,7 +277,7 @@ class Commande extends CommonObject
// If stock is incremented on validate order, we must increment it
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
// Loop on each line
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
@@ -383,7 +383,7 @@ class Commande extends CommonObject
// If stock is decremented on validate order, we must reincrement it
if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{

4
htdocs/compta/facture/class/facture.class.php
View File

@@ -1405,7 +1405,7 @@ class Facture extends CommonObject
// Si active on decremente le produit principal et ses composants a la validation de facture
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
// Loop on each line
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
@@ -1514,7 +1514,7 @@ class Facture extends CommonObject
// Si active on decremente le produit principal et ses composants a la validation de facture
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{

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

@@ -81,7 +81,7 @@ class Expedition extends CommonObject
{
global $conf;
require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php";
require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php";
$error = 0;
// Clean parameters
@@ -370,7 +370,7 @@ class Expedition extends CommonObject
// If stock increment is done on sending (recommanded choice)
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT)
{
require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php";
require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php";
// Loop on each product line to add a stock movement
// TODO possibilite d'expedier a partir d'une propale ou autre origine

2
htdocs/expedition/fiche.php
View File

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

2
htdocs/expedition/shipment.php
View File

@@ -35,7 +35,7 @@ if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUME
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.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");
if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
$langs->load('orders');
$langs->load("companies");

6
htdocs/fourn/class/fournisseur.commande.class.php
View File

@@ -566,7 +566,7 @@ class CommandeFournisseur extends Commande
// If stock is incremented on validate order, we must increment it
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER == 1)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{
@@ -923,7 +923,7 @@ class CommandeFournisseur extends Commande
function DispatchProducts($user, $products, $qtys, $entrepots)
{
global $conf;
require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php";
require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php";
$this->db->begin();
@@ -945,7 +945,7 @@ class CommandeFournisseur extends Commande
{
global $conf;
$error = 0;
require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php";
require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php";
dol_syslog("CommandeFournisseur::DispatchProduct");

4
htdocs/fourn/class/fournisseur.facture.class.php
View File

@@ -589,7 +589,7 @@ class FactureFournisseur extends Facture
// Si activé on décrémente le produit principal et ses composants à la validation de facture
if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{
@@ -663,7 +663,7 @@ class FactureFournisseur extends Facture
// Si active on decremente le produit principal et ses composants a la validation de facture
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{

2
htdocs/fourn/commande/dispatch.php
View File

@@ -28,7 +28,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php');
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');

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

@@ -28,7 +28,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");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.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/livraison/fiche.php
View File

@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
if ($conf->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
if (!$user->rights->expedition->livraison->lire) accessforbidden();

4
htdocs/product/class/product.class.php
View File

@@ -2291,7 +2291,7 @@ class Product extends CommonObject
*/
function ajust_stock($user, $id_entrepot, $nbpiece, $movement, $label='')
{
require_once(DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php");
$op[0] = "+".trim($nbpiece);
$op[1] = "-".trim($nbpiece);
@@ -2314,7 +2314,7 @@ class Product extends CommonObject
*/
function create_stock($user, $id_entrepot, $nbpiece, $movement=0, $label='')
{
require_once(DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php");
require_once(DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php");
$op[0] = "+".trim($nbpiece);
$op[1] = "-".trim($nbpiece);

0
htdocs/product/stock/entrepot.class.php → htdocs/product/stock/class/entrepot.class.php
View File

0
htdocs/product/stock/mouvementstock.class.php → htdocs/product/stock/class/mouvementstock.class.php
View File

2
htdocs/product/stock/fiche-valo.php
View File

@@ -25,7 +25,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
$langs->load("products");

2
htdocs/product/stock/fiche.php
View File

@@ -27,7 +27,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");

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

@@ -28,7 +28,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
$langs->load("stocks");

2
htdocs/product/stock/info.php
View File

@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");

2
htdocs/product/stock/liste.php
View File

@@ -26,7 +26,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
$langs->load("stocks");

2
htdocs/product/stock/mouvement.php
View File

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

2
htdocs/product/stock/product.php
View File

@@ -28,7 +28,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");

2
htdocs/product/stock/user.php
View File

@@ -27,7 +27,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");

2
htdocs/product/stock/valo.php
View File

@@ -26,7 +26,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
$langs->load("stocks");

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

@@ -750,7 +750,7 @@ class User extends CommonObject
if (! empty($conf->global->STOCK_USERSTOCK) && ! empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
$entrepot = new Entrepot($this->db);
$entrepot->libelle = 'Stock Personnel '.$this->nom;
$entrepot->description = 'Cet entrepot represente le stock personnel de '.$this->prenom.' '.$this->nom;