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

Merge pull request #2663 from FHenry/develop

Browse Source 
fix bug #2652
This commit is contained in:
Laurent Destailleur 2015-04-18 23:06:19 +02:00
commit 5c80d46b74
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/askpricesupplier/card.php
View File

@ -1730,7 +1730,7 @@ if ($action == 'create')
/* /*
* Action presend * Action presend
*/ */
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if ($action == 'presend') if ($action == 'presend')

2
htdocs/comm/propal.php
View File

@ -2308,7 +2308,7 @@ if ($action == 'create')
* Action presend * Action presend
*/ */
//Select mail models is same action as presend //Select mail models is same action as presend
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if ($action == 'presend') if ($action == 'presend')

2
htdocs/compta/facture.php
View File

@ -3734,7 +3734,7 @@ if ($action == 'create')
print '<br>'; print '<br>';
//Select mail models is same action as presend //Select mail models is same action as presend
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if ($action != 'prerelance' && $action != 'presend') if ($action != 'prerelance' && $action != 'presend')

2
htdocs/compta/facture/mergepdftool.php
View File

@ -530,7 +530,7 @@ if ($resql)
print '<form id="form_unpaid" method="POST" action="'.$_SERVER["PHP_SELF"].'?sortfield='. $sortfield .'&sortorder='. $sortorder .'">'; print '<form id="form_unpaid" method="POST" action="'.$_SERVER["PHP_SELF"].'?sortfield='. $sortfield .'&sortorder='. $sortorder .'">';
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if (! empty($mode) && $action == 'presend') if (! empty($mode) && $action == 'presend')

2
htdocs/expedition/card.php
View File

@ -1514,7 +1514,7 @@ else if ($id || $ref)
* Action presend * Action presend
*/ */
//Select mail models is same action as presend //Select mail models is same action as presend
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if ($action == 'presend') if ($action == 'presend')

2
htdocs/fichinter/card.php
View File

@ -1732,7 +1732,7 @@ else if ($id > 0 || ! empty($ref))
/* /*
* Action presend * Action presend
*/ */
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if ($action == 'presend') if ($action == 'presend')

2
htdocs/fourn/commande/card.php
View File

@ -2246,7 +2246,7 @@ elseif (! empty($object->id))
/* /*
* Action presend * Action presend
*/ */
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if ($action == 'presend') if ($action == 'presend')

2
htdocs/fourn/facture/card.php
View File

@ -2499,7 +2499,7 @@ else
/* /*
* Show mail form * Show mail form
*/ */
if (!empty(GETPOST('modelselected'))) { if (GETPOST('modelselected')) {
$action = 'presend'; $action = 'presend';
} }
if ($action == 'presend') if ($action == 'presend')

2
htdocs/install/mysql/tables/llx_user.sql
View File

@ -52,7 +52,7 @@ create table llx_user
admin smallint DEFAULT 0, admin smallint DEFAULT 0,
module_comm smallint DEFAULT 1, module_comm smallint DEFAULT 1,
module_compta smallint DEFAULT 1, module_compta smallint DEFAULT 1,
fk_soc integer, fk_soc integer,
fk_socpeople integer, fk_socpeople integer,
fk_member integer, fk_member integer,
fk_user integer, -- Hierarchic parent fk_user integer, -- Hierarchic parent