Commit Graph

33368 Commits

Author SHA1 Message Date
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
Laurent Destailleur
b724a78cb3 Fix: Debug dictionnary to add localtaxes 2012-09-16 15:04:55 +02:00
Laurent Destailleur
df2bac35c6 Merge pull request #399 from cbattarel/develop
patch on the dictionnary setup of local taxes table to be able to set localtax type
2012-09-16 04:40:54 -07:00
Christophe Battarel
a9ed3bc175 correction for previous patch on localtax 2012-09-16 10:12:43 +02:00
Christophe Battarel
05971f1952 patch on the dictionnary setup of local taxes table to be able to set localtax type 2012-09-16 10:08:41 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2012-09-15 13:53:19 +02:00
Laurent Destailleur
4566595d44 Fix: W3C when module margin is on 2012-09-15 13:44:40 +02:00
Laurent Destailleur
1fb26e2ab2 Fix: if 1 experimental module is on, we must always show tab 2012-09-15 13:37:55 +02:00
Regis Houssin
89e70cd61a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-15 11:22:30 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
85a756bee4 Merge pull request #398 from grandoc/develop
dyslexie
2012-09-15 01:05:08 -07:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Grand Philippe
f19321eaf6 dyslexie 2012-09-14 17:37:14 +02:00
Regis Houssin
4220229573 Fix: minor change 2012-09-14 15:56:50 +02:00
Regis Houssin
b33e59dd66 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-14 15:56:11 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Regis Houssin
3a6be2b896 Fix: uniformize code
fix: add current user for commercial by default
2012-09-14 11:34:30 +02:00
Laurent Destailleur
643d6ff3f9 Fix: Debug feature predefined invoices 2012-09-14 10:09:56 +02:00
Regis Houssin
968380ba3e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-13 18:50:29 +02:00
Laurent Destailleur
46ee00fc5e A party to fish bugs and merou. 2012-09-13 18:28:03 +02:00
Regis Houssin
f902fedbb8 Fix: split for more possibility 2012-09-13 17:43:24 +02:00
Laurent Destailleur
0a5c49b3d9 Fix: If no warehouse selected, no warning for stock in warehouse too
low.
2012-09-13 16:23:58 +02:00
Regis Houssin
125f499e82 Fix: dol_htmloutput_events is already call in llxFooter 2012-09-13 16:15:36 +02:00
Laurent Destailleur
af5507bcfa Fix: restore correct behaviour. Space is output only if there is an img
+ text. img alone is not enough.
2012-09-13 16:13:12 +02:00
Regis Houssin
84c61c9411 Fix: remove obsolete code and use "propal" instead "propale" 2012-09-13 16:11:08 +02:00
Regis Houssin
7eef637776 Fix: strict mode killer 2012-09-13 11:52:50 +02:00
Laurent Destailleur
ed61508b3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-13 10:14:47 +02:00
Laurent Destailleur
4cc56f0176 New: Extra fields supports more types (now int, string, double, date,
datetime)
2012-09-13 10:14:25 +02:00
Regis Houssin
6561694658 Fix: invert space 2012-09-13 10:03:58 +02:00
Regis Houssin
1fa84aa92b Fix: better 2012-09-13 10:02:45 +02:00
Regis Houssin
9130dbda4e Fix: wrong space 2012-09-13 09:57:12 +02:00
Regis Houssin
b1e01b50f5 Fix: use warning icon for limit size of tab
Fix: optimizing textwithtooltip method
2012-09-13 09:52:03 +02:00
Laurent Destailleur
29b4e1f57a Removed not available module from demo 2012-09-13 09:19:45 +02:00
Laurent Destailleur
4b1c863673 Fix: removed warnings 2012-09-12 23:59:19 +02:00
Laurent Destailleur
a950f775e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 20:50:00 +02:00
Laurent Destailleur
82435fb176 Merge pull request #396 from marcosgdf/translations
Removed unused lines mistakenly introduced in previous PR #395
2012-09-12 11:45:56 -07:00
Laurent Destailleur
c11c3897ef Qual: Uniformize code 2012-09-12 20:45:01 +02:00
Laurent Destailleur
b221b8878e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 20:34:25 +02:00
Laurent Destailleur
91e304d0d7 Move dev and experimental modules into a separated tab 2012-09-12 20:33:50 +02:00
Marcos García
c38274c111 Forgot to remove some lines... 2012-09-12 20:32:39 +02:00
Laurent Destailleur
d5e8037483 Merge pull request #395 from marcosgdf/translations
Improved translations
2012-09-12 11:08:55 -07:00
Laurent Destailleur
bd49dc81a3 Merge pull request #394 from simnandez/develop
Localtaxes also in skip_update_total comprobation
2012-09-12 10:54:42 -07:00
Regis Houssin
5770245805 Fix: rename the hook 2012-09-12 19:37:37 +02:00
Marcos García
cb4044755b Fixed export translations
Added missing strings
Corrected some translations
2012-09-12 19:11:03 +02:00
simnandez
4ac2ee83f2 Localtaxes also in skip_update_total comprobation 2012-09-12 19:07:23 +02:00
Regis Houssin
28e5ba6c18 Fix: mini strict mode 2012-09-12 18:47:06 +02:00
Laurent Destailleur
c465aea0e7 Merge pull request #393 from simnandez/develop
Fix: If price is 'TTC' we need to have the totals without VAT for a correct calculation
2012-09-12 09:16:19 -07:00