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

77908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f28e4c14e8 FIX #12644 2019-12-09 13:40:26 +01:00
Laurent Destailleur
70a8d93f6e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-09 13:27:40 +01:00
Laurent Destailleur
94bab15528 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:27:30 +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
d7390b51cd
Merge pull request #12645 from Gecka-Apps/10.0-takepos-fix-search-width 
Takepos: Well align the search field width, keep old CSS rule as fallback
 2019-12-09 13:22:26 +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 Dinclaux
f51a68ceb1 Takepos: Well align the search field width, keep old CSS rule as fallback for old browsers 2019-12-07 15:36:23 +11:00
Laurent Destailleur
d73bd3ee9a Fix a supplier ref is mandatory for import 2019-12-06 18:43:13 +01:00
Laurent Destailleur
22f575dad0
Merge pull request #12633 from atm-lena/FIX_getrights_request 
FIX getrights() request
 2019-12-06 16:22:47 +01:00
atm-lena
486f598067 FIX getrights() request 2019-12-05 16:11:12 +01:00
Laurent Destailleur
18464de297 Clean old file 2019-12-04 22:08:32 +01:00
Laurent Destailleur
89dd74c115 Fix clean old files 2019-12-04 22:05: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
21a0e962ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-03 22:35:01 +01:00
Laurent Destailleur
558e0cb5f6 Fix regression 2019-12-03 22:34:49 +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
606a13898c
Merge pull request #12394 from mapiolca/patch-15 
Fix problem of display photo in the model
 2019-12-03 16:16:57 +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
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
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
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
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