Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
103,106 Commits 36 Branches 190 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

7144 Commits

Author SHA1 Message Date
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
865ecf7a94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 14:58:50 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
e472d2d5d1 Fix bad permission position for external modules 2021-05-19 12:44:26 +02:00
gmilad
57732d4265 Fix issue #17608 for branch 10 
Fix issue #17608 for branch 10
 2021-05-18 19:45:15 +02:00
Damien BENOIT
38a5dfb263 Update listevents.php 
Added $optioncss
 2021-05-18 15:26:55 +02:00
Damien BENOIT
e7ac39fe35 Update modules.php 
Added $param
 2021-05-18 15:23:29 +02:00
Laurent Destailleur
f51e892a97 Fix phpcs 2021-05-18 02:06:35 +02:00
Laurent Destailleur
de6134965b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 19:50:19 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Givriz
6bbd6db84b Compatibility phpv8 2021-05-17 18:39:08 +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
caea6f8d6c Update listevents.php 2021-05-17 16:29:00 +02:00
Laurent Destailleur
caf1c625a3 Update listevents.php 2021-05-17 16:28:19 +02:00
Laurent Destailleur
c8758c53d2 Update listevents.php 2021-05-17 16:27:14 +02:00
Laurent Destailleur
68fe68b844 Update listevents.php 2021-05-17 16:25:25 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Ferran Marcet
f923c70f38 Fix: Before there was no mistake 2021-05-17 10:17:54 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f FIX #17602 2021-05-17 09:25:18 +02:00
Laurent Destailleur
af2f40cc18 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 09:15:21 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Ferran Marcet
c577d1c51e FIX: Impossible to add multiple localtax2 2021-05-13 13:35:28 +02:00
Laurent Destailleur
9eda9c1e21 Enhance setup 2021-05-12 19:55:16 +02:00
Givriz
81d899947d Update listevents.php 2021-05-12 18:41:41 +02:00
Frédéric FRANCE
4c77e07a1b Merge remote-tracking branch 'upstream/develop' into filecheck 2021-05-11 18:04:04 +02:00
Laurent Destailleur
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Frédéric FRANCE
0d3afb573a align check code 2021-05-10 14:33:26 +02:00
Gauthier PC portable 024
f9afe7e81a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-05-10 09:17:15 +02:00
Laurent Destailleur
a349f6c6e7 Fix hide a non ready feature 2021-05-09 20:30:42 +02:00
Laurent Destailleur
ff14d2817d css 2021-05-07 14:08:39 +02:00
Frédéric FRANCE
7b8d4c2656 phpcs 2021-05-06 20:32:41 +02:00
Laurent Destailleur
457050f1c5 Add pen to edit dictionary 2021-05-06 18:45:20 +02:00
Laurent Destailleur
b8b6919cb0 Fix label of dictionaries 2021-05-06 18:41:27 +02:00
Laurent Destailleur
3e34557066 Clean code 2021-05-06 18:36:02 +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
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +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
7a76dc4648 Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
e1498ca7ef Clean code 2021-05-05 01:26:06 +02:00
Laurent Destailleur
f37033b1f4 CSS 2021-05-05 00:56:40 +02:00
ATM john
6574e54a41 Fix saving template email 2021-05-04 18:09:13 +02:00
Laurent Destailleur
816acaa4c2 css 2021-05-04 00:17:47 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
af9b2414a0 Merge pull request #17480 from bb2a/ajax-pdf-option 
Use AJAX PDF Options
 2021-05-04 00:06:18 +02:00