Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,107 Commits 39 Branches 191 Tags
f5395fa859bf6423e46faaa06e4db60cc1f4def1
Commit Graph

78107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
atm-greg
f5395fa859 fix lost name_alias on country selection 2020-01-24 14:28:08 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Laurent Destailleur
3a9ef7c5e7 Merge pull request #12911 from aspangaro/9.0_FEC 
FIX: FEC export format
 2020-01-23 12:04:55 +01:00
Laurent Destailleur
cbe396b97c Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082 Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
381f2d5eee Fix typo 2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674 FIX Check on unicity on prof id was not triggered sometimes 2020-01-22 16:22:53 +01:00
Laurent Destailleur
28d0b85b84 Fix phpcs 2020-01-22 14:56:19 +01:00
Laurent Destailleur
2caa4e9fa6 Merge pull request #12885 from leninrivas/10.0 
FIX Missing Linked objects Fichinter Ref. in PDF formats
 2020-01-22 14:17:25 +01:00
Laurent Destailleur
cb41168904 Merge pull request #12889 from mapiolca/patch-21 
Fix double display of create credit note button
 2020-01-22 13:57:47 +01:00
Laurent Destailleur
0c4e736e13 Merge pull request #12893 from aspangaro/10.0_p33 
Fix : Accounting - error on right
 2020-01-22 13:54:45 +01:00
Laurent Destailleur
d141d9516b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-22 13:53:31 +01:00
Laurent Destailleur
fc894d7a20 Fix for stripe connect 2020-01-22 13:53:20 +01:00
Laurent Destailleur
3d474d5174 Merge pull request #12902 from ptibogxiv/patch-293 
fix stripe/charge.php for connect mode with payment intent
 2020-01-22 13:53:04 +01:00
Laurent Destailleur
999e363446 Update charge.php 2020-01-22 13:52:37 +01:00
Laurent Destailleur
3bd4580e9b Merge pull request #12904 from OPEN-DSI/v10-product-unit-length-update 
FIX length, width and height units coherence in product table
 2020-01-22 13:48:18 +01:00
Laurent Destailleur
e96ef17737 Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param 
FIX dom and missing param
 2020-01-22 13:45:06 +01:00
Laurent Destailleur
443e4e2223 Update html.form.class.php 2020-01-22 13:44:42 +01:00
VESSILLER
c91ab621b8 FIX length, width and height coherence in product table 2020-01-21 17:49:27 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00
ptibogxiv
b4758295e1 fix stripe/charge.php for connect mode with payment intent 2020-01-21 10:59:57 +01:00
Alexandre SPANGARO
f4cd3236b1 Fix : Accounting - error on right 2020-01-19 21:59:01 +01:00
Pierre Ardoin
e4eb8883fe Fix double display of create credit note button 
Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated.
After: Displays a single button "Create a credit note"
 2020-01-19 19:10:10 +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