0
@@ -260,66 +247,32 @@
0
-
0
-
0
-
0
-
-
-
-
- 5
-
-
-
-
+
0
-
0
-
- 0
-
-
-
- 0
-
+
0
@@ -352,19 +305,21 @@
0
-
+
+
0
+
- 0
+ 0
-
+
+
0
@@ -373,27 +328,25 @@
0
-
+
+
0
-
- 0
-
+
- 0
+ 0
-
- 0
-
-
- 0
-
+
+ 0
+
- 0
+ 0
-
+
0
- 0
-
+
0
0
-
+
0
@@ -432,16 +385,16 @@
+
+
0
+
0
@@ -452,7 +405,6 @@
0
-
0
@@ -462,15 +414,17 @@
-
-
-
- Login Dolibarr 3.4.0-alpha
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
';
if ($user->rights->accounting->chartofaccount) {
- print '';
+ print ' ';
print img_edit();
print ' ';
print ' ';
- print '';
+ print ' ';
print img_delete();
print ' ';
}
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 0ab42d582d1..b31cd23dfa4 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -696,7 +696,7 @@ if ($id)
print " ";
// Modify link
- if ($canbemodified) print ''.img_edit().' '.img_edit().' ';
// Delete link
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 500a0d3cbba..1b2733e2045 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -408,7 +408,7 @@ llxHeader('', $langs->trans('DictionaryAccountancyCategory'));
$titre = $langs->trans($tablib[$id]);
$linkback = '';
-$titlepicto = 'title_setup';
+$titlepicto = 'title_accountancy';
print load_fiche_titre($titre, $linkback, $titlepicto);
@@ -806,7 +806,7 @@ if ($id)
print "";
// Modify link
- if ($canbemodified) print ''.img_edit().' '.img_edit().' ';
// Delete link
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 02963557222..006db08fe9c 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -236,6 +236,7 @@ if (!empty($user->admin))
}
print '';
+ /* Set this option as a hidden option but keep it for some needs.
print '';
print ''.$langs->trans("ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL").' ';
if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
@@ -248,6 +249,7 @@ if (!empty($user->admin))
print '';
}
print ' ';
+ */
print '';
print ''.$langs->trans("BANK_DISABLE_DIRECT_INPUT").' ';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index eccb7450594..e34ce8094dd 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -657,7 +657,7 @@ if ($id)
print "";
// Modify link
- if ($canbemodified) print ''.img_edit().' '.img_edit().' ';
// Delete link
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index c6c76a57621..e32e47b169d 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -362,7 +362,6 @@ 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 .= '';
- // Permet d'afficher le compte comptable
- if (empty($displayed_account) || $root_account_description != $displayed_account)
+ if (!empty($show_subgroup))
{
- // Affiche un Sous-Total par compte comptable
- if ($displayed_account != "") {
- 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 '';
+ print ''.$langs->trans("SubTotal").': ';
+ print ''.price($sous_total_debit).' ';
+ print ''.price($sous_total_credit).' ';
+ print ''.price(price2num($sous_total_credit - $sous_total_debit)).' ';
+ print " ';
+ }
+
+ // Show first line of a break
+ print '';
+ print ''.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').' ';
print ' ';
+
+ $displayed_account = $root_account_description;
+ $sous_total_debit = 0;
+ $sous_total_credit = 0;
}
-
- // Show first line of a break
- print '';
- print ''.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').' ';
- print ' ';
-
- $displayed_account = $root_account_description;
- $sous_total_debit = 0;
- $sous_total_credit = 0;
}
-
// $object->get_compte_racine($line->numero_compte);
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 "'.$langs->trans("AccountBalance").': '.price($total_debit).' '.price($total_credit).' '.price(price2num($total_debit - $total_credit)).' ';
- print " \n";
+ print "
";
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 26476119cca..f8fa0774400 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -438,7 +438,7 @@ if ($action == 'create')
print $langs->trans('Docdate');
print '';
if ($action != 'editdate')
- print '
piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).' ';
+ print '
piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).' ';
print '
';
print '';
if ($action == 'editdate') {
@@ -462,7 +462,7 @@ if ($action == 'create')
print $langs->trans('Codejournal');
print ' ';
if ($action != 'editjournal')
- print 'piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' ';
if ($action == 'editjournal') {
@@ -486,7 +486,7 @@ if ($action == 'create')
print $langs->trans('Piece');
print ' ';
if ($action != 'editdocref')
- print 'piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' ';
if ($action == 'editdocref') {
@@ -650,8 +650,8 @@ if ($action == 'create')
print ' '.price($line->credit).' ';
print '';
- print 'id.'&piece_num='.$line->piece_num.'&mode='.$mode.'">';
- print img_edit();
+ print ' id.'&piece_num='.$line->piece_num.'&mode='.$mode.'">';
+ print img_edit('', 0, 'class="marginrightonly"');
print ' ';
$actiontodelete = 'delete';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 545ac855b29..2889fbf4ef1 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -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 '';
-print '
';
+$moreforfilter = '';
-print '';
-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 .= '
';
+$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 .= '
';
+
+$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 '
';
+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 '
';
+
+// Filters lines
+print '';
+
+// Code journal
+if (!empty($arrayfields['t.code_journal']['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 '';
+ 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 '';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
+$searchpicto = $form->showFilterButtons();
print $searchpicto;
print ' ';
-print ' ';
+print "\n";
print '';
-print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF']);
-print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre("Piece", $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre("Label");
-print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60"', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.code_journal']['checked'])) print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.doc_date']['checked'])) print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked'])) print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.doc_ref']['checked'])) print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.label_operation']['checked'])) print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.debit']['checked'])) print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.credit']['checked'])) print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.lettering_code']['checked'])) print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
@@ -323,7 +501,10 @@ $sous_total_debit = 0;
$sous_total_credit = 0;
$displayed_account_number = null; // Start with undefined to be able to distinguish with empty
+// Loop on record
+// --------------------------------------------------------------------
$i = 0;
+$totalarray = array();
while ($i < min($num, $limit))
{
$line = $object->lines[$i];
@@ -336,18 +517,41 @@ while ($i < min($num, $limit))
// Is it a break ?
if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
- // Affiche un Sous-Total par compte comptable
+ $colspan = $totalarray['nbfield'] - 3;
+ $colspanend = $totalarray['nbfield'] - 7;
+ // Show a subtotal by accounting account
if (isset($displayed_account_number)) {
- print ''.$langs->trans("SubTotal").': '.price($sous_total_debit).' '.price($sous_total_credit).' ';
- print " \n";
- print " \n";
+ print '';
+ print ''.$langs->trans("TotalForAccount").' '.length_accountg($displayed_account_number).': ';
+ print ''.price($sous_total_debit).' ';
+ print ''.price($sous_total_credit).' ';
+ print ' ';
+ // Show balance of last shown account
+ $balance = $sous_total_debit - $sous_total_credit;
+ print '';
+ print ''.$langs->trans("Balance").': ';
+ if ($balance > 0 )
+ {
+ print '';
+ print price($sous_total_debit - $sous_total_credit);
+ print ' ';
+ print '';
+ print price($sous_total_credit - $sous_total_debit);
+ print ' ';
+ }
+ print ' ';
}
// Show the break account
- $colspan = 9;
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 ' ';
- print ''.$line->piece_num.' '.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 '';
+ // Picto + Ref
+ print '';
+
+ if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
+ {
+ print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+ print $documentlink;
+ } else {
+ print $line->doc_ref;
+ }
+ 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 " \n";
+ if (!$i) $totalarray['nbfield']++;
// Comptabilise le sous-total
$sous_total_debit += $line->debit;
$sous_total_credit += $line->credit;
+ print "\n";
+
$i++;
}
// Show sub-total of last shown account
+$colspan = $totalarray['nbfield'] - 3;
+$colspanend = $totalarray['nbfield'] - 8;
print '';
-print ''.$langs->trans("SubTotal").': '.price($sous_total_debit).' '.price($sous_total_credit).' ';
-print '';
-print price($sous_total_debit - $sous_total_credit);
-print ' ';
-print ''.$langs->trans("TotalForAccount").' '.$accountg.': ';
+print ''.price($sous_total_debit).' ';
+print ''.price($sous_total_credit).' ';
+print ' ';
+// Show balance of last shown account
+$balance = $sous_total_debit - $sous_total_credit;
+print '';
+print ''.$langs->trans("Balance").': ';
+if ($balance > 0 )
+{
+ print '';
+ print price($sous_total_debit - $sous_total_credit);
+ print ' ';
+ print '';
+ print price($sous_total_credit - $sous_total_debit);
+ print ' ';
+}
+print ' ';
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-// Show total
-print '';
-print ''.$langs->trans("Total").': ';
-print '';
-print price($total_debit);
-print ' ';
-print '';
-print price($total_credit);
-print ' ';
-print ' ';
print "
";
print '
* Copyright (C) 2015 Raphaël Doursenaud
* Copyright (C) 2016 Pierre-Henry Favre
- * Copyright (C) 2016-2019 Alexandre Spangaro
+ * Copyright (C) 2016-2020 Alexandre Spangaro
* Copyright (C) 2013-2017 Olivier Geffroy
* Copyright (C) 2017 Elarifr. Ari Elbaz
* Copyright (C) 2017-2019 Frédéric France
* Copyright (C) 2017 André Schild
+ * Copyright (C) 2020 Guillaume Alexandre
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,6 +53,7 @@ class AccountancyExport
public static $EXPORT_TYPE_SAGE50_SWISS = 45;
public static $EXPORT_TYPE_CHARLEMAGNE = 50;
public static $EXPORT_TYPE_QUADRATUS = 60;
+ public static $EXPORT_TYPE_WINFIC = 70;
public static $EXPORT_TYPE_OPENCONCERTO = 100;
public static $EXPORT_TYPE_LDCOMPTA = 110;
public static $EXPORT_TYPE_LDCOMPTA10 = 120;
@@ -105,6 +107,7 @@ class AccountancyExport
self::$EXPORT_TYPE_BOB50 => $langs->trans('Modelcsv_bob50'),
self::$EXPORT_TYPE_CIEL => $langs->trans('Modelcsv_ciel'),
self::$EXPORT_TYPE_QUADRATUS => $langs->trans('Modelcsv_quadratus'),
+ self::$EXPORT_TYPE_WINFIC => $langs->trans('Modelcsv_winfic'),
self::$EXPORT_TYPE_EBP => $langs->trans('Modelcsv_ebp'),
self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
@@ -136,6 +139,7 @@ class AccountancyExport
self::$EXPORT_TYPE_BOB50 => 'bob50',
self::$EXPORT_TYPE_CIEL => 'ciel',
self::$EXPORT_TYPE_QUADRATUS => 'quadratus',
+ self::$EXPORT_TYPE_WINFIC => 'winfic',
self::$EXPORT_TYPE_EBP => 'ebp',
self::$EXPORT_TYPE_COGILOG => 'cogilog',
self::$EXPORT_TYPE_AGIRIS => 'agiris',
@@ -184,6 +188,10 @@ class AccountancyExport
'label' => $langs->trans('Modelcsv_quadratus'),
'ACCOUNTING_EXPORT_FORMAT' => 'txt',
),
+ self::$EXPORT_TYPE_WINFIC => array(
+ 'label' => $langs->trans('Modelcsv_winfic'),
+ 'ACCOUNTING_EXPORT_FORMAT' => 'txt',
+ ),
self::$EXPORT_TYPE_EBP => array(
'label' => $langs->trans('Modelcsv_ebp'),
),
@@ -246,7 +254,7 @@ class AccountancyExport
$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);
$type_export = 'general_ledger';
- global $db; // The tpl file use $db
+ global $db; // The tpl file use $db
include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
@@ -269,6 +277,9 @@ class AccountancyExport
case self::$EXPORT_TYPE_QUADRATUS :
$this->exportQuadratus($TData);
break;
+ case self::$EXPORT_TYPE_WINFIC :
+ $this->exportWinfic($TData);
+ break;
case self::$EXPORT_TYPE_EBP :
$this->exportEbp($TData);
break;
@@ -548,6 +559,85 @@ class AccountancyExport
}
}
+ /**
+ * Export format : WinFic - eWinfic - WinSis Compta
+ *
+ *
+ * @param array $TData data
+ * @return void
+ */
+ public function exportWinfic(&$TData)
+ {
+ global $conf;
+
+ $end_line = "\r\n";
+
+ //We should use dol_now function not time however this is wrong date to transfert in accounting
+ //$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+ //$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+ foreach ($TData as $data) {
+ $code_compta = $data->numero_compte;
+ if (!empty($data->subledger_account))
+ $code_compta = $data->subledger_account;
+
+ $Tab = array();
+ //$Tab['type_ligne'] = 'M';
+ $Tab['code_journal'] = str_pad(self::trunc($data->code_journal, 2), 2);
+
+ //We use invoice date $data->doc_date not $date_ecriture which is the transfert date
+ //maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
+ //$Tab['date_ecriture'] = $date_ecriture;
+ $Tab['date_operation'] = dol_print_date($data->doc_date, '%d%m%Y');
+
+ $Tab['folio'] = ' 1';
+
+ $Tab['num_ecriture'] = str_pad(self::trunc($data->piece_num, 6), 6, ' ', STR_PAD_LEFT);
+
+ $Tab['jour_ecriture'] = dol_print_date($data->doc_date, '%d%m%y');
+
+ $Tab['num_compte'] = str_pad(self::trunc($code_compta, 6), 6, '0');
+
+ if($data->sens == 'D'){
+ $Tab['montant_debit'] = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+
+ $Tab['montant_crebit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+ }
+ else{
+ $Tab['montant_debit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+
+ $Tab['montant_crebit'] = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+ }
+
+ $Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 30), 30);
+
+ $Tab['lettrage'] = str_repeat(' ', 2);
+
+ $Tab['code_piece'] = str_repeat(' ', 5);
+
+ $Tab['code_stat'] = str_repeat(' ', 4);
+
+ if (!empty($data->date_echeance))
+ //$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
+ $Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%Y');
+ else
+ $Tab['date_echeance'] = dol_print_date($data->doc_date, '%d%m%Y');
+
+ $Tab['monnaie'] = '1';
+
+ $Tab['filler'] = ' ';
+
+ $Tab['ind_compteur'] = ' ';
+
+ $Tab['quantite'] = '0,000000000';
+
+ $Tab['code_pointage'] = str_repeat(' ', 2);
+
+ $Tab['end_line'] = $end_line;
+
+ print implode('|', $Tab);
+ }
+ }
+
/**
* Export format : EBP
@@ -930,7 +1020,7 @@ class AccountancyExport
}
/**
- * Export format : LD Compta version 9 & higher
+ * Export format : LD Compta version 9
* http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW9.pdf
*
* @param array $objectLines data
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index a32918cc5bf..bcd17793db1 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -553,24 +553,19 @@ class AccountingAccount extends CommonObject
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Account deactivated
+ * Deactivate an account (for status active or status reconcilable)
*
* @param int $id Id
- * @param int $mode 0=field active, 1=field active_customer_list, 2=field_active_supplier_list
+ * @param int $mode 0=field active, 1=field reconcilable
* @return int <0 if KO, >0 if OK
*/
- public function account_desactivate($id, $mode = 0)
+ public function accountDeactivate($id, $mode = 0)
{
- // phpcs:enable
$result = $this->checkUsage();
- if ($mode == 0)
- {
- $fieldtouse = 'active';
- }
- elseif ($mode == 1)
+ $fieldtouse = 'active';
+ if ($mode == 1)
{
$fieldtouse = 'reconcilable';
}
@@ -582,7 +577,7 @@ class AccountingAccount extends CommonObject
$sql .= "SET ".$fieldtouse." = '0'";
$sql .= " WHERE rowid = ".$this->db->escape($id);
- dol_syslog(get_class($this)."::account_desactivate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::accountDeactivate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);
if ($result) {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 43762c2d36a..0162a98394e 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -704,7 +704,7 @@ class BookKeeping extends CommonObject
$sql .= ' WHERE 1 = 1';
$sql .= " AND entity IN (".getEntity('accountancy').")";
if (null !== $ref) {
- $sql .= ' AND t.ref = '.'\''.$ref.'\'';
+ $sql .= " AND t.ref = '".$this->db->escape($ref)."'";
} else {
$sql .= ' AND t.rowid = '.$id;
}
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 7e51160195b..45b0c909016 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2013-2016 Alexandre Spangaro
+ * Copyright (C) 2013-2020 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2014-2016 Florian Henry
* Copyright (C) 2014 Juanjo Menent
@@ -27,10 +27,11 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -42,6 +43,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
$account_parent = GETPOST('account_parent');
$changeaccount = GETPOST('changeaccount');
// Search Getpost
+$search_societe = GETPOST('search_societe', 'alpha');
$search_lineid = GETPOST('search_lineid', 'int');
$search_ref = GETPOST('search_ref', 'alpha');
$search_invoice = GETPOST('search_invoice', 'alpha');
@@ -89,6 +91,7 @@ $formaccounting = new FormAccounting($db);
// Purge search criteria
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_societe='';
$search_lineid = '';
$search_ref = '';
$search_invoice = '';
@@ -175,7 +178,7 @@ $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
$sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
$sql .= " fd.situation_percent,";
$sql .= " co.code as country_code, co.label as country,";
-$sql .= " s.tva_intra";
+$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
@@ -193,6 +196,10 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
} else {
$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
}
+// Add search filter like
+if ($search_societe) {
+ $sql .= natural_search('s.nom', $search_societe);
+}
if ($search_lineid) {
$sql .= natural_search("fd.rowid", $search_lineid, 1);
}
@@ -262,6 +269,7 @@ if ($result) {
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+ if ($search_societe) $param .= "&search_societe=".urlencode($search_societe);
if ($search_invoice) $param .= "&search_invoice=".urlencode($search_invoice);
if ($search_ref) $param .= "&search_ref=".urlencode($search_ref);
if ($search_label) $param .= "&search_label=".urlencode($search_label);
@@ -296,7 +304,7 @@ if ($result) {
print ''."\n";
print '';
- print '';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
@@ -310,8 +318,9 @@ if ($result) {
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 ' \n";
+ $thirdpartystatic=new Societe($db);
$facture_static = new Facture($db);
$product_static = new Product($db);
@@ -347,6 +358,17 @@ if ($result) {
$facture_static->id = $objp->facid;
$facture_static->type = $objp->ftype;
+ $thirdpartystatic->id = $objp->socid;
+ $thirdpartystatic->name = $objp->name;
+ $thirdpartystatic->client = $objp->client;
+ $thirdpartystatic->fournisseur = $objp->fournisseur;
+ $thirdpartystatic->code_client = $objp->code_client;
+ $thirdpartystatic->code_compta_client = $objp->code_compta_client;
+ $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+ $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+ $thirdpartystatic->email = $objp->email;
+ $thirdpartystatic->country_code = $objp->country_code;
+
$product_static->ref = $objp->product_ref;
$product_static->id = $objp->product_id;
$product_static->label = $objp->product_label;
@@ -367,7 +389,7 @@ if ($result) {
print '';
if ($product_static->id > 0) print $product_static->getNomUrl(1);
if ($product_static->id > 0 && $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
+ * Copyright (C) 2013-2020 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2013-2014 Florian Henry
* Copyright (C) 2014 Juanjo Menent
@@ -27,12 +27,13 @@
*/
require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -49,6 +50,7 @@ $toselect = GETPOST('toselect', 'array');
$mesCasesCochees = GETPOST('toselect', 'array');
// Search Getpost
+$search_societe = GETPOST('search_societe', 'alpha');
$search_lineid = GETPOST('search_lineid', 'int');
$search_ref = GETPOST('search_ref', 'alpha');
$search_invoice = GETPOST('search_invoice', 'alpha');
@@ -112,6 +114,7 @@ if (empty($reshook))
// Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
{
+ $search_societe='';
$search_lineid = '';
$search_ref = '';
$search_invoice = '';
@@ -212,7 +215,7 @@ $sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as co
$sql .= " p.tosell as status, p.tobuy as status_buy,";
$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
$sql .= " co.code as country_code, co.label as country_label,";
-$sql .= " s.tva_intra";
+$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
@@ -227,6 +230,9 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy
$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
$sql .= " AND l.product_type <= 2";
// Add search filter like
+if ($search_societe) {
+ $sql .= natural_search('s.nom', $search_societe);
+}
if ($search_lineid) {
$sql .= natural_search("l.rowid", $search_lineid, 1);
}
@@ -314,6 +320,7 @@ if ($result) {
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+ if ($search_societe) $param .= '&search_societe='.urlencode($search_societe);
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);
@@ -363,7 +370,7 @@ if ($result) {
// We add search filter
print '';
- print '';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
@@ -377,6 +384,7 @@ if ($result) {
print ' ';
print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
//print ' \n";
+ $thirdpartystatic = new Societe($db);
$facture_static = new Facture($db);
$product_static = new Product($db);
@@ -421,6 +431,17 @@ if ($result) {
$objp->code_sell_l = '';
$objp->code_sell_p = '';
+ $thirdpartystatic->id = $objp->socid;
+ $thirdpartystatic->name = $objp->name;
+ $thirdpartystatic->client = $objp->client;
+ $thirdpartystatic->fournisseur = $objp->fournisseur;
+ $thirdpartystatic->code_client = $objp->code_client;
+ $thirdpartystatic->code_compta_client = $objp->code_compta_client;
+ $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+ $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+ $thirdpartystatic->email = $objp->email;
+ $thirdpartystatic->country_code = $objp->country_code;
+
$product_static->ref = $objp->product_ref;
$product_static->id = $objp->product_id;
$product_static->type = $objp->type;
@@ -558,6 +579,9 @@ if ($result) {
print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
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->MAIN_LIST_FILTER_ON_DAY)) print ' ';
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ print_liste_field_titre("DateValidation", $_SERVER["PHP_SELF"], "er.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
+ print_liste_field_titre("DateOfLine", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("TypeFees", $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -299,6 +305,11 @@ if ($result) {
// Ref Invoice
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->MAIN_LIST_FILTER_ON_DAY)) print ' ';
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+ print_liste_field_titre("DateValidation", $_SERVER["PHP_SELF"], "er.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
+ print_liste_field_titre("DateOfLine", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("TypeFees", $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
@@ -341,6 +350,11 @@ if ($result) {
// Ref Expense report
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 ''; // hideobject is to start hidden
print "
\n";
@@ -101,13 +101,13 @@ if ($conf->accounting->enabled)
// STEPS
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").' '.' ');
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").' ');
print "
\n";
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").' '.' ');
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").' ');
print "
\n";
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").' '.' ');
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").' ');
print "
\n";
print "
\n";
@@ -116,20 +116,20 @@ if ($conf->accounting->enabled)
print "
\n";
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").' '.' ');
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").' ');
print "
\n";
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").' '.' ')."\n";
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").' ')."\n";
print "
\n";
$step++;
- $textlink = '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").' '.' ';
+ $textlink = '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").' ';
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
print "
\n";
if (!empty($conf->tax->enabled))
{
- $textlink = '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").' '.' ';
+ $textlink = '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").' ';
$step++;
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
print "
\n";
@@ -145,7 +145,7 @@ if ($conf->accounting->enabled)
if (!empty($conf->expensereport->enabled)) // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
{
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").' '.' ');
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").' ');
print "
\n";
}
/*
@@ -169,7 +169,7 @@ if ($conf->accounting->enabled)
}*/
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '
'.''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").' '.' ');
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '
'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").' ');
print "
\n";
@@ -186,17 +186,17 @@ if ($conf->accounting->enabled)
$langs->loadLangs(array('bills', 'trips'));
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '
'.''.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").' '.' ')."\n";
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '
'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").' ')."\n";
print "
\n";
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '
'.''.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").' '.' ')."\n";
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '
'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").' ')."\n";
print "
\n";
if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled))
{
$step++;
- print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '
'.''.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").' '.' ')."\n";
+ print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '
'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").' ')."\n";
print "
\n";
}
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index b3d1e6ce7f8..3372105cd85 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -994,7 +994,7 @@ if (empty($action) || $action == 'view') {
print '
';
- if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '
';
+ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '
';
if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index d0a84c1236c..4be0b133143 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -508,7 +508,7 @@ if (empty($action) || $action == 'view') {
}
print '
';
- if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '
';
+ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '
';
if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
print '
';
}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index dd7dc1ca9e1..42bff74097f 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -740,7 +740,7 @@ if (empty($action) || $action == 'view') {
print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '
'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").' ');
}
print '
';
- if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '
';
+ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '
';
if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
print '
';
}
@@ -936,7 +936,7 @@ if (empty($action) || $action == 'view') {
$accountoshow = length_accountg($k);
if (($accountoshow == "") || $accountoshow == 'NotDefined')
{
- print '
'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')'.' ';
+ print '
'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").') ';
}
else print $accountoshow;
print "";
@@ -959,15 +959,15 @@ if (empty($action) || $action == 'view') {
foreach ($tabother[$key] as $k => $mt) {
if ($mt) {
print '
';
- print "";
+ print '';
print "".$date." ";
print "".$invoicestatic->getNomUrl(1)." ";
// Account
- print "";
+ print ' ';
$accountoshow = length_accountg($k);
- if (($accountoshow == "") || $accountoshow == 'NotDefined')
+ if ($accountoshow == '' || $accountoshow == 'NotDefined')
{
- print ''.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account'.' ';
+ print ''.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account ';
}
else print $accountoshow;
print ' ';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 80603106cb3..c3c9f45ed5a 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -677,7 +677,7 @@ if (empty($action) || $action == 'view') {
print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").' ');
}
print '';
- if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print '
';
+ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '
';
if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
print '
';
}
@@ -874,7 +874,7 @@ if (empty($action) || $action == 'view') {
$accountoshow = length_accountg($k);
if (($accountoshow == "") || $accountoshow == 'NotDefined')
{
- print '
'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')'.' ';
+ print '
'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").') ';
}
else print $accountoshow;
print "";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 6d1a0ccd610..f3a4b255f3e 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2013-2017 Alexandre Spangaro
+ * Copyright (C) 2013-2020 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2013-2016 Florian Henry
* Copyright (C) 2014 Juanjo Menent
@@ -27,12 +27,13 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -44,6 +45,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
$account_parent = GETPOST('account_parent');
$changeaccount = GETPOST('changeaccount');
// Search Getpost
+$search_societe = GETPOST('search_societe', 'alpha');
$search_lineid = GETPOST('search_lineid', 'int');
$search_ref = GETPOST('search_ref', 'alpha');
$search_invoice = GETPOST('search_invoice', 'alpha');
@@ -91,6 +93,7 @@ $formaccounting = new FormAccounting($db);
// Purge search criteria
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_societe = '';
$search_lineid = '';
$search_ref = '';
$search_invoice = '';
@@ -177,7 +180,7 @@ $sql .= " l.rowid, l.fk_product, l.product_type as line_type, l.description, l.t
$sql .= " aa.label, aa.account_number, ";
$sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
$sql .= " co.code as country_code, co.label as country,";
-$sql .= " s.tva_intra";
+$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
@@ -188,6 +191,10 @@ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_fact
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
$sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
+// Add search filter like
+if ($search_societe) {
+ $sql .= natural_search('s.nom', $search_societe);
+}
if ($search_lineid) {
$sql .= natural_search("l.rowid", $search_lineid, 1);
}
@@ -264,6 +271,7 @@ if ($result) {
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+ if ($search_societe) $param .= "&search_societe=" . urlencode($search_societe);
if ($search_invoice) $param .= "&search_invoice=".urlencode($search_invoice);
if ($search_ref) $param .= "&search_ref=".urlencode($search_ref);
if ($search_label) $param .= "&search_label=".urlencode($search_label);
@@ -300,7 +308,7 @@ if ($result) {
// We add search filter
print '';
- print '';
@@ -312,8 +320,9 @@ if ($result) {
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 ' \n";
+ $thirdpartystatic = new Societe($db);
$facturefournisseur_static = new FactureFournisseur($db);
$product_static = new ProductFournisseur($db);
@@ -352,6 +363,17 @@ if ($result) {
$facturefournisseur_static->ref = $objp->ref;
$facturefournisseur_static->id = $objp->facid;
+ $thirdpartystatic->id = $objp->socid;
+ $thirdpartystatic->name = $objp->name;
+ $thirdpartystatic->client = $objp->client;
+ $thirdpartystatic->fournisseur = $objp->fournisseur;
+ $thirdpartystatic->code_client = $objp->code_client;
+ $thirdpartystatic->code_compta_client = $objp->code_compta_client;
+ $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+ $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+ $thirdpartystatic->email = $objp->email;
+ $thirdpartystatic->country_code = $objp->country_code;
+
$product_static->ref = $objp->product_ref;
$product_static->id = $objp->product_id;
$product_static->label = $objp->product_label;
@@ -376,7 +398,7 @@ if ($result) {
print '';
if ($product_static->id > 0) print $product_static->getNomUrl(1);
if ($product_static->id > 0 && $objp->product_label) print ''.$objp->product_label.' ';
print ' ';
// Description
@@ -390,6 +412,10 @@ if ($result) {
print ''.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).' ';
+ // Thirdparty
+ print '' . $thirdpartystatic->getNomUrl(1, 'supplier') . ' ';
+
+ // Country
print '';
if ($objp->country_code)
{
@@ -400,7 +426,7 @@ if ($result) {
print ' '.$objp->tva_intra.' ';
print '';
- print $codecompta.' ';
+ print $codecompta.' ';
print img_edit();
print ' ';
print '';
- print '';
@@ -376,6 +383,7 @@ if ($result) {
print ' ';
print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
//print ' \n";
+ $thirdpartystatic=new Societe($db);
$facturefourn_static = new FactureFournisseur($db);
$product_static = new Product($db);
@@ -424,6 +434,17 @@ if ($result) {
$objp->code_buy_l = '';
$objp->code_buy_p = '';
+ $thirdpartystatic->id = $objp->socid;
+ $thirdpartystatic->name = $objp->name;
+ $thirdpartystatic->client = $objp->client;
+ $thirdpartystatic->fournisseur = $objp->fournisseur;
+ $thirdpartystatic->code_client = $objp->code_client;
+ $thirdpartystatic->code_compta_client = $objp->code_compta_client;
+ $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+ $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+ $thirdpartystatic->email = $objp->email;
+ $thirdpartystatic->country_code = $objp->country_code;
+
$product_static->ref = $objp->product_ref;
$product_static->id = $objp->product_id;
$product_static->type = $objp->type;
@@ -543,6 +564,9 @@ if ($result) {
print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
print '';
+ // Thirdparty
+ print '' . $thirdpartystatic->getNomUrl(1, 'supplier') . ' ';
+
// 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;
@@ -553,12 +577,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_buy_l > 0 ? length_accountg($objp->code_buy_l) : $langs->trans("NotDefined"));
+ $s .= ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : ''.$langs->trans("NotDefined").' ');
print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
if ($objp->product_id > 0)
{
@@ -567,7 +591,7 @@ if ($result) {
$shelp = '';
if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
- $s .= (empty($objp->code_buy_p) ? $langs->trans("NotDefined") : length_accountg($objp->code_buy_p));
+ $s .= (empty($objp->code_buy_p) ? ''.$langs->trans("NotDefined").' ' : length_accountg($objp->code_buy_p));
print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
}
print ' ';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index dd2593329e0..55504a547c2 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -60,6 +60,9 @@ class Adherent extends CommonObject
*/
public $ismultientitymanaged = 1;
+ public $picto = 'member';
+
+
public $mesgs;
/**
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 46733575c36..4af80ab4a63 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -183,20 +183,14 @@ class AdherentType extends CommonObject
$sql2 .= " SET ";
$sql2 .= " label='".$this->db->escape($this->label)."',";
$sql2 .= " description='".$this->db->escape($this->description)."'";
- if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email='".$this->db->escape($this->other)."'";
- }
$sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
}
else
{
$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
- if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email";
- }
$sql2 .= ")";
$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
$sql2 .= " '".$this->db->escape($this->description)."'";
- if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", '".$this->db->escape($this->other)."'";
- }
$sql2 .= ")";
}
dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
@@ -219,20 +213,14 @@ class AdherentType extends CommonObject
$sql2 .= " SET ";
$sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
- if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email='".$this->db->escape($this->multilangs["$key"]["other"])."'";
- }
$sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
}
else
{
$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
- if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email";
- }
$sql2 .= ")";
$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
$sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
- if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
- }
$sql2 .= ")";
}
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 44fcb397ddc..6d069386592 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -1,9 +1,9 @@
* Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2017 Laurent Destailleur
+ * Copyright (C) 2004-2020 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2019 Nicolas ZABOURI
+ * Copyright (C) 2019 Nicolas ZABOURI
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
/**
* \file htdocs/adherents/index.php
* \ingroup member
- * \brief Page accueil module adherents
+ * \brief Home page of membership module
*/
require '../main.inc.php';
@@ -339,7 +339,7 @@ if ($resql)
$staticmember->ref = $staticmember->getFullName($langs);
$statictype->id = $obj->typeid;
$statictype->label = $obj->label;
- print ''.$staticmember->getNomUrl(1, 32).' ';
+ print ''.$staticmember->getNomUrl(1, 32).' ';
print ''.$statictype->getNomUrl(1, 32).' ';
print ''.dol_print_date($db->jdate($obj->datem), 'dayhour').' ';
print ''.$staticmember->LibStatut($obj->statut, ($obj->subscription == 'yes' ? 1 : 0), $db->jdate($obj->date_end_subscription), 3).' ';
@@ -399,12 +399,12 @@ if ($resql)
$staticmember->name = $obj->company;
}
$staticmember->ref = $staticmember->getFullName($langs);
- print ''.$subscriptionstatic->getNomUrl(1).' ';
- print ''.$staticmember->getNomUrl(1, 32, 'subscription').' ';
- print ''.get_date_range($db->jdate($obj->date_start), $db->jdate($obj->date_end)).' ';
+ print ''.$subscriptionstatic->getNomUrl(1).' ';
+ print ''.$staticmember->getNomUrl(1, 32, 'subscription').' ';
+ print ''.get_date_range($db->jdate($obj->date_start), $db->jdate($obj->date_end)).' ';
print ''.price($obj->subscription).' ';
//print ''.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).' ';
- print ''.dol_print_date($db->jdate($obj->datem ? $obj->datem : $obj->datec), 'dayhour').' ';
+ print ''.dol_print_date($db->jdate($obj->datem ? $obj->datem : $obj->datec), 'dayhour').' ';
print ' ';
$i++;
}
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7ed417750a7..6cb34192845 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -877,7 +877,7 @@ while ($i < min($num, $limit))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// 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;
// Date creation
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index faba2c50ac2..d2fd59b8ce5 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -521,7 +521,7 @@ while ($i < min($num, $limit))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// 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;
// Date creation
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 10bfa13d1ce..c5b196146d5 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -81,8 +81,10 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
}
if ($action == 'set')
{
+ $getDefaultFilter = GETPOST('AGENDA_DEFAULT_FILTER_TYPE');
+ $defaultfilter = (is_array($getDefaultFilter)) ? implode(',', $getDefaultFilter) : $getDefaultFilter;
dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
- dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
+ dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
}
@@ -377,7 +379,12 @@ print '
'."\n";
print ''.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").' '."\n";
print ' '."\n";
print ''."\n";
-$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1);
+$multiselect = 0;
+if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {
+ // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+ $multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
+}
+$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1, $multiselect);
print ' '."\n";
// AGENDA_DEFAULT_FILTER_STATUS
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d4664a13de1..f33a3ea6f93 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -693,7 +693,7 @@ print '
';
// Sales taxes (VAT, IRPF, ...)
-print load_fiche_titre($langs->trans("TypeOfSaleTaxes"));
+print load_fiche_titre($langs->trans("TypeOfSaleTaxes"), '', 'object_payment');
print '
';
print '';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index cdfa15d9069..3ccc2a213ac 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -5,6 +5,7 @@
* Copyright (C) 2011-2013 Juanjo Menent
* Copyright (C) 2013-2017 Philippe Grand
* Copyright (C) 2014 Marcos García
+ * Copyright (C) 2020 Maxime DEMAREST
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -83,6 +84,20 @@ if ($action == 'update')
}
}
+ $report_include_varpay = GETPOST('ACCOUNTING_REPORTS_INCLUDE_VARPAY', 'alpha');
+ if (!empty($report_include_varpay))
+ if ($report_include_varpay == 'yes')
+ if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', 1, 'chaine', 0, '', $conf->entity)) $error++;
+ if ($report_include_varpay == 'no')
+ if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', $conf->entity)) $error++;
+
+ $report_include_loan = GETPOST('ACCOUNTING_REPORTS_INCLUDE_LOAN', 'alpha');
+ if (!empty($report_include_loan))
+ if ($report_include_loan == 'yes')
+ if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', 1, 'chaine', 0, '', $conf->entity)) $error++;
+ if ($report_include_loan == 'no')
+ if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', $conf->entity)) $error++;
+
if (!$error)
{
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -158,6 +173,20 @@ foreach ($list as $key)
print ' ';
}
+// Option to include various payment in results
+print ''."\n";
+print ''.$langs->trans('IncludeVarpaysInResults').' '."\n";
+print $form->selectyesno('ACCOUNTING_REPORTS_INCLUDE_VARPAY', (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY)));
+print ' ';
+
+// Option to include loan in results
+print ''."\n";
+print ''.$langs->trans('IncludeLoansInResults').' '."\n";
+print $form->selectyesno('ACCOUNTING_REPORTS_INCLUDE_LOAN', (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN)));
+print ' ';
+
print "
\n";
print '
';
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 9f3accfe549..bc22a2020fb 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -328,10 +328,10 @@ if ($conf->use_javascript_ajax)
{
print '
';
print '
';
- print '
';
print '
';
- print '
';
}
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7d12ffca433..cce441c4052 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)
@@ -644,6 +644,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
if ($value == 'color' && empty($_POST['color'])) continue;
if ($value == 'formula' && empty($_POST['formula'])) continue;
+ if ($value == 'dayrule' && empty($_POST['dayrule'])) continue;
if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position'
if ((!isset($_POST[$value]) || $_POST[$value] == '')
&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking')) // Fields that are not mandatory
@@ -1718,7 +1719,7 @@ if ($id)
print "";
// Modify link
- if ($canbemodified) print '
'.img_edit().' ';
+ if ($canbemodified) print '
'.img_edit().' ';
else print '
';
// Delete link
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index 8d1122417b5..7c25e9d33a5 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -1,6 +1,7 @@
.
* Copyright (C) 2008-2011 Laurent Destailleur
+ * Copyright (C) 2020 Frédéric France
*
* This program is free software; you can redistribute it and/or modifyion 2.0 (the "License");
* it under the terms of the GNU General Public License as published bypliance with the License.
@@ -17,6 +18,9 @@
*/
if (!defined('REQUIRE_JQUERY_BLOCKUI')) define('REQUIRE_JQUERY_BLOCKUI', 1);
+if (!defined('NOTOKENRENEWAL')) {
+ define('NOTOKENRENEWAL', 1);
+}
/**
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index 251322ea798..a229f3c985d 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -213,19 +213,17 @@ class Dolistore
{
$cat = $this->categories[$i];
if ($cat->is_root_category == 1 && $parent == 0) {
- $html .= '';
- $html .= self::get_categories($cat->id);
- $html .= " \n";
+ $html .= '';
+ $html .= self::get_categories($cat->id);
+ $html .= " \n";
} elseif (trim($cat->id_parent) == $parent && $cat->active == 1 && trim($cat->id_parent) != 0) { // si cat est de ce niveau
$select = ($cat->id == $this->categorie) ? ' selected' : '';
- $html .= ''.$cat->name->language[$this->lang - 1].' '.$cat->nb_products_recursive.' ';
- $html .= self::get_categories($cat->id);
- $html .= "description->language[$this->lang - 1])).'" ';
+ $html .= '>'.$cat->name->language[$this->lang - 1].' '.$cat->nb_products_recursive.' ';
+ $html .= self::get_categories($cat->id);
+ $html .= "'.
- ' ';
+ $images = '';
+ $images .= ' ';
} else {
$images = ''.$langs->trans("SeeInMarkerPlace").'
+ $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->language[$this->lang - 1].'
- '.$price.'
-
- '.$download_link.'
- ';
+ '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.' '.$product->description->language[$this->lang - 1].' ';
+ $html .= ''.$price.' ';
+ $html .= ''.$download_link.' ';
+ $html .= ' ';
}
return $html;
}
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 74592ff777a..80161eaadc6 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -592,7 +592,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '';
- print ''.img_edit().' ';
+ print ''.img_edit().' ';
print ' '.img_delete().' ';
print ' ';
print '';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index d2c52da585b..f180cdf10cf 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -476,7 +476,7 @@ while ($i < min($num, $limit))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index af1c7c88698..d076e77bf44 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -368,20 +368,20 @@ foreach ($dirmodels as $reldir)
{
if (file_exists($dir.'/'.$file))
{
- $name = substr($file, 4, dol_strlen($file) -16);
- $classname = substr($file, 0, dol_strlen($file) -12);
+ $name = substr($file, 4, dol_strlen($file) - 16);
+ $classname = substr($file, 0, dol_strlen($file) - 12);
require_once $dir.'/'.$file;
$module = new $classname($db);
- $modulequalified=1;
- if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
- if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+ $modulequalified = 1;
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
if ($modulequalified)
{
print '';
- print (empty($module->name)?$name:$module->name);
+ print (empty($module->name) ? $name : $module->name);
print " \n";
if (method_exists($module, 'info')) print $module->info($langs);
else print $module->description;
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index cc2edb550a0..8aa1a425778 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -240,9 +240,9 @@ dol_syslog("select rss boxes", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
- $boxlist = InfoBox::listBoxes($db, 'activated', -1, null);
- $num = $db->num_rows($resql);
- $i = 0;
+ $boxlist = InfoBox::listBoxes($db, 'activated', -1, null);
+ $num = $db->num_rows($resql);
+ $i = 0;
while ($i < $num)
{
@@ -271,19 +271,19 @@ if ($resql)
print ' ';
- print "';
print "".$langs->trans("Title")." ";
print " "."\n";
+ print ''."\n";
print '';
print "".$langs->trans("URL")." ";
print " "."\n";
+ print ''."\n";
print '';
@@ -301,7 +301,7 @@ if ($resql)
print '';
}
print "";
- print " "."\n";
+ print ''."\n";
// Logo
if ($result > 0 && empty($rss->error))
@@ -315,7 +315,7 @@ if ($resql)
if ($imageurl) print '';
print ''.$langs->trans('WidgetEnabled').' ';
print ''.yn($active).' ';
- print " "."\n";
+ print ''."\n";
print '
'."\n";
- print ""."\n";
+ print "\n";
$i++;
}
@@ -350,9 +350,9 @@ $db->close();
*/
function _isInBoxList($idrss, array $boxlist)
{
- foreach($boxlist as $box)
+ foreach ($boxlist as $box)
{
- if($box->boxcode === "lastrssinfos" && strpos($box->note, $idrss) !== false)
+ if ($box->boxcode === "lastrssinfos" && strpos($box->note, $idrss) !== false)
{
return true;
}
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index ce327cc5187..223045db2e9 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -36,13 +36,13 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
$action = GETPOST('action', 'alpha');
$value = GETPOST('value', 'alpha');
$label = GETPOST('label', 'alpha');
$scandir = GETPOST('scan_dir', 'alpha');
-$type='invoice';
+$type = 'invoice';
/*
@@ -57,17 +57,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
* View
*/
-$dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
llxHeader(
"", $langs->trans("BillsSetup"),
'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
);
-$form=new Form($db);
+$form = new Form($db);
-$linkback=''.$langs->trans("BackToModuleList").' ';
+$linkback = ''.$langs->trans("BackToModuleList").' ';
print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
$head = invoice_admin_prepare_head();
@@ -106,12 +106,12 @@ $arrayAvailableType = array(
);
$selected = array();
$implodeglue = '+';
-if(!empty($conf->global->{$confkey}) && !is_array($conf->global->{$confkey})){
+if (!empty($conf->global->{$confkey}) && !is_array($conf->global->{$confkey})) {
$selected = explode('+', $conf->global->{$confkey});
}
-$curentInput = (empty($inputCount)?1:($inputCount+1));
-$formSelectInvoiceType = $form->selectarray('value'. $curentInput, $arrayAvailableType, $selected, 1);
+$curentInput = (empty($inputCount) ? 1 : ($inputCount + 1));
+$formSelectInvoiceType = $form->selectarray('value'.$curentInput, $arrayAvailableType, $selected, 1);
_printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty'), '', array(), $formSelectInvoiceType);
//_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituation'));
@@ -126,7 +126,7 @@ $metas = array(
_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
// Conditions paiements
-$inputCount = empty($inputCount)?1:($inputCount+1);
+$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
print '';
print ''.$langs->trans('PaymentConditionsShortRetainedWarranty').' ';
print ' ';
@@ -178,7 +178,7 @@ function _printOnOff($confkey, $title = false, $desc = '')
global $langs;
print ' ';
- print ''.($title?$title:$langs->trans($confkey));
+ print ' '.($title ? $title : $langs->trans($confkey));
if (!empty($desc)) {
print ''.$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 ' ';
if (!empty($help)) {
- print $form->textwithtooltip(($title?$title:$langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
+ print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
} else {
- print $title?$title:$langs->trans($confkey);
+ print $title ? $title : $langs->trans($confkey);
}
if (!empty($desc)) {
@@ -244,12 +244,12 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra
print ' ';
// Disable javascript and ajax
print ''.$langs->trans("DisableJavascript").' ';
print ajax_constantonoff("MAIN_DISABLE_JAVASCRIPT", array(), $conf->entity, 0, 0, 1, 0);
+print ' '.$langs->trans("DisableJavascriptNote").' ';
+print ' ';
+print '';
print ' ';
-print ' ';
print ''.$langs->trans("LoginPage
print ' ';
print ''.$langs->trans("DisableLinkToHelpCenter").' ';
+print ajax_constantonoff("MAIN_HELPCENTER_DISABLELINK", array(), $conf->entity, 0, 0, 0, 0);
+print ' ';
+print ' ';
+print ' '."\n";
-// Hide helpcenter link on login page
-print ''.$langs->trans("DisableLinkToHelpCenter").' ';
-print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK', isset($conf->global->MAIN_HELPCENTER_DISABLELINK) ? $conf->global->MAIN_HELPCENTER_DISABLELINK : 0, 1);
-print ' ';
-print ' ';
-print ''.$langs->trans("BackgroundImageLogin").' (png,jpg) ';
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 $langs->trans("SetupDescription1").' ';
print $langs->trans("AreaForAdminOnly").' ';
print $langs->trans("SetupDescription2", $langs->transnoentities("MenuCompanySetup"), $langs->transnoentities("Modules"));
-print ' ';
print " ';
print '
';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index cc8a92f819b..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))
{
@@ -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 '';
print ''.$langs->trans("TreeMenuPersonalized").' ';
-print ' ';
print '';
@@ -325,6 +325,22 @@ if ($conf->use_javascript_ajax)
if (!empty($menu['langs'])) $langs->load($menu['langs']);
$titre = $langs->trans($menu['titre']);
+ $entry = '';
+
+ $buttons = ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' ';
+ $buttons .= ''.img_edit_add('default').' ';
+ $buttons .= ''.img_delete('default').' ';
+ $buttons .= ' ';
+ $buttons .= ''.img_picto("Up", "1uparrow").' '.img_picto("Down", "1downarrow").' ';
+
$data[] = array(
'rowid'=>$menu['rowid'],
'module'=>$menu['module'],
@@ -335,20 +351,8 @@ if ($conf->use_javascript_ajax)
'fk_mainmenu'=>$menu['fk_mainmenu'],
'fk_leftmenu'=>$menu['fk_leftmenu'],
'position'=>$menu['position'],
- 'entry'=>'',
- 'buttons'=>''.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").' '
+ 'entry'=>$entry,
+ 'buttons'=>$buttons
);
$i++;
}
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 339b98be44a..d5bf12f1061 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -387,7 +387,7 @@ if ($mode == 'feature')
$filedata = dol_buildpath($moduledir.'/sql/data.sql');
if (dol_is_file($filedata))
{
- $text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql'.')';
+ $text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
}
else $text .= $langs->trans("No");
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 926a4c34f70..c0f1991835b 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -412,11 +412,13 @@ foreach ($modulesdir as $dir)
}
$familyposition = $familyinfo[$familykey]['position'];
- if ($external)
+ $listOfOfficialModuleGroups = array('hr', 'technic', 'interface', 'technic', 'portal', 'financial', 'crm', 'base', 'products', 'srm', 'ecm', 'projects', 'other');
+ if ($external && ! in_array($familykey, $listOfOfficialModuleGroups))
{
- // TODO Find a solution so modules with their own family are always at end
- //var_dump($familyposition);
- //$familyposition += 100;
+ // If module is extern and into a custom group (not into an official predefined one), it must appear at end (custom groups should not be before official groups).
+ if (is_numeric($familyposition)) {
+ $familyposition = sprintf("%03d", (int) $familyposition + 100);
+ }
}
$orders[$i] = $familyposition."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
@@ -678,7 +680,9 @@ if ($mode == 'common' || $mode == 'commonkanban')
if (preg_match('/development/i', $version)) $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
if (preg_match('/deprecated/i', $version)) $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
- $versiontrans .= $objMod->getVersion(1);
+ if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
+ $versiontrans .= $objMod->getVersion(1);
+ }
// Define imginfo
$imginfo = "info";
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 ' \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 " \n";
+
print '
';
print '
';
- print '';
+ print '
';
+ print '';
print '
';
- $out .= ''.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).' ';
- $out .= ''.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort)).' ';
+ $out .= ''.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).' ';
+ $out .= ''.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort)).' ';
$out .= "\n";
}
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index da51589b8ac..d0f102a4e78 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -39,7 +39,7 @@ function bank_prepare_head(Account $object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("BankAccount");
$head[$h][2] = 'bankname';
$h++;
@@ -211,7 +211,7 @@ function various_payment_prepare_head($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("VariousPayment");
$head[$h][2] = 'card';
$h++;
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index e0945f9a029..e900e6ff424 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -40,7 +40,7 @@ function categories_prepare_head(Categorie $object, $type)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("Category");
$head[$h][2] = 'card';
$h++;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 25061e60f9c..4b0a2d5b131 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -46,7 +46,7 @@ function societe_prepare_head(Societe $object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("ThirdParty");
$head[$h][2] = 'card';
$h++;
@@ -174,7 +174,7 @@ function societe_prepare_head(Societe $object)
}
// Related items
- if ((!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled))
+ if ((!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
&& empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB))
{
$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
@@ -367,7 +367,7 @@ function societe_prepare_head2($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("ThirdParty");
$head[$h][2] = 'company';
$h++;
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 8edc81d7ee7..1589809dd6b 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -38,7 +38,7 @@ function contact_prepare_head(Contact $object)
$head = array();
$head[$tab][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id;
- $head[$tab][1] = $langs->trans("Card");
+ $head[$tab][1] = $langs->trans("Contact");
$head[$tab][2] = 'card';
$tab++;
@@ -59,7 +59,7 @@ function contact_prepare_head(Contact $object)
$tab++;
// Related items
- if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled))
+ if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
{
$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
$head[$tab][1] = $langs->trans("Referers");
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 8128a449cfd..33ad0a85229 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -107,7 +107,7 @@ function dol_print_cron_urls()
print ''.$langs->trans("FileToLaunchCronJobs").': '.$label.' ';
$button .= '';
- // hidden conf keep during button transition TODO: remove this block
- if (!empty($conf->global->MAIN_USE_OLD_TITLE_BUTTON)) {
- $button = '<'.$tag.' '.$compiledAttributes.' >'.$label.' ';
- $button .= ' '.$langs->trans("TotalQuantity").' ';
print '';
+ // MO
+ if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
+ {
+ $nblines++;
+ //$ret = $product->load_stats_mo($socid);
+ if ($ret < 0) dol_print_error($db);
+ $langs->load("orders");
+ print '';
+ print ''.img_object('', 'mrp').' '.$langs->trans("MO").' ';
+ print ' ';
+ print $product->stats_mo['suppliers'];
+ print ' ';
+ print $product->stats_mo['nb'];
+ print ' ';
+ print $product->stats_mo['qty'];
+ print ' ';
+ print '';
- print ''.img_object('', 'propal').' '.$langs->trans("SupplierProposals").' ';
+ print ''.img_object('', 'supplier_proposal').' '.$langs->trans("SupplierProposals").' ';
print ' ';
print $product->stats_proposal_supplier['suppliers'];
print ' ';
@@ -408,14 +426,14 @@ function show_stats_for_company($product, $socid)
print ' ';
- print ''.img_object('', 'order').' '.$langs->trans("SuppliersOrders").' ';
+ print ''.img_object('', 'supplier_order').' '.$langs->trans("SuppliersOrders").' ';
print ' ';
print $product->stats_commande_fournisseur['suppliers'];
print ' ';
@@ -425,24 +443,6 @@ function show_stats_for_company($product, $socid)
print ' ';
print '';
- print ''.img_object('', 'mrp').' '.$langs->trans("MO").' ';
- print ' ';
- print $product->stats_mo['suppliers'];
- print ' ';
- print $product->stats_mo['nb'];
- print ' ';
- print $product->stats_mo['qty'];
- print ' ';
- print '';
- print ''.img_object('', 'bill').' '.$langs->trans("SuppliersInvoices").' ';
+ print ''.img_object('', 'supplier_invoice').' '.$langs->trans("SuppliersInvoices").' ';
print ' ';
print $product->stats_facture_fournisseur['suppliers'];
print ' ';
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 428d976ab6d..bf60968387a 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -87,7 +87,8 @@ function project_prepare_head($object)
$h++;
}
- if (!empty($conf->fournisseur->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)
+ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+ || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)
|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))
{
@@ -167,7 +168,7 @@ function task_prepare_head($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("Project");
$head[$h][2] = 'task_task';
$h++;
@@ -642,7 +643,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($source == 'internal') $c = new User($db);
else $c = new Contact($db);
$c->fetch($contacttask['id']);
- print $c->getNomUrl(1).' ('.$contacttask['libelle'].')'.' ';
print '';
- print $projectstatic->getNomUrl(1);
+ print $projectstatic->getNomUrl(1, '', 0, '', '-', 0 , -1, 'nowraponall');
if (!in_array('projectlabel', $hiddenfields)) print ''.dol_trunc($objp->title, 24).' ';
print ' ';
- print '';
+ print ' ';
if ($objp->fk_soc > 0)
{
$thirdpartystatic->id = $objp->fk_soc;
@@ -2241,7 +2242,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
if (!in_array('prospectionstatus', $hiddenfields)) {
- print ' ';
+ print ' ';
// Because color of prospection status has no meaning yet, it is used if hidden constant is set
if (empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
$oppStatusCode = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index 0e2328bc7e7..5a94e025097 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -34,7 +34,7 @@ function salaries_prepare_head($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("SalaryPayment");
$head[$h][2] = 'card';
$h++;
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 6749f32ffbe..03f1525eb91 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -192,6 +192,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
if ($features == 'mo') $features = 'mrp';
if ($features == 'member') $features = 'adherent';
if ($features == 'subscription') { $features = 'adherent'; $feature2 = 'cotisation'; };
+ if ($features == 'websitepage') $features = 'website';
// Get more permissions checks from hooks
$parameters = array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 34dd845cdfa..ad1e6304d03 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -415,7 +415,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
//var_dump($expedition->linkedObjects);
$receiving = '';
- if (count($expedition->linkedObjects['delivery']) > 0) $receiving = reset($expedition->linkedObjects['delivery']); // Take first link
+ if (!empty($expedition->linkedObjects['delivery'])) $receiving = reset($expedition->linkedObjects['delivery']); // Take first link
if (!empty($receiving))
{
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 988c7a2d78c..0b9deb7779b 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -35,7 +35,7 @@ function stock_prepare_head($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("Warehouse");
$head[$h][2] = 'card';
$h++;
diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index 8a883ceef91..d04fa5f77ef 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -43,6 +43,14 @@ function takepos_prepare_head()
$head[$h][2] = 'receipt';
$h++;
+ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
+ {
+ $head[$h][0] = DOL_URL_ROOT.'/takepos/admin/bar.php';
+ $head[$h][1] = $langs->trans("BarRestaurant");
+ $head[$h][2] = 'bar';
+ $h++;
+ }
+
$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
for ($i = 1; $i <= $numterminals; $i++)
{
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index e12531b3846..cf6607e6960 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -78,7 +78,7 @@ function ticket_prepare_head($object)
$h = 0;
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("Ticket");
$head[$h][2] = 'tabTicket';
$h++;
@@ -230,8 +230,8 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$mysoc->logo);
$width = 150;
- } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) {
- $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+ } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+ $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
}
}
}
@@ -254,7 +254,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '';
if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
- print '';
+ print '';
}
print '';
}
@@ -709,7 +709,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
$out .= $histo[$key]['id'];
$out .= ' ';
} else {
- $out .= $actionstatic->getNomUrl(1, -1).' ';
+ $out .= $actionstatic->getNomUrl(1, -1, 'valignmiddle').' ';
}
//if ($user->rights->agenda->allactions->read || $actionstatic->authorid == $user->id)
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index ec8c6a6858f..cdc7360fbf8 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -35,7 +35,7 @@ function trip_prepare_head(Deplacement $object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Card");
+ $head[$h][1] = $langs->trans("Trip");
$head[$h][2] = 'card';
$h++;
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 5b7c923001b..9ac9383e516 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -359,7 +359,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print $form->textwithpicto($langs->trans("DefaultSkin"), $langs->trans("ThemeDir").' : '.$dirthemestring);
print '';
print ' ';
- $url = 'https://www.dolistore.com/4-skins';
+ $url = 'https://www.dolistore.com/9-skins';
print '';
print $langs->trans('DownloadMoreSkins');
print ' ';
@@ -502,9 +502,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
{
print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
}
- print ' ('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print ' ';
}
@@ -549,9 +548,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if ($color) print '('.$langs->trans("Default").': ffffff ) ';
+ print ' '.$langs->trans("Default").' : ffffff ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print '';
}
@@ -597,9 +595,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if ($color) print '('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print '';
}
@@ -645,9 +642,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if ($color) print '('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print '';
}
@@ -671,9 +667,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
{
print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
}
- print ' ('.$langs->trans("Default").': '.$default.' '.$langs->trans("Default").' : '.$default.' ';
print '';
print '';
@@ -698,9 +693,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
{
print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
}
- print ' ('.$langs->trans("Default").': '.$default.' ) '; // $colorbacktitle1 in CSS
+ print ' '.$langs->trans("Default").' : '.$default.' '; // $colorbacktitle1 in CSS
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print '';
@@ -725,7 +719,33 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
{
print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
}
- print ' ('.$langs->trans("Default").': '.$default.' '.$langs->trans("Default").' : '.$default.' ';
+ print ''.$langs->trans("BackgroundTableTitleTextlinkColor").' ';
+ print '';
+ if ($edit)
+ {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
+ }
+ else
+ {
+ print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
+ }
+ print ' '.$langs->trans("Default").' : '.$default.' ';
@@ -754,9 +774,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if ($color) print '('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print ' ';
}
@@ -782,9 +801,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if ($color) print '('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print '';
}
@@ -835,9 +853,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print $langs->trans("Default");
}
}
- print ' ('.$langs->trans("Default").': '.$default.' '.$langs->trans("Default").' : '.$default.' ';
print '';
print '';
}
@@ -881,9 +898,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else print $langs->trans("Default");
}
- print ' ('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
}
@@ -927,9 +943,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else print $langs->trans("Default");
}
- print ' ('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
print '';
print '';
}
@@ -959,7 +974,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
}
}
- print ' ('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
print '';
print '';
@@ -979,7 +994,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
{
print yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
}
- print ' ('.$langs->trans("Default").': '.$default.' ) ';
+ print ' wspan class="opacitymedium">'.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
print '';
print '';
@@ -1018,7 +1033,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print yn(0);
}
}
- print ' ('.$langs->trans("Default").': '.$default.' ) ';
+ print ' '.$langs->trans("Default").' : '.$default.' ';
print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORCOLORBLINDDesc"));
print '';
print '';
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 2dcabbcafaa..1075a91ebc0 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -219,10 +219,13 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
{
global $db, $langs, $conf, $user;
global $dolibarr_main_url_root, $dolibarr_main_data_root;
+ global $includehtmlcontentopened;
$nbrep = 0;
- dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR') ? '1' : '')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER') ? '1' : '').')');
+ dol_syslog("dolWebsiteOutput start - contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR') ? '1' : '')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER') ? '1' : '').' includehtmlcontentopened='.$includehtmlcontentopened);
+
+ //print $containerid.' '.$content;
// Define $urlwithroot
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -259,6 +262,8 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
// Replace relative link /xxx.php#aaa or /xxx.php with dolibarr URL: ...href="....php" (we discard param ?...)
$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3"', $content, -1, $nbrep);
// Replace relative link /xxx.php?a=b&c=d#aaa or /xxx.php?a=b&c=d with dolibarr URL
+ // Warning: we may replace twice if href="..." was inside an include (dolWebsiteOutput called by include and the by final page), that's why
+ // at end we replace the '!~!~!~' only if we are in final parent page.
$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php\?([^#\"<>]*)(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2&\3\4"', $content, -1, $nbrep);
// Replace relative link without .php like /xxx#aaa or /xxx with dolibarr URL: ...href="....php"
$content = preg_replace('/(href=")\/?([a-zA-Z0-9\-_#]+)(\"|\?)/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
@@ -291,8 +296,10 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
$content = str_replace('src="!~!~!~/viewimage.php', 'src="!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content);
$content = str_replace('href="!~!~!~/document.php', 'href="!~!~!~'.DOL_URL_ROOT.'/document.php', $content);
- // Remove the protection tag !~!~!~
- $content = str_replace('!~!~!~', '', $content);
+ // Remove the protection tag !~!~!~, but only if this is the parent page and not an include
+ if (empty($includehtmlcontentopened)) {
+ $content = str_replace('!~!~!~', '', $content);
+ }
}
else // REPLACEMENT OF LINKS When page called from virtual host
{
@@ -352,7 +359,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
$content = str_replace(' contenteditable="true"', ' contenteditable="false"', $content);
- if (! empty($conf->global->WEBSITE_ADD_CSS_TO_BODY)) {
+ if (!empty($conf->global->WEBSITE_ADD_CSS_TO_BODY)) {
$content = str_replace(']*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
@@ -520,7 +530,7 @@ function includeContainer($containerref)
$tmpoutput = ob_get_contents();
ob_end_clean();
- print "\n".''."\n";
+ print "\n".''."\n";
print preg_replace(array('/^.*]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
if (!$res)
@@ -533,14 +543,15 @@ function includeContainer($containerref)
/**
* Return HTML content to add structured data for an article, news or Blog Post.
+ * Use the json-ld format.
*
- * @param string $type 'blogpost', 'product', 'software'...
+ * @param string $type 'blogpost', 'product', 'software', 'organization', ...
* @param array $data Array of data parameters for structured data
* @return string HTML content
*/
function getStructuredData($type, $data = array())
{
- global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+ global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs; // Very important. Required to have var available when running inluded containers.
if ($type == 'software')
{
@@ -551,7 +562,7 @@ function getStructuredData($type, $data = array())
"@type": "SoftwareApplication",
"name": "'.dol_escape_json($data['name']).'",
"operatingSystem": "'.dol_escape_json($data['os']).'",
- "applicationCategory": "https://schema.org/GameApplication",
+ "applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",
"aggregateRating": {
"@type": "AggregateRating",
"ratingValue": "'.$data['ratingvalue'].'",
@@ -565,6 +576,44 @@ function getStructuredData($type, $data = array())
}'."\n";
$ret .= ''."\n";
}
+ elseif ($type == 'organization')
+ {
+ $companyname = $mysoc->name;
+ $url = $mysoc->url;
+
+ $ret = ''."\n";
+ $ret .= ''."\n";
+ }
elseif ($type == 'blogpost')
{
if (!empty($websitepage->author_alias))
@@ -581,7 +630,7 @@ function getStructuredData($type, $data = array())
$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);
$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);
- $image = str_replace('__WEBSITE_KEY__', $website->ref, $image);
+ $image = 'medias/'.str_replace('__WEBSITE_KEY__', $website->ref, $image);
$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);
$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);
@@ -598,6 +647,7 @@ function getStructuredData($type, $data = array())
"image": [
"'.dol_escape_json($image).'"
],
+ "dateCreated": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
"datePublished": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
"dateModified": "'.dol_print_date($websitepage->date_modification, 'dayhourrfc').'",
"author": {
@@ -609,11 +659,22 @@ function getStructuredData($type, $data = array())
"name": "'.dol_escape_json($companyname).'",
"logo": {
"@type": "ImageObject",
- "url": "/viewimage.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'"
+ "url": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'"
}
- },
- "description": "'.dol_escape_json($description).'"
- }'."\n";
+ },'."\n";
+ if ($websitepage->keywords) {
+ $ret .= '"keywords": [';
+ $i = 0;
+ $arrayofkeywords = explode(',', $websitepage->keywords);
+ foreach($arrayofkeywords as $keyword) {
+ $ret.= '"'.dol_escape_json($keyword).'"';
+ $i++;
+ if ($i < count($arrayofkeywords)) $ret .= ', ';
+ }
+ $ret .= '],'."\n";
+ }
+ $ret .= '"description": "'.dol_escape_json($description).'"';
+ $ret .= "\n".'}'."\n";
$ret .= ''."\n";
}
}
@@ -720,9 +781,10 @@ function getSocialNetworkSharingLinks()
* @param int $max Max number of answers
* @param string $sortfield Sort Fields
* @param string $sortorder Sort order ('DESC' or 'ASC')
+ * @param string $langcode Language code ('' or 'en', 'fr', 'es', ...)
* @return string HTML content
*/
-function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC')
+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '')
{
global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
@@ -764,6 +826,9 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
{
$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';
$sql .= " WHERE fk_website = ".$website->id;
+ if ($langcode) {
+ $sql .= " AND lang ='".$db->escape($langcode)."'";
+ }
if ($type) {
$tmparrayoftype = explode(',', $type);
$typestring = '';
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index b2b5ef06abf..ce1f27b49fc 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -39,7 +39,10 @@ function dolSaveMasterFile($filemaster)
$mastercontent = ''."\n";
$result = file_put_contents($filemaster, $mastercontent);
if (!empty($conf->global->MAIN_UMASK))
@@ -133,7 +136,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
$tplcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {\n";
$tplcontent .= ' $pathdepth = count(explode(\'/\', $_SERVER[\'SCRIPT_NAME\'])) - 2;'."\n";
$tplcontent .= ' require_once ($pathdepth ? str_repeat(\'../\', $pathdepth) : \'./\').\'master.inc.php\';'."\n";
- $tplcontent .= "} // Not already loaded"."\n";
+ $tplcontent .= "} // Not already loaded\n";
$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
$tplcontent .= "ob_start();\n";
@@ -193,7 +196,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
else dol_print_error($db);
}
// Add canonical reference
- $tplcontent .= '';
print '';
@@ -356,7 +364,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') // Entry in accountancy journal for each bank account
{
- $newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy');
+ $newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy', 10);
// Multi journal
$sql = "SELECT rowid, code, label, nature";
@@ -380,13 +388,13 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
$nature = '';
// Must match array $sourceList defined into journals_list.php
- if ($objp->nature == 2 && !empty($conf->facture->enabled)) $nature = "sells";
- if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) $nature = "purchases";
- if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
- if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) $nature = "expensereports";
- if ($objp->nature == 1) $nature = "various";
- if ($objp->nature == 8) $nature = "inventory";
- if ($objp->nature == 9) $nature = "hasnew";
+ if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
+ if ($objp->nature == 3 && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) $nature="purchases";
+ if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
+ if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
+ if ($objp->nature == 1) $nature="various";
+ if ($objp->nature == 8) $nature="inventory";
+ if ($objp->nature == 9) $nature="hasnew";
// To enable when page exists
if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
@@ -411,36 +419,6 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
}
else dol_print_error($db);
$db->free($resql);
-
- /*
- $sql = "SELECT rowid, label, accountancy_journal";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
- $sql.= " WHERE entity = ".$conf->entity;
- $sql.= " AND clos = 0";
- $sql.= " ORDER BY label";
-
- $resql = $db->query($sql);
- if ($resql)
- {
- $numr = $db->num_rows($resql);
- $i = 0;
-
- if ($numr > 0)
- while ($i < $numr)
- {
- $objp = $db->fetch_object($resql);
- $newmenu->add('/accountancy/journal/bankjournal.php?id_account='.$objp->rowid, $langs->trans("Journal").' - '.$objp->label, 1, $user->rights->accounting->comptarapport->lire,'','accountancy','accountancy_journal');
- $i++;
- }
- }
- else dol_print_error($db);
- $db->free($resql);
-
- // Add other journal
- $newmenu->add("/accountancy/journal/sellsjournal.php?leftmenu=journal",$langs->trans("SellsJournal"),1,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy_journal');
- $newmenu->add("/accountancy/journal/purchasesjournal.php?leftmenu=journal",$langs->trans("PurchasesJournal"),1,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy_journal');
- $newmenu->add("/accountancy/journal/expensereportsjournal.php?leftmenu=journal",$langs->trans("ExpenseReportsJournal"),1,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy_journal');
- */
}
if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') // Entry for FTP
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 0b08dce9beb..2a67d43c1e3 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -119,7 +119,7 @@ class MenuManager
/**
- * Show menu
+ * Show menu.
* Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
*
* @param string $mode 'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index dba6dd2f4a4..3f539260856 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -120,7 +120,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'enabled'=> ((!empty($conf->societe->enabled) &&
(empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
)
- || !empty($conf->fournisseur->enabled)
+ || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
),
'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),
'module'=>'societe|fournisseur'
@@ -227,19 +227,21 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
$tmpentry = array(
'enabled'=>(!empty($conf->propal->enabled) ||
!empty($conf->commande->enabled) ||
- !empty($conf->supplier_order->enabled) ||
- !empty($conf->supplier_proposal->enabled) ||
- !empty($conf->contrat->enabled) ||
+ !empty($conf->fournisseur->enabled) ||
+ !empty($conf->supplier_proposal->enabled) ||
+ !empty($conf->supplier_order->enabled) ||
+ !empty($conf->contrat->enabled) ||
!empty($conf->ficheinter->enabled)
) ? 1 : 0,
'perms'=>(!empty($user->rights->propal->lire) ||
!empty($user->rights->commande->lire) ||
- !empty($user->rights->supplier_order->lire) ||
+ !empty($user->rights->fournisseur->lire) ||
!empty($user->rights->supplier_proposal->lire) ||
+ !empty($user->rights->supplier_order->lire) ||
!empty($user->rights->contrat->lire) ||
!empty($user->rights->ficheinter->lire)
),
- 'module'=>'propal|commande|supplier_order|supplier_proposal|contrat|ficheinter'
+ 'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
);
$onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) &&
@@ -306,8 +308,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
// Bank
$tmpentry = array(
'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
- 'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire)),
- 'module'=>'banque|prelevement'
+ 'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),
+ 'module'=>'banque|prelevement|paymentbybanktransfer'
);
$menu_arr[] = array(
'name' => 'Bank',
@@ -848,7 +850,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
}
// Suppliers
- if (!empty($conf->societe->enabled) && (!empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)))
+ if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled)))
{
$langs->load("suppliers");
$newmenu->add("/societe/list.php?type=f&leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
@@ -868,7 +870,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
}
// Categories suppliers
- if (!empty($conf->fournisseur->enabled))
+ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
{
$newmenu->add("/categories/index.php?leftmenu=catfournish&type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);
}
@@ -880,7 +882,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
- if (!empty($conf->fournisseur->enabled)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
+ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);
//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->societe->contact->lire);
@@ -1211,7 +1213,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
if (!empty($conf->banque->enabled)) {
$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 70);
}
- if (!empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled)) {
+ if (!empty($conf->facture->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) {
$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 80);
}
if (!empty($conf->tax->enabled)) {
@@ -1285,7 +1287,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
// Must match array $sourceList defined into journals_list.php
if ($objp->nature == 2 && !empty($conf->facture->enabled)) $nature = "sells";
- if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) $nature = "purchases";
+ if ($objp->nature == 3 && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) $nature = "purchases";
if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) $nature = "expensereports";
if ($objp->nature == 1) $nature = "various";
@@ -1447,7 +1449,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/asset/list.php?leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');
if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {
- $newmenu->add("/asset/type.php?leftmenu=asset_type&action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->rights->asset->configurer);
+ $newmenu->add("/asset/type.php?leftmenu=asset_type&action=create", $langs->trans("MenuNewTypeAssets"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->setup_advance));
$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);
}
}
@@ -1462,7 +1464,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
// Load translation files required by the page
$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));
- // Bank-Caisse
+ // Bank-Cash account
if (!empty($conf->banque->enabled))
{
$newmenu->add("/compta/bank/list.php?leftmenu=bank&mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank');
@@ -1482,14 +1484,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
}
- // Prelevements
+ // Direct debit order
if (!empty($conf->prelevement->enabled))
{
$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank", $langs->trans("StandingOrders"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');
if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
- //$newmenu->add("/compta/prelevement/demandes.php?status=0&mainmenu=bank",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire);
-
$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);
$newmenu->add("/compta/prelevement/bons.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
@@ -1501,7 +1501,22 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
}
}
- // Gestion cheques
+ // Bank transfer order
+ if (!empty($conf->paymentbybanktransfer->enabled))
+ {
+ $newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->paymentbybanktransfer->read, '', $mainmenu, 'banktransfer');
+
+ if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {
+ $newmenu->add("/compta/paymentbybanktransfer/create.php?mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->rights->paymentbybanktransfer->create);
+
+ $newmenu->add("/compta/paymentbybanktransfer/bons.php?mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);
+ $newmenu->add("/compta/paymentbybanktransfer/list.php?mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->rights->paymentbybanktransfer->read);
+ $newmenu->add("/compta/paymentbybanktransfer/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->paymentbybanktransfer->read);
+ $newmenu->add("/compta/paymentbybanktransfer/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->paymentbybanktransfer->read);
+ }
+ }
+
+ // Management of checks
if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)))
{
$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');
@@ -1905,40 +1920,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, (empty($user->socid) ? 0 : 1), 'eldy', $tabMenu);
//var_dump($newmenu->liste); //
- // We update newmenu for special dynamic menus
- if (!empty($user->rights->banque->lire) && $mainmenu == 'bank') // Entry for each bank account
- {
- require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
- $sql = "SELECT rowid, label, courant, rappro";
- $sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
- $sql .= " WHERE entity = ".$conf->entity;
- $sql .= " AND clos = 0";
- $sql .= " ORDER BY label";
-
- $resql = $db->query($sql);
- if ($resql)
- {
- $numr = $db->num_rows($resql);
- $i = 0;
-
- if ($numr > 0) $newmenu->add('/compta/bank/list.php', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);
-
- while ($i < $numr)
- {
- $objp = $db->fetch_object($resql);
- $newmenu->add('/compta/bank/card.php?id='.$objp->rowid, $objp->label, 1, $user->rights->banque->lire);
- if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos)) // If not cash account and not closed and can be reconciliate
- {
- $newmenu->add('/compta/bank/bankentries_list.php?action=reconcile&contextpage=banktransactionlist-'.$objp->rowid.'&account='.$objp->rowid.'&id='.$objp->rowid.'&search_conciliated=0', $langs->trans("Conciliate"), 2, $user->rights->banque->consolidate);
- }
- $i++;
- }
- }
- else dol_print_error($db);
- $db->free($resql);
- }
-
if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') // Entry for FTP
{
$MAXFTP = 20;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 96c334a1de7..5276a509ae5 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -308,8 +308,6 @@ class MenuManager
$lastlevel2[$val2['level']] = 'greyed';
}
}
- //var_dump($val2['level']);
- //var_dump($lastlevel2);
print $val2['titre'];
if ($relurl2)
{
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index cd3fe7922ee..24811ad854d 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2279,7 +2279,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($this)));
print '
-
+
';
@@ -2295,9 +2295,17 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
{
print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
}
- print '
getVersion(1).'">';
- print $this->getVersion(1);
- print ' ';
+
+ $version = $this->getVersion(0);
+ $versiontrans = '';
+ if (preg_match('/development/i', $version)) $versiontrans .= 'warning';
+ if (preg_match('/experimental/i', $version)) $versiontrans .= 'warning';
+ if (preg_match('/deprecated/i', $version)) $versiontrans .= 'warning';
+ if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
+ print '
getVersion(1).'">';
+ print $this->getVersion(1);
+ print ' ';
+ }
/*print '
';
print '';
@@ -2313,8 +2321,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
print '
-
'.$this->getName().'
-
'.nl2br($this->getDesc()).' ';
+
'.$this->getName().'
+
'.nl2br($this->getDesc()).' ';
/*print '
getVersion(1).'">';
print $this->getVersion(1);
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index b8b458c4b2a..1fb4e33a6c6 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -174,7 +174,7 @@ class CommActionRapport
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
- $nbpage = $this->_pages($pdf, $outputlangs); // Write content
+ $nbpage = $this->_pages($pdf, $outputlangs); // Write content
if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 0ce2f2bbbb2..23868eef643 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -227,14 +227,14 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$posY += 2;
$pdf->SetXY($this->marge_gauche, $posY);
- $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").')'.' : '.$object->rum, 0, 'L');
+ $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").') : '.$object->rum, 0, 'L');
$posY = $pdf->GetY();
$posY += 2;
$pdf->SetXY($this->marge_gauche, $posY);
$ics = '';
if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
- $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").')'.' : '.$ics, 0, 'L');
+ $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
$posY = $pdf->GetY();
$posY += 1;
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 1a8f13ea1af..2e0733f1ba2 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -214,14 +214,14 @@ class pdf_rouget extends ModelePdfExpedition
$objphoto = new Product($this->db);
$objphoto->fetch($object->lines[$i]->fk_product);
- if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+ if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
{
- $pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product') . $object->lines[$i]->fk_product ."/photos/";
+ $pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
$dir = $conf->product->dir_output.'/'.$pdir;
}
else
{
- $pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
+ $pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
$dir = $conf->product->dir_output.'/'.$pdir;
}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index cf6bc12b9a1..3a66a8ae961 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -354,12 +354,12 @@ class pdf_standard extends ModeleExpenseReport
// Loop on each lines
$i = 0;
while ($i < $nblines) {
- $pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
+ $pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
$pdf->SetTextColor(0, 0, 0);
$pdf->setTopMargin($tab_top_newpage);
if (empty($showpricebeforepagebreak)) {
- $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+ $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
} else {
$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
}
@@ -385,8 +385,8 @@ class pdf_standard extends ModeleExpenseReport
$pdf->setPage($pageposafter + 1);
$showpricebeforepagebreak = 1;
$nexY = $tab_top_newpage;
- $nexY += ($pdf->getFontSize() * 1.3); // Passe espace entre les lignes
- $pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
+ $nexY += ($pdf->getFontSize() * 1.3); // Passe espace entre les lignes
+ $pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
$pdf->SetTextColor(0, 0, 0);
$pdf->setTopMargin($tab_top_newpage);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index dcb6cc33a96..cf91ec4806c 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -356,7 +356,7 @@ class pdf_crabe extends ModelePDFFactures
if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
// Set certificate
- $cert=empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+ $cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
// If use has no certificate, we try to take the company one
if (!$cert) {
$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
@@ -372,7 +372,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
}
- $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+ $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Set $this->atleastonediscount if you have at least one discount
for ($i = 0; $i < $nblines; $i++)
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 85392dd21fa..de32e84d43a 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -462,39 +462,39 @@ class ImportCsv extends ModeleImports
$errorforthistable++;
$error++;
}*/
- $param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
+ $param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
}
call_user_func_array(array($classinstance, $method), $param_array);
// If not found, try the fetch from label
- if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
+ if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
{
$param_array = array('', '', $newval);
call_user_func_array(array($classinstance, $method), $param_array);
}
- $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
+ $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
if ($classinstance->id != '') // id may be 0, it is a found value
{
- $newval=$classinstance->id;
+ $newval = $classinstance->id;
}
else
{
- if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
- elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
- else $this->errors[$error]['lib']='ErrorBadDefinitionOfImportProfile';
- $this->errors[$error]['type']='FOREIGNKEY';
+ if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+ elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+ else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+ $this->errors[$error]['type'] = 'FOREIGNKEY';
$errorforthistable++;
$error++;
}
}
}
}
- elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeandlabel')
+ elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
{
- $isidorref='id';
- if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i', $newval)) $isidorref='ref';
- $newval=preg_replace('/^(id|ref):/i', '', $newval);
+ $isidorref = 'id';
+ if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+ $newval = preg_replace('/^(id|ref):/i', '', $newval);
if ($isidorref == 'ref') {
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index f2fc9af2f9e..911a4bbd5b9 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -50,7 +50,7 @@ class modAdherent extends DolibarrModules
$this->numero = 310;
$this->family = "hr";
- $this->module_position = '55';
+ $this->module_position = '06';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Management of members of a foundation or association";
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index 1efeec1ff43..c11cf34d257 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -69,7 +69,7 @@ class modAsset extends DolibarrModules
// Name of image file used for this module.
// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
- $this->picto = 'generic';
+ $this->picto = 'accounting';
// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
// for default path (eg: /asset/core/xxxxx) (0=disable, 1=enable)
@@ -103,7 +103,7 @@ class modAsset extends DolibarrModules
// 1=>array('ASSETS_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
// );
$this->const = array(
- 1=>array('ASSET_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+ //1=>array('ASSET_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
);
@@ -200,7 +200,7 @@ class modAsset extends DolibarrModules
$this->rights[$r][1] = 'Setup types of asset'; // Permission label
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
- $this->rights[$r][4] = 'advanced_configurer'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+ $this->rights[$r][4] = 'setup_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
// Menus
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index b51ac199ff5..822ebd81e03 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -143,6 +143,7 @@ class modBanque extends DolibarrModules
//--------
$r = 0;
+ // Bank lines
$r++;
$this->export_code[$r] = $this->rights_class.'_'.$r;
$this->export_label[$r] = 'Ecritures bancaires et releves';
@@ -174,6 +175,7 @@ class modBanque extends DolibarrModules
$this->export_sql_end[$r] .= ' AND ba.entity IN ('.getEntity('bank_account').')';
$this->export_sql_order[$r] = ' ORDER BY b.datev, b.num_releve';
+ //
$r++;
$this->export_code[$r] = $this->rights_class.'_'.$r;
$this->export_label[$r] = 'Bordereaux remise Chq/Fact';
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 61a4dd67d5c..4f0c1e04307 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -120,7 +120,7 @@ class modCategorie extends DolibarrModules
$this->export_code[$r] = 'category_'.$r;
$this->export_label[$r] = 'CatSupList';
$this->export_icon[$r] = 'category';
- $this->export_enabled[$r] = '$conf->fournisseur->enabled';
+ $this->export_enabled[$r] = '!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)';
$this->export_permission[$r] = array(array("categorie", "lire"), array("fournisseur", "lire"));
$this->export_fields_array[$r] = array(
'u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix",
@@ -423,7 +423,7 @@ class modCategorie extends DolibarrModules
);
$typeexample = "";
if ($conf->product->enabled) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
- if ($conf->fournisseur->enabled) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
+ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
if ($conf->societe->enabled) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
if ($conf->adherent->enabled) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
$this->import_examplevalues_array[$r] = array(
@@ -491,7 +491,7 @@ class modCategorie extends DolibarrModules
$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"Imported category", 'cs.fk_socpeople'=>"123");
}
- if (!empty($conf->fournisseur->enabled))
+ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
{
// Suppliers
$r++;
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 5190c8c4d72..345a292cb92 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -55,7 +55,7 @@ class modCollab extends DolibarrModules
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of image file used for this module.
- $this->picto = 'globe';
+ $this->picto = 'website';
// Data directories to create when module is enabled
$this->dirs = array("/collab/temp");
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index c548b18fffb..5c9ca314bef 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -51,7 +51,7 @@ class modCommande extends DolibarrModules
$this->numero = 25;
$this->family = "crm";
- $this->module_position = '23';
+ $this->module_position = '11';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Gestion des commandes clients";
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 7aadc941180..d3b1c56b054 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -47,7 +47,7 @@ class modContrat extends DolibarrModules
$this->numero = 54;
$this->family = "crm";
- $this->module_position = '35';
+ $this->module_position = '41';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Gestion des contrats de services";
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 003fd61b578..88b7400cc36 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -54,7 +54,7 @@ class modDon extends DolibarrModules
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of png file (without png) used for this module.
// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
- $this->picto = 'bill';
+ $this->picto = 'donation';
// Data directories to create when module is enabled
$this->dirs = array("/don/temp");
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index cba555391d7..ce8ea9436e8 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -282,8 +282,10 @@ class modEmailCollector extends DolibarrModules
$tmpresql = $this->db->query($tmpsql);
if ($tmpresql) {
if ($this->db->num_rows($tmpresql) == 0) {
+ $descriptionA1 = 'This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated.';
+ $descriptionA1 .= ' If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.';
$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
- $sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Ticket_Requets', 'Example to collect ticket requests', 'This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+ $sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Ticket_Requets', 'Example to collect ticket requests', '".$this->db->escape($descriptionA1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
$sqlforexampleA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
$sqlforexampleA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
$sqlforexampleA3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
@@ -301,8 +303,9 @@ class modEmailCollector extends DolibarrModules
$tmpresql = $this->db->query($tmpsql);
if ($tmpresql) {
if ($this->db->num_rows($tmpresql) == 0) {
+ $descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.';
$sqlforexampleB1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
- $sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses', 'Example to collect any email responses', 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+ $sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses', 'Example to collect any email responses', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
$sqlforexampleB2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses' and entity = ".$conf->entity."), 'withtrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
$sqlforexampleB3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
@@ -317,8 +320,11 @@ class modEmailCollector extends DolibarrModules
$tmpresql = $this->db->query($tmpsql);
if ($tmpresql) {
if ($this->db->num_rows($tmpresql) == 0) {
+ $descriptionC1 = "This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated.";
+ $descriptionC1 .= " If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2010-2011 Juanjo Menent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see \r\n\r\n\r\n\r\n\r\nFacture \r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n';
$sql = array(
"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
"DELETE FROM ".MAIN_DB_PREFIX."printer_receipt_template WHERE name = '".$langs->trans('Example')."';",
- "INSERT INTO ".MAIN_DB_PREFIX."printer_receipt_template (name,template,entity) VALUES ('".$langs->trans('Example')."', '\r\n\r\n\r\n\r\n\r\nFacture \r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n', 1);",
+ "INSERT INTO ".MAIN_DB_PREFIX."printer_receipt_template (name,template,entity) VALUES ('".$langs->trans('Example')."', '".$templateexample."', 1);",
);
return $this->_init($sql, $options);
}
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 637afae049d..c09915febb8 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -197,7 +197,8 @@ class modReception extends DolibarrModules
$this->export_entities_array[$r] = array(
's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company',
'd.nom'=>'company', 'co.label'=>'company', 'co.code'=>'company', 's.fk_pays'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.siret'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company',
- 'c.rowid'=>"reception", 'c.ref'=>"reception", 'c.ref_supplier'=>"reception", 'c.fk_soc'=>"reception", 'c.date_creation'=>"reception", 'c.date_delivery'=>"reception", 'c.tracking_number'=>'reception', 'c.height'=>"reception", 'c.width'=>"reception", 'c.size'=>'reception', 'c.size_units'=>'reception', 'c.weight'=>"reception", 'c.weight_units'=>'reception', 'c.fk_statut'=>"reception", 'c.note_public'=>"reception", 'ed.rowid'=>'reception_line', 'ed.comment'=>'reception_line', 'ed.qty'=>"reception_line",
+ 'c.rowid'=>"reception", 'c.ref'=>"reception", 'c.ref_supplier'=>"reception", 'c.fk_soc'=>"reception", 'c.date_creation'=>"reception", 'c.date_delivery'=>"reception", 'c.tracking_number'=>'reception', 'c.height'=>"reception", 'c.width'=>"reception", 'c.size'=>'reception', 'c.size_units'=>'reception', 'c.weight'=>"reception", 'c.weight_units'=>'reception', 'c.fk_statut'=>"reception", 'c.note_public'=>"reception",
+ 'ed.rowid'=>'reception_line', 'ed.comment'=>'reception_line', 'ed.qty'=>"reception_line",
'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product', 'p.weight'=>'product', 'p.weight_units'=>'product', 'p.volume'=>'product', 'p.volume_units'=>'product'
);
if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 7d64a1a7499..a9be157d126 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -451,7 +451,7 @@ class modSociete extends DolibarrModules
's.fk_multicurrency' => 'MulticurrencyUsed',
's.multicurrency_code' => 'MulticurrencyCurrency'
);
- if (! empty($conf->global->PRODUIT_MULTIPRICES)) $this->import_fields_array[$r]['s.price_level']='PriceLevel';
+ if (!empty($conf->global->PRODUIT_MULTIPRICES)) $this->import_fields_array[$r]['s.price_level'] = 'PriceLevel';
// Add extra fields
$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
$resql = $this->db->query($sql);
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 8c0f92b8db1..4dd1a740278 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -48,7 +48,7 @@ class modStock extends DolibarrModules
$this->numero = 52;
$this->family = "products";
- $this->module_position = '40';
+ $this->module_position = '39';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Gestion des stocks";
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 1fc755455de..0b5e54e9637 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -122,7 +122,12 @@ class modTicket extends DolibarrModules
'langs' => 'ticket',
'tabname' => array(MAIN_DB_PREFIX."c_ticket_type", MAIN_DB_PREFIX."c_ticket_severity", MAIN_DB_PREFIX."c_ticket_category", MAIN_DB_PREFIX."c_ticket_resolution"),
'tablib' => array("TicketDictType", "TicketDictSeverity", "TicketDictCategory", "TicketDictResolution"),
- 'tabsql' => array('SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_category as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'),
+ 'tabsql' => array(
+ 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
+ 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
+ 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
+ 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
+ ),
'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
'tabfield' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
'tabfieldvalue' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 3e3b4bae374..60cc93b5d39 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -55,7 +55,7 @@ class modWebsite extends DolibarrModules
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of image file used for this module.
- $this->picto = 'globe';
+ $this->picto = 'website';
// Data directories to create when module is enabled
$this->dirs = array("/website/temp");
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 5031b4079e4..80bc9f7ce0a 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -61,6 +61,9 @@ abstract class ModelePDFProduct extends CommonDocGenerator
}
}
+/**
+ * Class template for classes of numbering product
+ */
abstract class ModeleProductCode
{
/**
@@ -97,7 +100,6 @@ abstract class ModeleProductCode
*/
public function getExample($langs)
{
- $langs->load("bills");
return $langs->trans("NoExample");
}
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 9cfc52fc1de..542ea728f84 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -41,8 +41,8 @@ if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/p
if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
if (!empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
if (!empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
@@ -1008,13 +1008,13 @@ class doc_generic_project_odt extends ModelePDFProjects
'title' => "ListSupplierOrdersAssociatedProject",
'table' => 'commande_fournisseur',
'class' => 'CommandeFournisseur',
- 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
+ 'test' => (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire
),
'invoice_supplier' => array(
'title' => "ListSupplierInvoicesAssociatedProject",
'table' => 'facture_fourn',
'class' => 'FactureFournisseur',
- 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
+ 'test' => (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire
),
'contract' => array(
'title' => "ListContractAssociatedProject",
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 707609767f5..4044676461e 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -34,17 +34,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (!empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-if (!empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 8a38450697f..9b7b15a884d 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -130,7 +130,7 @@ class doc_generic_task_odt extends ModelePDFTask
public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
{
// phpcs:enable
- global $conf;
+ global $conf, $extrafields;
$resarray = array(
$array_key.'_id'=>$object->id,
@@ -150,11 +150,6 @@ class doc_generic_task_odt extends ModelePDFTask
// Retrieve extrafields
if (is_array($object->array_options) && count($object->array_options))
{
- $extrafieldkey = $object->element;
-
- require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafields = new ExtraFields($this->db);
- $extrafields->fetch_name_optionals_label($extrafieldkey, true);
$object->fetch_optionals();
$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
@@ -167,16 +162,17 @@ class doc_generic_task_odt extends ModelePDFTask
/**
* Define array with couple substitution key => substitution value
*
- * @param array $task Task Object
+ * @param Task $task Task Object
* @param Translate $outputlangs Lang object to use for output
+ * @param string $array_key Name of the key for return array
* @return array Return a substitution array
*/
- public function get_substitutionarray_tasks($task, $outputlangs)
+ public function get_substitutionarray_tasks($task, $outputlangs, $array_key = 'task')
{
// phpcs:enable
- global $conf;
+ global $conf, $extrafields;
- return array(
+ $resarray = array(
'task_ref'=>$task->ref,
'task_fk_project'=>$task->fk_project,
'task_projectref'=>$task->projectref,
@@ -184,7 +180,10 @@ class doc_generic_task_odt extends ModelePDFTask
'task_label'=>$task->label,
'task_description'=>$task->description,
'task_fk_parent'=>$task->fk_parent,
- 'task_duration'=>$task->duration,
+ 'task_duration'=>$task->duration_effective,
+ 'task_duration_formated'=>convertSecondToTime($task->duration_effective, 'allhourmin'),
+ 'task_planned_workload'=>$task->planned_workload,
+ 'task_planned_workload_formated'=>convertSecondToTime($task->planned_workload, 'allhourmin'),
'task_progress'=>$task->progress,
'task_public'=>$task->public,
'task_date_start'=>dol_print_date($task->date_start, 'day'),
@@ -192,6 +191,16 @@ class doc_generic_task_odt extends ModelePDFTask
'task_note_private'=>$task->note_private,
'task_note_public'=>$task->note_public
);
+
+ // Retrieve extrafields
+ if (is_array($task->array_options) && count($task->array_options))
+ {
+ $task->fetch_optionals();
+
+ $resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, $array_key, $outputlangs);
+ }
+
+ return $resarray;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -474,7 +483,6 @@ class doc_generic_task_odt extends ModelePDFTask
if (!file_exists($dir))
{
- print '$dir'.$dir;
if (dol_mkdir($dir) < 0)
{
$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 2377e537606..103d0fdffba 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2003-2006 Rodolphe Quiedeville
* Copyright (C) 2006-2014 Laurent Destailleur
* Copyright (C) 2015-2018 Charlene BENKE
+ * Copyright (C) 2020 Maxime DEMAREST
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -207,7 +208,11 @@ class pdf_paiement
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
- $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
+ // If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
+ if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD))
+ $sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC";
+ else
+ $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
break;
case "fourn":
$sql = "SELECT p.datep as dp, f.ref as ref";
@@ -237,7 +242,11 @@ class pdf_paiement
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
- $sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+ // If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
+ if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))
+ $sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
+ else
+ $sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
break;
}
@@ -425,7 +434,7 @@ class pdf_paiement
public function Body(&$pdf, $page, $lines, $outputlangs)
{
// phpcs:enable
- global $langs;
+ global $langs, $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('', '', $default_font_size - 1);
@@ -435,6 +444,11 @@ class pdf_paiement
$pdf->SetFillColor(220, 220, 220);
$yp = 0;
$numlines = count($lines);
+ if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD)))
+ {
+ $mod = $lines[0][2];
+ $total_mod = 0;
+ }
for ($j = 0; $j < $numlines; $j++)
{
$i = $j;
@@ -450,8 +464,17 @@ class pdf_paiement
{
if ($yp > $this->tab_height - 15)
{
- $pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $langs->transnoentities('SubTotal')." : ".price($total_page), 0, 'R', 0);
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+ $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+ $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+ $pdf->SetFont('', 'B', $default_font_size - 1);
+ $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+ $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
+ $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', 1);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetFillColor(220, 220, 220);
$page++;
$pdf->AddPage();
$this->_pagehead($pdf, $page, 0, $outputlangs);
@@ -474,6 +497,7 @@ class pdf_paiement
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][4], 0, 'R', 1);
$yp = $yp + 5;
$total_page += $lines[$j][9];
+ if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) $total_mod += $lines[$j][9];
}
// Invoice number
@@ -497,9 +521,44 @@ class pdf_paiement
{
$oldprowid = $lines[$j][7];
}
+
+ // Add line to add total by payment mode if mode reglement for nex line change
+ if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2]))
+ {
+ $pdf->SetFillColor(245, 245, 245);
+ $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+ $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+ $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+ $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+ $pdf->SetFont('', 'I', $default_font_size - 1);
+ $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
+ $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', 1);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $mod = $lines[$j + 1][2];
+ $total_mod = 0;
+ $yp = $yp + 5;
+ if ($yp > $this->tab_height - 5)
+ {
+ $page++;
+ $pdf->AddPage();
+ $this->_pagehead($pdf, $page, 0, $outputlangs);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $yp = 0;
+ }
+ $pdf->SetFillColor(220, 220, 220);
+ }
}
$total += $total_page;
- $pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $langs->transnoentities('Total')." : ".price($total), 0, 'R', 0);
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+ $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+ $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+ $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+ $pdf->SetFont('', 'B');
+ $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
+ $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', 1);
+ $pdf->SetFillColor(220, 220, 220);
}
}
diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php
index 348417dd345..accb8eeed00 100644
--- a/htdocs/core/tools.php
+++ b/htdocs/core/tools.php
@@ -46,7 +46,7 @@ $text = $langs->trans("Tools");
print load_fiche_titre($text, '', 'wrench');
// Show description of content
-print ''.$langs->trans("ToolsDesc").'
'.$langs->trans("ToolsDesc").'
';
print ''.$langs->trans("AdvTgtStartDt").' ';
- print $form->selectDate('', 'options_'.$key.'_st_dt'.'_cnct');
+ print $form->selectDate('', 'options_'.$key.'_st_dt_cnct');
print ' '.$langs->trans("AdvTgtEndDt").' ';
- print $form->selectDate('', 'options_'.$key.'_end_dt'.'_cnct');
+ print $form->selectDate('', 'options_'.$key.'_end_dt_cnct');
print '
';
print ''."\n";
print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
diff --git a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
index 6595223083e..4f435bb2106 100644
--- a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
+++ b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
@@ -53,7 +53,7 @@ $(document).ready(function(){
});
- var $dialog = $('')
+ var $dialog = $('')
.load( page + " #tablelines", function() {
$("#" + formId + " #tablelines").prop("id", "ajaxloaded_tablelines"); // change id attribute
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 97612645b7d..32f6e67cb00 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -70,14 +70,14 @@ if ($action == 'delete')
);
}
-$formfile=new FormFile($db);
+$formfile = new FormFile($db);
// We define var to enable the feature to add prefix of uploaded files.
// Caller of this include can make
// $savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) {
- $savingdocmask='';
+ $savingdocmask = '';
if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) {
//var_dump($modulepart);
if (in_array($modulepart, array(
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index b53bb6276b1..03d487ee0c0 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -36,7 +36,7 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
{
$mode_search = 0;
- if (in_array($typ, array('int', 'double', 'real'))) $mode_search = 1; // Search on a numeric
+ if (in_array($typ, array('int', 'double', 'real', 'price'))) $mode_search = 1; // Search on a numeric
if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search = 4; // Search on a multiselect field with sql type = text
if (is_array($crit)) $crit = implode(' ', $crit); // natural_search() expects a string
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index e6cbad245d9..198a3910747 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -52,8 +52,12 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
{
$lastseparatorkeyfound = '';
$extrafields_collapse_num = '';
+ $extrafields_collapse_num_old = '';
+ $i = 0;
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
{
+ $i++;
+
// Discard if extrafield is a hidden field on form
$enabled = 1;
@@ -65,6 +69,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
{
$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
}
+
$perms = 1;
if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
{
@@ -87,6 +92,8 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
$value = $object->array_options["options_".$key];
//var_dump($key.' - '.$value);
}
+
+ // Print line tr of extra field
if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
{
$extrafields_collapse_num = '';
@@ -109,13 +116,20 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
}
else
{
- print ' 
-
-
';
}
@@ -308,16 +303,16 @@ class Dolistore
//.'
// become
// 
- $newfreetext = preg_replace('/(
