lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,328 Commits 43 Branches 150 Tags 886 MiB
b0baed83fc
Commit Graph

2024 Commits

Author SHA1 Message Date
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
9619c0cdea Fix: [ bug #1581 ] SQL injection possbile 2014-10-27 00:58:56 +01:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 00:42:52 +02:00
Frédéric FRANCE
b2a9b48a78 Update ajax.lib.php 
Add a delay before making request, may avoid multiple request to server when typing search request
 2014-10-24 10:40:48 +02:00
Laurent Destailleur
3fe4c58e95 Use span class="badge" for notes. 2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b Fix: Better layout detection 2014-10-19 12:24:36 +02:00
Frédéric FRANCE
a1bedcc263 Update ajax.lib.php 2014-10-18 22:46:13 +02:00
Frédéric FRANCE
eefb211be7 Update ajax.lib.php 2014-10-18 18:48:13 +02:00
Frédéric FRANCE
8bb0ce0f7f Update ajax.lib.php 2014-10-18 17:17:41 +02:00
Frédéric FRANCE
dd5ea670e2 Update ajax.lib.php 2014-10-18 17:11:02 +02:00
Frédéric FRANCE
2107a61bbe Update ajax.lib.php 
For use in a list of object
 2014-10-18 16:32:32 +02:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Frédéric FRANCE
96aee6eed4 Update ajax.lib.php 2014-10-18 15:48:59 +02:00
Laurent Destailleur
97f98d7e16 Merge pull request #1955 from frederic34/patch-2 
Ajax On/Off for product tosell and tobuy
 2014-10-18 14:18:14 +02:00
Laurent Destailleur
fb76fc94b5 Merge pull request #1963 from defrance69/patch-24 
Update functions2.lib.php
 2014-10-18 14:11:25 +02:00
Laurent Destailleur
58b15fa736 Fix: Solve some regressions 2014-10-18 01:32:38 +02:00
Laurent Destailleur
dbbf31d87b Fix: Restore comaptibility with all languages. 
Fix: Corrupting data function.
 2014-10-18 00:41:21 +02:00
BENKE Charles
8095bbf809 Update functions2.lib.php 2014-10-17 17:10:12 +02:00
Laurent Destailleur
e2afa48caa Fix: avoid warning 2014-10-17 16:23:32 +02:00
Laurent Destailleur
4b34455f0a Fix permissions 2014-10-17 15:01:56 +02:00
BENKE Charles
589a3fdf95 Update functions2.lib.php 2014-10-17 10:26:34 +02:00
BENKE Charles
5bd665f10d Update functions2.lib.php 
disable entity filter fields for module who not use multicompany fields
 2014-10-17 09:53:17 +02:00
Laurent Destailleur
e2524fbf77 Fxi: Filter on list view was not correct. 2014-10-16 21:34:35 +02:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Laurent Destailleur
a94f7dc3ad Revert "Add function dolEscapeXML" 
This reverts commit 756b1d31ad.
 2014-10-16 01:21:33 +02:00
Laurent Destailleur
b90011aeb1 Add function dolEscapeXML 2014-10-16 01:21:10 +02:00
Laurent Destailleur
756b1d31ad Add function dolEscapeXML 2014-10-16 01:01:30 +02:00
Laurent Destailleur
2cf21f856c Fix: table name differs. 2014-10-14 01:47:31 +02:00
Frédéric FRANCE
f5f50045d6 Update ajax.lib.php 2014-10-12 16:09:42 +02:00
Frédéric FRANCE
f25c4f18e6 Update ajax.lib.php 2014-10-12 15:55:18 +02:00
Laurent Destailleur
5c07df812d Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-12 15:24:33 +02:00
Laurent Destailleur
cbbe909bc5 Fix: Pb in management of "or" ("|") for permission check. 2014-10-12 15:22:07 +02:00
Frédéric FRANCE
e6e953b4d8 Update ajax.lib.php 2014-10-12 14:20:49 +02:00
Laurent Destailleur
65f47f7d10 New: Add number of active notification into tab title (like we do for 
notes and documents)
 2014-10-12 12:22:45 +02:00
Laurent Destailleur
f08759a17e Fix: area to generate doc must use half size not onethird. 
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
 2014-10-12 11:59:52 +02:00
Laurent Destailleur
c5d8012eb1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/date.lib.php
 2014-10-12 02:13:38 +02:00
Laurent Destailleur
2b479aa0b4 Qual: Uniformize translated label of progress on all pages. 
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
 2014-10-12 01:04:34 +02:00
Laurent Destailleur
6c3c1d3a0a Merge pull request #1930 from GPCsolutions/reportprogress 
Allow reporting progress along with timespent
 2014-10-12 00:10:28 +02:00
Laurent Destailleur
e9881997ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-11 23:50:27 +02:00
Laurent Destailleur
52e1bd2ad1 Merge 2014-10-11 23:46:49 +02:00
Laurent Destailleur
77ed7bf5df Merge branch 'develop-HiddenMailPasswordForgotten' of 
github.com:Devensys/dolibarr into
Devensys-develop-HiddenMailPasswordForgotten

Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-10-11 23:44:50 +02:00
jfefe
eb06c8a33e Allow to make PUT request with getURLContent() function 2014-10-11 04:25:32 +02:00
Andrelec1
269b960d9a Add support tld with dots 2014-10-10 15:18:24 +02:00
Andrelec1
f4f1f45d5a copyright and annotation 2014-10-10 15:01:10 +02:00
Andrelec1
7978b4503d Add function hideMail and use 2014-10-10 14:57:07 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00
Laurent Destailleur
de5005ca54 Fix: Avoid duplicate error message 
Fix: pgsql syntax error
 2014-10-08 15:35:39 +02:00
Laurent Destailleur
4c4485d0ee More comment to explain and remove a todo. 2014-10-08 15:24:35 +02:00
Regis Houssin
cc553514af Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have 
the same name as the module
 2014-10-08 14:51:16 +02:00
Laurent Destailleur
60f643cf1a Change comented log to help debug 2014-10-05 20:26:35 +02:00
aspangaro
7e11fa06bb Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-10-05 16:35:38 +02:00
Laurent Destailleur
742d0e37ee Fix: Bad month return by function 2014-10-05 12:54:51 +02:00
Laurent Destailleur
5c5f725a34 Fix scrutinizer 2014-10-05 01:22:17 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
aspangaro
c1db82a791 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-10-04 08:10:12 +02:00
Laurent Destailleur
166853dd56 Fix: miscellaneous bugs 2014-10-03 12:15:21 +02:00
Raphaël Doursenaud
769d824e7b Allow reporting progress along with timespent 2014-10-01 14:12:47 +02:00
aspangaro
f70e8b766f Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-09-29 20:40:53 +02:00
Laurent Destailleur
ec2a8b5551 Merge pull request #1800 from Devensys/Develop-HighlitingIBAN 
Highliting IBAN (sepa)
 2014-09-29 16:43:22 +02:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
Laurent Destailleur
06494b085a Perf enhancement 2014-09-28 16:38:45 +02:00
Laurent Destailleur
cd4c81d15d Uniformize code. 2014-09-28 16:31:37 +02:00
Laurent Destailleur
2b95bd2fcc Fix: Link to linked object was not working for invoice and order. 
Fix: end date
 2014-09-28 16:12:38 +02:00
aspangaro
250b57ca0a Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-09-28 14:00:26 +02:00
Laurent Destailleur
4244979f4f Fix: doxygen 
Fix: td balance
 2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
aspangaro
a58025c601 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-09-23 21:24:29 +02:00
Laurent Destailleur
7224f64224 Work on multi user for events. 
Fix: Modules must be reloaded after migration.
 2014-09-23 16:15:15 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Laurent Destailleur
e1fec958ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/group/fiche.php
 2014-09-22 23:43:22 +02:00
Alexis Algoud
de0d53a2bb ADD extrafields on usergroup 2014-09-22 16:31:58 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
aspangaro
08b9e05425 New Module : Manage Financial Loan 2014-09-21 17:42:38 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
aspangaro
6d26a7a46d Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-20 06:36:31 +02:00
Laurent Destailleur
ca3c5d9513 Fix: invalid list of params 
Fix: loading of sql menu
 2014-09-19 14:36:55 +02:00
Laurent Destailleur
2a9275d0de Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/societe/consumption.php
 2014-09-19 11:09:51 +02:00
aspangaro
ab9226aab6 Delete elements have a link with old module ventilation - Replace today by module Accounting Expert 2014-09-19 05:55:54 +02:00
Raphaël Doursenaud
4296766ea9 Qual: Coding style 2014-09-19 03:07:54 +02:00
Raphaël Doursenaud
0f71b7e0b0 FIX: Typo 2014-09-19 03:07:54 +02:00
Raphaël Doursenaud
e9175d5d66 Qual: date type doesn't exist 2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
eea9a76589 FIX: Variable might not be traversable 2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
4c7ae3d14b FIX: Missing parameter declaration 2014-09-19 03:05:20 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
e64e161a58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-18 17:54:24 +02:00
Laurent Destailleur
fd890c0b81 Merge pull request #1878 from Cubexed/develop 
This commit adds a way to filter projects by checking if selected year is in creation/ending range.
 2014-09-18 17:47:12 +02:00
Laurent Destailleur
46f117b0f9 Merge pull request #1902 from atm-maxime/mko_workonlists 
Work on lists
 2014-09-18 17:29:15 +02:00
Laurent Destailleur
ea3d091f03 Merge pull request #1900 from ndrosis/patch-5 
Correct view greek language in PDF
 2014-09-18 17:25:44 +02:00
Laurent Destailleur
49db9d1304 Fix: Avoid explode when separator : is not. 2014-09-18 17:12:51 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
 2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Maxime Kohlhaas
64fe082539 New generic functions for search pictos, to be used in every lists 2014-09-17 17:59:00 +02:00
Laurent Destailleur
f0ebd7721d Fix: Restore sort feature. Still did not see why previous commit is a 
bug fix of dolibarr bug.
 2014-09-17 17:49:39 +02:00
Drosis Nikos
de6e1c5036 Correct view greek language in PDF 2014-09-17 18:01:59 +03:00
Regis Houssin
099daf4296 Fix: remove hook restriction ! 2014-09-17 16:08:58 +02:00
Regis Houssin
f185028707 Fix: remove hook restriction ! 2014-09-17 16:08:14 +02:00
Regis Houssin
d225d92c0b Fix: remove hook restriction ! 2014-09-17 16:03:21 +02:00
Marcos García de La Fuente
4b3191b64e Removed deprecated usage of facture_pdf_create 2014-09-16 20:49:05 +02:00
Cubexed
c3b255bce9 Changed sql to be portable 2014-09-16 15:27:04 +02:00
Juanjo Menent
d1879c1b9f Qual: Remove unused code 2014-09-16 11:19:22 +02:00
Laurent Destailleur
d8e8b34605 Fix: Removed AGENDA_DEFAULT_TYPE. There is already 
AGENDA_DEFAULT_FILTER_TYPE.
 2014-09-15 19:35:54 +02:00
Laurent Destailleur
8487913209 Fix: default setup of type of action 2014-09-15 19:27:45 +02:00
Laurent Destailleur
7fc8799c3d Qual: Clean code from user table tr td 2014-09-15 16:18:19 +02:00
Laurent Destailleur
b94d913440 New: Add option AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS to 
automatically set end date of event to start date + delta on creation
page.
 2014-09-15 10:19:08 +02:00
Laurent Destailleur
6f718af1b6 Fix: list of interventions of thirdparties 2014-09-15 09:29:40 +02:00
Laurent Destailleur
4e21891f14 Add lost PR 2014-09-14 12:06:38 +02:00
Cubexed
71a1857b49 Ignore dateo/datee if is a null column 2014-09-12 16:46:19 +02:00
Cubexed
c23fab267c This commit adds a way to filter projects by checking if 
selected year is in creation/ending range.

The year input is shown after the list, outside the table.

It's hidden by default and must be
enabled with PROJECT_LIMIT_YEAR_RANGE
 2014-09-12 05:30:17 +02:00
Laurent Destailleur
9f2b0b4f29 Minor enhancement on agenda module. 
Can filter on date of event.
Local calendar renamed into Internal calendar.
 2014-09-09 12:28:35 +02:00
Laurent Destailleur
9e2a0cb671 Fix: debug of accountancy module 2014-09-09 09:46:57 +02:00
Laurent Destailleur
2fb806bfc2 Fix: duplicate entity encoding into select_array. 2014-09-08 23:08:59 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
63bfc093c3 Search on a specific day is possible into per user view. 2014-09-06 17:55:33 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
Laurent Destailleur
a86de9b685 Work on agenda per user. 2014-09-05 21:12:01 +02:00
Laurent Destailleur
de0cf14ece Fix: Bad position of week 2014-09-05 15:10:31 +02:00
Laurent Destailleur
0e944b0403 Fix: Pb with week position when week start on sunday. 2014-09-05 15:00:53 +02:00
Laurent Destailleur
175e3eca6b Work on agenda view per user 2014-09-05 13:48:55 +02:00
Laurent Destailleur
6da0077738 Fix: Not enough space 2014-09-04 15:48:49 +02:00
Laurent Destailleur
782aaf52ae Add method setEventMessages (can deal this->error and this->errors) 2014-09-04 14:39:18 +02:00
Laurent Destailleur
be0c7ba28f Fix: Bad title 2014-09-03 09:55:06 +02:00
Laurent Destailleur
0254edb426 Merge pull request #1858 from ndrosis/patch-4 
Can change size of Logo picture
 2014-09-02 19:15:59 +02:00
Laurent Destailleur
adc96cc826 Merge pull request #1853 from aspangaro/develop-accounting 
Integration of module Accounting Expert
 2014-09-02 19:14:21 +02:00
Laurent Destailleur
4fdfe05168 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-02 12:46:57 +02:00
Juanjo Menent
e6a387cb65 Merge pull request #1856 from aspangaro/develop-patch1 
Typo
 2014-09-01 18:44:09 +02:00
Laurent Destailleur
de548ba610 Doxygen 2014-08-31 23:01:49 +02:00
Laurent Destailleur
6e54577167 Better error management 2014-08-31 15:09:10 +02:00
aspangaro
9f92446dba Merge branch 'Upstream/develop' 2014-08-31 07:44:46 +02:00
Drosis Nikos
445bac25fe Can change size of Logo picture 2014-08-30 23:57:37 +03:00
Laurent Destailleur
0ccd29c6cd Doxygen 2014-08-30 20:05:16 +02:00
aspangaro
d6b2cb0b31 Correct travis 2014-08-30 06:05:02 +02:00
aspangaro
cc9f26a035 Correct travis 2014-08-30 05:44:12 +02:00
aspangaro
b27cf2cbd6 Merge branch 'Upstream/develop' 2014-08-30 05:30:53 +02:00
aspangaro
b25db97c28 Typo 2014-08-30 05:30:37 +02:00
aspangaro
1a7c88751c Correct travis 2014-08-30 05:19:48 +02:00
aspangaro
bb7aa9f29c Merge branch 'Upstream/develop' 2014-08-29 06:33:00 +02:00
Laurent Destailleur
1505ade3db Fix error management: When an error is returned by hooks into 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php
 2014-08-28 15:14:06 +02:00
Laurent Destailleur
a1e92b464f Merge pull request #1848 from atm-alexis/develop_feature_intervention_lines_extrafields 
Feature  : Add extrafields on intervention's lines
 2014-08-28 12:00:43 +02:00
Laurent Destailleur
a486b4e415 Fix error management: When an error is returned by hooks into 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.
 2014-08-28 11:20:13 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Alexis Algoud
85228fd8e7 add support in admin 2014-08-26 11:50:02 +02:00
Laurent Destailleur
7cb283d0ea Prepare code to be able to choose what to show into footer 2014-08-25 19:16:37 +02:00
aspangaro
0f7e09d01f Merge branch 'Upstream/develop' 2014-08-20 07:54:33 +02:00
Laurent Destailleur
7437eb8088 New: On contact list can set filter on both active and not active (no 
more exclusive select).
 2014-08-19 14:40:20 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Regis Houssin
e713c8dadc Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:20:43 +02:00
Regis Houssin
0632cbdad0 Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:15:52 +02:00
Regis Houssin
86f1d59e3c Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:12:20 +02:00
Laurent Destailleur
f392eb4c94 Merge pull request #1803 from defrance69/patch-15 
add company contact tabs
 2014-08-17 01:05:18 +02:00
Laurent Destailleur
7edf2eacea New: Each user can include its own external ics calendar into dolibarr 
agenda view.
 2014-08-15 17:08:05 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Regis Houssin
a8668aee11 Fix: add global object to test condition with an object 2014-08-14 15:35:08 +02:00
Regis Houssin
d4a0c122be Fix: add global object to test condition with an object 2014-08-14 15:33:41 +02:00
BENKE Charles
5d81eca1a3 change option name 
replace
MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES
by
MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES
 2014-08-14 10:47:28 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
e0a874b5fd Merge pull request #1808 from KreizIT/GETPost_review 
Add improvement to GETPOST function
 2014-08-13 23:44:58 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
5026320fec Fix: Longueur zone texte libre incorrecte. 2014-08-13 14:44:41 +02:00
Laurent Destailleur
b2638625c9 Add comment to warn about a bug 2014-08-13 14:36:40 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
Laurent Destailleur
526066803c New: Function dol_delete_dir_recursive accept new param $onlysub 2014-08-11 15:20:07 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
ebcc68cdfa Add commented code to use "clear" cookie. This help debug. 2014-08-08 13:09:06 +02:00
Laurent Destailleur
111d215ef1 Merge pull request #1807 from atm-maxime/develop 
New: Intervention documents are now available in ECM module
 2014-08-08 01:56:33 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Maxime Kohlhaas
3b14fa2b35 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-08-07 12:27:46 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
 2014-08-07 12:13:00 +02:00
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:50:34 +02:00
Laurent Destailleur
c64ffb3087 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-07 11:48:41 +02:00
Laurent Destailleur
b7cb2e6b9d Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:48:19 +02:00
KreizIT
180cc0b200 Add description for new param 2014-08-06 17:12:28 +02:00
KreizIT
cfe35f32e8 - Add improvement to GETPOST function 
- Review thirdparty cards for illustration of new GETPOST functionality
 2014-08-06 15:59:36 +02:00
Maxime Kohlhaas
5e63f16d32 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2014-08-06 09:58:10 +02:00
Laurent Destailleur
273b9029b8 Fix: mb_strtolower function does not exists on all PHP versions. 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2014-08-06 01:45:31 +02:00
Laurent Destailleur
f33df3419c Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:25:47 +02:00
Laurent Destailleur
0397fa7dc3 Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:18:36 +02:00
Maxime Kohlhaas
1b3efbb9a3 New : add attachments on user cards 2014-08-05 16:01:40 +02:00
Maxime Kohlhaas
4f47bddd0a New : Intervention documents are now available in ECM module (files downloadable) 2014-08-05 16:00:56 +02:00
Laurent Destailleur
4e8ec8e598 Revert "Add Reduction value in pdf" 
This reverts commit 0b5707c1cf.
 2014-08-04 18:36:18 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard 
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
 2014-08-04 12:49:54 +02:00
Andrelec1
92a5030f8f replace with space by tab 2014-08-04 10:11:56 +02:00
Laurent Destailleur
defb9a772f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-04 09:06:57 +02:00
Laurent Destailleur
7ac22cf7d2 Qual: no more currency into output, must be included into price function 2014-08-04 09:05:51 +02:00
Laurent Destailleur
8d867dde69 Merge pull request #1797 from Devensys/Develop-AddValueReduction 
Add Reduction value in pdf
 2014-08-04 09:01:45 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
b16dc8dbcd Fix: Tab not selected 2014-08-03 23:51:26 +02:00
Laurent Destailleur
8ea52f52f5 Fix: Missing counter into document tab 2014-08-03 23:48:27 +02:00
Laurent Destailleur
9eab1f51cc Fix: remove debug output 2014-08-02 17:27:45 +02:00
BENKE Charles
250e8aacaf Update company.lib.php 2014-08-02 09:58:23 +02:00
Andrelec1
7318d0fbc0 Highliting IBAN (sepa) 
Highliting IBAN code in pdf ( SEPA )
 2014-08-01 15:13:21 +02:00
Andrelec1
0b5707c1cf Add Reduction value in pdf 
Add value of %reduction in pdf
 2014-08-01 14:49:42 +02:00
Laurent Destailleur
96a4aa2d26 Fix: phpunit 2014-08-01 01:31:52 +02:00
Laurent Destailleur
95da79108f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 17:22:37 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
frederic34
6645b8a454 Cannot redeclare getmypid() 2014-07-31 10:21:47 +02:00
Marcos García de La Fuente
a779eea202 Restored JSON reimplementation 2014-07-30 15:17:57 +02:00
Laurent Destailleur
0f9aa69e4e Fix: New: Differentiate text and img for better accessibility. 2014-07-29 21:34:23 +02:00
Laurent Destailleur
b57371bfa1 Fix: New: Differentiate text and img for better accessibility. 2014-07-29 20:21:01 +02:00
Laurent Destailleur
6226d39cda Fix: Pb when option javascript disabled. 2014-07-29 19:45:48 +02:00
Laurent Destailleur
1a96bc0f30 Fix: Bad url for cron 
Fix: must use html syntax, not xml
 2014-07-28 20:33:37 +02:00
Laurent Destailleur
bcd441cc1e Fix: Bad url for cron 
Fix: must use html syntax, not xml
 2014-07-28 20:30:31 +02:00
Laurent Destailleur
3011ecf6df Fix: PHPCS 2014-07-28 19:55:12 +02:00
Laurent Destailleur
b31bf68376 New: Start to work on data check for dictionnary tables. 2014-07-28 00:47:27 +02:00
Laurent Destailleur
0ca72dcfea Fix: Restore compatibility with old modules. 2014-07-27 23:53:46 +02:00
Laurent Destailleur
25d18f225f Fix: Restore compatibility with old modules. 2014-07-27 23:51:58 +02:00
Laurent Destailleur
bf9313dd87 getBrowserInfo can return type of layout (classic/phone/tablet) 2014-07-27 20:56:26 +02:00
Laurent Destailleur
709bf20deb Work on prootype for using datatable. 2014-07-27 20:31:11 +02:00
Laurent Destailleur
b964f9e9e3 New: Add info page about browser. 
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
 2014-07-27 14:13:25 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Marcos García de La Fuente
37c7d05a9e Added missing return null for getStaticMember 2014-07-22 04:46:17 +02:00
Marcos García de La Fuente
1a254b310e Merge remote-tracking branch 'upstream/develop' into optimization 
Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-22 04:42:50 +02:00
Marcos García de La Fuente
203dc5518a Merge branch 'develop' into optimization 2014-07-22 04:39:31 +02:00
Marcos García de La Fuente
31adeb7477 Deprecated getStaticMember 2014-07-22 04:12:45 +02:00
Marcos García de La Fuente
9b3e65d80f Removed PHP 5.3 comparison in dol_nl2br function 2014-07-22 04:07:33 +02:00
Laurent Destailleur
bd095f597d Fix: CheckStyle 2014-07-20 14:54:30 +02:00
Laurent Destailleur
f6b8017386 Fix: PHPCS 2014-07-20 05:14:22 +02:00
Laurent Destailleur
ffe7b531a6 Merge pull request #1746 from marcosgdf/patch-1 
Removed @ operator from dol_include_once
 2014-07-20 04:43:38 +02:00
Laurent Destailleur
d87e146e47 Fix: Navigation into agenda tabs 2014-07-19 22:37:18 +02:00
Marcos García de La Fuente
55bfc98d48 Corrected dol_microtime_float refactor 2014-07-18 12:00:01 +02:00
Marcos García de La Fuente
2c7b2cf227 Copyright 2014-07-18 11:57:49 +02:00
Marcos García de La Fuente
997a7ff843 Deprecated function dol_json_decode and replaced with native behaviour 2014-07-18 11:57:21 +02:00
Marcos García de La Fuente
214fe2d552 Optimized isValidEmail function and load json.lib.php always as it contains common Dolibarr functions 2014-07-18 11:18:25 +02:00
Marcos García de La Fuente
2142ab997d Removed Dolibarr implementation of json_encode and json_decode, and deprecated dol_json_encode 2014-07-18 11:17:32 +02:00
Marcos García de La Fuente
bcafa2c790 Corrected file_exists check and little refactor 2014-07-17 21:44:59 +02:00
Marcos García de La Fuente
37d4d303b3 Updated is_ip comment and added a test for is_ip function 2014-07-17 21:19:03 +02:00
Marcos García de La Fuente
cdc40ca76f Optimized is_ip dolibarr function 2014-07-17 21:12:50 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other 
main page).
- New: Can search on project ref or string from project main page (like
other main page).
 2014-07-17 01:28:01 +02:00
Marcos García de La Fuente
8a17feb69b Deprecated some functions and improved method documentation 2014-07-15 17:35:12 +02:00
Marcos García de La Fuente
ad4512cb24 Avoiding include in case of unexisting file 2014-07-15 17:18:41 +02:00
Marcos García
8eced58ba0 Removed @ operator from dol_include_once 
Adding @ operator to include_once makes include errors untraceable, it shouldn't be there. Errors must be thrown so that we notice them. It is PHP configuration's choice to decide wether to log them or print them.
 2014-07-14 19:16:28 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
fmarcet
ab57c236be New: Can have half day holiday 
New: Add Spanish holidays
Fix: Holiday log shows nothing
 2014-07-10 12:06:09 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
aspangaro
9eaeaae2fb Merge branch 'Upstream/develop' 2014-07-05 08:48:51 +02:00
aspangaro
be78e96313 Bug fix & add tab info 2014-07-05 08:47:01 +02:00
Laurent Destailleur
8e2999f73f Fix: phpcs 2014-07-04 14:19:03 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
aspangaro
a2ac578712 Merge branch 'Upstream/develop' 2014-07-04 06:21:00 +02:00
Juanjo Menent
24b2b83b85 use count() instead sizeof() 2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with company 2014-07-03 17:39:31 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
31c27b8f7c New: More option to define default filter setting of agenda views. 2014-06-29 23:35:00 +02:00
aspangaro
46320071a0 Merge branch 'Upstream/develop' 2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d Update 2014-06-29 05:41:24 +02:00
Laurent Destailleur
6f0250cb94 Fix: typo 2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9 New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5 New: Can filter events on a group of users. 2014-06-28 20:49:10 +02:00
Laurent Destailleur
a8e4391887 Prepare calendars to be able to show calendars with selection on several 
users.
 2014-06-28 18:04:32 +02:00
Maxime Kohlhaas
d61e5bae93 Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related 2014-06-28 17:01:52 +02:00
Laurent Destailleur
e5a06635dc Fix css for agenda box 
Make different view of agenda into different tabs.
 2014-06-27 20:50:46 +02:00
Laurent Destailleur
2deadea40a New: Filter on event status 2014-06-26 20:24:00 +02:00
Laurent Destailleur
0778d38b2c Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:08:32 +02:00
Laurent Destailleur
62b0d8a472 Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:03:01 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
Laurent Destailleur
a2724822d7 Fix: Add hidden option to partially fix a bug. A more complete fix 
should be done later.
 2014-06-20 16:01:08 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
e2afa6853b Fix: Deletion of translation has disappeared. 2014-06-20 15:05:39 +02:00
Laurent Destailleur
6740e0321a Merge pull request #1670 from FHenry/3.5 
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
 2014-06-20 13:16:11 +02:00
Laurent Destailleur
3791175536 Fix: doxygen 2014-06-20 13:07:15 +02:00
Laurent Destailleur
221d7b56aa Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:52:08 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236 Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
 2014-06-20 12:41:23 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Florian HENRY
f796a6408e Do not display dictionnay for non activated module 2014-06-12 15:28:11 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Laurent Destailleur
9ba4b53a88 Merge pull request #1645 from FHenry/3.5 
Start fix [ bug #1437 ] Securitu Issue
 2014-06-09 15:10:55 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue 
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
 2014-06-09 12:34:10 +02:00
Laurent Destailleur
768163c6fc Fix: Easy fix to solve pb with pagebreak when adding image 2014-06-06 12:57:12 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Laurent Destailleur
905f700136 Fix: Pb with pagebreak when adding image 2014-06-06 11:57:45 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Laurent Destailleur
1557d8973f Fix: [ bug #1403 ] suppression d'une fiche produit impossible 2014-05-26 23:12:47 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
ae01c785c5 Fix: Do not show ref supplier title if ref_supplier not set (currently 
always the case with 3.5).
 2014-05-25 03:57:13 +02:00
Laurent Destailleur
9bc1a6b4f5 Fix: favicon must use dol_buildpath and not hardcoded path 
Conflicts:
	htdocs/core/lib/security2.lib.php
 2014-05-24 18:29:22 +02:00
Laurent Destailleur
44ebaf45cf Fix: favicon must use dol_buildpath and not hardcoded path 2014-05-24 18:21:05 +02:00
Laurent Destailleur
872e764c94 Fix: html detection was not working with hx tags. 2014-05-24 14:57:41 +02:00
Laurent Destailleur
43bf9ba890 Fix: Import of ical files was broken 
Fix: Can import of ical files from BlueMind.
 2014-05-23 04:28:57 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Raphaël Doursenaud
00162cc93d Members: fixed typo 2014-05-19 14:38:26 +02:00
Laurent Destailleur
15796ec592 Fix: checkstyle errors 2014-05-14 12:19:45 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no 
more by default (we keep data intact when no mode provided).
 2014-05-13 13:22:29 +02:00
Florian HENRY
b6f091926f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-13 11:40:39 +02:00
Florian HENRY
d2e2dabf26 Add showempty into combobox 2014-05-13 11:40:19 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Jean-François Ferry
b3f7e9f99b Fix : bad usage of this 2014-05-10 22:07:54 +02:00
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
fdb50ab116 Move generic function from commonobject.class to functions2.lib.php (work on resource module) 2014-05-10 22:06:22 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Laurent Destailleur
1724fd2f89 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-10 16:44:12 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Florian HENRY
2aa2f896c6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-09 13:28:45 +02:00
Florian HENRY
02e0fac79f "or" into if instead of || 2014-05-09 13:28:29 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
4bf86508a5 Merge pull request #1583 from FHenry/3.5 
Fix error return project deletion
 2014-05-07 19:25:02 +02:00
Laurent Destailleur
16b3ec8923 Fix: concat of string must use dol_concat. 2014-05-07 19:06:47 +02:00
Laurent Destailleur
1bc3558307 Fix: Better html detection 2014-05-07 19:06:15 +02:00
Florian HENRY
0e2497e710 [ bug #1377 ] Warning: get_class() called without object from outside a 
class
 2014-05-07 18:19:46 +02:00
Florian HENRY
395e09d64d fix warning message into function2.lib.php 2014-05-07 17:25:50 +02:00
Laurent Destailleur
845f764f93 Increase default size of image 2014-05-07 12:21:14 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79 Fix: [ bug #1360 ] note indicator for member tab. 2014-05-06 23:42:19 +02:00
Laurent Destailleur
959b104b78 Fix: the pdf template name for typhon as not correctly set when enabling 
module.
 2014-05-06 13:31:30 +02:00
Laurent Destailleur
c4291c228e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-06 13:16:06 +02:00
Laurent Destailleur
948e0bf753 Fix: When on delivery receipt, ref of shipment was not visible. Also 
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.
 2014-05-06 13:15:37 +02:00
philippe
a04cd99090 fix : no room when number of pages sup than 9 2014-05-05 19:03:25 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51 New: The combo list of juridical status is now sorted 2014-05-04 23:46:36 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Laurent Destailleur
7bb23086b8 Fix: Strict mode 2014-05-01 17:06:14 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
4a23a8a789 Merge branch 'category_translate' of github.com:aternatik/dolibarr into 
aternatik-category_translate

Conflicts:
	ChangeLog
 2014-04-28 02:39:56 +02:00
Laurent Destailleur
e5c5b15ecc Qual: Start to clean module ECM (Code is to complex). Prepare for 
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
 2014-04-28 01:46:11 +02:00
Laurent Destailleur
8beaf30e88 Qual: Removed useless use of js 2014-04-27 01:51:31 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
4fa472518e Fix: doxygen 2014-04-26 22:23:46 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00
jfefe
d256799abf Work on adding catgory translation 2014-04-25 15:17:12 +02:00
Raphaël Doursenaud
6788c5b7f8 Qual: Wrong type in method documentation 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
f1f550e551 Qual: Removed missing variable from function call 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
ca8cf9101c Qual: Removed missing variable from function call 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
7a6b3a0827 Qual: Missing variable declaration 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
036cc7472f Qual: Removed missing variable from function call 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
1c7011523d Qual: Missing global declaration 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
6fc9fbd7a6 Qual: Derived missing variable from a known one 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
202344e8fb Qual: Wrong type in method documentation 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
234a2a0e27 Qual: Removed call to inexistant object 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
82973eb0b7 Qual: Removed missing variable from function call 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
eca27d6711 Qual: Wrong type in method documentation 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
85d1770646 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
652cb77e40 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
229bc890d4 Qual: Moved variable declaration for later usage 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
3830329499 Qual: Removed missing variable 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
996704d258 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
75eb98033f Qual: Fixed typo 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
aad4359786 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
db91684193 Qual: Wrong type in method documentation 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
83dd3a532b Qual: Better type check 2014-04-23 18:23:50 +02:00
Laurent Destailleur
38a0596594 Merge branch 'develop' of https://github.com/aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/core/lib/bank.lib.php
 2014-04-13 02:11:54 +02:00
Laurent Destailleur
5d30220bf1 Merge pull request #1530 from squarou/develop 
Add region tab for stats in adhrent
 2014-04-13 02:04:02 +02:00
Laurent Destailleur
31fa6c5b2b Merge branch 'develop' of https://github.com/guerrierk/dolibarr into 
guerrierk-develop

Conflicts:
	htdocs/commande/fiche.php
 2014-04-13 01:59:46 +02:00
aspangaro
79d8ce9d1d Add tabs in bank card 2014-04-12 10:00:28 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
squarou
a0b05581f9 Added region tab 2014-04-10 22:15:56 +02:00
GUERRIER Kevin
3d725f37cb Adding Bank head completion from other modules 2014-04-10 15:23:58 +02:00
Laurent Destailleur
30dae3def2 Doc 2014-04-08 23:28:26 +02:00
Grand Philippe
42b6628b76 translation and cleaning 2014-04-07 09:54:24 +02:00
Laurent Destailleur
1c21c00fb6 New: Can use "Space" as value for SeparatorThousand into language files 2014-04-06 21:18:21 +02:00
Laurent Destailleur
d595b96c8e New: Paypal return for subscription show more information and direct 
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
 2014-04-06 14:22:08 +02:00
Laurent Destailleur
cf8ff97855 Fix: Install of odt templates for project and tasks failed. 2014-04-02 13:17:20 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
 2014-04-02 11:41:55 +02:00
Laurent Destailleur
46e46507ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/compta/bank/class/account.class.php
	htdocs/compta/bank/index.php
 2014-04-02 11:33:47 +02:00
Laurent Destailleur
6dab09e07a Fix: Bad dialog position 2014-04-02 00:04:13 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
61f649e1ae Fix: When select_date is called with '' as preselected date, 
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
 2014-03-29 04:26:44 +01:00
Laurent Destailleur
c2b7e40aa1 Merge pull request #1507 from GPCsolutions/3.5-taskswithtime 
Project: make tasks accept a time
 2014-03-27 15:56:26 +01:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
Laurent Destailleur
62a990d6cc Fix: ajax_combobox function must be included before called. 
New: Feature of module survey are now localized into top menu "Tools".
 2014-03-26 16:02:22 +01:00
Raphaël Doursenaud
d9cb1da4d5 Project: make tasks accept a time 2014-03-24 15:26:36 +01:00
Laurent Destailleur
f115501ddf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-24 00:16:47 +01:00
Laurent Destailleur
3f78fe8c93 Fix: Avoid to get duplicate field 2014-03-23 21:01:05 +01:00
Laurent Destailleur
6039c81845 Fix: copy to clipboard does not work with jmobile 
Fix: Bad translation
 2014-03-23 20:56:41 +01:00
Marcos García de La Fuente
09e02f807f Even better improvement 2014-03-22 19:01:19 +01:00
Marcos García de La Fuente
e2f51d0df2 Removed duplicate line 2014-03-22 19:00:37 +01:00
Marcos García de La Fuente
c8c77dbdcf Fix: Agenda and Banks module were not working with multicompany module 2014-03-22 18:59:48 +01:00
Laurent Destailleur
ed7ffebea4 Code comment 2014-03-21 18:32:18 +01:00
Laurent Destailleur
24dbfbba60 Qual: Still working on cleaning code for timezone management. 2014-03-21 18:05:08 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases. 
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
 2014-03-21 16:22:41 +01:00
Laurent Destailleur
b2f6498236 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-21 15:03:37 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Laurent Destailleur
c1411e65b7 Fix: Try to add code to provide easy way to fix warning on timezone not 
defined.
 2014-03-21 10:13:29 +01:00
Laurent Destailleur
aabd923248 Try to remove warning 2014-03-21 09:49:10 +01:00
Laurent Destailleur
4bf822225e Look: info admin picto now use the info picto (the star were confused 
with the mandatory "star").
 2014-03-19 23:50:10 +01:00
Laurent Destailleur
7eea96c07c Minor fix into standing order. 2014-03-17 20:43:01 +01:00
Laurent Destailleur
8cf3d258f4 Fix: Bug into calculation of total of time for tasks 2014-03-17 15:13:24 +01:00