lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,682 Commits 43 Branches 150 Tags 886 MiB
142f171e50
Commit Graph

34682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
77f177d846 Fix: Bad selection of option 2013-01-08 11:04:29 +01:00
Laurent Destailleur
a555b47acd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-08 10:45:59 +01:00
Laurent Destailleur
47482202ac Fix: Missing picto 2013-01-08 10:28:22 +01:00
Laurent Destailleur
f96c1d83cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 23:22:20 +01:00
Laurent Destailleur
0889bdc3eb Fix: Error using static method 2013-01-07 23:20:00 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
de83dc68e1 New: Uniformize odt generation to use hooks like pdf generation 2013-01-07 02:24:20 +01:00
Laurent Destailleur
989e0ba4c3 Merge pull request #580 from marcosgdf/3.3 
Updated change log
 2013-01-06 16:57:53 -08:00
Marcos García
0e21a61eca Updated change log 2013-01-07 01:26:33 +01:00
Laurent Destailleur
ec664aaa71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-07 00:42:02 +01:00
Laurent Destailleur
e5f5e38736 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 00:41:32 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
Laurent Destailleur
0f5a80a40f Fix: Bad var name 2013-01-07 00:14:38 +01:00
eldy
24d3fdfe6c Fix: bad setup entry page 2013-01-06 21:52:59 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
eldy
c0bbd5d730 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-06 20:46:58 +01:00
eldy
492d00ee86 Fix: Syntax error with pgsql 2013-01-06 20:45:03 +01:00
Laurent Destailleur
567cd00f5c Fix: Lost button 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/facture/fiche.php
 2013-01-06 13:33:09 +01:00
Laurent Destailleur
a40047d464 Merge pull request #578 from marcosgdf/translations 
Translations!
 2013-01-06 04:03:14 -08:00
Laurent Destailleur
4909b9dcf7 Merge pull request #577 from KreizIT/develop 
Add SASU form
 2013-01-06 04:02:37 -08:00
Laurent Destailleur
d70f671ba0 Merge pull request #576 from simnandez/3.3 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
 2013-01-06 04:02:12 -08:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
Cedric GROSS
6a9c3dee52 Add SASU form 2013-01-05 17:07:25 +01:00
Laurent Destailleur
5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/es_ES/admin.lang
 2013-01-05 16:41:08 +01:00
Laurent Destailleur
d44b086527 Fix: font size 2013-01-05 16:32:58 +01:00
simnandez
c0246c07b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 16:03:00 +01:00
Laurent Destailleur
013f8cb6fc Merge pull request #572 from simnandez/develop 
Cherrypick to Develop
 2013-01-05 03:32:56 -08:00
Laurent Destailleur
a9ff3c2be1 Merge pull request #574 from simnandez/3.3 
Fix: Modify Spanish localtax2 to new rate
 2013-01-05 03:29:54 -08:00
Laurent Destailleur
9ce7a430b8 Merge pull request #573 from marcosgdf/translations 
Added missing translations
 2013-01-05 03:18:33 -08:00
simnandez
c639d80372 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:47:54 +01:00
simnandez
32b19802b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:43:40 +01:00
simnandez
773882c8c0 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-05 09:42:20 +01:00
simnandez
d0265db3d2 Fix: Modify Spanish localtax2 to new rate 2013-01-05 09:07:01 +01:00
Marcos García
5bf93ca41a Added missing es_ES translation & fixed typo 2013-01-04 23:56:22 +01:00
Marcos García
d27519338a Added missing translations 
Reverted removal of strings in PR #570
Added missing strings to en_US
 2013-01-04 22:34:55 +01:00
simnandez
5032c48322 Fix: Bug creating invoice from a contract 2013-01-04 20:54:49 +01:00
simnandez
a585d8b455 Trad: Add missing ca_ES and es_ES translations 2013-01-04 20:54:31 +01:00
simnandez
b4204b9c25 Fix: Withdrawal payment warning 2013-01-04 20:54:15 +01:00
Cedric GROSS
ff3231045b Fix: A better fix for escaping data: escape for database must be done 
during sql request forging. Also renamed tag to tag.

Merge:
Security fix emailing read and
unsubscribe

unsubscribe can lead to email disclosure

Conflicts:
	htdocs/public/emailing/mailing-unsubscribe.php
 2013-01-04 18:08:34 +01:00
Laurent Destailleur
d86eab713c Merge pull request #570 from simnandez/3.3 
Fix: Withdrawal payment warning
 2013-01-04 08:14:16 -08:00
simnandez
9a3681e6b0 Fix: Bug creating invoice from a contract 2013-01-04 16:23:15 +01:00
simnandez
b9ec558501 Trad: Add missing ca_ES and es_ES translations 2013-01-04 16:13:03 +01:00
simnandez
68866eaa5f Fix: Withdrawal payment warning 2013-01-04 11:07:31 +01:00
Laurent Destailleur
4c3191a3e0 Merge pull request #569 from FHenry/develop 
CheckStyle
 2013-01-04 01:12:29 -08:00
Laurent Destailleur
a9ce8083cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-04 00:24:39 +01:00
Laurent Destailleur
86645d8be9 Fix: Field birthday must be hidden for moral members 2013-01-04 00:23:46 +01:00
fhenry
0158885415 CheckStyle 
I check everypalce where this function is call in Dolibarr, and to be
consistant it's better to use new attribute names
 2013-01-03 23:57:18 +01:00
Laurent Destailleur
932c36e695 Merge pull request #568 from FHenry/3.3 
CheckStyle
 2013-01-03 11:47:57 -08:00