Laurent Destailleur
9eaf8af341
Fix: Removed warning (this can be normal behaviour)
...
Fix: menu manager name has changed
2013-01-28 15:35:29 +01:00
Laurent Destailleur
0beea6c23c
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/install/inc.php
2013-01-28 12:58:16 +01:00
Laurent Destailleur
a8ccc0ab0b
Fix: loghandler loaded twice.
2013-01-28 12:36:15 +01:00
Laurent Destailleur
b98151db94
Fix: A log handler can be loaded twice.
2013-01-28 12:22:12 +01:00
Laurent Destailleur
abd8aea06b
Fix: Log not reported
...
Fix: charset not correctly forced
Conflicts:
htdocs/install/inc.php
2013-01-28 11:56:45 +01:00
Laurent Destailleur
eeba48f9b0
Fix: Log not reported
...
Fix: charset not correctly forced
2013-01-28 11:43:49 +01:00
Laurent Destailleur
c2d334624b
Qual: Simplify system for menu manager. Only one file, one class per
...
manager.
2013-01-25 17:44:23 +01:00
Laurent Destailleur
a7d41d74e8
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-23 18:09:05 +01:00
Laurent Destailleur
7b1e15f340
New: Allow to use upgrade script to upgrade sql of modules
2013-01-23 14:51:15 +01:00
Laurent Destailleur
ec76127625
Fix: http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers
...
Fix: Update member
2013-01-22 15:14:46 +01:00
Laurent Destailleur
05bd489b82
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/admin/index.php
2013-01-21 01:12:19 +01:00
Laurent Destailleur
e236ac3f03
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-21 01:07:22 +01:00
Laurent Destailleur
9cf405f9d2
Fix: syntax error
2013-01-21 01:06:52 +01:00
eldy
5c49947750
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-20 15:32:48 +01:00
eldy
d1dc04761a
Fix: dev rule to build portable requests
2013-01-20 15:30:51 +01:00
eldy
6ded74d5dd
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-20 15:22:14 +01:00
eldy
fc011610bb
Fix: pgsql
2013-01-20 15:21:18 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
f701559056
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-19 14:32:50 +01:00
Laurent Destailleur
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +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
simnandez
a57f291aa2
Fix: Bad Spanish departament name
2013-01-18 09:28:54 +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
d40440fc45
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-16 14:21:56 +01:00
fhenry
e3fd60c762
Add adherent type extrafield extrafield table in migration script
2013-01-16 13:49:44 +01:00
Laurent Destailleur
5497b93247
Fix: Removed warning
2013-01-16 13:43:25 +01:00
Laurent Destailleur
f57409ddcd
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-15 12:06:41 +01:00
Laurent Destailleur
285bcbecb7
Fix: init of new syslog handler system
2013-01-14 17:12:13 +01:00
Laurent Destailleur
0861fbfeb6
Fix: Missing kenya currency
2013-01-13 23:47:23 +01:00
Laurent Destailleur
29e6d01e51
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Laurent Destailleur
ec8b260bf6
New: Prepare 3.4 branch
...
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
Laurent Destailleur
8ac33e98e7
Fix: property object_total_discount was not working when quantity was
...
not 1.
2013-01-10 12:58:46 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
5c51905f63
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3
Fix: Example an label of category import
2013-01-09 13:29:12 +01:00
fhenry
23b2aa6a7b
[ task #664 ] Add extrafields behaviours to Member Type
2013-01-08 19:16:39 +01:00
Laurent Destailleur
142f171e50
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/.gitignore
2013-01-08 11:10:47 +01:00
eldy
24d3fdfe6c
Fix: bad setup entry page
2013-01-06 21:52:59 +01:00
eldy
2c59c6311f
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-06 21:36:39 +01:00
eldy
492d00ee86
Fix: Syntax error with pgsql
2013-01-06 20:45:03 +01:00
Cedric GROSS
6a9c3dee52
Add SASU form
2013-01-05 17:07:25 +01:00
simnandez
d0265db3d2
Fix: Modify Spanish localtax2 to new rate
2013-01-05 09:07:01 +01:00
simnandez
9a3681e6b0
Fix: Bug creating invoice from a contract
2013-01-04 16:23:15 +01:00
Marcos García
406ce9e11c
Update changelog + update deprecated triggers in database
2012-12-31 04:11:13 +01:00
Laurent Destailleur
86c9011437
Merge pull request #561 from marcosgdf/3.3
...
Updated changelog + also removed unused triggers when migrating from 3.2.X
2012-12-30 08:36:25 -08:00
Laurent Destailleur
753d79f181
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8
Fix: Normalize trigger names for fichinter module.
2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
