lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,250 Commits 43 Branches 150 Tags 886 MiB
7ee37ddd3f
Commit Graph

63953 Commits

Author SHA1 Message Date
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +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
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
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
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
florian HENRY
bb6523b75d fix task document banner without thirdparty FATAL 2019-12-17 10:49:56 +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
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
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
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
Frédéric FRANCE
407fe902b4
missing $db for line 711 2019-12-09 16:42:57 +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
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
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
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
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
Laurent Destailleur
d6ef77e895
Merge pull request #12603 from atm-florianm/NEW_9.0_mysqldump_export_enable_using_--quick_option 
NEW 9.0: enable user to use the mysqldump '--quick' option
 2019-12-03 14:36:01 +01:00
Laurent Destailleur
072db96b11 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-03 13:48:38 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option 
(useful if the server has low RAM or large tables)
 2019-12-02 16:54:05 +01:00
John Botella
4a33ee60f8 Fix user card : use comma in amounts inputs 2019-12-02 10:34:14 +01:00
Laurent Destailleur
87e81f1afd
Merge pull request #12583 from atm-maxime/fix_supplier_proddesc 
Fix #12044 : with replenish function, use product supplier desc in order
 2019-12-01 11:51:22 +01:00
Maxime Kohlhaas
d76608729b Fix #12569 : update qty on expensereport prevented decimals 2019-12-01 10:50:28 +01:00
Laurent Destailleur
bf99e8af5d Fix phpcs 2019-12-01 10:33:55 +01:00
Maxime Kohlhaas
270f4c2500 Fix #12044 : with replenish function, use product supplier desc in order 2019-12-01 09:26:54 +01:00
Maxime Kohlhaas
a220d43bd6 Fix #11849 : missing price2num in discount split 2019-12-01 01:41:13 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +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