Commit Graph

73677 Commits

Author SHA1 Message Date
Laurent Destailleur
dde18e803d Fix transaction 2019-02-25 15:09:56 +01:00
Laurent Destailleur
7b2f4771f0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-24 20:30:21 +01:00
Laurent Destailleur
58caf27744 Fix phpcs 2019-02-24 20:30:06 +01:00
Laurent Destailleur
3f078203b9 Fix phpcs 2019-02-24 20:29:01 +01:00
Laurent Destailleur
5e6797f39d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-24 20:28:18 +01:00
Laurent Destailleur
2f300ae63f Standardize code with customer invoices 2019-02-24 20:26:54 +01:00
Laurent Destailleur
f41d504ba1
Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note
FIX positive values IN supplier credit notes creating diff on addline rounding
2019-02-24 20:21:22 +01:00
Laurent Destailleur
f83f746123 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/facture/class/facture.class.php
2019-02-23 16:03:40 +01:00
Laurent Destailleur
cdf85b0d00 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 16:02:35 +01:00
Laurent Destailleur
0081d3c25d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-23 16:02:10 +01:00
Laurent Destailleur
4e19a83f1b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:38 +01:00
Laurent Destailleur
af6c482f26 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:30 +01:00
ptibogxiv
d7ffcca59b FIX fetch module / pos source 2019-02-23 16:00:07 +01:00
Laurent Destailleur
0298582fc3
Merge pull request #10640 from ptibogxiv/patch-122
FIX fetch module / pos source
2019-02-23 15:59:22 +01:00
Laurent Destailleur
9ba6e3f8f5 FIX #10638 2019-02-23 15:57:57 +01:00
Laurent Destailleur
2413c41622
Merge pull request #10639 from ptibogxiv/patch-121
NEW POS support in order (ex: online cart)
2019-02-23 15:19:10 +01:00
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
f2a73eecf2
Merge pull request #10645 from atm-gauthier/7.0_fix_feature_not_finished
FIX : function sendEmailsReminder isn't completely developed, then MA…
2019-02-23 15:01:44 +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
4c32aed2f4
Merge pull request #10650 from fappels/8.0_fix_dispatch
FIX fk_default_warehouse missing in group by
2019-02-23 14:08:28 +01:00
Cristian Torres
8ca6935f8b [FIX] Variable $i is already declared
It was preventing displaying of the other accounts
2019-02-23 14:08:11 +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
Francis Appels
c38b0c4dbe FIX fk_default_warehouse missing in group by 2019-02-22 12:17:34 +01:00