Commit Graph

64091 Commits

Author SHA1 Message Date
Darkjeff
e8b27c8e66 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-17 17:06:12 +01:00
Laurent Destailleur
56d702e3c6 Fix missing property in tooltip 2018-01-17 16:26:24 +01:00
Laurent Destailleur
1e9ddf153c Fix workboard not visible on smartphone, so i invert position with stats 2018-01-17 13:55:53 +01:00
Laurent Destailleur
dcd579242f Fix <br /> (xml) into <br> (html) 2018-01-17 13:26:57 +01:00
Laurent Destailleur
2e0ec5e76a Fix <br> 2018-01-17 13:17:33 +01:00
Laurent Destailleur
be821716f0 code comment 2018-01-17 12:26:20 +01:00
Laurent Destailleur
90e579b884 Update doxygen 2018-01-17 11:49:06 +01:00
Laurent Destailleur
0a85a4702a Fix https 2018-01-17 11:41:03 +01:00
Laurent Destailleur
ef5939fe78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 11:20:32 +01:00
Laurent Destailleur
1a04178d64 Clean unused file and fix missing translation 2018-01-17 11:20:18 +01:00
Darkjeff
5f1a95e5d7 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-17 08:48:54 +01:00
Laurent Destailleur
3f551f0d05 Fix migration 2018-01-17 02:19:32 +01:00
Laurent Destailleur
a84ed841cc Fix creation date was not filled 2018-01-16 20:47:33 +01:00
Laurent Destailleur
26ba0a9ec2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/cashdesk/index.php
	htdocs/compta/index.php
	htdocs/core/lib/security.lib.php
	htdocs/societe/list.php
2018-01-16 20:23:32 +01:00
Laurent Destailleur
5d4eda68e0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-16 19:53:02 +01:00
Laurent Destailleur
94b1d59f2b Fix missing check on object entity 2018-01-16 19:52:14 +01:00
Laurent Destailleur
59eefa46e6 Fix duplicate search field 2018-01-16 18:02:36 +01:00
Darkjeff
69ab7542d0 Merge branch 'develop' of https://github.com/Darkjeff/dolibarr into develop 2018-01-16 17:51:00 +01:00
Darkjeff
0a1fec42a2 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-16 17:50:46 +01:00
Darkjeff
73c0a96d1b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-16 16:52:05 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
f307fecaf6
Merge pull request #8064 from atm-quentin/6.0
FIX missing hook invoice index
2018-01-16 12:15:06 +01:00
Laurent Destailleur
51421a8bf6 Fix position of fields 2018-01-15 18:11:56 +01:00
Laurent Destailleur
25d59cf107 Fix sort on common fields 2018-01-15 18:05:15 +01:00
Laurent Destailleur
3d34a839a3 Doc 2018-01-15 17:43:18 +01:00
Laurent Destailleur
926683763b Modulebuilde fix sort of fields, fix generation of files 2018-01-15 17:38:15 +01:00
atm-quentin
6feacab4f5 FIX missing hook invoice index 2018-01-15 14:24:19 +01:00
Darkjeff
608aa54517 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-15 13:14:31 +01:00
Laurent Destailleur
bc2009874d Fix code comment 2018-01-15 12:59:30 +01:00
Darkjeff
9f2ecdd06f Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-15 12:53:25 +01:00
Laurent Destailleur
4c8af0ff50 Fix name alias on list 2018-01-15 12:24:56 +01:00
Laurent Destailleur
b154357683
Merge pull request #7982 from simnandez/6.0
FIX: Bad name alias showing in name of third column
2018-01-15 12:22:40 +01:00
Laurent Destailleur
3b9aee7d4c
Update list.php 2018-01-15 12:22:21 +01:00
Laurent Destailleur
e4c02152b3 Fix navigation in bookeeping view grouped by account 2018-01-15 12:14:18 +01:00
Laurent Destailleur
04a5dc79e9
Merge pull request #8054 from artis-auxilium/accounting_searchdate_fiscalyear
Accounting searchdate fiscalyear
2018-01-15 11:38:04 +01:00
Laurent Destailleur
926f39fc2b
Merge pull request #8060 from atm-maxime/fix_blockaedlog_migration
Fix blockedlog triggers fatal error in migration script
2018-01-15 11:34:48 +01:00
Laurent Destailleur
c29bfcef31
Merge pull request #8053 from Oeris/develop-api
FIX use DB PREFIX instead of llx_
2018-01-15 11:33:09 +01:00
Laurent Destailleur
193dfec29e
Merge pull request #8061 from fappels/7.0_fix_module_builder
7.0 fix module builder
2018-01-15 11:32:40 +01:00
Laurent Destailleur
64fd5154c9
Merge pull request #8052 from hregis/develop_multicompany
Fix: regression and broken feature
2018-01-15 11:31:07 +01:00
Laurent Destailleur
68f0808d16
Update societe.class.php 2018-01-15 11:30:32 +01:00
Laurent Destailleur
b8688a46d3
Update contact.class.php 2018-01-15 11:30:11 +01:00
fappels
00185bd9d4 Fix fetchCommon should return 0 iso error if not found 2018-01-15 11:21:24 +01:00
Laurent Destailleur
3410e29755 CSS 2018-01-15 11:20:45 +01:00
Laurent Destailleur
90fc086814 Fix minor 2018-01-14 20:11:38 +01:00
Laurent Destailleur
cc5dcde9e1 Fix protection to avoid errors 2018-01-14 18:55:55 +01:00
Laurent Destailleur
3c3402bc60 Debug API for prices of products 2018-01-14 15:58:04 +01:00
fappels
d6ed968c51 html modulebuilder type is a text type in database 2018-01-14 15:41:37 +01:00
fappels
25b455272a Fix 0 is a valif value for a NOT NULL field 2018-01-14 15:31:31 +01:00
Laurent Destailleur
133e87fcc3 Sync transifex 2018-01-14 12:45:26 +01:00
Darkjeff
7e94cf497d Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-14 12:41:58 +01:00