Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 02:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

171 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
4ca85eacc1 Debug module BOM 2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
3024919cd6 fix phpcs 2019-10-21 10:25:23 +02:00
Laurent Destailleur
6e9f3c3f9d Merge pull request #11084 from atm-florian/dev_MassSendEmailInvoiceToBillingContact 
NEW : mass email action on invoice list use billing contact if exists
 2019-10-20 21:45:37 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
florian HENRY
cab4b2db5b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact 2019-09-02 09:48:08 +02:00
Laurent Destailleur
85016a7a45 Fix bad error when module not enabled 2019-08-28 13:12:43 +02:00
Laurent Destailleur
b05b3e897f Fix bad error when module not enabled 2019-08-28 13:11:51 +02:00
florian HENRY
4c61e3e381 merge develop 2019-08-19 17:23:47 +02:00
Laurent Destailleur
171a173935 Fix phpcs 2019-06-25 14:30:48 +02:00
Laurent Destailleur
700acbeefb Fix phpcs 2019-06-25 13:26:02 +02:00
Laurent Destailleur
736f918bac Fix phpcs 2019-06-25 13:14:11 +02:00
Laurent Destailleur
28024d5cd1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:28:48 +02:00
Laurent Destailleur
3d185b6818 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
Laurent Destailleur
357c5244f7 Fix phpcs 2019-06-13 13:26:35 +02:00
Laurent Destailleur
52159dcb69 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:14:19 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Laurent Destailleur
0bf7512f28 Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
 2019-06-12 12:03:46 +02:00
Maxime Kohlhaas
0ce2c2aab5 Fix missing massaction hook params 2019-06-10 10:11:26 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:58:58 +02:00
Frédéric FRANCE
ca6a624112 avoid warning with php 7.2 2019-06-05 13:55:47 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
Laurent Destailleur
fc37c393ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-02 12:36:48 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Maxime Kohlhaas
d47913ed19 Fix : add refclient on bulk invoicing 2019-05-31 16:33:32 +02:00
atm-ph
c79b9b9704 Fix create bills on mass action does not retrieve the original currency code 2019-05-27 11:18:29 +02:00
florian HENRY
8b1c91912b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact 2019-05-17 16:40:48 +02:00
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-05-08 19:14:31 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
florian HENRY
7af203e519 modifié : ../core/actions_massactions.inc.php 2019-05-03 16:28:44 +02:00
florian HENRY
8dc494890a modifié : ../core/actions_massactions.inc.php 2019-05-03 16:24:25 +02:00
florian HENRY
f2d275614c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact 2019-05-03 09:48:07 +02:00
Laurent Destailleur
263b6cafbc Fix var 2019-05-02 14:03:35 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00