Commit Graph

73986 Commits

Author SHA1 Message Date
Laurent Destailleur
6538971be0
Merge pull request #10734 from ptibogxiv/patch-138
Fixe date on fetch adherent.class.php
2019-03-04 15:59:10 +01:00
Laurent Destailleur
a5cc799fc2
Merge pull request #10735 from ptibogxiv/patch-137
Fixe date on fetch don.class.php
2019-03-04 15:58:46 +01:00
Laurent Destailleur
db13e54724 FIX The notes was also copied on invoice 2019-03-04 14:54:59 +01:00
Laurent Destailleur
fe5cb57df8 FIX label of bank account 2019-03-04 14:41:20 +01:00
Laurent Destailleur
99e79d1750 Fix regression with private property 2019-03-04 14:11:07 +01:00
Laurent Destailleur
ca9449c70e Work on BOM 2019-03-04 14:01:30 +01:00
Laurent Destailleur
d8259f94e1 Work on BOM module 2019-03-04 13:40:16 +01:00
Laurent Destailleur
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
Laurent Destailleur
7b7ff33fdf Work on BOM module 2019-03-04 13:30:43 +01:00
Laurent Destailleur
a46b7f5202 Work of BOM module 2019-03-04 12:49:22 +01:00
Laurent Destailleur
1c775b7b68 Work of BOM module 2019-03-04 12:46:07 +01:00
Laurent Destailleur
dd9a4a8cbc CSS 2019-03-04 12:29:36 +01:00
Laurent Destailleur
34c179ab2b Fix responsive 2019-03-04 10:42:09 +01:00
ptibogxiv
dd172f04d5
Fixe date on fetch adherent.class.php 2019-03-03 21:51:32 +01:00
ptibogxiv
c05552e1cc
Fixe date on fetch don.class.php
v 10
2019-03-03 21:42:28 +01:00
Laurent Destailleur
d502d10da4 CSS 2019-03-03 21:05:33 +01:00
Laurent Destailleur
15a6da1a8c Fix alignement css 2019-03-03 17:03:09 +01:00
Laurent Destailleur
83fc10e917 css 2019-03-03 13:38:45 +01:00
Laurent Destailleur
481d0de010 FIX Import of service was not available in update mode 2019-03-03 13:02:20 +01:00
Laurent Destailleur
cccad3416e Look and feel v10 2019-03-03 12:41:08 +01:00
Laurent Destailleur
1931f43ce7 Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
2019-03-03 00:05:07 +01:00
Laurent Destailleur
66d8b8e7a1 Fix phpcs 2019-03-02 21:04:44 +01:00
Laurent Destailleur
4cb5c9ef35 Var not initialized 2019-03-02 19:26:01 +01:00
Laurent Destailleur
e91a933635 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-02 19:13:48 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/modules/modAgenda.class.php
2019-03-02 19:07:14 +01:00
Laurent Destailleur
aea5abd9a1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:58 +01:00
Laurent Destailleur
8f8aaf1e8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:51 +01:00
Laurent Destailleur
6a53727d9c
Merge pull request #10692 from frederic34/Squiz.Scope.MethodScope.Missing
Squiz.scope.method scope.missing
2019-03-02 19:05:13 +01:00
Laurent Destailleur
a2eefab696
Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm
FIX: actioncomm export: ORDER BY clause / event type filter
2019-03-02 18:44:34 +01:00
Laurent Destailleur
f7daa53a2c
Merge pull request #10724 from frederic34/patch-4
Update admin_extrafields_view.tpl.php
2019-03-02 18:42:28 +01:00
Laurent Destailleur
bc9218dee3
Merge pull request #10713 from atm-gauthier/8.0_fix_title_project
FIX : project_title for display of getNomUrl()
2019-03-02 18:36:42 +01:00
Laurent Destailleur
4d5372e98f
Merge pull request #10716 from frederic34/patch-3
Update doc in categorie.class.php
2019-03-02 18:36:27 +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
b4e4097894 Merge branch 'frederic34-Squiz.Scope.MethodScope.Missing' into develop 2019-03-02 18:27:42 +01:00
Frédéric FRANCE
1125c7b475
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-02 18:27:29 +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
dfc3cf0888
Merge pull request #10715 from frederic34/patch-2
The property $fk_doc was declared of type integer
2019-03-02 18:25:07 +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
e215bfdb66
Merge pull request #10721 from frederic34/bad-exclude-pattern
fix exclude from phpcs
2019-03-02 18:23:02 +01:00
Laurent Destailleur
4288a09101
Merge pull request #10723 from frederic34/swiftmailer-autoloader
autoloader for egulias lib needed by swiftmailer
2019-03-02 18:21:31 +01:00
Laurent Destailleur
03237d1730 NEW Look and feel v10 - Add CSS tabBarNoTop 2019-03-02 18:20:13 +01:00
Frédéric FRANCE
41f0fcd671
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-02 18:18:52 +01:00
Frédéric FRANCE
b5def5fd59
Update admin_extrafields_view.tpl.php 2019-03-02 18:11:47 +01:00
Frédéric FRANCE
73740bc10e
autoloader for egulias lib needed by swiftmailer 2019-03-02 14:35:05 +01:00
Frédéric FRANCE
8c23b41f9a
autoloader for egulias lib needed by swiftmailer 2019-03-02 14:32:52 +01:00
Laurent Destailleur
6b5083bb23 Remove useless html code 2019-03-02 14:10:21 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
65551864d5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-02 12:24:15 +01:00