Commit Graph

61300 Commits

Author SHA1 Message Date
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
Laurent Destailleur
b13088849b CSS 2018-10-10 18:58:28 +02:00
Laurent Destailleur
619ac9c7cf Fix help 2018-10-10 18:42:53 +02:00
Laurent Destailleur
7f1aa217a6 Fix link 2018-10-10 18:38:53 +02:00
Laurent Destailleur
82e06eda75 FIX save search criteria when going on receipt from bank transaction 2018-10-10 18:33:32 +02:00
Laurent Destailleur
62a6af3288 phpcs 2018-10-10 17:02:35 +02:00
Laurent Destailleur
fcf62744d7 Add ref in description 2018-10-10 16:23:00 +02:00
Laurent Destailleur
1204fb1e74 Fix online payments use id instead of ref into TAG 2018-10-10 16:16:17 +02:00
Laurent Destailleur
eff0e959b3 Fix duplicate column 2018-10-10 13:06:54 +02:00
Laurent Destailleur
6446343e1b Fix sort lost 2018-10-10 13:05:19 +02:00
Laurent Destailleur
cb29209457 NEW Enhancement in process to make manual bank conciliation 2018-10-10 12:47:18 +02:00
Laurent Destailleur
562ee1cb64 FIX checkbox to conciliate not visible if bank receipt nb known 2018-10-10 12:19:22 +02:00
Laurent Destailleur
2b33e2a9c5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-10 10:52:58 +02:00
Laurent Destailleur
40f89d138f Fix height of confirm popup 2018-10-10 10:52:29 +02:00
Laurent Destailleur
e2e935e713 Fix scrutinizer bugs 2018-10-10 02:01:13 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
414876e25e More complete message 2018-10-10 01:46:43 +02:00
Laurent Destailleur
d75828567c Fix amount last subscription 2018-10-10 01:44:56 +02:00
Laurent Destailleur
b1289632e0 CSS 2018-10-10 01:27:31 +02:00
Laurent Destailleur
b73a2a24ef FIX Tooltip on invoice widget 2018-10-10 01:16:53 +02:00
Laurent Destailleur
2539f0047f FIX Sending of reminder for expired subscriptions 2018-10-09 23:10:39 +02:00
Laurent Destailleur
df0ec95b22 Code comment and better error message 2018-10-09 21:21:10 +02:00
Laurent Destailleur
9fe3e7b6c0 Fix phpunit 2018-10-09 17:09:33 +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
84605bc59b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-09 16:59:47 +02:00
Laurent Destailleur
dc498173c8 Code comment 2018-10-09 16:58:55 +02:00
Laurent Destailleur
430f833222 Merge pull request #9626 from OPEN-DSI/fix_product_margin
FIX Product margin tab and credit note
2018-10-09 16:57:08 +02:00
Laurent Destailleur
c401739fed Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 16:28:03 +02:00
Laurent Destailleur
b4b82ce3d6 Drop both contraint and index 2018-10-09 16:25:57 +02:00
Laurent Destailleur
62319018dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 16:19:56 +02:00
Laurent Destailleur
bd8cf3d81e Merge pull request #9704 from atm-gauthier/7.0_fix_userlist
FIX : when we're just admin and not super admin, if we create new use…
2018-10-09 16:17:49 +02:00
Laurent Destailleur
bde5ee1232 Merge pull request #9621 from ptibogxiv/patch-69
Prepare for more stripe function
2018-10-09 16:15:23 +02:00
Laurent Destailleur
b68f6c0fca Use more generic name 2018-10-09 16:15:12 +02:00
Laurent Destailleur
422af361b4 Merge pull request #9622 from ptibogxiv/patch-68
Prepare for more stripe function
2018-10-09 16:14:35 +02:00
Laurent Destailleur
65b48b06d9 Update llx_paiement.sql 2018-10-09 16:14:28 +02:00
Laurent Destailleur
4fc1f3be4a Merge pull request #9716 from grandoc/new_branch_09_10_2018
Standardize and update code
2018-10-09 16:07:43 +02:00
Laurent Destailleur
69b33199da Merge pull request #9714 from homer8173/patch-3
Fix log bookmark create
2018-10-09 16:07:15 +02:00
Laurent Destailleur
0fbc9d640e Fix syntax error 2018-10-09 16:05:56 +02:00
Laurent Destailleur
5d2f34dc1e Merge pull request #9715 from inoveaconseil/datapolicies
Dolibarization DataPolicies
2018-10-09 16:03:14 +02:00
Philippe GRAND
52369bcb2b Standardize and update code 2018-10-09 15:46:10 +02:00
Philippe GRAND
9dadd5212d Merge remote-tracking branch 'upstream/develop' into new_branch_09_10_2018 2018-10-09 15:45:07 +02:00
Philippe GRAND
e9bd1be41b Standardize and update code 2018-10-09 15:38:42 +02:00
Laurent Destailleur
46ad7de5dd Merge pull request #9709 from bafbes/abb80031
NEW Category filter on user list
2018-10-09 15:38:00 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00