lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,956 Commits 43 Branches 150 Tags 886 MiB
89dcbfae82
Commit Graph

83956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
89dcbfae82
Merge pull request #15212 from Dolibarr/revert-15182-FIX_11.0_various_payment_subledger 
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"
 2020-10-29 10:37:33 +01:00
Laurent Destailleur
c3f0f3cc4a
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback" 2020-10-29 10:36:48 +01:00
Laurent Destailleur
866934e6c5
Merge pull request #15182 from marc-dll/FIX_11.0_various_payment_subledger 
FIX: various payments: bad data handling for subledger account + useless db commit/rollback
 2020-10-27 18:07:47 +01:00
Marc de Lima Lucio
a33d34a165 FIX: various payments: bad data handling for subledger account + useless db commit/rollback 2020-10-27 16:48:56 +01:00
Laurent Destailleur
027c5582c3
Merge pull request #15178 from frederic34/patch-6 
dol_print_date called with a bad value
 2020-10-27 11:55:07 +01:00
Frédéric FRANCE
da4f3fab14
dol_print_date called with a bad value 2020-10-27 08:10:19 +01:00
Laurent Destailleur
78a52eda96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/main.inc.php
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:05:30 +01:00
Laurent Destailleur
50ede5224a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-26 19:02:47 +01:00
Laurent Destailleur
c58d3d0cf7 FIX #15163 2020-10-26 19:02:26 +01:00
Laurent Destailleur
ca66df2a7b
Merge pull request #15167 from marc-dll/FIX_10.0_customer_price_triggers 
FIX: product customer prices: missing triggers in CRUD class
 2020-10-26 18:59:44 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Marc de Lima Lucio
3f839c2a96 FIX: product customer prices: missing triggers in CRUD class 2020-10-26 16:11:21 +01:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +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
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
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
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
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
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
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
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