Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ecfbe0a568 Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate 
FIX #9497
 2018-09-15 17:14:05 +02:00
Laurent Destailleur
56b0a5f1ed FIX Mixing tickets of different thirdparties 2018-09-14 13:07:27 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
Laurent Destailleur
5655856ca5 Merge pull request #9504 from atm-gauthier/6.0_fix_refsupplier 
FIX : wrong var name
 2018-09-13 17:55:04 +02:00
gauthier
7838b75ec9 FIX : wrong var name 2018-09-13 16:11:42 +02:00
gauthier
b68523b9c1 FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product 2018-09-13 14:37:12 +02:00
tarrsalah
08453a5337 FIX #9497 
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
 2018-09-13 11:04:11 +01:00
Laurent Destailleur
c5e30b61c0 Fix translation 2018-09-12 21:25:14 +02:00
Laurent Destailleur
3dca02d25b Fix translation 2018-09-12 21:07:34 +02:00
Laurent Destailleur
b7eeaa952c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-12 19:41:02 +02:00
Laurent Destailleur
72f359fdc7 Revert "add capture option in payment function" 
This reverts commit 849b7154a7.
 2018-09-12 19:40:43 +02:00
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
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +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
58ba1c3496 Merge pull request #9451 from hregis/7.0_price 
FIX better compatibility with multicompany
 2018-09-12 18:27:50 +02:00
Laurent Destailleur
e3a00c5dcd Merge pull request #9450 from frederic34/patch-15 
Update accountancycategory.class.php
 2018-09-12 18:25:54 +02:00
Laurent Destailleur
a57e82a300 Merge pull request #9479 from atm-quentin/FIX_character_bill_list 
FIX character making error on bill list
 2018-09-12 18:22:07 +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
atm-quentin
c42f39cc34 FIX character making error on list 2018-09-12 14:44:08 +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
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +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
Regis Houssin
43ac51b44c FIX remove debug 2018-09-10 10:11:07 +02:00
Regis Houssin
8699866062 FIX better compatibility with multicompany 2018-09-10 10:08:04 +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
Frédéric FRANCE
d8f77f040f Update accountancycategory.class.php 2018-09-09 23:12:16 +02:00