diff --git a/.travis.yml b/.travis.yml
index 688d706331d..9958556d42d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -404,6 +404,10 @@ script:
php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
+ php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
+ php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
+ php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
+
# Enable modules not enabled into original dump
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
echo $?
diff --git a/ChangeLog b/ChangeLog
index 68cd7695057..20a1748af6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,83 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
+***** ChangeLog for 11.0.4 compared to 11.0.3 *****
+FIX: #13749
+FIX: #7594 Expense report multi pagebreak
+FIX: Access to undeclared static property: Contact::$table_element
+FIX: actions on supplier proposal not saved (bad trigger name)
+FIX: Add function "completeTabsHead" to "addreplace" type hook.
+FIX: All forms must use newToken()
+FIX: Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"
+FIX: author search supplier proposal list
+FIX: A variable was erased by a temporary variable
+FIX: Avoid infinite loop when a fetch is inside a compute field.
+FIX: Backto link
+FIX: Bad position of total in column
+FIX: bad value in currency into discount created from down payment
+FIX: buyprice extrafield langfile and tooltip
+FIX: Buyprice was updated only if min price for this qty had same qty
+FIX: Can switch from double to price type for extrafields
+FIX: Can use decimal value in virtual products
+FIX: child categories only with good entity rights
+FIX: cloning of emailing when no content selected
+FIX: closing tags
+FIX: Combo list of available users to filter on the list of leaves.
+FIX: Compatibility with multicompany, bad numerotation of task.
+FIX: consistency of price w/wo vat wrong when price entered with tax
+FIX: default value of selectMasssAction broken
+FIX: draftordered replenish virtual stock
+FIX: Error update SQL into stock reception
+FIX: expensereport status in generated pdf
+FIX: extra date field incorrect check
+FIX: Extrafields of type price must be '' and not '0' if not defined
+FIX: Foreign currency lost when splitting a discount
+FIX: get remain to pay with rounding decimals
+FIX: gzip and bzip2 must use option -f
+FIX: IHM, unexpected quote
+FIX: keep viewstatut for doli 3.5
+FIX: Link missing into email of some notification
+FIX: Look and feel v11
+FIX: md stylesheet to be included by external modules like eldy
+FIX: missing array option
+FIX: missing default accountancy product buy code
+FIX: missing fk_bank during export of suppliers invoices
+FIX: missing member entity
+FIX: missing selectedlines on supplier order but checkbox are displayed
+FIX: Missing token and take into account max date when it can.
+FIX: model export list must be sorted by label
+FIX: multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
+FIX: Must escape shell
+FIX: Must exclude logs and some dirs for compressed backup
+FIX: ordered stock already in $stock
+FIX: picture migration script from doli 9.0
+FIX: print pictures on shipment docs
+FIX: product get purchase prices
+FIX: product purchase prices
+FIX: Protection when database has a corrupted product id
+FIX: remove unused var, $usercancreate can be change by Multicompany
+FIX: replenish stock to buy
+FIX: Sanitizing menu parameter
+FIX: Send email from bulk action of list of thirdparties
+FIX: setup of suggested payment mode on proposals and orders
+FIX: Several pb in export of documents
+FIX: Situation invoice take into account the credit notes.
+FIX: some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report
+FIX: sort by default role makes no sense
+FIX: sort on company on member list
+FIX: TakePOS buying price
+FIX: text version of html emailing (removed the body style)
+FIX: The "test smtp connectivity" failed on page to setup mass emailing
+FIX: Error logs an Orderline::delete error, but this is an Orderline::insert error
+FIX: Translation of tooltips of extrafields
+FIX: Use getNomURL instead of hard coded link. Fix limit.
+FIX: Use of image into free text for PDF if DOL_DATA_DIR is outside of
+FIX: viewstatut to search status
+FIX: we must export company mail address on contact vcard only if contact email address is empty
+FIX: when we filter a list on a view status, we want this filter to be on bookmark that we create
+FIX: Wrong Sql on getListOfTowns api method
+FIX: wrong user right's name to top menu "commercial"
+FIX: XSS Vulnerability reported by Mehmet Kelepçe / Gais Cyber Security
***** ChangeLog for 12.0.0 compared to 11.0.0 *****
For Users:
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index c06dc51aec1..24b32dcff91 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -19,7 +19,7 @@ use Term::ANSIColor;
# Change this to defined target for option 98 and 99
$PROJECT="dolibarr";
$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+$PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/asso.dolibarr.org/dolibarr_documents/website/www.dolibarr.org/files";
#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
diff --git a/dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf b/dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf
new file mode 100644
index 00000000000..2fbaad04699
Binary files /dev/null and b/dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf differ
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index ad26c7f0bdc..e726df6db7c 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -272,12 +272,7 @@
-
-
-
-
-
+
0
@@ -310,20 +305,21 @@
0
-
+
0
+
- 0
+ 0
-
+
+
0
@@ -332,27 +328,25 @@
0
-
+
+
0
-
- 0
-
+
- 0
+ 0
-
- 0
-
-
- 0
-
+
+ 0
+
- 0
+ 0
-
+
0
- 0
-
+
0
0
-
+
0
@@ -391,16 +385,16 @@
+
+
0
+
0
@@ -411,7 +405,6 @@
0
-
0
@@ -421,15 +414,17 @@
-
-
-
- ';
- // 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 "piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).' piece_num.'&mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).' ';
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/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/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/dict.php b/htdocs/admin/dict.php
index 15cfd9ed9db..cce441c4052 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -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
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 230c588f7e4..a229f3c985d 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -248,11 +248,8 @@ class Dolistore
// phpcs:enable
global $langs, $conf;
$html = "";
- $parity = "pair";
$last_month = time() - (30 * 24 * 60 * 60);
foreach ($this->products as $product) {
- $parity = ($parity == "impair") ? 'pair' : 'impair';
-
// check new product ?
$newapp = '';
if ($last_month < strtotime($product->date_add)) {
@@ -267,7 +264,7 @@ class Dolistore
// add image or default ?
if ($product->id_default_image != '') {
$image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.$product->id.'&id_image='.$product->id_default_image;
- $images = '';
+ $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.' ';
+ // do not load if display none
+ //$html .= ''.$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/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 '
*
* 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
@@ -70,11 +71,12 @@ if ($action == 'setmod')
if ($action == 'setparams')
{
$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS', 'none'); // No alpha here, we want exact string
-
$res = dolibarr_set_const($db, "FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $freetext, 'chaine', 0, '', $conf->entity);
-
if (!$res > 0) $error++;
+ $res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+ if (!$res > 0) $error++;
+
if ($error)
{
setEventMessages($langs->trans("Error"), null, 'errors');
@@ -253,6 +255,14 @@ print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $co
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 " ';
print ''.$langs->trans("SessionTimeOut").' ';
-print $form->textwithpicto('', $langs->trans("SessionExplanation", ini_get("session.gc_probability"), ini_get("session.gc_divisor")));
+if (ini_get("session.gc_probability") == 0) {
+ print $form->textwithpicto('', $langs->trans("SessionsPurgedByExternalSystem", ini_get("session.gc_maxlifetime")));
+} else {
+ print $form->textwithpicto('', $langs->trans("SessionExplanation", ini_get("session.gc_probability"), ini_get("session.gc_divisor"), ini_get("session.gc_maxlifetime")));
+}
print ' ';
print '';
print ' ';
print ' ';
-$sessiontimeout = ini_get("session.gc_maxlifetime");
if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE = "";
print '';
print ''.$langs->trans("MAIN_APPLICATION_TITLE").' ';
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index d533ba0d8eb..5d7a0d0b8d5 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -1,6 +1,7 @@
* Copyright (C) 2016 Laurent Destailleur
+ * 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
@@ -144,6 +145,23 @@ elseif ($action == 'specimen')
}
}
+
+
+elseif ($action == 'setparams')
+{
+ $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+ if (!$res > 0) $error++;
+
+ if ($error)
+ {
+ setEventMessages($langs->trans("Error"), null, 'errors');
+ }
+ if (!$error)
+ {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ }
+}
+
/*
* View
*/
@@ -428,8 +446,46 @@ foreach ($dirmodels as $reldir)
print '';
+/*
+ * Other Options
+ */
+
+print " 
';
} else {
$images = '
';
@@ -306,16 +303,16 @@ class Dolistore
//.'