2
0
forked from Wavyzz/dolibarr
Commit Graph

13372 Commits

Author SHA1 Message Date
Laurent Destailleur
0a85a4702a Fix https 2018-01-17 11:41:03 +01:00
Laurent Destailleur
1a04178d64 Clean unused file and fix missing translation 2018-01-17 11:20:18 +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
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
Philippe GRAND
cd0dc2dbde Add linked file tab to vat 2018-01-16 16:22:32 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +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
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
fappels
00185bd9d4 Fix fetchCommon should return 0 iso error if not found 2018-01-15 11:21:24 +01:00
Aurélien Labate
b86a5d5623 FIX add password_hash compatibility test for PHP < 5.5 2018-01-15 11:02:08 +01:00
Aurélien Labate
8088d92bbb NEW Add password_hash as hash algorithm 2018-01-15 00:33:25 +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
Maxime Kohlhaas
c45e5c91b1 New hidden option MAIN_DISABLE_FREE_LINES 2018-01-14 17:13:42 +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
f0d6099e5f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/core/lib/functions.lib.php
2018-01-14 03:15:49 +01:00
Laurent Destailleur
9f6118ed52 Code comments 2018-01-14 03:12:22 +01:00
Laurent Destailleur
debc758134 Fix code comment 2018-01-14 01:40:12 +01:00
Laurent Destailleur
7a087327e1 Fix deprecated code 2018-01-13 19:33:40 +01:00
Laurent Destailleur
c947502efa Fix typo 2018-01-13 17:22:59 +01:00
Laurent Destailleur
7c480f76e3 Fix thumbs of pdf at wrong place
Fix param not provided
Fix css
2018-01-13 16:09:05 +01:00
Laurent Destailleur
8d793c680e Fix dol_delete_preview 2018-01-13 15:48:30 +01:00
Laurent Destailleur
7a88afe962 Fix field enabled and perms must differs 2018-01-13 13:16:33 +01:00
Laurent Destailleur
53b36435d0 Fix on smartphone 2018-01-12 20:50:18 +01:00
Laurent Destailleur
8014f7d822 Fix blockedlog module must store ref of invoice once validated 2018-01-12 19:09:43 +01:00
Laurent Destailleur
d0680b429f Fix name of file saved from tax document tab 2018-01-12 17:39:20 +01:00
Laurent Destailleur
7bfcfd4574 Fix recursive path when dir is '0' 2018-01-12 17:12:38 +01:00
Laurent Destailleur
32a998e68d Fix preview link 2018-01-12 16:28:10 +01:00
Laurent Destailleur
ad4b59d2c8 Fix scrutinizer 2018-01-12 15:33:21 +01:00
Laurent Destailleur
4f8a447d30 Fix alignement 2018-01-12 14:09:51 +01:00
Laurent Destailleur
50596a5214 Fix trans key 2018-01-12 14:06:48 +01:00
Laurent Destailleur
6c9d5984a2 Fix trans key 2018-01-12 14:03:03 +01:00
Laurent Destailleur
95d2a9f88d Responsive and css 2018-01-12 01:10:03 +01:00
Laurent Destailleur
e56d74f5c4 Fix generation of doc for supplier payment 2018-01-11 19:01:47 +01:00
Laurent Destailleur
0b893c11fd Revert "Fix wrong address used into PDF model of supplier payment"
This reverts commit 22d92c0540.
2018-01-11 18:09:05 +01:00
Laurent Destailleur
15ed7584b8 Fix navigation in accounting account card 2018-01-11 17:06:06 +01:00
Laurent Destailleur
46d28deee7 Fix substitution of thirdparty 2018-01-11 12:25:40 +01:00
Laurent Destailleur
3f4d7dbce6 Fix substitution of thirdparty 2018-01-11 12:24:47 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/translation.php
2018-01-11 01:14:20 +01:00
Laurent Destailleur
0ae02d76a3 Merge pull request #8049 from fmarcet/6.0
Fix: Still using property ->client instead of ->thirdparty.
2018-01-11 01:03:47 +01:00
Laurent Destailleur
af6b84ba3a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/contact/document.php
	htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
f83ea80d6a Merge pull request #8041 from dolibarr95/patch-35
NEW Add class in societe/card.php
2018-01-11 00:47:53 +01:00
Laurent Destailleur
79562f8d5b Merge pull request #8036 from atm-ph/fix_6.0_model_pdf_invoice_payment
Fix wrong address used into PDF model of supplier payment
2018-01-11 00:37:37 +01:00
Laurent Destailleur
436b653fa0 Error report 2018-01-11 00:16:45 +01:00