lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,381 Commits 43 Branches 150 Tags 886 MiB
8115acbf82
Commit Graph

87381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8115acbf82 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:05 +02:00
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
Laurent Destailleur
b6af947042 Fix phpcs 2020-08-21 13:06:54 +02:00
Laurent Destailleur
95c25bc1b7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-20 12:21:55 +02:00
Laurent Destailleur
fbb162aa9b Trans 2020-08-20 12:21:40 +02:00
Frédéric FRANCE
b4d2bf98fa
Use of undefined constant state - assumed 'state' 2020-08-20 12:14:40 +02:00
Laurent Destailleur
6b36502e1e
Merge pull request #14498 from aspangaro/12.0_p6 
Fix Accountancy - Show label account in page already bind
 2020-08-19 14:31:09 +02:00
Alexandre SPANGARO
fbd4323dd8 Fix Accountancy - Show label account in page already bind 2020-08-19 06:01:10 +02:00
Laurent Destailleur
3556004f02 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-18 15:35:43 +02:00
Laurent Destailleur
d4a502629e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/stock.php
	htdocs/core/lib/ajax.lib.php
 2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d FIX Setup of stock increase/decrease 2020-08-18 15:27:17 +02:00
Juanjo Menent
e685a96716 FIX: Intervention lose html tags when updating 2020-08-18 13:44:50 +02:00
Laurent Destailleur
e3beec3e1f Fix css 2020-08-17 20:57:44 +02:00
Laurent Destailleur
c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2020-08-17 19:59: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
Laurent Destailleur
68b6fdb508 Fix missing tags 2020-08-17 19:48:05 +02:00
Laurent Destailleur
0245eb102c Fix css on fields that are not mandatory 2020-08-17 19:44:06 +02:00
Laurent Destailleur
69d73ac528 FIX Compatibility with modules without document generation 
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
 2020-08-17 16:08:38 +02:00
Laurent Destailleur
8bfa6df1a6 FIX Update extrafields on line only if it is supported 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2020-08-17 16:06:36 +02:00
John Botella
6e1702c1a5 Fix infinite fetch object linked loop 2020-08-17 15:00:31 +02:00
Laurent Destailleur
86a31d17a5 Better test 2020-08-17 04:34:53 +02:00
asolslk
5a6f459db5 Update accounting.lib.php 2020-08-17 04:09:12 +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
657e6a2037 No warning 2020-08-16 23:14:53 +02:00
Laurent Destailleur
4c0785e996 FIX #14469 2020-08-16 23:13:27 +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
Laurent Destailleur
65ceaac42e Better message 2020-08-14 12:56:17 +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
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +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