Commit Graph

303 Commits

Author SHA1 Message Date
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Laurent Destailleur
3ab82a93ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2022-07-08 10:20:55 +02:00
Laurent Destailleur
7741826d34 phpcs 2022-07-07 23:09:39 +02:00
Laurent Destailleur
63ce535deb Merge pull request #21448 from atm-jpb/patch-1
# FIX : rank duplicate on mass action
2022-07-07 20:57:51 +02:00
Laurent Destailleur
5afe1dbb84 Update actions_massactions.inc.php 2022-07-07 20:57:29 +02:00
Laurent Destailleur
2f269c75de Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/bills.lang
2022-07-07 20:12:23 +02:00
jpb
ea52403339 rank change. if we only have one order we leave the origin rank otherwise we leave the -1 and let the class set the max rank. 2022-07-07 11:08:01 +02:00
Juanjo Menent
4f091c4394 Fix: PHP Fatal error: Call to undefined function getOnlineSignatureUrl() 2022-07-05 17:11:02 +02:00
stickler-ci
244a3fc819 Fixing style errors. 2022-07-04 15:22:40 +00:00
boudet jean pascal
5dabcec767 rank duplicate on mass action
#### rank duplicate on mass action  invoice from multiple orders

we have to  define the max rank for each line which makes it possible not to have a duplicate on the rank field in the case of several order massaction request.
2022-07-04 17:17:55 +02:00
Laurent Destailleur
4b79d91437 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:35:24 +02:00
Florian HENRY
98ee53c4b1 fix: massaction delete on actioncomm list do not call delete with good paramters 2022-06-22 15:13:13 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
atm-greg
c2ee562c89 add missing CMailFile class requirement 2022-05-18 14:47:12 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
GregM
ac1fcf290e update 2022-05-04 17:24:37 +02:00
GregM
885324629f commit resolve conflict 2022-05-04 17:10:39 +02:00
Laurent Destailleur
2bc958efe3 Merge pull request #20686 from Easya-Solutions/new-mass-action-send-last-main-doc
NEW Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
2022-05-04 01:17:20 +02:00
lvessiller
bcc645ce38 NEW const MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND for mailing mass action 2022-05-02 10:50:48 +02:00
Laurent Destailleur
fa8ce6e4fd Merge pull request #20710 from fappels/develop_confirm_createbills
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
2022-04-29 17:19:18 +02:00
John BOTELLA
56bab82219 add js on change action 2022-04-29 16:43:40 +02:00
John BOTELLA
02cf3fa361 end factoring 2022-04-29 15:38:12 +02:00
John BOTELLA
8b248c75f2 Factor save 2022-04-29 15:10:15 +02:00
GregM
3e4cd251ea add edit extrafields Massaction products 2022-04-29 11:45:50 +02:00
dolibarr95
c969cef731 NEW : Send email to the supplier order contact
Select the recipient defined in object contact (Vendor contact following-up order / Contact fournisseur suivi commande) in order to send email to the specific contact and not to generic company email (as for invoice/bill)
2022-04-27 10:09:22 +02:00
Francis Appels
e6ce81bf8b Move confirm_createbills mass action to order list 2022-04-25 11:20:00 +02:00
lvessiller
2992b3e845 NEW send last document in mass mailing action 2022-04-22 09:24:23 +02:00
lmarcouiller
d41676cf8b Close #20609 : new massaction asign sale representative 2022-04-12 13:57:00 +02:00
Laurent Destailleur
dd6238cb2d Try to save on fetch 2022-04-11 15:24:39 +02:00
javierybar
d7da57960f FIX Tax 2 is lost when order is invoiced 2022-04-10 15:33:35 +02:00
Laurent Destailleur
5960d5971c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-04 10:49:51 +02:00
Laurent Destailleur
1c71a8da1e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-03 17:27:15 +02:00
kamel
11d4e85a39 FIX - Fiw default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions 2022-04-01 16:52:59 +02:00
Laurent Destailleur
636188f28a Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date
NEW: check invoice date
2022-03-29 16:07:31 +02:00
Laurent Destailleur
7aeaaab7f0 Merge pull request #20365 from gdsoftdev/fix_invoicelineorders
Fix : keep row order into invoices created from massactions
2022-03-17 13:37:17 +01:00
Jé GDSOFT
ffa6cb0610 fix : keep lines order when creating invoices from orders 2022-03-15 15:47:36 +01:00
Thomas Negre
7f527b85b0 use double quotes to compose SQL requests 2022-03-09 09:34:50 +01:00
Thomas Negre
93765add38 Travis fix, hopefully. 2022-03-09 09:25:52 +01:00
Thomas Negre
288663be36 Facture mass validation: sort by date to avoid conflicts 2022-03-09 09:25:52 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
0e9b707801 Fix #19249 : wrong payment cond and mode on mass order billing 2021-12-28 11:57:26 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +01:00
Marc de Lima Lucio
f5343c55c3 FIX: holiday mass deletion: correct return of record deleted 2021-11-26 18:23:31 +01:00