Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Laurent Destailleur
2764fb240f
Fix text color for category tags
...
Fix banner for category translation tab
2016-01-10 00:11:49 +01:00
Juanjo Menent
c47e18b7e2
Merge pull request #4197 from atm-ph/new_mail_input_file_multiple
...
NEW hidden conf to use input file multiple from mail form
2016-01-09 17:57:50 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
befe58ab98
Fix selection of first entry into select
2016-01-07 13:44:19 +01:00
Laurent Destailleur
4e2d4a6651
Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible.
...
Solved this by completing tooltip info.
2016-01-07 11:01:37 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Laurent Destailleur
d5fa91f7ba
Fix several bugs in css and in jmobile usage
2016-01-02 20:48:19 +01:00
Laurent Destailleur
04c5516483
Fix the format "dayall" does not exists. Instead add missing format
...
"_locale" using correct language file.
2016-01-02 11:51:40 +01:00
BENKE Charlie
dbb8e49654
Update commondocgenerator.class.php
2016-01-01 12:47:27 +01:00
BENKE Charlie
b1aba4b93b
Add rfc and dayall format for extrafields date
2015-12-31 18:50:28 +01:00
Laurent Destailleur
2cbcbb8f85
Merge pull request #4319 from ParisLiakos/develop
...
FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
2015-12-31 15:04:16 +01:00
Paris Liakos
b6b422042c
MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
2015-12-29 03:43:49 +02:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Bahfir Abbes
ce49c0d5dc
Update conf.class.php
...
I used dol_sanitizeFileName only for $file in order to not clean the two '/' characters needed in the path
2015-12-27 18:27:18 +01:00
Laurent Destailleur
5afed31265
Merge pull request #4305 from marcosgdf/bug-4036
...
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
2015-12-27 17:37:29 +01:00
Marcos García de La Fuente
c40c695d20
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
2015-12-27 14:58:33 +01:00
Marcos García de La Fuente
686348a0d6
FIX #4287 SQL error when accessing an unexisting proposal
2015-12-25 11:47:48 +01:00
Bahfir Abbes
0027e1a8ba
Include local constants files and fetch their values to the corresponding database constants
...
Modules may declare their file constants in a file named as : "module name"_consts.php and located in the module root folder.
They may also assign a correspondence between file constants they define and their equivalent database constants in a table named $file2bddconsts defined in their constants file.
To get this two functions the module need to add its name to the list of modules in LOCAL_CONSTS_FILES.
2015-12-24 20:25:54 +01:00
Laurent Destailleur
74e8738ca7
Fix: if option to select thirdparties using a combo box after n chars
...
was on, it was no more possible to clear the filter.
2015-12-24 11:24:56 +01:00
Laurent Destailleur
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
0a515ca8c0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:38:23 +01:00
Laurent Destailleur
7e03aaee23
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
2015-12-21 12:24:24 +01:00
Laurent Destailleur
f0802eb36b
FIX #4245 PHP 7
2015-12-19 19:48:36 +01:00
Laurent Destailleur
9334cf8fd1
FIX #4243 sql injection
2015-12-19 18:03:08 +01:00
Laurent Destailleur
d7e9c92144
Fix bad link on category
...
Fix cancel button on categories
Css enhancement.
2015-12-19 13:55:27 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
Laurent Destailleur
cdc408a84c
Fix: button "now" was not working on date using no javascript
2015-12-17 17:16:26 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
Laurent Destailleur
acc4623b74
Merge pull request #4236 from defrance/patch-90
...
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 19:25:39 +01:00
Laurent Destailleur
4ef832b94b
Merge pull request #4215 from frederic34/patch-7
...
Update sms.php
2015-12-16 19:02:07 +01:00
BENKE Charlie
afe3e6ac27
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 12:38:32 +01:00
Laurent Destailleur
3e3dbf850f
Fix: bad case for function
2015-12-15 09:44:17 +01:00
Laurent Destailleur
40269c3c70
Fix Remove syntax warnings
2015-12-15 09:43:39 +01:00
Laurent Destailleur
0ec62c05cc
Fix bad var name. Removed warning.
2015-12-14 09:14:34 +01:00
Frédéric FRANCE
1aa232c4a7
Update CSMSFile.class.php
2015-12-13 21:14:53 +01:00
Laurent Destailleur
4d11c8b733
Merge pull request #4212 from frederic34/patch-7
...
typo
2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399
Merge pull request #4214 from frederic34/patch-8
...
typo
2015-12-13 19:39:56 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
7db6ac592f
FIX Option start tls of ldap was not correctly supported.
2015-12-13 15:51:52 +01:00
Frédéric FRANCE
9cc77787c5
typo
2015-12-12 16:10:36 +01:00
Frédéric FRANCE
442f669dc7
typo
2015-12-12 10:45:33 +01:00
Frédéric FRANCE
e193d9be97
Update CSMSFile.class.php
2015-12-10 23:08:21 +01:00
phf
2f5f6c9ead
NEW hidden conf to use input file multiple from mail form
2015-12-10 13:48:37 +01:00
Laurent Léonard
05234390f2
Fix uniqueness of objects reference
2015-12-07 02:02:03 +01:00
Laurent Destailleur
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
5cd43d2df0
Some debug on new features
2015-12-04 20:51:34 +01:00