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

87618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
e247b2de61 FIX list of fields in list of recurring invoices was empty 2020-10-06 16:29:29 +02:00
Laurent Destailleur
6933b7ec9c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-06 13:13:31 +02:00
Laurent Destailleur
8d3ebad52b
Merge pull request #14908 from ptibogxiv/patch-373 
Fix multicompany in last action box
 2020-10-05 16:39:34 +02:00
Laurent Destailleur
a68ba1704b Fix phpcs 2020-10-05 02:25:57 +02:00
Laurent Destailleur
63415e9728 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_shipments.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2020-10-04 23:27:52 +02:00
Laurent Destailleur
ca16606b4f Fix phpcs 2020-10-04 23:21:24 +02:00
ptibogxiv
dd1904c521
Fix multicompany in last action box 2020-10-04 13:58:46 +02:00
Laurent Destailleur
f217959740 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-03 14:51:30 +02:00
Laurent Destailleur
ca0dcb4db0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_supplier_orders.php
 2020-10-03 14:51:18 +02:00
Laurent Destailleur
5ed7b43214 phpcs 2020-10-03 14:48:19 +02:00
Laurent Destailleur
9e48920e1d
Merge pull request #14902 from ptibogxiv/patch-368 
Fix multicompany in order box
 2020-10-03 14:15:11 +02:00
Laurent Destailleur
ae16b45a5b
Merge pull request #14900 from frederic34/patch-4 
use create instead edit on create contract
 2020-10-03 14:14:53 +02:00
Laurent Destailleur
08afb586f8
Merge pull request #14903 from ptibogxiv/patch-369 
Fix multicompany in propal box
 2020-10-03 14:13:29 +02:00
Laurent Destailleur
f7e5079e4e
Merge pull request #14904 from ptibogxiv/patch-370 
Fix multicompany in supplier order box
 2020-10-03 14:13:14 +02:00
Laurent Destailleur
71ab4c4a70
Merge pull request #14905 from ptibogxiv/patch-371 
Fix multicompany in supplier order awaiting box
 2020-10-03 14:12:57 +02:00
Laurent Destailleur
78cf3c24c1
Merge pull request #14906 from ptibogxiv/patch-372 
Fix multicompany in shipment box
 2020-10-03 14:12:38 +02:00
ptibogxiv
af2bd76500
Fix multicompany in shipment box 2020-10-03 14:06:33 +02:00
ptibogxiv
69660d1a9d
Update box_supplier_orders.php 2020-10-03 14:02:59 +02:00