Commit Graph

34726 Commits

Author SHA1 Message Date
Laurent Destailleur
979ea42d3f Comments 2013-01-12 15:40:38 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
Laurent Destailleur
22dcb7ee6a Merge pull request #599 from cbattarel/develop
show costprice instead of buyingprice if setup of margin module is costprice
2013-01-11 06:50:58 -08:00
Christophe Battarel
62ccb57857 fix missing td 2013-01-11 15:41:47 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Regis Houssin
ee0db5f67b Merge pull request #597 from FHenry/develop
Update method in thirdparty web service
2013-01-10 14:32:17 -08:00
fhenry
10ed8c141e Update method in thirdparty web service 2013-01-10 23:30:26 +01:00
Laurent Destailleur
5b4f1d39be Merge pull request #591 from marcosgdf/test
Improved AdherentTest and added testAdherentMakeSubstitution
2013-01-10 12:13:53 -08:00
Laurent Destailleur
63cd0e8984 First try to include svg into css. 2013-01-10 18:50:07 +01:00
Marcos García
88fdfec0eb Improved AdherentTest and added testAdherentMakeSubstitution 2013-01-10 12:26:02 +01:00
Laurent Destailleur
9d886eca53 Fix: Scan of correct dir when them dir is forced 2013-01-10 11:19:46 +01:00
Regis Houssin
399003d46b Merge pull request #589 from grandoc/develop
fix: favicon was not displayed when using theme within custom directory
2013-01-10 00:34:22 -08:00
Grand Philippe
eea5dd36ac fix: favicon was not displayed when using theme within custom directory 2013-01-10 09:23:52 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Laurent Destailleur
a415a988a3 Fix: Packaging of doliwamp 2013-01-09 15:19:00 +01:00
Laurent Destailleur
4099b98540 Prepare 3.3 release 2013-01-09 14:55:24 +01:00
Laurent Destailleur
f2af70628d Prepare 3.3 release 2013-01-09 14:43:55 +01:00
Laurent Destailleur
c282f33d4d Update changelog 2013-01-09 14:39:50 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
4a2a8e438d Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-09 11:45:04 +01:00
Laurent Destailleur
7114ae33fe Fix: Doc not uptodate 2013-01-09 11:44:45 +01:00
Laurent Destailleur
e31aedbc50 Merge pull request #584 from jfefe/3.3
Fix bug #666 : error when sending intervention card
2013-01-09 02:23:00 -08:00
Regis Houssin
a7ed40b10d Fix: empty value if combobox disabled 2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371 Fix: empty value if combobox disabled 2013-01-09 10:40:36 +01:00
jfefe
1a3cecfae5 Fix bug #666 : error when sending intervention card 2013-01-09 06:30:27 +01:00
Laurent Destailleur
64d2a662de Merge pull request #582 from marcosgdf/translations
Improvements in translations
2013-01-08 14:03:52 -08:00
Laurent Destailleur
f3df7a2fec Fix: An easier to understand fix. Remove also not recommanded "continue
2" instructions.
2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c Merge pull request #581 from simnandez/3.3
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
2013-01-08 13:38:38 -08:00
Regis Houssin
dd08da6ea8 Merge pull request #583 from FHenry/develop
[ task #664 ] Add extrafields behaviours to Member Type
2013-01-08 10:58:46 -08:00
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
Laurent Destailleur
b7a5e226c9 Fix: Disable menu entry of a not avilable feature 2013-01-08 18:53:45 +01:00
Laurent Destailleur
53df0766cb Fix: Translation 2013-01-08 18:47:40 +01:00
Laurent Destailleur
db0aa49cad Merge remote-tracking branch 'origin/3.3' into develop 2013-01-08 18:37:59 +01:00
Laurent Destailleur
334b5b5dac Fix: Minor fix 2013-01-08 18:31:55 +01:00
Laurent Destailleur
9b6289503c Fix: Overwriting of login template works with module_parts. 2013-01-08 18:30:49 +01:00
Laurent Destailleur
5aeec9eab2 Fix: line into theme 2013-01-08 16:46:06 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
Laurent Destailleur
1f320dc1e7 Fix: Comment must be before tag 2013-01-08 12:27:17 +01:00
Laurent Destailleur
9b3874f6f9 Fix: PHPUnit found regression 2013-01-08 12:26:02 +01:00
Marcos García
ae98ebc793 There is no need to warn the user as the picto already does 2013-01-08 12:14:11 +01:00
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
simnandez
596df78d39 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
2013-01-08 08:46:48 +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