Commit Graph

75768 Commits

Author SHA1 Message Date
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Josep Lluís
f6fc9190f3
Add no_email field in contact list
Add no_email field in contact list
2019-02-25 19:41:40 +01:00
Laurent Destailleur
fc1d0b2dd5 Add missing translation 2019-02-25 19:07:29 +01:00
Laurent Destailleur
25d277aceb More complete translation 2019-02-25 19:02:41 +01:00
Laurent Destailleur
5ffc1822d9 Translation 2019-02-25 19:01:51 +01:00
John BOTELLA
3e4983f073 Prepare badge standard 2019-02-25 17:38:04 +01:00
John BOTELLA
81aab86a67 Add fontawesome support for menu top btn 2019-02-25 15:21:59 +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
8234c09412 Try some fixes 2019-02-25 15:15:17 +01:00
Laurent Destailleur
dde18e803d Fix transaction 2019-02-25 15:09:56 +01:00
Laurent Destailleur
3ba69fc93a Fix missing ; after sql request 2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670 Remove duplicate record 2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5 FXI Remove duplicate record before trying to create unique key 2019-02-25 14:55:29 +01:00
Regis Houssin
6fa016dc85 FIX wrong feature2 when user rights "group_advance" is used 2019-02-25 10:44:22 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Frédéric FRANCE
42a1387218
wip 2019-02-25 00:56:48 +01:00
Frédéric FRANCE
6ee186096c
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-24 23:48:51 +01:00
Frédéric FRANCE
041310c4ee
wip 2019-02-24 23:47:00 +01:00
Frédéric FRANCE
461da700d5
phpcs fix 2019-02-24 23:40:32 +01:00
Frédéric FRANCE
27218b7087
wip 2019-02-24 23:32:09 +01:00
andreubisquerra
57ee8b7991 Fix no JPG images in TakePOS and other image improvements. 2019-02-24 21:15:11 +01:00
Cristian Torres
c781eeb17d [FIX] ORDER BY before custom filters for where
When filtering data "and cac.libelle" would be appended after ORDER BY
2019-02-24 20:55:27 +01:00
Laurent Destailleur
dfd6a0feaa
Merge pull request #10643 from tony13tv/patch-3
[FIX] ORDER BY before custom filters for where
2019-02-24 20:55:01 +01:00
Laurent Destailleur
b9835faf4b
Merge pull request #10681 from frederic34/PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:54:03 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
ptibogxiv
47f5ff3303 Fix declare functions2.lib.php for donations API 2019-02-24 20:51:00 +01:00
Laurent Destailleur
14b9a06e57
Merge pull request #10680 from ptibogxiv/patch-130
FIX donations API
2019-02-24 20:50:32 +01:00
Laurent Destailleur
c002fd68ae
Merge pull request #10679 from ptibogxiv/patch-129
Fix declare functions2.lib.php for donations API
2019-02-24 20:49:59 +01:00
Laurent Destailleur
7fb6c3194a
Merge pull request #10678 from frederic34/patch-7
phpcs fix in 9.0
2019-02-24 20:49:11 +01:00
Laurent Destailleur
e349fe780e
Merge pull request #10641 from OPEN-DSI/fix-show-action-done-emailing
Fix url for emailing type event (link to emailing card)
2019-02-24 20:48:57 +01:00
Laurent Destailleur
c1fa48889e
Merge pull request #10677 from frederic34/patch-6
fix #10385
2019-02-24 20:46:04 +01:00
Laurent Destailleur
6fdd0191f4
Merge pull request #10676 from frederic34/patch-5
fix #10656
2019-02-24 20:45:13 +01:00
Laurent Destailleur
89087473e1
Merge pull request #10674 from frederic34/patch-4
Update printgcp.modules.php
2019-02-24 20:44:08 +01:00
Laurent Destailleur
2eb48a6046
Merge pull request #10673 from frederic34/patch-3
Update extrafields.class.php
2019-02-24 20:43:44 +01:00
Laurent Destailleur
52bcef38fc
Merge pull request #10672 from frederic34/patch-1
Update html.formfile.class.php
2019-02-24 20:39:32 +01:00
Laurent Destailleur
b5973957e7
Merge pull request #10670 from ptibogxiv/patch-127
Fix travis for recent PR
2019-02-24 20:37:55 +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
9a8be2da9d
Merge pull request #10667 from frederic34/patch-24
Update api_contacts.class.php
2019-02-24 20:35:51 +01:00
Laurent Destailleur
95a6080636
Merge pull request #10666 from frederic34/patch-23
Update html.formresource.class.php
2019-02-24 20:35:26 +01:00
Laurent Destailleur
d119171b97
Merge pull request #10665 from frederic34/patch-22
Update accountancycategory.class.php
2019-02-24 20:34:10 +01:00
Laurent Destailleur
2b6fac3d54
Merge pull request #10664 from frederic34/patch-21
Update ajax.lib.php
2019-02-24 20:33:38 +01:00
Laurent Destailleur
c24102d03f
Merge pull request #10663 from frederic34/patch-18
Update html.formfile.class.php
2019-02-24 20:33:02 +01:00
Laurent Destailleur
50f50e4477
Merge pull request #10662 from frederic34/patch-17
update api invoices
2019-02-24 20:32:42 +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