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

1676 Commits

Author SHA1 Message Date
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
a466104b81 Fix FEC on transaction card 
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
 2018-10-17 07:20:04 +02:00
Alexandre SPANGARO
a5ebcff2ee Fix lettering function 2018-10-16 22:27:34 +02:00
Alexandre SPANGARO
eb4ffcf1a7 Fix FEC Missing some information in bookkeeping 2018-10-16 21:17:00 +02:00
Frédéric FRANCE
a40271e475 Update bankjournal.php 2018-10-16 20:11:32 +02:00
Frédéric FRANCE
f470068d9d fix phpcs 2018-10-16 20:10:13 +02:00
Laurent Destailleur
ae76891853 Merge pull request #9751 from frederic34/patch-17 
Update bookkeeping.class.php
 2018-10-16 19:44:07 +02:00
Laurent Destailleur
63c79f23d6 Merge pull request #9749 from aspangaro/9.0_accountancy 
Fix FEC Missing some information on bookeeping
 2018-10-16 19:35:14 +02:00
Laurent Destailleur
f0c0c4779b Fix remove yellow alert 2018-10-16 19:32:35 +02:00
Laurent Destailleur
97429aeb7a Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Philippe GRAND
bd3315528e add links and highlight relevant text 2018-10-16 15:08:06 +02:00
Philippe GRAND
059c72c678 add links and highlight relevant text 2018-10-16 14:55:29 +02:00
Philippe GRAND
5f37e07540 add links and highlight relevant text 2018-10-16 14:42:36 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Alexandre SPANGARO
a971a2afe6 Fix FEC 2018-10-16 06:32:55 +02:00
Alexandre SPANGARO
3a6824da68 Fix FEC Missing label_compte & label_operation 2018-10-15 21:50:05 +02:00
Alexandre SPANGARO
47305f5b0b Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-15 20:06:02 +02:00
Laurent Destailleur
2684767b19 Fix pagination 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2018-10-15 11:08:40 +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
Laurent Destailleur
9afc53ca06 Fix remove step in accountancy if module expense report not used 2018-10-15 11:05:20 +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
Alexandre SPANGARO
c8b9c11a01 Fix FEC Missing some subledger label on bookeeping 2018-10-15 06:53:48 +02:00
Laurent Destailleur
c881be847d Fix remove step in accountancy if module expense report not used 2018-10-15 01:47:44 +02:00
Laurent Destailleur
35eeb32f5d Fix pagination 2018-10-15 00:08:28 +02:00
Laurent Destailleur
b13d9650f2 Fix pagination 2018-10-15 00:06:16 +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
Philippe GRAND
eecc56c1a3 highlight relevant text 2018-10-14 13:00:01 +02:00
Philippe GRAND
b2677f08a4 add links for set-up 2018-10-14 12:47:26 +02:00
Philippe GRAND
5dd447445a html5 2018-10-14 09:43:33 +02:00
Alexandre SPANGARO
d9e1312924 Debug FEC model export 2018-10-14 06:16:14 +02:00
Philippe Grand
7e82e3d44c Update card.php 2018-10-12 19:13:07 +02:00
Philippe GRAND
18b3238bad Standardize and update code 2018-10-12 16:56:01 +02:00
Philippe GRAND
1cfb06934c Standardize and update code 2018-10-12 16:49:53 +02:00
Philippe GRAND
bd426d1052 Standardize and update code 2018-10-12 16:44:25 +02:00
Philippe GRAND
4df574d58e Standardize and update code 2018-10-12 16:23:27 +02:00
Philippe GRAND
c5edb3289b Standardize and update code 2018-10-12 16:09:05 +02:00
Philippe GRAND
181c1e0b77 Standardize and update code 2018-10-12 16:01:27 +02:00
Philippe GRAND
9d4f6dc444 Standardize and update code 2018-10-12 15:55:36 +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
8d9f6aad3f css 2018-10-10 19:20:10 +02:00
Laurent Destailleur
4a80a4d9e7 css 2018-10-10 19:18:33 +02:00
Laurent Destailleur
5cb111e339 css 2018-10-10 19:13:00 +02:00
Laurent Destailleur
9f4cee5fb7 css 2018-10-10 19:11:37 +02:00