Laurent Destailleur
|
e0e4da481a
|
Fix phpcs
|
2020-10-23 03:42:54 +02:00 |
|
Laurent Destailleur
|
cfcac7e053
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/lib/functions2.lib.php
|
2020-10-22 17:34:48 +02:00 |
|
Laurent Destailleur
|
a826e328c1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-10-22 17:31:40 +02:00 |
|
Laurent Destailleur
|
31f1ab73b1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-10-22 17:31:29 +02:00 |
|
Laurent Destailleur
|
c8936f9919
|
Merge pull request #15094 from marc-dll/FIX_10.0_virtual_product_buying_price
FIX: virtual products: supplier discount was not applied in component list
|
2020-10-22 16:34:57 +02:00 |
|
Laurent Destailleur
|
3369379ba1
|
Update card.php
|
2020-10-22 16:34:23 +02:00 |
|
Marc de Lima Lucio
|
34dd486b6c
|
FIX: virtual products: displayed value is by unit
|
2020-10-22 16:18:37 +02:00 |
|
Laurent Destailleur
|
0f435f9901
|
Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services
FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…
|
2020-10-22 16:18:11 +02:00 |
|
Laurent Destailleur
|
a9117fe864
|
Update interface_20_modWorkflow_WorkflowManager.class.php
|
2020-10-22 16:18:00 +02:00 |
|
Laurent Destailleur
|
8ce929d509
|
Merge pull request #15069 from ATM-Consulting/fix/9.0_linked_object_on_supplier_proposal_events
FIX 9.0 - when users create an event from a supplier proposal, the "linked objects" section says "Deleted"
|
2020-10-22 16:10:49 +02:00 |
|
Got2be
|
c2ad40043f
|
FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty
|
2020-10-22 16:10:47 +02:00 |
|
Marc de Lima Lucio
|
a232a19e7d
|
FIX: virtual products: supplier discount was not applied in component list
|
2020-10-22 15:16:33 +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 |
|
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
|
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
|
1691fcedfb
|
Fix phpcs
|
2020-10-14 20:13:30 +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
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
ptibogxiv
|
331db5e367
|
Fix multicompany in supplier order awaiting box
|
2020-10-03 14:01:46 +02:00 |
|
ptibogxiv
|
26a2fea8c7
|
Fix multicompany in supplier order box
|
2020-10-03 14:00:23 +02:00 |
|