2
0
forked from Wavyzz/dolibarr
Commit Graph

1676 Commits

Author SHA1 Message Date
Laurent Destailleur
b13088849b CSS 2018-10-10 18:58:28 +02:00
Laurent Destailleur
62a6af3288 phpcs 2018-10-10 17:02:35 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df Merge 2018-10-09 17:06:08 +02:00
Laurent Destailleur
0fbc9d640e Fix syntax error 2018-10-09 16:05:56 +02:00
Laurent Destailleur
94743d50be Merge pull request #9707 from aspangaro/9.0_FEC
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Philippe GRAND
6ea115f828 Standardize code 2018-10-09 09:04:27 +02:00
Philippe GRAND
ac214a7258 Standardize code 2018-10-09 08:53:08 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270 NEW Can filter on EEC, not EEC, etc... in binding step of accountancy 2018-10-09 01:47:37 +02:00
Laurent Destailleur
6ded9e843d NEW The binding step in accountancy has a country filter like a combo 2018-10-09 01:03:46 +02:00
Alexandre SPANGARO
75b9862c14 New : Add FEC Export in accountancy 2018-10-08 21:01:21 +02:00
Philippe GRAND
dd9af92020 Standardize code 2018-10-06 12:07:24 +02:00
Philippe GRAND
da560289e3 Standardize code 2018-10-05 15:48:38 +02:00
Laurent Destailleur
20f45db6b8 Merge pull request #9677 from grandoc/new_branch_04_10_2018
Standardize and update code
2018-10-04 18:33:24 +02:00
Laurent Destailleur
1f44380dd1 Clean code 2018-10-04 16:20:55 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
atm-ph
58d1ac427e Fix missing hook on sellsjournal 2018-10-04 10:57:22 +02:00
Philippe GRAND
c32b96c207 Standardize and update code 2018-10-04 09:15:15 +02:00
gauthier
d6a9da57e1 FIX : need to round with 2 decimals to avoid movements not correctly balanced 2018-10-01 14:11:19 +02:00
Laurent Destailleur
85bed00474 Fix default fields 2018-09-18 11:50:04 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2018-09-16 12:54:39 +02:00
Frédéric FRANCE
e8d2cb6135 update code comment lettering class 2018-09-16 08:39:43 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
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