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
3551dff18a
Fix: [ bug #671 ] Product country origin is automatically entered in
...
description of invoices, but not in invoices generated from orders
2013-01-19 15:57:28 +01:00
Laurent Destailleur
7002b328a8
Fix: [ bug #685 ] Supplier invoices should use encoding sequence number
...
as secondary sorting field
2013-01-19 15:32:03 +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
0e060cac11
Merge pull request #619 from FHenry/develop
...
Update web service
2013-01-18 09:39:13 -08:00
Laurent Destailleur
aaa56ce606
Merge pull request #618 from simnandez/3.3
...
Fix: Bad Spanish departament name
2013-01-18 09:30:45 -08: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
060edf21da
New: Add more PHPUnit tests to prepare removal of adodb.
2013-01-18 15:54:40 +01:00
Laurent Destailleur
591eab4826
Detect another problem into box. Just add a comment.
2013-01-18 14:22:18 +01:00
Laurent Destailleur
a12972034f
Fix: Start to fix some bugs
2013-01-18 13:56:36 +01:00
Laurent Destailleur
3438b9fa62
Fix: init specimen
2013-01-18 12:32:10 +01:00
Laurent Destailleur
f650888ea6
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d
Fix: Bad error management
2013-01-18 12:09:39 +01:00
Laurent Destailleur
57a869683d
Fix date function
2013-01-18 11:28:06 +01:00
fhenry
e4b704f76d
Update web service
2013-01-18 11:10:56 +01:00
Laurent Destailleur
abafd4f4ff
Fix: separator was working only once.
2013-01-18 11:05:18 +01:00
simnandez
a57f291aa2
Fix: Bad Spanish departament name
2013-01-18 09:28:54 +01:00
Laurent Destailleur
34c5343103
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-17 20:56:28 +01:00
Laurent Destailleur
0c418160b9
Fix: exclude files
2013-01-17 20:56:13 +01:00
Laurent Destailleur
91f666bd90
Merge pull request #617 from FHenry/develop
...
Fix bug on update thirdpartty webservice
2013-01-17 11:28:35 -08:00
fhenry
685400c20e
Fix bug on web service
2013-01-17 18:49:21 +01:00
Laurent Destailleur
6091f74b13
New: First changes to simplify/optimize menu management.
2013-01-17 18:39:15 +01:00
fhenry
9d5ab6daa0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-17 18:04:47 +01:00
fhenry
f665980ef0
Fix bug on update thirdpartty webservice
2013-01-17 18:03:10 +01:00
Laurent Destailleur
db54f5af44
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-17 18:02:51 +01:00
Laurent Destailleur
c16269d04e
Fix: load at wrong place
...
Conflicts:
htdocs/core/class/html.formother.class.php
2013-01-17 17:59:47 +01:00
Laurent Destailleur
9d5b36b27b
Fix: error set on non object
2013-01-17 17:54:08 +01:00
Laurent Destailleur
b89b74e933
Fix: load at wrong place
2013-01-17 17:40:27 +01:00
Laurent Destailleur
66921cf24a
Prepare 3.4
2013-01-17 13:19:17 +01:00
Laurent Destailleur
f0f347394a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-17 13:15:30 +01:00
Laurent Destailleur
cccc7d1af3
Fix: comments
2013-01-17 13:02:34 +01:00
Laurent Destailleur
2b8aa54f68
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-17 10:32:49 +01:00
Laurent Destailleur
b158758e7c
Fix: Missing exclude dir
2013-01-17 10:32:00 +01:00
Laurent Destailleur
9134dfc896
Prepare 3.4
2013-01-17 10:25:40 +01:00
Laurent Destailleur
c222f39c76
Prepare 3.4
2013-01-17 10:22:26 +01:00
Laurent Destailleur
dddcc0b424
Update doc
2013-01-16 21:31:27 +01:00
Laurent Destailleur
3685911bfa
Merge pull request #616 from FHenry/3.3
...
Fix bug [ bug #694 ] Set security permision to user belong to group
2013-01-16 11:45:33 -08:00
Laurent Destailleur
2f528cc090
Merge pull request #615 from simnandez/3.3
...
Trad: Best ca_ES and es_ES translations
2013-01-16 11:40:35 -08:00
fhenry
968e980f58
Fix bug [ bug #694 ] Set security permision to user belong to group
2013-01-16 18:58:39 +01:00
simnandez
e820e62c03
Trad: Best ca_ES and es_ES translations
2013-01-16 18:19:48 +01:00
Laurent Destailleur
533f162e3e
Fix: var not defined
2013-01-16 17:09:46 +01:00
Laurent Destailleur
0923102c4a
Fix: Duplicate declaration
2013-01-16 16:53:47 +01:00
Laurent Destailleur
f97f34a302
Update doc
2013-01-16 16:28:36 +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
Laurent Destailleur
6d843e76e1
Merge pull request #614 from FHenry/develop
...
Add adherent type extrafield extrafield table in migration script
2013-01-16 05:20:07 -08: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
