Laurent Destailleur
53709cf509
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/utils.class.php
2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e
FIX avoid infinite loop on dump with popen
2022-01-07 15:35:33 +01:00
Laurent Destailleur
0a72aed3d7
Fix missing space before union
2021-12-23 13:35:38 +01:00
Regis Houssin
34e434a17e
FIX missing member entity
2020-04-06 16:36:11 +02:00
Laurent Destailleur
125e964352
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2020-03-30 19:46:23 +02:00
Cédric
eead9a93d3
Fix can set desiredstock to (int) 0 from API Rest
...
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
2020-03-30 13:03:13 +02:00
Laurent Destailleur
467dc2da7a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2020-03-11 16:59:35 +01:00
Laurent Destailleur
4bdf10c995
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2020-03-11 16:44:03 +01:00
atm-lena
20aa51f26b
FIX - Clone Fourn Command, add line's extrafields Part 2
2020-03-11 15:26:49 +01:00
atm-lena
35f32391a0
FIX - Clone Fourn Command, add line's extrafields
2020-03-10 14:46:15 +01:00
Maxime Kohlhaas
0ab16ed5ae
Fix #10179 discount split
2020-02-23 16:50:24 +01:00
Laurent Destailleur
14531bf160
Fix #13046 - Bad parenthesis on test
2020-02-08 15:28:40 +01:00
Laurent Destailleur
bf4fca0c7e
Fix warning
2020-02-03 22:09:21 +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
Maxime Kohlhaas
3e19702e39
Fix prevent double action on shipment close
2019-12-17 18:05:59 +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
9f2a628c3b
Remove bak file
2019-12-14 13:25:21 +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
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
94ae8e07af
Merge pull request #12642 from frederic34/patch-11
...
fix #12628
2019-12-09 13:54:20 +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
Frédéric FRANCE
cafe26cfc3
Update card.php
2019-12-06 23:23:57 +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
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
Maxime Kohlhaas
a220d43bd6
Fix #11849 : missing price2num in discount split
2019-12-01 01:41:13 +01:00
Laurent Destailleur
bfb8a4e8da
Merge pull request #12578 from Dolibarr/revert-12577-#12482
...
Revert "FIX#12482"
2019-12-01 00:55:13 +01:00
Laurent Destailleur
199b0c11af
Merge pull request #12572 from atm-maxime/fix_deposit
...
Fix deposit line was not translated in deposit invoice
2019-12-01 00:44:17 +01:00
Laurent Destailleur
ec67fa4877
Merge pull request #12573 from atm-maxime/fix_vat_fiscal
...
Fix #11228 : VAT dates regarding fiscal year
2019-11-30 23:30:41 +01:00
Laurent Destailleur
47b35e9011
Merge pull request #12570 from atm-maxime/fix_margin_rights
...
Fix margin rights
2019-11-30 23:28:26 +01:00
Laurent Destailleur
a352fd5a6e
Revert "FIX#12482"
2019-11-30 21:00:56 +01:00
Nicolas
f2ff443641
FIX #12482
2019-11-30 20:04:27 +01:00
Maxime Kohlhaas
3c639772d9
Fix #11228 : VAT dates regarding fiscal year
2019-11-30 17:16:16 +01:00
Maxime Kohlhaas
558669dd88
Fix #6497 : deposit lines were not translated
2019-11-30 16:14:16 +01:00
Maxime Kohlhaas
2c165d0a61
Fix deposit date display in PDF
2019-11-30 15:53:50 +01:00
Maxime Kohlhaas
916954b301
Fix #12371 : access rights on contacts
2019-11-30 14:48:05 +01:00
Maxime Kohlhaas
9095482113
Fix margins access + menu display
2019-11-30 14:47:48 +01:00
Maxime Kohlhaas
02b5da5db1
Fix #12448 : notifications were sent to disabled user or contacts
2019-11-30 00:57:21 +01:00