Commit Graph

1549 Commits

Author SHA1 Message Date
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
3bf296c9cf Merge pull request #9448 from frederic34/loadfichetitre
remove deprecated
2018-09-12 18:23:24 +02:00
Laurent Destailleur
b5d866f4d5 Merge pull request #9444 from frederic34/patch-11
Completely comment unused code
2018-09-12 18:14:22 +02:00
Laurent Destailleur
bdcbc71ce9 Merge pull request #9443 from frederic34/patch-10
Completely comment unused code
2018-09-12 17:28:29 +02:00
Frédéric FRANCE
d8f77f040f Update accountancycategory.class.php 2018-09-09 23:12:16 +02:00
Frédéric FRANCE
9d8a4e463b Update accountancycategory.class.php 2018-09-09 23:09:52 +02:00
Frédéric FRANCE
aab617aeb3 remove deprecated 2018-09-09 18:38:48 +02:00
Frédéric FRANCE
0e0db9d1ee remove deprecated 2018-09-09 15:52:55 +02:00
Frédéric FRANCE
86e237f61f Completely comment unused code 2018-09-09 14:18:26 +02:00
Frédéric FRANCE
fdd24a5a30 Update accountancycategory.class.php 2018-09-09 13:47:12 +02:00
Frédéric FRANCE
8c5a785797 completely comment unused code 2018-09-09 13:42:38 +02:00
Frédéric FRANCE
a558c3bdac replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
a3fa13994b replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
cb97a29fc0 introduce seletDate 2018-09-08 12:00:11 +02:00
Frédéric FRANCE
7e0ef3ad7e Update fiscalyear_card.php 2018-09-06 22:10:19 +02:00
Frédéric FRANCE
3ecf788438 move phpcs:ignore 2018-09-06 18:29:01 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Frédéric FRANCE
7288335c6d Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-03 19:01:11 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
2018-09-03 14:06:51 +02:00
Laurent Destailleur
47655f0725 Add comment as FIXME 2018-09-03 14:00:12 +02:00
Frédéric FRANCE
2a9ef8dc05 move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
47879d44bc move phpcs:ignore 2018-09-02 09:57:19 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
d86d7323fb Update code 2018-09-01 22:46:35 +02:00
Philippe GRAND
091b8269a6 fix conflict 2018-09-01 22:42:42 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Philippe Grand
df4a4aa6c9 Merge branch 'develop' into develop 2018-09-01 17:23:43 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +02:00
Frédéric FRANCE
10200374ef Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
aa2655d604 Merge pull request #9374 from bafbes/abb80014
Fix: No link is shown to access for bank transfers.
2018-09-01 13:36:08 +02:00
Frédéric FRANCE
2b5407c31d Update export.php 2018-09-01 13:30:28 +02:00
Laurent Destailleur
0d3c34f2b3 Merge pull request #9364 from frederic34/patch-22
Update export.php
2018-09-01 13:29:41 +02:00
Philippe GRAND
0dc812cf10 precise label comment 2018-09-01 13:02:27 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d Merge pull request #9322 from grandoc/new_branch_29_08_2018
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Abbes Bahfir
c288c42ee3 Fix: No link is shown to access for bank transfers. 2018-08-31 18:13:56 +01:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Philippe GRAND
7973489f8a fix display comment issue 2018-08-31 17:18:08 +02:00
Frédéric FRANCE
d8441619ed Update export.php 2018-08-31 08:29:51 +02:00
Philippe Grand
5ec22d9fad Update accountingaccount.class.php 2018-08-30 14:25:25 +02:00
Philippe Grand
e96e3bdf42 Update accountancycategory.class.php 2018-08-30 14:19:21 +02:00
Philippe GRAND
ba6a48360e Standardize and update code 2018-08-30 12:26:59 +02:00
Philippe Grand
b3c84ac3bc Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650 WTF... 2018-08-30 12:03:20 +02:00