cvsimport
This commit is contained in:
Laurent Destailleur
commit
9346fd8c47
@ -10,7 +10,7 @@
|
||||
; only the root user with no password, stop server and catch
|
||||
; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
|
||||
;
|
||||
; Version: $Id: doliwamp.iss,v 1.83 2011/07/28 10:29:49 eldy Exp $
|
||||
; Version: $Id: doliwamp.iss,v 1.84 2011/08/05 23:52:45 eldy Exp $
|
||||
;----------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -109,8 +109,8 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
|
||||
Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
|
||||
; Dolibarr
|
||||
Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,telephonie\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\install.forced.php,*\modBookmark4u.class.php,*\modDocument.class.php,*\modDroitPret.class.php,*\modEditeur.class.php,*\modPostnuke.class.php,*\modTelephonie.class.php,*\interface_modEditeur_Editeur.class.php*,*\bureau2crea,*\rodolphe"
|
||||
Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,fpdf\*,initdemo\*,iso-normes\*,samples\*,test\*,uml\*,xdebug\*"
|
||||
Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*"
|
||||
Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,xdebug\*"
|
||||
Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
|
||||
Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
|
||||
Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
|
||||
; Config files
|
||||
|
||||
@ -58,7 +58,7 @@ if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && $conf->stock->enabled)
|
||||
$langs->load("cashdesk");
|
||||
$langs->load("main");
|
||||
|
||||
$logout='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png">';
|
||||
$logout='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png" title="'.dol_escape_htmltag($langs->trans("Logout")).'">';
|
||||
|
||||
print '<div class="menu_bloc">';
|
||||
print '<ul class="menu">';
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/compta/bank/class/account.class.php
|
||||
* \ingroup banque
|
||||
* \brief File of class to manage bank accounts
|
||||
* \version $Id: account.class.php,v 1.33 2011/07/31 22:23:30 eldy Exp $
|
||||
* \version $Id: account.class.php,v 1.34 2011/08/05 21:05:19 eldy Exp $
|
||||
*/
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
||||
@ -146,7 +146,7 @@ class Account extends CommonObject
|
||||
$sql.= ", '".$type."'";
|
||||
$sql.= ")";
|
||||
|
||||
dol_syslog("Account::add_url_line sql=".$sql);
|
||||
dol_syslog(get_class($this)."::add_url_line sql=".$sql);
|
||||
if ($this->db->query($sql))
|
||||
{
|
||||
$rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
|
||||
@ -155,25 +155,37 @@ class Account extends CommonObject
|
||||
else
|
||||
{
|
||||
$this->error=$this->db->lasterror();
|
||||
dol_syslog("Account:add_url_line ".$this->error, LOG_ERR);
|
||||
dol_syslog(get_class($this)."::add_url_line ".$this->error, LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return array with links
|
||||
* @param line_id Id transaction line
|
||||
* TODO Move this into AccountLine
|
||||
* Return array with links from llx_bank_url
|
||||
* @param fk_bank To search using bank transaction id
|
||||
* @param url_id To search using link to
|
||||
* @param type To search using type
|
||||
* @return array Array of links
|
||||
*/
|
||||
function get_url($line_id)
|
||||
function get_url($fk_bank='', $url_id='', $type='')
|
||||
{
|
||||
$lines = array();
|
||||
|
||||
$sql = "SELECT url_id, url, label, type";
|
||||
// Check parameters
|
||||
if (! empty($fk_bank) && (! empty($url_id) || ! empty($type)))
|
||||
{
|
||||
$this->error="ErrorBadParameter";
|
||||
return -1;
|
||||
}
|
||||
|
||||
$sql = "SELECT fk_bank, url_id, url, label, type";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."bank_url";
|
||||
$sql.= " WHERE fk_bank = ".$line_id;
|
||||
if ($fk_bank > 0) { $sql.= " WHERE fk_bank = ".$fk_bank; }
|
||||
else { $sql.= " WHERE url_id = ".$url_id." AND type = '".$type."'"; }
|
||||
$sql.= " ORDER BY type, label";
|
||||
|
||||
dol_syslog(get_class($this)."::get_url sql=".$sql);
|
||||
$result = $this->db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
@ -192,10 +204,13 @@ class Account extends CommonObject
|
||||
$lines[$i]['url_id'] = $obj->url_id;
|
||||
$lines[$i]['label'] = $obj->label;
|
||||
$lines[$i]['type'] = $obj->type;
|
||||
$lines[$i]['fk_bank'] = $obj->fk_bank;
|
||||
$i++;
|
||||
}
|
||||
return $lines;
|
||||
}
|
||||
else dol_print_error($this->db);
|
||||
|
||||
return $lines;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -779,11 +794,11 @@ class Account extends CommonObject
|
||||
{
|
||||
$obj=$this->db->fetch_object($resql);
|
||||
$newdate=$this->db->jdate($obj->datev)+(3600*24*$sign);
|
||||
|
||||
|
||||
$sql = "UPDATE ".MAIN_DB_PREFIX."bank SET ";
|
||||
$sql.= " datev = '".$this->db->idate($newdate)."'";
|
||||
$sql.= " WHERE rowid = ".$rowid;
|
||||
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
@ -801,7 +816,7 @@ class Account extends CommonObject
|
||||
else dol_print_error($this->db);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param rowid
|
||||
*/
|
||||
@ -997,7 +1012,7 @@ class Account extends CommonObject
|
||||
|
||||
/**
|
||||
* \class AccountLine
|
||||
* \brief Classto manage bank transaction lines
|
||||
* \brief Class to manage bank transaction lines
|
||||
*/
|
||||
class AccountLine extends CommonObject
|
||||
{
|
||||
@ -1112,7 +1127,7 @@ class AccountLine extends CommonObject
|
||||
|
||||
|
||||
/**
|
||||
* Delete bank line record
|
||||
* Delete transaction bank line record
|
||||
* @param user User object that delete
|
||||
* @return int <0 if KO, >0 if OK
|
||||
*/
|
||||
@ -1129,12 +1144,14 @@ class AccountLine extends CommonObject
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid=".$this->rowid;
|
||||
dol_syslog("AccountLine::delete sql=".$sql);
|
||||
$result = $this->db->query($sql);
|
||||
if (! $result) $nbko++;
|
||||
// Delete urls
|
||||
$result=$this->delete_urls();
|
||||
if ($result < 0)
|
||||
{
|
||||
$nbko++;
|
||||
}
|
||||
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank=".$this->rowid;
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid=".$this->rowid;
|
||||
dol_syslog("AccountLine::delete sql=".$sql);
|
||||
$result = $this->db->query($sql);
|
||||
if (! $result) $nbko++;
|
||||
@ -1157,6 +1174,42 @@ class AccountLine extends CommonObject
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Delete bank line records
|
||||
* @param user User object that delete
|
||||
* @return int <0 if KO, >0 if OK
|
||||
*/
|
||||
function delete_urls($user=0)
|
||||
{
|
||||
$nbko=0;
|
||||
|
||||
if ($this->rappro)
|
||||
{
|
||||
// Protection to avoid any delete of consolidated lines
|
||||
$this->error="ErrorDeleteNotPossibleLineIsConsolidated";
|
||||
return -1;
|
||||
}
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank=".$this->rowid;
|
||||
dol_syslog("AccountLine::delete_urls sql=".$sql);
|
||||
$result = $this->db->query($sql);
|
||||
if (! $result) $nbko++;
|
||||
|
||||
if (! $nbko)
|
||||
{
|
||||
$this->db->commit();
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->db->rollback();
|
||||
return -$nbko;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update bank account record in database
|
||||
* @param user Object user making update
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
* \file htdocs/compta/paiement/class/paiement.class.php
|
||||
* \ingroup facture
|
||||
* \brief File of class to manage payments of customers invoices
|
||||
* \version $Id: paiement.class.php,v 1.22 2011/08/03 00:46:39 eldy Exp $
|
||||
* \version $Id: paiement.class.php,v 1.23 2011/08/05 21:06:55 eldy Exp $
|
||||
*/
|
||||
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
||||
|
||||
@ -259,9 +259,9 @@ class Paiement extends CommonObject
|
||||
function delete($notrigger=0)
|
||||
{
|
||||
global $conf, $user, $langs;
|
||||
|
||||
|
||||
$error=0;
|
||||
|
||||
|
||||
$bank_line_id = $this->bank_line;
|
||||
|
||||
$this->db->begin();
|
||||
@ -273,7 +273,7 @@ class Paiement extends CommonObject
|
||||
{
|
||||
if (sizeof($billsarray))
|
||||
{
|
||||
$this->error="Impossible de supprimer un paiement portant sur au moins une facture fermee";
|
||||
$this->error="ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible";
|
||||
$this->db->rollback();
|
||||
return -1;
|
||||
}
|
||||
@ -284,18 +284,18 @@ class Paiement extends CommonObject
|
||||
return -2;
|
||||
}
|
||||
|
||||
// Verifier si paiement ne porte pas sur ecriture bancaire rapprochee
|
||||
// Si c'est le cas, on refuse le paiement
|
||||
// Delete bank urls. If payment if on a conciliated line, return error.
|
||||
if ($bank_line_id)
|
||||
{
|
||||
$accline = new AccountLine($this->db,$bank_line_id);
|
||||
$accline = new AccountLine($this->db);
|
||||
$accline->fetch($bank_line_id);
|
||||
if ($accline->rappro)
|
||||
{
|
||||
$this->error="Impossible de supprimer un paiement qui a genere une ecriture qui a ete rapprochee";
|
||||
$result=$accline->delete_urls($user);
|
||||
if ($result < 0)
|
||||
{
|
||||
$this->error=$accline->error;
|
||||
$this->db->rollback();
|
||||
return -3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Delete payment (into paiement_facture and paiement)
|
||||
@ -309,7 +309,7 @@ class Paiement extends CommonObject
|
||||
$result = $this->db->query($sql);
|
||||
if (! $result)
|
||||
{
|
||||
$this->error=$this->db->error();
|
||||
$this->error=$this->db->lasterror();
|
||||
$this->db->rollback();
|
||||
return -3;
|
||||
}
|
||||
@ -327,7 +327,7 @@ class Paiement extends CommonObject
|
||||
return -4;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (! $notrigger)
|
||||
{
|
||||
// Appel des triggers
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \ingroup facture
|
||||
* \brief Page of a customer payment
|
||||
* \remarks Nearly same file than fournisseur/paiement/fiche.php
|
||||
* \version $Id: fiche.php,v 1.76 2011/08/03 00:46:35 eldy Exp $
|
||||
* \version $Id: fiche.php,v 1.77 2011/08/05 21:06:55 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -84,7 +84,8 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights-
|
||||
}
|
||||
else
|
||||
{
|
||||
$mesg='<div class="error">'.$paiement->error.'</div>';
|
||||
$langs->load("errors");
|
||||
$mesg='<div class="error">'.$langs->trans($paiement->error).'</div>';
|
||||
$db->rollback();
|
||||
}
|
||||
}
|
||||
@ -120,7 +121,8 @@ if ($action == 'confirm_valide' && GETPOST('confirm') == 'yes' && $user->rights-
|
||||
}
|
||||
else
|
||||
{
|
||||
$mesg='<div class="error">'.$paiement->error.'</div>';
|
||||
$langs->load("errors");
|
||||
$mesg='<div class="error">'.$langs->trans($paiement->error).'</div>';
|
||||
$db->rollback();
|
||||
}
|
||||
}
|
||||
@ -178,7 +180,7 @@ if ($action == 'valide')
|
||||
}
|
||||
|
||||
|
||||
if ($mesg) print $mesg.'<br>';
|
||||
dol_htmloutput_mesg($mesg);
|
||||
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
@ -356,5 +358,5 @@ print '</div>';
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.76 $');
|
||||
llxFooter('$Date: 2011/08/05 21:06:55 $ - $Revision: 1.77 $');
|
||||
?>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
/* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -20,7 +20,7 @@
|
||||
* \file htdocs/compta/sociales/charges.php
|
||||
* \ingroup tax
|
||||
* \brief Social contribution car page
|
||||
* \version $Id: charges.php,v 1.65 2011/07/31 22:23:20 eldy Exp $
|
||||
* \version $Id: charges.php,v 1.66 2011/08/05 21:11:50 eldy Exp $
|
||||
*/
|
||||
|
||||
require('../../main.inc.php');
|
||||
@ -29,10 +29,10 @@ require(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php");
|
||||
$langs->load("compta");
|
||||
$langs->load("bills");
|
||||
|
||||
$chid=isset($_GET["id"])?$_GET["id"]:$_POST["id"];
|
||||
$chid=GETPOST("id");
|
||||
|
||||
// Security check
|
||||
$socid = isset($_GET["socid"])?$_GET["socid"]:'';
|
||||
$socid = GETPOST("socid");
|
||||
if ($user->societe_id) $socid=$user->societe_id;
|
||||
$result = restrictedArea($user, 'tax', '', '', 'charges');
|
||||
|
||||
@ -62,7 +62,7 @@ if ($_REQUEST["action"] == 'confirm_paid' && $_REQUEST["confirm"] == 'yes')
|
||||
if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes')
|
||||
{
|
||||
$chargesociales=new ChargeSociales($db);
|
||||
$chargesociales->id=$_GET["id"];
|
||||
$chargesociales->fetch($chid);
|
||||
$result=$chargesociales->delete($user);
|
||||
if ($result > 0)
|
||||
{
|
||||
@ -129,8 +129,8 @@ if ($_POST["action"] == 'add' && $user->rights->tax->charges->creer)
|
||||
|
||||
if ($_GET["action"] == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->creer)
|
||||
{
|
||||
$dateech=@dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]);
|
||||
$dateperiod=@dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
|
||||
$dateech=dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]);
|
||||
$dateperiod=dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
|
||||
if (! $dateech)
|
||||
{
|
||||
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")).'</div>';
|
||||
@ -172,10 +172,7 @@ llxHeader('',$langs->trans("SocialContribution"));
|
||||
|
||||
$html = new Form($db);
|
||||
|
||||
/*
|
||||
* Mode creation
|
||||
*
|
||||
*/
|
||||
// Mode creation
|
||||
if ($_GET["action"] == 'create')
|
||||
{
|
||||
print_fiche_titre($langs->trans("NewSocialContribution"));
|
||||
@ -251,7 +248,7 @@ if ($chid > 0)
|
||||
|
||||
if ($result > 0)
|
||||
{
|
||||
if ($mesg) print $mesg.'<br>';
|
||||
dol_htmloutput_mesg($mesg);
|
||||
|
||||
$h = 0;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$cha->id;
|
||||
@ -268,15 +265,13 @@ if ($chid > 0)
|
||||
if ($_GET["action"] == 'paid')
|
||||
{
|
||||
$text=$langs->trans('ConfirmPaySocialContribution');
|
||||
$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=$cha->id&action=confirm_paid",$langs->trans('PaySocialContribution'),$text,"confirm_paid");
|
||||
if ($ret == 'html') print '<br>';
|
||||
print $html->formconfirm($_SERVER["PHP_SELF"]."?id=".$cha->id,$langs->trans('PaySocialContribution'),$text,"confirm_paid",'','',2);
|
||||
}
|
||||
|
||||
if ($_GET['action'] == 'delete')
|
||||
{
|
||||
$text=$langs->trans('ConfirmDeleteSocialContribution');
|
||||
$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$cha->id,$langs->trans('DeleteSocialContribution'),$text,'confirm_delete');
|
||||
if ($ret == 'html') print '<br>';
|
||||
print $html->formconfirm($_SERVER['PHP_SELF'].'?id='.$cha->id,$langs->trans('DeleteSocialContribution'),$text,'confirm_delete','','',2);
|
||||
}
|
||||
|
||||
if ($_GET['action'] == 'edit')
|
||||
@ -353,9 +348,9 @@ if ($chid > 0)
|
||||
{
|
||||
$objp = $db->fetch_object($resql);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]><td>";
|
||||
print "<tr ".$bc[$var]."><td>";
|
||||
print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").'</a> ';
|
||||
print dol_print_date($db->jdate($objp->dp))."</td>\n";
|
||||
print dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
|
||||
print "<td>".$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
|
||||
print '<td align="right">'.price($objp->amount)."</td><td> ".$langs->trans("Currency".$conf->monnaie)."</td>\n";
|
||||
print "</tr>";
|
||||
@ -445,7 +440,7 @@ if ($chid > 0)
|
||||
}
|
||||
|
||||
// Delete
|
||||
if ($cha->paye == 0 && $totalpaye <=0 && $user->rights->tax->charges->supprimer)
|
||||
if ($user->rights->tax->charges->supprimer)
|
||||
{
|
||||
print "<a class=\"butActionDelete\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$cha->id&action=delete\">".$langs->trans("Delete")."</a>";
|
||||
}
|
||||
@ -462,5 +457,5 @@ if ($chid > 0)
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.65 $');
|
||||
llxFooter('$Date: 2011/08/05 21:11:50 $ - $Revision: 1.66 $');
|
||||
?>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
* \file htdocs/compta/sociales/class/chargesociales.class.php
|
||||
* \ingroup facture
|
||||
* \brief Fichier de la classe des charges sociales
|
||||
* \version $Id: chargesociales.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $
|
||||
* \version $Id: chargesociales.class.php,v 1.15 2011/08/05 21:11:50 eldy Exp $
|
||||
*/
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
|
||||
@ -147,25 +147,72 @@ class ChargeSociales extends CommonObject
|
||||
|
||||
|
||||
/**
|
||||
* \brief Efface un charge sociale
|
||||
* \param user Utilisateur qui cree le paiement
|
||||
* \return int <0 si erreur, >0 si ok
|
||||
* Delete a social contribution
|
||||
* @param user Object user making delete
|
||||
* @return int <0 if KO, >0 if OK
|
||||
*/
|
||||
function delete($user)
|
||||
{
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$this->id."'";
|
||||
$error=0;
|
||||
|
||||
dol_syslog("ChargesSociales::delete sql=".$sql);
|
||||
$resql=$this->db->query($sql);
|
||||
if ($resql)
|
||||
$this->db->begin();
|
||||
|
||||
// Get bank transaction lines for this social contributions
|
||||
include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
|
||||
$account=new Account($this->db);
|
||||
$lines_url=$account->get_url('',$this->id,'sc');
|
||||
|
||||
// Delete bank urls
|
||||
foreach ($lines_url as $line_url)
|
||||
{
|
||||
if (! $error)
|
||||
{
|
||||
$accountline=new AccountLine($this->db);
|
||||
$accountline->fetch($line_url['fk_bank']);
|
||||
$result=$accountline->delete_urls($user);
|
||||
if ($result < 0)
|
||||
{
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Delete payments
|
||||
if (! $error)
|
||||
{
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge where fk_charge='".$this->id."'";
|
||||
dol_syslog(get_class($this)."::delete sql=".$sql);
|
||||
$resql=$this->db->query($sql);
|
||||
if (! $resql)
|
||||
{
|
||||
$error++;
|
||||
$this->error=$this->db->lasterror();
|
||||
}
|
||||
}
|
||||
|
||||
if (! $error)
|
||||
{
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$this->id."'";
|
||||
dol_syslog(get_class($this)."::delete sql=".$sql);
|
||||
$resql=$this->db->query($sql);
|
||||
if (! $resql)
|
||||
{
|
||||
$error++;
|
||||
$this->error=$this->db->lasterror();
|
||||
}
|
||||
}
|
||||
|
||||
if (! $error)
|
||||
{
|
||||
$this->db->commit();
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->error=$this->db->error();
|
||||
$this->db->rollback();
|
||||
return -1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
* \file htdocs/exports/class/export.class.php
|
||||
* \ingroup export
|
||||
* \brief File of class to manage exports
|
||||
* \version $Id: export.class.php,v 1.12 2011/07/31 23:50:57 eldy Exp $
|
||||
* \version $Id: export.class.php,v 1.13 2011/08/05 06:29:50 tiaris Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -213,11 +213,12 @@ class Export
|
||||
* \param model Export format
|
||||
* \param datatoexport Name of dataset to export
|
||||
* \param array_selected Filter on array of fields to export
|
||||
* \param sqlquery = '' if set, transmit a sql query instead of building it from arrays
|
||||
* \remarks Les tableaux array_export_xxx sont deja chargees pour le bon datatoexport
|
||||
* aussi le parametre datatoexport est inutilise
|
||||
*/
|
||||
function build_file($user, $model, $datatoexport, $array_selected)
|
||||
{
|
||||
function build_file($user, $model, $datatoexport, $array_selected, $sqlquery = '')
|
||||
{
|
||||
global $conf,$langs;
|
||||
|
||||
$indice=0;
|
||||
@ -232,7 +233,8 @@ class Export
|
||||
require_once($dir.$file);
|
||||
$objmodel = new $classname($db);
|
||||
|
||||
$sql=$this->build_sql($indice,$array_selected);
|
||||
if ($sqlquery) $sql = $sqlquery;
|
||||
else $sql=$this->build_sql($indice,$array_selected);
|
||||
|
||||
// Run the sql
|
||||
$this->sqlusedforexport=$sql;
|
||||
|
||||
@ -101,7 +101,7 @@
|
||||
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
||||
#tiptip_content {
|
||||
padding: 4px 8px 5px 8px;
|
||||
background-color: rgba(45,45,45,0.88);
|
||||
/*background-color: rgba(45,45,45,0.88);*/
|
||||
}
|
||||
#tiptip_holder.tip_bottom #tiptip_arrow_inner {
|
||||
border-bottom-color: rgba(45,45,45,0.88);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--
|
||||
-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $
|
||||
-- $Revision: 1.123 $
|
||||
-- $Id: init_menu_auguria.sql,v 1.124 2011/08/05 18:28:02 eldy Exp $
|
||||
-- $Revision: 1.124 $
|
||||
--
|
||||
-- Menu base entries
|
||||
-- This file is loaded when a menu handler base is activated (auguria, etc..)
|
||||
@ -16,7 +16,7 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->societe->enabled || $conf->fournisseur->enabled', 2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies', '', 0, '/societe/index.php?mainmenu=companies&leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 2, __ENTITY__);
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 3, __ENTITY__);
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->societe->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 5, __ENTITY__);
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire', '', 2, 6, __ENTITY__);
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire', '', 2, 6, __ENTITY__);
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7, __ENTITY__);
|
||||
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run', '', 2, 8, __ENTITY__);
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
/**
|
||||
* \file htdocs/includes/menus/standard/eldy.lib.php
|
||||
* \brief Library for file eldy menus
|
||||
* \version $Id: eldy.lib.php,v 1.61 2011/07/31 23:46:07 eldy Exp $
|
||||
* \version $Id: eldy.lib.php,v 1.62 2011/08/05 18:28:01 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -203,7 +203,7 @@ function print_eldy_menu($db,$atarget,$type_user)
|
||||
|
||||
// Financial
|
||||
if ($conf->comptabilite->enabled || $conf->accounting->enabled
|
||||
|| $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled)
|
||||
|| $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled)
|
||||
{
|
||||
$langs->load("compta");
|
||||
|
||||
@ -219,7 +219,7 @@ function print_eldy_menu($db,$atarget,$type_user)
|
||||
|
||||
$idsel='accountancy';
|
||||
if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
|
||||
|| $user->rights->facture->lire || $user->rights->banque->lire)
|
||||
|| $user->rights->facture->lire || $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire)
|
||||
{
|
||||
print_start_menu_entry($idsel);
|
||||
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
/**
|
||||
* \defgroup produit Module products
|
||||
* \brief Module pour gerer le suivi de produits predefinis
|
||||
* \version $Id: modProduct.class.php,v 1.13 2011/07/31 23:28:12 eldy Exp $
|
||||
* \version $Id: modProduct.class.php,v 1.14 2011/08/05 22:11:23 eldy Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -132,10 +132,12 @@ class modProduct extends DolibarrModules
|
||||
$this->export_label[$r]="Products"; // Translation key (used only if key ExportDataset_xxx_z not found)
|
||||
$this->export_permission[$r]=array(array("produit","export"));
|
||||
$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.label'=>"Label",'p.description'=>"Description",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.customcode'=>'CustomCode','p.price_base_type'=>"PriceBase",'p.price'=>"UnitPriceHT",'p.price_ttc'=>"UnitPriceTTC",'p.tva_tx'=>'VATRate','p.tosell'=>"OnSell",'p.tobuy'=>"OnBuy",'p.datec'=>'DateCreation','p.tms'=>'DateModification');
|
||||
if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge ($this->export_fields_array[$r],array('p.stock'=>'Stock','p.pmp'=>'PMPValue'));
|
||||
//if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge ($this->export_fields_array[$r],array('p.stock'=>'Stock','p.pmp'=>'PMPValue'));
|
||||
if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge ($this->export_fields_array[$r],array('p.pmp'=>'PMPValue'));
|
||||
if (! empty($conf->barcode->enabled)) $this->export_fields_array[$r]=array_merge ($this->export_fields_array[$r],array('p.barcode'=>'Barcode'));
|
||||
$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.label'=>"product",'p.description'=>"product",'p.accountancy_code_sell'=>'product','p.accountancy_code_sell'=>'product','p.note'=>"product",'p.length'=>"product",'p.surface'=>"product",'p.volume'=>"product",'p.weight'=>"product",'p.customcode'=>'product','p.price_base_type'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>"product",'p.tosell'=>"product",'p.tobuy'=>"product",'p.datec'=>"product",'p.tms'=>"product");
|
||||
if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge ($this->export_entities_array[$r],array('p.stock'=>'product','p.pmp'=>'product'));
|
||||
//if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge ($this->export_entities_array[$r],array('p.stock'=>'product','p.pmp'=>'product'));
|
||||
if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge ($this->export_entities_array[$r],array('p.pmp'=>'product'));
|
||||
if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge ($this->export_entities_array[$r],array('p.barcode'=>'product'));
|
||||
|
||||
$this->export_sql_start[$r]='SELECT DISTINCT ';
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
/** \file htdocs/install/inc.php
|
||||
* \ingroup core
|
||||
* \brief File that define environment for install pages
|
||||
* \version $Id: inc.php,v 1.138 2011/08/04 12:07:30 eldy Exp $
|
||||
* \version $Id: inc.php,v 1.139 2011/08/05 23:47:34 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
@ -178,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
|
||||
exit;
|
||||
}
|
||||
$lockfile=DOL_DATA_ROOT.'/install.lock';
|
||||
if (file_exists($lockfile))
|
||||
if (constant('DOL_DATA_ROOT') && file_exists($lockfile))
|
||||
{
|
||||
print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).<br>';
|
||||
if (! empty($dolibarr_main_url_root))
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
-- Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
||||
-- Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
-- Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
-- Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
||||
-- Copyright (C) 2004 Guillaume Delecourt <guillaume.delecourt@opensides.be>
|
||||
-- Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
@ -19,7 +19,7 @@
|
||||
-- You should have received a copy of the GNU General Public License
|
||||
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
--
|
||||
-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
|
||||
-- $Id: llx_c_paper_format.sql,v 1.3 2011/08/05 22:33:04 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
@ -30,24 +30,28 @@
|
||||
--
|
||||
-- Formats de papier
|
||||
--
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1, '4A0', 'Format 4A0', '1682', '2378', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2, '2A0', 'Format 2A0', '1189', '1682', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3, 'A0', 'Format A0', '840', '1189', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4, 'A1', 'Format A1', '594', '840', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5, 'A2', 'Format A2', '420', '594', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6, 'A3', 'Format A3', '297', '420', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7, 'A4', 'Format A4', '210', '297', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8, 'A5', 'Format A5', '148', '210', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9, 'A6', 'Format A6', '105', '148', 'mm', 1);
|
||||
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (100, 'USLetter', 'Format Letter (A)', '216', '279', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (105, 'USLegal', 'Format Legal', '216', '356', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (110, 'USExecutive', 'Format Executive', '190', '254', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (115, 'USLedger', 'Format Ledger/Tabloid (B)', '279', '432', 'mm', 0);
|
||||
-- Europe
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1, 'EU4A0', 'Format 4A0', '1682', '2378', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2, 'EU2A0', 'Format 2A0', '1189', '1682', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3, 'EUA0', 'Format A0', '840', '1189', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4, 'EUA1', 'Format A1', '594', '840', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5, 'EUA2', 'Format A2', '420', '594', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6, 'EUA3', 'Format A3', '297', '420', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7, 'EUA4', 'Format A4', '210', '297', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8, 'EUA5', 'Format A5', '148', '210', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9, 'EUA6', 'Format A6', '105', '148', 'mm', 1);
|
||||
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (200, 'Canadian P1', 'Format Canadian P1', '560', '860', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (205, 'Canadian P2', 'Format Canadian P2', '430', '560', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (210, 'Canadian P3', 'Format Canadian P3', '280', '430', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (215, 'Canadian P4', 'Format Canadian P4', '215', '280', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (220, 'Canadian P5', 'Format Canadian P5', '140', '215', 'mm', 0);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (225, 'Canadian P6', 'Format Canadian P6', '107', '140', 'mm', 0);
|
||||
-- US
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (100, 'USLetter', 'Format Letter (A)', '216', '279', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (105, 'USLegal', 'Format Legal', '216', '356', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (110, 'USExecutive', 'Format Executive', '190', '254', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (115, 'USLedger', 'Format Ledger/Tabloid (B)', '279', '432', 'mm', 1);
|
||||
|
||||
-- Canadian
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (200, 'CAP1', 'Format Canadian P1', '560', '860', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (205, 'CAP2', 'Format Canadian P2', '430', '560', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (210, 'CAP3', 'Format Canadian P3', '280', '430', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (215, 'CAP4', 'Format Canadian P4', '215', '280', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (220, 'CAP5', 'Format Canadian P5', '140', '215', 'mm', 1);
|
||||
INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (225, 'CAP6', 'Format Canadian P6', '107', '140', 'mm', 1);
|
||||
|
||||
@ -14,7 +14,7 @@ CashDeskOn=de
|
||||
CashDeskThirdParty=Tercer
|
||||
ShoppingCart=Cistella
|
||||
NewSell=Nova venda
|
||||
BackOffice=Sortir
|
||||
BackOffice=Back office
|
||||
AddThisArticle=Afegeix aquest article
|
||||
RestartSelling=Reprendre la venda
|
||||
SellFinished=Venda acabada
|
||||
|
||||
@ -81,4 +81,5 @@ ErrorBadMask=Error on mask
|
||||
ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
|
||||
ErrorBadMaskBadRazMonth=Error, bad reset value
|
||||
ErrorSelectAtLeastOne=Error. Select at least one entry.
|
||||
ErrorProductWithRefNotExist=Product with reference '<i>%s</i>' don't exist
|
||||
ErrorProductWithRefNotExist=Product with reference '<i>%s</i>' don't exist
|
||||
ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
|
||||
@ -14,7 +14,7 @@ CashDeskOn=de
|
||||
CashDeskThirdParty=Tercero
|
||||
ShoppingCart=Cesta
|
||||
NewSell=Nueva venta
|
||||
BackOffice=Salir
|
||||
BackOffice=Back office
|
||||
AddThisArticle=Añadir este artículo
|
||||
RestartSelling=Retomar la venta
|
||||
SellFinished=Venta terminada
|
||||
|
||||
@ -82,4 +82,5 @@ ErrorBadMask=Erreur sur le masque
|
||||
ErrorBadMaskFailedToLocatePosOfSequence=Erreur, masque sans numéro de séquence
|
||||
ErrorBadMaskBadRazMonth=Erreur, mauvais valeur de remise à zéro
|
||||
ErrorSelectAtLeastOne=Erreur. Sélectionnez au moins une entrée.
|
||||
ErrorProductWithRefNotExist=La référence produit '<i>%s</i>' n'existe pas
|
||||
ErrorProductWithRefNotExist=La référence produit '<i>%s</i>' n'existe pas
|
||||
ErrorDeleteNotPossibleLineIsConsolidated=Suppression impossible car l'enregistrement porte sur au moins une transaction bancaire rapprochée
|
||||
@ -5,7 +5,7 @@
|
||||
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
||||
* Copyright (C) 2006 Auguria SARL <info@auguria.org>
|
||||
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
|
||||
*
|
||||
* 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
|
||||
@ -25,7 +25,7 @@
|
||||
* \file htdocs/product/fiche.php
|
||||
* \ingroup product
|
||||
* \brief Page to show product
|
||||
* \version $Id: fiche.php,v 1.375 2011/08/04 21:46:50 eldy Exp $
|
||||
* \version $Id: fiche.php,v 1.376 2011/08/05 12:59:17 simnandez Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -1286,7 +1286,7 @@ if ($product->id && $action == '' && $product->status)
|
||||
$sql.= " AND p.entity = ".$conf->entity;
|
||||
$sql.= " AND p.fk_statut = 0";
|
||||
$sql.= " AND p.fk_user_author = ".$user->id;
|
||||
$sql.= " ORDER BY p.datec DESC, tms DESC";
|
||||
$sql.= " ORDER BY p.datec DESC, p.tms DESC";
|
||||
|
||||
$result=$db->query($sql);
|
||||
if ($result)
|
||||
@ -1645,6 +1645,6 @@ if ($product->id && $action == '' && $product->status)
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/08/04 21:46:50 $ - $Revision: 1.375 $');
|
||||
llxFooter('$Date: 2011/08/05 12:59:17 $ - $Revision: 1.376 $');
|
||||
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user