Commit Graph

73647 Commits

Author SHA1 Message Date
Laurent Destailleur
345cd25613 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 15:11:52 +01:00
Laurent Destailleur
b4e3bb37af Sync transifex 2019-02-23 15:11:41 +01:00
Laurent Destailleur
9aa8de3367 FIX #10644 2019-02-23 15:10:18 +01:00
Laurent Destailleur
b3c3e8f09e
Merge pull request #10547 from Rusu-Marian-Dan/develop
New API markAsCreditAvailable
2019-02-23 14:39:13 +01:00
Laurent Destailleur
ca45651265
Update api_invoices.class.php 2019-02-23 14:38:13 +01:00
Laurent Destailleur
eb733728c3
Update api_invoices.class.php 2019-02-23 14:37:09 +01:00
Laurent Destailleur
5bf3a1f175
Update api_invoices.class.php 2019-02-23 14:36:51 +01:00
Laurent Destailleur
3d0af97e79
Update api_invoices.class.php 2019-02-23 14:24:37 +01:00
Laurent Destailleur
4da1bef6dc
Merge pull request #10654 from ptibogxiv/patch-125
FIX Stripe live Oauth
2019-02-23 14:21:25 +01:00
Laurent Destailleur
114cd5fa30
Merge pull request #10646 from grandoc/new_branch_21_02_2019
fix : When comparing two booleans, it is generally considered safer t…
2019-02-23 14:19:22 +01:00
Laurent Destailleur
1d6f541278
Merge pull request #10658 from frederic34/patch-18
doc comment entrepot.class.php
2019-02-23 14:16:03 +01:00
Laurent Destailleur
bdc4cc0def
Merge pull request #10659 from frederic34/patch-21
variables does not seem to be defined for all execution paths
2019-02-23 14:15:32 +01:00
Laurent Destailleur
6f922ad316
Merge pull request #10653 from ptibogxiv/patch-124
Fix stripe payment list of transaction
2019-02-23 14:12:40 +01:00
Laurent Destailleur
b73d8394dc
Merge pull request #10651 from ptibogxiv/patch-123
Fix servicestatus list of  payment stripe
2019-02-23 14:12:19 +01:00
Laurent Destailleur
b8df685186
Update payment.php 2019-02-23 14:11:53 +01:00
Laurent Destailleur
50da34e26b
Merge pull request #10660 from frederic34/patch-22
Update html.formmail.class.php
2019-02-23 14:09:54 +01:00
Laurent Destailleur
fa45d2c5a9
Merge pull request #10657 from frederic34/patch-17
doc comment html.formfile.class.php
2019-02-23 14:09:42 +01:00
Laurent Destailleur
0a83bc474c
Merge pull request #10635 from grandoc/new_branch_19_02_2019
update with html5 compliant code
2019-02-23 14:09:17 +01:00
Laurent Destailleur
59218de7de
Merge pull request #10637 from tony13tv/patch-1
[FIX] Variable $i is already declared
2019-02-23 14:07:46 +01:00
Frédéric FRANCE
b75519fefe
Update html.formmail.class.php 2019-02-23 11:25:49 +01:00
Frédéric FRANCE
c3d1ed73d2
variables does not seem to be defined for all execution paths 2019-02-23 11:17:07 +01:00
Frédéric FRANCE
6ee29559f9
doc comment entrepot.class.php 2019-02-23 09:44:45 +01:00
Frédéric FRANCE
f7c0044e60
doc comment 2019-02-23 09:33:21 +01:00
ptibogxiv
dd160a6242
Create stripelive_oauthcallback.php 2019-02-22 14:56:39 +01:00
ptibogxiv
454ab2e866
FIX Stripe live Oauth 2019-02-22 14:54:26 +01:00
ptibogxiv
f027bd2b08
Update payment.php 2019-02-22 14:30:25 +01:00
ptibogxiv
3416d2bdd1
Update transaction.php 2019-02-22 14:29:38 +01:00
ptibogxiv
232741d919
Update payment.php 2019-02-22 14:27:50 +01:00
ptibogxiv
5021252622
Fix stripe payment list of transaction 2019-02-22 14:23:28 +01:00
ptibogxiv
7360e1c0d4
Fix servicestatus list of payment stripe 2019-02-22 14:19:21 +01:00
Laurent Destailleur
ec5461a4d1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/multicurrency/class/multicurrency.class.php
2019-02-21 22:31:27 +01:00
Laurent Destailleur
6cdf5c5673 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-21 22:28:25 +01:00
Laurent Destailleur
5a18588bb7 CSS 2019-02-21 22:27:56 +01:00
Laurent Destailleur
2891758c23 FIX Stock visibility for service when option stock on service is on
NEW Add option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2019-02-21 20:13:03 +01:00
Laurent Destailleur
4a3751a054 Fix html5 2019-02-21 19:50:54 +01:00
Philippe GRAND
54da44b506 Translation 2019-02-21 19:50:03 +01:00
Laurent Destailleur
afae29198d Missing function 'getFormatedCustomerRef' and 'getFormatedsupplierRef' 2019-02-21 17:03:24 +01:00
Philippe GRAND
5a88930062 fix : The property total_vat does not exist on Reception 2019-02-21 14:38:12 +01:00
Philippe GRAND
33164bcb3e fix : When comparing two booleans, it is generally considered safer to use the strict comparison operator. 2019-02-21 14:25:09 +01:00
Laurent Destailleur
a3a89b755f NEW Gain space by moving the meteo on title line 2019-02-20 06:01:13 +01:00
Laurent Destailleur
e42487ae4e CSS 2019-02-20 05:26:27 +01:00
Laurent Destailleur
4eac819df0 Trans 2019-02-20 05:22:05 +01:00
Laurent Destailleur
c204b8bf7b Fix menu level 2019-02-20 05:17:24 +01:00
Laurent Destailleur
acc0ac2c88 Fix line feed 2019-02-20 05:05:26 +01:00
Laurent Destailleur
4296f959ca Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
Laurent Destailleur
abfd610bbc Fix quote not closed 2019-02-20 03:44:08 +01:00
Cristian Torres
7128270a95
[FIX] Variable $i is already declared
It was preventing displaying of the other accounts
2019-02-19 11:37:46 -06:00
Philippe GRAND
d83b77432d update with html5 compliant code 2019-02-19 17:42:12 +01:00
Philippe GRAND
047ec90d78 update with html5 compliant code 2019-02-19 17:38:14 +01:00
Philippe GRAND
3a2b5e28c4 update with html5 compliant code 2019-02-19 17:17:11 +01:00