Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-01 14:42:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,175 Commits 37 Branches 191 Tags
d3e951e1ec4c387f8dff3f9c4fa67ddc19f98356
Commit Graph

34544 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Laurent Destailleur
4a983811d0 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:43:31 +01:00
Laurent Destailleur
7684e9e4f7 Fix: Add PHPUnit test to check main.lang files does not contains rubish 
values for keys SeparatorXXX
Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys FormatDateShortJaxaXXX
 2014-03-11 23:39:26 +01:00
Laurent Destailleur
241ae7a4d1 Fix: Miscellaneous bugs on tasks management 
Conflicts:
	htdocs/core/lib/project.lib.php
 2014-03-11 20:53:47 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Laurent Destailleur
5ee17a2f14 Merge pull request #1460 from atm-gauthier/3.5 
error on ajax_constantonoff function
 2014-03-11 11:53:44 +01:00
Laurent Destailleur
324402be0d Merge pull request #1465 from marcosgdf/bug-1295 
Fixed bug 1295: Error when creating an agenda extrafield with a number as reference
 2014-03-11 11:45:50 +01:00
Laurent Destailleur
67de6699d6 Fix: Translation of number for pt_PT 2014-03-11 01:37:37 +01:00
Marcos García de La Fuente
20262a0164 Fix bug #1295: Error when creating an agenda extrafield with a number as reference 2014-03-10 23:58:16 +01:00
Laurent Destailleur
be97066a74 Fix: Bug into sql request because of incomplete group by 2014-03-10 23:57:19 +01:00
Marcos García de La Fuente
89a4c51153 Added es_CL language 2014-03-10 21:13:16 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7 Fix: Must use div for columns of index pages. Not table. 2014-03-10 17:19:02 +01:00
Laurent Destailleur
21bf279248 Fix: css 2014-03-10 16:17:55 +01:00
Gauthier
92e8f54e9a error on ajax_constantonoff function 2014-03-10 10:53:20 +01:00
Laurent Destailleur
97677f08a9 Fix: Add protection to avoid memory hung 2014-03-10 01:49:44 +01:00
Laurent Destailleur
b2116c37d8 Enhance packager: 
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
 2014-03-09 01:37:08 +01:00
Laurent Destailleur
c082d7c82e Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/main.inc.php
 2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
 2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f Fix: Compatibility with v4 of ckeditor (for debian) 2014-03-08 14:06:01 +01:00
Laurent Destailleur
0a2a635755 Fix: td balance. 
Fix: New price was not used when editing a line when margin module was
on.
 2014-03-07 11:58:30 +01:00
Laurent Destailleur
06b2c646c3 Fix: Add a space after (int) for travis succes ;) 2014-03-06 18:31:02 +01:00
Alexis Algoud
d139009ef5 bug on update service with service created in 3.4 2014-03-05 15:29:28 +01:00