Commit Graph

32329 Commits

Author SHA1 Message Date
Laurent Destailleur
268a4b67e9 Fix: 3.2 was ok with PHP 5.3 only, not 5.4 2013-12-09 02:11:39 +01:00
Laurent Destailleur
206ded3f2b Backport travis script into 3.2 2013-12-09 02:05:52 +01:00
Laurent Destailleur
94c2b504cb Update ignore files 2013-12-09 01:44:00 +01:00
Laurent Destailleur
0e7b861086 Merge pull request #1044 from FHenry/3.2
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:25:28 -07:00
Florian Henry
e4e27a0071 Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:03:20 +02:00
Laurent Destailleur
29841f2606 Fix: param lang not provided to price function 2013-06-08 15:20:06 +02:00
Laurent Destailleur
6c5517b757 Fix: CSS 2013-06-05 20:11:07 +02:00
Laurent Destailleur
0cac22376a Merge pull request #981 from FHenry/3.2
Fix search product with multilangue
2013-05-25 01:59:38 -07:00
Florian Henry
cd68538d2d Fix search product with multilangue 2013-05-24 22:43:07 +02:00
Laurent Destailleur
8bd5327d02 Update nl 2013-04-24 13:56:05 +02:00
Laurent Destailleur
9bf77eac4c Fix: Korting 2013-04-22 13:57:16 +02:00
Laurent Destailleur
ffe47141ff Merge pull request #799 from FHenry/3.2
Fix Dutch (nl_NL) translation
2013-04-04 02:34:37 -07:00
fhenry
b0eec3ef3a Fix Dutch (nl_NL) translation 2013-04-03 11:51:40 +02:00
Laurent Destailleur
c74f68d14a Fix: dol_is_dir may not be loaded, so call fails 2013-03-08 01:52:56 +01:00
Laurent Destailleur
970b332bd8 Merge pull request #695 from FHenry/3.2
Fix [ bug #737 ]
2013-02-26 11:03:05 -08:00
fhenry
d7485f5823 Fix [ bug #737 ] 2013-02-26 12:11:34 +01:00
Laurent Destailleur
24b002fbe6 Revert "Fix: only once superadmin and an admin can not delete/modify a superadmin"
This reverts commit 0216bdd311.
2013-02-11 22:52:26 +01:00
Laurent Destailleur
5cd329a320 Merge pull request #643 from FHenry/3.2
Fix bug [ bug #709 ]
2013-02-10 17:42:24 -08:00
fhenry
63c5f3433a Fix bug [ bug #709 ] 2013-02-10 20:49:52 +01:00
Regis Houssin
93dc6b5fc0 Fix: use the users entity 2013-01-23 15:47:26 +01:00
Regis Houssin
0216bdd311 Fix: only once superadmin and an admin can not delete/modify a
superadmin
2013-01-23 15:24:41 +01:00
Regis Houssin
ac6049f0b3 Fix: only once superadmin if no multicompany setup 2013-01-23 14:58:14 +01:00
Regis Houssin
8b129f1af0 Fix: missing files library 2013-01-23 11:23:38 +01:00
Regis Houssin
2cabd97da8 Fix: prepare maintenance release 3.2.4 2013-01-22 22:21:28 +01:00
Regis Houssin
27a1e11ea5 Fix: prepare 3.2.4 2013-01-22 21:33:03 +01:00
Regis Houssin
9ecd566580 Fix: broken features with special_code and externals modules 2013-01-22 21:32:06 +01:00
Laurent Destailleur
ac1cfd3d23 Fix: [ bug #666 ] Fatal error when sending intervention card 2013-01-19 15:12:18 +01:00
Laurent Destailleur
72dbeadc49 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2013-01-17 17:45:41 +01:00
Laurent Destailleur
8fec37d5ad Fix: error set on non object 2013-01-17 14:36:08 +01:00
Laurent Destailleur
b826a6b559 Merge pull request #612 from FHenry/3.2
Fix Bug [ bug #681 ] Can't modify a line a business proposal
2013-01-15 14:13:19 -08:00
fhenry
085dee1ab1 Fix Bug [ bug #692 ] Can't search for suppliers invoice 2013-01-15 23:00:17 +01:00
fhenry
5e9a9a48f3 Fix Bug [ bug #681 ] Can't modify a line a business proposal 2013-01-15 22:45:18 +01:00
Laurent Destailleur
ec17511e01 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:53:52 +01:00
Laurent Destailleur
99c461b9d1 Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2013-01-06 13:17:17 +01:00
Laurent Destailleur
4a2c38a1c1 Fix: Lost button 2013-01-06 13:16:25 +01:00
Laurent Destailleur
585d1b0587 Merge pull request #571 from KreizIT/3.2
Security fix emailing read and unsubscribe
2013-01-04 08:16:11 -08:00
Cedric GROSS
b4ad2887a0 Security fix emailing read and unsubscribe
unsubscribe can lead to email disclosure
2013-01-04 13:01:48 +01:00
Laurent Destailleur
6aebf470f6 Merge pull request #558 from FHenry/3.2
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 08:32:37 -08:00
fhenry
24721eb3e8 Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 15:59:14 +01:00
Laurent Destailleur
4a74ebc1f9 Fix: [ bug #651 ] FusionPDF created files cannot be deleted 2012-12-27 14:46:50 +01:00
Laurent Destailleur
80bbeaa9b5 Fix: Migration of payment id not complete 2012-12-27 01:22:31 +01:00
Laurent Destailleur
1038e86616 Fix: Correct recipient into rouget template. 2012-12-13 01:21:37 +01:00
Laurent Destailleur
217b4ea15f Fix: Update changelog 2012-12-13 01:20:24 +01:00
Laurent Destailleur
0b0a30d362 Fix: Bad position of field with non A4 pages 2012-12-12 20:59:40 +01:00
Laurent Destailleur
19e0c66efc Fix: Using bad root url. 2012-12-12 14:48:31 +01:00
Laurent Destailleur
48eec88cba Fix: force redirect to https could not work for some environments
Conflicts:
	htdocs/main.inc.php
2012-12-12 02:40:01 +01:00
Laurent Destailleur
f8f3b2dc39 Fix: Bad url forging 2012-12-12 00:54:36 +01:00
Laurent Destailleur
d8aa8051dc Fix: Personalizing css fails when multicompany is on. Cache must differ
between each environment.
2012-12-08 18:42:29 +01:00
Laurent Destailleur
a7e1a45571 Fix: Use different css cache file for each user. This fix problem when
using personalised constants that change style.
2012-12-08 18:40:41 +01:00
Laurent Destailleur
60486417c3 Test. Try to create a backport branch. 2012-12-02 19:55:42 +01:00