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

102357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1c45104f38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-26 12:43:00 +01:00
Laurent Destailleur
b4961c598b
Merge pull request #19932 from ATM-Consulting/fix_14.0_export_html_tag_test 
FIX : Replace restricthtml to nohtml in export .
 2022-01-26 12:42:35 +01:00
Laurent Destailleur
42f252b636 Add one more test 2022-01-26 12:39:41 +01:00
jpb
23e5ff08eb change to alphawithlgt 2022-01-26 12:07:06 +01:00
jpb
ec1f784247 replace restricthtml to nohtml. 2022-01-26 11:43:44 +01:00
Laurent Destailleur
909c974bad
Merge pull request #19897 from smil2k/bug/19896 
fix docker build setup
 2022-01-23 17:53:44 +01:00
Cserveny, Tamás
adf7492575 migrate missing properties 2022-01-23 16:26:14 +01:00
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
07ef603c2c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:37 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Laurent Destailleur
a0154503f4
Merge pull request #19838 from OPEN-DSI/v12-fix-supplier-order-print-error 
FIX replace print error with event message when error on update line …
 2022-01-23 13:37:09 +01:00
Laurent Destailleur
b5a287875c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 12:59:44 +01:00
Laurent Destailleur
4888d127e0 Make virus file no more detected. 2022-01-23 12:59:15 +01:00
Laurent Destailleur
8dc9489c31
Merge pull request #19880 from atm-lena/14.0_FIX_CreateEventFromContract 
14.0 fix create event from contract
 2022-01-23 12:55:59 +01:00
Laurent Destailleur
6c78ba5c71
Merge pull request #19884 from smil2k/bug/17058 
Check if the lines in create is type object (like supplier invoice)
 2022-01-23 12:54:17 +01:00
Laurent Destailleur
284fcf3ad5 FIX Company logo not found in some cases on some templates 2022-01-22 13:19:29 +01:00
Cserveny, Tamás
259c94e320 fix docker build setup 2022-01-20 17:57:21 +01:00
stickler-ci
400d28238c Fixing style errors. 2022-01-20 00:09:52 +00:00
Cserveny, Tamás
115f022ae9 Check if the lines in create is type object (like supplier invoice) 2022-01-20 00:55:52 +01:00
atm-lena
db9a26f8d4 FIX error urlencode 2022-01-19 15:35:09 +01:00
atm-lena
c8589970af FIX : event created from contract not linked to object origin 2022-01-19 15:33:30 +01:00
Laurent Destailleur
20cec36a05
Merge pull request #19849 from atm-maxime/fix_ticket_messaging 
Fix missing require class project
 2022-01-19 01:50:19 +01:00
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +01:00
Laurent Destailleur
75eb256589 Fix perm to delete a draft supplier order 2022-01-18 16:06:27 +01:00
Laurent Destailleur
01aa2deae6 Fix bad include 2022-01-18 15:27:43 +01:00
Laurent Destailleur
642f77e8f5 FIX Widget of stock alert does not report on purchase products. 2022-01-17 22:07:18 +01:00
Maxime Kohlhaas
ea55712d1b Fix missing require class project 2022-01-15 23:04:56 +01:00
Laurent Destailleur
8e4c7efed5 Fix do not include file if url not correctly detected 2022-01-15 20:53:16 +01:00
Laurent Destailleur
3d97888bc5 Comment 2022-01-14 17:46:06 +01:00
lvessiller
a9c76f2e44 FIX replace print error with event message when error on update line in supplier order 2022-01-14 16:09:30 +01:00
Laurent Destailleur
77c286b769 Fix permission 2022-01-14 14:01:50 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
Laurent Destailleur
e223fb1e7c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-14 10:36:56 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
 2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
 2022-01-14 10:30:39 +01:00
Laurent Destailleur
5b6133ad62
Merge pull request #19821 from marc-dll/12.0_FIX_shipment_all_lines 
FIX: order to shipment: debug hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS
 2022-01-14 10:19:28 +01:00
Laurent Destailleur
e365975b2f
Merge pull request #19820 from frederic34/patch-1 
fix warning
 2022-01-14 10:04:42 +01:00
Laurent Destailleur
90c3c90864
Merge pull request #19829 from OPEN-DSI/v12-fix-supplier-order-list-search-user 
FIX search by user in supplier order list
 2022-01-14 09:45:06 +01:00
Laurent Destailleur
b9b45fb506 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486 
Conflicts:
	test/phpunit/CodingPhpTest.php
 2022-01-13 18:46:29 +01:00
lvessiller
cacff0c2d4 FIX cast int for search user 2022-01-13 16:18:57 +01:00
lvessiller
22f6d204a2 FIX search by user in supplier order list 2022-01-13 16:01:23 +01:00
Laurent Destailleur
620a88b8d6 Fix param sortfield/order 2022-01-13 11:05:21 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Marc de Lima Lucio
b110ca6ead FIX: order to shipment: FIX hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a warehouse) 2022-01-12 16:40:43 +01:00
Frédéric FRANCE
297d2ecfbd
fix warning 2022-01-12 16:09:31 +01:00
Laurent Destailleur
1efbff8fea Fix error message 2022-01-11 15:42:03 +01:00
Laurent Destailleur
cde290c78a
Merge pull request #19402 from atm-gauthier/fix_reorder_lines_after_delete_line_everywhere 
FIX : reorder all lines when delete document line everywhere (4 documents were missing)
 2022-01-10 21:23:23 +01:00
Laurent Destailleur
5d5a219b95 FIX #19770 2022-01-10 19:23:46 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
ff31d660c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-07 15:50:40 +01:00