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

76816 Commits

Author SHA1 Message Date
Laurent Destailleur
fbb162aa9b Trans 2020-08-20 12:21:40 +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
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
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
Laurent Destailleur
7ce1d36b59 FIX Category for suplements not saved 2020-08-13 13:51:08 +02:00
Laurent Destailleur
f22398a9d3 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2020-08-12 20:26:01 +02:00
Laurent Destailleur
355d62e7db FIX Update line of BOM 2020-08-12 20:24:44 +02:00
Juanjo Menent
3eb23d3325 FIX: MySql Strict mode 2020-08-11 10:12:19 +02:00
Juanjo Menent
4e6b7289f2 FIX: MySql Strict mode 2020-08-11 10:07:38 +02:00
Juanjo Menent
b1735b0f80 FIX: MySql Strict mode 2020-08-11 10:02:46 +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
6e01ffd5ac Prepare for 12.0.3 2020-08-08 13:00:57 +02:00
Laurent Destailleur
deabfcf403 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-08 02:34:36 +02:00
Laurent Destailleur
537b58b446 Introduce workaround to allow integrator to suggest list of modules in 
old style by default instead of kanban style #14075
 2020-08-08 02:34:22 +02:00
Laurent Destailleur
b5749af5b4
Merge pull request #14379 from fappels/12_fix_search_stock_list 
FIX filter warehouse list on status
 2020-08-08 02:25:54 +02:00
Laurent Destailleur
4855b49698 css 2020-08-07 19:44:49 +02:00
Laurent Destailleur
030df58fea Fix regression in sending emails 2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e Fix regression in sending emails 2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3 Fix regression in sending emails 2020-08-07 17:06:12 +02:00
Laurent Destailleur
e69616110d Fix permission on page 2020-08-07 16:59:27 +02:00
Laurent Destailleur
0dda5ca4d6 Fix experimental 2020-08-07 16:27:09 +02:00
Laurent Destailleur
00804c1020 Complete fix for #14146 2020-08-07 15:19:26 +02:00