lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,795 Commits 43 Branches 150 Tags 886 MiB
d765b03bd1
Commit Graph

83795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d765b03bd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-23 19:23:57 +02:00
Laurent Destailleur
f819509442 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a Fix include regression 2020-08-23 19:22:01 +02:00
Laurent Destailleur
38d53cc03d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-08-23 19:20:50 +02:00
Laurent Destailleur
49f8a6e733 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:12 +02:00
Laurent Destailleur
4fa6d86127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:01 +02:00
Laurent Destailleur
03557b69c2
Merge pull request #14486 from atm-john/9.0_fix_infinite_fetch_loop 
FIX : infinite fetch object linked loop
 2020-08-23 19:14:08 +02:00
Laurent Destailleur
7a183ea026
Update pdf.lib.php 2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9
Update pdf.lib.php 2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684
Update pdf.lib.php 2020-08-23 19:11:19 +02:00
Laurent Destailleur
7a53e191a9
Merge pull request #14511 from frederic34/patch-6 
Use of undefined constant state - assumed 'state'
 2020-08-23 18:27:28 +02:00
Frédéric FRANCE
b4d2bf98fa
Use of undefined constant state - assumed 'state' 2020-08-20 12:14:40 +02:00
Laurent Destailleur
d21bda604d FIX Setup of stock increase/decrease 2020-08-18 15:27:17 +02:00
Laurent Destailleur
5952ae28b8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-17 19:54:32 +02:00
Laurent Destailleur
487d26c7db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
 2020-08-17 19:54:23 +02:00
John Botella
6e1702c1a5 Fix infinite fetch object linked loop 2020-08-17 15:00:31 +02:00
Laurent Destailleur
a76d4daff8
Merge pull request #14444 from fmarcet/11.0 
FIX: Visualization rights correction on last modified contacts box
 2020-08-16 23:37:23 +02:00
Laurent Destailleur
03e8a0737c
Merge pull request #14481 from OPEN-DSI/v10-html-formfile-add-param-entity 
FIX param entity in html form file
 2020-08-16 21:16:28 +02:00
lvessiller
d5acc85ef0 FIX param entity in html form file 2020-08-14 12:18:28 +02:00
Laurent Destailleur
6851e24c3b Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2020-08-14 12:02:40 +02:00
Laurent Destailleur
fe0b1c5ee4 Fix travis 2020-08-14 11:53:54 +02:00
Laurent Destailleur
52f20a1047 Fix travis 2020-08-14 11:52:21 +02:00
Laurent Destailleur
2b393d04e1 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0 2020-08-14 11:03:48 +02:00
Laurent Destailleur
d35c7ed49b Fix trans 2020-08-14 11:03:12 +02:00
Laurent Destailleur
9e8ed3bf54
Merge pull request #14445 from atm-john/11.0_fix_lang 
Fix lang fr
 2020-08-14 03:28:42 +02:00
Laurent Destailleur
48323059e8
Merge pull request #14475 from atm-adrien/FIX_task_leftmenu 
Fix missings tasks leftmenu parameters
 2020-08-14 02:25:37 +02:00
Laurent Destailleur
04be66eab7
Merge pull request #14476 from OPEN-DSI/v10-fix-button-title-attr-id 
FIX title button attribute id empty
 2020-08-14 02:24:26 +02:00
lvessiller
f385e02c53 FIX title button attribute id empty 2020-08-13 17:43:18 +02:00
stickler-ci
d784c621c9 Fixing style errors. 2020-08-13 15:07:06 +00:00
Adrien Raze
990217fcb0 FIX : task leftmenu 2020-08-13 16:59:27 +02:00
John Botella
f014365b65 Fix lang fr 2020-08-10 10:35:50 +02:00
Ferran Marcet
10df9777b5 FIX: Visualization rights correction on last modified contacts box 2020-08-10 09:53:20 +02:00
Laurent Destailleur
dd773d33fd Fix phpcs 2020-08-07 14:57:52 +02:00
Laurent Destailleur
ada7b74ba1 Fix phpcs 2020-08-07 14:56:30 +02:00
Laurent Destailleur
5482a3134a
Merge pull request #14355 from fmarcet/10.0 
Fix: User can see events that are not assigned to it
 2020-08-07 14:54:39 +02:00
Laurent Destailleur
47cf447310 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-07 12:10:08 +02:00
Laurent Destailleur
68a3716fd2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/projet/info.php
 2020-08-07 12:09:58 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam 
FIX :  JS CRASH - bad usage of moreparam
 2020-08-07 10:10:09 +02:00
Laurent Destailleur
921be56379
Merge pull request #14400 from atm-quentin/FIX_project_info_right_access 
fix right project info.php
 2020-08-07 10:01:41 +02:00
quentin
215242a4a1 fix right project info.php 2020-08-06 14:11:26 +02:00
Laurent Destailleur
37f1b27bd2 Fix phpcs 2020-08-06 03:55:47 +02:00
Laurent Destailleur
b40177a8c8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 03:00:16 +02:00
Laurent Destailleur
641d9a6565 Fix number to string 2020-08-06 02:58:07 +02:00
Laurent Destailleur
ce960c8d0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:53:19 +02:00
Laurent Destailleur
0b7aec1fa0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functionsnumtoword.lib.php
 2020-08-06 02:52:54 +02:00
Laurent Destailleur
73ea5b0e2d Fix function to convert price to string 2020-08-06 02:50:24 +02:00
Laurent Destailleur
2fd430bd2c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:08:44 +02:00
Laurent Destailleur
ef0f7cfa6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-06 02:08:15 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
 2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165 FIX Bad address used for vendor on PDF standard of supplier payment 2020-08-06 02:05:55 +02:00