Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
0c6499f193
Update product.php 2019-07-25 18:01:47 +02:00
Laurent Destailleur
9a0e0fbdd2
Update product.php 2019-07-25 18:01:16 +02:00
Laurent Destailleur
0d79905b0a
Merge pull request #11539 from hregis/9.0_bug2
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-25 17:56:42 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00
Laurent Destailleur
8241bc414a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/lib/files.lib.php
2019-07-25 17:52:17 +02:00
Laurent Destailleur
fe9ddd7649 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/lib/files.lib.php
2019-07-25 17:50:07 +02:00
Laurent Destailleur
e8932335aa
Merge pull request #11544 from atm-josselin/FIX_upload_file_with_multiple_spaces
FIX : correct error in files with multiple spaces
2019-07-25 17:48:26 +02:00
Laurent Destailleur
96a90e735c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:47:13 +02:00
Laurent Destailleur
ff215d9b04
Merge pull request #11547 from ptibogxiv/patch-198
Fix display civility in contact card
2019-07-25 17:47:02 +02:00
Laurent Destailleur
95be7ad82a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:46:58 +02:00
Laurent Destailleur
111c0dcadd Comment 2019-07-25 17:46:48 +02:00
Laurent Destailleur
6e3fad8f83 Fix phpcs 2019-07-25 17:42:44 +02:00
Laurent Destailleur
27c6bfe9db
Merge pull request #11548 from aspangaro/9.0pa
FIX FEC Format - Missing date_creation in general ledger when you add a new transaction
2019-07-25 17:37:05 +02:00
Laurent Destailleur
2dc2af7c41
Merge pull request #11552 from aspangaro/10.0_FEC
Presentation nowrap on amount
2019-07-25 17:35:36 +02:00
Laurent Destailleur
2f08715d5a
Merge pull request #11559 from atm-florianm/FIX_product.lib.php_needed_for_pdf_generation
FIX: tk9877 - PDF rouget requires product.lib.php
2019-07-25 17:34:25 +02:00
Laurent Destailleur
1d7885bc0c FIX We should remove property comments only for project and task api. 2019-07-25 16:58:24 +02:00
Laurent Destailleur
e88ca8ae89 Fix migration 2019-07-25 15:07:24 +02:00
Laurent Destailleur
fe22f11f10 More generic code 2019-07-25 15:07:00 +02:00
Laurent Destailleur
351b877c05 Add structured data product 2019-07-25 14:39:22 +02:00
Laurent Destailleur
fb2a9e371c Fix syntax 2019-07-25 14:27:53 +02:00
Laurent Destailleur
6674b8975b Fix logo of organization 2019-07-25 14:26:48 +02:00
Laurent Destailleur
1978ffb370 Fix 2019-07-25 14:21:39 +02:00
Laurent Destailleur
e29023f155 Fix 2019-07-25 14:12:22 +02:00
Laurent Destailleur
5fd35c1bc9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/website.lib.php
2019-07-25 13:51:12 +02:00
Laurent Destailleur
d1aa15004e NEW Add method getStructuredData for website 2019-07-25 13:49:56 +02:00
Laurent Destailleur
0bb92ff10d NEW Add method getStructuredDataForBlogPost for website 2019-07-25 13:48:13 +02:00
atm-quentin
efd89588e5 fix trans 2019-07-25 12:21:28 +02:00
Florian Mortgat
65e9d8f239 FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined) 2019-07-25 11:14:59 +02:00
Laurent Destailleur
151075402f css 2019-07-24 17:15:25 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
907ba62054 Sync transifex 2019-07-24 14:59:03 +02:00
ptibogxiv
c219b62b10
Update contact.class.php 2019-07-24 13:23:24 +02:00
ptibogxiv
ba60e99b45
Update card.php 2019-07-24 13:22:41 +02:00
Alexandre SPANGARO
323d2df210 Presentation nowrap on amount 2019-07-24 10:42:00 +02:00
atm-quentin
0ff121e7f1 add some new field on global search 2019-07-24 09:42:52 +02:00
atm-quentin
03ed4eb141 modif rowspan 2019-07-24 09:42:39 +02:00
atm-quentin
5a385bf1cc ADD extrafields on global search 2019-07-24 09:41:02 +02:00
Regis Houssin
f45175cc9b FIX missing filter by current contact 2019-07-24 09:28:11 +02:00
Alexandre SPANGARO
3921f706e2 Presentation nowrap on amount 2019-07-24 09:01:11 +02:00
Alexandre SPANGARO
2162f2331d Try to fix travis 2019-07-24 06:57:42 +02:00
Laurent Destailleur
be13d5e471 FIX The new feature to attach document on lines was not correclty
enabled.
2019-07-23 14:49:09 +02:00
Laurent Destailleur
9ddb8a5b0b Fix tooltip to say closed project are not visibles 2019-07-23 14:41:29 +02:00
ptibogxiv
f959341aa8
Update card.php 2019-07-23 14:30:12 +02:00
ptibogxiv
57db12ccdb
Update card.php 2019-07-23 14:10:13 +02:00
ptibogxiv
cc10f5e684
Update card.php 2019-07-23 14:06:51 +02:00
ptibogxiv
46d0137d30
FIx display civility in contact card 2019-07-23 14:04:54 +02:00
Laurent Destailleur
239b7d56b4 Fix compatibility with plugins using old jquery 2019-07-23 13:31:00 +02:00
Laurent Destailleur
8aaa716e33 Fix missing title 2019-07-23 13:05:33 +02:00
Laurent Destailleur
c96ad85126 Add hidden option to avoid experimental to use export files feature 2019-07-23 12:34:17 +02:00