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

Works on multi-company

Browse Source
This commit is contained in:
Regis Houssin
2009-12-10 13:08:19 +00:00
parent 73f6abdeca
commit a4eea3ec7b
6 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/comptacompte.class.php
View File

@@ -25,7 +25,7 @@
/*! \class ComptaCompte
\brief Classe permettant la gestion des comptes g<EFBFBD>n<EFBFBD>raux de compta
\brief Classe permettant la gestion des comptes generaux de compta
*/
class ComptaCompte
@@ -38,7 +38,7 @@ class ComptaCompte
/**
* \brief Constructeur de la classe
* \param DB handler acc<EFBFBD>s base de donn<EFBFBD>es
* \param DB handler acces base de donnees
* \param id id compte (0 par defaut)
*/
@@ -49,7 +49,7 @@ class ComptaCompte
}
/**
* \brief Ins<EFBFBD>re le produit en base
* \brief Insere le produit en base
* \param user utilisateur qui effectue l'insertion
*/

44
htdocs/compta/deplacement/deplacement.class.php
View File

@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,18 +19,18 @@
*/
/**
\file htdocs/compta/deplacement/deplacement.class.php
\ingroup deplacement
\brief Fichier de la classe des deplacements
\version $Id$
*/
* \file htdocs/compta/deplacement/deplacement.class.php
* \ingroup deplacement
* \brief Fichier de la classe des deplacements
* \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
/**
\class Deplacement
\brief Class to manage trips and working credit notes
*/
* \class Deplacement
* \brief Class to manage trips and working credit notes
*/
class Deplacement extends CommonObject
{
var $db;
@@ -43,8 +44,9 @@ class Deplacement extends CommonObject
var $socid;
/*
* Constructor
/**
* \brief Constructeur de la classe
* \param DB handler acces base de donnees
*/
function Deplacement($DB)
{
@@ -59,9 +61,12 @@ class Deplacement extends CommonObject
* @param unknown_type $user User that creat
* @param unknown_type $type Type of record: 0=trip, 1=credit note
* @return unknown
* @TODO Add ref number
*/
function create($user)
{
global $conf;
// Check parameters
if (empty($this->type) || $this->type < 0)
{
@@ -76,9 +81,19 @@ class Deplacement extends CommonObject
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."deplacement";
$sql.= " (datec, fk_user_author, fk_user, type)";
$sql.= " VALUES (".$this->db->idate(mktime()).", ".$user->id.", ".$this->fk_user.", '".$this->type."')";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."deplacement (";
$sql.= "datec";
$sql.= ", entity";
$sql.= ", fk_user_author";
$sql.= ", fk_user";
$sql.= ", type";
$sql.= ") VALUES (";
$sql.= $this->db->idate(mktime());
$sql.= ", ".$conf->entity;
$sql.= ", ".$user->id;
$sql.= ", ".$this->fk_user;
$sql.= ", '".$this->type."'";
$sql.= ")";
dol_syslog("Deplacement::create sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);
@@ -107,7 +122,6 @@ class Deplacement extends CommonObject
}
/**
*
*
*/
function update($user)
@@ -183,7 +197,7 @@ class Deplacement extends CommonObject
}
}
/*
/**
*
*/
function delete($id)

8
htdocs/compta/deplacement/index.php
View File

@@ -21,7 +21,7 @@
/**
\file htdocs/compta/deplacement/index.php
\brief Page liste des d<EFBFBD>placements
\brief Page liste des deplacements
\version $Id$
*/
@@ -62,10 +62,10 @@ $sql.= " u.name, u.firstname"; // Qui
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= ", ".MAIN_DB_PREFIX."deplacement as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on d.fk_soc = s.rowid";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE d.fk_user = u.rowid";
$sql.= " AND s.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " AND d.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND s.rowid = ".$socid;
$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1 ,$offset);

3
htdocs/install/mysql/migration/2.7.0-2.8.0.sql
View File

@@ -11,3 +11,6 @@ ALTER TABLE llx_don ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid;
ALTER TABLE llx_don ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
ALTER TABLE llx_stock_mouvement ADD COLUMN label varchar(128);
ALTER TABLE llx_deplacement ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid;
ALTER TABLE llx_deplacement ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;

3
htdocs/install/mysql/tables/llx_deplacement.sql
View File

@@ -1,5 +1,6 @@
-- ============================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -21,6 +22,8 @@
create table llx_deplacement
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
ref varchar(30) DEFAULT NULL, -- Ref donation (TODO change to NOT NULL)
entity integer DEFAULT 1 NOT NULL, -- multi company id
datec datetime NOT NULL,
tms timestamp,
dated datetime,