lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,773 Commits 43 Branches 150 Tags 886 MiB
a38287ffdf
Commit Graph

36773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fhenry
a38287ffdf Deprecated column price into llx_facturedet 2013-05-03 11:16:22 +02:00
fhenry
97192510e2 Fix bug on margin calculation (column price no more use) use subprice 
instead.
 2013-05-03 11:09:58 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Laurent Destailleur
7bb820826f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-02 23:48:33 +02:00
Laurent Destailleur
7e8027218d Merge pull request #912 from FHenry/develop 
Various bug fixing for PgSQL
 2013-05-02 14:47:56 -07:00
Laurent Destailleur
16fbe72f69 Fix: Fedora rules 2013-05-02 23:36:32 +02:00
fhenry
f9328f4018 Propal don't move 2013-05-02 23:00:33 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
77956a5676 Merge pull request #911 from atm-maxime/develop 
Fix : extrafields were save without escape
 2013-05-02 10:43:14 -07:00
Laurent Destailleur
4687350337 Merge pull request #910 from marcosgdf/3.3-translations 
Translation improvements + fixed statut image of returned prelevement
 2013-05-02 10:42:53 -07:00
Laurent Destailleur
3a531f048a Merge pull request #906 from grandoc/3.3 
fix: undefined property
 2013-05-02 10:42:13 -07:00
Laurent Destailleur
36479db0fd Merge pull request #908 from FHenry/3.3 
Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur
 2013-05-02 10:41:31 -07:00
Laurent Destailleur
f595a7ed0c Merge pull request #905 from FHenry/develop 
Add table extrafield for commande fournisseur
 2013-05-02 10:41:02 -07:00
Laurent Destailleur
fa497cf5fc Fix: Trans and wrap 2013-05-02 18:25:27 +02:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning 
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
 2013-05-02 17:41:10 +02:00
fhenry
7e47b37ade Fix [ bug #788 ] Date of linked interventions are not shown 2013-05-02 13:56:14 +02:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02:00
Maxime Kohlhaas
80cf467c47 Fix : extrafields were save without escape 2013-05-02 12:14:29 +02:00
Laurent Destailleur
09c53cbe40 There is confusions with script, so I split it into two different 
scripts.
 2013-05-01 23:23:29 +02:00
fhenry
5d60ed2462 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-01 22:57:33 +02:00
fhenry
8d6f959d31 Fix [ bug #864 ] fournisseur_extrafields 2013-05-01 22:57:03 +02:00
Marcos García
97478ccbf2 Error statut image + not translated strings 2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171 Corrected some es_ES translations and fixed problems with translations not being translated 2013-05-01 20:43:08 +02:00
fhenry
3b6efd569d Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-05-01 17:09:08 +02:00
Laurent Destailleur
cbc56f8044 Fix: W3C 
Fix: Translation
 2013-05-01 16:05:52 +02:00
Laurent Destailleur
5c95018356 Fix: Avoid empty arrays 2013-05-01 16:00:06 +02:00
fhenry
ed9581f77f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-01 14:40:07 +02:00
fhenry
f3480bf502 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 14:38:43 +02:00
Laurent Destailleur
08b656dc0a Look: missing top border 2013-05-01 13:40:24 +02:00
Laurent Destailleur
3dd920d92a Use redhat rule for licence name 2013-05-01 13:37:33 +02:00
Laurent Destailleur
3daac1d7ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-01 13:35:01 +02:00
Grand Philippe
7f27801c3c fix: Undefined property: stdClass::$xxx 2013-05-01 09:41:36 +02:00
philippe
8d844a1094 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 09:08:15 +02:00
Laurent Destailleur
5b85adfb90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/account.php
 2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:28:14 +02:00
Laurent Destailleur
c02f8e689e Restore standard postinst file 2013-05-01 00:24:03 +02:00
Laurent Destailleur
0a71c84bf4 Fix: Remove separator files. 2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
c84427bd22 Fix: delete of files with [ and glob. 
Conflicts:
	test/phpunit/FilesLibTest.php
 2013-04-30 22:52:56 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
fhenry
3933fb318c update change log 2013-04-30 21:57:34 +02:00
fhenry
e9f02ebacf Update change log 2013-04-30 21:45:40 +02:00
fhenry
440912a4d3 fix [ bug #827 ] AJAX search does not respect multiprice level 2013-04-30 21:35:27 +02:00
Laurent Destailleur
8f214a77c5 Fix: Fix error with linux rules 2013-04-30 21:31:35 +02:00
fhenry
ac6e56f058 Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-04-30 21:10:26 +02:00
Laurent Destailleur
e62bdd8647 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 20:17:47 +02:00
Laurent Destailleur
4e072e6229 Doc 2013-04-30 20:14:40 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
fhenry
0b8d78c4f6 [ bug #865 ] Dolibarr navigation array in project/task do not work 
Conflicts:
	htdocs/projet/fiche.php

Change-Id: I7607f97d21cc695c9b295d94f5abcb64fe25f3af
 2013-04-30 18:23:44 +02:00