Francis Appels
e5ddc8dfa3
Merge remote-tracking branch 'Dolibarr/11.0' into 11
2020-01-07 09:43:13 +01:00
Laurent Destailleur
73e62c65aa
Fix phpcs
2020-01-04 15:20:10 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +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
VESSILLER
6e9bb5d7da
FIX sql bad request in product buying price extrafields
2020-01-03 20:49:54 +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
Laurent Destailleur
15ad41ee6d
MRP
2020-01-03 15:01:14 +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
68d7195964
MRP
2020-01-02 22:09:08 +01:00
Laurent Destailleur
d95e37aa72
Look and feel v11
2020-01-02 20:43:16 +01:00
Laurent Destailleur
298f6d0683
Look and feel v11
2020-01-02 20:36:35 +01:00
Laurent Destailleur
d93de4b931
FIX Import of customer prices per segment was not possible
2020-01-02 20:08:43 +01:00
Laurent Destailleur
2c20b25a29
Suggest another value than "bad customer" to close an invoice paid
2020-01-02 18:02:53 +01:00
Laurent Destailleur
d398917294
Prepare final version
2020-01-02 15:47:31 +01:00
Laurent Destailleur
fff805e7ec
Look and feel v11
2020-01-02 15:10:46 +01:00
Laurent Destailleur
b98251f7b0
Fix phpcs
2020-01-01 23:14:13 +01:00
Laurent Destailleur
607d013a9d
Fix phpcs
2020-01-01 23:01:42 +01:00
Laurent Destailleur
b90dbb585a
Fix ident
2020-01-01 22:45:47 +01:00
Laurent Destailleur
e7ac01e1bd
FIX localtax info were not returned correctly when call done with id.
2020-01-01 22:27:47 +01:00
Laurent Destailleur
85d3b424f7
FIX: Substitution of login into link is wrong.
2020-01-01 22:27:08 +01:00
Laurent Destailleur
d3d7592072
FIX Warning for some country must appears if company is in this country.
2020-01-01 22:26:47 +01:00
Laurent Destailleur
2e8fd25299
FIX Local taxes was not correctly supported in TakePOS.
2020-01-01 21:54:47 +01:00
Laurent Destailleur
b50cb2a65d
Fix solution to solve a blocking situation (credit note both refunded
...
and consumed)
2020-01-01 19:04:14 +01:00
Laurent Destailleur
ce7360ced3
Code comment
2020-01-01 18:43:46 +01:00
Laurent Destailleur
84d0ae7ac5
Trans
2020-01-01 17:31:48 +01:00
Laurent Destailleur
7d07c198bc
FIX Price of purchase order and vendor invoice with multicurrency
...
FIX entering predefined product with a forced unit price
2020-01-01 17:15:26 +01:00
Laurent Destailleur
cc8f3f7258
Fix var not defined
2020-01-01 16:41:01 +01:00
Laurent Destailleur
2ac6a8a3db
Fix ping after update
2020-01-01 14:30:16 +01:00
Laurent Destailleur
3d98863092
Fix bad position of lang loading
2020-01-01 13:51:14 +01:00
Laurent Destailleur
bf9f9df50f
Fix var not defined
2020-01-01 13:46:09 +01:00
Laurent Destailleur
d175b34323
Fix log
2020-01-01 13:22:20 +01:00
Laurent Destailleur
821ff375b0
Fix update ref
2020-01-01 13:15:42 +01:00
Laurent Destailleur
e4a03e98b7
FIX Do not record resource owner of event when not defined.
...
More log to track payment errors.
2020-01-01 12:47:01 +01:00
Laurent Destailleur
3825e9af06
FIX logo not found in some cases
2020-01-01 03:00:10 +01:00
Laurent Destailleur
f8c15a14cf
Add try catch
2019-12-31 19:11:36 +01:00
Laurent Destailleur
c0c413b219
Alignement
2019-12-31 18:32:57 +01:00
Laurent Destailleur
4e2bc6a741
Fix alignment
2019-12-31 18:23:56 +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
