Commit Graph

35198 Commits

Author SHA1 Message Date
Laurent Destailleur
574c4373b4 Fix: bug with php 5.4 2013-09-09 19:53:35 +02:00
Laurent Destailleur
e932bef031 Fix: Bug with php 5.4 2013-09-09 17:50:42 +02:00
Laurent Destailleur
411a6bb819 Enabled travis-ci on old branch 2013-09-09 17:05:52 +02:00
Laurent Destailleur
8a0ac8b650 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-09-06 13:43:12 +02:00
Laurent Destailleur
651596e8d5 Fix: missing ; 2013-09-06 13:42:14 +02:00
Laurent Destailleur
5db9505f40 Fix debian package 2013-09-06 01:30:49 +02:00
Laurent Destailleur
a9c14c80f0 Fix: debian files 2013-09-06 01:27:11 +02:00
Laurent Destailleur
c71c4e86f6 Fix: watch file for debian package. 2013-09-05 23:52:13 +02:00
Laurent Destailleur
556827c818 Fix: wash file 2013-09-05 22:58:11 +02:00
Laurent Destailleur
2ce6f55d92 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-09-05 17:54:00 +02:00
Laurent Destailleur
7afb1aef14 Fix: Image was not correctly generated. Bad licence into it. 2013-09-05 17:53:07 +02:00
Laurent Destailleur
da7c8b42f2 Fix: Image was not correctly generated. Bad licence into it. 2013-09-04 22:34:49 +02:00
Laurent Destailleur
dd3d0ad9ac Merge pull request #1181 from grandoc/3.3
fix some trad
2013-08-21 13:13:42 -07:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Laurent Destailleur
34987d3e8b Exclude conf.php file from git 2013-08-10 13:02:13 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
associated to the country of the company
2013-08-01 18:09:01 +02:00
Laurent Destailleur
a43e7fd34e Fix: Changelog 2013-07-27 12:39:01 +02:00
Laurent Destailleur
3cd46d5e20 Merge pull request #1134 from FHenry/3.3
Fix [ bug #1001 ] Charge sociale : état incorrect
2013-07-27 02:38:56 -07:00
Laurent Destailleur
ae9c3cd780 Prepare 3.3.4 2013-07-26 16:43:06 +02:00
Laurent Destailleur
d0af692ed5 Fix: date must be reported according to user timezone
Conflicts:
	htdocs/core/class/html.formfile.class.php
2013-07-26 15:23:41 +02:00
Florian Henry
7af45ccdf3 update changelog 2013-07-26 12:52:51 +02:00
Florian Henry
116988febd Fix [ bug #1001 ] Charge sociale : état incorrect 2013-07-26 12:49:11 +02:00
Laurent Destailleur
16d530b22d Fix: Watermark make pagebreak crazy. 2013-07-25 18:58:47 +02:00
Laurent Destailleur
7cf429d238 Fix: Color change on page break. 2013-07-24 15:04:09 +02:00
Laurent Destailleur
f32bc24285 Fix: Upgrade of package break install
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
2013-07-24 13:49:40 +02:00
Laurent Destailleur
e8400afeba Fix: rpm packages
Conflicts:
	build/rpm/dolibarr_generic.spec
2013-07-24 13:46:50 +02:00
Laurent Destailleur
c24659b3a5 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-07-14 20:29:25 +02:00
Laurent Destailleur
dc5ad1a0f3 Fix: Total missing 2013-07-14 20:29:07 +02:00
Laurent Destailleur
f4428c8a8a Fix: Bad link 2013-07-09 15:27:06 +02:00
Laurent Destailleur
1561062285 Merge pull request #1073 from FHenry/3.3
Fix bug pgsql : add mail directly into mailling
2013-06-27 14:50:47 -07:00
Florian Henry
469e700895 Fix bug pgsql : add mail directly into mailling 2013-06-27 14:35:41 +02:00
Laurent Destailleur
2af8f295b1 Fix: warning not always visible. Depends if addon modules were
installed. Var should provide a quick fix.
2013-06-25 21:25:09 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Laurent Destailleur
ad49f965d5 Merge pull request #1060 from FHenry/3.3
Fix trad holidays module
2013-06-19 09:34:10 -07:00
Laurent Destailleur
d6d7665e65 Merge pull request #1059 from marcosgdf/translations
Fixed es_ES translation typo
2013-06-19 09:34:03 -07:00
Laurent Destailleur
9518cb7836 Merge pull request #1058 from marcosgdf/bug-947
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
2013-06-19 09:33:44 -07:00
Florian Henry
ee1e266774 Fix trad holidays module 2013-06-19 11:22:53 +02:00
Marcos García
76d9ba6a43 Fixed es_ES translation typo 2013-06-19 10:24:24 +02:00
Marcos García
676191c1f9 Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 2013-06-19 10:22:46 +02:00
Laurent Destailleur
c92471d40b Merge pull request #1043 from FHenry/3.3
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:25:16 -07:00
Florian Henry
fb0a99cb55 Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:05:19 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
e13974b5f3 Fix: tcpdf bug 2013-06-08 15:29:27 +02:00
Laurent Destailleur
2c71c898eb Fix: param lang not provided to price function 2013-06-08 15:21:47 +02:00
simnandez
a4841dacda Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:13 +02:00
Laurent Destailleur
94d1f23721 Merge pull request #1019 from GPCsolutions/3.3-societefix
Fixed field name
2013-06-04 10:19:44 -07:00
Raphaël Doursenaud
880a27f827 Fixed field name 2013-06-04 18:40:46 +02:00
Laurent Destailleur
4f0758f9b1 Merge pull request #1011 from marcosgdf/minor
Avoid warnings
2013-06-02 04:29:23 -07:00
Laurent Destailleur
c8c9ea797d Merge pull request #1009 from marcosgdf/bug-903
Fixed bug #903: Fatal error: Call to undefined function dol_get_first_da...
2013-06-02 04:17:07 -07:00
Marcos García
cf1d269f15 Avoid warnings 2013-06-01 16:11:45 +02:00