Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-12 02:42:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,882 Commits 39 Branches 191 Tags
558e0cb5f6a4bb71d01b2ea17f43e397ea32cd59
Commit Graph

77882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
558e0cb5f6 Fix regression 2019-12-03 22:34:49 +01:00
Laurent Destailleur
d153918a10 Fix trans 2019-12-03 15:00:52 +01:00
Laurent Destailleur
78acf07e4c Fix bad side effect of debugbar with android 2019-12-03 14:59:05 +01:00
Laurent Destailleur
cb62844472 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-03 13:52:53 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
 2019-12-03 13:52:42 +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
Laurent Destailleur
5835d49ae1 Merge pull request #12613 from ptibogxiv/patch-288 
Fix title of transactions list
 2019-12-03 13:22:02 +01:00
Laurent Destailleur
e08eca2bf9 Merge pull request #12611 from ptibogxiv/patch-287 
Fix stripe menu
 2019-12-03 13:19:22 +01:00
Laurent Destailleur
242f7ebf09 Merge pull request #12610 from ptibogxiv/patch-286 
FIX not fee in payout list
 2019-12-03 13:16:03 +01:00
ptibogxiv
636da4518f Fix title of transactions list 2019-12-03 11:22:00 +01:00
ptibogxiv
b67fb8be02 Fix stripe menu 2019-12-03 00:14:05 +01:00
ptibogxiv
15715aa12c FIX not fee in payout list 2019-12-02 23:53:01 +01:00
Laurent Destailleur
66571df449 Fix remove a link that is private 2019-12-02 15:19:14 +01:00
John Botella
4a33ee60f8 Fix user card : use comma in amounts inputs 2019-12-02 10:34:14 +01:00
Laurent Destailleur
3bb3643c19 Merge pull request #12575 from inoveaconseil/FIX#11974 
Fix #11974
 2019-12-01 12:44:36 +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
00e901ade8 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2019-12-01 10:37:41 +01:00
Laurent Destailleur
bf99e8af5d Fix phpcs 2019-12-01 10:33:55 +01:00
Laurent Destailleur
971add1c2f Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-12-01 10:30:33 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +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
0e19b94719 Merge pull request #12565 from atm-maxime/fix_ticket_from_third 
FIX #12481 : fix ticket creation from thirdparty, mission $socid var
 2019-12-01 00:47:59 +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
Nicolas
13577d8d48 FIX #12473 2019-11-30 19:52:06 +01:00
Inovea Conseil
025e3d2a80 Merge remote-tracking branch 'Dolibarr/10.0' into 10.0 2019-11-30 19:44:37 +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
b6c88d3c24 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-11-30 12:04:01 +01:00
Laurent Destailleur
fe37983b06 Fix inversion of mime type and mime file name 2019-11-30 12:02:05 +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
6bff3c7fd9 Merge pull request #12561 from atm-maxime/fix_loan_currency 
Fix #12496 : currency was € in loan schedule
 2019-11-30 01:17:43 +01:00
Maxime Kohlhaas
2a3012f12d Fix #12481 : fix ticket creation from thirdparty, mission $socid var 2019-11-30 01:15:47 +01:00