2
0
forked from Wavyzz/dolibarr
Commit Graph

33416 Commits

Author SHA1 Message Date
Laurent Destailleur
21c4baa13b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-19 15:10:39 +02:00
Laurent Destailleur
2ac3fbc5c6 New: Add clipart for holiday module 2012-09-19 15:10:23 +02:00
Laurent Destailleur
533e285dad Merge pull request #403 from simnandez/develop
Trad: Add ca_ES and es_ES translations
2012-09-19 05:53:43 -07:00
Laurent Destailleur
9bc0011290 Merge pull request #405 from cbattarel/develop
correct some ajax bugs caused by tpl recent updates
2012-09-19 05:53:29 -07:00
Laurent Destailleur
a68483d72f Uniformize code. 2012-09-19 14:49:13 +02:00
Laurent Destailleur
0b4df34091 Fix: Blank page when renaming product ref 2012-09-19 14:16:29 +02:00
Laurent Destailleur
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +02:00
Laurent Destailleur
9306360d3c Remove warnings 2012-09-19 13:39:47 +02:00
Laurent Destailleur
d1cfe2ec54 Fix: Bug when metafile is on 2012-09-19 13:30:59 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +02:00
Christophe Battarel
de93c819f4 correct some ajax bugs caused by tpl recent updates 2012-09-19 12:02:06 +02:00
Laurent Destailleur
60fc0f2b74 Removed warning 2012-09-19 11:56:50 +02:00
simnandez
875edcad0d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-09-19 10:32:00 +02:00
simnandez
cf72ffd650 Trad: Improve bank translations for adjust into pdf info size 2012-09-18 18:50:02 +02:00
simnandez
13aeca2ffd Fix: Add type of product/service into factures for a correct localtaxes
calculation
2012-09-18 18:27:28 +02:00
Laurent Destailleur
89dfd246d1 Init data must match migrated data 2012-09-18 18:27:10 +02:00
simnandez
b7837f9280 Fix: Localtaxes type only missing in propal update line 2012-09-18 18:18:30 +02:00
simnandez
dd9d3c8ba4 Fix: localtaxes must display in pdf even if they are in negative 2012-09-18 17:57:52 +02:00
simnandez
0bf29edb60 Fix: Add type of product/service into commandes for a correct
localtaxes calculation
2012-09-18 17:41:59 +02:00
simnandez
76f3fb56ea Fix: Add type of product/service into propals for a correct localtaxes
calculation
Fix: Localtax2_type for Spain must be 3
2012-09-18 16:06:45 +02:00
simnandez
fab101d2e8 Fix: Spanish localtax1 must be only applicable to products
Add localtax2_type
2012-09-18 15:38:08 +02:00
simnandez
b65c23576a Trad: Add ca_ES and es_ES translations 2012-09-18 15:28:38 +02:00
Laurent Destailleur
889f71db6f Fix: Color of lines must be set for each lines 2012-09-18 12:52:54 +02:00
Laurent Destailleur
303f0dc681 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-18 11:09:44 +02:00
Laurent Destailleur
ffbe2acc36 Fix: use https if https is used 2012-09-18 11:06:49 +02:00
Laurent Destailleur
4f0e4be449 Merge pull request #402 from cbattarel/develop
add option to select contact type associated to commercial agents for margin and commission modules
2012-09-18 01:24:00 -07:00
Christophe Battarel
951b98a963 add option to select contact type associated to commercial agents for margin and commission modules 2012-09-18 09:44:34 +02:00
Laurent Destailleur
eb964e6436 Fix: Should works for everybody like that 2012-09-17 22:08:41 +02:00
Laurent Destailleur
4065b52441 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-17 22:05:36 +02:00
Laurent Destailleur
4a98c08a74 Fix: Use correct date timezone. 2012-09-17 22:05:13 +02:00
Regis Houssin
8bab5fdadd Fix: convert line delimiters 2012-09-17 19:37:02 +02:00
Regis Houssin
58ae3b9372 Fix: possibility to disable hook 2012-09-17 19:36:43 +02:00
Regis Houssin
dc7100677a Fix: avoid warning if no object 2012-09-17 16:28:37 +02:00
Regis Houssin
c42cf7ce78 Fix: broken features 2012-09-17 16:16:48 +02:00
Laurent Destailleur
7167edb244 Fix: Comment to avoid bug 2012-09-17 16:00:41 +02:00
Laurent Destailleur
237bcf35ed Merge pull request #401 from grandoc/develop
missing translation
2012-09-17 06:23:20 -07:00
Laurent Destailleur
ef4831d119 Solved FIXME. I keep the code but commented, to keep source the more
similar as possible than invoices.
2012-09-17 11:46:50 +02:00
Grand Philippe
d25e8fc584 missing translation 2012-09-17 11:18:20 +02:00
Regis Houssin
16ad953d10 Fix: best practice 2012-09-17 08:13:29 +02:00
Regis Houssin
80eceab230 Fix: restore broken features 2012-09-17 07:15:38 +02:00
Regis Houssin
10b122578e FIXME: $deja_regle not use in proposal? 2012-09-17 06:52:33 +02:00
Regis Houssin
bf008c7640 Fix: optimizing 2012-09-17 06:43:58 +02:00
Laurent Destailleur
cd6a8fa761 New: Uniformize code 2012-09-17 02:07:14 +02:00
Laurent Destailleur
9ab0653902 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-17 01:39:49 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code
New: Can use extrafields on contacts/addresses.
2012-09-17 01:39:30 +02:00
Laurent Destailleur
2170801fd2 New: Uniformize pdf generation code. We also keep space to repeat pdf
head info.
2012-09-17 00:43:23 +02:00
Laurent Destailleur
832a472325 Little clean of page 2012-09-16 22:45:58 +02:00
Regis Houssin
ada85df649 Fix: wrong permission 2012-09-16 21:12:55 +02:00
Laurent Destailleur
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +02:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00