diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 81896a12490..17921eabf3c 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
- print " ";
+ print ' ';
print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
@@ -107,7 +107,7 @@ if ($action == 'create')
/* ************************************************************************** */
if ($action == 'edit' && ! empty($attrname))
{
- print " ";
+ print ' ';
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 732504ed923..accdedc0141 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -94,7 +94,7 @@ if ($id > 0)
// Define variables to know what current user can do on properties of user linked to edited member
if ($object->user_id)
{
- // $ User is the user who edits, $ object->user_id is the id of the related user in the edited member
+ // $User is the user who edits, $object->user_id is the id of the related user in the edited member
$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
@@ -268,7 +268,7 @@ if (empty($reshook))
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
}
- // Test si le login existe deja
+ // Check if the login already exists
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
{
if (empty($login)) {
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 399a59b4687..7bc587bd67b 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -121,7 +121,7 @@ print "\n";
print '
'.$langs->trans("CashDeskThirdPartyForSell").'
';
print '
';
-print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3) AND s.status = 1',1,0,1,array(),0);
+print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3) AND s.status = 1', 1, 0, 0, array(), 0);
print '
';
if (! empty($conf->banque->enabled))
{
@@ -157,7 +157,8 @@ if (! empty($conf->stock->enabled))
if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
$res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
}
- print $langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch');
+ print $langs->trans("Yes").' ';
+ print ''.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'';
}
print '';
@@ -173,7 +174,7 @@ if (! empty($conf->stock->enabled))
}
else
{
- print $langs->trans("StockDecreaseForPointOfSaleDisabled");
+ print ''.$langs->trans("StockDecreaseForPointOfSaleDisabled").'';
}
print '';
}
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 11c86e53af3..6d446580353 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -1,4 +1,6 @@
* Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005-2009 Regis Houssin
@@ -28,6 +30,7 @@
*/
require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
$langs->loadLangs(array("cashcontrol","install","cashdesk","admin","banks"));
@@ -38,7 +41,10 @@ $action=GETPOST('action','aZ09');
$categid = GETPOST('categid');
$label = GETPOST("label");
-if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) or empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB)) setEventMessages($langs->trans("CashDesk")." - ".$langs->trans("NotConfigured"), null, 'errors');
+$now=dol_now();
+$syear = (GETPOSTISSET('closeyear')?GETPOST('closeyear', 'int'):dol_print_date($now, "%Y"));
+$smonth = (GETPOSTISSET('closemonth')?GETPOST('closemonth', 'int'):dol_print_date($now, "%m"));
+$sday = (GETPOSTISSET('closeday')?GETPOST('closeday', 'int'):dol_print_date($now, "%d"));
$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
@@ -78,6 +84,16 @@ $hookmanager->initHooks(array('cashcontrolcard','globalcard'));
* Actions
*/
+if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH))
+{
+ setEventMessages($langs->trans("CashDesk")." - ".$langs->trans("NotConfigured"), null, 'errors');
+}
+
+
+if (GETPOST('cancel'))
+{
+ $action = 'create';
+}
if ($action=="start")
{
$error=0;
@@ -102,13 +118,13 @@ if ($action=="start")
}
elseif ($action=="add")
{
- $error=0;
if (GETPOST('opening','alpha') == '')
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InitialBankBalance")), null, 'errors');
$action='start';
$error++;
}
+ $error=0;
foreach($arrayofpaymentmode as $key=>$val)
{
if (GETPOST($key,'alpha') == '')
@@ -133,9 +149,20 @@ elseif ($action=="add")
$object->posmodule=GETPOST('posmodule','alpha');
$object->posnumber=GETPOST('posnumber','alpha');
- $id=$object->create($user);
+ $db->begin();
- $action="view";
+ $id=$object->create($user);
+
+ if ($id > 0)
+ {
+ $db->commit();
+ $action="view";
+ }
+ else
+ {
+ $db->rollback;
+ $action="view";
+ }
}
}
@@ -171,16 +198,86 @@ if ($action=="create" || $action=="start")
$initialbalanceforterminal=array();
$theoricalamountforterminal=array();
- if (GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1')
+ if (GETPOST('posnumber','alpha') != '' && GETPOST('posnumber','alpha') != '' && GETPOST('posnumber','alpha') != '-1')
{
- // Calculate $initialbalanceforterminal and $theoricalamountforterminal for terminal 0
- // TODO
+ $posmodule = GETPOST('posmodule','alpha');
+ $terminalid = GETPOST('posnumber','alpha');
+
+ // Calculate $initialbalanceforterminal for terminal 0
+ foreach($arrayofpaymentmode as $key => $val)
+ {
+ if ($key != 'cash')
+ {
+ $initialbalanceforterminal[$terminalid][$key] = 0;
+ continue;
+ }
+
+ // Get the bank account dedicated to this point of sale module/terminal
+ $bankid = $conf->global->CASHDESK_ID_BANKACCOUNT_CASH; // This value is ok for 'Terminal 0' for module 'CashDesk' and 'TakePos' (they manage only 1 terminal)
+ // Hook to get the good bank id according to posmodule and posnumber.
+ // @TODO add hook here
+
+ $sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
+ $sql.= " WHERE fk_account = ".$bankid;
+ if ($syear && ! $smonth) $sql.= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
+ elseif ($syear && $smonth && ! $sday) $sql.= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
+ elseif ($syear && $smonth && $sday) $sql.= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
+ else dol_print_error('', 'Year not defined');
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $obj = $db->fetch_object($resql);
+ if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
+ }
+ else dol_print_error($db);
+ }
+
+ // Calculate $theoricalamountforterminal for terminal 0
+ foreach($arrayofpaymentmode as $key => $val)
+ {
+ /*$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
+ $sql.= " WHERE fk_account = ".$bankid;*/
+
+ $sql = "SELECT SUM(pf.amount) as total";
+ $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp";
+ $sql.= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement";
+ $sql.= " AND f.module_source = '".$db->escape($posmodule)."'";
+ $sql.= " AND f.pos_source = '".$db->escape($terminalid)."'";
+ $sql.= " AND f.paye = 1";
+ $sql.= " AND p.entity IN (".getEntity('facture').")";
+ if ($key == 'cash') $sql.=" AND cp.code = 'LIQ'";
+ elseif ($key == 'cheque') $sql.=" AND cp.code = 'CHQ'";
+ elseif ($key == 'card') $sql.=" AND cp.code = 'CB'";
+ else
+ {
+ dol_print_error('Value for key = '.$key.' not supported');
+ exit;
+ }
+ if ($syear && ! $smonth) $sql.= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
+ elseif ($syear && $smonth && ! $sday) $sql.= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, $smonth))."' AND '".$db->idate(dol_get_last_day($syear, $smonth))."'";
+ elseif ($syear && $smonth && $sday) $sql.= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+ else dol_print_error('', 'Year not defined');
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $theoricalamountforterminal[$terminalid][$key] = $initialbalanceforterminal[$terminalid][$key];
+
+ $obj = $db->fetch_object($resql);
+ if ($obj)
+ {
+ $theoricalamountforterminal[$terminalid][$key] = price2num($theoricalamountforterminal[$terminalid][$key] + $obj->total);
+ }
+ }
+ else dol_print_error($db);
+ }
}
print load_fiche_titre($langs->trans("CashControl")." - ".$langs->trans("New"), '', 'title_bank.png');
print '