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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2011-11-14 01:38:33 +01:00
commit 8cdbc2151c
13 changed files with 96 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dolibarr-doxygen-build.pl → build/doxygen/dolibarr-doxygen-build.pl
View File

@ -17,7 +17,7 @@ use Cwd;
my $dir = getcwd; my $dir = getcwd;
print "Current dir is: $dir\n"; print "Current dir is: $dir\n";
print "Running dir for doxygen must be: $DIR/doxygen\n"; print "Running dir for doxygen must be: $DIR\n";
if (! -s $CONFFILE) if (! -s $CONFFILE)
{ {

0
build/dolibarr-doxygen-filter.pl → build/doxygen/dolibarr-doxygen-filter.pl
View File

0
build/dolibarr-doxygen-getversion.pl → build/doxygen/dolibarr-doxygen-getversion.pl
View File

0
build/dolibarr-mysql2pgsql.pl → dev/initdata/dolibarr-mysql2pgsql.pl
View File

12
htdocs/comm/remx.php
View File

@ -32,6 +32,8 @@ $langs->load("orders");
$langs->load("bills"); $langs->load("bills");
$langs->load("companies"); $langs->load("companies");
$action=GETPOST('action');
// Security check // Security check
$socid = GETPOST("id"); $socid = GETPOST("id");
if ($user->societe_id > 0) if ($user->societe_id > 0)
@ -50,7 +52,7 @@ if (GETPOST('cancel') && GETPOST('backtopage'))
exit; exit;
} }
if (GETPOST("action") == 'confirm_split' && GETPOST("confirm") == 'yes') if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
{ {
//if ($user->rights->societe->creer) //if ($user->rights->societe->creer)
//if ($user->rights->facture->creer) //if ($user->rights->facture->creer)
@ -127,7 +129,7 @@ if (GETPOST("action") == 'confirm_split' && GETPOST("confirm") == 'yes')
} }
} }
if (GETPOST("action") == 'setremise') if ($action == 'setremise')
{ {
//if ($user->rights->societe->creer) //if ($user->rights->societe->creer)
//if ($user->rights->facture->creer) //if ($user->rights->facture->creer)
@ -145,13 +147,13 @@ if (GETPOST("action") == 'setremise')
{ {
$soc = new Societe($db); $soc = new Societe($db);
$soc->fetch($_GET["id"]); $soc->fetch($_GET["id"]);
$soc->set_remise_except($_POST["amount_ht"],$user,$_POST["desc"],$_POST["tva_tx"]); $discountid=$soc->set_remise_except($_POST["amount_ht"],$user,$_POST["desc"],$_POST["tva_tx"]);
if ($result > 0) if ($discountid > 0)
{ {
if (GETPOST("backtopage")) if (GETPOST("backtopage"))
{ {
Header("Location: ".GETPOST("backtopage")); Header("Location: ".GETPOST("backtopage").'&discountid='.$discountid);
exit; exit;
} }
else else

4
htdocs/compta/facture.php
View File

@ -2225,12 +2225,12 @@ else
// Remise dispo de type remise fixe (not credit note) // Remise dispo de type remise fixe (not credit note)
$filter='fk_facture_source IS NULL'; $filter='fk_facture_source IS NULL';
print '<br>'; print '<br>';
$form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer, ' ('.$addabsolutediscount.')'); $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, GETPOST('discountid'), 'remise_id', $soc->id, $absolute_discount, $filter, $resteapayer, ' ('.$addabsolutediscount.')');
} }
} }
else else
{ {
if ($absolute_creditnote > 0) // If not linke will be added later if ($absolute_creditnote > 0) // If not, link will be added later
{ {
if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' ('.$addabsolutediscount.')<br>'; if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' ('.$addabsolutediscount.')<br>';
else print '.'; else print '.';

10
htdocs/compta/facture/impayees.php
View File

@ -144,12 +144,12 @@ $formfile = new FormFile($db);
?> ?>
<script type="text/javascript"> <script type="text/javascript">
jQuery(document).ready(function() { $(document).ready(function() {
jQuery("#checkall").click(function() { $("#checkall").click(function() {
jQuery(".checkformerge").attr('checked', true); $(".checkformerge").attr('checked', true);
}); });
jQuery("#checknone").click(function() { $("#checknone").click(function() {
jQuery(".checkformerge").attr('checked', false); $(".checkformerge").attr('checked', false);
}); });
}); });
</script> </script>

19
htdocs/core/class/html.form.class.php
View File

@ -2703,14 +2703,14 @@ class Form
/** /**
* Show a select box with available absolute discounts * Show a select box with available absolute discounts
* *
* @param page Page URL where form is shown * @param string $page Page URL where form is shown
* @param selected Value pre-selected * @param int $selected Value pre-selected
* @param htmlname Nom du formulaire select. Si none, non modifiable * @param string $htmlname Nom du formulaire select. Si none, non modifiable
* @param socid Third party id * @param int $socid Third party id
* @param amount Total amount available * @param float $amount Total amount available
* @param filter SQL filter on discounts * @param string $filter SQL filter on discounts
* @param maxvalue Max value for lines that can be selected * @param int $maxvalue Max value for lines that can be selected
* @param more More string to add * @param string $more More string to add
* @return void * @return void
*/ */
function form_remise_dispo($page, $selected='', $htmlname='remise_id',$socid, $amount, $filter='', $maxvalue=0, $more='') function form_remise_dispo($page, $selected='', $htmlname='remise_id',$socid, $amount, $filter='', $maxvalue=0, $more='')
@ -2725,10 +2725,9 @@ class Form
print '<tr><td nowrap="nowrap">'; print '<tr><td nowrap="nowrap">';
if (! $filter || $filter=='fk_facture_source IS NULL') print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': '; if (! $filter || $filter=='fk_facture_source IS NULL') print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': '; else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
// print $langs->trans("AvailableGlobalDiscounts").': ';
$newfilter='fk_facture IS NULL AND fk_facture_line IS NULL'; // Remises disponibles $newfilter='fk_facture IS NULL AND fk_facture_line IS NULL'; // Remises disponibles
if ($filter) $newfilter.=' AND '.$filter; if ($filter) $newfilter.=' AND '.$filter;
$nbqualifiedlines=$this->select_remises('',$htmlname,$newfilter,$socid,$maxvalue); $nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
if ($nbqualifiedlines > 0) if ($nbqualifiedlines > 0)

22
htdocs/core/class/html.formfile.class.php
View File

@ -439,12 +439,17 @@ class FormFile
$file_list=dol_dir_list($filedir,'files',0,$filter,'\.meta$'.($png?'|'.$png:''),'date',SORT_DESC); $file_list=dol_dir_list($filedir,'files',0,$filter,'\.meta$'.($png?'|'.$png:''),'date',SORT_DESC);
// Affiche en-tete tableau si non deja affiche // Affiche en-tete tableau si non deja affiche
if (count($file_list) && ! $headershown && !$iconPDF) if (! empty($file_list) && ! $headershown && ! $iconPDF)
{ {
$headershown=1; $headershown=1;
$out.= '<div class="titre">'.$titletoshow.'</div>'; $out.= '<div class="titre">'.$titletoshow.'</div>';
$out.= '<table class="border" summary="listofdocumentstable" width="100%">'; $out.= '<table class="border" summary="listofdocumentstable" width="100%">';
} }
else if (empty($file_list) && ! empty($iconPDF))
{
// For ajax treatment
$out.= '<div id="gen_pdf_'.$filename.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
}
// Loop on each file found // Loop on each file found
foreach($file_list as $file) foreach($file_list as $file)
@ -474,12 +479,15 @@ class FormFile
{ {
$out.= img_pdf($file["name"],2); $out.= img_pdf($file["name"],2);
} }
$out.= '</a>'; $out.= '</a>'."\n";
if (!$iconPDF) $out.= '</td>'; if (! $iconPDF)
// Affiche taille fichier {
if (!$iconPDF) $out.= '<td align="right" nowrap="nowrap">'.dol_print_size(dol_filesize($filedir."/".$file["name"])).'</td>'; $out.= '</td>';
// Affiche date fichier // Show file size
if (!$iconPDF) $out.= '<td align="right" nowrap="nowrap">'.dol_print_date(dol_filemtime($filedir."/".$file["name"]),'dayhour').'</td>'; $out.= '<td align="right" nowrap="nowrap">'.dol_print_size(dol_filesize($filedir."/".$file["name"])).'</td>';
// Show file date
$out.= '<td align="right" nowrap="nowrap">'.dol_print_date(dol_filemtime($filedir."/".$file["name"]),'dayhour').'</td>';
}
if ($delallowed) if ($delallowed)
{ {

4
htdocs/core/lib/pdf.lib.php
View File

@ -752,11 +752,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
{ {
if ($idprod) if ($idprod)
{ {
if ( empty($hidedesc) ) $libelleproduitservice.=$desc; if ( empty($hidedesc) ) $libelleproduitservice.=dol_htmlentitiesbr($desc,1);
} }
else else
{ {
$libelleproduitservice.=$desc; $libelleproduitservice.=dol_htmlentitiesbr($desc,1);
} }
} }
} }

0
htdocs/langs/HOWTO-Translation.txt Executable file → Normal file
View File

2
htdocs/main.inc.php
View File

@ -73,7 +73,7 @@ if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* removed in PHP6
function test_sql_and_script_inject($val, $type) function test_sql_and_script_inject($val, $type)
{ {
$sql_inj = 0; $sql_inj = 0;
// For SQL Injection (onyl GET and POST are used to be included into bad escaped SQL requests) // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
if ($type != 2) if ($type != 2)
{ {
$sql_inj += preg_match('/delete[\s]+from/i', $val); $sql_inj += preg_match('/delete[\s]+from/i', $val);

29
htdocs/societe/class/societe.class.php
View File

@ -1217,17 +1217,18 @@ class Societe extends CommonObject
/** /**
* Add a discount for third party * Add a discount for third party
* @param remise Montant de la remise *
* @param user Utilisateur qui accorde la remise * @param float $remise Amount of discount
* @param desc Motif de l'avoir * @param User $user User adding discount
* @param tva_tx VAT rate * @param string $desc Reason of discount
* @return int <0 if KO, id or record if OK * @param float $tva_tx VAT rate
* @return int <0 if KO, id of discount record if OK
*/ */
function set_remise_except($remise, $user, $desc, $tva_tx=0) function set_remise_except($remise, $user, $desc, $tva_tx=0)
{ {
global $langs; global $langs;
// Nettoyage des parametres // Clean parameters
$remise = price2num($remise); $remise = price2num($remise);
$desc = trim($desc); $desc = trim($desc);
@ -1269,11 +1270,12 @@ class Societe extends CommonObject
} }
/** /**
* \brief Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe * Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
* \param user Filtre sur un user auteur des remises *
* \param filter Filtre autre * @param User $user Filtre sur un user auteur des remises
* \param maxvalue Filter on max value for discount * @param string $filter Filtre autre
* \return int <0 if KO, Credit note amount otherwise * @param string $maxvalue Filter on max value for discount
* @return int <0 if KO, Credit note amount otherwise
*/ */
function getAvailableDiscounts($user='',$filter='',$maxvalue=0) function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
{ {
@ -1294,6 +1296,7 @@ class Societe extends CommonObject
/** /**
* Return array of sales representatives * Return array of sales representatives
*
* @return array Array of sales representatives of third party * @return array Array of sales representatives of third party
*/ */
function getSalesRepresentatives($user='') function getSalesRepresentatives($user='')
@ -1331,8 +1334,8 @@ class Societe extends CommonObject
/** /**
* Set the price level * Set the price level
* *
* @param $price_level * @param int $price_level Level of price
* @param $user * @param User $user Use making change
*/ */
function set_price_level($price_level, $user) function set_price_level($price_level, $user)
{ {