lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82,776 Commits 43 Branches 150 Tags 886 MiB
1904ae0e82
Commit Graph

82776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1904ae0e82 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER

Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7 Fix prefix of log 2020-02-17 12:22:52 +01:00
Laurent Destailleur
bf281b7dab Comment 2020-02-17 11:51:49 +01:00
Laurent Destailleur
ac7a077c77 FIX Vulnerability in module from modulebuilder. Only fields with type 
html can contains HTML.
 2020-02-16 18:14:10 +01:00
Laurent Destailleur
5b87b12e64 FIX Vulnerability reported by code16 2020-02-16 18:06:25 +01:00
Laurent Destailleur
7cdfc3ca65 FIX HTML Injection 2020-02-16 12:55:32 +01:00
Laurent Destailleur
f14cd9f49f Look and feel v11 2020-02-15 18:07:23 +01:00
Laurent Destailleur
2b3cc0d048 Fix add both public id and ref in topic 2020-02-15 18:00:09 +01:00
Laurent Destailleur
69bd616e73 css 2020-02-15 10:40:32 +01:00
Laurent Destailleur
d3d572c8d3 FIX Avoid to download the export if we just press enter to refresh form 2020-02-14 19:55:50 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
3bc122ecf6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-14 19:05:58 +01:00
Laurent Destailleur
3faed758b3 FIX #13110 2020-02-14 19:05:39 +01:00
Laurent Destailleur
88f0cc1331
Merge pull request #13113 from aspangaro/9.0_FEC 
FIX: Force FEC export to txt format
 2020-02-14 18:56:31 +01:00
Alexandre SPANGARO
72e59e6fe2 FIX: Force FEC export to txt format 2020-02-14 16:07:06 +01:00
Laurent Destailleur
f0596b4bcf Prepare 11.0.1 2020-02-13 18:11:48 +01:00
Laurent Destailleur
e0dd31389c Prepare 11.0.1 2020-02-13 18:05:02 +01:00
Laurent Destailleur
bb895cb1d8 FIX ref_client not visible in tooltip. 2020-02-13 18:00:59 +01:00
Laurent Destailleur
c196342fd8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-13 15:44:06 +01:00
Laurent Destailleur
ec30938a07 Fix phpcs 2020-02-13 15:43:53 +01:00
Laurent Destailleur
82535291c0
Merge pull request #13103 from ATM-Marc/FIX_11.0_situation_excess_recieved 
FIX: situation invoices: can't convert excess received to discount & bad previous payment amount
 2020-02-13 12:42:22 +01:00
Laurent Destailleur
4f1c8e7f53 FIX #10203 2020-02-13 12:18:26 +01:00
Marc de Lima Lucio
fa78af1996 Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr into 11.0 2020-02-13 12:18:16 +01:00
Laurent Destailleur
e511deb8e7 FIX #13096 2020-02-13 11:39:08 +01:00
Laurent Destailleur
78d4978d31 FIX #13100 2020-02-13 11:26:11 +01:00
Laurent Destailleur
33b7fc11f0 Fix status of emailing target 2020-02-13 10:41:53 +01:00
Laurent Destailleur
1973f2c9b9 Fix look and feel v11 2020-02-13 10:07:34 +01:00
Laurent Destailleur
21d9b00fce Fix missing amount in table of prelevement 2020-02-13 00:05:01 +01:00
Laurent Destailleur
ccced09113 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/propal/list.php
	htdocs/core/class/html.formmail.class.php
 2020-02-12 22:54:55 +01:00
Laurent Destailleur
5be0485917 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-12 22:51:05 +01:00
Laurent Destailleur
700e01d661 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-02-12 22:50:56 +01:00
Laurent Destailleur
9f3bedb7ea Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-12 22:45:39 +01:00
Laurent Destailleur
139dfc3022 Debug MRP module 2020-02-12 22:45:27 +01:00
Laurent Destailleur
e69b362fb5
Merge pull request #13079 from RubenRuCh/11.0 
FIX: #13038 ExpenseReport PDF - custom category description is not correct
 2020-02-12 21:59:23 +01:00
Laurent Destailleur
6be746e219 Fix replenishment for virtual stock check if module is on or off 2020-02-12 21:42:48 +01:00
Laurent Destailleur
cfd64c7171 Fix class not found 2020-02-12 21:31:49 +01:00
Laurent Destailleur
0f12003782 Trans 2020-02-12 21:20:55 +01:00
Laurent Destailleur
83b5fe3c71 FIX #13077 Replace left join with inner join (left join was useless) 2020-02-12 20:24:58 +01:00
Laurent Destailleur
3f4c787c84 Fix physical stock were truncated in product/reassort page 2020-02-12 20:22:53 +01:00
Laurent Destailleur
18f0a0f73e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-12 19:36:43 +01:00
Laurent Destailleur
d419315e98 FIX #13048 2020-02-12 19:36:29 +01:00
Laurent Destailleur
d70712fd61
Merge pull request #13089 from mapiolca/patch-31 
Fix the display of the banner with multicompany
 2020-02-12 18:51:08 +01:00
Laurent Destailleur
50f0b61f1e
Update bankjournal.php 2020-02-12 18:50:33 +01:00
Laurent Destailleur
ccb895e251
Merge pull request #13083 from atm-greg/FIX_bookkeeping_LD_Compta_Export 
fix missing fields in LD Compta Export
 2020-02-12 18:41:34 +01:00
Laurent Destailleur
3a9125b097
Merge pull request #13087 from ptibogxiv/patch-304 
Fix netmeasure update and display
 2020-02-12 18:35:44 +01:00
Laurent Destailleur
bd0666bf53
Update product.lib.php 2020-02-12 18:35:15 +01:00
Thomas
9b0b5f755b Fixed missing trigger on contact delete 2020-02-12 18:24:37 +01:00
Laurent Destailleur
e9688e66c0
Merge pull request #13084 from atm-john/11.0_fix_retained_warranty_hasdelay 
FIX - hasDelay for retained warranty
 2020-02-12 18:22:53 +01:00
Laurent Destailleur
77f8a36cda
Merge pull request #13076 from aspangaro/10.0_p35 
FIX : Problem with column label in subscription list
 2020-02-12 18:22:17 +01:00
Laurent Destailleur
03a8414ba8 FIX #13085 2020-02-12 18:21:45 +01:00