2
0
forked from Wavyzz/dolibarr
Commit Graph

34721 Commits

Author SHA1 Message Date
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
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