lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,672 Commits 43 Branches 150 Tags 886 MiB
068622bced
Commit Graph

7571 Commits

Author SHA1 Message Date
MOREAU FRANCK
4b8dfc1abe Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 18:11:59 +02:00
MOREAU FRANCK
2e66509245 Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 15:47:20 +02:00
MOREAU FRANCK
207dc1df55 Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 12:34:26 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts 2021-06-06 17:09:35 +02:00
Laurent Destailleur
a1bb7129da Debug v14 2021-06-06 15:29:49 +02:00
Frédéric FRANCE
efb5ec2901
search by name or email 2021-06-06 10:32:04 +02:00
Laurent Destailleur
70af18148b Debug modulebuilder v14 2021-06-05 17:49:01 +02:00
Laurent Destailleur
273c4c2880 Fix typo 2021-06-05 15:28:41 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
ddbfb5d734 Fix translation of note of product 2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836 Fix bad name of var 2021-06-05 11:07:38 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2 
Fix #17743 newpayement source membersubscription is member
 2021-06-04 13:04:17 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning 2021-06-03 08:33:44 +02:00
Laurent Destailleur
0071d63fbb Fix for ro-md language 2021-05-31 13:35:03 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member 
Fix #17743 newpayement source membersubscription is not valid anymore

@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
 2021-05-27 21:09:49 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF 2021-05-27 00:02:01 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
Laurent Destailleur
b9de8561a9 Fix regression 2021-05-25 15:59:36 +02:00
Laurent Destailleur
dd48c3ee9d Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__) 2021-05-25 00:08:06 +02:00
Laurent Destailleur
31af74f852 FIX CWE-269 - huntr - Can download files of an agenda event 2021-05-24 20:07:04 +02:00
Laurent Destailleur
cdf3b7f9a8 Fix responsive 2021-05-24 19:05:25 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Laurent Destailleur
a3c28edfbb Fix regenerate wrapper when rebuilding cache 2021-05-20 10:34:49 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Laurent Destailleur
92ccf5982a Fix responsive 2021-05-19 14:38:39 +02:00
Laurent Destailleur
8f5c898dae CSS 2021-05-19 14:13:42 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
78cf2b59c8 Debug feature copy-paste on smarpthone 2021-05-19 11:47:58 +02:00
Laurent Destailleur
271ba884db css 2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918 css 2021-05-18 17:00:20 +02:00
Laurent Destailleur
c2cb055b0a Fix look and feel v14 2021-05-18 14:00:29 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Laurent Destailleur
ba0e95a4ff FIX huntr CWE-79 2021-05-17 23:47:16 +02:00
Laurent Destailleur
d888e4b3bf
Merge pull request #17385 from Givriz/dev_1 
Compatibility phpv8
 2021-05-17 16:29:49 +02:00
Laurent Destailleur
f25c57b1f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496 Fix colors 2021-05-17 11:26:31 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1 
Fix  #17475 : Add of List-Unsubscribe in mass emailing
 2021-05-17 10:23:21 +02:00
Laurent Destailleur
17b08cc22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket 
Fix ticket when module societe not enabled
 2021-05-17 06:59:32 +02:00
Laurent Destailleur
78b38f75a1 Minor fixes 2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590 Add comment 2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Laurent Destailleur
a665ff5bda Copy-Paste works also for hidden fields 2021-05-12 11:51:39 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete 
bug fix - deletion of invoice supplier payment
 2021-05-11 19:27:05 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6 
Fix Title supplier proposal
 2021-05-11 18:18:35 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
Alexandre SPANGARO
427221c8d3 Merge remote-tracking branch 'upstream/develop' into 14b6 2021-05-11 07:02:04 +02:00
Laurent Destailleur
6499270619 v14 2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Laurent Destailleur
a2cd181435 FIX Debug reception module 2021-05-10 11:53:19 +02:00
Alexandre SPANGARO
100b0f297e Fix Title supplier proposal contact card 2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41 Move title to v14 ergonomy 2021-05-10 06:26:58 +02:00
Laurent Destailleur
19bae333c9 Add option MAIN_SHOW_PASSWORD_INTO_LOG 2021-05-09 22:07:08 +02:00
Alexis LAURIER
d04c741a3b add payment_fourn delete proper check into security.lib 2021-05-08 09:12:17 +02:00
lmarcouiller
bf64bde571 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 15:22:10 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
f4291dc985 commit missing file 2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead 
complete $template['head'] in module and return 0 to not replace instead return $head and replace
 2021-05-06 22:28:03 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b Clean code 2021-05-06 18:06:19 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2 
New 5 substitutions keys "online payment link" in mailing
 2021-05-06 16:36:10 +02:00
lmarcouiller
7d649dd90e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-06 16:26:30 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +02:00
Laurent Destailleur
19f78b2e8f More compact gui 2021-05-05 19:13:40 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
stickler-ci
fb3c8e698e Fixing style errors. 2021-05-04 20:59:32 +00:00
daraelmin
b04dfcadc7
Add function to get html online payment link 2021-05-04 21:55:19 +02:00
Laurent Destailleur
bf52b54db6 Add date in error message 2021-05-04 19:43:33 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete 
FIX missing token on dolGetButtonAction for action delete
 2021-05-04 00:21:55 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9 Disable empty tabs 2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate 
New Add option for doctemplate
 2021-05-03 19:45:40 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3 Enhance error management 2021-05-03 19:25:16 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
7b706d6fe5 Fix phpunit for crop of image 2021-05-03 15:56:56 +02:00
Laurent Destailleur
c6a9117a00 Graph color 2021-05-03 14:03:50 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2 
Close #17271 : Replacement of 2 graphes in /compta/index.php
 2021-05-03 13:56:44 +02:00
Laurent Destailleur
2a47128e2d Code comment 2021-05-03 11:00:41 +02:00
Laurent Destailleur
2bef447229 Clean code 2021-05-02 16:24:52 +02:00
Laurent Destailleur
efda17657d Fix conversion in webp 2021-05-02 15:29:52 +02:00
Laurent Destailleur
39f7d0bed8 Fix conversion of images 2021-05-02 15:15:27 +02:00
Laurent Destailleur
a54e60d345 Look and feel v14 2021-05-02 13:13:55 +02:00