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

73203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
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
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
20e941c585
Merge pull request #12579 from atm-maxime/fix_pdf_rouget 
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
 2019-11-30 23:26:43 +01:00
Maxime Kohlhaas
edb8bcb598 Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME 2019-11-30 22:58:32 +01:00
Laurent Destailleur
a352fd5a6e
Revert "FIX#12482" 2019-11-30 21:00:56 +01:00
Laurent Destailleur
639e258140
Merge pull request #12577 from inoveaconseil/#12482 
FIX#12482
 2019-11-30 20:54:08 +01:00
Nicolas
f2ff443641 FIX #12482 2019-11-30 20:04:27 +01:00
Inovea Conseil
7077457d50 Merge remote-tracking branch 'Dolibarr/8.0' into 8.0 2019-11-30 19:59:42 +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
Laurent Destailleur
7b828d1f0b
Merge pull request #12563 from atm-maxime/fix_notification_user_diabled 
Fix #12448 : notifications were sent to disabled user or contacts
 2019-11-30 01:18:35 +01:00
Laurent Destailleur
f0cc559f4c
Merge pull request #12562 from atm-maxime/fix_loan_update_rate 
Fix #12502 : loan rate wasn't updatable
 2019-11-30 01:11:00 +01:00
Maxime Kohlhaas
02b5da5db1 Fix #12448 : notifications were sent to disabled user or contacts 2019-11-30 00:57:21 +01:00
Maxime Kohlhaas
9116110737 Fix #12502 : loan rate wasn't updatable 2019-11-30 00:35:32 +01:00
Laurent Destailleur
8656143050 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:13:02 +01:00
Laurent Destailleur
98a7a5559f Fix bad fix 2019-11-24 18:12:40 +01:00
Laurent Destailleur
f2e01834a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:11:46 +01:00