lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,224 Commits 43 Branches 150 Tags 886 MiB
163bc55e4a
Commit Graph

68224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
163bc55e4a
Merge pull request #9468 from jmarsac/numericextrafields9464 
Convert localized numeric extrafields value before inserting/updating
 2018-09-12 19:06:43 +02:00
Laurent Destailleur
23096354e0
Merge pull request #9463 from ptibogxiv/patch-57 
add capture option in payment function
 2018-09-12 18:38:10 +02:00
Laurent Destailleur
0bf42085db
Merge pull request #9484 from Dolibarr/revert-9453-patch-56 
Revert "V8 style"
 2018-09-12 18:21:29 +02:00
Laurent Destailleur
88e76b6127
Revert "V8 style" 2018-09-12 18:19:12 +02:00
Laurent Destailleur
71e8d4c728
Merge pull request #9453 from ptibogxiv/patch-56 
V8 style
 2018-09-12 18:18:45 +02:00
Laurent Destailleur
1ad8a3e190
Merge pull request #9466 from ptibogxiv/patch-58 
Fix status display in transaction.php
 2018-09-12 18:14:46 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2018-09-12 18:11:51 +02:00
Laurent Destailleur
a3968b86df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-12 18:05:47 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Laurent Destailleur
eb242d58f2
Merge pull request #9469 from atm-ph/fix_7.0_classname_colht 
Fix classname liencolht to linecolht
 2018-09-12 17:30:36 +02:00
Laurent Destailleur
77d7c97750 Fix typo 2018-09-12 17:18:27 +02:00
Laurent Destailleur
fd93a22dca Fix missing field 2018-09-12 16:45:12 +02:00
Laurent Destailleur
48ae4de47b FIX Add paypal error message in alert email 2018-09-12 16:11:10 +02:00
Laurent Destailleur
9cbba2dc7d Add log 2018-09-12 15:28:59 +02:00
Laurent Destailleur
50478b1bd4 FIX capital must be empty and not 0 if undefined 2018-09-12 15:21:11 +02:00
Laurent Destailleur
729d03862f Fix warning 2018-09-12 15:02:59 +02:00
Laurent Destailleur
5bd2c01411 Fix email missing in tooltip 2018-09-12 14:43:05 +02:00
Laurent Destailleur
902bdf540e Update ChangeLog 2018-09-12 13:45:04 +02:00
Laurent Destailleur
53da80a79f FIX Missing translation in predefined email to membership renewal 2018-09-12 12:55:10 +02:00
Laurent Destailleur
aad6a0871f FIX Lose filter on payment type or category after a sort on invoice list 
Conflicts:
	htdocs/compta/facture/list.php
 2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
Jean-Marie Arsac
345c24990e Correction of variable name 2018-09-11 20:51:54 +02:00
atm-ph
40c79cb7cd Fix classname liencolht to linecolht 2018-09-11 17:56:11 +02:00
Jean-Marie Arsac
2f2dff8155 Convert localized numeric extrafields value before inserting 
- add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()
 2018-09-11 14:57:31 +02:00
ptibogxiv
7f3f0f3643
Fix status display in transaction.php 2018-09-11 12:10:48 +02:00
ptibogxiv
849b7154a7
add capture option in payment function 2018-09-11 10:59:25 +02:00
Laurent Destailleur
d011204624 Fix switch of extrafields between all and only one entity 2018-09-10 17:36:46 +02:00
ptibogxiv
ccc415204e
V8 style 2018-09-10 16:46:16 +02:00
Laurent Destailleur
20fa294ff1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-10 01:22:16 +02:00
Laurent Destailleur
15aa99fc8e Fix css 2018-09-10 01:22:01 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0 
FIX : Homepage links were using wrong topmenus
 2018-09-07 19:35:10 +02:00
Laurent Destailleur
e2df3fd4ad
Merge pull request #9423 from ptibogxiv/patch-55 
Fix error when delete stripe customer
 2018-09-07 19:34:45 +02:00
Laurent Destailleur
7c5ceff569 Fix search on project 2018-09-07 15:01:34 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Laurent Destailleur
ff05997f0a FIX Several fixes on the management of minimal amount for orders 2018-09-06 17:37:02 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
ptibogxiv
da4e902645
Fix error when delete stripe customer 2018-09-06 11:35:19 +02:00
Laurent Destailleur
b25a0ca672 Fix no need of thumb when upload image for email 2018-09-05 23:25:17 +02:00
Laurent Destailleur
ed31eec5ee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Laurent Destailleur
e3339f5f95 Fix trad 2018-09-05 19:01:00 +02:00
Laurent Destailleur
0bd4bc39dd Fix responsive 2018-09-05 16:03:43 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Laurent Destailleur
f1cb13634b FIX Entering negative price on order 2018-09-05 14:55:45 +02:00
Laurent Destailleur
19431a94ba Code style 2018-09-05 14:37:44 +02:00
Laurent Destailleur
1882043f19 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 14:26:24 +02:00
Laurent Destailleur
51901108ad FIX #9412 2018-09-05 14:26:12 +02:00
Laurent Destailleur
49b568f73f
Merge pull request #9413 from fmarcet/8.0 
FIX Expedition not showing extrafields on creation
 2018-09-05 14:16:28 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10 
Create index.html
 2018-09-05 14:15:22 +02:00
Laurent Destailleur
ead2a764c7
Merge pull request #9409 from frederic34/patch-9 
Create index.html
 2018-09-05 14:15:12 +02:00