Commit Graph

41207 Commits

Author SHA1 Message Date
aspangaro
79d8ce9d1d Add tabs in bank card 2014-04-12 10:00:28 +02:00
aspangaro
bae2fe0921 Merge branch 'upstream/develop' 2014-04-12 09:51:19 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
918de2d0a1 Fix: Payment detail are not visible. 2014-04-11 19:20:11 +02:00
Laurent Destailleur
5843668dbe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-11 19:02:59 +02:00
Laurent Destailleur
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02:00
Juanjo Menent
f458c384d7 Fix: Can not make withdrawals
Conflicts:
	ChangeLog
2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232 Fix: Can not make withdrawals 2014-04-11 12:07:01 +02:00
Laurent Destailleur
55599f9455 Fix: MAIN_AUTOFILL_DATE was broken in some cases. 2014-04-10 19:47:52 +02:00
Laurent Destailleur
7fcf57ca5a Fix: SQL request for export. Extra field missing. 2014-04-10 18:36:34 +02:00
Laurent Destailleur
4be113b2e8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-10 17:55:14 +02:00
Laurent Destailleur
30731e6c91 Fix: Must use $this 2014-04-10 17:51:42 +02:00
Laurent Destailleur
5d4b861156 Fix: Try/catch
Conflicts:
	htdocs/core/class/conf.class.php
2014-04-09 17:09:38 +02:00
Laurent Destailleur
b586b74c79 Fix: Try/catch 2014-04-09 17:07:27 +02:00
Laurent Destailleur
13929bc46f New: showrefnav can be used with tables without prefix. 2014-04-09 13:19:31 +02:00
Laurent Destailleur
351ab9788b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-09 01:38:54 +02:00
Laurent Destailleur
e061c442a6 Fix: hour:min not saved 2014-04-09 01:18:42 +02:00
Laurent Destailleur
6f40825270 Merge pull request #1527 from grandoc/3.5
translation and cleaning
2014-04-09 00:31:57 +02:00
Laurent Destailleur
13659b1528 Fix: [ bug #1334 ] filter lost when sorting into list of memebers. 2014-04-09 00:12:07 +02:00
Laurent Destailleur
60b37dffe1 Fix: [ bug #1323 ] generation of odt files for tasks. 2014-04-09 00:07:32 +02:00
Laurent Destailleur
4e619c42fa Fix: [ bug #1340 ] Erreur de langage dans les projets 2014-04-08 23:56:10 +02:00
Laurent Destailleur
e0e64af18c Fix: Hierarchical user not saved. 2014-04-08 23:51:50 +02:00
Laurent Destailleur
30dae3def2 Doc 2014-04-08 23:28:26 +02:00
Laurent Destailleur
89dca04720 Update doc 2014-04-08 23:06:58 +02:00
Grand Philippe
9a056ab497 anglicizing 2014-04-08 14:05:10 +02:00
Grand Philippe
9dd499b133 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2014-04-08 13:47:17 +02:00
Laurent Destailleur
eb0d98d406 Comment 2014-04-07 20:41:33 +02:00
Laurent Destailleur
ab3bbf8e0b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop
2014-04-07 13:15:26 +02:00
Laurent Destailleur
2035e6e648 Fix: The " " is not more allowed as value for SeparatorThousand. We must
use "Space". This solve a lot of problem into translation process.
2014-04-07 13:08:04 +02:00
Grand Philippe
fe49f55a48 fix from forum 2014-04-07 11:01:11 +02:00
Grand Philippe
f25ddfbc9c Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2014-04-07 10:03:01 +02:00
Grand Philippe
42b6628b76 translation and cleaning 2014-04-07 09:54:24 +02:00
Laurent Destailleur
a96f762f40 Sync from transifex. 2014-04-07 09:23:50 +02:00
Laurent Destailleur
dc6a09f746 Doc 2014-04-07 00:00:30 +02:00
Laurent Destailleur
2b38ec3912 Merge pull request #1526 from defrance69/patch-4
Update fournisseur.commande.class.php
2014-04-06 23:45:07 +02:00
Laurent Destailleur
26fa5c0857 Merge pull request #1525 from grandoc/debug
anglicized
2014-04-06 23:44:47 +02:00
Laurent Destailleur
5eeb6b8445 Fix: Use "Space" instead of " " when we need space as Thousand
Separator.
2014-04-06 23:43:32 +02:00
Laurent Destailleur
6a916a4ce9 Add sq_AL (albanian) language 2014-04-06 23:29:07 +02:00
Laurent Destailleur
6f47e2e154 Ignore file 2014-04-06 21:25:53 +02:00
Laurent Destailleur
3bc63c43dc Fix: [ bug #1322 ] notification d'erreur en insérant ou supprimer un
tiers dans une catégorie
2014-04-06 21:25:26 +02:00
BENKE Charles
def7d1d2c8 Update fournisseur.commande.class.php
$id not defined but used
2014-04-06 21:21:08 +02:00
Laurent Destailleur
41a2ce1a74 Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales
Conflicts:
	htdocs/comm/propal.php
2014-04-06 21:21:08 +02:00
Laurent Destailleur
1c21c00fb6 New: Can use "Space" as value for SeparatorThousand into language files 2014-04-06 21:18:21 +02:00
Laurent Destailleur
a2531872cb Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 2014-04-06 21:17:35 +02:00
Laurent Destailleur
5aee7131af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-06 20:47:29 +02:00
Laurent Destailleur
18f4eabbdf Update conf template 2014-04-06 19:09:10 +02:00
philippe
8dc23025ed anglicized 2014-04-06 16:06:54 +02:00
Grand Philippe
3734c4de0b Merge branch 'develop' into debug 2014-04-06 15:59:03 +02:00
Laurent Destailleur
b77e068a72 New: More information into email confirm for paybox payment. 2014-04-06 15:01:45 +02:00
Laurent Destailleur
2be6b2ecf7 Fix: var not initialized 2014-04-06 14:53:42 +02:00