Commit Graph

42351 Commits

Author SHA1 Message Date
Laurent Destailleur
131c8398ce Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 00:13:48 +02:00
Laurent Destailleur
b182b2ff44 Update changelog 2014-08-06 00:11:42 +02:00
Laurent Destailleur
f33df3419c Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:25:47 +02:00
Laurent Destailleur
3a4a1a4c72 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-05 18:28:52 +02:00
Laurent Destailleur
5027222c33 Fix: When there is an error to update a thirdparty, the number for
supplier and customer code is kept to old value.
2014-08-05 18:28:06 +02:00
Laurent Destailleur
ee3f92a168 Fix: When there is an error to update a thirdparty, the number for
supplier and customer code is kept to old value.
2014-08-05 18:22:01 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
2014-08-04 22:18:30 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
2014-08-04 12:49:54 +02:00
Laurent Destailleur
863d57004e Fix: Field must be invisible 2014-08-04 10:44:19 +02:00
Laurent Destailleur
c7d4b1e3d5 Merge pull request #1802 from FHenry/3.6
Fix extrafield parameters for sellist
2014-08-04 09:13:42 +02:00
Laurent Destailleur
d14fcf617c Merge pull request #1799 from FHenry/3.5
Fix : Fusion PDF button on unpaid invoice is no more displayed
2014-08-04 09:08:47 +02:00
Laurent Destailleur
e56956110f Merge pull request #1796 from atm-maxime/3.5
Fix : shipping list SQL request was not filtering on shipping element
2014-08-04 08:58:41 +02:00
Laurent Destailleur
8167f30833 Fix: Exclude dev dir from bin package. 2014-08-04 01:25:38 +02:00
Laurent Destailleur
b5bb4c639c Fix: Clean data 2014-08-04 00:15:23 +02:00
Laurent Destailleur
0834178bf5 Add more colors to fix pb with agenda 2014-08-04 00:15:08 +02:00
Laurent Destailleur
bf7a33494e Run request to clean data 2014-08-03 23:55:33 +02:00
Laurent Destailleur
86b2887d44 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-03 23:54:05 +02:00
Laurent Destailleur
b16dc8dbcd Fix: Tab not selected 2014-08-03 23:51:26 +02:00
Laurent Destailleur
8ea52f52f5 Fix: Missing counter into document tab 2014-08-03 23:48:27 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
9fb11cd13b Fix: Action created by triggers does not saved owner of action. 2014-08-03 23:20:32 +02:00
Laurent Destailleur
4c91788941 Fix: Can not set option when using in nojs mode. 2014-08-03 22:08:25 +02:00
Laurent Destailleur
6ff57e57c2 Fix: external link is visible when a module is using tabhelp of
dictionary.
2014-08-02 00:34:54 +02:00
Juanjo Menent
c15da5f257 Fix: Price by customer: a client must be able to have multiple products
with customer prices
2014-08-01 18:22:39 +02:00
Laurent Destailleur
41f846ac6e Fix: Bad param 2014-08-01 17:13:23 +02:00
Florian HENRY
b0011d0514 remove debug 2014-08-01 16:50:47 +02:00
Florian HENRY
767ca07374 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 16:48:59 +02:00
Florian HENRY
17e272c8ac Fix extrafield parameters for sellist 2014-08-01 16:48:16 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with
enter keyboard input instead of lens click)
2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Florian HENRY
8f8c6a9c9e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-01 14:56:30 +02:00
Laurent Destailleur
c6d491b0b9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 14:49:24 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Juanjo Menent
32e110b6d9 Fix: Price by customer 2014-08-01 13:25:29 +02:00
Laurent Destailleur
a5a7fb4967 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-01 11:15:45 +02:00
Laurent Destailleur
6917b97420 Fix: Missing link.lang file into transifex sync. 2014-08-01 11:13:13 +02:00
Maxime Kohlhaas
23974daca4 Fix : shipping list SQL request was not filtering on shipping element 2014-08-01 09:57:08 +02:00
Laurent Destailleur
cf72c05a99 Fix: debian package provided by dolibarr team use embedded libraries. 2014-08-01 02:11:37 +02:00
Laurent Destailleur
33a60bc14e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 02:02:14 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Regis Houssin
977300c653 Fix: missing skin.js 2014-07-31 11:15:30 +02:00
Laurent Destailleur
1b16f87569 Merge pull request #1783 from defrance69/patch-4
Update consumption.php
2014-07-30 11:37:43 +02:00
BENKE Charles
fb4e64fdab Update consumption.php
security access fix : we don't have right to access of invoice and order if we are not agreed
2014-07-29 11:28:46 +02:00
Laurent Destailleur
c9d27383a4 Fix: When option to use optimize display for text borwser and blin
person is on, box addon was broken.
2014-07-29 00:50:57 +02:00
Laurent Destailleur
096a61d5c0 Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong
translate.
2014-07-28 20:35:32 +02:00
Laurent Destailleur
21c7972f7e Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
is not enabled.
2014-07-28 20:34:51 +02:00
Laurent Destailleur
6d7b50d5d4 Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
is not enabled.
2014-07-28 20:34:42 +02:00
Laurent Destailleur
1a96bc0f30 Fix: Bad url for cron
Fix: must use html syntax, not xml
2014-07-28 20:33:37 +02:00
Florian HENRY
30b41fbd18 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-28 16:30:38 +02:00
Laurent Destailleur
0ca72dcfea Fix: Restore compatibility with old modules. 2014-07-27 23:53:46 +02:00