Laurent Destailleur
|
0616b9bc9b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-10-22 17:55:38 +02:00 |
|
Laurent Destailleur
|
a17c391efe
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/product/composition/card.php
|
2020-10-22 17:38:48 +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
|
72505b2ad4
|
Merge pull request #15101 from FHenry/12.0_fix_autofilldate_payment_expensereport
fix MAIN_AUTOFILL_DATE for expense payment date
|
2020-10-22 16:58:55 +02:00 |
|
Florian HENRY
|
10a3786bab
|
fix MAIN_AUTOFILL_DATE for expense payment date
|
2020-10-22 16:38:59 +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 |
|
Laurent Destailleur
|
648efbc0cb
|
Merge pull request #15067 from prietojc/12.0
FIX: Payment by BankTransfer
|
2020-10-22 15:59:19 +02:00 |
|
Laurent Destailleur
|
ca93f732c8
|
Update line.php
|
2020-10-22 15:59:04 +02:00 |
|
Laurent Destailleur
|
b9e6b188bc
|
Update rejetprelevement.class.php
|
2020-10-22 15:58:24 +02:00 |
|
Laurent Destailleur
|
10a8ce82a9
|
Update bonprelevement.class.php
|
2020-10-22 15:57:25 +02:00 |
|
Laurent Destailleur
|
5a52534675
|
Merge pull request #15072 from FHenry/12.0_fix_14649
FIX #14649
|
2020-10-22 15:51:31 +02:00 |
|
Laurent Destailleur
|
37749e8e9c
|
Merge pull request #15075 from FHenry/12.0_fix_status_receipt_tot
fix set status on order Receipt when no dispatch
|
2020-10-22 15:50:30 +02:00 |
|
Laurent Destailleur
|
88df2ef36d
|
Merge pull request #15076 from FHenry/12.0_fix_margin_token
fix form token missing
|
2020-10-22 15:49:56 +02:00 |
|
Laurent Destailleur
|
9775728b7d
|
Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order
FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form
|
2020-10-22 15:43:31 +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 |
|
Laurent Destailleur
|
732f236c32
|
Merge pull request #15084 from FHenry/12.0_fix_tokenCheck_GetSupplierPrice
12.0 fix token check get supplier price
|
2020-10-22 15:13:40 +02:00 |
|
Laurent Destailleur
|
d521ad6db4
|
Update objectline_edit.tpl.php
|
2020-10-22 15:11:54 +02:00 |
|
Laurent Destailleur
|
46a31f443d
|
Update objectline_create.tpl.php
|
2020-10-22 15:11:01 +02:00 |
|
Florian Mortgat
|
56db7d6c64
|
FIX: also check if there is a method $object->fetch_thirdparty() before calling it
|
2020-10-22 15:09:48 +02:00 |
|
Laurent Destailleur
|
a5d52baa05
|
Merge pull request #15089 from frederic34/patch-7
fill incoterms with company parameters
|
2020-10-22 15:09:47 +02:00 |
|
Laurent Destailleur
|
b45c99faec
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-22 15:03:34 +02:00 |
|
Laurent Destailleur
|
92c6152ad5
|
FIX #14995
|
2020-10-22 15:03:12 +02:00 |
|
Frédéric FRANCE
|
7d8df07253
|
Update card.php
|
2020-10-22 11:46:12 +02:00 |
|
Florian Mortgat
|
509819c119
|
FIX 12.0 - third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order)
|
2020-10-21 23:19:29 +02:00 |
|
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
|
351c8a5a2d
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2020-10-21 20:10:43 +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 |
|
Laurent Destailleur
|
30f8dbad59
|
Merge pull request #15081 from OPEN-DSI/new-invoice-list-margin-info
NEW add margin info in invoice list
|
2020-10-21 19:53:07 +02:00 |
|
Laurent Destailleur
|
5a9aa38cd1
|
Merge pull request #15082 from frederic34/patch-7
add missing parameter
|
2020-10-21 19:51:33 +02:00 |
|
Laurent Destailleur
|
409f8f9866
|
Update doc
|
2020-10-21 19:50:40 +02:00 |
|
Frédéric FRANCE
|
672797aa65
|
add missing parameter
|
2020-10-21 17:09:40 +02:00 |
|
lvessiller
|
9b423106dc
|
NEW add margin info in invoice list
|
2020-10-21 16:10:48 +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 |
|