Commit Graph

9087 Commits

Author SHA1 Message Date
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
63d14b16c9 FIX The notes was also copied on invoice 2019-03-04 14:56:39 +01:00
Laurent Destailleur
db13e54724 FIX The notes was also copied on invoice 2019-03-04 14:54:59 +01:00
Laurent Destailleur
1686b7b1db FIX label of bank account 2019-03-04 14:42:00 +01:00
Laurent Destailleur
fe5cb57df8 FIX label of bank account 2019-03-04 14:41:20 +01:00
Laurent Destailleur
4cb5c9ef35 Var not initialized 2019-03-02 19:26:01 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
50f6bbefe7 Merge pull request #10720 from frederic34/patch-5
Update facture-rec.class.php
2019-03-02 18:23:26 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
728a3fcbba Update facture-rec.class.php 2019-03-02 08:43:09 +01:00
Frédéric FRANCE
4fcde0eaa3 Update facture-rec.class.php 2019-03-02 01:37:49 +01:00
Frédéric FRANCE
62501b11e8 add visibility 2019-03-02 00:14:22 +01:00
Frédéric FRANCE
014f69850e add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
be8db31388 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-01 19:24:27 +01:00
Frédéric FRANCE
bd2e541fd6 add visibility 2019-03-01 18:28:51 +01:00
Laurent Destailleur
2e128a786b NEW Can change the customer account of an instance 2019-03-01 15:38:15 +01:00
Frédéric FRANCE
796ea6f4ea add visibility 2019-02-28 23:19:58 +01:00
Laurent Destailleur
b3fb0eaf5b Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
da826c4bc7 Fix bad var name 2019-02-27 01:22:26 +01:00
Frédéric FRANCE
81f2f99db5 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Frédéric FRANCE
346d1f410c wip 2019-02-25 23:15:48 +01:00
Laurent Destailleur
8a9339a059 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/facture/class/api_invoices.class.php
2019-02-25 15:16:23 +01:00
Laurent Destailleur
dde18e803d Fix transaction 2019-02-25 15:09:56 +01:00
Laurent Destailleur
3fa2680859 Merge pull request #10669 from frederic34/html5fix
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Laurent Destailleur
3f078203b9 Fix phpcs 2019-02-24 20:29:01 +01:00
Frédéric FRANCE
4f341ea022 replace html code by html5 2019-02-23 22:56:38 +01:00
Frédéric FRANCE
4b0b8e1c1f Update api_invoices.class.php 2019-02-23 16:44:36 +01:00
Frédéric FRANCE
0e093ffb24 Update api_invoices.class.php 2019-02-23 16:41:40 +01:00
Frédéric FRANCE
f1e4c80771 Update api_invoices.class.php 2019-02-23 16:39:15 +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
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
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
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
ptibogxiv
98affe0921 Update facture.class.php 2019-02-20 14:25:25 +01:00
ptibogxiv
152585c1b8 Update facture.class.php 2019-02-20 13:20:46 +01:00
ptibogxiv
ef5372f476 Update facture.class.php 2019-02-20 13:04:22 +01:00
ptibogxiv
6416f24d5f FIX fetch module / pos source 2019-02-20 12:35:13 +01:00