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

Possibilit de choisir si changment statu propal cre venment ou non dans Webcalendar

Browse Source
This commit is contained in:
Laurent Destailleur 2006-08-05 17:24:44 +00:00
parent 10939882ae
commit 5396184755
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/webcalendar.php
View File

@ -65,6 +65,7 @@ elseif ($actionsave)
$i+=dolibarr_set_const($db,'PHPWEBCALENDAR_SYNCRO',trim($_POST["phpwebcalendar_syncro"]),'chaine',0);
$i+=dolibarr_set_const($db,'PHPWEBCALENDAR_COMPANYCREATE',trim($_POST["phpwebcalendar_companycreate"]),'chaine',0);
$i+=dolibarr_set_const($db,'PHPWEBCALENDAR_PROPALSTATUS',trim($_POST["phpwebcalendar_propalstatus"]),'chaine',0);
$i+=dolibarr_set_const($db,'PHPWEBCALENDAR_CONTRACTSTATUS',trim($_POST["phpwebcalendar_contractstatus"]),'chaine',0);
$i+=dolibarr_set_const($db,'PHPWEBCALENDAR_BILLSTATUS',trim($_POST["phpwebcalendar_billstatus"]),'chaine',0);
@ -225,6 +226,18 @@ if ($conf->societe->enabled)
print '</select>';
print '</td></tr>';
}
if ($conf->propal->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("WebCalAddEventOnStatusPropal").'</td>';
print '<td>';
print '<select name="phpwebcalendar_propalstatus" class="flat">';
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_PROPALSTATUS=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_PROPALSTATUS || $conf->global->PHPWEBCALENDAR_PROPALSTATUS=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
print '</select>';
print '</td></tr>';
}
if ($conf->contrat->enabled)
{
$var=!$var;
@ -248,8 +261,8 @@ if ($conf->facture->enabled)
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_BILLSTATUS || $conf->global->PHPWEBCALENDAR_BILLSTATUS=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
print '</select>';
print '</td></tr>';
print '</table>';
}
print '</table>';
print '<br><center>';

4
htdocs/facture.class.php
View File

@ -977,10 +977,10 @@ class Facture extends CommonObject
if ($error == 0)
{
$this->use_webcal=($conf->global->PHPWEBCALENDAR_BILLSTATUS=='always'?1:0);
$this->ref = $numfa;
$this->use_webcal=($conf->global->PHPWEBCALENDAR_BILLSTATUS=='always'?1:0);
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);

3
htdocs/langs/en_US/admin.lang
View File

@ -137,7 +137,7 @@ Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Taxes and social contributions
Module500Desc=Taxes and social contributions' management
Module600Name=Notification
Module600Name=Notifications
Module600Desc=Send notifications (by email) on Dolibarr business events
Module700Name=Donations
Module700Desc=Donations' management
@ -397,6 +397,7 @@ WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be r
WebCalTestKo2=Connection to server '%s' with user '%s' failed.
WebCalAddEventOnCreateActions=Add calendar event on actions create
WebCalAddEventOnCreateCompany=Add calendar event on companies create
WebCalAddEventOnStatusPropal=Add calendar event on commercial proposal status change
WebCalAddEventOnStatusContract=Add calendar event on contract status change
WebCalAddEventOnStatusBill=Add calendar event on bill status change
ErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database.

7
htdocs/langs/fr_FR/admin.lang
View File

@ -137,7 +137,7 @@ Module410Name=Webcalendar
Module410Desc=Interface avec le calendrier Webcalendar
Module500Name=Taxes et charges sociales
Module500Desc=Gestion des taxes et charges sociales
Module600Name=Notification
Module600Name=Notifications
Module600Desc=Envoi de notifications (par mail) sur les évênements métiers Dolibarr
Module700Name=Dons
Module700Desc=Gestion des dons
@ -397,8 +397,9 @@ WebCalTestKo1=La connexion au serveur '%s' a r
WebCalTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
WebCalAddEventOnCreateActions=Ajouter évênement dans calendrier sur création d'actions
WebCalAddEventOnCreateCompany=Ajouter évênement dans calendrier sur création de sociétés
WebCalAddEventOnStatusContract=Ajouter évênement dans calendrier sur changement statut contrats
WebCalAddEventOnStatusBill=Ajouter évênement dans calendrier sur changement statut factures
WebCalAddEventOnStatusPropal=Ajouter évênement dans calendrier sur changement de statut des propositions commerciales
WebCalAddEventOnStatusContract=Ajouter évênement dans calendrier sur changement de statut des contrats
WebCalAddEventOnStatusBill=Ajouter évênement dans calendrier sur changement de statut des factures
ErrorConnectOkButWrongDatabase=La connexion a réussie mais la base ne semble pas etre une base webcalendar.
##### Invoices #####
BillsSetup=Configuration du module Factures

5
htdocs/propal.class.php
View File

@ -928,6 +928,7 @@ class Propal extends CommonObject
if ($this->db->query($sql))
{
$this->use_webcal=($conf->global->PHPWEBCALENDAR_PROPALSTATUS=='always'?1:0);
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
@ -1226,6 +1227,8 @@ class Propal extends CommonObject
return -2;
}
$this->use_webcal=($conf->global->PHPWEBCALENDAR_PROPALSTATUS=='always'?1:0);
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);
@ -1234,6 +1237,8 @@ class Propal extends CommonObject
}
else
{
$this->use_webcal=($conf->global->PHPWEBCALENDAR_PROPALSTATUS=='always'?1:0);
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);