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

78079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Ardoin
1d4e36ba3d
Add Link to Pay if Online payment is used 
Before : URL to Online Payment never shown.

Now : URL shown when PayPal, Stripe or PayBox are used.
 2020-01-21 10:04:49 +01:00
Laurent Destailleur
041d5aeb46 FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:51:37 +01:00
Laurent Destailleur
00cddc39fd Fix remove some orphelins in llx_ecm_files 2020-01-19 13:56:16 +01:00
Laurent Destailleur
8bc8a8f57c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-19 12:16:33 +01:00
Laurent Destailleur
f4ae869678 Fix error return when creating order with not enough stock 2020-01-19 12:15:47 +01:00
Laurent Destailleur
cf2001a1ae
Merge pull request #12860 from atm-ph/fix_10.0_html_text 
Fix note started with <s> balise
 2020-01-17 14:51:09 +01:00
Laurent Destailleur
e14d933f3e
Merge pull request #12879 from OPEN-DSI/v10-fix-expense-report-mail 
FIX send expense report mail in HTML format
 2020-01-17 14:50:05 +01:00
VESSILLER
60d4f63205 FIX send expense report mail in HTML format 2020-01-17 13:56:01 +01:00
atm-ph
3cdb84b192 Fix note started with <s> balise 2020-01-16 09:50:57 +01:00
Laurent Destailleur
536f835a3e
Merge pull request #12850 from atm-john/10.0_fix_export_explode 
FIX complex export model loading
 2020-01-15 20:09:32 +01:00
John Botella
10c973f38f Fix complex export model loading 2020-01-15 14:36:44 +01:00
Laurent Destailleur
0a1a07aa22
Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields 
FIX : We want to be able to import data for extrafields of entity 0 too
 2020-01-15 13:12:56 +01:00
Laurent Destailleur
b4a309a251 Prepare 10.0.7 2020-01-15 12:00:25 +01:00
Laurent Destailleur
0442105bd4 Fix Generation of zip of module 2020-01-15 11:55:27 +01:00
gauthier
5455130a03 FIX : We want to be able to import data for extrafields of entity 0 too 2020-01-13 16:15:22 +01:00
Laurent Destailleur
1292575371 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-10 19:50:00 +01:00
Laurent Destailleur
b513ad90eb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:33 +01:00
Laurent Destailleur
e0a12edf31 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:10 +01:00
Laurent Destailleur
0625a7194f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-01-10 19:47:32 +01:00
Laurent Destailleur
ec6e933f66 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-01-10 19:47:00 +01:00
Laurent Destailleur
e0c8ccb9fb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-01-10 19:45:35 +01:00
Laurent Destailleur
ef00cb0736 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-01-10 19:44:52 +01:00
Laurent Destailleur
d7f7f5bf3d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2020-01-10 19:42:34 +01:00
Laurent Destailleur
7c0a6946a7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2020-01-10 19:42:15 +01:00
Laurent Destailleur
1ecc1afa9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2020-01-10 19:41:49 +01:00
Laurent Destailleur
ceb1e699b7 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2020-01-10 19:37:16 +01:00
Laurent Destailleur
c028819cab FIX clone of purchase order 2020-01-10 19:35:49 +01:00
Laurent Destailleur
efb506ba7f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-10 13:51:35 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Laurent Destailleur
4f2f2f0d73
Merge pull request #12815 from artis-auxilium/fix_massaction_checkbox 
Fix massaction checkbox when product module disable
 2020-01-10 00:22:02 +01:00
Laurent Destailleur
b93247aeec
Merge pull request #12819 from atm-arnaud/FIX_stats_invoices_with_draft 
FIX drafts are now implemented for stats
 2020-01-10 00:15:13 +01:00
Laurent Destailleur
bc8dfd46c2
Merge pull request #12810 from ATM-Consulting/10.0_Fix_folder_rename_behavior 
Fix folder rename behavior
 2020-01-10 00:11:47 +01:00
Laurent Destailleur
e18282ac1e
Merge pull request #12807 from ptibogxiv/patch-292 
FIX: multicompany for discount
 2020-01-10 00:09:16 +01:00
atm-arnaud
ae4554af65 FIX drafts are now implemented for stats 2020-01-08 11:27:52 +01:00
Dev2a
57c954f2e8 Fix Check array of action after kooks 2020-01-07 21:41:36 +01:00
Dev2a
2d67c2365f Fix Check right for service for arrayofmassaction 
if product module disable, threre is no action for service
 2020-01-07 18:59:58 +01:00
John Botella
36ccb8b08e Fix folder rename behavior 2020-01-07 14:49:25 +01:00
ptibogxiv
5a1f123994
Update societe.class.php 2020-01-07 13:10:10 +01:00
ptibogxiv
e820af4aa0
FIX: multicompany for discount 2020-01-07 13:07:36 +01:00
Laurent Destailleur
7350331865 Prepare 10.0.6 2020-01-05 20:41:12 +01:00
Laurent Destailleur
cc4c2d8a0b Prepare 10.0.6 2020-01-05 20:39:45 +01:00
Laurent Destailleur
eca91af2ca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-04 14:21:56 +01:00
Laurent Destailleur
7853427bb1 FIX product with empty stock were not visible 2020-01-04 14:21:38 +01:00
Laurent Destailleur
0dafbd194f
Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending 
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
 2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732
Update product.class.php 2020-01-03 20:53:49 +01:00
Laurent Destailleur
88d97104be
Merge pull request #12789 from aspangaro/10.0_p32 
FIX Some problems on conciliation with others modules
 2020-01-03 20:47:33 +01:00
Laurent Destailleur
e178d38bf8
Merge pull request #12791 from ptocquin/patch-1 
Update api_supplier_invoices.class.php
 2020-01-03 20:42:55 +01:00
Laurent Destailleur
e83b71f271
Merge pull request #12787 from aspangaro/10.0_p30 
FIX Loan card - Wrong language key used
 2020-01-03 20:42:01 +01:00
Laurent Destailleur
b452fc8442
Merge pull request #12788 from aspangaro/10.0_p31 
FIX typo on language key
 2020-01-03 20:41:04 +01:00