ATM John BOTELLA
f714b45efb
FIX scrutinizer feedback
2019-05-18 15:53:07 +02:00
Laurent Destailleur
2d0b3b7b23
Fix dol_sort_array for objects
2019-05-16 12:25:14 +02:00
Laurent Destailleur
4a69541419
Several bug fixes using phpstan
2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213
Fix doc
2019-05-15 17:50:35 +02:00
ptibogxiv
f50280f13b
Fix img_credit_card with payment methods
2019-05-10 01:16:58 +02:00
Laurent Destailleur
8442c86436
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9
FIX Default value on form to send email
2019-05-02 15:34:29 +02:00
Laurent Destailleur
90a1181dc5
Debug module Ticket
2019-05-01 20:41:03 +02:00
Laurent Destailleur
a75c6a81d1
FIX Follow rule to create a new page
2019-05-01 17:15:42 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
f19d96bf8d
NEW Show enabled modules in dol_print_error
2019-04-23 10:24:05 +02:00
ATM john
945e3db952
remove text
2019-04-16 22:03:11 +02:00
ATM john
965c973bda
Change class name
2019-04-16 22:02:23 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
John BOTELLA
a60d4b3b52
Appli btn apply to links
2019-04-16 09:09:25 +02:00
ATM john
07e6ce5460
Appli function to links
2019-04-15 21:33:31 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
Laurent Destailleur
cfa414b2de
Better log
2019-04-10 16:42:45 +02:00
Laurent Destailleur
917b9d69fa
Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
...
not recommanded to use in Dolibarr.
2019-04-08 14:55:31 +02:00
Laurent Destailleur
fad2fa48dd
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
2019-04-07 15:44:17 +02:00
Laurent Destailleur
54714bc755
Deprecated property ->fk_departement is now ->state_id everywhere.
2019-04-05 20:06:13 +02:00
Laurent Destailleur
1f00e24abc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-03 18:52:47 +02:00
Laurent Destailleur
9e5d87e821
Fix warning
2019-04-03 18:39:27 +02:00
Laurent Destailleur
82c19a6372
FIX Avoid error 500 when extension php-intl not loaded
2019-04-03 18:38:27 +02:00
Laurent Destailleur
c5f5abc67d
Fix css for MD theme
2019-04-03 14:37:38 +02:00
Laurent Destailleur
8a6e28860b
A better transition with deprecation
2019-04-01 22:09:24 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
fc983fa65c
Move a function into functions2.lib.php
2019-04-01 18:46:13 +02:00
Laurent Destailleur
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
...
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
039e6034d1
Merge pull request #10936 from aspangaro/10.0_WARNING
...
LOG_WARNING on function dol_print_date with deprecated value
2019-03-31 18:45:01 +02:00
Laurent Destailleur
fca404e8d5
Show price without tax to prepare tax per customer country.
2019-03-30 19:30:58 +01:00
Alexandre SPANGARO
8163739a68
LOG_WARNING on function dol_print_date with deprecated value
2019-03-28 12:03:04 +01:00
ptibogxiv
2c71b98d0d
NEW automatic / manual selector form
2019-03-27 11:05:43 +01:00
Laurent Destailleur
513ef1e727
Fix label short
2019-03-25 16:16:08 +01:00
Laurent Destailleur
a950d8389e
WIP Attach document to expense report lines
2019-03-24 20:22:05 +01:00
Laurent Destailleur
152c27139f
Doc
2019-03-24 14:54:04 +01:00
Laurent Destailleur
614b4afeb0
NEW The preview of PDF files generates 1 png file even if several pages.
2019-03-24 14:53:26 +01:00
Laurent Destailleur
949ef79227
Better error message
2019-03-24 14:26:16 +01:00
Laurent Destailleur
fad6efd86c
WIP file attachment on expense report lines
2019-03-24 13:27:26 +01:00
Laurent Destailleur
df9e121ac6
Enhance the module debugbar. Do not scan the log anymore.
2019-03-23 14:37:54 +01:00
Laurent Destailleur
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
70c2ffc816
FIX toggle of login_block was ko with eldy theme
2019-03-19 14:22:57 +01:00
Laurent Destailleur
5f9fa817fb
Fix bad log
2019-03-16 23:41:06 +01:00
Laurent Destailleur
e5567c7ee4
Fix typo
2019-03-16 14:48:41 +01:00
Laurent Destailleur
40c2ca4310
Fix label of status of third party record when using smartphone
2019-03-15 23:08:00 +01:00
Laurent Destailleur
7a5a561170
Fix label of status of invoice record when using smartphone
2019-03-15 23:00:50 +01:00
Laurent Destailleur
91f80934f3
Fix: On smartphone, hide label of status only on lists.
2019-03-15 20:39:55 +01:00
Laurent Destailleur
b6cacf3a20
Fix label of status for members on smartphone
2019-03-15 20:18:35 +01:00
Laurent Destailleur
d512e54407
Restore toggle of login_block because it was no more visible
2019-03-15 20:10:39 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
...
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
6f0fbc42c1
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
...
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
2019-03-15 15:13:28 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
f8a4d9075b
Fix css for fontawesome 5
2019-03-14 11:48:25 +01:00
Laurent Destailleur
fcbd39fda9
Fix typo
2019-03-13 19:07:19 +01:00
Laurent Destailleur
e7cd8d690c
Remove warnings
2019-03-13 19:06:45 +01:00
Laurent Destailleur
1bd9d6a8e5
Fix font awesome 5 picto for notes
2019-03-13 15:02:43 +01:00
Laurent Destailleur
7d82073eab
Use fontawesome for icon "setup".
2019-03-12 11:57:55 +01:00
Laurent Destailleur
d762766a56
Font awesome 5 by default
2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle
2019-03-12 09:24:42 +01:00
Laurent Destailleur
abdc2aa21a
Fix phpcs
2019-03-11 21:03:23 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
John BOTELLA
5d7118340b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-11 14:40:19 +01:00
Laurent Destailleur
fac329e637
Clean code
2019-03-11 01:01:15 +01:00
John BOTELLA
ccebb8d1a7
Fix travis errors
2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564
Add user friendly behavior
2019-03-08 14:26:06 +01:00
John BOTELLA
218690db00
add css behavior
2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092
fix travis
2019-03-07 15:49:16 +01:00
John BOTELLA
e382f13637
remove test
2019-03-05 17:16:38 +01:00
John BOTELLA
ef9ad4d109
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-05 17:14:59 +01:00
John BOTELLA
600f0c9fa6
Fix condition
2019-03-05 17:14:29 +01:00
John BOTELLA
72d96d2ac3
prepare badges
2019-03-05 17:13:20 +01:00
John BOTELLA
6b98eecd32
fix compatibility status
2019-03-05 16:58:05 +01:00
John BOTELLA
95981ca14c
PR feedback
2019-03-05 15:26:19 +01:00
John BOTELLA
7cadaca8fc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-04 11:37:16 +01:00
John BOTELLA
c420cab500
fix travis errors
2019-03-04 11:11:15 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
03237d1730
NEW Look and feel v10 - Add CSS tabBarNoTop
2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a
Replace arrow picto with fontawesome
2019-03-02 14:07:13 +01:00
John BOTELLA
421c009e58
Standardise new function name
2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-01 13:49:42 +01:00
John BOTELLA
b222c44bb9
Add helper functions and little review size of badges
2019-03-01 12:01:25 +01:00
Laurent Destailleur
429da47d68
Fix default language of reminders
2019-02-28 13:11:14 +01:00
Laurent Destailleur
29cfa03fa4
Fix font awesome 5 regressions
2019-02-27 13:54:39 +01:00
John BOTELLA
9f0a93f68f
Add color lib for color automation
2019-02-26 17:44:16 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Laurent Destailleur
a3a89b755f
NEW Gain space by moving the meteo on title line
2019-02-20 06:01:13 +01:00
Laurent Destailleur
abfd610bbc
Fix quote not closed
2019-02-20 03:44:08 +01:00
Laurent Destailleur
e644de4a70
Fix for font awesome 5
2019-02-15 15:30:21 +01:00
Laurent Destailleur
c480f4be68
FIX Bad remote ip address when user is using a proxy
2019-02-15 15:17:24 +01:00
Alexandre SPANGARO
b99149b940
Move error on function dol_include_once() to LOG_WARNING
2019-02-12 16:34:52 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
ATM-Nicolas
4e35ebe52a
FIX : Default sign out icon if not using Font Awesome 5
2019-02-12 10:43:00 +01:00
Laurent Destailleur
27cad29e1e
Fix regression of right alignement
2019-02-11 15:06:52 +01:00
Laurent Destailleur
0bd30b160a
Fix picto logout with fontawesome 5
2019-02-11 11:55:48 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
522afd8e7b
Fix font awesome 5
2019-02-09 13:11:02 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Regis Houssin
8860eab6b1
FIX wrong merged conflict
2019-02-05 07:40:50 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Pierre Ardoin
b6df02e795
Correction oubli date de livraison
...
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
2019-01-29 11:47:39 +01:00
Laurent Destailleur
08a181bfbf
Fix substitution of REF_CLIENT and REF_SUPPLIER
2019-01-29 11:00:17 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Pierre Ardoin
6fdbded588
Update functions.lib.php
2019-01-26 14:40:00 +01:00
Pierre Ardoin
78f8607d41
Add date_livraison substitution
...
Complete the substitution for supplier orders.
2019-01-25 13:15:24 +01:00
Laurent Destailleur
e860d664d7
Fix substitution of __REF_CLIENT__
2019-01-23 11:54:20 +01:00
Laurent Destailleur
8104b7fa2d
look and feel v10
2019-01-22 15:40:51 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc
2019-01-21 18:04:48 +01:00
torvista
9b1cf648dc
more validation fixes
2019-01-21 16:19:31 +01:00
torvista
07b2bb6715
Swap of align/valign/border/width for css
...
Removal of type="text/javascript"
2019-01-20 23:36:39 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
4ffd7de9f7
doc
2019-01-19 16:15:05 +01:00
Laurent Destailleur
f311deb405
Fix hash for gol_getprefix must not contains special char.
2019-01-19 16:14:45 +01:00
Laurent Destailleur
a72d92006b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 13:57:33 +01:00
Laurent Destailleur
638be67f96
Fix tooltip
2019-01-16 13:56:13 +01:00
Laurent Destailleur
1f87b8bb18
FIX Position of price symbol (before) for nl_NL
2019-01-16 01:54:08 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1306918eb0
FIX #10299
2019-01-07 16:03:55 +01:00
ldestailleur
5638ac8f4d
FIX title on picto no more visible
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-01-04 15:25:14 +01:00
ldestailleur
b4fc4b0178
FIX title on picto no more visible
2019-01-04 15:22:59 +01:00
ldestailleur
ab9fe1a757
Add option to use fontawesome 5 with fontawesome 4
2019-01-03 21:14:59 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
Laurent Destailleur
294107bba0
FIX vars for substitution must be null if not applicable (and not '')
2018-12-27 05:07:11 +01:00
Laurent Destailleur
6a708666b2
FIX vars for substitution must be null if not applicable (and not '')
2018-12-27 05:06:37 +01:00
Regis Houssin
4ee09c9d5b
FIX remove old unused and deprecated function
2018-12-25 07:58:32 +01:00
Laurent Destailleur
35debd06fb
List of events show user firstname by default
2018-12-23 01:28:36 +01:00
Laurent Destailleur
623afd1020
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
17b2fd295f
FIX Css of amount on remain to pay on expense report
2018-12-17 13:57:30 +01:00
Laurent Destailleur
527ad04ae8
FIX Mandatory field feature should works on textarea
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52
FIX Mandatory field feature should works on textarea
2018-12-15 18:11:40 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
539e2c55cd
FIX #9629 #9625
2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91
FIX #9629 #9625
2018-12-14 10:31:09 +01:00
Laurent Destailleur
3213b3be07
Standardize code: Move jabberid into social network module
2018-12-11 09:17:02 +01:00
Laurent Destailleur
138640fc63
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-12-04 14:58:11 +01:00
Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Laurent Destailleur
01181ba3a4
Fix avoid warning
2018-11-28 13:06:39 +01:00
Laurent Destailleur
b9e544d291
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/resource/list.php
2018-11-26 23:08:06 +01:00
Laurent Destailleur
13e24dc894
Code comment
2018-11-23 15:35:40 +01:00
Laurent Destailleur
5bd9c14929
Update demo data for 8.0 and 9.0
2018-11-23 14:05:45 +01:00
Laurent Destailleur
1d4c756783
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-22 11:44:37 +01:00
Laurent Destailleur
5e9abe6aad
Fix getLanguageCodeFromCountryCode
2018-11-21 16:28:36 +01:00
Laurent Destailleur
b6dac7da20
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-21 15:40:15 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Laurent Destailleur
1ecdaa548c
Remove the no more used and deprecated dol_print_graph function
2018-11-20 20:28:46 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +01:00
Regis Houssin
2350908d4e
FIX change getEntity doc and changelog
2018-11-15 19:00:14 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
Laurent Destailleur
77582b2a41
FIX the autofocus feature
2018-11-13 11:36:57 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
9a0b5fb599
Fix extrafields
2018-11-07 12:25:22 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518
Debug modulebuilder
2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
d65bf1fbc7
Fix emailcollector
2018-11-05 15:31:41 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27
...
make play and playdisable equals
2018-10-30 14:49:54 +01:00
Laurent Destailleur
4a71374cf7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
7a268d8d9f
Clean code
2018-10-30 14:27:14 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email
...
FIX the member e-mail on resign and validation.
2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php
2018-10-30 12:41:06 +01:00
Frédéric FRANCE
450a837393
make play and playdisable equals
2018-10-29 18:50:15 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Regis Houssin
866a7df510
FIX $forceentity is not used, replace by $currentobject if needed
2018-10-26 18:23:48 +02:00
De Coninck Laurent
d347cf3a85
set a message
2018-10-26 16:18:27 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
d28c9ddea5
Merge pull request #9872 from laudeco/feature/improvement_module_picto
...
improve img_picto by returning ASAP
2018-10-26 15:20:40 +02:00
De Coninck Laurent
70cd68ebef
improve img_picto by returning ASAP
...
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
2018-10-25 18:21:00 +02:00
atm-ph
f41e7e05e1
Fix PHP warnings printed in javascript
2018-10-25 12:01:17 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
Frédéric FRANCE
70a98743e8
Update functions.lib.php
2018-10-14 10:48:06 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Laurent Destailleur
8f4b74733c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
2539f0047f
FIX Sending of reminder for expired subscriptions
2018-10-09 23:10:39 +02:00
Laurent Destailleur
01c32525df
Merge
2018-10-09 17:06:08 +02:00
Laurent Destailleur
5437c2ae85
Fix popup on img_picto
2018-10-05 14:32:19 +02:00
Laurent Destailleur
4e84ed0e80
FIX Symbol of currency in substitution variables
2018-10-05 13:59:46 +02:00
Laurent Destailleur
d1ad5dd4f1
FIX Symbol of currency in substitution variables
2018-10-05 13:58:38 +02:00
atm-ph
2acd69033c
Fix minor error in dom
2018-10-03 22:48:29 +02:00
Laurent Destailleur
5f897eb7ee
Clean code
2018-10-01 00:40:02 +02:00
Laurent Destailleur
adc36e7d63
Clean code
2018-10-01 00:20:47 +02:00
Laurent Destailleur
851fd4cc18
NEW Can set the default focus of each page.
...
NEW Can set if a field is mandatory on form level.
2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830
Work on mandatory form fields
2018-09-27 16:38:18 +02:00
Laurent Destailleur
7e58662c6f
Merge branch 'develop' into patch-9
2018-09-27 09:18:42 +02:00
Laurent Destailleur
ba3ca550ce
Fix date in text for substitution. Removed not used translation keys.
2018-09-25 11:36:40 +02:00
Frédéric FRANCE
86072ad1d7
remove superfluous space
2018-09-24 10:43:57 +02:00
Laurent Destailleur
ad6895aa2e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:18:13 +02:00
Laurent Destailleur
1569770855
Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC
2018-09-23 15:41:22 +02:00
gauthier
7b46bedce6
NEW : hidden configuration
2018-09-21 14:35:36 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
df395847d3
FIX #9567
2018-09-20 19:14:32 +02:00
Laurent Destailleur
12b449fe49
It's easier to select fields to show on list
2018-09-19 16:41:33 +02:00
Laurent Destailleur
4580ed0b09
Fix bad link
2018-09-18 15:31:25 +02:00
Philippe GRAND
18f4755a90
Standardize and update code
2018-09-14 10:20:21 +02:00
gauthier
b68523b9c1
FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product
2018-09-13 14:37:12 +02:00
Laurent Destailleur
b4264ee0a0
Use font awesome for sort image
2018-09-12 21:57:32 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Laurent Destailleur
53da80a79f
FIX Missing translation in predefined email to membership renewal
2018-09-12 12:55:10 +02:00
Laurent Destailleur
887a40cf1d
Remove TODO
2018-09-02 16:46:01 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
dee9442720
Fix regression
2018-09-01 13:12:09 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing
2018-08-31 21:39:23 +02:00
Laurent Destailleur
b08971b03b
FIX vat rate code not return by get_product_vat_for_country
2018-08-31 14:52:34 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
6abd5d478a
Update functions.lib.php
2018-08-23 17:15:14 +02:00
Laurent Destailleur
f7da76e1c0
Use session cache for stats
2018-08-16 14:24:59 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Laurent Destailleur
6954ab00f9
Update functions.lib.php
2018-08-12 18:11:27 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3
2018-08-09 14:46:00 +02:00
ATM-Nicolas
70adfb135d
FIX : Missing behavior
2018-08-03 09:51:29 +02:00
ATM-Nicolas
b9a44fc76b
FIX : Wrong position of firstname lastname
2018-07-31 12:15:18 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Frédéric FRANCE
d582f72bd9
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
2018-07-22 17:27:02 +02:00
Laurent Destailleur
c4e207e8b7
Fix dol_string_onlythesehtmltags
2018-07-22 15:51:19 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
efa5cdeab1
More complete list of allowed html tags
2018-07-19 15:24:48 +02:00
Laurent Destailleur
26507ee712
Code comment
2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:48:08 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
d3cc2c81eb
Better detail for time elapsed
2018-07-16 11:14:39 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes
...
fix sql error functions.lib.php
2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php
2018-07-15 20:00:43 +02:00
ias-ceo
076bf0a3a7
fix sql error
2018-07-12 05:09:36 +03:00
Laurent Destailleur
4c65f4d498
Log
2018-07-11 09:38:40 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-07-10 13:57:24 +02:00
Laurent Destailleur
aeb5f5e4f3
Fix phpcs
2018-07-10 13:56:03 +02:00
Laurent Destailleur
a55abb4da7
Fix version
2018-07-10 13:54:20 +02:00
Laurent Destailleur
8e0a663b7c
Code comment
2018-07-10 10:53:59 +02:00
Laurent Destailleur
e427496ddf
FIX Injection
2018-07-09 14:13:01 +02:00
Laurent Destailleur
91b7ee5fc2
NEW Add function isValidMXRecord
2018-07-04 11:07:28 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
06342ff80c
FIX contextpage on contact list
2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f
Fix the "back to list" link also restore the contextpage
2018-06-23 11:55:04 +02:00
Laurent Destailleur
533c19cc2c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/lib/functions.lib.php
2018-06-22 15:29:26 +02:00
Regis Houssin
8fc2f7441c
Fix: to avoid deleting line breaks
2018-06-20 09:06:16 +02:00
Laurent Destailleur
63fb82931c
Update functions.lib.php
2018-06-18 10:41:11 +02:00
Laurent Destailleur
186f08e67b
Fix preview of PDF for supplier objects
2018-06-16 15:08:13 +02:00
altatof
5d6cd381b9
Fix <br/> detection
2018-06-15 15:59:14 +02:00
Laurent Destailleur
1d7d16649a
Code comment
2018-06-11 12:31:26 +02:00
Laurent Destailleur
d10c9cf565
FIX dir for modules must not have s at end (fix contracts into contract)
2018-06-06 23:47:48 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
Laurent Destailleur
02da9b6992
FIX #8893 to get formatted price as substitution vars
2018-05-30 11:04:44 +02:00
Laurent Destailleur
1b20ec05d1
Save translation
2018-05-21 19:37:47 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
08cf034e2f
FIX to allow IRPF not null even if main VAT is null.
...
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
2018-05-03 13:39:44 +02:00
Laurent Destailleur
dc9892f803
Fix bad log
2018-05-01 20:17:03 +02:00
Laurent Destailleur
e72c2e6a11
Enhance sorting of field for lists on field with several sort criterias
2018-04-28 19:54:41 +02:00
Laurent Destailleur
69db960a92
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/activity/perweek.php
2018-04-26 18:33:02 +02:00
Laurent Destailleur
39aef07c6b
FIX Only voters can send comments in public survey page
2018-04-25 17:14:18 +02:00
Laurent Destailleur
83b762b681
FIX CVE-2018-9019
2018-04-25 16:01:06 +02:00
Laurent Destailleur
75a4891113
Add az09comma to sanitize sortfield/sortorder
2018-04-25 15:47:42 +02:00
Laurent Destailleur
d0efc41983
New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-04-20 14:50:11 +02:00
Laurent Destailleur
fc167612c2
NEW class reposition can also work on POST (not only GET)
2018-04-19 13:59:20 +02:00
Laurent Destailleur
4472234637
Can set email in dol_print_error_email
2018-04-19 12:12:54 +02:00
Laurent Destailleur
d8e05c90f7
Can set email in dol_print_error_email
2018-04-19 12:12:19 +02:00
Laurent Destailleur
a0f8aa50d5
CSS
2018-04-18 00:00:37 +02:00
Laurent Destailleur
7b53ec5198
FIX timestamp must be an int not a float
2018-04-17 12:41:13 +02:00
Laurent Destailleur
c3970f1a52
Code comment
2018-04-17 09:44:57 +02:00
Laurent Destailleur
1e0a660d24
More font awesome picto instead of img
2018-04-16 19:57:46 +02:00
Laurent Destailleur
f19abe38d7
FIX pdf thumb for expense report
2018-04-16 18:17:35 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
6450f95c90
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 19:13:38 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Laurent Destailleur
57c03553dd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-15 12:09:07 +02:00
Laurent Destailleur
37e4da30d0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-15 11:33:27 +02:00
Laurent Destailleur
ffffd848a9
Look and feel v8
2018-04-14 22:34:46 +02:00
Juanjo Menent
bfed1b9db1
FIX: some localtaxes errors
2018-04-14 12:45:40 +02:00
Laurent Destailleur
ecfabc6633
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-13 23:18:39 +02:00
Laurent Destailleur
a0e243a29b
Clean code
2018-04-13 23:11:19 +02:00
Laurent Destailleur
93ea46c58c
Merge branch 'develop' into develop-ecmfiles
2018-04-13 23:08:26 +02:00
fappels
e054d1ae8d
Try to fix travis
2018-04-13 16:49:03 +02:00
Laurent Destailleur
4251748aca
Clean code
2018-04-13 16:18:33 +02:00
Laurent Destailleur
fbae4429b7
Clean code for better extrafields management
2018-04-13 12:52:23 +02:00
Laurent Destailleur
3cecfd02c7
NEW Mutualize code for action="update_extras"
...
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
2018-04-12 23:16:23 +02:00
Laurent Destailleur
dd022ee423
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
e543a6bf85
Merge pull request #8549 from atm-greg/fix_multiselect_filter
...
FIX #8480
2018-04-11 17:38:30 +02:00
Laurent Destailleur
1aace69b1a
Update functions.lib.php
2018-04-11 17:37:00 +02:00
Laurent Destailleur
c70e0c1cda
FIX #8475 #8540
2018-04-11 17:14:34 +02:00
atm-greg
8a0baaad17
fix #8480
2018-04-10 16:25:06 +02:00
atm-greg
4f13a4f45b
fix #8521
2018-04-10 14:16:01 +02:00
Laurent Destailleur
65996c47ff
Fix clean email syntax to remove , to avoid error RFC-5321 address
2018-04-10 11:15:21 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
0abcf5694c
Fix message of discount
2018-04-06 20:18:36 +02:00
Laurent Destailleur
1a321e19c8
FIX XSS in company setup page
2018-04-06 19:12:13 +02:00
Laurent Destailleur
956fc2376d
FIX #8483
2018-04-06 12:27:55 +02:00
Regis Houssin
b43aca0f8d
Fix: use dol_string_nohtmltag instead (with strip_tags)
2018-04-06 08:52:02 +02:00
Laurent Destailleur
48ff89c63b
Fix regression
2018-04-05 19:52:54 +02:00
Laurent Destailleur
d55657951d
Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda
...
FIX: img_pictos for remove assigned user in agenda card
2018-04-05 16:42:40 +02:00
Rui Strecht
e8a700caab
Fixed issue with img_picto no showing icon in agenda assigned users
2018-04-03 12:13:40 +01:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Laurent Destailleur
99ada20f6d
Add picto bank
2018-03-29 19:08:51 +02:00
Laurent Destailleur
e28307ede4
Merge pull request #8449 from hregis/develop_dict
...
NEW add "moreHtmlRef" hook
2018-03-27 18:07:57 +02:00
Regis Houssin
2b8fe93fc8
Fix: remove unused global
2018-03-27 17:40:17 +02:00
Regis Houssin
35b6cb750f
Fix: move "moreHtmlRef" hook in "showrefnav" function
2018-03-27 17:36:25 +02:00
Laurent Destailleur
53dde8dc0c
Fix confirmation email for membership payment
2018-03-25 15:00:43 +02:00
Regis Houssin
180f2a0336
Fix: multi_dir compatibility
2018-03-25 12:56:43 +02:00
Regis Houssin
d5ed29c567
NEW add "moreHtmlRef" hook
2018-03-25 12:13:29 +02:00
Laurent Destailleur
224fa1c03e
Fix external links ko when substitution key are inside domain
2018-03-24 12:48:33 +01:00
Laurent Destailleur
ab9edef3c7
Fix external links ko when substitution key are inside domain
2018-03-24 12:46:52 +01:00
Laurent Destailleur
6e32e9961f
Syn transifex
2018-03-23 17:56:35 +01:00
Laurent Destailleur
700c69e127
NEW Can set position of images in module tickets
...
Mutualize code of method show_photo
2018-03-22 11:46:35 +01:00
Laurent Destailleur
35938b1942
NEW Variable __ONLINE_PAYMENT_URL__ available in email templates
2018-03-21 20:06:22 +01:00
Laurent Destailleur
42b0a22df2
Use font-awsome for play icon
2018-03-21 13:16:05 +01:00
Laurent Destailleur
51b6723b08
Dolibarrize module ticket
2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
cb1069cf0b
Use font-awesome for the picto to move/transfer a line
2018-03-17 13:21:27 +01:00
arnaud
32ce42610a
FIX show status on societe banner
2018-03-16 11:18:00 +01:00
Laurent Destailleur
71c51eb789
NEW Add hook printEmail
2018-03-15 22:22:42 +01:00
Laurent Destailleur
7c62f22408
Remove doubtful code
2018-03-15 14:02:32 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
da617f7d32
Can work both with remote and local payment modes
2018-03-13 22:43:50 +01:00
Laurent Destailleur
0d1e26b02c
Fix error management
2018-03-12 13:19:09 +01:00
Laurent Destailleur
5b8006a6bb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Regis Houssin
861a831e24
Fix: debug
2018-03-08 11:53:46 +01:00
Laurent Destailleur
c02e8e9831
Css
2018-03-07 19:13:15 +01:00
Laurent Destailleur
7e6ba51780
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Laurent Destailleur
004839b368
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-07 13:03:40 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
alexis Algoud
cb27eb98e1
FIX natural search double quote
2018-03-07 11:42:47 +01:00
Laurent Destailleur
23a4a60970
Fix status of task
2018-03-06 21:51:43 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
7e48db2869
Clean code
2018-02-26 15:03:09 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
1666f371bf
css
2018-02-26 00:13:16 +01:00
Laurent Destailleur
a5b1f114c2
FIX Generic substitution of constant disabled for sensitive constant
2018-02-24 14:03:32 +01:00
Laurent Destailleur
1ec5a5d0bf
FIX Generic substitution of constant disabled for sensitive constant
2018-02-24 14:02:27 +01:00
Laurent Destailleur
b6737d3607
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-02-23 11:24:45 +01:00
Laurent Destailleur
194f5a2cef
Fix substitution key
2018-02-23 11:03:48 +01:00
Laurent Destailleur
3f9a9f20ce
Fix missing substitution key
2018-02-22 17:06:18 +01:00
Laurent Destailleur
76543023a1
Fix missing substitution key
2018-02-22 17:05:24 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
ab6d0d2530
Fix errors
2018-02-17 01:16:52 +01:00
Laurent Destailleur
03e58f86f3
Merge pull request #8199 from dolibarr95/patch-37
...
Fix : Bad copy/paste in var name
2018-02-15 17:28:46 +01:00
Laurent Destailleur
4f0ba4982b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-15 15:34:35 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
dolibarr95
634f3bc025
Bad copy/paste
2018-02-15 13:38:21 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
dolibarr95
3ffc671052
Add phone format for several countries
2018-02-15 10:47:32 +01:00
Laurent Destailleur
434980bb22
Fix svg image preview ko
2018-02-13 18:15:39 +01:00
Laurent Destailleur
92e67ebb8f
Fix svg image preview ko
2018-02-13 16:33:45 +01:00
Laurent Destailleur
8a32ae6935
Move ajax_autoselect into functions.lib.php
2018-02-13 15:46:39 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
b2536d8ebb
FIX #8110
2018-02-01 15:44:35 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
bbcc1e54d5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-30 18:03:26 +01:00
Laurent Destailleur
f761c9efab
Add param morecss on error message
2018-01-30 18:02:24 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
6fb90682cf
Merge pull request #7931 from grandoc/new_branch_09_12_17
...
enhance image using awesome icon
2018-01-30 00:08:42 +01:00
Laurent Destailleur
bee64962fe
Fix css
2018-01-27 19:40:11 +01:00
Laurent Destailleur
a61b420759
Fix css
2018-01-26 23:29:49 +01:00
Laurent Destailleur
e379b02b81
Merge pull request #8009 from dolibarr95/patch-33
...
NEW add a hook in dol_print_phone
2018-01-26 18:02:27 +01:00
Laurent Destailleur
6cae36cc33
NEW Add key __USER_REMOTE_IP__ into available substitution variables
2018-01-26 17:23:30 +01:00
Laurent Destailleur
c922498e79
Code comment
2018-01-25 20:35:25 +01:00
Laurent Destailleur
7a1a2cf90d
Fix send into ledger for bank line record. Show accounted status.
2018-01-22 04:13:29 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Laurent Destailleur
3987033aab
Fix substitution in public notes of pdf
2018-01-21 20:53:36 +01:00
Laurent Destailleur
cc5dcde9e1
Fix protection to avoid errors
2018-01-14 18:55:55 +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
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
95d2a9f88d
Responsive and css
2018-01-12 01:10:03 +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
436b653fa0
Error report
2018-01-11 00:16:45 +01:00
Laurent Destailleur
167ab17927
Fix substitution of user_signature
2018-01-10 10:31:27 +01:00
Laurent Destailleur
dbf7603118
Debug blockedlog for loi finance 2016
2018-01-05 04:31:48 +01:00
Laurent Destailleur
07d991cc8d
Code comment
2018-01-05 01:27:48 +01:00
Laurent Destailleur
c98b5c7ec7
Fix css background
2018-01-02 17:27:05 +01:00
dolibarr95
3438cfb1e7
Update functions.lib.php
...
syntax error $withpicto
2018-01-02 11:48:41 +01:00
dolibarr95
e794a3b321
Update functions.lib.php
...
add more parameters and add if empty
2018-01-02 11:44:54 +01:00
dolibarr95
ab896dc49d
Update functions.lib.php
2018-01-02 11:39:00 +01:00
dolibarr95
12e414509c
Add a hook in dol_print_phone
...
To allow more controls in this print function as in dol_print_address (there is a hook so we can create links to maps...).
Eg : create a other click to dial functions (different from dolibarr ones with more parameters, because each provider give differents api ) etc
Hope this one will be accepted and usefull for the community.
And happy new year :)
2018-01-02 11:24:28 +01:00
Laurent Destailleur
57272dc5fe
API to get list of available document is ok for invoice
...
order, proposal, shipment
2017-12-22 19:49:31 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
12d91d7444
Fix missing messages in error report.
...
Fix test on non empty array
2017-12-19 18:26:27 +01:00
Laurent Destailleur
feaff433b8
Debug module website
2017-12-19 12:54:10 +01:00
Laurent Destailleur
d4afb8300d
Fix several pb of duplicate functions in some cases
2017-12-19 00:15:22 +01:00
Laurent Destailleur
2204790602
Fix filter on project id when id is list with comma
2017-12-18 19:04:57 +01:00
Laurent Destailleur
54db0d31b4
Fix GETPOST for intcomma
2017-12-18 11:32:24 +01:00
Laurent Destailleur
e774beffc3
Fix the symbol of Yuan must be before amount
2017-12-15 17:17:35 +01:00
Laurent Destailleur
5af153550d
Debug blockedlog:
...
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
2017-12-15 16:56:08 +01:00
Laurent Destailleur
2eea3a1afa
Fix backlink of module setup pages
2017-12-15 10:36:35 +01:00
Laurent Destailleur
e3dcff7f5b
Fix substition for menus title and urls
2017-12-09 15:35:01 +01:00
Philippe GRAND
8fa7b924d5
enhance image using awesome icon
2017-12-09 12:08:50 +01:00
Laurent Destailleur
46b281f703
Fix for #7697
2017-12-01 19:29:29 +01:00
Laurent Destailleur
9fa6bfd1a5
Fix edit external user or not
2017-11-29 15:30:41 +01:00
Laurent Destailleur
a15a57317b
Debug accountancy module
2017-11-28 11:12:13 +01:00
Laurent Destailleur
7e40ee5e4b
Fix substitution key for constant ok with php 5.3
2017-11-25 23:16:15 +01:00
Laurent Destailleur
c02528a479
NEW Accept substitution key __[ABC]__ replaced with value of const ABC
2017-11-25 19:55:31 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
c3d8ef2104
Update functions.lib.php
2017-11-22 11:14:52 +01:00
Regis Houssin
848a27283b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member
2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148
NEW add possibility to remove address field
2017-11-22 09:51:46 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:29:42 +01:00
Laurent Destailleur
405275693f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenishorders.php
htdocs/projet/activity/perday.php
2017-11-17 14:20:08 +01:00
Laurent Destailleur
68f477eaf7
Merge pull request #7818 from dolibarr95/patch-29
...
Fix : syntax error in dol_print_graph()
2017-11-17 13:18:11 +01:00
Laurent Destailleur
4f25bc5e3b
NEW detection of edge browser
2017-11-16 14:44:55 +01:00
dolibarr95
c6c1552c01
syntax error
...
bad syntax when add an url in dol_print_graph()
2017-11-15 11:11:45 +01:00
Laurent Destailleur
451d3ed8ed
NEW Add API to activate/unactivate a contract
2017-11-14 17:51:04 +01:00
florian HENRY
e195cf0b95
fix : return vat code for supplier price
2017-11-14 09:53:06 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
cb6bf91044
Merge pull request #7787 from libersoft/feature/correct-italian-address-format
...
NEW Support Italian addresses format. Fixes #7785
2017-11-11 17:38:29 +01:00
Laurent Destailleur
debc0480dd
CSS
2017-11-10 20:20:59 +01:00
Laurent Destailleur
c2d7b88bdd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54
Work on filemanager generic component
2017-11-10 13:45:38 +01:00
Laurent Destailleur
9b07f33649
Clear code
2017-11-09 09:50:55 +01:00
Laurent Destailleur
d18f65a6e2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2017-11-09 01:25:41 +01:00
Laurent Destailleur
ad71a22994
Code comment
2017-11-09 01:21:02 +01:00
Laurent Destailleur
c8a551e7de
Reorganize javascript at end of page.
2017-11-09 01:00:43 +01:00
Valerio Baldisserotto
15a501467e
FR: Support Italian address format. Fixes #7785
2017-11-08 11:43:52 +01:00
Laurent Destailleur
e7abc92f97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
2017-11-06 21:37:19 +01:00
Laurent Destailleur
bc093ef969
FIX #7775 Order of deletion in delete method (trigger first)
2017-11-06 19:27:10 +01:00
Laurent Destailleur
bc9b816719
Fix deletion of files that contains __
2017-11-06 17:54:18 +01:00
Laurent Destailleur
1e939ec90c
Merge pull request #7761 from hregis/develop_member
...
Fix: broken feature (add more attr and css class)
2017-11-05 18:33:43 +01:00
Laurent Destailleur
202d36d582
Work on modulebuilder
2017-11-05 18:15:59 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
Regis Houssin
2d4717b745
Fix: broken feature (add more attr and css class)
2017-11-03 14:46:45 +01:00
Laurent Destailleur
dbd85321b3
Merge pull request #7735 from grandoc/new_branc_30_10_17
...
Warning: trim() expects parameter 1 to be string, array given in /htt…
2017-11-02 09:58:57 +01:00
Laurent Destailleur
6ea558b639
Update functions.lib.php
2017-11-02 09:58:22 +01:00
Laurent Destailleur
f26d970d58
Remove option MAIN_HTML5_PLACEHOLDER (on by default now)
2017-11-01 10:17:24 +01:00
Laurent Destailleur
d39a19e976
Replace on/off img tick with fa-font
2017-10-31 12:32:30 +01:00
Laurent Destailleur
bd94ec0f1d
Use fontawesome for picto for on/off default.
2017-10-31 12:25:06 +01:00
Laurent Destailleur
068f5e32cb
NEW Tooltip for substitutions variables on tooltips on admin pages
2017-10-31 11:17:44 +01:00
Philippe GRAND
f904c46a10
Warning: trim() expects parameter 1 to be string, array given in /httpdocs/core/lib/functions.lib.php on line 520
2017-10-30 14:22:34 +01:00
Laurent Destailleur
33aa0f3160
Code comment
2017-10-29 17:49:24 +01:00
Laurent Destailleur
9676b83574
Google tag enabled also on mobile
2017-10-28 16:00:46 +02:00
Laurent Destailleur
9e382a7f1b
Can disabled output of notify messages
2017-10-28 13:36:23 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
53d2f29cdd
Fix regression
2017-10-23 10:27:50 +02:00
Laurent Destailleur
f4f47c6732
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
2017-10-22 21:15:08 +02:00
Laurent Destailleur
3bca0ad07d
More modern picto for switch on/off
...
Work on website module
2017-10-20 21:39:19 +02:00
Laurent Destailleur
ab4f5a3aea
Clean code
2017-10-20 18:15:43 +02:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
Laurent Destailleur
6497ca5394
prepare tzuserrel
2017-10-12 18:14:02 +02:00
Laurent Destailleur
50da6a0c9e
Prepare code for removing adodb
2017-10-12 14:59:38 +02:00
Laurent Destailleur
cf3dd4be12
Merge pull request #7606 from dolibarr95/patch-23
...
NEW More picto for phone
2017-10-11 11:51:07 +02:00
Laurent Destailleur
eb75c2f98e
Merge pull request #7596 from hregis/develop_bug2
...
Fix: wrong POST GET name
2017-10-11 11:30:36 +02:00
dolibarr95
572a64bdbf
display mobile picto
...
runs with #6617
2017-10-10 10:19:04 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Regis Houssin
64d9b625ff
Fix: wrong POST GET name
2017-10-09 11:03:16 +02:00
Laurent Destailleur
3e0ccd6312
FIX #7585
2017-10-09 10:43:19 +02:00
Laurent Destailleur
67c33840cf
Code comment
2017-10-08 23:19:19 +02:00
Laurent Destailleur
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Regis Houssin
e0e10ff830
NEW add '$moreatt' parameter in picto_from_langcode function
2017-10-06 20:53:41 +02:00
Laurent Destailleur
06b18a740e
NEW Add date of birth on user card.
...
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
848aadb48a
FIX Do not lose selected id after ENTER the TAB on autocomplete
2017-10-06 10:47:02 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Laurent Destailleur
5ddd77c950
Fix We must use dol_escape_htmltag for input field not dol_htmlentities
2017-10-03 18:35:35 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
c4b3dc40c3
Allow : into file names
2017-10-03 10:54:51 +02:00
Laurent Destailleur
26564cc79c
Allow : into file names
2017-10-02 20:38:15 +02:00
Regis Houssin
e65b21a3bf
Fix: change the parameter value of dol_getIdFromCode
2017-10-02 11:59:17 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
3ddd5d3d3a
The default value feature is sensitive to url parameters.
2017-10-01 14:54:17 +02:00
Laurent Destailleur
537a551bb5
Fix vat visiblity on pdf
2017-09-27 21:58:42 +02:00
Laurent Destailleur
8242469e40
FIX The unique index on email templates can work now.
2017-09-27 18:16:28 +02:00
Laurent Destailleur
f1f4a2fb44
Add email template to send SEPA mandate
2017-09-27 17:40:14 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
Laurent Destailleur
5482f80c0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1
FIX #7473 Mass update of vat rates and other bugs on localtax
2017-09-26 10:29:44 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
bee94b32d9
Debug modulebuilder
2017-09-23 15:12:25 +02:00
Laurent Destailleur
57adc28256
Work on modulebuilder
2017-09-23 01:45:03 +02:00
Laurent Destailleur
63ec14e47d
Convert sode to send member info email into new generic email template
...
system.
2017-09-22 20:18:11 +02:00
Laurent Destailleur
6d7db96359
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 16:31:05 +02:00
Laurent Destailleur
d4bde2a4ea
Fix date substitution for contracts
2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
695c231e78
Update code comment
2017-09-16 10:26:27 +02:00
Laurent Destailleur
bd7c4fe940
NEW Summary of last events on a card are sorted on decreasing date.
2017-09-16 10:12:44 +02:00
Laurent Destailleur
4e7e6cc658
Fix W3C
2017-09-16 09:15:10 +02:00
Laurent Destailleur
961d475a9d
More complete substitution system.
...
Add __CONTRACT_NEXT_EXPIRATION_DATE__ and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
2017-09-16 03:45:29 +02:00
Laurent Destailleur
b13dbf1f06
Clean code. Make selection of template working even if public.
2017-09-16 00:49:46 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
0ade500535
Better support of text editor when no js available.
2017-09-15 11:19:56 +02:00
Laurent Destailleur
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Laurent Destailleur
f16d88fd53
FIX #7391
2017-09-14 13:17:31 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
205989b64b
Fix phpunit
2017-09-14 09:16:57 +02:00
Laurent Destailleur
bc15a0f8e0
Fix search criteria list
2017-09-12 14:50:12 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
cf56da8102
NEW Default filter and sort order can use partial list of query
...
parameters to set the qualified URLs.
2017-09-11 00:02:52 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
7c2c496823
Fix pagination on account list page
2017-09-06 19:53:28 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
33e2179b65
FIX SQL injection
2017-09-06 18:17:57 +02:00
Laurent Destailleur
d26b2a694d
FIX Security fixes (filter onload js, less verbose error message in
...
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Laurent Destailleur
a0cdf784da
Standardize code
2017-09-05 09:43:22 +02:00
Laurent Destailleur
e6f0e76988
Add option MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH
2017-09-02 15:30:00 +02:00
Laurent Destailleur
a6a5602572
NEW Can set email of thirdparty as unique and/or mandatory
2017-09-02 12:36:53 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
991a33f7b6
Make different vat rates visible
2017-08-29 20:40:51 +02:00
Laurent Destailleur
eebaff95cf
Fix pb with imagick
2017-08-29 13:41:44 +02:00
Laurent Destailleur
1b1ce4fdf5
Code comment
2017-08-27 19:40:43 +02:00
Laurent Destailleur
326d3df63f
FIX select of category
...
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e
FIX select of category
...
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
e25a428118
Fix compatibility with Internet Explorer
2017-08-23 12:32:28 +02:00
Laurent Destailleur
aae24c26a3
Some fixes with smartphones
2017-08-22 20:20:34 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
71d49f1c6f
Fix pb in ecm
2017-08-01 18:44:34 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
7a69df08c5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/cron/class/cronjob.class.php
2017-07-31 02:39:42 +02:00
atm-ph
1f3f9e40b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-27 16:01:53 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
7e0a165131
Fix some pb in search using phone
2017-07-26 20:33:25 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
bd85d87e3e
Fix pb with .svg
2017-07-25 23:02:48 +02:00
Laurent Destailleur
ab72fbffc6
Fix pb with .svg files
2017-07-25 23:02:14 +02:00
Laurent Destailleur
9043cf759b
Fix clone function
2017-07-23 20:27:30 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Laurent Destailleur
44023606c6
Fix pb in dolGetFirstLineOfText. Add PHPunit
2017-07-22 12:47:35 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
7b2a71802b
Do some TODO on modulebuilder module.
2017-07-16 13:00:35 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
7eb4562432
Code comment
2017-07-13 15:22:07 +02:00
Regis Houssin
d63e15f0c6
Fix: missing group name with dol_banner_tab
2017-07-12 15:52:58 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
ba3b6b6aa5
Better support of vat with code in expense report
2017-07-08 18:09:45 +02:00
Laurent Destailleur
2ea7f38d38
Fix migration of version that is not a final version
2017-07-08 12:48:17 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
phf
b8865c425f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-05 10:48:01 +02:00
phf
1beec51928
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
2017-07-05 10:44:52 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Laurent Destailleur
c56ea50251
Currency symbol for peru is before value
2017-07-02 14:30:24 +02:00
Laurent Destailleur
b308cfef1d
Fix dol_trunc
2017-06-30 18:30:01 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
05318bb4ec
More complete dol_string_nospecial
2017-06-28 19:02:09 +02:00
Laurent Destailleur
1a860c42ee
Look and feel v6
2017-06-27 16:42:11 +02:00
Laurent Destailleur
693b2fe3b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
2017-06-23 11:20:29 +02:00
Laurent Destailleur
45004493e0
Fix multicurrency and vat_src_code not propaged on invoice from
...
shipment.
2017-06-23 11:12:17 +02:00
Laurent Destailleur
014cb4b004
Fix navigation on security event list
2017-06-21 12:03:49 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
287e727e71
Fix detection of relative URL
2017-06-19 13:47:25 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
b228fe6a2a
Fix auto focus on module page
2017-06-16 16:06:20 +02:00
Laurent Destailleur
ac708a8ee9
Debug accounting module with new structure v6
...
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
2017-06-15 23:58:56 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
7939daa225
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Laurent Destailleur
70c7bcc85f
Complete css to get value unique
2017-06-13 15:57:30 +02:00
Laurent Destailleur
c8856182a6
Fix look and feel v6
2017-06-13 15:34:18 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Laurent Destailleur
6d130351a0
Fix css
2017-06-12 11:32:10 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
36b18f0300
Save MAIN_VERSION_FIRST_INSTALL that is not erased.
2017-06-10 22:11:12 +02:00
Laurent Destailleur
9c482b9f2a
FIX CVE-2017-7886
2017-06-10 21:37:27 +02:00
Laurent Destailleur
d037515e37
FIX SQL injection on user/index.php parameter search_statut.
...
Conflicts:
htdocs/user/index.php
2017-06-10 20:10:57 +02:00
Laurent Destailleur
b62da4bb7a
Fix a parameter is required to know what we share.
2017-06-10 20:04:24 +02:00
Laurent Destailleur
890ac81e4d
Fix menu entried must be greyed, sub menus not visible fi not allowed on
...
parent.
2017-06-10 19:16:42 +02:00
Laurent Destailleur
87c8659e72
Fix responsive
2017-06-10 00:45:18 +02:00
Regis Houssin
0e8f36dc92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 14:00:48 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
929946ad47
Fix several problem with hook printFieldListWhere
2017-06-09 10:12:01 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
ade915af5f
New: add dictionnary sharing (multicompany)
2017-06-08 16:36:42 +02:00
Regis Houssin
4b98a1aefd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-08 15:05:45 +02:00
Laurent Destailleur
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Regis Houssin
44dba391c1
New: add dictionnary sharing (multicompany)
2017-06-08 10:24:16 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
9e629bdb02
Work on modulebuilder
2017-06-02 20:01:25 +02:00
Laurent Destailleur
5c58ed8ca7
Add a better error message when payment link is not valid.
2017-06-02 09:13:04 +02:00
Laurent Destailleur
f4cdb6b254
Fix month on 2 chars. Some setup return on 1 char only. More phpunit
...
assert.
2017-06-01 15:33:23 +02:00
Laurent Destailleur
7ad92c3a4d
Fix new generic substitution system
2017-06-01 13:32:20 +02:00
Laurent Destailleur
c70beaa56b
Complete work for mutualizing generic substitution system.
2017-06-01 01:57:22 +02:00
Laurent Destailleur
6c7179d281
Test of commit with autoremove trail space
2017-05-31 19:20:33 +02:00
Laurent Destailleur
d5f83d6bbe
NEW #6915 Simplest change.
2017-05-31 19:15:39 +02:00
Laurent Destailleur
145cb628cd
FIX dol_string_nohtmltag make 2 passes to clean html into html
...
attributes.
2017-05-31 11:11:25 +02:00
Laurent Destailleur
452579150d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
70636cc59f
FIX SQL injection on user/index.php parameter search_statut.
2017-05-29 09:59:21 +02:00
Regis Houssin
18886849eb
New: add REST api "memberstypes"
2017-05-25 08:54:30 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
6d4c5e4b4a
Code comment
2017-05-24 11:37:44 +02:00
Laurent Destailleur
a3eef35ce6
Fix travis error
2017-05-22 01:19:16 +02:00
Laurent Destailleur
5cb38ece19
Fix travis errors
2017-05-21 19:37:15 +02:00
Laurent Destailleur
5992175b68
Standardize code between customer and supplier invoice list.
2017-05-21 03:23:44 +02:00
Laurent Destailleur
2dd2ab1003
Look and feel v6
2017-05-20 20:59:54 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
30cedd154e
Fix default value must apply only if restore_lastsearch_values is on
2017-05-19 15:42:11 +02:00
Laurent Destailleur
ff2a268831
NEW Architecture to manage search criteria persistance (using
...
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
2017-05-19 00:52:13 +02:00
Laurent Destailleur
5a79d11389
Avoid warning
2017-05-18 13:14:56 +02:00
Laurent Destailleur
58f789659d
Remove one picto loading
2017-05-18 02:53:49 +02:00
Laurent Destailleur
b29f325fcf
Work on search criteria persistence
2017-05-16 23:38:23 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
cc16bb0bef
Debug default value feature.
2017-05-16 12:22:55 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
5a96ae54b9
FIX Link to files on bank account tab broken with multicompany
...
FIX Link to preview on thirdparty broken with multicompany
2017-05-10 19:08:07 +02:00
Laurent Destailleur
0156e99894
Code comment
2017-05-10 13:46:02 +02:00
Laurent Destailleur
fe053c8603
Better escaping of error message.
2017-05-10 12:03:40 +02:00
Laurent Destailleur
8e25155fc9
Better escaping of error message.
2017-05-10 12:02:41 +02:00
Laurent Destailleur
c4722e3694
FIX XSS
2017-05-10 11:48:45 +02:00
Laurent Destailleur
5c33c1773f
FIX XSS
2017-05-10 11:47:34 +02:00
Laurent Destailleur
ecf3b6ab33
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-10 00:51:27 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
2fc64b8e11
Fix XSS
2017-05-10 00:44:54 +02:00
Laurent Destailleur
b8b91db007
Use function top_httphead to include headers in pages.
2017-05-09 21:46:57 +02:00
Laurent Destailleur
667e3c2876
Add another security sanitizing option
2017-05-09 19:26:28 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
d7e10085b8
Clean code. Using 2 different key for a param is not more allowed.
2017-05-05 18:42:11 +02:00
Laurent Destailleur
57e540af53
For better compatibility with module for 6.0
2017-05-05 17:46:40 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
39d9a0f979
Support of pdf preview on supplier orders
2017-05-04 19:11:19 +02:00
Laurent Destailleur
f543461e9b
Complete the substitution array with substitution array with all
...
possible keys
2017-05-04 11:21:28 +02:00
Laurent Destailleur
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
Laurent Destailleur
faddcb28ac
FIX serious bugs in accounting (error management, transactions, bad
...
values set)
2017-04-29 14:53:29 +02:00
Laurent Destailleur
2e6d865c7d
NEW Can define default values for create forms.
...
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
2017-04-29 00:44:25 +02:00
Laurent Destailleur
defce63a24
Work on management of default values
2017-04-28 14:05:28 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Laurent Destailleur
d99de641e8
Fic on vat npr
2017-04-15 03:06:25 +02:00
Laurent Destailleur
1e4dd5d095
Fix bug reported by scrutinizer
2017-04-15 03:05:04 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
6c069e9a1a
Fix label of long status
2017-04-13 15:15:44 +02:00
Laurent Destailleur
d78f3923ee
Support of preview for pdf with several pages
2017-04-12 12:13:38 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
37939e7cbd
NEW Add key __USERID__ and __ENTITYID__ as key for dynamic filters.
2017-04-11 02:17:47 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
a99a4be9e0
Work on 6.0 look and feel
2017-04-06 22:31:45 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
Laurent Destailleur
01d69e4b58
NEW Better reponsive design
2017-04-04 12:55:54 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
d975e7f442
Work on 6.0 look and feel
2017-04-01 12:46:47 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
b5b0eba470
Several enhancement for 6.0
2017-03-28 12:47:48 +02:00
Laurent Destailleur
292bcae592
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-25 00:05:04 +01:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
fec3a89aa5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 11:38:46 +01:00
Laurent Destailleur
0a35d17207
CSS enhancement
2017-03-23 10:59:13 +01:00
Laurent Destailleur
36630b9404
FIX Picto of project on dol_banner and box
...
Conflicts:
htdocs/core/boxes/box_project.php
2017-03-21 13:43:05 +01:00
Laurent Destailleur
0e997c973f
FIX Picto of project on dol_banner and box
2017-03-21 13:13:00 +01:00
Laurent Destailleur
47e325cc66
NEW Can set the default value of any field on any create page with
...
option MAIN_DEFAULT_FOR_path-to-file_fieldname
2017-03-20 20:35:24 +01:00
Laurent Destailleur
888675016d
NEW Can use dol_fiche_end without showing bottom border.
2017-03-15 11:13:30 +01:00
Laurent Destailleur
618c27d63c
Optimize space
2017-03-10 16:26:43 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
6ee286f5f7
FIX #6404
2017-03-03 15:11:41 +01:00
Laurent Destailleur
bf591f5f91
Work on module website
2017-02-24 21:13:40 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
bb72121179
Fix menu loading
2017-02-22 01:47:22 +01:00
Laurent Destailleur
2dbae7b808
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
BENKE Charlie
e4ede5aef3
"Preview" not translated
2017-02-17 12:32:06 +01:00
Laurent Destailleur
868f2e5473
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
htdocs/core/lib/functions.lib.php
2017-02-13 01:36:02 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Alexandre SPANGARO
5c9c761911
Fix : Bank account label not shown in dol_banner_tab
2017-02-09 05:58:39 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
3a2d9c8610
Fix for rtl languages
2017-01-21 16:12:25 +01:00
Laurent Destailleur
a250ba5f56
Close #6307 #6306
2017-01-20 17:52:52 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
9bb9d4d36e
Fix position of field and tooltip
2017-01-20 12:08:33 +01:00
Laurent Destailleur
3336943ff2
Fix responsive
2017-01-18 15:49:12 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Laurent Destailleur
76a53dfb7d
FIX Accept spaces around the | criteria
2017-01-08 01:01:34 +01:00
Laurent Destailleur
785b2d46b3
FIX Accept spaces around the | criteria
2017-01-08 01:00:47 +01:00
Laurent Destailleur
2c1477ecea
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit 37d158f159
2017-01-07 21:50:14 +01:00
Laurent Destailleur
163ee094ec
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit df9121d6fa
2017-01-07 21:46:26 +01:00
Laurent Destailleur
37d158f159
FIX Accept spaces around the | criteria
2017-01-07 21:34:12 +01:00
Laurent Destailleur
df9121d6fa
FIX Accept spaces around the | criteria
2017-01-07 21:33:13 +01:00
Laurent Destailleur
e9853f3cd7
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
...
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
2017-01-07 17:45:05 +01:00
Laurent Destailleur
43942e6ea2
Fix css and fix navigation on resource tab.
2016-12-23 13:04:46 +01:00
aspangaro
098dc08169
Loan : Complete work on dol_banner
2016-12-20 07:29:49 +01:00
Laurent Destailleur
0eded9a8b7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-19 02:36:10 +01:00
Laurent Destailleur
3f5d67d4d6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-19 02:35:16 +01:00
Laurent Destailleur
876722733a
Better fix to get localtax
2016-12-19 02:33:54 +01:00
Laurent Destailleur
9fd48df839
Fix minor bug on subscription pages
2016-12-17 19:21:48 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
8f3ce46c50
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f
Better fix to add server name into email id.
2016-12-15 12:11:39 +01:00
Laurent Destailleur
ecab7cb70e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-14 12:21:33 +01:00
Laurent Destailleur
56b3f2c011
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
...
tracking email.
2016-12-14 10:36:11 +01:00
Laurent Destailleur
530d3503f5
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
...
tracking email.
2016-12-14 10:32:31 +01:00
Laurent Destailleur
4b831537e5
Fix several problem in notes management of template invoices.
2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01
Complete work on dol_banner on contracts
2016-12-04 13:30:17 +01:00
Laurent Destailleur
317df1cf91
Complete work on use of the new ol_banner_tab.
2016-11-30 20:24:36 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
83972b39ce
Complete work on dol_banner. Fix errors due to missing columns.
2016-11-28 23:58:36 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
b035b1e196
Merge remote-tracking branch 'origin/4.0' into develop
2016-11-20 15:48:24 +01:00
Laurent Destailleur
e3c529d483
FIX javascript error when using on mobile/smartphone
2016-11-20 15:38:48 +01:00
Laurent Destailleur
7ac96da0d4
Several fix in warehouse stock change (rounding, api rest)
2016-11-18 16:34:03 +01:00
Laurent Destailleur
0b3765dd9a
Fix phpcs
2016-11-18 13:17:24 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
4768017662
Debug of module accountancy
2016-11-16 19:23:32 +01:00
florian HENRY
ff734bb5d9
Fix travis
2016-11-16 09:40:29 +01:00
Laurent Destailleur
2961039b98
Code comment
2016-11-15 13:14:26 +01:00
Laurent Destailleur
6014345fb7
Fix typo error
2016-11-13 18:28:06 +01:00
Laurent Destailleur
4bcc7dc8a0
CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu
2016-11-12 14:36:52 +01:00
Laurent Destailleur
b1bd9e4930
Responsive design
2016-11-11 23:17:37 +01:00
Laurent Destailleur
cc64994f30
Better responsive design
2016-11-10 11:33:25 +01:00
Laurent Destailleur
9bff6f966b
NEW Can add event from the card listing events
2016-11-08 14:08:48 +01:00
Laurent Destailleur
4681c84e1d
Better responsive
2016-11-06 12:16:10 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Laurent Destailleur
e59c2bb61c
Debug accounting menu. Can now edit product account if already set.
2016-11-04 16:15:31 +01:00
Laurent Destailleur
a658b7cc3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/card.php
2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d
Fix dol_buildpath with parameter 3. Add phpunit tests
2016-10-31 10:37:58 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
22d2557a48
Clean page
2016-10-28 18:05:46 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
fb0f5e3230
Better behaviour on small screen
2016-10-27 01:47:03 +02:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
Laurent Destailleur
3b05d00163
Better responsive design
2016-10-24 12:06:33 +02:00
Laurent Destailleur
9560ec54cc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/lib/functions.lib.php
2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/lib/functions.lib.php
2016-10-24 02:10:17 +02:00
Laurent Destailleur
14e78ef50b
Mutualize code of 2 lists into one page.
2016-10-22 13:52:43 +02:00
Laurent Destailleur
3ca3b7ab78
Fix code comment
2016-10-21 10:36:11 +02:00
Laurent Destailleur
19532c9965
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2016-10-18 13:00:46 +02:00
Juanjo Menent
f28c7bbc6d
Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x
2016-10-18 10:20:09 +02:00
Juanjo Menent
6a944bb6a3
Fix: Bad localtaxes calc for Spain if VAT is 0
2016-10-18 10:11:42 +02:00
Laurent Destailleur
46c985d8cc
FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO
2016-10-17 15:16:21 +02:00
Laurent Destailleur
fe471c43d1
Minor css enhancement
2016-10-16 18:28:09 +02:00
Laurent Destailleur
9175ff80a0
Fix download of files uploaded on donation
2016-10-16 17:25:33 +02:00
Laurent Destailleur
7504af42de
Fix regression in GETPOST when value is an array
2016-10-10 00:56:35 +02:00
Laurent Destailleur
cd9654978b
NEW Filters can accept generic search key like __DAY__, __MONTH__,
...
__YEAR__ replaced with current day, month year before making the search.
2016-10-09 19:49:09 +02:00
Laurent Destailleur
ba52eb870c
Enhancement of Oauth module
2016-10-07 18:43:44 +02:00
Laurent Destailleur
3599f2c840
Uniformize code for recurring invoices
2016-10-04 12:31:45 +02:00
Laurent Destailleur
45a808e034
NEW Generation of document is available on member card
2016-10-03 00:08:47 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
521008a698
FIX #5746 chrome php
...
Try a fix. Not sure it solved all problems reported
2016-10-01 17:27:52 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
e60d2b0ae5
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2016-09-26 14:10:39 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Laurent Destailleur
4cccaae831
Fix warning
2016-09-25 16:44:55 +02:00
Laurent Destailleur
dc45776d31
FIX Date visible on project overview
2016-09-23 10:32:19 +02:00
Laurent Destailleur
133657a8c7
Uniformize code
2016-09-21 01:25:34 +02:00
Laurent Destailleur
79ddc2458d
Better center of left, center and right part of titles.
2016-09-20 12:51:09 +02:00
Laurent Destailleur
af28a67803
Uniformize look using dol_banner
2016-09-19 10:43:30 +02:00
Laurent Destailleur
77e2037195
NEW Add REST API to read, create and delete agenda events
2016-09-19 02:02:45 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
f8dbc1aa9f
Theme cleaner
2016-09-10 16:09:01 +02:00
Laurent Destailleur
858291c3a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Laurent Destailleur
2b7ef01e42
FIX SEC for HTB23302
2016-09-08 11:09:38 +02:00
phf
d3a7b5453b
New type for GETPOST
2016-09-08 10:25:48 +02:00
Laurent Destailleur
d24045d831
NEW Editing translation GUI become easier with search translation tool.
2016-09-04 14:45:43 +02:00
Laurent Destailleur
e4539be127
FIX sortfield and sortorder parameters output twice in navigation url.
2016-09-04 13:28:37 +02:00
Laurent Destailleur
034b08ce56
NEW Add option "Hide images in Top menu".
2016-08-05 23:40:00 +02:00
Laurent Destailleur
e168888c59
NEW Reduce nb of picto on ref into list, merging preview and download
2016-08-05 12:20:11 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
cc21909909
Fix dol_include_once could not work to get external url of a module
2016-08-02 14:33:46 +02:00
Laurent Destailleur
a353093ae7
NEW Phone formatting for Canada. Add dol_print_phone into phpunit tests
2016-08-01 20:18:31 +02:00
Laurent Destailleur
a35dd9f2d1
Fix bad separation of address
2016-08-01 19:37:17 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4
Fix for option MAIN_OPTIMIZEFORTEXTBROWSER
2016-07-31 13:07:55 +02:00
Laurent Destailleur
a6147ee73b
Miscellaneous fixes
2016-07-30 14:49:29 +02:00
Laurent Destailleur
d619a641ce
Fix regression (empty log were output)
2016-07-28 14:11:41 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
3d2dc3c66e
NEW Each user can select its landing page.
2016-07-26 21:12:52 +02:00
Laurent Destailleur
b615b52f47
FIX html detection fails if only u tag is present
2016-07-26 16:11:38 +02:00
All3kcis
f4705873cb
Update functions.lib.php
...
Remove useless verification on $level. Second check "in_array" line 624 is sufficient with strict mode.
Otherwise "Emerg level" is not possible with "empty($level).. LOG_EMERG = 0...
2016-07-19 15:27:03 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e
Several minor fixes in expense reports
2016-07-16 15:21:38 +02:00
Laurent Destailleur
9512bf1ac7
Add phpunit tests for option USE_STRICT_CSV_RULES
2016-07-15 12:30:24 +02:00
Laurent Destailleur
9bd937a3bc
Merge remote-tracking branch 'origin/3.9' into 4.0
2016-07-14 00:35:59 +02:00
Laurent Destailleur
0ad0755f4d
Merge remote-tracking branch 'origin/3.9' into develop
2016-07-14 00:35:09 +02:00
Laurent Destailleur
10e7fa51fc
Fix missing parameters to provide all information required for
...
substitution hooks
2016-07-13 23:06:41 +02:00
Laurent Destailleur
933ec6c118
FIX detection of HTML content when only p tag is present.
2016-06-29 13:14:53 +02:00
Laurent Destailleur
74f19944b9
Fix rtl language ar_SA
2016-06-20 00:13:30 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
eac5cbb0dd
FIX Fix the reposition on the clear target button.
2016-06-19 11:59:55 +02:00
Laurent Destailleur
243a30e5de
Code comment
2016-06-17 15:51:09 +02:00
Laurent Destailleur
65cbf1623b
Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER
2016-06-12 20:24:05 +02:00
Laurent Destailleur
74e59a1bc4
Debug prototype feature "testmenuhider"
2016-06-10 18:41:10 +02:00
Laurent Destailleur
645412517d
css enhancement
2016-06-06 22:07:35 +02:00
Laurent Destailleur
51ce4804dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-06 10:58:43 +02:00
Laurent Destailleur
ff23c825ae
Code comment
2016-06-06 10:58:23 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
7866fb9dae
Fix #5153
2016-06-04 19:11:32 +02:00
jean
49d0c8d5ff
FIX #4173 Ergonomie of product/service card
...
Add configuration key PRODUCT_NODISPLAYIFNOPHOTO to avoid displaying
nophoto.png
2016-06-04 16:34:26 +02:00
Laurent Destailleur
7519c4a602
FIX Log of tax
...
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
2016-06-01 13:24:27 +02:00
Laurent Destailleur
1bc6c4ffa3
Clean code
2016-05-30 20:50:49 +02:00
Laurent Destailleur
46a0f3dab0
Fix minor bugs
2016-05-30 01:30:28 +02:00
Laurent Destailleur
889ff16906
FIX #5239
2016-05-29 11:56:19 +02:00
Laurent Destailleur
25dfa0c5b9
Work on website
2016-05-07 16:38:32 +02:00
Laurent Destailleur
bfc5be1aad
FIX Fix and move dolGetFirstLine function into main
...
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
c939273fd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 13:38:56 +02:00
Laurent Destailleur
7515b2ba7b
NEW Add a parameter on graph function to show a generic graph when no
...
data are available.
2016-04-22 12:11:57 +02:00
Marcos García de La Fuente
54dd1763fe
Little refactor
2016-04-17 15:05:54 +02:00
Laurent Destailleur
059466030a
FIX Missing a new line into log of sent emails
2016-04-07 12:42:18 +02:00
Laurent Destailleur
2c829e7cb6
NEW Add picto on module list to show warning and if module is an
...
external module.
2016-04-07 11:50:45 +02:00
aspangaro
33e8833287
Fix travis
2016-04-03 10:47:21 +02:00
Laurent Destailleur
281b06a2d3
NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and
...
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
2016-04-01 18:44:23 +02:00
Laurent Destailleur
61bc8fc9ef
NEW Can edit value date of a vat payment after recording it.
...
Conflicts:
htdocs/compta/localtax/card.php
htdocs/core/class/html.form.class.php
2016-03-25 16:01:45 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Laurent Destailleur
4ec41bc33b
NEW Can edit value date of a vat payment after recording it.
2016-03-25 14:49:48 +01:00
Juanjo Menent
187a04854f
Merge pull request #4862 from marcosgdf/form-selectarray2
...
Corrected non-static usages of several Form functions
2016-03-21 20:21:29 +01:00
Laurent Destailleur
d4f5076a84
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-20 17:37:50 +01:00
Laurent Destailleur
706a7f05b8
FIX PHPCS
2016-03-20 17:37:27 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Laurent Destailleur
8689240b7f
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 21:37:08 +01:00
Laurent Destailleur
af3256f84a
Fix first change to fix serious pb with vat definition when using the
...
POS.
2016-03-19 21:35:03 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
97b630ac65
NEW Can use ^ and $ (to say start with or end with like regex syntax)
...
into search fields when search field is text. Bonus: ^$ can filter all
lines with field not defined.
2016-03-18 12:42:13 +01:00
Laurent Destailleur
5edeeae384
FIX Bad error and style message when changing its own login
2016-03-18 11:30:15 +01:00
Laurent Destailleur
7dac7c4f04
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-11 11:00:53 +01:00
Laurent Destailleur
7a5353efb2
Make things clearer about option MAIN_ENABLE_LOG_TO_HTML
2016-03-10 18:36:09 +01:00
Laurent Destailleur
155fd71f6d
Merge pull request #4734 from fappels/develop
...
Fix: add require to showDimensionInBestUnit
2016-03-10 13:22:58 +01:00
Laurent Destailleur
8ab343e95f
Can choose number of decimals into function showDimensionInBestUnit
2016-03-09 23:17:46 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Francis Appels
0890f20a72
Update functions.lib.php
...
Add product.lib for function measuring_units_string
2016-03-04 19:29:08 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
c1ea597cb7
Redesign page with customer price to make it easier to understand.
2016-02-26 13:44:03 +01:00
Laurent Destailleur
e115ac90ec
Code comment
2016-02-26 12:08:04 +01:00
Laurent Destailleur
f330a1c8e5
Fix phpcs
2016-02-26 10:55:47 +01:00
Laurent Destailleur
a95240e33d
FIX Some troubles into weight and volume calculation when unit differs.
...
NEW Introduce a function showDimensionInBestUnit
2016-02-25 13:46:38 +01:00
Ion Agorria
673f0c70a6
NEW: TimeZone can be supplied to mktime
2016-02-22 22:00:59 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
355f091246
FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE
2016-02-22 13:28:08 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
3b5ce32cb0
Code comment
2016-02-19 01:47:00 +01:00
Laurent Destailleur
5268038e00
Minor css enhancement
2016-02-16 22:58:24 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
aspangaro
47f60e1f8d
Add function img_weather
2016-02-13 07:53:50 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Laurent Destailleur
e67be201ed
NEW Can select number of lines on page list for projects and tasks
2016-02-11 16:49:13 +01:00
Laurent Destailleur
0d7f67ade5
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-10 23:59:15 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
Laurent Destailleur
9b41e11a1e
NEW Can select dynamicaly number of lines to show on page
2016-02-10 20:48:18 +01:00
Laurent Destailleur
6dbaba6973
Fix: previous and next arrow
2016-02-10 17:45:26 +01:00
Laurent Destailleur
7ef0415aca
Small per enhancement
2016-02-09 15:57:24 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82
Fix warning when javascript disabled
2016-02-03 03:10:58 +01:00
Laurent Destailleur
928336c835
NEW Clean and enhance code for cron engine
2016-01-31 15:14:50 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
fedf1f3288
Fix view of product image when using old path
...
Fix size of image uploaded on user.
2016-01-22 14:02:48 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
d857b3475b
Fix doxygen
2016-01-22 03:07:46 +01:00
Laurent Destailleur
4e87afddf1
Fix: why a floating float here ?
2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82
Fix: why a floating float here ?
2016-01-21 22:43:20 +01:00
Laurent Destailleur
dd6e60630d
Fix size of cells make page too large even for large screen
2016-01-21 15:01:53 +01:00
Laurent Destailleur
19bcdb6910
Fix size of cells make page too large even for large screen
2016-01-21 14:56:26 +01:00
bobby
eec22169e3
FIX feature
2015-12-28 10:21:38 +01:00
bobby
10ff19eb46
NEW : if nb total of lines provided in print barre_liste, display in
...
title
2015-12-28 10:20:23 +01:00
Laurent Destailleur
a4d5e022cf
Fix pagination on limit failed when limit was forced on url
2015-12-24 12:52:11 +01:00
Laurent Destailleur
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +01:00
aspangaro
d12e3ca91f
Finish work on better integration of skype
2015-11-28 14:43:16 +01:00
BENKE Charlie
ce367bfa31
bad limittoshow usage
...
the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector
2015-11-17 14:42:34 +01:00
Laurent Destailleur
6dc6bab556
Support of 'small', 'mini' and '' image size everywhere.
2015-11-17 10:38:00 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
64c783623b
NEW Framework feature. To have a page being loaded at same scrollbar
...
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
99f5211070
NEW Can use the * as a joker characters into search boxes of lists
2015-11-07 11:48:35 +01:00
Laurent Destailleur
d0e6db7f89
Use the new banner for first tab of products.
2015-11-06 18:57:35 +01:00
Laurent Destailleur
0f358eea49
Fix path definition of thumbs with the new function
2015-11-06 01:56:56 +01:00
Laurent Destailleur
f319976e5d
FIX #3878 Storing and deleting files on emailing was done at wrong place
...
Conflicts:
htdocs/comm/mailing/card.php
2015-11-05 03:08:15 +01:00
Laurent Destailleur
a612289136
FIX Storing and deleting files on emailing was done at wrong place
2015-11-05 03:02:31 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
Regis Houssin
0fd7ba478a
Fix: add Mac OS
2015-11-01 17:27:41 +01:00
fmarcet
62dc6814a3
FIX #3726 Not showing images on product card
2015-10-29 10:14:54 +01:00
Laurent Destailleur
6493438e87
NEW The clicktodial module is now able to provide link "tel:" on phone
...
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
2015-10-26 16:20:09 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
48ed8d4408
FIX The thumb of user into top menu was using the image in full size.
...
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f
NEW Show photo of user into user list. A new function
...
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
2015-10-25 19:31:42 +01:00
Laurent Destailleur
cac4a85ccd
Merge pull request #3788 from atm-maxime/new_customer_recap
...
New customer recap
2015-10-22 18:02:38 +02:00
Laurent Destailleur
e70bb28be7
If firstname not define, use lastname
2015-10-20 00:47:35 +02:00
Laurent Destailleur
23d7d60d73
Better compatibility with old versions
2015-10-20 00:22:28 +02:00
Maxime Kohlhaas
158281b14c
Fix : minor typo
2015-10-19 17:13:02 +02:00
Laurent Destailleur
df0c6aa5cf
Use the new card banner for members
2015-10-16 16:14:33 +02:00
Laurent Destailleur
8a32041f16
Clean CSS when option MAIN_MAXTABS_IN_CARD is set
2015-10-15 13:31:44 +02:00
Laurent Destailleur
9a6ac4f457
CSS enhancement
2015-10-11 16:32:46 +02:00
Laurent Destailleur
bd48ad265d
The new banner tab is also on user card now
2015-10-11 15:21:21 +02:00
Laurent Destailleur
6ec77e2ca0
New banner card on contact card.
2015-10-11 12:27:04 +02:00
Laurent Destailleur
0222867a94
The new banner for tab is moved into a shared functions
2015-10-10 12:01:09 +02:00
Laurent Destailleur
f4f7629037
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511
Start to work on a common banner for tabs (goal is to have a nicer and
...
generic part for all element)
2015-10-10 01:51:12 +02:00
Laurent Destailleur
82428fea68
NEW: Only arrow of current sorted field is visible into table views.
...
This save a lot of spaces. You can click on the column title to sort.
This make clickable area larger and click to sort is easier.
2015-10-09 13:01:50 +02:00
Laurent Destailleur
43f09dfccf
Work on theme
2015-10-02 16:26:08 +02:00
Juanjo Menent
dd19029279
Merge pull request #3589 from GPCsolutions/moduletabs
...
[Qual] Warning on deprecated number of values
2015-09-26 08:41:33 +02:00
Juanjo Menent
4f187d3413
Merge pull request #3588 from GPCsolutions/microtime
...
[Qual] Replaced deprecated dol_microtime_float()
2015-09-26 08:40:52 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
bbaa76fab1
[Qual] Warning on deprecated number of values
...
Module tabs declarations now uses 6 values including permissions.
2015-09-24 18:47:43 +02:00
Raphaël Doursenaud
65340667b6
[Qual] Replaced deprecated dol_microtime_float()
2015-09-24 18:42:35 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
95daf14725
Merge branch 'patch-73' of https://github.com/defrance/dolibarr into
...
defrance-patch-73
Conflicts:
htdocs/core/lib/functions.lib.php
2015-09-23 19:21:59 +02:00
Laurent Destailleur
72d7671a1e
Enhance CSS
2015-09-22 16:21:46 +02:00
Laurent Destailleur
58a734cb17
Firstname only on login
2015-09-21 17:28:11 +02:00
Laurent Destailleur
0821f18712
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-18 21:50:10 +02:00
Laurent Destailleur
5f507cbbd8
Fix missing closing div making jmobile crazy
2015-09-18 20:23:06 +02:00
Laurent Destailleur
f72f652d98
FIX Pb into pagination scroll widget
...
FIX Style of previous-next card when using dolidroid
2015-09-18 15:51:27 +02:00
Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
BENKE Charlie
95cfce925f
fix error on tabcollectors and enhance
...
fix error on tabcollectors feature
add number of tabs present in tab collectors
2015-09-15 03:33:27 +02:00
Laurent Destailleur
a5c6582bc1
Fix duplicate translation/encoding on setEventMessage
...
Conflicts:
htdocs/ftp/index.php
2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1
Fix duplicate translation/encoding on setEventMessage
2015-09-12 12:52:07 +02:00
Laurent Destailleur
24f7100562
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/memory.lib.php
2015-09-08 10:33:33 +02:00
Laurent Destailleur
82ad81fc03
Fix picto
2015-09-07 20:56:28 +02:00
Raphaël Doursenaud
1ffb28a460
Fixed mobile detect classname without autoloader
2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
0eb0f52b6d
Install mobiledetect from composer
2015-09-04 19:06:01 +02:00
Laurent Destailleur
7a78c9d704
Fix doxygen
2015-09-01 14:31:32 +02:00
BENKE Charlie
5ee00cf97b
change made
2015-08-31 05:09:21 +02:00
Laurent Destailleur
9a6e13d253
Fix test if empty was inverted
2015-08-19 19:45:24 +02:00
Laurent Destailleur
52240eec9a
Fix removed warnings
2015-08-15 02:44:05 +02:00
BENKE Charlie
daa68efdd3
Update functions.lib.php
...
better context change
2015-08-14 23:23:44 +02:00
BENKE Charlie
a3db26adfd
Update functions.lib.php
...
change context init method
2015-08-14 19:13:13 +02:00
Laurent Destailleur
84d4cbdbcc
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc
Remove dead code
2015-08-14 15:12:40 +02:00
Laurent Destailleur
25e729cf4d
Revert "Fix #3322 Use title for alt if no alt is provided"
...
This reverts commit 2cf9d9f583
2015-08-12 23:18:07 +02:00
BENKE Charlie
6801504755
Update functions.lib.php
...
some bugs sorry
2015-08-11 23:51:02 +02:00
BENKE Charlie
049805e926
Update functions.lib.php
...
Div enough on sub-menu case (project/task)
2015-08-10 19:47:12 +02:00
Juanjo Menent
761c50a885
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-08-06 18:22:29 +02:00
BENKE Charlie
187c40aca9
Update functions.lib.php
2015-08-06 18:20:09 +02:00
BENKE Charlie
f5d4cc5f89
Update functions.lib.php
2015-08-06 16:23:34 +02:00
BENKE Charlie
4709a51c84
Add number of collected tabs and hook/trigger
...
Add number of collected tabs
Add trigger based on tabs name
add hook at end of tabs and at the footer of page
2015-08-05 15:19:00 +02:00
Raphaël Doursenaud
2cf9d9f583
Fix #3322 Use title for alt if no alt is provided
...
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
2015-08-03 10:30:10 +02:00
Laurent Destailleur
747e4b5e40
Fix timezone problem with external calendar import.
2015-07-28 18:12:45 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
4d6ce2a1de
Fix: Can't view thirdparties that are not customer nor prospect nor
...
supplier.
2015-07-15 12:42:50 +02:00
Laurent Destailleur
8eb4a208ce
Debug statistics of project module
2015-07-05 22:04:30 +02:00
Laurent Destailleur
324d855b9c
Still working on project module to uniformize way of working with other
...
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
9c80735310
An easier to use dictionary page to edit email template.
...
Uniformize look.
2015-07-04 03:28:52 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
9c99cae911
FIX XSS security using the onerror and missing escapement on type of
...
member page.
2015-06-28 23:32:38 +02:00
Laurent Destailleur
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
Laurent Destailleur
5a8e763099
Uniformize code for hooks
...
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Laurent Destailleur
230fd7a7e4
Debug withdraw module
2015-06-21 17:05:49 +02:00
Laurent Destailleur
7507a71121
Lenght of fields
2015-06-18 14:47:33 +02:00
Laurent Destailleur
6263e90ddb
More info on contact popup
2015-06-14 17:38:28 +02:00
Laurent Destailleur
87e07a3038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
2015-06-14 17:11:36 +02:00
Laurent Destailleur
14a8a2269b
FIX End log must use same level then start log.
2015-06-14 16:59:35 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
35dd069ec9
Fix #2994
2015-06-08 18:17:13 +02:00
Raphaël Doursenaud
143a7d7328
Use rfc6761 example.com domain instead of domain.com in examples
...
Fix #2988
2015-06-08 17:13:23 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
5e2d9efa07
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:02:50 +02:00
Laurent Destailleur
4c7ccf6145
NEW Can filter on contact status in prospect list. Removed deprecated
...
menu entry.
2015-06-05 10:49:02 +02:00
Laurent Destailleur
bbd8a712cf
Merge pull request #2932 from GPCsolutions/dolibarr-2571
...
Added tags/categories management to customers
2015-06-05 09:44:06 +02:00
Laurent Destailleur
8010cb7f33
Fix the extracss parameter was overwritten other css into
...
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
2015-06-04 10:42:12 +02:00
Laurent Destailleur
dd8a0b849a
NEW If module salaries is on, you can set a hourly value for tome
...
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
2015-06-03 21:01:50 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
7a0ec2d831
Prototype with datatables works now also ith jmobile.
...
Add field fifo and lifo into product table.
2015-05-30 23:56:42 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Raphaël Doursenaud
bbd0b89087
Added tags/categories management to customers
...
Customers part of #2571
2015-05-29 18:50:43 +02:00
BENKE Charlie
a30d4d4be6
Tabs collector better identification
...
Tabs collector goes wrong with 2 tabs in the same page (like projet and task), so we use picto name to identify the 2 tabscollect
We need to substract the @ if the tabs is from a module... eg : factory@factory
2015-05-25 18:14:49 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Laurent Destailleur
390c7d8e65
Fix link to prospect with filter on commercial status
...
Enhance natural_search method to allow to search on several ids.
2015-05-22 15:19:27 +02:00
Laurent Destailleur
62e1c55c97
NEW Introduce function dolGetFirstLineOfText
2015-05-19 00:44:05 +02:00
Laurent Destailleur
4a70bb7acf
Work on generic usage of get_exdir.
2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45
Prepare to generalize usage of get_exdir
2015-05-18 21:47:44 +02:00
Laurent Destailleur
e230d72cea
Increase default date range to current month instead of current day
2015-05-18 19:41:23 +02:00
Laurent Destailleur
684686e0f6
Fix restore compatibility of new navigation style with jmobile
2015-05-18 08:59:58 +02:00
Laurent Destailleur
d25a2af70c
Fix PHPCS
2015-05-17 23:47:15 +02:00
Laurent Destailleur
c89c883d7d
Fix the new navigation style.
2015-05-17 19:37:37 +02:00
Laurent Destailleur
4931401188
Fix new pagination style was not working correctly.
2015-05-15 04:33:01 +02:00
Laurent Destailleur
7b2230e437
Merge pull request #2774 from aspangaro/develop-pagination
...
NEW Use larger button for navigation
2015-05-15 03:57:29 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
3a8cf17f3c
NEW Can edit list of prospect status for customers/prospects. Add a new
...
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
aspangaro
f092be58c8
New: Add visual pagination for use on tablet
2015-05-05 21:41:08 +02:00
Laurent Destailleur
c485b1fe30
Fix When generation of doc is required and generator not provided, we
...
take first entry found.
2015-05-03 20:07:16 +02:00
Raphaël Doursenaud
2c44aa6742
Add sensible default mode to directory creation
...
Fix #2632
2015-04-30 16:22:01 +02:00
Laurent Destailleur
5a509940f3
Merge pull request #2706 from GPCsolutions/mobiledetect
...
Mobiledetect
2015-04-24 21:22:56 +02:00
Laurent Destailleur
e0d2c43086
fix phpcs
2015-04-24 01:15:29 +02:00
Raphaël Doursenaud
7281ea21e6
Qual: moved mobiledetect external library
...
External libraries resides in the include directory
2015-04-23 20:30:33 +02:00
Laurent Destailleur
4f3fe82e93
NEW Add filter on task ref and task label into list of tasks
2015-04-23 15:22:50 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Maxime Kohlhaas
e6c5b234fc
Remove debug trace
2015-04-18 03:54:33 +02:00
Florian HENRY
32e067c806
Remove debug
2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74
Fix doliforge bug 1707
2015-04-15 18:53:39 +02:00
Laurent Destailleur
bf254baa02
Fix doliforge bug 1707
2015-04-15 18:50:41 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Laurent Destailleur
6889162d7a
Fix: management of vat type 2, 4 and 6 is now ok.
...
Works for canada and ivory cost.
2015-04-11 22:51:53 +02:00
Laurent Destailleur
493392d89f
Remove warnings
2015-04-06 19:46:10 +02:00
Laurent Destailleur
c148f82452
Fix warning
2015-04-06 19:31:25 +02:00
Laurent Destailleur
3d161deb17
Fix more robust function
2015-04-06 16:50:26 +02:00
Laurent Destailleur
b49705d5d0
Status and amount of object should always be visible.
2015-04-06 16:13:23 +02:00
Laurent Destailleur
2ec5595277
NEW Can install an external module from admin pages, if web server has
...
permission for and if setup is ok for.
2015-04-04 00:19:03 +02:00
Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
c71efc8f2e
Avoid pb with scrutinizer
2015-03-31 16:59:40 +02:00
Laurent Destailleur
42c2c81e28
Fix detection of html was wrong with img
2015-03-26 12:05:52 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
1a1959b52c
Fix: Solve conflict with imgup and imgdown class use for sort fields and
...
to drag and drop lines.
2015-03-22 21:18:25 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
Laurent Destailleur
73266bb965
Fix error when using a log hangler that make output into the http
...
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
Laurent Destailleur
f44d91e153
NEW: The notification module accept keyword __SUPERVISOR__ to send
...
notification to supervisor of user.
2015-03-19 11:47:30 +01:00
Laurent Destailleur
a73ff524e5
Merge pull request #2459 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2015-03-17 00:38:40 +01:00
Scrutinizer Auto-Fixer
b693ed3f51
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
Laurent Destailleur
141fa56d67
Fixed bad parameter
2015-03-17 00:11:04 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
2e68b51a10
Merge remote-tracking branch 'upstream/develop' into develop
2015-03-15 17:52:07 +01:00
Laurent Destailleur
10bbf463e7
Several bug fixes from scrutinizer
2015-03-14 14:55:41 +01:00
Laurent Destailleur
bc3f9bf800
Fix: the visible version was not enough to know version of dolibarr. We
...
also need the MAIN_FEATURES_LEVEL.
2015-03-13 18:11:31 +01:00
Laurent Destailleur
b564b754fc
Doxygen
2015-03-10 14:09:29 +01:00
Laurent Destailleur
12be50d4ba
Doxygen
2015-03-10 13:50:05 +01:00
Laurent Destailleur
35dfaf4dd1
Natural search on numeric works also with several space after operator
2015-03-10 10:14:24 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
Laurent Destailleur
dd3f569ede
NEW: Enhance the natural_search function so we can use it to search
...
numeric fields with criteria with operator <>= inside (< 100, >= 1000)
2015-03-06 20:34:00 +01:00
Marcos García de La Fuente
0170d409d3
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2015-03-04 10:16:25 +01:00
Laurent Destailleur
52425648bf
NEW: When using transfer or correct stock from warehouse, after
...
recording we go back to the warehouse page.
2015-03-04 01:54:26 +01:00
Laurent Destailleur
60a6d8789f
Merge remote-tracking branch 'origin/3.7' into develop
2015-03-04 01:14:27 +01:00
Laurent Destailleur
35733c4c08
More comments
2015-03-03 17:47:17 +01:00
Laurent Destailleur
73afe1513d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Marcos García de La Fuente
e6c8cac381
Removed TODO and deprecated tag of dol_htmlentities and revert substitution commit
2015-03-02 01:16:35 +01:00
Laurent Destailleur
0774669331
Update comment
2015-03-02 00:37:47 +01:00
Laurent Destailleur
ce8cbee5d2
Merge pull request #2399 from marcosgdf/misc
...
misc
2015-03-02 00:31:27 +01:00
Marcos García de La Fuente
60e2524fc2
Merge remote-tracking branch 'upstream/develop' into better-practice
...
Conflicts:
htdocs/core/lib/functions.lib.php
test/phpunit/FunctionsLibTest.php
2015-02-28 14:39:14 +01:00
Marcos García de La Fuente
f117b65a17
Removed silent operator for PHP 4 in function dol_html_entity_decode
2015-02-25 23:01:07 +01:00
Marcos García de La Fuente
f2fededd2c
Drop usage of deprecated dol_htmlentities function
2015-02-25 22:48:45 +01:00
Marcos García de La Fuente
fb959abc63
Misc PHPdoc fixes
2015-02-25 18:24:36 +01:00
Marcos García de La Fuente
0a5f17f179
Undefined variable + Unreachable statement
2015-02-25 18:06:54 +01:00
Marcos García de La Fuente
91fa823075
Marked getStaticMember as deprecated
2015-02-25 18:03:31 +01:00
Marcos García de La Fuente
40a5c15616
Improved getBrowserInfo documentation
2015-02-25 16:45:14 +01:00
Marcos García de La Fuente
f598963d6b
Fixed regression
2015-02-25 16:41:51 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
Marcos García de La Fuente
7e07638fba
Little refactor
2015-02-23 10:51:43 +01:00
Marcos García de La Fuente
71b98ee82b
Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.
2015-02-23 10:42:10 +01:00
Marcos García de La Fuente
702c19dab3
Refactored function getBrowserInfo
2015-02-22 13:17:57 +01:00
Laurent Destailleur
2bc6ac4671
Finished new module to manage expense reports !
...
Fix export to support corectly multicompany
2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb
Better practice in getBrowserInfo
2015-02-22 12:35:51 +01:00
Laurent Destailleur
6d1324b463
Work on expense report module
2015-02-21 16:15:54 +01:00
Laurent Destailleur
938936b8f2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/core/lib/functions.lib.php
2015-02-20 22:51:47 +01:00
Laurent Destailleur
e1e31de229
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-02-20 20:15:04 +01:00
Laurent Destailleur
ec56667f5e
Fix: [ bug #1849 ] Broken flag image when a contact does not have a
...
country set
2015-02-19 09:44:22 +01:00
Laurent Destailleur
d1a4b6c2c5
phpcs
2015-02-19 00:04:35 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Marcos García de La Fuente
3efb737cbf
Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php"
2015-02-16 12:30:10 +01:00
Marcos García de La Fuente
6f08893016
Fix: [ bug #1846 ] Browser IE11 not detected
2015-02-16 12:26:20 +01:00
Laurent Destailleur
448655ea45
First work on a new module for expense report matching dolibarr
...
standard to replace current one.
2015-02-14 18:39:45 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
58a61e1294
Changed int typecast to float
2015-02-10 00:23:32 +01:00
Marcos García de La Fuente
949f9e40a0
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
2015-02-10 00:20:47 +01:00
Laurent Destailleur
3bdf8864a9
New: Add option MAXTABS_IN_CARD to limit number of visible tabs.
2015-02-07 04:24:31 +01:00
Laurent Destailleur
01541e4152
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/core/datepicker.php
2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe
Fix pb into date management.
...
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
Laurent Destailleur
21c78cc392
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-02 21:45:31 +01:00
Laurent Destailleur
7809013b96
Message is more clear.
2015-02-02 13:33:16 +01:00
Laurent Destailleur
6976aec04b
Merge pull request #2289 from accett/patch-2
...
Currency symbol in Mexico
2015-01-31 19:40:57 +01:00
Laurent Destailleur
13019f1f33
Clean code introduced by last PR.
2015-01-31 17:02:36 +01:00
Laurent Destailleur
1e72d49858
Merge pull request #2286 from accett/patch-1
...
New: Introduce num to text function and use sign before amout for mexico currency
2015-01-31 15:55:16 +01:00
Laurent Destailleur
291340a39f
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-30 16:34:18 +01:00
Laurent Destailleur
d6dc495a42
Removed bad print
2015-01-30 16:01:56 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
AcceTT Soluciones Computacionales
608b099934
Currency symbol in Mexico
...
I tried to change the order of the currency symbol in Mexico is before.
2015-01-26 21:38:43 -06:00
accett
62ae75b3bf
Update for Mexico Users
...
Add MXN in the array for countries use the sign currency before. (Mexico does). Add function float2text_moneda to convert the number in the text form for tickets, facture, proposals, etc.
2015-01-26 14:38:02 -06:00
Laurent Destailleur
ffde00de81
Fixed date change was lost when changing event assignement.
2015-01-26 10:31:41 +01:00
Laurent Destailleur
57c84089fe
Introduce warning to remind to do a backup before migration.
...
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
3ebaaa38d2
Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC
2015-01-25 16:04:37 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
9876b30387
Need more info to find bugs
2015-01-17 16:22:37 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
Laurent Destailleur
68441a563a
Fixed: Avoid space into address string
2015-01-14 19:17:58 +01:00
Laurent Destailleur
a2c9d5bd4a
Fixed balance of td introduced by MAX_TAB option.
2015-01-14 19:10:21 +01:00
Laurent Destailleur
e10b5637d4
Fixed: Avoid spaces into address string
2015-01-14 18:54:56 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
fentman
9049931ff0
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-09 22:55:17 +01:00
fentman
742ec954cd
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-08 11:21:25 +11:00
aspangaro
b4b5b35afa
Skype :: Better presentation
2015-01-04 20:17:49 +01:00
Laurent Destailleur
baa247ea86
Fixed: doxygen
2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02
Enhance look for contacts forms of thirdparties.
2014-12-30 21:04:02 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
BENKE Charles
b45bd06475
Update functions.lib.php
...
Add feature to limit the number of tabs in a card (based on google menu practice)
function actived with MAXTABS_IN_CARD dictionnary
watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008
or here.
All the code is in one function, need to explode/refactoring it on diferent css
2014-12-22 12:26:04 +01:00
Laurent Destailleur
4769e26d8e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
d9aba405dd
Fix: utf must be default value.
2014-12-18 10:09:47 +01:00
Frédéric FRANCE
66f634f217
Update functions.lib.php
2014-12-09 20:47:54 +01:00
Frédéric FRANCE
590618eb38
Update functions.lib.php
2014-12-09 20:17:13 +01:00
Laurent Destailleur
a8052d8ea4
Fixed: Several fix in color management (function at wrong place, mark
...
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:12:27 +01:00
Laurent Destailleur
0ea7d51b22
Fixed: Several fix in color management (function at wrong place, mark
...
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:05:22 +01:00
Laurent Destailleur
c731321024
New: Function yn can show a visual checkbox
2014-12-07 01:57:23 +01:00
Juanjo Menent
fe23a851e7
Fix: datepicker first day of week can be monday by setting into
...
display setup
2014-12-06 11:03:48 +01:00
Juanjo Menent
430b2ff8db
Fix: datepicker first day of week can be monday by setting into
...
display setup
2014-12-06 11:00:49 +01:00
Laurent Destailleur
83122ebe1e
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
...
for release.
2014-12-04 13:20:56 +01:00
Laurent Destailleur
df9a6dae6c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Laurent Destailleur
38062177d3
Doxygen
2014-11-28 00:37:46 +01:00
Francis Appels
18406fc550
Fix: Show sender Country on PDF docs
...
Show sender Country on PDF docs when sender Country != receiver Country
2014-11-25 14:26:45 +01:00
Laurent Destailleur
e3a8041b0d
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/facture.php
htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Florian HENRY
c0a3606a59
Fix problem on task creation with chrome for french browser.
2014-11-12 22:53:23 +01:00
Laurent Destailleur
0b70d26275
Keep commented code to keep a chance for old php version to work.
2014-11-07 22:06:51 +01:00
Laurent Destailleur
b74bdb8f7d
Fix: Bad error message
2014-11-02 11:39:30 +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
Laurent Destailleur
9b24cccd0b
Fix: Better layout detection
2014-10-19 12:24:36 +02:00
Laurent Destailleur
dbbf31d87b
Fix: Restore comaptibility with all languages.
...
Fix: Corrupting data function.
2014-10-18 00:41:21 +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
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
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
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
5c5f725a34
Fix scrutinizer
2014-10-05 01:22:17 +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
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ca3c5d9513
Fix: invalid list of params
...
Fix: loading of sql menu
2014-09-19 14:36:55 +02:00
Raphaël Doursenaud
0f71b7e0b0
FIX: Typo
2014-09-19 03:07:54 +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
49db9d1304
Fix: Avoid explode when separator : is not.
2014-09-18 17:12:51 +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
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
6d9cc15856
Fix: Function unaccent was not enough complete.
2014-09-06 14:40:43 +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
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
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
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
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
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
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
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
3011ecf6df
Fix: PHPCS
2014-07-28 19:55:12 +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
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
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
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
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
bcafa2c790
Corrected file_exists check and little refactor
2014-07-17 21:44:59 +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
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
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
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
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
e2afa6853b
Fix: Deletion of translation has disappeared.
2014-06-20 15:05:39 +02:00
Laurent Destailleur
3791175536
Fix: doxygen
2014-06-20 13:07:15 +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
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +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
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
872e764c94
Fix: html detection was not working with hx tags.
2014-05-24 14:57:41 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +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
1bc3558307
Fix: Better html detection
2014-05-07 19:06:15 +02:00
Laurent Destailleur
bcdf3e8a51
New: The combo list of juridical status is now sorted
2014-05-04 23:46:36 +02:00
Laurent Destailleur
7bb23086b8
Fix: Strict mode
2014-05-01 17:06:14 +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
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
83dd3a532b
Qual: Better type check
2014-04-23 18:23:50 +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
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
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
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
14d8bfef3a
New: Improved Opensurvey module: Description of survey use wysiwig
...
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
2014-03-17 12:40:12 +01:00
Laurent Destailleur
2d3c700a7d
Fix: When cloning product, autogenerating barcode must not use same
...
number.
Qual: Moved dedicated permission of module to "advance" permissions.
2014-03-16 17:37:54 +01:00
Laurent Destailleur
998ecc3c15
Optimize code.
2014-03-01 15:59:09 +01:00
Marcos García de La Fuente
e963f55593
Corrected CS error
2014-02-25 13:34:33 +01:00
Marcos García de La Fuente
d69939b7b1
Function dol_clone is now a deprecated function
2014-02-25 04:29:09 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
Laurent Destailleur
8c9d2418d2
Qual: Move common javascript function into lib_head.js
2014-02-19 11:08:43 +01:00
Laurent Destailleur
867c83680b
Merge remote-tracking branch 'origin/3.5' into develop
2014-02-17 18:22:49 +01:00
Laurent Destailleur
1cfcda702e
Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not
...
work.
2014-02-17 17:32:25 +01:00
Laurent Destailleur
57153e4de4
Try a cleaner javascript escape function.
2014-02-13 23:40:39 +01:00
Laurent Destailleur
aa69927089
Move table title nowrap tag at a better place.
2014-01-15 18:35:15 +01:00
Laurent Destailleur
02989b9f32
New: An external module can add tabs with a label that is a dynamic
...
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
2014-01-12 14:11:03 +01:00
Laurent Destailleur
5bdd7fc074
Fix: Doxygen
2014-01-10 03:39:43 +01:00
Laurent Destailleur
7809e0baa9
Fix: dol_htmlentitiesbr behaviour was different if input was html
...
or not. Add phpunit test to avoid that in future.
2014-01-10 01:25:28 +01:00
Laurent Destailleur
6ff337ccad
New: Add option 'aZ' into GETPOST function to check parameters
...
contains only a to z or A to Z characters.
2014-01-08 00:10:39 +01:00
Laurent Destailleur
0e3757aa5c
New: Add option 'az' into GETPOST
2014-01-08 00:05:14 +01:00
Laurent Destailleur
eadccb5d9b
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/langs/bg_BG/main.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/et_EE/admin.lang
htdocs/langs/et_EE/agenda.lang
htdocs/langs/et_EE/banks.lang
htdocs/langs/et_EE/bills.lang
htdocs/langs/et_EE/commercial.lang
htdocs/langs/et_EE/companies.lang
htdocs/langs/et_EE/compta.lang
htdocs/langs/et_EE/dict.lang
htdocs/langs/et_EE/help.lang
htdocs/langs/et_EE/main.lang
htdocs/langs/et_EE/margins.lang
htdocs/langs/et_EE/other.lang
htdocs/langs/et_EE/stocks.lang
htdocs/langs/et_EE/suppliers.lang
htdocs/langs/et_EE/users.lang
htdocs/langs/et_EE/withdrawals.lang
htdocs/langs/lv_LV/admin.lang
htdocs/langs/lv_LV/agenda.lang
htdocs/langs/lv_LV/banks.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/lv_LV/boxes.lang
htdocs/langs/lv_LV/opensurvey.lang
htdocs/langs/lv_LV/users.lang
htdocs/langs/ro_RO/admin.lang
htdocs/langs/ro_RO/banks.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/companies.lang
htdocs/langs/ro_RO/compta.lang
htdocs/langs/ro_RO/cron.lang
htdocs/langs/ro_RO/dict.lang
htdocs/langs/ro_RO/help.lang
htdocs/langs/ro_RO/main.lang
htdocs/langs/ro_RO/margins.lang
htdocs/langs/ro_RO/other.lang
htdocs/langs/ro_RO/stocks.lang
htdocs/langs/ro_RO/suppliers.lang
htdocs/langs/ro_RO/withdrawals.lang
htdocs/langs/uz_UZ/main.lang
2013-12-31 12:18:31 +01:00
Laurent Destailleur
e142bd252d
Fix: disable code making jmobile crazy.
2013-12-31 10:48:15 +01:00
Laurent Destailleur
b35f44e3cb
New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs
...
when you use the "print" view on screen.
2013-12-19 20:57:13 +01:00
Laurent Destailleur
9a07f31a8c
Doxygen
...
Bad translation
2013-12-13 17:36:43 +01:00
Laurent Destailleur
519919889c
Fix comment
2013-11-30 16:57:11 +01:00
