Commit Graph

27421 Commits

Author SHA1 Message Date
Laurent Destailleur
142e7e55d7 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-13 20:14:48 +02:00
Regis Houssin
56188ca798 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-12 23:15:25 +02:00
Regis Houssin
c8c31b2167 Fix: mutualize ckeditor parameters 2012-06-12 23:14:54 +02:00
Laurent Destailleur
4c52e477e4 Fix: Removed non greek sentences 2012-06-09 12:41:03 +02:00
Laurent Destailleur
b8b400a5a4 Fix: No alpha here, this breaks ability to submit html content with
images or links.
2012-06-09 12:40:51 +02:00
simnandez
92cb694f55 Fix: Missing translation key 2012-06-09 09:05:14 +02:00
Laurent Destailleur
2be18e834a Fix: Turkish translation 2012-06-09 00:25:31 +02:00
Laurent Destailleur
b554dfc3d2 Fix: Missing translation key 2012-06-09 00:25:22 +02:00
Laurent Destailleur
183ba3e8ca Fix: Another fix for var not initialized 2012-06-08 22:26:54 +02:00
Laurent Destailleur
f2365a4c8d Fix: A lot of pb into javascript. Javascripts code for same feature was
not inserted always at same place (sometinmes at low level, and
sometimes at high level). This was creating conflict into javascript.

Conflicts:
	htdocs/product/class/product.class.php
2012-06-08 22:25:45 +02:00
Regis Houssin
db840bf8de Fix: remove deprecated code can cause warning 2012-06-08 18:20:06 +02:00
Regis Houssin
4713738ea3 Fix: avoid warning 2012-06-08 18:19:55 +02:00
Laurent Destailleur
d8894b149e Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-06 23:13:41 +02:00
Laurent Destailleur
407978991c Fix: bad error management 2012-06-06 23:05:59 +02:00
Regis Houssin
0d1159d862 Fix: problem with external module 2012-06-06 23:02:46 +02:00
Laurent Destailleur
06442f4755 Fix: Var not initialized 2012-06-06 21:39:37 +02:00
Regis Houssin
54dd02413f Fix: missing search in alternative root directory 2012-06-06 14:05:04 +02:00
Laurent Destailleur
7feff22c1a Fxi: Bad permission check 2012-06-06 00:23:13 +02:00
Laurent Destailleur
a5a4ef538d Fix: Exclude temp file 2012-06-06 00:23:00 +02:00
Laurent Destailleur
c8bd77ddd7 Fix: Missing permission check 2012-06-06 00:22:43 +02:00
Laurent Destailleur
1c32b4231d Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-05 12:55:12 +02:00
Laurent Destailleur
31560e19df Fix with PHP 5.2 2012-06-05 12:54:34 +02:00
Laurent Destailleur
00d185f648 Fix: Use wrong handler. Make install fails. 2012-06-04 02:15:10 +02:00
Regis Houssin
4e05640ecb Fix: date format error 2012-06-03 23:56:27 +02:00
Regis Houssin
ff33cb4a88 Fix: merge array of hookmanager errors 2012-06-03 23:55:05 +02:00
Laurent Destailleur
5ce0fe1405 Fix: Solve error Method Not Implemented 2012-06-01 21:24:54 +02:00
Laurent Destailleur
7c61f6fd88 Fix: Try a fix for the _FILES escape problem. 2012-06-01 21:00:03 +02:00
Laurent Destailleur
0160fb8c5e Fix: an url must be with url escape format. 2012-06-01 10:12:15 +02:00
Laurent Destailleur
a51114d571 Fix: regression. quote was no more supported. 2012-06-01 09:34:43 +02:00
Laurent Destailleur
52f270d623 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 09:28:49 +02:00
Regis Houssin
9c42cdc7d3 Fix: clear file name send by php 2012-06-01 07:14:29 +02:00
Raphaël Doursenaud
d79b65ce49 Fixed a bug preventing invoice sorting by authors 2012-06-01 06:52:59 +02:00
Laurent Destailleur
2b85a2fcd4 Merge pull request #216 from GPCsolutions/82af0ed28f223d1324c8843abb106c8ee6af9a4b
Fixed a bug preventing invoice sorting by authors
2012-05-31 17:57:40 -07:00
Laurent Destailleur
4fd98dfb72 Fix: Revert a lot of commits made on wrong branch. No new features, no
change on architecture on a beta, only bug fixes on visible features.
2012-06-01 02:22:39 +02:00
Laurent Destailleur
06eca56e00 Revert "Fix: replace Bootstrap version by jQueryUI version"
This reverts commit 03ec0d7cc5.
2012-06-01 02:07:35 +02:00
Laurent Destailleur
2d818fc886 Revert "Fix: add max file size"
This reverts commit 8b224e9e2d.
2012-06-01 02:07:24 +02:00
Laurent Destailleur
180908bfe1 Revert "Fix: reload page after file upload completed"
This reverts commit 368af101ef.
2012-06-01 02:07:11 +02:00
Laurent Destailleur
3dcf553a47 Revert "New: update jQuery and jQuery UI"
This reverts commit 7ed980fab5.
2012-06-01 02:07:02 +02:00
Laurent Destailleur
f9bda74e22 Revert "Fix: stock message in session and reload the page for avoid url problem with jQuery fileupload"
This reverts commit 4deeb20dd8.
2012-06-01 02:06:53 +02:00
Laurent Destailleur
73f1d8ee99 Revert "Fix: more clean code for new version of jQuery fileupload"
This reverts commit d7308525ae.
2012-06-01 02:06:43 +02:00
Laurent Destailleur
1a73347866 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 01:54:24 +02:00
Regis Houssin
d7308525ae Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:12:40 +02:00
Regis Houssin
4deeb20dd8 Fix: stock message in session and reload the page for avoid url problem
with jQuery fileupload
2012-05-31 21:12:25 +02:00
Regis Houssin
7ed980fab5 New: update jQuery and jQuery UI 2012-05-30 23:40:45 +02:00
Regis Houssin
368af101ef Fix: reload page after file upload completed 2012-05-30 23:37:02 +02:00
Regis Houssin
8b224e9e2d Fix: add max file size 2012-05-30 23:36:50 +02:00
Regis Houssin
03ec0d7cc5 Fix: replace Bootstrap version by jQueryUI version 2012-05-30 23:36:40 +02:00
Regis Houssin
a717297a8c Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 23:36:17 +02:00
Simnandez
f23462a173 Trad: Add translation 2012-05-30 16:28:13 +02:00
Laurent Destailleur
a83c7d0992 Fix: Regression with quot management. Try a better fix. 2012-05-30 12:49:22 +02:00
Laurent Destailleur
f67636d0f3 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 12:47:58 +02:00
Laurent Destailleur
92fe8ebe1d Fix: js not escaped 2012-05-30 12:33:47 +02:00
Regis Houssin
1a969e61e9 Fix: can't delete a files with quote 2012-05-30 08:31:59 +02:00
Laurent Destailleur
fd9565934c A better fix to remove files from document list 2012-05-30 04:11:37 +02:00
Laurent Destailleur
a465814fd4 More fix for canvas features
Conflicts:
	htdocs/product/canvas/product/tpl/card_create.tpl.php
	htdocs/product/fiche.php
2012-05-30 03:50:53 +02:00
Laurent Destailleur
514babeab1 Fix: delete of documents is done by page of element, not by the view
wrapper.

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/projet/fiche.php
2012-05-30 00:18:11 +02:00
Regis Houssin
caadf396e2 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 00:09:49 +02:00
Regis Houssin
5c2922a17b Fix: big problem with files upload and more compatible with external
modules

Conflicts:
	htdocs/compta/facture.php
2012-05-30 00:09:38 +02:00
Laurent Destailleur
1618ce29c7 Fix: Return empty image instead of error when file not found. 2012-05-30 00:06:44 +02:00
Laurent Destailleur
f11430dec8 Removed deprecated strings 2012-05-29 22:22:00 +02:00
Laurent Destailleur
ea51673ce7 Update de_de translation (manual translation) 2012-05-29 22:19:02 +02:00
Laurent Destailleur
d9d32bb9f5 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-29 22:18:45 +02:00
Regis Houssin
1cbd628971 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-29 09:56:20 +02:00
Regis Houssin
46ae38c86d Fix: clone object before all treatment 2012-05-29 09:56:05 +02:00
Laurent Destailleur
b6c9a37415 Fix: Avoid to have a special php module. 2012-05-28 23:06:32 +02:00
Laurent Destailleur
79cafb1c12 Fix: Subscription must use company name when type is "moral" 2012-05-28 22:14:00 +02:00
Regis Houssin
21d30c1b3e Fix: jquery fileupload broken feature 2012-05-25 20:54:45 +02:00
Raphaël Doursenaud
82af0ed28f Fixed a bug preventing invoice sorting by authors 2012-05-25 16:35:46 +02:00
Laurent Destailleur
95b976c3d5 Fix: Bad action reset 2012-05-23 17:49:08 +02:00
Laurent Destailleur
190bcf61e4 Fix: Permissions to see project 2012-05-23 14:30:55 +02:00
Laurent Destailleur
229ae171de Fix: bug on projects visibility for external users 2012-05-23 13:10:51 +02:00
Laurent Destailleur
face8fc0be Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-23 13:10:15 +02:00
Laurent Destailleur
72f67f640d Merge pull request #203 from GPCsolutions/3.2
3.2
2012-05-23 02:58:43 -07:00
Laurent Destailleur
0b7b27e795 Fix: extrafield repair was using bad hardcoded values. 2012-05-23 11:50:55 +02:00
Laurent Destailleur
04bb23d9bf Fix: [ bug #411 ] Can't modify most properties 2012-05-23 11:20:59 +02:00
Laurent Destailleur
ed48969630 Fix: [ bug #409 ] List of vat rates for supplier prices must use the
seller country.

Conflicts:
	htdocs/install/mysql/migration/3.1.0-3.2.0.sql
	htdocs/product/fournisseurs.php
2012-05-23 11:07:18 +02:00
Laurent Destailleur
c1b1dcc5e7 Fix: Translation of payment term/cond 2012-05-21 20:24:20 +02:00
Regis Houssin
646651e731 Merge pull request #206 from FHenry/3.2
3.2
2012-05-21 07:11:38 -07:00
juanjo
952864f532 [ bug #399 ] Bad calculation of local taxes in update line products 2012-05-21 15:39:15 +02:00
FHenry
23226ad472 correct bug #410 2012-05-21 11:00:08 +02:00
Laurent Destailleur
6cf8c5c102 Fix: Check for duplicate must ignore spaces before and after 2012-05-21 10:38:48 +02:00
Laurent Destailleur
1725e5b591 Fix: [ bug #405 ] Late icon always displayed on comm/propal.php 2012-05-21 00:08:36 +02:00
Laurent Destailleur
7a49d56589 Fix: Missing name 2012-05-16 17:07:01 +02:00
Raphaël Doursenaud
43f1fbed01 Trim payment amounts
This allows to ignore trailing characters that may triggers a warning because the payment looks greater than what's
required
2012-05-16 17:03:15 +02:00
Laurent Destailleur
a8913704e9 Fix: W3C 2012-05-16 12:35:21 +02:00
Raphaël Doursenaud
f7476d5727 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-15 12:04:26 +02:00
Cédric Salvador
68c1fa6c34 Fix: error in syslog call 2012-05-15 11:41:41 +02:00
Laurent Destailleur
94f9fb2e2f Fix: daylight depends also on year (not only month and day) 2012-05-15 00:49:57 +02:00
Laurent Destailleur
dc1457b96a Fix: Bad timezone function. Daylight was not used. 2012-05-14 21:07:49 +02:00
Laurent Destailleur
ceb5f161f6 Fix: bad translation 2012-05-14 21:07:24 +02:00
Laurent Destailleur
b4440a6b2e Fix: Exclude nltechno modules from demo 2012-05-14 21:06:48 +02:00
Laurent Destailleur
fd362f1108 Fix: Clean sql 2012-05-13 18:04:00 +02:00
Laurent Destailleur
6f1fd1ae53 Fix: pgsql 2012-05-13 17:36:43 +02:00
Laurent Destailleur
5c62e8865a Fix: W3C 2012-05-13 17:11:31 +02:00
Laurent Destailleur
e13696db55 Fix: syntax error in name of pgsql util proc.
Fix: Add a proc to fix pgsql problems.
2012-05-13 16:41:45 +02:00
Laurent Destailleur
964bb0968f Fix: Missing log when error 2012-05-13 14:44:22 +02:00
Laurent Destailleur
06679ede7c Fix: style 2012-05-13 14:43:41 +02:00
Laurent Destailleur
4a4cdc0839 Fix: Style 2012-05-13 14:36:22 +02:00
Laurent Destailleur
ee31359488 Fix: pgsql compatibility not complete. 2012-05-13 14:33:46 +02:00
Laurent Destailleur
230f4f8f57 Fix: Missing lang 2012-05-12 18:31:04 +02:00