Laurent Destailleur
52407f88c4
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-05 21:59:23 +02:00
Laurent Destailleur
61d5359f23
Fix: Uniformize menu entries
2013-06-05 21:55:51 +02:00
Laurent Destailleur
e25651204c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/admin.lib.php
2013-06-05 18:56:41 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
ebb8f05f09
Subscription to ML can also be done according to member type
2013-06-05 15:53:27 +02:00
Laurent Destailleur
eac4aa7e28
New: Module mailman can subscribe/unsubscribe to ML according to
...
categories of member.
2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/infobox.class.php
2013-06-04 22:59:28 +02:00
Laurent Destailleur
c6c4a83850
Fix: Removed deprecated code fo local tax type 7 since we can use now
...
the fiscal stamp that is a better implementation.
2013-06-04 12:04:04 +02:00
Laurent Destailleur
22bde298de
Fix: First permission must start with 1
2013-06-03 23:06:15 +02:00
Laurent Destailleur
e871ea64eb
Fix: Regression
2013-06-03 19:52:34 +02:00
Laurent Destailleur
1aa5535741
New: Add function to get http content
2013-06-03 17:44:55 +02:00
Laurent Destailleur
c1dd2f20cd
Qual: Clean code.
2013-06-03 15:18:36 +02:00
Laurent Destailleur
1ff175f14e
Fix: Bad regex
2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c
Fix: Loading of boxes from external modules
2013-06-03 12:43:14 +02:00
Laurent Destailleur
7dc984fd6f
Fix: Loading of boxes from external modules
2013-06-03 11:33:13 +02:00
Laurent Destailleur
a1a8fac25c
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-03 11:15:15 +02:00
Laurent Destailleur
c5783215c4
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:46:36 +02:00
Laurent Destailleur
8348596aea
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:45:03 +02:00
Laurent Destailleur
b3b80701fd
Fix: Bug with jmobile
2013-06-01 02:03:19 +02:00
Laurent Destailleur
743da5a214
Fix: function to get localtax1 or 2 value from vat rate return bad value
...
when countries differs.
Conflicts:
htdocs/langs/fr_CA/main.lang
2013-05-31 21:33:48 +02:00
Laurent Destailleur
92346296f0
Doxygen
2013-05-31 21:17:49 +02:00
Laurent Destailleur
a85fea9317
Fix: function to get localtax1 or 2 value from vat rate return bad value
...
when countries differs.
2013-05-31 21:03:24 +02:00
Laurent Destailleur
da73a8d84c
Fix: syntax error
...
Fix: Bad field param
2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e
Fix: Bad param used
2013-05-31 16:35:32 +02:00
Laurent Destailleur
5254f102ba
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 16:34:02 +02:00
Laurent Destailleur
ba6d82686f
Fix: Menu dictionnary
2013-05-31 14:54:10 +02:00
Laurent Destailleur
0ec32afd8d
Fix: syntax error
...
Fix: Bad field param
2013-05-31 13:30:24 +02:00
Laurent Destailleur
c285f81844
Fix: Bad param used
2013-05-31 13:21:01 +02:00
Laurent Destailleur
da40c460bb
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 10:56:48 +02:00
simnandez
7fa0d6cffa
Fix: [ bug #916 ] Same for Thirds and Members
2013-05-30 18:00:08 +02:00
simnandez
5fa2598a6f
Fix: [ bug #916 ] Same for Thirds and Members
2013-05-30 17:58:48 +02:00
Laurent Destailleur
5bba5782a4
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-29 21:22:27 +02:00
Laurent Destailleur
b36a10babf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-29 21:05:48 +02:00
simnandez
4f9b5883df
Fix: [ bug #916 ] Products complementary attributes, imports and
...
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports
No Changelog Update need, because complementary attributes is new in 3.4
2013-05-29 18:18:24 +02:00
simnandez
00395c87a8
Fix: [ bug #916 ] Products complementary attributes, imports and
...
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports
No Changelog Update need, because complementary attributes is new in 3.4
2013-05-29 18:17:39 +02:00
Laurent Destailleur
e6c93424ce
Qual: Normalized tabs
2013-05-29 15:41:59 +02:00
Laurent Destailleur
b2600e8880
Fix: Missing trans
2013-05-29 02:20:30 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d
Fix: But siwtiching to auguria menu.
2013-05-29 01:24:57 +02:00
Laurent Destailleur
9ab8f4c6a3
Merge pull request #998 from FHenry/develop
...
Develop
2013-05-28 15:23:29 -07:00
Laurent Destailleur
b87350e2d6
Merge pull request #994 from defrance69/patch-13
...
Update modSociete.class.php
2013-05-28 15:09:45 -07:00
Florian Henry
8a726ab51b
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-28 21:51:11 +02:00
Florian Henry
23c25066d3
Change comment on dol_include_once
2013-05-28 17:54:55 +02:00
Florian Henry
3ddb410e2e
Change comment on dol_include_once method
2013-05-28 17:53:56 +02:00
BENKE Charles
aa06a0b113
Update modSociete.class.php
...
enhance filter on export of contact
add postorfunction field in export of contact
2013-05-28 15:37:08 +02:00
Laurent Destailleur
dc7b4ebc79
Fix: But siwtiching to auguria menu.
2013-05-28 13:54:29 +02:00
Florian Henry
f543f00024
Fix PGSQL Bugs
...
Removing parenthesis make query works for MySQL and PgSQL
2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222
Fix [ bug #911 ] Reorder intervention do not work
2013-05-26 10:15:43 +02:00
Laurent Destailleur
2005ce8d6e
Fix: Error with jmobile
2013-05-26 05:02:46 +02:00
Laurent Destailleur
f3f4dec96e
Fix: Error with jmobile
2013-05-26 05:01:28 +02:00
