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

Can define warehouse used by cachdesk module

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-26 01:57:05 +00:00
parent 2fb72e7258
commit 7a0aa1aceb
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5,6 +5,7 @@ English Dolibarr changelog
For users: For users:
- Sessions timeout can be configured to overwrite PHP setup. - Sessions timeout can be configured to overwrite PHP setup.
- Support bookmark add of product cards. - Support bookmark add of product cards.
- Enhancement in stock management.
- New view in ecm module. - New view in ecm module.
- Look enhancements for graphics (add transparency). - Look enhancements for graphics (add transparency).
- Added statistics report for supplier invoices. - Added statistics report for supplier invoices.
@ -13,13 +14,16 @@ For users:
- Add an export definition to export interventions. - Add an export definition to export interventions.
- Can set umask file permissions on Unix/Linux/BSD systems. - Can set umask file permissions on Unix/Linux/BSD systems.
- Miscelanous bug fixes. - Miscelanous bug fixes.
- A lot of enhancement to increase productivity.
For translators: For translators:
- The errors language file contains only error or warning messages with - The errors language file contains only error or warning messages with
prefix Error or Warning. prefix Error or Warning.
- HTML Output is by default in UTF8.
For developers: For developers:
- Update skeletons. - Update skeletons.
- Add an experimental Cash Desk module.
***** Changelog for 2.4 compared to 2.2 ***** ***** Changelog for 2.4 compared to 2.2 *****

11
htdocs/admin/cashdesk.php
View File

@ -39,7 +39,12 @@ $langs->load("cashdesk");
*/ */
if ($_POST["action"] == 'set') if ($_POST["action"] == 'set')
{ {
dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",$_POST["socid"]); if ($_POST["CASHDESK_ID_THIRDPARTY"] < 0) $_POST["CASHDESK_ID_THIRDPARTY"]='';
if ($_POST["CASHDESK_ID_WAREHOUSE"] < 0) $_POST["CASHDESK_ID_WAREHOUSE"]='';
dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",$_POST["CASHDESK_ID_THIRDPARTY"]);
dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",$_POST["CASHDESK_ID_WAREHOUSE"]);
dolibarr_syslog("admin/cashdesk: level ".$_POST["level"]); dolibarr_syslog("admin/cashdesk: level ".$_POST["level"]);
} }
@ -72,7 +77,7 @@ print "</tr>\n";
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>'; print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print $form->select_societes($conf->global->CASHDESK_ID_THIRDPARTY,'socid','',1); print $form->select_societes($conf->global->CASHDESK_ID_THIRDPARTY,'CASHDESK_ID_THIRDPARTY','',1);
print '</td></tr>'; print '</td></tr>';
if ($conf->global->MAIN_MODULE_BANQUE) if ($conf->global->MAIN_MODULE_BANQUE)
{ {
@ -88,7 +93,7 @@ if ($conf->global->MAIN_MODULE_STOCK)
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskIdWareHouse").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
$formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE'); $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1);
print '</td></tr>'; print '</td></tr>';
} }