Laurent Destailleur
8bc8a8f57c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-19 12:16:33 +01:00
Laurent Destailleur
f4ae869678
Fix error return when creating order with not enough stock
2020-01-19 12:15:47 +01:00
Laurent Destailleur
cf2001a1ae
Merge pull request #12860 from atm-ph/fix_10.0_html_text
...
Fix note started with <s> balise
2020-01-17 14:51:09 +01:00
VESSILLER
60d4f63205
FIX send expense report mail in HTML format
2020-01-17 13:56:01 +01:00
atm-ph
3cdb84b192
Fix note started with <s> balise
2020-01-16 09:50:57 +01:00
John Botella
10c973f38f
Fix complex export model loading
2020-01-15 14:36:44 +01:00
Laurent Destailleur
0a1a07aa22
Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields
...
FIX : We want to be able to import data for extrafields of entity 0 too
2020-01-15 13:12:56 +01:00
Laurent Destailleur
b4a309a251
Prepare 10.0.7
2020-01-15 12:00:25 +01:00
Laurent Destailleur
0442105bd4
Fix Generation of zip of module
2020-01-15 11:55:27 +01:00
gauthier
5455130a03
FIX : We want to be able to import data for extrafields of entity 0 too
2020-01-13 16:15:22 +01:00
Laurent Destailleur
efb506ba7f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-10 13:51:35 +01:00
Laurent Destailleur
c4d62e0ea3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Laurent Destailleur
b93247aeec
Merge pull request #12819 from atm-arnaud/FIX_stats_invoices_with_draft
...
FIX drafts are now implemented for stats
2020-01-10 00:15:13 +01:00
Laurent Destailleur
bc8dfd46c2
Merge pull request #12810 from ATM-Consulting/10.0_Fix_folder_rename_behavior
...
Fix folder rename behavior
2020-01-10 00:11:47 +01:00
atm-arnaud
ae4554af65
FIX drafts are now implemented for stats
2020-01-08 11:27:52 +01:00
Dev2a
57c954f2e8
Fix Check array of action after kooks
2020-01-07 21:41:36 +01:00
Dev2a
2d67c2365f
Fix Check right for service for arrayofmassaction
...
if product module disable, threre is no action for service
2020-01-07 18:59:58 +01:00
John Botella
36ccb8b08e
Fix folder rename behavior
2020-01-07 14:49:25 +01:00
ptibogxiv
5a1f123994
Update societe.class.php
2020-01-07 13:10:10 +01:00
ptibogxiv
e820af4aa0
FIX: multicompany for discount
2020-01-07 13:07:36 +01:00
Laurent Destailleur
cc4c2d8a0b
Prepare 10.0.6
2020-01-05 20:39:45 +01:00
Laurent Destailleur
eca91af2ca
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-04 14:21:56 +01:00
Laurent Destailleur
7853427bb1
FIX product with empty stock were not visible
2020-01-04 14:21:38 +01:00
Laurent Destailleur
0dafbd194f
Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending
...
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732
Update product.class.php
2020-01-03 20:53:49 +01:00
Laurent Destailleur
88d97104be
Merge pull request #12789 from aspangaro/10.0_p32
...
FIX Some problems on conciliation with others modules
2020-01-03 20:47:33 +01:00
Laurent Destailleur
e178d38bf8
Merge pull request #12791 from ptocquin/patch-1
...
Update api_supplier_invoices.class.php
2020-01-03 20:42:55 +01:00
Laurent Destailleur
e83b71f271
Merge pull request #12787 from aspangaro/10.0_p30
...
FIX Loan card - Wrong language key used
2020-01-03 20:42:01 +01:00
Laurent Destailleur
b452fc8442
Merge pull request #12788 from aspangaro/10.0_p31
...
FIX typo on language key
2020-01-03 20:41:04 +01:00
Pierre Tocquin
8a5f3d48f4
Update api_supplier_invoices.class.php
...
Correction test data 'date' lors de la création d'une facture fournisseur. `array_keys` remplacé par `array_key_exists` dans la clause `if`. Cette clause est correcte dans api_invoices.class.php.
2020-01-03 19:18:24 +01:00
Pierre Ardoin
79458ac139
FIX an issue that shows all entities stock
...
Before : If products are shared between several entities, the stock of each entity are to add in this page (reassort.php)
Now : Each entity see only her stock and not other's stock.
2020-01-03 18:05:49 +01:00
Alexandre SPANGARO
f14aaf5e50
FIX Some problems on conciliation with others modules
2020-01-03 16:35:02 +01:00
Alexandre SPANGARO
93d87d581b
FIX typo on language key
2020-01-03 14:56:49 +01:00
Alexandre SPANGARO
67316c9125
FIX Loan card - Wrong language key used
2020-01-03 14:38:25 +01:00
Laurent Destailleur
103f41f571
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-31 18:22:34 +01:00
Laurent Destailleur
d2efe1d427
Fix SQL injection on type parameter in list of events
2019-12-31 17:52:28 +01:00
Laurent Destailleur
31c5f4eb0b
Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto
...
FIX remove backward compatibility projectid and uses object id instead
2019-12-31 17:40:01 +01:00
Laurent Destailleur
ff1c96f985
Merge pull request #12753 from aspangaro/10.0_p9
...
FIX : Some issues on salary payment
2019-12-31 17:39:08 +01:00
Laurent Destailleur
4c6c8e172f
Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class
...
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04
FIX #12760 #12763 #12755 #12765 #12751
2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:26:02 +01:00
Laurent Destailleur
10d6d00c17
Merge pull request #12749 from OPEN-DSI/v10-fix-admin-dict-transkey-not-defined
...
FIX var transkey not defined in input hidden
2019-12-30 22:01:16 +01:00
Laurent Destailleur
6e90e81be1
Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class
...
FIX class Facture undefined in displaying margin information
2019-12-30 22:00:28 +01:00
Laurent Destailleur
b067653070
Merge pull request #12757 from aspangaro/10.0_p12
...
FIX Missing language key for MAIN_MAXTABS_IN_CARD
2019-12-30 21:59:32 +01:00
Laurent Destailleur
aa390b8c3c
Merge pull request #12771 from tuxgasy/10.0_Fix_double_value_on_update_object
...
Fix decimal value on update object
2019-12-30 21:50:53 +01:00
Laurent Destailleur
e2c7ee7d09
Merge pull request #12772 from hregis/10.0_mc
...
FIX wrong var name and avoid warning
2019-12-30 21:48:56 +01:00
Laurent Destailleur
5a34874b0a
Merge pull request #12752 from OPEN-DSI/v10-fix-project-element-task-urlnew
...
FIX url new for task time spent in project element tab
2019-12-30 21:47:26 +01:00
Regis Houssin
71a2998118
FIX wrong var name and avoid warning
2019-12-30 15:36:09 +01:00
TuxGasy
c9cc6cbbea
Fix decimal value on update object
2019-12-29 23:15:49 +01:00
Alexandre SPANGARO
a804208b32
Fix missing language key
2019-12-27 20:54:47 +01:00
Alexandre SPANGARO
9a7307eea8
FIX Missing language key for MAIN_MAXTABS_IN_CARD
2019-12-26 12:01:09 +01:00
Marc de Lima Lucio
c8dfc3d9fc
FIX: error 500 when getting margin info for objects other than invoices
2019-12-24 16:09:29 +01:00
Alexandre SPANGARO
44400b7866
FIX : Some issues on salary payment
2019-12-24 07:22:25 +01:00
Laurent Destailleur
5521d13a11
Prepare 10.0.5
2019-12-23 22:12:50 +01:00
VESSILLER
792096ad08
FIX url new for task time spent in project element tab
2019-12-23 16:00:35 +01:00
Laurent Destailleur
3250b13f4a
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
2019-12-23 15:45:08 +01:00
VESSILLER
720146c45f
FIX class Facture undefined in displaying margin information
2019-12-23 15:37:12 +01:00
VESSILLER
99e63ad507
FIX uses GETPOSTISSET instead of GETPOST for projectfield
2019-12-23 15:18:45 +01:00
VESSILLER
b0edd46494
FIX add product qty in shipment already sent
2019-12-23 15:07:26 +01:00
VESSILLER
e03222b831
FIX var transkey not defined in input hidden
2019-12-23 14:38:01 +01:00
VESSILLER
e7a5d26355
FIX remove backward compatibility projectid and uses object id instead
2019-12-23 14:25:54 +01:00
Laurent Destailleur
7b08ce9fb8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-23 14:01:51 +01:00
Laurent Destailleur
eb32e98127
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-23 14:01:44 +01:00
Laurent Destailleur
36e6036e9e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-23 14:01:00 +01:00
Laurent Destailleur
76d23141fd
Merge pull request #12727 from fappels/patch-1
...
Update 6.0.0-7.0.0.sql
2019-12-23 14:00:15 +01:00
Laurent Destailleur
1229e8bc4b
Merge pull request #12747 from OPEN-DSI/v10-fix-contact-card-select-state
...
FIX contact card state address selected after filling address
2019-12-23 13:47:16 +01:00
Laurent Destailleur
15031a3e87
Merge pull request #12746 from OPEN-DSI/v10-fix-categories-traduction-backurl
...
FIX add and modify category translate form with posted values on errors
2019-12-23 13:44:37 +01:00
Laurent Destailleur
93cece6a3a
Merge pull request #12738 from mapiolca/patch-16
...
#FIX Error Margin with Situation Invoice
2019-12-23 13:43:18 +01:00
Laurent Destailleur
b3400fac24
Merge pull request #12744 from OPEN-DSI/v10-fix-facture-duedate-and-paid
...
FIX set due date in object in create invoice
2019-12-23 13:42:31 +01:00
Laurent Destailleur
e963fa4b07
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-23 13:40:49 +01:00
Laurent Destailleur
4d12ecb072
FIX #12745
2019-12-23 13:40:35 +01:00
VESSILLER
e59514600b
FIX contact card state address selected after filling address
2019-12-23 12:10:51 +01:00
VESSILLER
558d577309
FIX add and modify category translate form with posted values on errors
2019-12-23 11:53:19 +01:00
VESSILLER
c39e45b81a
FIX set due date in object in create invoice
2019-12-23 10:57:51 +01:00
Laurent Destailleur
77ab6604fd
Merge pull request #12740 from mapiolca/patch-17
...
FIX Invoice Situation integration into Margin
2019-12-22 21:39:15 +01:00
Regis Houssin
8321fe6ad2
FIX missing nl2br conversion
2019-12-22 09:13:34 +01:00
Pierre Ardoin
91e2fe9a99
Update to integer situation invoice
...
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and proportional.
2019-12-19 12:06:18 +01:00
Pierre Ardoin
a82f996fcf
Update to integer situation invoice
...
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and proportional.
2019-12-19 12:04:48 +01:00
Pierre Ardoin
347eae05ac
Update to integer situation invoice
...
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and proportional.
2019-12-19 12:03:09 +01:00
Pierre Ardoin
14cf295f22
Update to integer situation invoice
...
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and proportional.
2019-12-19 11:58:25 +01:00
Pierre Ardoin
063c139fee
Situation Invoice Compatibility
...
take progress percent into account in buying price
2019-12-19 11:52:30 +01:00
Pierre Ardoin
538921f479
#FIX Error Margin with Situation Invoice
...
Fix an issue that show a negative margin when $line->situation_percent is not 100%
Now, the margin price take progress into account.
2019-12-19 10:35:38 +01:00
ptibogxiv
6789b7bd1e
Fix day scale unit
2019-12-18 18:23:31 +01:00
Laurent Destailleur
ea93c687a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-18 12:26:05 +01:00
Laurent Destailleur
92facbc892
Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad
...
FIX : units traductions for selectUnits() function
2019-12-18 12:21:33 +01:00
Laurent Destailleur
451b32674e
Removed duplicate record
2019-12-18 12:15:34 +01:00
Alexandre SPANGARO
3fb72c349f
Fix language traduction on import/export tools
2019-12-18 03:25:19 +01:00
Maxime Kohlhaas
3e19702e39
Fix prevent double action on shipment close
2019-12-17 18:05:59 +01:00
Laurent Destailleur
27b1e71cd2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-17 12:45:00 +01:00
Francis Appels
95b56f0518
Update 6.0.0-7.0.0.sql
...
timestamp NOT NULL can cause SQL error.
2019-12-17 12:19:35 +01:00
Laurent Destailleur
7b1bf32cd9
Update products.lang
2019-12-17 12:19:32 +01:00
Laurent Destailleur
03bb395ad8
Update document.php
2019-12-17 12:14:30 +01:00
gauthier
a672673319
FIX : units traductions for selectUnits() function
2019-12-17 11:25:25 +01:00
florian HENRY
bb6523b75d
fix task document banner without thirdparty FATAL
2019-12-17 10:49:56 +01:00
John Botella
98bd4f3a66
Fix document module call
2019-12-16 09:44:08 +01:00
Laurent Destailleur
60a0c18338
Merge pull request #12708 from atm-gauthier/10.0_fix_product_fourn_price_id
...
FIX : product_fourn_price_id was assigned too late for logPrice() function
2019-12-14 22:28:11 +01:00
Laurent Destailleur
2c4fd099c8
Update fournisseur.product.class.php
2019-12-14 22:27:45 +01:00
Laurent Destailleur
e9a0646f6f
Update fournisseur.product.class.php
2019-12-14 22:25:34 +01:00
Laurent Destailleur
5e3698b023
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
2019-12-14 14:44:38 +01:00
Laurent Destailleur
17b9964678
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
31a60ff30b
Fix $db
2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-14 14:34:14 +01:00
Laurent Destailleur
a8de7b850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
371a2c62bd
Merge pull request #12695 from hregis/10.0_mc
...
FIX #12688
2019-12-14 13:58:43 +01:00
Laurent Destailleur
9f2a628c3b
Remove bak file
2019-12-14 13:25:21 +01:00
gauthier
cc1454c8d5
FIX : product_fourn_price_id was assigned too late for logPrice() function
2019-12-13 14:55:39 +01:00
Frédéric FRANCE
bac5c3800e
Update api_setup.class.php
2019-12-13 14:46:27 +01:00
Frédéric FRANCE
50937f8ca1
Update filecheck.php
2019-12-13 12:56:48 +01:00
Frédéric FRANCE
6e64a20f9e
Update filecheck.php
2019-12-13 11:16:46 +01:00
Frédéric FRANCE
a923a48e64
Update filecheck.php
2019-12-13 10:44:12 +01:00
gauthier
a0aa51fe0c
FIX : CommandeFournisseurLigne update function must not be able to return other value than 1 if success
2019-12-12 16:46:25 +01:00
Regis Houssin
a527e72124
FIX #12688
2019-12-12 16:35:07 +01:00
Laurent Destailleur
22a297ed47
Merge pull request #12680 from glelarge/90/12665-mass_invoice_validation_with_stock_management
...
FIX #12665 Mass invoice validation with stock management (branch 9.0)
2019-12-10 19:27:36 +01:00
Mistral Oz - LWEP
b92ec604ec
New model "Excel 2007" : first col at wrong position
...
The first column start at id 0 instead of id 1. At id 0, the first column move at Z position.
Documentation : https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1
2019-12-10 18:25:30 +01:00
Gérald Lelarge
97ec8b8e02
FIX #12665 Mass invoice validation with stock management
...
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
2019-12-10 14:23:48 +01:00
Gérald Lelarge
5d61e53140
FIX #12665 Mass invoice validation with stock management
...
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
2019-12-10 14:16:15 +01:00
Frédéric FRANCE
f4674a7558
doxygen and $db bot defined
2019-12-10 07:51:39 +01:00
Laurent Destailleur
c0e23c7b71
Merge pull request #12670 from frederic34/patch-7
...
The variable $id seems to be never defined
2019-12-10 05:53:46 +01:00
Frédéric FRANCE
de741f5dd0
The variable $id seems to be never defined
2019-12-09 23:22:13 +01:00
Frédéric FRANCE
a16e342af6
typo
2019-12-09 23:15:15 +01:00
Laurent Destailleur
24e9d3fdf0
Merge pull request #12631 from atm-florianm/FIX_10.0_backporting_duration_fix_from_develop
...
FIX 10.0: do not display single-letter duration values in product list
2019-12-09 17:43:32 +01:00
Frédéric FRANCE
407fe902b4
missing $db for line 711
2019-12-09 16:42:57 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card
...
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
2019-12-09 15:59:55 +01:00
Laurent Destailleur
1401daba39
Merge pull request #12667 from glelarge/12665-mass_invoice_validation_with_stock_management
...
FIX #12665 Mass invoice validation with stock management
2019-12-09 15:58:14 +01:00
Gérald Lelarge
903c3771ba
FIX #12665 Mass invoice validation with stock management
...
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
2019-12-09 14:59:30 +01:00
Laurent Destailleur
94ae8e07af
Merge pull request #12642 from frederic34/patch-11
...
fix #12628
2019-12-09 13:54:20 +01:00
Laurent Destailleur
f28e4c14e8
FIX #12644
2019-12-09 13:40:26 +01:00
Laurent Destailleur
70a8d93f6e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-09 13:27:40 +01:00
Laurent Destailleur
94bab15528
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
63a26ed436
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-09 13:25:49 +01:00
Laurent Destailleur
f2c7d3de2e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:25:23 +01:00
Laurent Destailleur
5dbf060f00
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:24:01 +01:00
Laurent Destailleur
53149bb7cd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2019-12-08 04:22:50 +01:00
Laurent Destailleur
394104291a
Fix function not found when creating a payment of an expense report
2019-12-08 04:22:09 +01:00
Laurent Dinclaux
f51a68ceb1
Takepos: Well align the search field width, keep old CSS rule as fallback for old browsers
2019-12-07 15:36:23 +11:00
Frédéric FRANCE
cafe26cfc3
Update card.php
2019-12-06 23:23:57 +01:00
Laurent Destailleur
d73bd3ee9a
Fix a supplier ref is mandatory for import
2019-12-06 18:43:13 +01:00
Laurent Destailleur
22f575dad0
Merge pull request #12633 from atm-lena/FIX_getrights_request
...
FIX getrights() request
2019-12-06 16:22:47 +01:00
atm-lena
486f598067
FIX getrights() request
2019-12-05 16:11:12 +01:00
Florian Mortgat
3f6715a377
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
2019-12-05 15:34:41 +01:00
Florian Mortgat
139419c3e8
FIX 10.0: do not display single-letter values (indicating duration unit without value) in product list
...
(this fix exists in develop)
2019-12-05 10:38:03 +01:00
Laurent Destailleur
18464de297
Clean old file
2019-12-04 22:08:32 +01:00
Laurent Destailleur
89dd74c115
Fix clean old files
2019-12-04 22:05:09 +01:00
Laurent Destailleur
13acb8537d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-12-03 22:38:10 +01:00
Laurent Destailleur
a75915a7a8
Fix regression
2019-12-03 22:37:58 +01:00
Laurent Destailleur
8006d08e6b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-03 22:36:37 +01:00
Laurent Destailleur
60d3bd0fe9
Fix regression
2019-12-03 22:36:26 +01:00
Laurent Destailleur
21a0e962ad
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-03 22:35:01 +01:00
Laurent Destailleur
558e0cb5f6
Fix regression
2019-12-03 22:34:49 +01:00
gauthier
cec54d6ce0
FIX : when we need to bill several orders, order lines unit is not on bill lines
2019-12-03 16:40:35 +01:00