Commit Graph

7507 Commits

Author SHA1 Message Date
Laurent Destailleur
94bab15528 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
2ca5a4378b Fix empty div when no address
Fix deletion of MO
2019-12-09 00:54:42 +01:00
Laurent Destailleur
9e479afff1 WIP Complete module MRP 2019-12-09 00:06:51 +01:00
Laurent Destailleur
2b5866aca2 WIP Complete module MRP 2019-12-08 23:45:06 +01:00
Laurent Destailleur
91d83c3d60 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-06 17:40:43 +01:00
Laurent Destailleur
796f34628d Debug v11 2019-12-06 17:40:22 +01:00
Scrutinizer Auto-Fixer
4debd71281 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Frédéric FRANCE
f101e919c8
The variable $out does not seem to be defined for all execution paths 2019-12-05 21:30:47 +01:00
Laurent Destailleur
5f148be56f Fix responsive 2019-12-04 16:43:56 +01:00
Laurent Destailleur
dbee703b18 Fix responsive 2019-12-04 16:23:31 +01:00
Laurent Destailleur
b61434dbef Avoid log 2019-12-04 15:55:22 +01:00
Laurent Destailleur
b78f310508 Reponsive 2019-12-04 15:49:22 +01:00
Laurent Destailleur
bde917d7fc Fix responsive 2019-12-04 15:09:20 +01:00
Laurent Destailleur
5a17289e75 Fix crop for proposal image 2019-12-03 18:04:58 +01:00
Laurent Destailleur
573aac8b04
Merge pull request #12594 from frederic34/patch-8
The variable xxx does not seem to be defined for all exec paths
2019-12-03 13:22:18 +01:00
Laurent Destailleur
ed462190f6
Merge pull request #12607 from frederic34/patch-18
doxygen
2019-12-03 13:18:48 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Frédéric FRANCE
261e166029
doxygen 2019-12-02 20:18:12 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
7908e0cd26 Fix crop for MO 2019-12-02 08:46:59 +01:00
Frédéric FRANCE
454d79db58
The variable xxx does not seem to be defined for all exec paths 2019-12-01 20:44:13 +01:00
Laurent Destailleur
7407df2fa3
Merge pull request #12590 from frederic34/patch-7
The variable $arraylist seems to be defined...
2019-12-01 18:42:03 +01:00
Frédéric FRANCE
3227f12a6e
The variable $arraylist seems to be defined...
The variable $arraylist seems to be defined by a foreach iteration. Are you sure the iterator is never empty, otherwise this variable is not defined?
2019-12-01 18:27:06 +01:00
Frédéric FRANCE
41b5e82d48
The variable $error seems to be never defined 2019-12-01 16:42:18 +01:00
Laurent Destailleur
3eec2430eb
Merge pull request #12585 from atm-john/develop_factoring_token_usage
Factoring token usage
2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime
Restore file for travis
2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
	htdocs/core/class/notify.class.php
2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
02b5da5db1 Fix #12448 : notifications were sent to disabled user or contacts 2019-11-30 00:57:21 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Laurent Destailleur
614b82fe88 Fix var not initialized 2019-11-28 14:16:54 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
altairis
355d7545f6 filter language is an array 2019-11-27 10:23:01 +01:00
Frédéric FRANCE
c7e8194df9
dol_print_error returns void 2019-11-26 18:28:44 +01:00
Laurent Destailleur
4ef6c9cc13 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/ticket.lang
2019-11-26 11:54:42 +01:00
Laurent Destailleur
b370d70426
Merge pull request #12511 from erpware/develop
just fixed two small css issues
2019-11-26 09:20:40 +01:00
Laurent Destailleur
0032b27a8e
Merge pull request #12517 from frederic34/patch-16
$out does not seem to be defined for all execution paths
2019-11-26 09:14:55 +01:00
Alexandre SPANGARO
6cc61fef9c Fix Ticket - Deprecated <center> 2019-11-26 04:32:38 +01:00
Frédéric FRANCE
a142c0050e
$out does not seem to be defined for all execution paths 2019-11-26 00:24:00 +01:00
Frédéric FRANCE
77a300c9ae
doxygen 2019-11-26 00:20:40 +01:00
Daniel Seichter
7a4beb824f Merge remote-tracking branch 'upstream/develop' into develop 2019-11-25 23:14:19 +01:00
Daniel Seichter
9eafc8f550 fix small css issues 2019-11-25 23:13:31 +01:00
Laurent Destailleur
e2009ceff0 Fix extrafields of line for receptions 2019-11-22 14:22:35 +01:00
Laurent Destailleur
00ad95c01e Figth against useless dependencies: Remove library the core never use. 2019-11-22 14:06:43 +01:00
Laurent Destailleur
6191307865 Debug v11 2019-11-22 12:22:27 +01:00
Laurent Destailleur
92a65a8039 Log 2019-11-21 21:36:03 +01:00
Laurent Destailleur
5fdd6f698d More complete error message
Conflicts:
	htdocs/core/class/CMailFile.class.php
2019-11-21 20:46:27 +01:00
Laurent Destailleur
b46362dff9 More complete error message 2019-11-21 20:45:19 +01:00
Laurent Destailleur
2f3b4d239b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:12 +01:00
Laurent Destailleur
6bfb76d40d
Merge pull request #12464 from bb2a/patch-6
Update getfullname
2019-11-19 10:55:47 +01:00
Scrutinizer Auto-Fixer
cd7523318d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
5b6f0cb101 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
Laurent Destailleur
918f476c2b Fix backport fix not checking mandatory extrafields of type select 2019-11-18 19:02:12 +01:00
Laurent Destailleur
16d67a1a8e Fix several trouble with some types in modulebuilder
Fix difference between null and 0
2019-11-17 17:36:36 +01:00
Anthony Berton
7a5883588c
Update commonobject.class.php 2019-11-17 14:07:01 +01:00
Scrutinizer Auto-Fixer
1648fc142e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields.
Fix remove empty id
2019-11-16 14:38:05 +01:00
Laurent Destailleur
c5b83ca3d8 Fix link translation of 2019-11-16 12:43:44 +01:00
Laurent Destailleur
e5daa73a9e
Merge pull request #12444 from frederic34/doxygen_menubase
doxygen menubase class
2019-11-16 00:45:30 +01:00
Laurent Destailleur
3898db3956 FIX #12446 2019-11-16 00:39:23 +01:00
Laurent Destailleur
1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Frédéric FRANCE
7100328116
doxygen menubase class 2019-11-14 21:25:12 +01:00
Laurent Destailleur
f7ab1498a7 FIX Advisory ID: usd20190053 2019-11-14 17:00:02 +01:00
Laurent Destailleur
7d997990fa Fix phpcs 2019-11-14 12:44:15 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
411e9c87e3 Debug feature to set sender profiles 2019-11-14 11:53:28 +01:00
Laurent Destailleur
75667833fe Fix missing ->msgid 2019-11-14 10:01:05 +01:00
Laurent Destailleur
95a6d7f8f5 Doxyen 2019-11-14 09:13:15 +01:00
Laurent Destailleur
56f2463a15
Merge branch 'develop' into patch-6 2019-11-14 08:53:53 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Frédéric FRANCE
6596ffac4f
Update conf.class.php 2019-11-13 20:20:35 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Laurent Destailleur
56c2dc2614 Reduce need of translations 2019-11-12 22:29:36 +01:00
Laurent Destailleur
528823140d Fix phpcs 2019-11-12 12:05:06 +01:00
Laurent Destailleur
6afc84fe72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-12 10:19:01 +01:00
Laurent Destailleur
f65ce1d5d0 Fix var not declared 2019-11-12 10:17:46 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Laurent Destailleur
dc77a58a73 Work on MO 2019-11-12 01:48:12 +01:00
Laurent Destailleur
814dce5b55 Fix var not defined 2019-11-11 19:26:19 +01:00
Laurent Destailleur
27fb9e0c7f
Merge pull request #12401 from grandoc/new_branch_10_11_2019
add some comment
2019-11-10 18:07:13 +01:00
Laurent Destailleur
0a824db6d3 Remove useless call 2019-11-10 17:48:50 +01:00
stickler-ci
f8138c22a3 Fixing style errors. 2019-11-10 10:12:10 +00:00
Philippe GRAND
9bf4347371 add some comment 2019-11-10 11:11:43 +01:00
Laurent Destailleur
5ebd5a401c Fix avoid error on lang not defined when calling trigger 2019-11-09 13:09:05 +01:00
Laurent Destailleur
ab26356e92 Fix avoid error on lang not defined when calling trigger 2019-11-09 13:08:30 +01:00
Laurent Destailleur
c0abb725cb Fix price2num needs lang loaded when it may not exists 2019-11-09 12:46:45 +01:00
Laurent Destailleur
f9869dbfed Fix price2num need langs when lang is not necessarly loaded. 2019-11-09 12:46:11 +01:00
Laurent Destailleur
dcdcd7c67e Look and feel v11 2019-11-09 12:03:11 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Laurent Destailleur
83090629fe Fix join into left join 2019-11-08 13:43:26 +01:00
Laurent Destailleur
4f219ae0fb Fix doc 2019-11-07 11:16:59 +01:00