Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
aspangaro
666e66e78f
Correct link in activity box
2014-12-09 05:04:12 +01:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
319295554d
Fix: Free memory after request
2013-06-08 00:52:02 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
854b9df96d
Qual: Clean code of box management
2013-04-23 16:18:26 +02:00
Regis Houssin
55757a6b82
Fix: $i is global
2013-03-27 20:42:55 +01:00
simnandez
5d357c7736
Trad: Fix activity box translation
2013-02-21 18:48:56 +01:00
Laurent Destailleur
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +01:00
Laurent Destailleur
0923102c4a
Fix: Duplicate declaration
2013-01-16 16:53:47 +01:00
Laurent Destailleur
f1f7ff315f
Fix: CRLF
2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
0b045a2d96
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
htdocs/filefunc.inc.php
2013-01-16 14:11:19 +01:00
Laurent Destailleur
1e9cb6b1d4
Qual: A translation file must not be loaded into class constructors, but
...
at output level.
2013-01-15 17:06:53 +01:00
Laurent Destailleur
6a51db82e9
Qual: We can enable box by default because a warning is output to user.
2013-01-15 15:53:35 +01:00
Laurent Destailleur
ec5b4f5fa7
Fix: Start to fix some bug (pgsql compatibility), try to optimize
...
request. Added FIXME tags.
2013-01-15 15:36:04 +01:00
Laurent Destailleur
1851aa4646
Fix: Move not stable feature as experimental. Disabled box by default
...
because there is still some bug (pgsl support, filters) and major
problem to solve (it slow down seriously Dolibarr, result not accurate
for some status).
2013-01-15 15:26:46 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
4e27969317
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-02 22:15:58 +01:00
Laurent Destailleur
cd6e3464db
Fix: Several fixes for bad management of external/internal users.
2013-01-02 14:35:16 +01:00
BENKE Charles
4eab7b004e
Update htdocs/core/boxes/box_activity.php
...
new release with "last 2 year bills"
2013-01-02 11:08:05 +01:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
2726283034
Missing BoxGlobalActivity translation and missing es_ES BoxLatestSupplierOrders translation
2012-08-04 14:45:23 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Laurent Destailleur
7d08bd45d6
Checkstyle
2012-07-25 11:35:34 +02:00
Regis Houssin
887f210618
Fix: avoid warning with php 5.4 and strict mode
2012-07-08 23:22:22 +02:00
Regis Houssin
cc4b2bf69c
New: add box activity
2012-07-04 09:07:15 +02:00