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

Fix: error with linked element

Browse Source
This commit is contained in:
Regis Houssin 2010-04-30 06:57:28 +00:00
parent a9eb2a9da9
commit 38701cda84
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/addpropal.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

32
htdocs/comm/propal.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2004-2010 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) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* *
@ -30,10 +30,13 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
$langs->load('companies'); $langs->load('companies');
$langs->load('propal'); $langs->load('propal');
@ -42,10 +45,6 @@ $langs->load('bills');
$langs->load('orders'); $langs->load('orders');
$langs->load('products'); $langs->load('products');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.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"]; $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
if (isset($_GET["msg"])) { $mesg=$_GET["mesg"]; } if (isset($_GET["msg"])) { $mesg=$_GET["mesg"]; }
$year=isset($_GET["year"])?$_GET["year"]:""; $year=isset($_GET["year"])?$_GET["year"]:"";
@ -265,15 +264,15 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer)
} }
else else
{ {
$propal->ref = $_POST['ref']; $propal->ref = $_POST['ref'];
$propal->ref_client = $_POST['ref_client']; $propal->ref_client = $_POST['ref_client'];
$propal->datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $propal->datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$propal->date_livraison = dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); $propal->date_livraison = dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']);
$propal->fk_delivery_address = $_POST['fk_delivery_address']; $propal->fk_delivery_address = $_POST['fk_delivery_address'];
$propal->adresse_livraison_id = $_POST['fk_delivery_address']; // TODO obsolete $propal->adresse_livraison_id = $_POST['fk_delivery_address']; // TODO obsolete
$propal->duree_validite = $_POST['duree_validite']; $propal->duree_validite = $_POST['duree_validite'];
$propal->cond_reglement_id = $_POST['cond_reglement_id']; $propal->cond_reglement_id = $_POST['cond_reglement_id'];
$propal->mode_reglement_id = $_POST['mode_reglement_id']; $propal->mode_reglement_id = $_POST['mode_reglement_id'];
$propal->contactid = $_POST['contactidp']; $propal->contactid = $_POST['contactidp'];
$propal->fk_project = $_POST['projectid']; $propal->fk_project = $_POST['projectid'];
@ -281,6 +280,9 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer)
$propal->author = $user->id; // deprecated $propal->author = $user->id; // deprecated
$propal->note = $_POST['note']; $propal->note = $_POST['note'];
$propal->origin = $_POST['origin'];
$propal->origin_id = $_POST['originid'];
for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++) for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
{ {
if ($_POST['idprod'.$i]) if ($_POST['idprod'.$i])

12
htdocs/comm/propal/class/propal.class.php
View File

@ -93,6 +93,9 @@ class Propal extends CommonObject
var $lines = array(); var $lines = array();
var $origin;
var $origin_id;
var $labelstatut=array(); var $labelstatut=array();
var $labelstatut_short=array(); var $labelstatut_short=array();
@ -634,6 +637,13 @@ class Propal extends CommonObject
} }
} }
// Add linked object
if ($this->origin && $this->origin_id)
{
$ret = $this->add_object_linked();
if (! $ret) dol_print_error($this->db);
}
// Affectation au projet // Affectation au projet
if ($resql && $this->fk_project) if ($resql && $this->fk_project)
{ {
@ -1231,6 +1241,7 @@ class Propal extends CommonObject
// Propale signee // Propale signee
include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
// TODO move in triggers
$result=$this->create_commande($user); $result=$this->create_commande($user);
if ($result >= 0) if ($result >= 0)
@ -1303,6 +1314,7 @@ class Propal extends CommonObject
* \brief Cree une commande a partir de la proposition commerciale * \brief Cree une commande a partir de la proposition commerciale
* \param user Utilisateur * \param user Utilisateur
* \return int <0 si ko, >=0 si ok * \return int <0 si ko, >=0 si ok
* TODO move in triggers
*/ */
function create_commande($user) function create_commande($user)
{ {