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

73228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
cdb730cf4a
Merge pull request #12724 from atm-florian/9.0 
fix: task document tab FATAL without thirdparty
 2019-12-17 12:14:55 +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
Laurent Destailleur
3a4b4e1559
Merge pull request #12706 from frederic34/patch-22 
Update generate_filelist_xml.php
 2019-12-14 13:23:36 +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
18e3a4bcbb
Update generate_filelist_xml.php 2019-12-13 12:56:02 +01:00
Frédéric FRANCE
6e64a20f9e
Update filecheck.php 2019-12-13 11:16:46 +01:00
Frédéric FRANCE
030b78d79f
Update generate_filelist_xml.php 2019-12-13 11:16:04 +01:00
Frédéric FRANCE
a923a48e64
Update filecheck.php 2019-12-13 10:44:12 +01:00
Frédéric FRANCE
cad54c6d7a
Update generate_filelist_xml.php 2019-12-13 10:42:49 +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
Laurent Destailleur
2103cacf9e
Merge pull request #12679 from glelarge/80/12665-mass_invoice_validation_with_stock_management 
FIX #12665 Mass invoice validation with stock management (branch 8.0)
 2019-12-10 19:26:24 +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
Laurent Destailleur
e66013275d
Merge pull request #12675 from frederic34/patch-6 
doxygen and $db not defined
 2019-12-10 11:35:46 +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
Laurent Destailleur
7ba5c2e9d8
Merge pull request #12669 from frederic34/patch-6 
typo
 2019-12-10 05:53:13 +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
314a13a8df
Merge pull request #12668 from frederic34/patch-6 
missing $db for line 711
 2019-12-09 17:33:20 +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
Laurent Destailleur
d4e20bb3a4
Merge pull request #12616 from atm-gauthier/8.0_fix_bill_orders_with_unit 
FIX : when we need to bill several orders, order lines unit is not on bill lines
 2019-12-03 19:10:00 +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
Laurent Destailleur
b5ce6131fb
Merge pull request #12599 from atm-john/9.0_fix_user_comma_input 
Fix user card : use comma in amounts inputs
 2019-12-03 13:45:02 +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
Laurent Destailleur
aa5dff9aae
Merge pull request #12582 from atm-maxime/fix_remise_split 
Fix #11849 : missing price2num in discount split
 2019-12-01 10:54:30 +01:00
Laurent Destailleur
e1d4e14075
Merge pull request #12587 from atm-maxime/fix_expense_qtyupdate 
Fix #12569 : update qty on expensereport prevented decimals
 2019-12-01 10:53:57 +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