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

87741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
93a97492ae review 2020-10-21 20:41:50 +02:00
Florian HENRY
0a9293c9c6 fix token CSRF check for getSupplierPrice ajax call 2020-10-21 20:40:53 +02:00
Laurent Destailleur
a96c193ab0
Merge pull request #15078 from FHenry/12.0_fix_if_no_pdf_model_no_pdf_created 
FIX if no PDF default model in admin for expense report, do not create a PDF
 2020-10-21 19:55:43 +02:00
Laurent Destailleur
be79791561
Merge pull request #15080 from atm-john/12.0_fix_display_field_on_page_load 
12.0 fix display field on page load & admin conf
 2020-10-21 19:54:45 +02:00
Laurent Destailleur
7605cb1871
Update facture_situation.php 2020-10-21 19:54:28 +02:00
John Botella
70790009a9 Fix display warranty fields on page load 2020-10-21 14:49:51 +02:00
Florian HENRY
c9e62845e8 fix is no PDF default model for expense report, no PDF created 2020-10-21 13:41:17 +02:00
John Botella
d9074e70e1 FIX admin conf selected 2020-10-21 13:27:37 +02:00
Florian HENRY
e23a289553 fix form token missing 2020-10-21 13:26:28 +02:00
Florian HENRY
b0641e6d69 better rix 2020-10-21 13:22:32 +02:00
Florian HENRY
a5e195d1c7 better rix 2020-10-21 13:20:17 +02:00
Florian HENRY
13dfa56c2f fix recipt when no dispatch 2020-10-21 13:18:11 +02:00
Florian HENRY
d4fd71d0b3 fix #14649 2020-10-20 19:58:11 +02:00
Florian Mortgat
529dfb8dfb FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched 2020-10-20 16:37:15 +02:00
jcp
b09a618f38 Fix Bank Transfer 2020-10-20 13:19:47 +02:00
jcp
a2d242356a Fix BankTransfer (V12.0.2) 2020-10-20 13:17:14 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Laurent Destailleur
fb3d18f962
Merge pull request #14658 from OPEN-DSI/v10-fix-extrafields-sellist-linked-options-load 
FIX load default linked options for linked sellist extra fields
 2020-10-17 18:13:13 +02:00
Laurent Destailleur
6bba249935 FIX pdf_getlinetotalwithtax must show total incl tax 2020-10-16 15:50:51 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
a9a519e890
Merge pull request #15025 from fmarcet/10.0 
FIX: Unable to edit extrafields in expense report
 2020-10-15 20:30:14 +02:00
Laurent Destailleur
4eddcb7503
Merge pull request #15023 from Ahuahuachi/10.0 
FIX #14927 Change ContratLigne property type to product_type
 2020-10-15 20:29:38 +02:00
Laurent Destailleur
3d68ab4059
Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Laurent Destailleur
75290d1bd4
Update contrat.class.php 2020-10-15 20:26:12 +02:00
Laurent Destailleur
c3a02d0391
Update contrat.class.php 2020-10-15 20:24:26 +02:00
Laurent Destailleur
b9aee876e9
Merge pull request #15026 from atm-john/10.0_fix_expensereport_pagebreak_on_pdf 
Fix page break on expense report pdf
 2020-10-15 10:19:22 +02:00
Ferran Marcet
32d823c739 FIX: Unable to edit extrafields in expense report 2020-10-15 09:40:50 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type 
This bug is produced because the ContratLigne class gives a property type instead of a product_type
 2020-10-14 22:17:50 -05:00
Laurent Destailleur
d283e8f649 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-14 20:15:19 +02:00
Laurent Destailleur
1691fcedfb Fix phpcs 2020-10-14 20:13:30 +02:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-13 15:08:53 +02:00
Laurent Destailleur
f1f1f2b9c8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:34 +02:00
Laurent Destailleur
496d429dcd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:25 +02:00
Laurent Destailleur
57702a1fb1 Retrieve commit a056d37f7255200ef0baf664a6b64516b2392dd9 2020-10-12 20:47:32 +02:00
Laurent Destailleur
d40dea8084
Merge pull request #14965 from atm-lena/10.0_FIX_cabyprodserv_categoryfilter 
FIX CA report by product/service : subcategory filter
 2020-10-12 12:18:47 +02:00
atm-lena
bf7d5b56fb FIX subcat filter 2020-10-12 11:50:19 +02:00
Florian HENRY
0b9783b7ed fix #14946 2020-10-12 11:31:09 +02:00
Laurent Destailleur
efd5924bdc
Merge pull request #14981 from aspangaro/11p45 
FIX Loan - Return on list when you cancel create form or delete a loan
 2020-10-11 13:33:49 +02:00
Alexandre SPANGARO
231a866838 FIX Loan - Return on list when you cancel create form or delete a loan 2020-10-10 07:38:29 +02:00
Laurent Destailleur
06bec1bff0
Merge pull request #14974 from code-chicken/patch-8 
Fix for #14957 and probably a lot of other issues
 2020-10-09 13:53:54 +02:00
Rüdiger Hahn
3b7b4312cb
Fix for #14957 and probably a lot of other issues 
Convert special characters for a valid use in xml documents
 2020-10-09 11:13:11 +02:00
Laurent Destailleur
c7784076c5
Merge pull request #14969 from atm-john/12.0_fix_project_loan_total 
Fix  total loan calculation on project summary
 2020-10-08 19:23:43 +02:00
Laurent Destailleur
e854cce158
Update element.php 2020-10-08 19:23:35 +02:00
ATM john
3bf12ca193 Fix total loan calculation 2020-10-08 19:10:41 +02:00
atm-lena
74ae9a2618 FIX CA report by product/service : subcategory filter 2020-10-08 10:49:46 +02:00
Laurent Destailleur
84105e996a Fix for #14940 2020-10-07 01:03:48 +02:00
Laurent Destailleur
04f8de4188 Remove dependency 2020-10-06 17:59:31 +02:00
Laurent Destailleur
b0d20f92dc FIX autofocus on first setup 2020-10-06 17:32:55 +02:00