Commit Graph

40390 Commits

Author SHA1 Message Date
Marcos García de La Fuente
09e02f807f Even better improvement 2014-03-22 19:01:19 +01:00
Marcos García de La Fuente
e2f51d0df2 Removed duplicate line 2014-03-22 19:00:37 +01:00
Marcos García de La Fuente
c8c77dbdcf Fix: Agenda and Banks module were not working with multicompany module 2014-03-22 18:59:48 +01:00
Juanjo Menent
e0b4bd9b0d Fix: [ bug #1306 ] Fatal error when adding an external calendar 2014-03-22 13:00:23 +01:00
Laurent Destailleur
a1e778c146 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-21 21:12:02 +01:00
Laurent Destailleur
1061a650d2 Fix: duplicate info 2014-03-21 21:11:51 +01:00
Laurent Destailleur
4bd6f11112 Backport fix to solve warning problems. 2014-03-21 18:35:50 +01:00
Florian Henry
c8c4a10a06 Fix restrictedearea bug 2014-03-21 16:18:17 +01:00
Florian Henry
10fda1956f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-03-21 14:41:18 +01:00
Laurent Destailleur
a884673637 Fix: A better to fix to manage automatic creation of code for import. 2014-03-21 13:29:13 +01:00
Laurent Destailleur
c1411e65b7 Fix: Try to add code to provide easy way to fix warning on timezone not
defined.
2014-03-21 10:13:29 +01:00
Laurent Destailleur
aabd923248 Try to remove warning 2014-03-21 09:49:10 +01:00
Laurent Destailleur
4afb85bd1d Fix: Several fix into workflow/condition for invoice payments or convert
into discount.
2014-03-19 22:30:25 +01:00
Laurent Destailleur
d3e951e1ec Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-19 20:22:04 +01:00
Laurent Destailleur
9cd7f68ae8 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2014-03-19 20:03:17 +01:00
Laurent Destailleur
062c150bc1 Fix: import of fields with value "auto" 2014-03-19 19:33:43 +01:00
Laurent Destailleur
212deb9e1c Fix: fails to import when value is 'AUTO' because compare was case
sensitive.
2014-03-19 17:15:18 +01:00
Laurent Destailleur
2f10198064 Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
making a pagebreak higher than 2 pages.
2014-03-19 16:36:12 +01:00
Laurent Destailleur
89f0a1bbff Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-19 15:22:08 +01:00
Laurent Destailleur
bf735cacbe Fix PDF: Page break was ko when breaking 2 pages or more.
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
2014-03-19 13:32:54 +01:00
Laurent Destailleur
5d14322679 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-19 11:46:44 +01:00
Laurent Destailleur
dbaea6fa42 Add clean sql requests into repair.sql 2014-03-19 11:40:23 +01:00
Laurent Destailleur
a05ea58181 Fix: form to add images should not show link form 2014-03-18 22:26:46 +01:00
Laurent Destailleur
ada22837a5 Fix: form to add images should not show link form 2014-03-18 22:26:09 +01:00
Laurent Destailleur
6ac7e22521 Merge pull request #1494 from atm-gauthier/3.5
Correction when adding line with price as '0'
2014-03-17 20:31:53 +01:00
Gauthier
eb43bc4982 Correction when adding line with price as '0' 2014-03-17 15:38:12 +01:00
Laurent Destailleur
ed4f7fd083 Fix: error 2014-03-16 20:05:07 +01:00
Florian Henry
b7bfadd660 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-03-15 22:11:51 +01:00
Laurent Destailleur
de59f3aafe Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-15 21:48:14 +01:00
Florian Henry
649f535d56 delete extrafield on delete invoice 2014-03-15 19:49:21 +01:00
Laurent Destailleur
9172beb282 Merge pull request #1483 from FHenry/3.5
3.5
2014-03-15 17:30:31 +01:00
Drosis Nikos
997e16fec7 Update user.class.php
String translated twice
2014-03-15 17:22:34 +01:00
Florian Henry
7625629491 Fix [ bug #1294 ] Expedition model Merou having problems with long names 2014-03-15 16:40:29 +01:00
Florian Henry
ee70f21f58 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-03-15 16:33:24 +01:00
Florian Henry
18c4d890dd Fix [ bug #1283 ] ROUGET Shipment PDF 2014-03-15 16:32:46 +01:00
Laurent Destailleur
4db8af8a53 Fix: sql syntax error with pgsql 2014-03-15 15:11:58 +01:00
Laurent Destailleur
5025d11a16 Merge pull request #1476 from tbasilici/3.5
3.5
2014-03-15 13:32:30 +01:00
kaos
f55bdc64bd fixes #1300 2014-03-15 11:10:20 +01:00
kaos
1cb71674d7 fixes #1300 2014-03-15 11:06:50 +01:00
Laurent Destailleur
c0f41c84cb Merge pull request #1471 from FHenry/3.5
Fix deposit invoice
2014-03-15 00:43:48 +01:00
Laurent Destailleur
90cf1ba3a5 Merge pull request #1468 from bouna/patch-1
Update list.php
2014-03-15 00:34:56 +01:00
Florian Henry
3f6b319d41 Fix deposit invoice 2014-03-14 23:42:45 +01:00
bouna
e7791a3ade Update list.php
to save the town filtre on prospect list, just i replace: 
$param='&stcomm='.$stcomm.'&search_nom='.urlencode($search_nom).'&search_zipcode='.urlencode($search_zipcode).'&search_ville ='.urlencode($search_ville );

search_ville by search_town
2014-03-14 19:46:36 +01:00
Laurent Destailleur
317134c29d Merge pull request #1467 from grandoc/3.5
fix : display specimen
2014-03-14 19:29:21 +01:00
philippe grand
f9c48be2a9 fix : display specimen 2014-03-14 18:23:37 +01:00
Laurent Destailleur
561a1a1aac Fix: Miscellaneous problems on task tabs (withproject parameter lost and
download fails).
2014-03-14 02:07:54 +01:00
Laurent Destailleur
c8f63d6160 Fix: Prepare for 3.5.2 2014-03-14 00:17:39 +01:00
Laurent Destailleur
da5610bf3f Merge branch 'es_CL-language' of https://github.com/marcosgdf/dolibarr
into marcosgdf-es_CL-language

Conflicts:
	ChangeLog
2014-03-13 23:40:43 +01:00
Laurent Destailleur
dd7970b549 Fix: Regression, so introduce option to restore old behaviour. 2014-03-12 12:57:26 +01:00
Laurent Destailleur
e76f2170b3 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:49:11 +01:00