-
-
-
-
-
-
diff --git a/doc/images/background_dolibarr.jpg b/doc/images/background_dolibarr.jpg
new file mode 100644
index 00000000000..6c4cc11460d
Binary files /dev/null and b/doc/images/background_dolibarr.jpg differ
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index f735a0a0cfc..cf00519e9d7 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -161,7 +161,7 @@ if (empty($reshook))
if ($action == 'disable') {
if ($accounting->fetch($id)) {
$mode = GETPOST('mode', 'int');
- $result = $accounting->account_desactivate($id, $mode);
+ $result = $accounting->accountDeactivate($id, $mode);
}
$action = 'update';
@@ -488,11 +488,11 @@ if ($resql)
// Action
print '
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-| fds fs df sdf gdsfgsdf r | -- - | -
| - | - - |
-
-
-
-
-
-
-'; @@ -412,7 +411,7 @@ if ($result) //print '
'.$buttonsave.'
';
$texte = $langs->trans("ListOfProductsServices");
- print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $buttonsave, $num, $nbtotalofrecords, '', 0, '', '', $limit);
+ print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $buttonsave, $num, $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
print '';
print '';
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index b2a25b00ce2..4de2be6fcbb 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -55,7 +55,7 @@ $pagenext = $page + 1;
//if (! $sortfield) $sortfield="p.date_fin";
//if (! $sortorder) $sortorder="DESC";
-
+$show_subgroup = GETPOST('show_subgroup', 'alpha');
$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
$search_date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
@@ -130,10 +130,11 @@ if (!empty($search_accountancy_code_end)) {
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{
- $search_accountancy_code_start = '';
- $search_accountancy_code_end = '';
+ $show_subgroup = '';
$search_date_start = '';
$search_date_end = '';
+ $search_accountancy_code_start = '';
+ $search_accountancy_code_end = '';
$filter = array();
}
@@ -223,6 +224,12 @@ if ($action != 'export_csv')
$moreforfilter .= $form->selectDate($search_date_start ? $search_date_start : -1, 'date_start', 0, 0, 1, '', 1, 0);
$moreforfilter .= $langs->trans('DateEnd').': ';
$moreforfilter .= $form->selectDate($search_date_end ? $search_date_end : -1, 'date_end', 0, 0, 1, '', 1, 0);
+
+ $moreforfilter .= ' - ';
+ $moreforfilter .= $langs->trans('ShowSubtotalByGroup').': ';
+ $moreforfilter .= '';
+
+
$moreforfilter .= '';
if (!empty($moreforfilter)) {
@@ -289,26 +296,31 @@ if ($action != 'export_csv')
}
print '
";
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 065a72a5257..2889fbf4ef1 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1006,7 +1006,7 @@ while ($i < min($num, $limit))
// Amount debit
if (!empty($arrayfields['t.debit']['checked']))
{
- print ''.($line->debit ? price($line->debit) : '').' ';
+ print ''.($line->debit != 0 ? price($line->debit) : '').' ';
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
$totalarray['val']['totaldebit'] += $line->debit;
@@ -1015,7 +1015,7 @@ while ($i < min($num, $limit))
// Amount credit
if (!empty($arrayfields['t.credit']['checked']))
{
- print ''.($line->credit ? price($line->credit) : '').' ';
+ print ''.($line->credit != 0 ? price($line->credit) : '').' ';
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
$totalarray['val']['totalcredit'] += $line->credit;
@@ -1039,7 +1039,7 @@ while ($i < min($num, $limit))
}
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 78f29e97595..25f664d955e 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -57,6 +57,12 @@ $search_direction = GETPOST('search_direction', 'alpha');
$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
$search_debit = GETPOST('search_debit', 'alpha');
$search_credit = GETPOST('search_credit', 'alpha');
+$search_lettering_code = GETPOST('search_lettering_code', 'alpha');
+$search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
+
+if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
+ $action = 'delbookkeepingyear';
+}
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
@@ -70,6 +76,13 @@ $pagenext = $page + 1;
if ($sortorder == "") $sortorder = "ASC";
if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$object = new BookKeeping($db);
+$hookmanager->initHooks(array('bookkeepingbyaccountlist'));
+
+$formaccounting = new FormAccounting($db);
+$form = new Form($db);
+
if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search_date_startday') && GETPOSTISSET('search_date_startmonth') && GETPOSTISSET('search_date_starthour')) {
$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
@@ -96,89 +109,167 @@ if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search
}
}
-$object = new BookKeeping($db);
+$arrayfields = array(
+ // 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
+ 't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
+ 't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+ 't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
+ 't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
+ 't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+ 't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
+ 't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
+ 't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+);
+
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
/*
* Action
*/
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
{
- $search_doc_date = '';
- $search_accountancy_code = '';
- $search_accountancy_code_start = '';
- $search_accountancy_code_end = '';
- $search_label_account = '';
- $search_doc_ref = '';
- $search_label_operation = '';
- $search_direction = '';
- $search_ledger_code = '';
- $search_date_start = '';
- $search_date_end = '';
- $search_date_startyear = '';
- $search_date_startmonth = '';
- $search_date_startday = '';
- $search_date_endyear = '';
- $search_date_endmonth = '';
- $search_date_endday = '';
- $search_debit = '';
- $search_credit = '';
+ include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+ {
+ $search_doc_date = '';
+ $search_accountancy_code = '';
+ $search_accountancy_code_start = '';
+ $search_accountancy_code_end = '';
+ $search_label_account = '';
+ $search_doc_ref = '';
+ $search_label_operation = '';
+ $search_direction = '';
+ $search_ledger_code = '';
+ $search_date_start = '';
+ $search_date_end = '';
+ $search_date_startyear = '';
+ $search_date_startmonth = '';
+ $search_date_startday = '';
+ $search_date_endyear = '';
+ $search_date_endmonth = '';
+ $search_date_endday = '';
+ $search_debit = '';
+ $search_credit = '';
+ $search_lettering_code = '';
+ $search_not_reconciled = '';
+ }
+
+ // Must be after the remove filter action, before the export.
+ $param = '';
+ $filter = array();
+
+ if (!empty($search_date_start)) {
+ $filter['t.doc_date>='] = $search_date_start;
+ $param .= '&search_date_startmonth=' . GETPOST('search_date_startmonth', 'int') . '&search_date_startday=' . GETPOST('search_date_startday', 'int') . '&search_date_startyear=' . GETPOST('search_date_startyear', 'int');
+ }
+ if (!empty($search_date_end)) {
+ $filter['t.doc_date<='] = $search_date_end;
+ $param .= '&search_date_endmonth=' . GETPOST('search_date_endmonth', 'int') . '&search_date_endday=' . GETPOST('search_date_endday', 'int') . '&search_date_endyear=' . GETPOST('search_date_endyear', 'int');
+ }
+ if (!empty($search_doc_date)) {
+ $filter['t.doc_date'] = $search_doc_date;
+ $param .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+ }
+ if (!empty($search_accountancy_code_start)) {
+ $filter['t.numero_compte>='] = $search_accountancy_code_start;
+ $param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+ }
+ if (!empty($search_accountancy_code_end)) {
+ $filter['t.numero_compte<='] = $search_accountancy_code_end;
+ $param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+ }
+ if (!empty($search_label_account)) {
+ $filter['t.label_compte'] = $search_label_account;
+ $param .= '&search_label_compte=' . urlencode($search_label_account);
+ }
+ if (!empty($search_doc_ref)) {
+ $filter['t.doc_ref'] = $search_doc_ref;
+ $param .= '&search_doc_ref=' . urlencode($search_doc_ref);
+ }
+ if (!empty($search_label_operation)) {
+ $filter['t.label_operation'] = $search_label_operation;
+ $param .= '&search_label_operation=' . urlencode($search_label_operation);
+ }
+ if (!empty($search_direction)) {
+ $filter['t.sens'] = $search_direction;
+ $param .= '&search_direction=' . urlencode($search_direction);
+ }
+ if (!empty($search_ledger_code)) {
+ $filter['t.code_journal'] = $search_ledger_code;
+ $param .= '&search_ledger_code=' . urlencode($search_ledger_code);
+ }
+ if (!empty($search_debit)) {
+ $filter['t.debit'] = $search_debit;
+ $param .= '&search_debit=' . urlencode($search_debit);
+ }
+ if (!empty($search_credit)) {
+ $filter['t.credit'] = $search_credit;
+ $param .= '&search_credit=' . urlencode($search_credit);
+ }
+ if (!empty($search_lettering_code)) {
+ $filter['t.lettering_code'] = $search_lettering_code;
+ $param .= '&search_lettering_code='.urlencode($search_lettering_code);
+ }
+ if (!empty($search_not_reconciled)) {
+ $filter['t.reconciled_option'] = $search_not_reconciled;
+ $param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
+ }
}
-// Must be after the remove filter action, before the export.
-$param = '';
-$filter = array();
+if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
+ $import_key = GETPOST('importkey', 'alpha');
-if (!empty($search_date_start)) {
- $filter['t.doc_date>='] = $search_date_start;
- $param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
-}
-if (!empty($search_date_end)) {
- $filter['t.doc_date<='] = $search_date_end;
- $param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
-}
-if (!empty($search_doc_date)) {
- $filter['t.doc_date'] = $search_doc_date;
- $param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
-}
-if (!empty($search_accountancy_code_start)) {
- $filter['t.numero_compte>='] = $search_accountancy_code_start;
- $param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
-}
-if (!empty($search_accountancy_code_end)) {
- $filter['t.numero_compte<='] = $search_accountancy_code_end;
- $param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
-}
-if (!empty($search_label_account)) {
- $filter['t.label_compte'] = $search_label_account;
- $param .= '&search_label_compte='.urlencode($search_label_account);
-}
-if (!empty($search_doc_ref)) {
- $filter['t.doc_ref'] = $search_doc_ref;
- $param .= '&search_doc_ref='.urlencode($search_doc_ref);
-}
-if (!empty($search_label_operation)) {
- $filter['t.label_operation'] = $search_label_operation;
- $param .= '&search_label_operation='.urlencode($search_label_operation);
-}
-if (!empty($search_direction)) {
- $filter['t.sens'] = $search_direction;
- $param .= '&search_direction='.urlencode($search_direction);
-}
-if (!empty($search_ledger_code)) {
- $filter['t.code_journal'] = $search_ledger_code;
- $param .= '&search_ledger_code='.urlencode($search_ledger_code);
-}
-if (!empty($search_debit)) {
- $filter['t.debit'] = $search_debit;
- $param .= '&search_debit='.urlencode($search_debit);
-}
-if (!empty($search_credit)) {
- $filter['t.credit'] = $search_credit;
- $param .= '&search_credit='.urlencode($search_credit);
-}
+ if (!empty($import_key)) {
+ $result = $object->deleteByImportkey($import_key);
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ // Make a redirect to avoid to launch the delete later after a back button
+ header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+ exit;
+ }
+}
+if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
+ $delmonth = GETPOST('delmonth', 'int');
+ $delyear = GETPOST('delyear', 'int');
+ if ($delyear == -1) {
+ $delyear = 0;
+ }
+ $deljournal = GETPOST('deljournal', 'alpha');
+ if ($deljournal == -1) {
+ $deljournal = 0;
+ }
-if ($action == 'delmouvconfirm') {
+ if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
+ {
+ $result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ else
+ {
+ setEventMessages("RecordDeleted", null, 'mesgs');
+ }
+
+ // Make a redirect to avoid to launch the delete later after a back button
+ header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+ exit;
+ }
+ else
+ {
+ setEventMessages("NoRecordDeleted", null, 'warnings');
+ }
+}
+if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->supprimer) {
$mvt_num = GETPOST('mvt_num', 'int');
if (!empty($mvt_num)) {
@@ -186,8 +277,13 @@ if ($action == 'delmouvconfirm') {
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
- Header("Location: listbyaccount.php");
- exit();
+ else
+ {
+ setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+ }
+
+ header("Location: listbyaccount.php?noreset=1".($param ? '&'.$param : ''));
+ exit;
}
}
@@ -229,22 +325,42 @@ if ($action == 'delmouv') {
}
if ($action == 'delbookkeepingyear') {
$form_question = array();
- $delyear = GETPOST('delyear');
+ $delyear = GETPOST('delyear', 'int');
+ $deljournal = GETPOST('deljournal', 'alpha');
if (empty($delyear)) {
$delyear = dol_print_date(dol_now(), '%Y');
}
+ $month_array = array();
+ for ($i = 1; $i <= 12; $i++) {
+ $month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
+ }
$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+ $journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
+ $form_question['delmonth'] = array(
+ 'name' => 'delmonth',
+ 'type' => 'select',
+ 'label' => $langs->trans('DelMonth'),
+ 'values' => $month_array,
+ 'default' => ''
+ );
$form_question['delyear'] = array(
- 'name' => 'delyear',
- 'type' => 'select',
- 'label' => $langs->trans('DelYear'),
- 'values' => $year_array,
- 'default' => $delyear
+ 'name' => 'delyear',
+ 'type' => 'select',
+ 'label' => $langs->trans('DelYear'),
+ 'values' => $year_array,
+ 'default' => $delyear
+ );
+ $form_question['deljournal'] = array(
+ 'name' => 'deljournal',
+ 'type' => 'other', // We don't use select here, the journal_array is already a select html component
+ 'label' => $langs->trans('DelJournal'),
+ 'value' => $journal_array,
+ 'default' => $deljournal
);
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1, 250);
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
print $formconfirm;
}
@@ -267,53 +383,115 @@ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($l
print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit);
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
// Reverse sort order
if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
else $sortorder = "desc";
-print '
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_credit - $sous_total_debit)).' | '; - print "\n"; + // Show accounting account + if (empty($displayed_account) || $root_account_description != $displayed_account) { + // Show subtotal per accounting account + if ($displayed_account != "") { + print ' | |||
| '.$langs->trans("SubTotal").': | '; + print ''.price($sous_total_debit).' | '; + print ''.price($sous_total_credit).' | '; + print ''.price(price2num($sous_total_credit - $sous_total_debit)).' | '; + print "\n"; + print ' | |||
| '.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').' | '; print '|||||||
| '.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').' | '; - print ''.length_accountg($line->numero_compte).' | '; @@ -326,12 +338,15 @@ if ($action != 'export_csv') $sous_total_credit += $line->credit; } - print '||||||
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_debit - $sous_total_credit)).' | '; - print "\n"; - print ' | |||
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_debit - $sous_total_credit)).' | '; + print "\n"; + print ' | |||
| '.$langs->trans("AccountBalance").': | '.price($total_debit).' | '.price($total_credit).' | '.price(price2num($total_debit - $total_credit)).' | '; - print "\n"; + print " | \n"; print ' | ||
';
-print '';
+$moreforfilter = '';
-print '
';
dol_fiche_end();
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 7a436c5a363..c8c082db6ae 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -128,7 +128,7 @@ print '';
-//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // By default, country of localization
+print img_picto('', 'globe-americas', 'class="paddingrightonly"');
print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
print '
| ';
-print ' ';
-print $langs->trans('From').' ';
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
+// Accountancy account
+$moreforfilter .= ' ';
+$moreforfilter .= $langs->trans('AccountAccounting').': ';
+$moreforfilter .= ' ';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+print '';
+$moreforfilter .= $langs->trans('From').' ';
+$moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
+$moreforfilter .= $langs->trans('to').' ';
+$moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
+$moreforfilter .= ' ';
+$moreforfilter .= '';
+print $moreforfilter;
print ' ';
-print '';
-print $langs->trans('to').' ';
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
-print ' ';
-print ' | ';
-print ''; + +print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; +} +// Date document +if (!empty($arrayfields['t.doc_date']['checked'])) { + print ' | ';
+ print ' ';
+ print $langs->trans('From') . ': ';
+ print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
+ print ' ';
+ print '';
+ print $langs->trans('to') . ': ';
+ print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1);
+ print ' ';
+ print ' | ';
+}
+// Movement number
+if (!empty($arrayfields['t.piece_num']['checked']))
+{
+ print ''; +} +// Ref document +if (!empty($arrayfields['t.doc_ref']['checked'])) { + print ' | '; +} +// Label operation +if (!empty($arrayfields['t.label_operation']['checked'])) { + print ' | '; +} +// Debit +if (!empty($arrayfields['t.debit']['checked'])) { + print ' | '; +} +// Credit +if (!empty($arrayfields['t.credit']['checked'])) { + print ' | '; +} +// Lettering code +if (!empty($arrayfields['t.lettering_code']['checked'])) +{ + print ' | ';
+ print '';
+ print ' '.$langs->trans("NotReconciled").''; + print ' | ';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Action column
print '';
-print $langs->trans('From').': ';
-print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
-print ' '; -print $langs->trans('to').': '; -print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1); -print ' | ';
-print ''; -print ' | '; -print ' | '; -print ' | '; -print ' | '; -print ' | '; -$searchpicto = $form->showFilterAndCheckAddButtons(0); +$searchpicto = $form->showFilterButtons(); print $searchpicto; print ' | '; -print '||||||
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '; - print "\n"; - print " | \n"; + print ' | ||||||||||||||||
| '.$langs->trans("TotalForAccount").' '.length_accountg($displayed_account_number).': | '; + print ''.price($sous_total_debit).' | '; + print ''.price($sous_total_credit).' | '; + print ''; + print ' | |||||||||||||||||
| '.$langs->trans("Balance").': | '; + if ($balance > 0 ) + { + print ''; + print price($sous_total_debit - $sous_total_credit); + print ' | '; + print ''; + } + else + { + print ' | '; + print ' | '; + print price($sous_total_credit - $sous_total_debit); + print ' | '; + } + print ''; print ' | |||||||||||||||
| '; + print ' | '; if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte); else print ''.$langs->trans("Unknown").''; print ' | '; @@ -357,72 +561,212 @@ while ($i < min($num, $limit)) //if (empty($displayed_account_number)) $displayed_account_number='-'; $sous_total_debit = 0; $sous_total_credit = 0; + + $colspan = 0; } print '|||||||||||||||||||
| '; - print ' | '.$line->piece_num.' | '; - print ''.dol_print_date($line->doc_date, 'day').' | '; - // TODO Add a link according to doc_type and fk_doc - print ''; - //if ($line->doc_type == 'supplier_invoice') - //if ($line->doc_type == 'customer_invoice') - print $line->doc_ref; + // Journal code + if (!empty($arrayfields['t.code_journal']['checked'])) + { + $accountingjournal = new AccountingJournal($db); + $result = $accountingjournal->fetch('', $line->code_journal); + $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal); + print ' | '.$journaltoshow.' | '; + if (!$i) $totalarray['nbfield']++; + } + + // Document date + if (!empty($arrayfields['t.doc_date']['checked'])) + { + print ''.dol_print_date($line->doc_date, 'day').' | '; + if (!$i) $totalarray['nbfield']++; + } + + // Piece number + if (!empty($arrayfields['t.piece_num']['checked'])) + { + print ''; + $object->id = $line->id; + $object->piece_num = $line->piece_num; + print $object->getNomUrl(1, '', 0, '', 1); + print ' | '; + if (!$i) $totalarray['nbfield']++; + } + + // Document ref + if (!empty($arrayfields['t.doc_ref']['checked'])) + { + if ($line->doc_type == 'customer_invoice') + { + $langs->loadLangs(array('bills')); + + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + $objectstatic = new Facture($db); + $objectstatic->fetch($line->fk_doc); + //$modulepart = 'facture'; + + $filename = dol_sanitizeFileName($line->doc_ref); + $filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref); + $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id; + $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); + } + elseif ($line->doc_type == 'supplier_invoice') + { + $langs->loadLangs(array('bills')); + + require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; + $objectstatic = new FactureFournisseur($db); + $objectstatic->fetch($line->fk_doc); + //$modulepart = 'invoice_supplier'; + + $filename = dol_sanitizeFileName($line->doc_ref); + $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref); + $subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref); + $documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir); + } + elseif ($line->doc_type == 'expense_report') + { + $langs->loadLangs(array('trips')); + + require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; + $objectstatic = new ExpenseReport($db); + $objectstatic->fetch($line->fk_doc); + //$modulepart = 'expensereport'; + + $filename = dol_sanitizeFileName($line->doc_ref); + $filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref); + $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id; + $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); + } + else + { + // Other type + } + + print '';
+
+ print '
| \n";
+ if (!$i) $totalarray['nbfield']++;
+ }
+
+ // Label operation
+ if (!empty($arrayfields['t.label_operation']['checked'])) {
+ // Affiche un lien vers la facture client/fournisseur
+ $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
+ print strlen(length_accounta($line->subledger_account)) == 0 ? '' . $line->label_operation . ' | ' : '' . $line->label_operation . ' (' . length_accounta($line->subledger_account) . ') | ';
+ if (!$i) $totalarray['nbfield']++;
+ }
+
+ // Amount debit
+ if (!empty($arrayfields['t.debit']['checked']))
+ {
+ print ''.($line->debit ? price($line->debit) : '').' | '; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit'; + $totalarray['val']['totaldebit'] += $line->debit; + } + + // Amount credit + if (!empty($arrayfields['t.credit']['checked'])) { + print '' . ($line->credit ? price($line->credit) : '') . ' | '; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit'; + $totalarray['val']['totalcredit'] += $line->credit; + } + + // Lettering code + if (!empty($arrayfields['t.lettering_code']['checked'])) + { + print ''.$line->lettering_code.' | '; + if (!$i) $totalarray['nbfield']++; + } + + // Fields from hook + $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj); + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + + // Action column + print ''; + if (empty($line->date_export)) { + if ($user->rights->accounting->mouvements->creer) { + print ''.img_edit().''; + } + if ($user->rights->accounting->mouvements->supprimer) { + print ' '.img_delete().''; + } + } print ' | '; - - // Affiche un lien vers la facture client/fournisseur - $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref); - print strlen(length_accounta($line->subledger_account)) == 0 ? ''.$line->label_operation.' | ' : ''.$line->label_operation.' ('.length_accounta($line->subledger_account).') | ';
-
-
- print ''.($line->debit ? price($line->debit) : '').' | '; - print ''.($line->credit ? price($line->credit) : '').' | '; - - $accountingjournal = new AccountingJournal($db); - $result = $accountingjournal->fetch('', $line->code_journal); - $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal); - print ''.$journaltoshow.' | '; - - print ''; - print ''.img_edit().' '; - print ''.img_delete().''; - print ' | '; - print "|
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '; -print ''; -print price($sous_total_debit - $sous_total_credit); -print ' | '; -print ''; +print ' | '.$langs->trans("TotalForAccount").' '.$accountg.': | '; +print ''.price($sous_total_debit).' | '; +print ''.price($sous_total_credit).' | '; +print ''; +print ' | ||||||||||||
| '.$langs->trans("Balance").': | '; +if ($balance > 0 ) +{ + print ''; + print price($sous_total_debit - $sous_total_credit); + print ' | '; + print ''; +} +else +{ + print ' | '; + print ' | '; + print price($sous_total_credit - $sous_total_debit); + print ' | '; +} +print ''; print ' | |||||||||||||||
| '.$langs->trans("Total").': | '; -print ''; -print price($total_debit); -print ' | '; -print ''; -print price($total_credit); -print ' | '; -print ''; -print ' | '; -print ' | ||||||||||||||||
'."\n";
+ print ''.$langs->trans("DeleteMvt").'';
+ print '
';
+}
+
print '';
// End of page
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 1e641564de4..3bf41e6326f 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -5,11 +5,12 @@
* Copyright (C) 2015 Florian Henry | '; + print ' | '; print ' | '; print ' | '; if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) { @@ -310,8 +318,9 @@ if ($result) { print ' | '; print ' | '; print ' | '; + print ' | '; print ' | '; - print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth200', 'code2', 1, 0, 1); + print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1); //print ''; print ' | '; print ''; @@ -330,6 +339,7 @@ if ($result) { print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, '', $sortfield, $sortorder, 'right '); print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder); @@ -337,6 +347,7 @@ if ($result) { print_liste_field_titre($clickpicto, '', '', '', '', '', '', '', 'center '); print " | ';
if ($product_static->id > 0) print $product_static->getNomUrl(1);
if ($product_static->id > 0 && $objp->product_label) print ' '; - if ($objp->product_label) print $objp->product_label; + if ($objp->product_label) print ''.$objp->product_label.''; print ' | ';
print ''; @@ -380,6 +402,9 @@ if ($result) { print ' | '.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).' | '; + // Thirdparty + print '' . $thirdpartystatic->getNomUrl(1, 'customer') . ' | '; + // Country print '';
if ($objp->country_code)
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 9dbb846370c..1d93a0fea17 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2013-2019 Alexandre Spangaro | ';
+ print ' | ';
print ' | ';
print ' | ';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
@@ -377,6 +384,7 @@ if ($result) {
print ' | ';
print ' | ';
print ' | ';
+ print ' | ';
print ' | ';
print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
//print '';
@@ -399,6 +407,7 @@ if ($result) {
print_liste_field_titre("ProductDescription", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
@@ -408,6 +417,7 @@ if ($result) {
print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
print " | | ';
+ // Thirdparty
+ print '' . $thirdpartystatic->getNomUrl(1, 'customer') . ' | '; + // Country print ''; $labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label; @@ -567,12 +591,12 @@ if ($result) { print ' | '.$objp->tva_intra.' | '; // Found accounts - print ''; + print ' | '; $s = ''.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': '; $shelp = ''; if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC"); elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport"); - $s .= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("NotDefined")); + $s .= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : ''.$langs->trans("NotDefined").''); print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1); if ($objp->product_id > 0) { @@ -583,7 +607,7 @@ if ($result) { elseif ($suggestedaccountingaccountfor == 'eecwithvat') $shelp = $langs->trans("SaleEECWithVAT"); elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $shelp = $langs->trans("SaleEECWithoutVATNumber"); elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport"); - $s .= (empty($objp->code_sell_p) ? $langs->trans("NotDefined") : length_accountg($objp->code_sell_p)); + $s .= (empty($objp->code_sell_p) ? ''.$langs->trans("NotDefined").'' : length_accountg($objp->code_sell_p)); print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1); } print ' | '; diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index 8cc398a00bf..4cd51fb3a63 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -252,6 +252,9 @@ if ($result) { print '
| '; print ' | '; + if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) { + print ' | '; + } print ' | '; if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; @@ -272,7 +275,10 @@ if ($result) { print ' | ||||||
| '.$expensereport_static->getNomUrl(1).' | '; + // Date validation + if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) { + print ''.dol_print_date($db->jdate($objp->date_valid), 'day').' | '; + } + print ''.dol_print_date($db->jdate($objp->date), 'day').' | '; print ''.($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))).' | '; diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index e03c717039f..96eebd49b36 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -42,6 +42,9 @@ $massaction = GETPOST('massaction', 'alpha'); $show_files = GETPOST('show_files', 'int'); $confirm = GETPOST('confirm', 'alpha'); $toselect = GETPOST('toselect', 'array'); +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search +$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') + // Select Box $mesCasesCochees = GETPOST('toselect', 'array'); @@ -183,7 +186,7 @@ if (empty($chartaccountcode)) } // Expense report lines -$sql = "SELECT er.ref, er.rowid as erid, er.date_debut,"; +$sql = "SELECT er.ref, er.rowid as erid, er.date_debut, er.date_valid,"; $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,"; $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,"; $sql .= " aa.rowid as aarowid"; @@ -240,8 +243,8 @@ if ($result) { $arrayofselected = is_array($toselect) ? $toselect : array(); $param = ''; - if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage; - if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit; + if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage); + if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit); if ($search_lineid) $param .= '&search_lineid='.urlencode($search_lineid); if ($search_day) $param .= '&search_day='.urlencode($search_day); if ($search_month) $param .= '&search_month='.urlencode($search_month); @@ -288,6 +291,9 @@ if ($result) { print '||||||
| '; print ' | '; + if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) { + print ' | '; + } print ' | '; if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; @@ -308,7 +314,10 @@ if ($result) { print ' | ||||||
| '.$expensereport_static->getNomUrl(1).' | '; + // Date validation + if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) { + print ''.dol_print_date($db->jdate($objp->date_valid), 'day').' | '; + } + // Date print ''.dol_print_date($db->jdate($objp->date), 'day').' | '; diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index bc0cf66a938..56cf674505b 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -88,7 +88,7 @@ if ($conf->accounting->enabled) } - print load_fiche_titre($langs->trans("AccountancyArea"), $resultboxes['selectboxlist'], 'accountancy', 0, '', '', $showtutorial); + print load_fiche_titre($langs->trans("AccountancyArea"), $resultboxes['selectboxlist'], 'title_accountancy', 0, '', '', $showtutorial); print '
'; // Sales taxes (VAT, IRPF, ...) -print load_fiche_titre($langs->trans("TypeOfSaleTaxes")); +print load_fiche_titre($langs->trans("TypeOfSaleTaxes"), '', 'object_payment'); print '
| '."\n"; +print ' | '."\n"; +print $form->selectyesno('ACCOUNTING_REPORTS_INCLUDE_VARPAY', (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY))); +print ' |
| '."\n"; +print ' | '."\n"; +print $form->selectyesno('ACCOUNTING_REPORTS_INCLUDE_LOAN', (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN))); +print ' |
'; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 59ac87a2c56..bc22a2020fb 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -208,7 +208,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity) { print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; } -print getTitleFieldOfList("Action", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center '); +print getTitleFieldOfList("", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center '); print "\n"; @@ -328,10 +328,10 @@ if ($conf->use_javascript_ajax) { print '
'; print '
';
- print '';
+ print '';
print '
';
print '';
- print '';
+ print '';
print '
';
}
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7d12ffca433..15cfd9ed9db 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -503,7 +503,7 @@ $tabhelp[33] = array('code'=>$langs->trans("EnterAnyCode"));
$tabhelp[34] = array('code'=>$langs->trans("EnterAnyCode"));
$tabhelp[35] = array();
$tabhelp[36] = array('range_ik'=>$langs->trans('PrevRangeToThisRange'));
-$tabhelp[37] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[37] = array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('MeasuringUnitTypeDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'));
$tabhelp[38] = array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'));
// List of check for fields (NOT USED YET)
@@ -1718,7 +1718,7 @@ if ($id)
print "";
// Modify link
- if ($canbemodified) print ''.$cat->name->language[$this->lang - 1].' '.$cat->nb_products_recursive.'
'; - $html .= self::get_categories($cat->id); - $html .= "description->language[$this->lang - 1])).'">'.$cat->name->language[$this->lang - 1].' '.$cat->nb_products_recursive.'
'; + $html .= self::get_categories($cat->id); + $html .= "
';
}
@@ -308,16 +303,16 @@ class Dolistore
//.'//output template - $html .= '
'.$newapp.$images.'
'.$product->name->language[$this->lang - 1]
.'
'.$version.'
- '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.''.$product->description_short->language[$this->lang - 1].'
'.$product->description_short->language[$this->lang - 1].''; + // do not load if display none + //$html .= ''; + $html .= '
'.$langs->trans($desc).''; } @@ -206,14 +206,14 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra { global $langs, $conf, $db, $inputCount; - $inputCount = empty($inputCount)?1:($inputCount+1); - $form=new Form($db); + $inputCount = empty($inputCount) ? 1 : ($inputCount + 1); + $form = new Form($db); $defaultMetas = array( 'name' => 'value'.$inputCount ); - if ($type!='textarea') { + if ($type != 'textarea') { $defaultMetas['type'] = 'text'; $defaultMetas['value'] = $conf->global->{$confkey}; } @@ -229,9 +229,9 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra print '
';
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 1a55fbc04ee..1a27d61e55d 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -67,12 +67,12 @@ if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
}
}
-print '';
-print $langs->trans("SetupDescription1");
+print '';
print "
"; +print ''; print '
'; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index d828873be36..0646c7f6d46 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -209,6 +209,8 @@ else // Show examples print load_fiche_titre($langs->trans("ExamplesWithCurrentSetup"), '', ''); + print ''.$langs->trans("Format").': '.price(price2num(1234.56789, 'MT'), 0, $langs, 1, -1, -1, $currencycode)."
\n"; + // Always show vat rates with vat 0 $s = 2 / 7; $qty = 1; $vat = 0; $tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc); diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index f2d27cf2849..37d1f903b4a 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -536,7 +536,7 @@ $errors = $hookmanager->errors; // Line to enter new values (input fields) -print "";
+print ' ';
if (empty($reshook))
{
@@ -754,9 +754,9 @@ if ($resql)
print '';
print '';
print '';
- print '';
+ print '';
print '';
- print '';
+ print '';
print ' ';
$fieldsforcontent = array('topic', 'joinfiles', 'content');
@@ -902,10 +902,10 @@ if ($resql)
// Modify link / Delete link
print '';
- if ($canbemodified) print ''.img_edit().'';
+ if ($canbemodified) print ''.img_edit().'';
if ($iserasable)
{
- print ' '.img_delete().'';
+ print ''.img_delete().'';
//else print ''.img_delete().''; // Some dictionary can be edited by other profile than admin
}
print ' ';
@@ -976,12 +976,9 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
{
global $conf, $langs, $user, $db;
global $form;
- global $region_id;
- global $elementList, $sourceList, $localtax_typeList;
- global $bc;
+ global $elementList, $sourceList;
$formadmin = new FormAdmin($db);
- $formcompany = new FormCompany($db);
foreach ($fieldlist as $field => $value)
{
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index cc83e019833..97f0246ac88 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -277,8 +277,8 @@ print '';
print '';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 99643401386..ba92aa1ec21 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -34,10 +34,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Noti
$langs->loadLangs(array('admin', 'other', 'orders', 'propal', 'bills', 'errors', 'mails'));
// Security check
-if (!$user->admin)
- accessforbidden();
+if (!$user->admin) {
+ accessforbidden();
+}
$action = GETPOST('action', 'aZ09');
+$error = 0;
/*
@@ -45,27 +47,48 @@ $action = GETPOST('action', 'aZ09');
*/
// Action to update or add a constant
-if ($action == 'update' || $action == 'add')
+if ($action == 'settemplates')
{
- $constlineid = GETPOST('rowid', 'int');
- $constname=GETPOST('constname', 'alpha');
+ $db->begin();
- $constvalue=(GETPOSTISSET('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname, 'alpha') : GETPOST('constvalue'));
- $consttype=(GETPOSTISSET('consttype_'.$constname) ? GETPOST('consttype_'.$constname, 'alphanohtml') : GETPOST('consttype'));
- $constnote=(GETPOSTISSET('constnote_'.$constname) ? GETPOST('constnote_'.$constname, 'none') : GETPOST('constnote'));
-
- $typetouse = empty($oldtypetonewone[$consttype]) ? $consttype : $oldtypetonewone[$consttype];
-
- $res=dolibarr_set_const($db, $constname, $constvalue, $typetouse, 0, $constnote, $conf->entity);
-
- if (! $res > 0) $error++;
-
- if (! $error)
+ if (!$error && is_array($_POST))
{
+ $reg = array();
+ foreach ($_POST as $key => $val)
+ {
+ if (!preg_match('/^constvalue_(.*)_TEMPLATE/', $key, $reg)) continue;
+
+ $triggername = $reg[1];
+ $constvalue = GETPOST($key, 'alpha');
+ $consttype = 'emailtemplate:xxx';
+ $tmparray=explode(':', $constvalue);
+ if (! empty($tmparray[0]) && ! empty($tmparray[1])) {
+ $constvalue = $tmparray[0];
+ $consttype = 'emailtemplate:'.$tmparray[1];
+ //var_dump($constvalue);
+ //var_dump($consttype);
+ $res = dolibarr_set_const($db, $triggername.'_TEMPLATE', $constvalue, $consttype, 0, '', $conf->entity);
+ if ($res < 0) {
+ $error++;
+ break;
+ }
+ } else {
+ $res = dolibarr_del_const($db, $triggername.'_TEMPLATE', $conf->entity);
+ }
+ }
+ }
+
+
+ if (!$error)
+ {
+ $db->commit();
+
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
else
{
+ $db->rollback();
+
setEventMessages($langs->trans("Error"), null, 'errors');
}
}
@@ -74,12 +97,31 @@ if ($action == 'setvalue' && $user->admin)
{
$db->begin();
- $result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", $_POST["email_from"], 'chaine', 0, '', $conf->entity);
+ $result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", GETPOST("email_from", "none"), 'chaine', 0, '', $conf->entity);
if ($result < 0) $error++;
+
+ if (!$error)
+ {
+ $db->commit();
+
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ }
+ else
+ {
+ $db->rollback();
+
+ setEventMessages($langs->trans("Error"), null, 'errors');
+ }
+}
+
+
+if ($action == 'setfixednotif' && $user->admin)
+{
+ $db->begin();
+
if (!$error && is_array($_POST))
{
- //var_dump($_POST);
$reg = array();
foreach ($_POST as $key => $val)
{
@@ -101,7 +143,7 @@ if ($action == 'setvalue' && $user->admin)
}
elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
{
- // Add a new entry
+ // Add a new entry
$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
$newval = GETPOST($shortkey.'_key');
}
@@ -168,9 +210,18 @@ print '';
print ' ';
print '
';
+print '';
+
+print '';
+
+
print '
'; +print ' \n";
+// Allow to group payments by mod in rapports
+print '';
+print $langs->trans("GroupPaymentsByModOnReports");
+print ' ';
+print $form->selectyesno("PAYMENTS_REPORT_GROUP_BY_MOD", $conf->global->PAYMENTS_REPORT_GROUP_BY_MOD, 1);
+print ' ';
+print "
';
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index d533ba0d8eb..5d7a0d0b8d5 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -1,6 +1,7 @@
* Copyright (C) 2016 Laurent Destailleur "; +print ''; print '
'; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index d828873be36..0646c7f6d46 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -209,6 +209,8 @@ else // Show examples print load_fiche_titre($langs->trans("ExamplesWithCurrentSetup"), '', ''); + print ''.$langs->trans("Format").': '.price(price2num(1234.56789, 'MT'), 0, $langs, 1, -1, -1, $currencycode)."
\n"; + // Always show vat rates with vat 0 $s = 2 / 7; $qty = 1; $vat = 0; $tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc); diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index f2d27cf2849..37d1f903b4a 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -536,7 +536,7 @@ $errors = $hookmanager->errors; // Line to enter new values (input fields) -print "
| '.$langs->trans("TreeMenuPersonalized").' | '; -print ''; +print ' | '; print ' | |||
| '; + $entry .= ' '.$titre.''; + $entry .= ' | '; + $entry .= ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' '; + $entry .= ''.img_edit_add('default').' '; + $entry .= ''.img_delete('default').' '; + $entry .= ' '; + $entry .= ''.img_picto("Up", "1uparrow").''.img_picto("Down", "1downarrow").''; + $entry .= ' |
| '. - ' '.$titre.''. - ' | '. - ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' '. - ''.img_edit_add('default').' '. - ''.img_delete('default').' '. - ' '. - ''.img_picto("Up", "1uparrow").''.img_picto("Down", "1downarrow").''. - ' |
'; +print '
"; + +print load_fiche_titre($langs->trans("OtherOptions"), '', ''); + +print '