Laurent Destailleur
|
2c2142ddba
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-10-26 18:13:47 +01:00 |
|
Laurent Destailleur
|
adeddc70ca
|
FIX Deletion of expensereport + other generated object not complete.
|
2020-10-26 18:10:58 +01:00 |
|
Laurent Destailleur
|
9dfc08d2bd
|
Fix bad var name
|
2020-10-25 21:11:05 +01:00 |
|
Laurent Destailleur
|
ec0da6921a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-10-25 21:10:00 +01:00 |
|
Laurent Destailleur
|
6bc0630c5f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/boxes/box_services_contracts.php
|
2020-10-25 21:09:43 +01:00 |
|
Laurent Destailleur
|
baa86d773b
|
Fix phpcs
|
2020-10-25 21:07:37 +01:00 |
|
Laurent Destailleur
|
b80d135fcb
|
Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage
fix mail error message
|
2020-10-25 14:50:23 +01:00 |
|
Laurent Destailleur
|
02ef5ad3b9
|
Merge pull request #15144 from atm-maxime/fix_supp_inv_numbering
Fix #15064 : error when supplier invoice numbering module is not configured
|
2020-10-25 13:58:48 +01:00 |
|
Laurent Destailleur
|
b6db71e5e6
|
Merge pull request #15146 from atm-maxime/fix_selected_lines_invoice_creation
Fix #15143 selected lines on invoice creation
|
2020-10-25 13:57:00 +01:00 |
|
Laurent Destailleur
|
b02c734c69
|
Merge pull request #15141 from atm-maxime/fix_bom_rang
Fix BOM position field
|
2020-10-25 13:54:45 +01:00 |
|
Laurent Destailleur
|
d21f51a35e
|
Merge pull request #15142 from atm-maxime/fix_contract_box_var
Fix var name in contract box
|
2020-10-25 13:54:04 +01:00 |
|
Maxime Kohlhaas
|
309691f1e7
|
Fix #15143 selected lines on invoice creation
|
2020-10-25 09:28:41 +01:00 |
|
Maxime Kohlhaas
|
680ae60b6f
|
Fix #15064 : error when supplier invoice numbering module is not configured
|
2020-10-25 08:56:34 +01:00 |
|
Maxime Kohlhaas
|
7080c8491d
|
Fix var name in contract box
|
2020-10-24 19:46:57 +02:00 |
|
Maxime Kohlhaas
|
bedfb7ac8d
|
Fix BOM position field
|
2020-10-24 19:19:06 +02:00 |
|
Laurent Destailleur
|
50da1cd95e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-10-23 17:33:57 +02:00 |
|
Laurent Destailleur
|
cf4ea4168d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/class/extrafields.class.php
|
2020-10-23 17:33:14 +02:00 |
|
Laurent Destailleur
|
377c44eeab
|
Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required
FIX no empty value in required extrafield
|
2020-10-23 17:29:12 +02:00 |
|
Florian HENRY
|
53a76dc01f
|
fix mail error message
|
2020-10-23 16:39:45 +02:00 |
|
Laurent Destailleur
|
edbf4dc375
|
Fix doc
|
2020-10-23 13:55:14 +02:00 |
|
Laurent Destailleur
|
0e25843baa
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
|
2020-10-23 03:59:11 +02:00 |
|
Laurent Destailleur
|
c9a73cc380
|
Fix phpcs
|
2020-10-23 03:55:18 +02:00 |
|
Laurent Destailleur
|
62420c5e7b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/fourn/facture/card.php
|
2020-10-23 03:51:22 +02:00 |
|
Laurent Destailleur
|
e0e4da481a
|
Fix phpcs
|
2020-10-23 03:42:54 +02:00 |
|
Laurent Destailleur
|
d9aa83e699
|
Fix phpcs
|
2020-10-23 03:41:26 +02:00 |
|
Laurent Destailleur
|
15bbba3f52
|
Remove warning
|
2020-10-22 21:55:01 +02:00 |
|
Laurent Destailleur
|
e811a9b13e
|
Merge pull request #15097 from marc-dll/FIX_10.0_supplier_invoice_echeance
FIX: supplier invoice: automatically calculate payment term when modifying payment condition
|
2020-10-22 18:40:07 +02:00 |
|
Laurent Destailleur
|
b4581b6af8
|
Better error management
|
2020-10-22 18:39:45 +02:00 |
|
Marc de Lima Lucio
|
594d9e321e
|
FIX: invoice payment terms edition: error management
|
2020-10-22 18:28:27 +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 |
|
Marc de Lima Lucio
|
1795ec6a9d
|
FIX: supplier invoice: autoatically calculate payment term when modifying payment condition
|
2020-10-22 16:11:12 +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 |
|