Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

518 Commits

Author SHA1 Message Date
Alexandre SPANGARO
921757c4a3 Fix travis 2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465 Debug Lettering 2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-20 06:35:39 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
Alexandre SPANGARO
a5ebcff2ee Fix lettering function 2018-10-16 22:27:34 +02:00
Laurent Destailleur
e29fb85cec Fix limit 2018-10-15 11:07:16 +02:00
Laurent Destailleur
aa6996e2d0 Fix pagination show two times the same account on balance of accounts 2018-10-15 11:07:07 +02:00
Frédéric FRANCE
425e26ecb6 Update bookkeeping.class.php 2018-10-15 08:46:41 +02:00
Frédéric FRANCE
4d6d3afbea code comment 2018-10-15 08:39:46 +02:00
Laurent Destailleur
995f4fa35f Fix limit 2018-10-14 23:57:07 +02:00
Laurent Destailleur
8fc73d1b1b Fix pagination show two times the same account on balance of accounts 2018-10-14 23:47:38 +02:00
Alexandre SPANGARO
d9e1312924 Debug FEC model export 2018-10-14 06:16:14 +02:00
Laurent Destailleur
cf88de05e2 NEW Add format code into exported filename 2018-10-10 20:01:01 +02:00
Laurent Destailleur
6c55bfc0f7 Fix export and remove duplicate csv export. 2018-10-10 19:45:26 +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
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
Philippe GRAND
c32b96c207 Standardize and update code 2018-10-04 09:15:15 +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
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +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
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
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
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
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
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +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
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00